Skip to contentSkip to conversation

hw/arm/virt-acpi-build: Set COHACC override flag in IORT SMMUv3 node

PATCH Applied Eric Auger 2 participants 2 messages Jan 7, 2019 – Jan 8, 2019

lore
Share & tools
lore

Eric Auger

author
#0 lore raw

PATCH v3 1/1 hw/arm/virt-acpi-build: Set COHACC override flag in IORT SMMUv3 node

Let's report IO-coherent access is supported for translation table walks, descriptor fetches and queues by setting the COHACC override flag. Without that, we observe wrong command opcodes. The DT description also advertises the dma coherency.

Fixes a703b4f6c1ee ("hw/arm/virt-acpi-build: Add smmuv3 node in IORT table")

---
v2 -> v3:
- added cpu_to_le32

---
 hw/arm/virt-acpi-build.c    | 1 +
 include/hw/acpi/acpi-defs.h | 2 ++
 2 files changed, 3 insertions(+)
hw/arm/virt-acpi-build.c +1 -0
index 95fad6f0ce..04b62c714d 100644
@@ -418,6 +418,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
         smmu->mapping_count = cpu_to_le32(1);
         smmu->mapping_offset = cpu_to_le32(sizeof(*smmu));
         smmu->base_address = cpu_to_le64(vms->memmap[VIRT_SMMU].base);
+        smmu->flags = cpu_to_le32(ACPI_IORT_SMMU_V3_COHACC_OVERRIDE);
         smmu->event_gsiv = cpu_to_le32(irq);
         smmu->pri_gsiv = cpu_to_le32(irq + 1);
         smmu->gerr_gsiv = cpu_to_le32(irq + 2);
include/hw/acpi/acpi-defs.h +2 -0
index 5021cb9e79..df37f68757 100644
@@ -623,6 +623,8 @@ struct AcpiIortItsGroup {
 } QEMU_PACKED;
 typedef struct AcpiIortItsGroup AcpiIortItsGroup;
 
+#define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE 1
+
 struct AcpiIortSmmu3 {
     ACPI_IORT_NODE_HEADER_DEF
     uint64_t base_address;
Signature · 1 line
2.17.2
#1 lore raw
Quoted 13 lines · Eric Auger

Let's report IO-coherent access is supported for translation table walks, descriptor fetches and queues by setting the COHACC override flag. Without that, we observe wrong command opcodes. The DT description also advertises the dma coherency.

Fixes a703b4f6c1ee ("hw/arm/virt-acpi-build: Add smmuv3 node in IORT table")

Quoted 4 lines

---
v2 -> v3:
- added cpu_to_le32
---

Applied to target-arm.next, thanks.

-- PMM