[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [Qemu-devel] [PATCH for-3.1] hw/arm/virt-acpi-build: Fix
From: |
Auger Eric |
Subject: |
Re: [Qemu-arm] [Qemu-devel] [PATCH for-3.1] hw/arm/virt-acpi-build: Fix SMMUv3 ACPI integration |
Date: |
Mon, 26 Nov 2018 18:38:20 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 |
Hi Shameer,
On 11/26/18 6:04 PM, Shameerali Kolothum Thodi wrote:
> Hi Eric,
>
>> -----Original Message-----
>> From: Eric Auger [mailto:address@hidden
>> Sent: 26 November 2018 15:46
>> To: address@hidden; address@hidden; qemu-
>> address@hidden; address@hidden; address@hidden;
>> address@hidden
>> Cc: Shameerali Kolothum Thodi <address@hidden>
>> Subject: [PATCH for-3.1] hw/arm/virt-acpi-build: Fix SMMUv3 ACPI integration
>>
>> The AcpiIortSmmu3 misses 2 32b fields corresponding to the
>> proximity domain and the device id mapping index.
>>
>> Also 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.
>
> Ah..that explains the "IDR0.COHACC overridden" and "CMD_SYNC timeout "
> entries in the boot log. Thanks for the fix and I can confirm this fixes the
> issue
> reported earlier[1].
>
> FWIW:
> Tested-by: Shameer Kolothum <address@hidden>
Many thanks!
Best Regards
Eric
>
> Thanks,
> Shameer
>
> [1] https://patchwork.kernel.org/cover/10609261/
>
>> Fixes a703b4f6c1ee ("hw/arm/virt-acpi-build: Add smmuv3 node in IORT
>> table")
>>
>> Signed-off-by: Eric Auger <address@hidden>
>> Reported-by: Shameerali Kolothum Thodi
>> <address@hidden>
>> ---
>> hw/arm/virt-acpi-build.c | 1 +
>> include/hw/acpi/acpi-defs.h | 8 ++++++++
>> 2 files changed, 9 insertions(+)
>>
>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
>> index 5785fb697c..aa177ba64d 100644
>> --- a/hw/arm/virt-acpi-build.c
>> +++ b/hw/arm/virt-acpi-build.c
>> @@ -448,6 +448,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 = 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);
>> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
>> index af8e023968..c3ee1f517b 100644
>> --- a/include/hw/acpi/acpi-defs.h
>> +++ b/include/hw/acpi/acpi-defs.h
>> @@ -628,6 +628,12 @@ struct AcpiIortItsGroup {
>> } QEMU_PACKED;
>> typedef struct AcpiIortItsGroup AcpiIortItsGroup;
>>
>> +enum {
>> + ACPI_IORT_SMMU_V3_COHACC_OVERRIDE = 1 << 0,
>> + ACPI_IORT_SMMU_V3_HTTU_OVERRIDE = 3 << 1,
>> + ACPI_IORT_SMMU_V3_PXM_VALID = 1 << 3
>> +};
>> +
>> struct AcpiIortSmmu3 {
>> ACPI_IORT_NODE_HEADER_DEF
>> uint64_t base_address;
>> @@ -639,6 +645,8 @@ struct AcpiIortSmmu3 {
>> uint32_t pri_gsiv;
>> uint32_t gerr_gsiv;
>> uint32_t sync_gsiv;
>> + uint32_t pxm;
>> + uint32_t id_mapping_index;
>> AcpiIortIdMapping id_mapping_array[0];
>> } QEMU_PACKED;
>> typedef struct AcpiIortSmmu3 AcpiIortSmmu3;
>> --
>> 2.17.2
>
>
Re: [Qemu-arm] [PATCH for-3.1] hw/arm/virt-acpi-build: Fix SMMUv3 ACPI integration, Peter Maydell, 2018/11/27