Rename struct AcpiIortSMMUv3Dev to AcpiSMMUv3Dev so that it is not specific to IORT. Subsequent Tegra241 CMDQV support patch will use the same struct to build CMDQV DSDT support as well.
No functional changes intended. Signed-off-by: Shameer Kolothum <[email protected]> --- hw/arm/virt-acpi-build.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 1e3779991e..4f8d36dae0 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -339,7 +339,7 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b) return idmap_a->input_base - idmap_b->input_base; } -typedef struct AcpiIortSMMUv3Dev { +typedef struct AcpiSMMUv3Dev { int irq; hwaddr base; GArray *rc_smmu_idmaps; @@ -347,16 +347,16 @@ typedef struct AcpiIortSMMUv3Dev { size_t offset; bool accel; bool ats; -} AcpiIortSMMUv3Dev; +} AcpiSMMUv3Dev; /* - * Populate the struct AcpiIortSMMUv3Dev for the legacy SMMUv3 and + * Populate the struct AcpiSMMUv3Dev for the legacy SMMUv3 and * return the total number of associated idmaps. */ static int populate_smmuv3_legacy_dev(GArray *sdev_blob) { VirtMachineState *vms = VIRT_MACHINE(qdev_get_machine()); - AcpiIortSMMUv3Dev sdev; + AcpiSMMUv3Dev sdev; sdev.rc_smmu_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping)); object_child_foreach_recursive(object_get_root(), iort_host_bridges, @@ -376,8 +376,8 @@ static int populate_smmuv3_legacy_dev(GArray *sdev_blob) static int smmuv3_dev_idmap_compare(gconstpointer a, gconstpointer b) { - AcpiIortSMMUv3Dev *sdev_a = (AcpiIortSMMUv3Dev *)a; - AcpiIortSMMUv3Dev *sdev_b = (AcpiIortSMMUv3Dev *)b; + AcpiSMMUv3Dev *sdev_a = (AcpiSMMUv3Dev *)a; + AcpiSMMUv3Dev *sdev_b = (AcpiSMMUv3Dev *)b; AcpiIortIdMapping *map_a = &g_array_index(sdev_a->rc_smmu_idmaps, AcpiIortIdMapping, 0); AcpiIortIdMapping *map_b = &g_array_index(sdev_b->rc_smmu_idmaps, @@ -391,7 +391,7 @@ static int iort_smmuv3_devices(Object *obj, void *opaque) GArray *sdev_blob = opaque; AcpiIortIdMapping idmap; PlatformBusDevice *pbus; - AcpiIortSMMUv3Dev sdev; + AcpiSMMUv3Dev sdev; int min_bus, max_bus; SysBusDevice *sbdev; PCIBus *bus; @@ -421,7 +421,7 @@ static int iort_smmuv3_devices(Object *obj, void *opaque) } /* - * Populate the struct AcpiIortSMMUv3Dev for all SMMUv3 devices and + * Populate the struct AcpiSMMUv3Dev for all SMMUv3 devices and * return the total number of idmaps. */ static int populate_smmuv3_dev(GArray *sdev_blob) @@ -442,10 +442,10 @@ static void create_rc_its_idmaps(GArray *its_idmaps, GArray *smmuv3_devs) { AcpiIortIdMapping *idmap; AcpiIortIdMapping next_range = {0}; - AcpiIortSMMUv3Dev *sdev; + AcpiSMMUv3Dev *sdev; for (int i = 0; i < smmuv3_devs->len; i++) { - sdev = &g_array_index(smmuv3_devs, AcpiIortSMMUv3Dev, i); + sdev = &g_array_index(smmuv3_devs, AcpiSMMUv3Dev, i); /* * Based on the RID ranges that are directed to the SMMU, determine the * bypassed RID ranges, i.e., the ones that are directed to the ITS @@ -479,7 +479,7 @@ static void create_rc_its_idmaps(GArray *its_idmaps, GArray *smmuv3_devs) static void build_iort_rmr_nodes(GArray *table_data, GArray *smmuv3_devices, uint32_t *id) { - AcpiIortSMMUv3Dev *sdev; + AcpiSMMUv3Dev *sdev; AcpiIortIdMapping *idmap; int i; @@ -487,7 +487,7 @@ build_iort_rmr_nodes(GArray *table_data, GArray *smmuv3_devices, uint32_t *id) uint16_t rmr_len; int bdf; - sdev = &g_array_index(smmuv3_devices, AcpiIortSMMUv3Dev, i); + sdev = &g_array_index(smmuv3_devices, AcpiSMMUv3Dev, i); if (!sdev->accel) { continue; } @@ -544,13 +544,13 @@ static void build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { int i, nb_nodes, rc_mapping_count; - AcpiIortSMMUv3Dev *sdev; + AcpiSMMUv3Dev *sdev; size_t node_size; bool ats_needed = false; int num_smmus = 0; uint32_t id = 0; int rc_smmu_idmaps_len = 0; - GArray *smmuv3_devs = g_array_new(false, true, sizeof(AcpiIortSMMUv3Dev)); + GArray *smmuv3_devs = g_array_new(false, true, sizeof(AcpiSMMUv3Dev)); GArray *rc_its_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping)); AcpiTable table = { .sig = "IORT", .rev = 5, .oem_id = vms->oem_id, @@ -581,7 +581,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } /* Calculate RMR nodes required. One per SMMUv3 with accelerated mode */ for (i = 0; i < num_smmus; i++) { - sdev = &g_array_index(smmuv3_devs, AcpiIortSMMUv3Dev, i); + sdev = &g_array_index(smmuv3_devs, AcpiSMMUv3Dev, i); if (sdev->ats) { ats_needed = true; } @@ -620,7 +620,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } for (i = 0; i < num_smmus; i++) { - sdev = &g_array_index(smmuv3_devs, AcpiIortSMMUv3Dev, i); + sdev = &g_array_index(smmuv3_devs, AcpiSMMUv3Dev, i); int smmu_mapping_count, offset_to_id_array; int irq = sdev->irq; @@ -699,7 +699,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) AcpiIortIdMapping *range; for (i = 0; i < num_smmus; i++) { - sdev = &g_array_index(smmuv3_devs, AcpiIortSMMUv3Dev, i); + sdev = &g_array_index(smmuv3_devs, AcpiSMMUv3Dev, i); /* * Map RIDs (input) from RC to SMMUv3 nodes: RC -> SMMUv3. @@ -742,7 +742,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) acpi_table_end(linker, &table); g_array_free(rc_its_idmaps, true); for (i = 0; i < num_smmus; i++) { - sdev = &g_array_index(smmuv3_devs, AcpiIortSMMUv3Dev, i); + sdev = &g_array_index(smmuv3_devs, AcpiSMMUv3Dev, i); g_array_free(sdev->rc_smmu_idmaps, true); } g_array_free(smmuv3_devs, true); -- 2.43.0
