Extract build_mcfg
v2 cover Extract build_mcfg
This patch set tries to generalize MCFG table build process.
Wei Yang (4):
hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg() hw/acpi: Extract build_mcfg to pci.c
default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + hw/acpi/Kconfig | 4 +++ hw/acpi/Makefile.objs | 1 + hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 31 ++++++--------------- hw/i386/acpi-build.c | 30 ++++----------------- include/hw/acpi/aml-build.h | 5 ++++ include/hw/acpi/pci.h | 5 ++++ 9 files changed, 76 insertions(+), 48 deletions(-) create mode 100644 hw/acpi/pci.c create mode 100644 include/hw/acpi/pci.h
Signature · 1 line
2.19.1
PATCH v2 1/4 hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start
mcfg_start points to the start of MCFG table and is used in build_header. While this information could be derived from mcfg.
This patch removes the unnecessary variable mcfg_start.
--- hw/arm/virt-acpi-build.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/arm/virt-acpi-build.c +1 -3
@@ -552,7 +552,6 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)const MemMapEntry *memmap = vms->memmap;int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam);int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); -int mcfg_start = table_data->len; mcfg =acpi_data_push (table_data, len); mcfg->allocation[0 ].address =cpu_to_le64 (memmap[ecam_id].base);
@@ -563,8 +562,7 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (memmap[ecam_id].size -1 ); -build_header (linker, table_data, (void *)(table_data->data + mcfg_start), -"MCFG" , table_data->len - mcfg_start,1 ,NULL ,NULL ); +build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }/* GTDT */
Signature · 1 line
2.19.1
Re: [Qemu-devel] [PATCH v2 1/4] hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start
Quoted 25 lines · Wei Yang
mcfg_startpoints to the start of MCFG table and is used inbuild_header. While this information could be derived from mcfg.This patch removes the unnecessary variable
mcfg_start.Signed-off-by Wei Yang <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- hw/arm/virt-acpi-build.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)hw/arm/virt-acpi-build.c +0
-1@@ -552,7 +552,6 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)const MemMapEntry *memmap = vms->memmap;int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam);int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); -int mcfg_start = table_data->len; mcfg =acpi_data_push (table_data, len); mcfg->allocation[0 ].address =cpu_to_le64 (memmap[ecam_id].base);
hw/arm/virt-acpi-build.c build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) · line 568
Quoted 9 lines
hw/arm/virt-acpi-build.c +1
-2@@ -563,8 +562,7 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (memmap[ecam_id].size -1 ); -build_header (linker, table_data, (void *)(table_data->data + mcfg_start), -"MCFG" , table_data->len - mcfg_start,1 ,NULL ,NULL ); +build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }/* GTDT */
PATCH v2 2/4 i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members
In reply to Wei YangThis is obvious the member in AcpiMcfgInfo describe MCFG's property.
Remove the mcfg_ prefix.
--- hw/i386/acpi-build.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
hw/i386/acpi-build.c +7 -7
@@ -87,8 +87,8 @@#define ACPI_BUILD_IOAPIC_ID 0x0typedef struct AcpiMcfgInfo { -uint64_t mcfg_base; -uint32_t mcfg_size; +uint64_t base; +uint32_t size; }AcpiMcfgInfo ; typedef struct AcpiPmInfo {
@@ -2404,11 +2404,11 @@ build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info)int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->mcfg_base); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base);/* Only a single allocation so no need to play with segments */ mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->mcfg_size -1 ); + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 );build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }
@@ -2577,15 +2577,15 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)if (!o) {return false; } - mcfg->mcfg_base =qnum_get_uint (qobject_to (QNum, o)); + mcfg->base =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o); -if (mcfg->mcfg_base ==PCIE_BASE_ADDR_UNMAPPED ) { +if (mcfg->base ==PCIE_BASE_ADDR_UNMAPPED ) {return false; } o =object_property_get_qobject (pci_host,PCIE_HOST_MCFG_SIZE ,NULL );assert (o); - mcfg->mcfg_size =qnum_get_uint (qobject_to (QNum, o)); + mcfg->size =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o);return true; }
Signature · 1 line
2.19.1
Re: [Qemu-devel] [PATCH v2 2/4] i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members
Quoted 49 lines · Wei Yang
This is obvious the member in AcpiMcfgInfo describe MCFG's property.
Remove the
mcfg_prefix.Signed-off-by Wei Yang <[email protected]>Suggested-by Igor Mammedov <[email protected]>--- hw/i386/acpi-build.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)hw/i386/acpi-build.c +6
-6@@ -87,8 +87,8 @@#define ACPI_BUILD_IOAPIC_ID 0x0typedef struct AcpiMcfgInfo { -uint64_t mcfg_base; -uint32_t mcfg_size; +uint64_t base; +uint32_t size; }AcpiMcfgInfo ; typedef struct AcpiPmInfo {@@ -2404,11 +2404,11 @@ build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info)int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->mcfg_base); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base);/* Only a single allocation so no need to play with segments */ mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->mcfg_size -1 ); + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 );build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }@@ -2577,15 +2577,15 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)if (!o) {return false; } - mcfg->mcfg_base =qnum_get_uint (qobject_to (QNum, o)); + mcfg->base =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o); -if (mcfg->mcfg_base ==PCIE_BASE_ADDR_UNMAPPED ) { +if (mcfg->base ==PCIE_BASE_ADDR_UNMAPPED ) {
hw/i386/acpi-build.c static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) · line 2591
Quoted 10 lines
hw/i386/acpi-build.c +1
-1return false; } o =object_property_get_qobject (pci_host,PCIE_HOST_MCFG_SIZE ,NULL );assert (o); - mcfg->mcfg_size =qnum_get_uint (qobject_to (QNum, o)); + mcfg->size =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o);return true; }
Re: [Qemu-arm] [PATCH v2 2/4] i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members
In reply to Wei YangQuoted 6 lines · On Mon, 15 Apr 2019 15:03:05 +0800 Wei Yang <[email protected]>…
This is obvious the member in AcpiMcfgInfo describe MCFG's property.
Remove the
mcfg_prefix.Signed-off-by Wei Yang <[email protected]>Suggested-by Igor Mammedov <[email protected]>
Quoted 52 lines
--- hw/i386/acpi-build.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)hw/i386/acpi-build.c +7
-7@@ -87,8 +87,8 @@#define ACPI_BUILD_IOAPIC_ID 0x0typedef struct AcpiMcfgInfo { -uint64_t mcfg_base; -uint32_t mcfg_size; +uint64_t base; +uint32_t size; }AcpiMcfgInfo ; typedef struct AcpiPmInfo {@@ -2404,11 +2404,11 @@ build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info)int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->mcfg_base); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base);/* Only a single allocation so no need to play with segments */ mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->mcfg_size -1 ); + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 );build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }@@ -2577,15 +2577,15 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)if (!o) {return false; } - mcfg->mcfg_base =qnum_get_uint (qobject_to (QNum, o)); + mcfg->base =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o); -if (mcfg->mcfg_base ==PCIE_BASE_ADDR_UNMAPPED ) { +if (mcfg->base ==PCIE_BASE_ADDR_UNMAPPED ) {return false; } o =object_property_get_qobject (pci_host,PCIE_HOST_MCFG_SIZE ,NULL );assert (o); - mcfg->mcfg_size =qnum_get_uint (qobject_to (QNum, o)); + mcfg->size =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o);return true; }
PATCH v2 3/4 hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg()
In reply to Wei YangTo build MCFG, two information is necessary:
* bus number
* base address
Abstract these two information to AcpiMcfgInfo so that build_mcfg and build_mcfg_q35 will have the same declaration.
---
v2:
* for arm platform, construct a AcpiMcfgInfo directly
--- hw/arm/virt-acpi-build.c | 17 ++++++++++------- hw/i386/acpi-build.c | 5 ----- include/hw/acpi/aml-build.h | 5 +++++ 3 files changed, 15 insertions(+), 12 deletions(-)
hw/arm/virt-acpi-build.c +10 -7
@@ -546,21 +546,18 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }static void -build_mcfg (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) +build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) {AcpiTableMcfg *mcfg; -const MemMapEntry *memmap = vms->memmap; -int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam);int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (memmap[ecam_id].base); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base);/* Only a single allocation so no need to play with segments */ mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number = -PCIE_MMCFG_BUS (memmap[ecam_id].size -1 ); + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 );build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }
@@ -801,7 +798,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_gtdt (tables_blob, tables->linker, vms);acpi_add_table (table_offsets, tables_blob); -build_mcfg (tables_blob, tables->linker, vms); + { +AcpiMcfgInfo mcfg = { + .base = vms->memmap[VIRT_ECAM_ID (vms->highmem_ecam)].base, + .size = vms->memmap[VIRT_ECAM_ID (vms->highmem_ecam)].size, + }; +build_mcfg (tables_blob, tables->linker, &mcfg); + }acpi_add_table (table_offsets, tables_blob);build_spcr (tables_blob, tables->linker, vms);
hw/i386/acpi-build.c +0 -5
@@ -86,11 +86,6 @@/* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 -typedef struct AcpiMcfgInfo { -uint64_t base; -uint32_t size; -}AcpiMcfgInfo ; - typedef struct AcpiPmInfo { bool s3_disabled; bool s4_disabled;
include/hw/acpi/aml-build.h +5 -0
@@ -223,6 +223,11 @@ struct AcpiBuildTables {BIOSLinker *linker; } AcpiBuildTables; +typedef struct AcpiMcfgInfo { +uint64_t base; +uint32_t size; +}AcpiMcfgInfo ; +/** * init_aml_allocator: *
Signature · 1 line
2.19.1
Re: [Qemu-arm] [Qemu-devel] [PATCH v2 3/4] hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg()
Quoted 86 lines · Wei Yang
To build MCFG, two information is necessary:
* bus number
* base addressAbstract these two information to AcpiMcfgInfo so that
build_mcfgandbuild_mcfg_q35will have the same declaration.Signed-off-by Wei Yang <[email protected]>---
v2:
* for arm platform, construct a AcpiMcfgInfo directly--- hw/arm/virt-acpi-build.c | 17 ++++++++++------- hw/i386/acpi-build.c | 5 ----- include/hw/acpi/aml-build.h | 5 +++++ 3 files changed, 15 insertions(+), 12 deletions(-)hw/arm/virt-acpi-build.c +10
-7@@ -546,21 +546,18 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }static void -build_mcfg (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) +build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) {AcpiTableMcfg *mcfg; -const MemMapEntry *memmap = vms->memmap; -int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam);int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (memmap[ecam_id].base); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base);/* Only a single allocation so no need to play with segments */ mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number = -PCIE_MMCFG_BUS (memmap[ecam_id].size -1 ); + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 );build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }@@ -801,7 +798,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_gtdt (tables_blob, tables->linker, vms);acpi_add_table (table_offsets, tables_blob); -build_mcfg (tables_blob, tables->linker, vms); + { +AcpiMcfgInfo mcfg = { + .base = vms->memmap[VIRT_ECAM_ID (vms->highmem_ecam)].base, + .size = vms->memmap[VIRT_ECAM_ID (vms->highmem_ecam)].size, + }; +build_mcfg (tables_blob, tables->linker, &mcfg); + }acpi_add_table (table_offsets, tables_blob);build_spcr (tables_blob, tables->linker, vms);hw/i386/acpi-build.c +0
-5@@ -86,11 +86,6 @@/* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 -typedef struct AcpiMcfgInfo { -uint64_t base; -uint32_t size; -}AcpiMcfgInfo ; - typedef struct AcpiPmInfo { bool s3_disabled; bool s4_disabled;include/hw/acpi/aml-build.h +0
-0@@ -223,6 +223,11 @@ struct AcpiBuildTables {BIOSLinker *linker;
include/hw/acpi/aml-build.h struct AcpiBuildTables { · line 233
Quoted 10 lines
include/hw/acpi/aml-build.h +5
-0} AcpiBuildTables; +typedef struct AcpiMcfgInfo { +uint64_t base; +uint32_t size; +}AcpiMcfgInfo ; +/** * init_aml_allocator: *
Re: [Qemu-arm] [PATCH v2 3/4] hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg()
In reply to Wei YangQuoted 84 lines · On Mon, 15 Apr 2019 15:03:06 +0800 Wei Yang <[email protected]>…
To build MCFG, two information is necessary:
* bus number
* base addressAbstract these two information to AcpiMcfgInfo so that
build_mcfgandbuild_mcfg_q35will have the same declaration.Signed-off-by Wei Yang <[email protected]>---
v2:
* for arm platform, construct a AcpiMcfgInfo directly--- hw/arm/virt-acpi-build.c | 17 ++++++++++------- hw/i386/acpi-build.c | 5 ----- include/hw/acpi/aml-build.h | 5 +++++ 3 files changed, 15 insertions(+), 12 deletions(-)hw/arm/virt-acpi-build.c +10
-7@@ -546,21 +546,18 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }static void -build_mcfg (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) +build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) {AcpiTableMcfg *mcfg; -const MemMapEntry *memmap = vms->memmap; -int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam);int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (memmap[ecam_id].base); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base);/* Only a single allocation so no need to play with segments */ mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number = -PCIE_MMCFG_BUS (memmap[ecam_id].size -1 ); + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 );build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }@@ -801,7 +798,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_gtdt (tables_blob, tables->linker, vms);acpi_add_table (table_offsets, tables_blob); -build_mcfg (tables_blob, tables->linker, vms); + { +AcpiMcfgInfo mcfg = { + .base = vms->memmap[VIRT_ECAM_ID (vms->highmem_ecam)].base, + .size = vms->memmap[VIRT_ECAM_ID (vms->highmem_ecam)].size, + }; +build_mcfg (tables_blob, tables->linker, &mcfg); + }acpi_add_table (table_offsets, tables_blob);build_spcr (tables_blob, tables->linker, vms);hw/i386/acpi-build.c +0
-5@@ -86,11 +86,6 @@/* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 -typedef struct AcpiMcfgInfo { -uint64_t base; -uint32_t size; -}AcpiMcfgInfo ; - typedef struct AcpiPmInfo { bool s3_disabled; bool s4_disabled;include/hw/acpi/aml-build.h +0
-0
include/hw/acpi/aml-build.h struct AcpiBuildTables { · line 229
Quoted 7 lines
include/hw/acpi/aml-build.h +4
-0@@ -223,6 +223,11 @@ struct AcpiBuildTables {BIOSLinker *linker; } AcpiBuildTables; +typedef struct AcpiMcfgInfo { +uint64_t base; +uint32_t size; +}AcpiMcfgInfo ;
this one should go to new acpi/pci.h
Quoted 4 lines
include/hw/acpi/aml-build.h +1
-0+/** * init_aml_allocator: *
PATCH v2 4/4 hw/acpi: Extract build_mcfg to pci.c
In reply to Wei YangNow we have two identical build_mcfg function.
Extract them to pci.c.
---
v2:
* put it to dedicated file pci.c
--- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + hw/acpi/Kconfig | 4 +++ hw/acpi/Makefile.objs | 1 + hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 18 +------------ hw/i386/acpi-build.c | 19 ++----------- include/hw/acpi/pci.h | 5 ++++ 8 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 hw/acpi/pci.c create mode 100644 include/hw/acpi/pci.h
default-configs/arm-softmmu.mak +1 -0
@@ -144,6 +144,7 @@ CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y CONFIG_ACPI=y +CONFIG_ACPI_PCI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=y
default-configs/i386-softmmu.mak +1 -0
@@ -25,3 +25,4 @@ CONFIG_ISAPC=y CONFIG_I440FX=y CONFIG_Q35=y +CONFIG_ACPI_PCI=y
hw/acpi/Kconfig +4 -0
@@ -23,6 +23,10 @@ config ACPI_NVDIMM bool depends on ACPI +config ACPI_PCI + bool + depends on ACPI + config ACPI_VMGENID bool default y
hw/acpi/Makefile.objs +1 -0
@@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o common-obj-y += acpi_interface.o common-obj-y += bios-linker-loader.o common-obj-y += aml-build.o utils.o +common-obj-$(CONFIG_ACPI_PCI) += pci.o common-obj-$(CONFIG_TPM) += tpm.o common-obj-$(CONFIG_IPMI) += ipmi.o
hw/acpi/pci.c new file +46 -0
46 lines not on this page · raw message
hw/arm/virt-acpi-build.c +1 -17
@@ -40,6 +40,7 @@#include "hw/hw.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/arm/virt.h"
@@ -545,23 +546,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) "SRAT", table_data->len - srat_start, 3, NULL, NULL); } -static void -build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); - -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* GTDT */ static void build_gtdt (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms)
hw/i386/acpi-build.c +2 -17
@@ -58,6 +58,7 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "qom/qom-qobject.h" #include "hw/i386/amd_iommu.h"
@@ -2392,22 +2393,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) table_data->len - srat_start, 1, NULL, NULL); } -static void -build_mcfg_q35 (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* * VT-d spec 8.1 DMA Remapping Reporting Structure * (version Oct. 2014 or later)
@@ -2677,7 +2662,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) }if (acpi_get_mcfg (&mcfg)) {acpi_add_table (table_offsets, tables_blob); -build_mcfg_q35 (tables_blob, tables->linker, &mcfg); +build_mcfg (tables_blob, tables->linker, &mcfg); }if (x86_iommu_get_default ()) {IommuType IOMMUType =x86_iommu_get_type ();
include/hw/acpi/pci.h new file +5 -0
@@ -0,0 +1,5 @@ +#ifndef HW_ACPI_PCI_H +#define HW_ACPI_PCI_H + +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info); +#endif
Signature · 1 line
2.19.1
Re: [Qemu-arm] [Qemu-devel] [PATCH v2 4/4] hw/acpi: Extract build_mcfg to pci.c
Hi Wei,
Quoted 90 lines · Wei Yang
Now we have two identical
build_mcfgfunction.Extract them to
pci.c.Signed-off-by Wei Yang <[email protected]>---
v2:
* put it to dedicated filepci.c--- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + hw/acpi/Kconfig | 4 +++ hw/acpi/Makefile.objs | 1 + hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 18 +------------ hw/i386/acpi-build.c | 19 ++----------- include/hw/acpi/pci.h | 5 ++++ 8 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 hw/acpi/pci.c create mode 100644 include/hw/acpi/pci.hdefault-configs/arm-softmmu.mak +1
-0@@ -144,6 +144,7 @@ CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y CONFIG_ACPI=y +CONFIG_ACPI_PCI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=ydefault-configs/i386-softmmu.mak +1
-0@@ -25,3 +25,4 @@ CONFIG_ISAPC=y CONFIG_I440FX=y CONFIG_Q35=y +CONFIG_ACPI_PCI=yhw/acpi/Kconfig +4
-0@@ -23,6 +23,10 @@ config ACPI_NVDIMM bool depends on ACPI +config ACPI_PCI + bool + depends on ACPI + config ACPI_VMGENID bool default yhw/acpi/Makefile.objs +1
-0@@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o common-obj-y += acpi_interface.o common-obj-y += bios-linker-loader.o common-obj-y += aml-build.o utils.o +common-obj-$(CONFIG_ACPI_PCI) += pci.o common-obj-$(CONFIG_TPM) += tpm.o common-obj-$(CONFIG_IPMI) += ipmi.ohw/acpi/pci.c new file +14
-0@@ -0,0 +1,46 @@ +/* +* Support for generating PCI related ACPI tables and passing them to Guests +* +* Copyright (C) 2006 Fabrice Bellard +* Copyright (C) 2008-2010 Kevin O'Connor <[email protected]> +* Copyright (C) 2013-2019 Red Hat Inc +* Copyright (C) 2019 Intel Corporation +* +* Author: Wei Yang <[email protected]> +* Author: Michael S. Tsirkin <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or
hw/acpi/pci.c line 24
Quoted 10 lines
hw/acpi/pci.c new file +10
-0+* (at your option) any later version. + +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. + +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/
Here you correctly added the copyright boilerplate, ...
Quoted 108 lines
hw/acpi/pci.c new file +22
-0+ +#include "qemu/osdep.h" +#include "hw/acpi/aml-build.h" +#include "hw/acpi/pci.h" +#include "hw/pci/pcie_host.h" + +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) +{ +AcpiTableMcfg *mcfg; +int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); + + mcfg =acpi_data_push (table_data, len); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base); + +/* Only a single allocation so no need to play with segments */ + mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); + mcfg->allocation[0 ].start_bus_number =0 ; + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); + +build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); +} +hw/arm/virt-acpi-build.c +1
-17@@ -40,6 +40,7 @@#include "hw/hw.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/arm/virt.h" @@ -545,23 +546,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) "SRAT", table_data->len - srat_start, 3, NULL, NULL); } -static void -build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); - -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* GTDT */ static void build_gtdt (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms)hw/i386/acpi-build.c +2
-17@@ -58,6 +58,7 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "qom/qom-qobject.h" #include "hw/i386/amd_iommu.h" @@ -2392,22 +2393,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) table_data->len - srat_start, 1, NULL, NULL); } -static void -build_mcfg_q35 (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* * VT-d spec 8.1 DMA Remapping Reporting Structure * (version Oct. 2014 or later) @@ -2677,7 +2662,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) }if (acpi_get_mcfg (&mcfg)) {acpi_add_table (table_offsets, tables_blob); -build_mcfg_q35 (tables_blob, tables->linker, &mcfg); +build_mcfg (tables_blob, tables->linker, &mcfg); }if (x86_iommu_get_default ()) {IommuType IOMMUType =x86_iommu_get_type ();include/hw/acpi/pci.h new file +0
-0
include/hw/acpi/pci.h line 2
Quoted 2 lines
include/hw/acpi/pci.h new file +2
-0@@ -0,0 +1,5 @@ +#ifndef HW_ACPI_PCI_H +#define HW_ACPI_PCI_H
But here you missed it :(
include/hw/acpi/pci.h line 5
Quoted 4 lines
include/hw/acpi/pci.h new file +3
-0+ +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info); +#endif
With the same copyright notice in the header:
Regards,
Phil.
Re: [Qemu-devel] [PATCH v2 4/4] hw/acpi: Extract build_mcfg to pci.c
Quoted 210 lines · Philippe Mathieu-Daud??
Hi Wei,
Quoted 90 lines · Wei Yang
Now we have two identical
build_mcfgfunction.Extract them to
pci.c.Signed-off-by Wei Yang <[email protected]>---
v2:
* put it to dedicated filepci.c--- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + hw/acpi/Kconfig | 4 +++ hw/acpi/Makefile.objs | 1 + hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 18 +------------ hw/i386/acpi-build.c | 19 ++----------- include/hw/acpi/pci.h | 5 ++++ 8 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 hw/acpi/pci.c create mode 100644 include/hw/acpi/pci.hdefault-configs/arm-softmmu.mak +1
-0@@ -144,6 +144,7 @@ CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y CONFIG_ACPI=y +CONFIG_ACPI_PCI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=ydefault-configs/i386-softmmu.mak +1
-0@@ -25,3 +25,4 @@ CONFIG_ISAPC=y CONFIG_I440FX=y CONFIG_Q35=y +CONFIG_ACPI_PCI=yhw/acpi/Kconfig +4
-0@@ -23,6 +23,10 @@ config ACPI_NVDIMM bool depends on ACPI +config ACPI_PCI + bool + depends on ACPI + config ACPI_VMGENID bool default yhw/acpi/Makefile.objs +1
-0@@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o common-obj-y += acpi_interface.o common-obj-y += bios-linker-loader.o common-obj-y += aml-build.o utils.o +common-obj-$(CONFIG_ACPI_PCI) += pci.o common-obj-$(CONFIG_TPM) += tpm.o common-obj-$(CONFIG_IPMI) += ipmi.ohw/acpi/pci.c new file +14
-0@@ -0,0 +1,46 @@ +/* +* Support for generating PCI related ACPI tables and passing them to Guests +* +* Copyright (C) 2006 Fabrice Bellard +* Copyright (C) 2008-2010 Kevin O'Connor <[email protected]> +* Copyright (C) 2013-2019 Red Hat Inc +* Copyright (C) 2019 Intel Corporation +* +* Author: Wei Yang <[email protected]> +* Author: Michael S. Tsirkin <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or hw/acpi/pci.c line 24
Quoted 10 lines
hw/acpi/pci.c new file +10
-0+* (at your option) any later version. + +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. + +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/ Here you correctly added the copyright boilerplate, ...
Quoted 104 lines
hw/acpi/pci.c new file +22
-0+ +#include "qemu/osdep.h" +#include "hw/acpi/aml-build.h" +#include "hw/acpi/pci.h" +#include "hw/pci/pcie_host.h" + +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) +{ +AcpiTableMcfg *mcfg; +int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); + + mcfg =acpi_data_push (table_data, len); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base); + +/* Only a single allocation so no need to play with segments */ + mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); + mcfg->allocation[0 ].start_bus_number =0 ; + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); + +build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); +} +hw/arm/virt-acpi-build.c +1
-17@@ -40,6 +40,7 @@#include "hw/hw.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/arm/virt.h" @@ -545,23 +546,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) "SRAT", table_data->len - srat_start, 3, NULL, NULL); } -static void -build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); - -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* GTDT */ static void build_gtdt (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms)hw/i386/acpi-build.c +2
-17@@ -58,6 +58,7 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "qom/qom-qobject.h" #include "hw/i386/amd_iommu.h" @@ -2392,22 +2393,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) table_data->len - srat_start, 1, NULL, NULL); } -static void -build_mcfg_q35 (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* * VT-d spec 8.1 DMA Remapping Reporting Structure * (version Oct. 2014 or later) @@ -2677,7 +2662,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) }if (acpi_get_mcfg (&mcfg)) {acpi_add_table (table_offsets, tables_blob); -build_mcfg_q35 (tables_blob, tables->linker, &mcfg); +build_mcfg (tables_blob, tables->linker, &mcfg); }if (x86_iommu_get_default ()) {IommuType IOMMUType =x86_iommu_get_type ();include/hw/acpi/pci.h new file +0
-0
Quoted 9 lines
include/hw/acpi/pci.h line 2
Quoted 6 lines
index 0000000000..6f94ac4926
include/hw/acpi/pci.h new file +2
-0@@ -0,0 +1,5 @@ +#ifndef HW_ACPI_PCI_H +#define HW_ACPI_PCI_H But here you missed it :(
Ah, ok, I will add the copyright. Thanks :-)
Quoted 11 lines
include/hw/acpi/pci.h line 5
Quoted 4 lines
include/hw/acpi/pci.h new file +3
-0+ +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info); +#endif With the same copyright notice in the header:
Reviewed-by Philippe Mathieu-Daud?? <[email protected]>Regards,
Phil.
Signature · 2 lines
Wei Yang Help you, Help me
Re: [Qemu-arm] [PATCH v2 4/4] hw/acpi: Extract build_mcfg to pci.c
In reply to Wei YangQuoted 1 line · On Mon, 15 Apr 2019 15:03:07 +0800 Wei Yang <[email protected]>…
Now we have two identical
build_mcfgfunction.
s/function./functions,/
Quoted 2 lines
Extract them to
pci.c.
s|.*|consolidate them in acpi/pci.c|
Quoted 2 lines
Signed-off-by Wei Yang <[email protected]>
with above and Philippe's comment addressed
Quoted 208 lines
---
v2:
* put it to dedicated filepci.c--- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + hw/acpi/Kconfig | 4 +++ hw/acpi/Makefile.objs | 1 + hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 18 +------------ hw/i386/acpi-build.c | 19 ++----------- include/hw/acpi/pci.h | 5 ++++ 8 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 hw/acpi/pci.c create mode 100644 include/hw/acpi/pci.hdefault-configs/arm-softmmu.mak +1
-0@@ -144,6 +144,7 @@ CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y CONFIG_ACPI=y +CONFIG_ACPI_PCI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=ydefault-configs/i386-softmmu.mak +1
-0@@ -25,3 +25,4 @@ CONFIG_ISAPC=y CONFIG_I440FX=y CONFIG_Q35=y +CONFIG_ACPI_PCI=yhw/acpi/Kconfig +4
-0@@ -23,6 +23,10 @@ config ACPI_NVDIMM bool depends on ACPI +config ACPI_PCI + bool + depends on ACPI + config ACPI_VMGENID bool default yhw/acpi/Makefile.objs +1
-0@@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o common-obj-y += acpi_interface.o common-obj-y += bios-linker-loader.o common-obj-y += aml-build.o utils.o +common-obj-$(CONFIG_ACPI_PCI) += pci.o common-obj-$(CONFIG_TPM) += tpm.o common-obj-$(CONFIG_IPMI) += ipmi.ohw/acpi/pci.c new file +46
-0@@ -0,0 +1,46 @@ +/* +* Support for generating PCI related ACPI tables and passing them to Guests +* +* Copyright (C) 2006 Fabrice Bellard +* Copyright (C) 2008-2010 Kevin O'Connor <[email protected]> +* Copyright (C) 2013-2019 Red Hat Inc +* Copyright (C) 2019 Intel Corporation +* +* Author: Wei Yang <[email protected]> +* Author: Michael S. Tsirkin <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. + +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. + +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "hw/acpi/aml-build.h" +#include "hw/acpi/pci.h" +#include "hw/pci/pcie_host.h" + +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) +{ +AcpiTableMcfg *mcfg; +int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); + + mcfg =acpi_data_push (table_data, len); + mcfg->allocation[0 ].address =cpu_to_le64 (info->base); + +/* Only a single allocation so no need to play with segments */ + mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); + mcfg->allocation[0 ].start_bus_number =0 ; + mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); + +build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); +} +hw/arm/virt-acpi-build.c +1
-17@@ -40,6 +40,7 @@#include "hw/hw.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/arm/virt.h" @@ -545,23 +546,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) "SRAT", table_data->len - srat_start, 3, NULL, NULL); } -static void -build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); - -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* GTDT */ static void build_gtdt (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms)hw/i386/acpi-build.c +2
-17@@ -58,6 +58,7 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" +#include "hw/acpi/pci.h" #include "qom/qom-qobject.h" #include "hw/i386/amd_iommu.h" @@ -2392,22 +2393,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) table_data->len - srat_start, 1, NULL, NULL); } -static void -build_mcfg_q35 (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) -{ -AcpiTableMcfg *mcfg; -int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); - - mcfg =acpi_data_push (table_data, len); - mcfg->allocation[0 ].address =cpu_to_le64 (info->base); -/* Only a single allocation so no need to play with segments */ - mcfg->allocation[0 ].pci_segment =cpu_to_le16 (0 ); - mcfg->allocation[0 ].start_bus_number =0 ; - mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->size -1 ); - -build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); -} -/* * VT-d spec 8.1 DMA Remapping Reporting Structure * (version Oct. 2014 or later) @@ -2677,7 +2662,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) }if (acpi_get_mcfg (&mcfg)) {acpi_add_table (table_offsets, tables_blob); -build_mcfg_q35 (tables_blob, tables->linker, &mcfg); +build_mcfg (tables_blob, tables->linker, &mcfg); }if (x86_iommu_get_default ()) {IommuType IOMMUType =x86_iommu_get_type ();include/hw/acpi/pci.h new file +5
-0@@ -0,0 +1,5 @@ +#ifndef HW_ACPI_PCI_H +#define HW_ACPI_PCI_H + +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info); +#endif
Quoted 1 line · On Mon, 15 Apr 2019 15:03:03 +0800 Wei Yang <[email protected]>…
This patch set tries to generalize MCFG table build process.
1.
series should reference not merged dependency if any exists. in this case "[PATCH for-4.1] q35: acpi: do not create dummy MCFG table" or as alternative include and repost that patch as part of the series.
if you'd do the later then add your SoB last when you are reposting it.
2. series is not finished without converting build_mcfg() to build_append_int_noprefix() API
Quoted 19 lines
Wei Yang (4):
hw/arm/virt-acpi-build: remove unnecessary variablemcfg_starti386, acpi: removemcfg_prefix in AcpiMcfgInfo members hw/arm/virt-acpi-build: pass AcpiMcfgInfo tobuild_mcfg()hw/acpi: Extractbuild_mcfgtopci.cdefault-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + hw/acpi/Kconfig | 4 +++ hw/acpi/Makefile.objs | 1 + hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 31 ++++++--------------- hw/i386/acpi-build.c | 30 ++++----------------- include/hw/acpi/aml-build.h | 5 ++++ include/hw/acpi/pci.h | 5 ++++ 9 files changed, 76 insertions(+), 48 deletions(-) create mode 100644 hw/acpi/pci.c create mode 100644 include/hw/acpi/pci.h