Commit 9f4d2a13 authored by Eric Auger's avatar Eric Auger Committed by Peter Maydell
Browse files

hw/arm/smmuv3: fix eventq recording and IRQ triggerring 



The event queue management is broken today. Event records
are not properly written as EVT_SET_* macro was not updating
the actual event record. Also the event queue interrupt
is not correctly triggered.

Fixes: bb981004 ("hw/arm/smmuv3: Event queue recording helper")
Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Message-id: 20180921070138.10114-3-eric.auger@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 6ce9297b

hw/arm/smmuv3-internal.h

+13 −13
Original line number Diff line number Diff line
@@ -442,17 +442,17 @@ typedef struct SMMUEventInfo { 


#define EVT_Q_OVERFLOW        (1 << 31)



#define EVT_SET_TYPE(x, v)              deposit32((x)->word[0], 0 , 8 , v)

#define EVT_SET_SSV(x, v)               deposit32((x)->word[0], 11, 1 , v)

#define EVT_SET_SSID(x, v)              deposit32((x)->word[0], 12, 20, v)

#define EVT_SET_TYPE(x, v)  ((x)->word[0] = deposit32((x)->word[0], 0 , 8 , v))

#define EVT_SET_SSV(x, v)   ((x)->word[0] = deposit32((x)->word[0], 11, 1 , v))

#define EVT_SET_SSID(x, v)  ((x)->word[0] = deposit32((x)->word[0], 12, 20, v))

#define EVT_SET_SID(x, v)   ((x)->word[1] = v)

#define EVT_SET_STAG(x, v)              deposit32((x)->word[2], 0 , 16, v)

#define EVT_SET_STALL(x, v)             deposit32((x)->word[2], 31, 1 , v)

#define EVT_SET_PNU(x, v)               deposit32((x)->word[3], 1 , 1 , v)

#define EVT_SET_IND(x, v)               deposit32((x)->word[3], 2 , 1 , v)

#define EVT_SET_RNW(x, v)               deposit32((x)->word[3], 3 , 1 , v)

#define EVT_SET_S2(x, v)                deposit32((x)->word[3], 7 , 1 , v)

#define EVT_SET_CLASS(x, v)             deposit32((x)->word[3], 8 , 2 , v)

#define EVT_SET_STAG(x, v)  ((x)->word[2] = deposit32((x)->word[2], 0 , 16, v))

#define EVT_SET_STALL(x, v) ((x)->word[2] = deposit32((x)->word[2], 31, 1 , v))

#define EVT_SET_PNU(x, v)   ((x)->word[3] = deposit32((x)->word[3], 1 , 1 , v))

#define EVT_SET_IND(x, v)   ((x)->word[3] = deposit32((x)->word[3], 2 , 1 , v))

#define EVT_SET_RNW(x, v)   ((x)->word[3] = deposit32((x)->word[3], 3 , 1 , v))

#define EVT_SET_S2(x, v)    ((x)->word[3] = deposit32((x)->word[3], 7 , 1 , v))

#define EVT_SET_CLASS(x, v) ((x)->word[3] = deposit32((x)->word[3], 8 , 2 , v))

#define EVT_SET_ADDR(x, addr)                             \

    do {                                                  \

            (x)->word[5] = (uint32_t)(addr >> 32);        \
@@ -460,8 +460,8 @@ typedef struct SMMUEventInfo { 
    } while (0)

#define EVT_SET_ADDR2(x, addr)                            \

    do {                                                  \

            deposit32((x)->word[7], 3, 29, addr >> 16);   \

            deposit32((x)->word[7], 0, 16, addr & 0xffff);\

            (x)->word[7] = deposit32((x)->word[7], 3, 29, addr >> 16);   \

            (x)->word[7] = deposit32((x)->word[7], 0, 16, addr & 0xffff);\

    } while (0)



void smmuv3_record_event(SMMUv3State *s, SMMUEventInfo *event);

hw/arm/smmuv3.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static MemTxResult smmuv3_write_eventq(SMMUv3State *s, Evt *evt) 
        return r;

    }



    if (smmuv3_q_empty(q)) {

    if (!smmuv3_q_empty(q)) {

        smmuv3_trigger_irq(s, SMMU_IRQ_EVTQ, 0);

    }

    return MEMTX_OK;