qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Simon Veith <sveith@amazon.de>
To: qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: Simon Veith <sveith@amazon.de>, Eric Auger <eric.auger@redhat.com>
Subject: [PATCH v3 6/6] hw/arm/smmuv3: Report F_STE_FETCH fault address in correct word position
Date: Mon, 16 Dec 2019 16:15:12 +0100	[thread overview]
Message-ID: <1576509312-13083-7-git-send-email-sveith@amazon.de> (raw)
In-Reply-To: <1576509312-13083-1-git-send-email-sveith@amazon.de>

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>
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>
---
 hw/arm/smmuv3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 31ac3ca..8b5f157 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -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);
-- 
2.7.4



  parent reply	other threads:[~2019-12-16 15:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-16 15:15 [PATCH v3 0/6] hw/arm/smmuv3: Correct stream ID and event address handling Simon Veith
2019-12-16 15:15 ` [PATCH v3 1/6] hw/arm/smmuv3: Apply address mask to linear strtab base address Simon Veith
2019-12-16 15:15 ` [PATCH v3 2/6] hw/arm/smmuv3: Correct SMMU_BASE_ADDR_MASK value Simon Veith
2019-12-17  8:55   ` Auger Eric
2019-12-16 15:15 ` [PATCH v3 3/6] hw/arm/smmuv3: Check stream IDs against actual table LOG2SIZE Simon Veith
2019-12-17  8:54   ` Auger Eric
2019-12-16 15:15 ` [PATCH v3 4/6] hw/arm/smmuv3: Align stream table base address to table size Simon Veith
2019-12-17  9:40   ` Auger Eric
2019-12-16 15:15 ` [PATCH v3 5/6] hw/arm/smmuv3: Use correct bit positions in EVT_SET_ADDR2 macro Simon Veith
2019-12-16 15:15 ` Simon Veith [this message]
2019-12-17 10:03 ` [PATCH v3 0/6] hw/arm/smmuv3: Correct stream ID and event address handling Auger Eric
2019-12-17 15:25   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1576509312-13083-7-git-send-email-sveith@amazon.de \
    --to=sveith@amazon.de \
    --cc=eric.auger@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).