Commit a703b4f6 authored by Prem Mallappa's avatar Prem Mallappa Committed by Peter Maydell
Browse files

hw/arm/virt-acpi-build: Add smmuv3 node in IORT table 

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: default avatarPrem Mallappa <prem.mallappa@broadcom.com>
Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarShannon Zhao <zhaoshenglong@huawei.com>
Message-id: 1524665762-31355-14-git-send-email-eric.auger@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 584105ea

hw/arm/virt-acpi-build.c

+48 −7
Original line number Diff line number Diff line
@@ -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 == VIRT_IOMMU_SMMUV3) {

        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,34 @@ 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 = iort->node_offset + node_size;

        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 +473,14 @@ build_iort(GArray *table_data, BIOSLinker *linker) 
    idmap->input_base = 0;

    idmap->id_count = cpu_to_le32(0xFFFF);

    idmap->output_base = 0;



    if (vms->iommu == VIRT_IOMMU_SMMUV3) {

        /* 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);
@@ -777,7 +818,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 */

include/hw/acpi/acpi-defs.h

+15 −0
Original line number Diff line number Diff line
@@ -628,6 +628,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;