From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
peter.maydell@linaro.org, qemu-arm@nongnu.org,
qemu-devel@nongnu.org, prem.mallappa@gmail.com,
alex.williamson@redhat.com
Cc: tn@semihalf.com, mst@redhat.com, christoffer.dall@linaro.org,
bharat.bhushan@nxp.com, jean-philippe.brucker@arm.com,
edgar.iglesias@gmail.com, linuc.decode@gmail.com,
peterx@redhat.com
Subject: [Qemu-devel] [PATCH v8 07/14] hw/arm/smmuv3: Implement MMIO write operations
Date: Mon, 5 Feb 2018 14:39:25 +0100 [thread overview]
Message-ID: <1517837972-1904-8-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1517837972-1904-1-git-send-email-eric.auger@redhat.com>
Now we have relevant helpers for queue and irq
management, let's implement MMIO write operations.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v7 -> v8:
- precise in the commit message invalidation commands
are not yet treated.
- use new queue helpers
- do not decode unhandled commands at this stage
---
hw/arm/smmuv3-internal.h | 24 +++++++---
hw/arm/smmuv3.c | 111 +++++++++++++++++++++++++++++++++++++++++++++--
hw/arm/trace-events | 6 +++
3 files changed, 132 insertions(+), 9 deletions(-)
diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h
index 44564ed..799bce0 100644
--- a/hw/arm/smmuv3-internal.h
+++ b/hw/arm/smmuv3-internal.h
@@ -152,6 +152,25 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,
return extract64(r, offset << 3, 32);
}
+static inline void smmu_write64(uint64_t *r, unsigned offset,
+ unsigned size, uint64_t value)
+{
+ if (size == 8 && !offset) {
+ *r = value;
+ }
+
+ /* 32 bit access */
+
+ if (offset && offset != 4) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "SMMUv3 MMIO write: bad offset/size %u/%u\n",
+ offset, size);
+ return ;
+ }
+
+ *r = deposit64(*r, offset << 3, 32, value);
+}
+
/* Interrupts */
#define smmuv3_eventq_irq_enabled(s) \
@@ -159,9 +178,6 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,
#define smmuv3_gerror_irq_enabled(s) \
(FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN))
-void smmuv3_trigger_irq(SMMUv3State *s, SMMUIrq irq, uint32_t gerror_mask);
-void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t gerrorn);
-
/* Queue Handling */
#define LOG2SIZE(q) extract64((q)->base, 0, 5)
@@ -302,6 +318,4 @@ enum { /* Command completion notification */
addr; \
})
-int smmuv3_cmdq_consume(SMMUv3State *s);
-
#endif
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 79970d7..8e9eab2 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -37,7 +37,8 @@
* @irq: irq type
* @gerror_mask: mask of gerrors to toggle (relevant if @irq is GERROR)
*/
-void smmuv3_trigger_irq(SMMUv3State *s, SMMUIrq irq, uint32_t gerror_mask)
+static void smmuv3_trigger_irq(SMMUv3State *s, SMMUIrq irq,
+ uint32_t gerror_mask)
{
bool pulse = false;
@@ -75,7 +76,7 @@ void smmuv3_trigger_irq(SMMUv3State *s, SMMUIrq irq, uint32_t gerror_mask)
}
}
-void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn)
+static void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn)
{
uint32_t pending = s->gerror ^ s->gerrorn;
uint32_t toggled = s->gerrorn ^ new_gerrorn;
@@ -202,7 +203,7 @@ static void smmuv3_init_regs(SMMUv3State *s)
s->sid_split = 0;
}
-int smmuv3_cmdq_consume(SMMUv3State *s)
+static int smmuv3_cmdq_consume(SMMUv3State *s)
{
SMMUCmdError cmd_error = SMMU_CERROR_NONE;
SMMUQueue *q = &s->cmdq;
@@ -287,7 +288,109 @@ int smmuv3_cmdq_consume(SMMUv3State *s)
static void smmu_write_mmio(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
- /* not yet implemented */
+ SMMUState *sys = opaque;
+ SMMUv3State *s = ARM_SMMUV3(sys);
+
+ /* CONSTRAINED UNPREDICTABLE choice to have page0/1 be exact aliases */
+ addr &= ~0x10000;
+
+ if (size != 4 && size != 8) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "SMMUv3 MMIO write: bad size %u\n", size);
+ }
+
+ trace_smmuv3_write_mmio(addr, val, size);
+
+ switch (addr) {
+ case A_CR0:
+ s->cr[0] = val;
+ s->cr0ack = val;
+ /* in case the command queue has been enabled */
+ smmuv3_cmdq_consume(s);
+ return;
+ case A_CR1:
+ s->cr[1] = val;
+ return;
+ case A_CR2:
+ s->cr[2] = val;
+ return;
+ case A_IRQ_CTRL:
+ s->irq_ctrl = val;
+ return;
+ case A_GERRORN:
+ smmuv3_write_gerrorn(s, val);
+ /*
+ * By acknowledging the CMDQ_ERR, SW may notify cmds can
+ * be processed again
+ */
+ smmuv3_cmdq_consume(s);
+ return;
+ case A_GERROR_IRQ_CFG0: /* 64b */
+ smmu_write64(&s->gerror_irq_cfg0, 0, size, val);
+ return;
+ case A_GERROR_IRQ_CFG0 + 4:
+ smmu_write64(&s->gerror_irq_cfg0, 4, size, val);
+ return;
+ case A_GERROR_IRQ_CFG1:
+ s->gerror_irq_cfg1 = val;
+ return;
+ case A_GERROR_IRQ_CFG2:
+ s->gerror_irq_cfg2 = val;
+ return;
+ case A_STRTAB_BASE: /* 64b */
+ smmu_write64(&s->strtab_base, 0, size, val);
+ return;
+ case A_STRTAB_BASE + 4:
+ smmu_write64(&s->strtab_base, 4, size, val);
+ return;
+ case A_STRTAB_BASE_CFG:
+ s->strtab_base_cfg = val;
+ if (FIELD_EX32(val, STRTAB_BASE_CFG, FMT) == 1) {
+ s->sid_split = FIELD_EX32(val, STRTAB_BASE_CFG, SPLIT);
+ s->features |= SMMU_FEATURE_2LVL_STE;
+ }
+ return;
+ case A_CMDQ_BASE: /* 64b */
+ smmu_write64(&s->cmdq.base, 0, size, val);
+ return;
+ case A_CMDQ_BASE + 4: /* 64b */
+ smmu_write64(&s->cmdq.base, 4, size, val);
+ return;
+ case A_CMDQ_PROD:
+ s->cmdq.prod = val;
+ smmuv3_cmdq_consume(s);
+ return;
+ case A_CMDQ_CONS:
+ s->cmdq.cons = val;
+ return;
+ case A_EVENTQ_BASE: /* 64b */
+ smmu_write64(&s->eventq.base, 0, size, val);
+ return;
+ case A_EVENTQ_BASE + 4:
+ smmu_write64(&s->eventq.base, 4, size, val);
+ return;
+ case A_EVENTQ_PROD:
+ s->eventq.prod = val;
+ return;
+ case A_EVENTQ_CONS:
+ s->eventq.cons = val;
+ return;
+ case A_EVENTQ_IRQ_CFG0: /* 64b */
+ s->eventq.prod = val;
+ smmu_write64(&s->eventq_irq_cfg0, 0, size, val);
+ return;
+ case A_EVENTQ_IRQ_CFG0 + 4:
+ smmu_write64(&s->eventq_irq_cfg0, 4, size, val);
+ return;
+ case A_EVENTQ_IRQ_CFG1:
+ s->eventq_irq_cfg1 = val;
+ return;
+ case A_EVENTQ_IRQ_CFG2:
+ s->eventq_irq_cfg2 = val;
+ return;
+ default:
+ error_report("%s unhandled access at 0x%"PRIx64, __func__, addr);
+ }
}
static uint64_t smmu_read_mmio(void *opaque, hwaddr addr, unsigned size)
diff --git a/hw/arm/trace-events b/hw/arm/trace-events
index d73e151..8a4acb9 100644
--- a/hw/arm/trace-events
+++ b/hw/arm/trace-events
@@ -24,3 +24,9 @@ smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d"
smmuv3_cmdq_consume(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod=%d cons=%d prod.wrap=%d cons.wrap=%d"
smmuv3_cmdq_opcode(const char *opcode) "<--- %s"
smmuv3_cmdq_consume_out(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod:%d, cons:%d, prod_wrap:%d, cons_wrap:%d "
+smmuv3_update(bool is_empty, uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "q empty:%d prod:%d cons:%d p.wrap:%d p.cons:%d"
+smmuv3_update_check_cmd(int error) "cmdq not enabled or error :0x%x"
+smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x"
+smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx val64:0x%lx"
+smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d"
+smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d"
--
2.5.5
next prev parent reply other threads:[~2018-02-05 13:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-05 13:39 [Qemu-devel] [PATCH v8 00/14] ARM SMMUv3 Emulation Support Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 01/14] hw/arm/smmu-common: smmu base device and datatypes Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 02/14] hw/arm/smmu-common: IOMMU memory region and address space setup Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 03/14] hw/arm/smmu-common: VMSAv8-64 page table walk Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 04/14] hw/arm/smmuv3: Skeleton Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 05/14] hw/arm/smmuv3: Wired IRQ and GERROR helpers Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 06/14] hw/arm/smmuv3: Queue helpers Eric Auger
2018-02-05 13:39 ` Eric Auger [this message]
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 08/14] hw/arm/smmuv3: Event queue recording helper Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 09/14] hw/arm/smmuv3: Implement translate callback Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 10/14] hw/arm/smmuv3: Abort on vfio or vhost case Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 11/14] target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 12/14] hw/arm/virt: Add SMMUv3 to the virt board Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 13/14] hw/arm/virt-acpi-build: Add smmuv3 node in IORT table Eric Auger
2018-02-05 13:39 ` [Qemu-devel] [PATCH v8 14/14] hw/arm/virt: Handle iommu in 2.12 machine type Eric Auger
2018-02-05 14:53 ` [Qemu-devel] [PATCH v8 00/14] ARM SMMUv3 Emulation Support no-reply
2018-02-06 12:22 ` Auger Eric
2018-02-06 12:45 ` 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=1517837972-1904-8-git-send-email-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=bharat.bhushan@nxp.com \
--cc=christoffer.dall@linaro.org \
--cc=edgar.iglesias@gmail.com \
--cc=eric.auger.pro@gmail.com \
--cc=jean-philippe.brucker@arm.com \
--cc=linuc.decode@gmail.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=prem.mallappa@gmail.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=tn@semihalf.com \
/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).