On 2018/3/12 20:48, Peter Maydell wrote:
> On 17 February 2018 at 18:46, Eric Auger <eric.au...@redhat.com> wrote:
>> From: Prem Mallappa <prem.malla...@broadcom.com>
>>
>> This patch builds the smmuv3 node in the ACPI IORT table.
>>
>> The RID space of the root complex, which spans 0x0-0x10000
>> maps to streamid space 0x0-0x10000 in smmuv3, which in turn
>> maps to deviceid space 0x0-0x10000 in the ITS group.
>>
>> The guest must feature the IOMMU probe deferral series
>> (https://lkml.org/lkml/2017/4/10/214) which fixes streamid
>> multiple lookup. This bug is not related to the SMMU emulation.
>>
>> Signed-off-by: Prem Mallappa <prem.malla...@broadcom.com>
>> Signed-off-by: Eric Auger <eric.au...@redhat.com>
>>
>> ---
>>
>> v2 -> v3:
>> - integrate into the existing IORT table made up of ITS, RC nodes
>> - take into account vms->smmu
>> - match linux actbl2.h acpi_iort_smmu_v3 field names
>> ---
>> hw/arm/virt-acpi-build.c | 56
>> +++++++++++++++++++++++++++++++++++++++------
>> include/hw/acpi/acpi-defs.h | 15 ++++++++++++
>> 2 files changed, 64 insertions(+), 7 deletions(-)
>
> Since ACPI is definitely not my area of expertise, I've cc'd
> Shannon on this patch. Shannon, could you take a look at it, please?
>
Sure.
>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
>> index f7fa795..4b5ad91 100644
>> --- a/hw/arm/virt-acpi-build.c
>> +++ b/hw/arm/virt-acpi-build.c
>> @@ -393,19 +393,26 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker,
>> unsigned xsdt_tbl_offset)
>> }
>>
>> static void
>> -build_iort(GArray *table_data, BIOSLinker *linker)
>> +build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>> {
>> - int iort_start = table_data->len;
>> + int nb_nodes, iort_start = table_data->len;
>> AcpiIortIdMapping *idmap;
>> AcpiIortItsGroup *its;
>> AcpiIortTable *iort;
>> - size_t node_size, iort_length;
>> + AcpiIortSmmu3 *smmu;
>> + size_t node_size, iort_length, smmu_offset = 0;
>> AcpiIortRC *rc;
>>
>> iort = acpi_data_push(table_data, sizeof(*iort));
>>
>> + if (vms->iommu) {
use if (vms->iommu == VIRT_IOMMU_SMMUV3) ? in case we support other
types of SMMU.
>> + nb_nodes = 3; /* RC, ITS, SMMUv3 */
>> + } else {
>> + nb_nodes = 2; /* RC, ITS */
>> + }
>> +
>> iort_length = sizeof(*iort);
>> - iort->node_count = cpu_to_le32(2); /* RC and ITS nodes */
>> + iort->node_count = cpu_to_le32(nb_nodes);
>> iort->node_offset = cpu_to_le32(sizeof(*iort));
>>
>> /* ITS group node */
>> @@ -418,6 +425,35 @@ build_iort(GArray *table_data, BIOSLinker *linker)
>> its->its_count = cpu_to_le32(1);
>> its->identifiers[0] = 0; /* MADT translation_id */
>>
>> + if (vms->iommu == VIRT_IOMMU_SMMUV3) {
>> + int irq = vms->irqmap[VIRT_SMMU];
>> +
>> + /* SMMUv3 node */
>> + smmu_offset = cpu_to_le32(iort->node_offset + node_size);
no need cpu_to_le32 here.
Otherwise: Reviewed-by: Shannon Zhao <zhaoshengl...@huawei.com>
>> + node_size = sizeof(*smmu) + sizeof(*idmap);
>> + iort_length += node_size;
>> + smmu = acpi_data_push(table_data, node_size);
>> +
>> +
>> + smmu->type = ACPI_IORT_NODE_SMMU_V3;
>> + smmu->length = cpu_to_le16(node_size);
>> + 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->event_gsiv = cpu_to_le32(irq);
>> + smmu->pri_gsiv = cpu_to_le32(irq + 1);
>> + smmu->gerr_gsiv = cpu_to_le32(irq + 2);
>> + smmu->sync_gsiv = cpu_to_le32(irq + 3);
>> +
>> + /* Identity RID mapping covering the whole input RID range */
>> + idmap = &smmu->id_mapping_array[0];
>> + idmap->input_base = 0;
>> + idmap->id_count = cpu_to_le32(0xFFFF);
>> + idmap->output_base = 0;
>> + /* output IORT node is the ITS group node (the first node) */
>> + idmap->output_reference = cpu_to_le32(iort->node_offset);
>> + }
>> +
>> /* Root Complex Node */
>> node_size = sizeof(*rc) + sizeof(*idmap);
>> iort_length += node_size;
>> @@ -438,8 +474,14 @@ build_iort(GArray *table_data, BIOSLinker *linker)
>> idmap->input_base = 0;
>> idmap->id_count = cpu_to_le32(0xFFFF);
>> idmap->output_base = 0;
>> - /* output IORT node is the ITS group node (the first node) */
>> - idmap->output_reference = cpu_to_le32(iort->node_offset);
>> +
>> + if (vms->iommu) {
>> + /* output IORT node is the smmuv3 node */
>> + idmap->output_reference = cpu_to_le32(smmu_offset);
>> + } else {
>> + /* output IORT node is the ITS group node (the first node) */
>> + idmap->output_reference = cpu_to_le32(iort->node_offset);
>> + }
>>
>> iort->length = cpu_to_le32(iort_length);
>>
>> @@ -786,7 +828,7 @@ void virt_acpi_build(VirtMachineState *vms,
>> AcpiBuildTables *tables)
>>
>> if (its_class_name() && !vmc->no_its) {
>> acpi_add_table(table_offsets, tables_blob);
>> - build_iort(tables_blob, tables->linker);
>> + build_iort(tables_blob, tables->linker, vms);
>> }
>>
>> /* XSDT is pointed to by RSDP */
>> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
>> index 80c8099..068ce28 100644
>> --- a/include/hw/acpi/acpi-defs.h
>> +++ b/include/hw/acpi/acpi-defs.h
>> @@ -700,6 +700,21 @@ struct AcpiIortItsGroup {
>> } QEMU_PACKED;
>> typedef struct AcpiIortItsGroup AcpiIortItsGroup;
>>
>> +struct AcpiIortSmmu3 {
>> + ACPI_IORT_NODE_HEADER_DEF
>> + uint64_t base_address;
>> + uint32_t flags;
>> + uint32_t reserved2;
>> + uint64_t vatos_address;
>> + uint32_t model;
>> + uint32_t event_gsiv;
>> + uint32_t pri_gsiv;
>> + uint32_t gerr_gsiv;
>> + uint32_t sync_gsiv;
>> + AcpiIortIdMapping id_mapping_array[0];
>> +} QEMU_PACKED;
>> +typedef struct AcpiIortSmmu3 AcpiIortSmmu3;
>> +
>> struct AcpiIortRC {
>> ACPI_IORT_NODE_HEADER_DEF
>> AcpiIortMemoryAccess memory_properties;
>> --
>> 2.5.5
>>
>
> thanks
> -- PMM
>
>
> .
>
--
Shannon
