hw/arm/smmuv3: Report F_STE_FETCH fault address in correct word position
The smmuv3_record_event() function that generates the F_STE_FETCH error
uses the EVT_SET_ADDR macro to record the fetch address, placing it in
32-bit words 4 and 5.
The correct position for this address is in words 6 and 7, per the
SMMUv3 Architecture Specification.
Update the function to use the EVT_SET_ADDR2 macro instead, which is the
macro intended for writing to these words.
ref. ARM IHI 0070C, section 7.3.4.
Signed-off-by: Simon Veith <sveith@amazon.de>
Acked-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Message-id: 1576509312-13083-7-git-send-email-sveith@amazon.de
Cc: Eric Auger <eric.auger@redhat.com>
Cc: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org
Acked-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
(cherry picked from commit b255cafb59
)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
stable-4.2
parent
ec3bd881e2
commit
9b59fdf478
|
@ -172,7 +172,7 @@ void smmuv3_record_event(SMMUv3State *s, SMMUEventInfo *info)
|
|||
case SMMU_EVT_F_STE_FETCH:
|
||||
EVT_SET_SSID(&evt, info->u.f_ste_fetch.ssid);
|
||||
EVT_SET_SSV(&evt, info->u.f_ste_fetch.ssv);
|
||||
EVT_SET_ADDR(&evt, info->u.f_ste_fetch.addr);
|
||||
EVT_SET_ADDR2(&evt, info->u.f_ste_fetch.addr);
|
||||
break;
|
||||
case SMMU_EVT_C_BAD_STE:
|
||||
EVT_SET_SSID(&evt, info->u.c_bad_ste.ssid);
|
||||
|
|
Loading…
Reference in New Issue