Extract build_mcfg
v3 cover Extract build_mcfg
This patch set tries to generalize MCFG table build process. And it is based on one un-merged patch from Igor, which is included in this serials.
v2->v3:
* Includes the un-merged patch from Igor
* use build_append_foo() API to construct MCFG
Igor Mammedov (1):
q35: acpi: do not create dummy MCFG table
Wei Yang (5):
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
acpi: pci: use build_append_foo() API to construct MCFG
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 | 52 ++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 31 +++++-------------- hw/i386/acpi-build.c | 44 +++++---------------------- include/hw/acpi/acpi-defs.h | 18 ----------- include/hw/acpi/pci.h | 34 +++++++++++++++++++++ 9 files changed, 108 insertions(+), 78 deletions(-) create mode 100644 hw/acpi/pci.c create mode 100644 include/hw/acpi/pci.h
Signature · 1 line
2.19.1
PATCH v3 1/6 q35: acpi: do not create dummy MCFG table
From: Igor Mammedov <[email protected]>
Dummy table (with signature "QEMU") creation came from original SeaBIOS codebase. And QEMU would have to keep it around if there were Q35 machine that depended on keeping ACPI tables blob constant size. Luckily there were no versioned Q35 machine types before commit:
(since 2.3) a1666142db acpi-build: make ROMs RAM blocks resizeable
which obsoleted need to keep ACPI tables blob the same size on source/destination.
Considering the 1st versioned machine is pc-q35-2.4, the dummy table is not really necessary and it's safe to drop it without breaking cross version migration in both directions unconditionally.
--- hw/i386/acpi-build.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
hw/i386/acpi-build.c +4 -14
@@ -2401,7 +2401,6 @@ static void build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) {AcpiTableMcfg *mcfg; -const char *sig;int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len);
@@ -2411,19 +2410,7 @@ build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) mcfg->allocation[0 ].start_bus_number =0 ; mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->mcfg_size -1 ); -/* MCFG is used for ECAM which can be enabled or disabled by guest. -* To avoid table size changes (which create migration issues), -* always create the table even if there are no allocations, -* but set the signature to a reserved value in this case. -* ACPI spec requires OSPMs to ignore such tables. -*/ -if (info->mcfg_base ==PCIE_BASE_ADDR_UNMAPPED ) { -/* Reserved signature: ignored by OSPM */ - sig ="QEMU" ; - }else { - sig ="MCFG" ; - } -build_header (linker, table_data, (void *)mcfg, sig, len,1 ,NULL ,NULL ); +build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }/*
@@ -2592,6 +2579,9 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) } mcfg->mcfg_base =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o); +if (mcfg->mcfg_base ==PCIE_BASE_ADDR_UNMAPPED ) { +return false; + } o =object_property_get_qobject (pci_host,PCIE_HOST_MCFG_SIZE ,NULL );assert (o);
Signature · 1 line
2.19.1
Re: [Qemu-arm] [PATCH v3 1/6] q35: acpi: do not create dummy MCFG table
Quoted 54 lines · Wei Yang
From: Igor Mammedov <[email protected]>
Dummy table (with signature "QEMU") creation came from original SeaBIOS codebase. And QEMU would have to keep it around if there were Q35 machine that depended on keeping ACPI tables blob constant size. Luckily there were no versioned Q35 machine types before commit:
(since 2.3)a1666142dbacpi-build: make ROMs RAM blocks resizeable
which obsoleted need to keep ACPI tables blob the same size on source/destination.Considering the 1st versioned machine is pc-q35-2.4, the dummy table is not really necessary and it's safe to drop it without breaking cross version migration in both directions unconditionally.
Signed-off-by Igor Mammedov <[email protected]>Signed-off-by Wei Yang <[email protected]>--- hw/i386/acpi-build.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)hw/i386/acpi-build.c +1
-14@@ -2401,7 +2401,6 @@ static void build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) {AcpiTableMcfg *mcfg; -const char *sig;int len =sizeof (*mcfg) +1 *sizeof (mcfg->allocation[0 ]); mcfg =acpi_data_push (table_data, len);@@ -2411,19 +2410,7 @@ build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) mcfg->allocation[0 ].start_bus_number =0 ; mcfg->allocation[0 ].end_bus_number =PCIE_MMCFG_BUS (info->mcfg_size -1 ); -/* MCFG is used for ECAM which can be enabled or disabled by guest. -* To avoid table size changes (which create migration issues), -* always create the table even if there are no allocations, -* but set the signature to a reserved value in this case. -* ACPI spec requires OSPMs to ignore such tables. -*/ -if (info->mcfg_base ==PCIE_BASE_ADDR_UNMAPPED ) { -/* Reserved signature: ignored by OSPM */ - sig ="QEMU" ; - }else { - sig ="MCFG" ; - } -build_header (linker, table_data, (void *)mcfg, sig, len,1 ,NULL ,NULL ); +build_header (linker, table_data, (void *)mcfg,"MCFG" , len,1 ,NULL ,NULL ); }/*
hw/i386/acpi-build.c static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) · line 2587
Quoted 9 lines
hw/i386/acpi-build.c +3
-0@@ -2592,6 +2579,9 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) } mcfg->mcfg_base =qnum_get_uint (qobject_to (QNum, o));qobject_unref (o); +if (mcfg->mcfg_base ==PCIE_BASE_ADDR_UNMAPPED ) { +return false; + } o =object_property_get_qobject (pci_host,PCIE_HOST_MCFG_SIZE ,NULL );assert (o);
PATCH v3 2/6 hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start
In reply to Wei Yangmcfg_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
PATCH v3 3/6 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
PATCH v3 4/6 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.
---
v3:
* move AcpiMcfgInfo to pci.h
v2:
* for arm platform, construct a AcpiMcfgInfo directly
--- hw/arm/virt-acpi-build.c | 18 +++++++++++------- hw/i386/acpi-build.c | 6 +----- include/hw/acpi/pci.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 include/hw/acpi/pci.h
hw/arm/virt-acpi-build.c +11 -7
@@ -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"
@@ -546,21 +547,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 +799,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 +1 -5
@@ -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"
@@ -86,11 +87,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/pci.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* 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/>. +*/ +#ifndef HW_ACPI_PCI_H +#define HW_ACPI_PCI_H + +typedef struct AcpiMcfgInfo { +uint64_t base; +uint32_t size; +}AcpiMcfgInfo ; + +#endif
Signature · 1 line
2.19.1
Re: [Qemu-arm] [PATCH v3 4/6] hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg()
Quoted 10 lines · On Wed, 17 Apr 2019 09:40:36 +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]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 128 lines
---
v3:
* move AcpiMcfgInfo topci.h
v2:
* for arm platform, construct a AcpiMcfgInfo directly--- hw/arm/virt-acpi-build.c | 18 +++++++++++------- hw/i386/acpi-build.c | 6 +----- include/hw/acpi/pci.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 include/hw/acpi/pci.hhw/arm/virt-acpi-build.c +11
-7@@ -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" @@ -546,21 +547,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 +799,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 +1
-5@@ -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" @@ -86,11 +87,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/pci.h new file +33
-0@@ -0,0 +1,33 @@ +/* +* 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/>. +*/ +#ifndef HW_ACPI_PCI_H +#define HW_ACPI_PCI_H + +typedef struct AcpiMcfgInfo { +uint64_t base; +uint32_t size; +}AcpiMcfgInfo ; + +#endif
PATCH v3 5/6 hw/acpi: Consolidate build_mcfg to pci.c
In reply to Wei YangNow we have two identical build_mcfg functions.
Consolidate them in acpi/pci.c.
---
v3:
* adjust changelog based on Igor's suggestion
--- 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 | 17 ------------ hw/i386/acpi-build.c | 18 +------------ include/hw/acpi/pci.h | 1 + 8 files changed, 55 insertions(+), 34 deletions(-) create mode 100644 hw/acpi/pci.c
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 +0 -17
@@ -546,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 +1 -17
@@ -2393,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)
@@ -2678,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 +1 -0
@@ -30,4 +30,5 @@ typedef struct AcpiMcfgInfo { uint32_t size; } AcpiMcfgInfo; +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info);#endif
Signature · 1 line
2.19.1
PATCH v3 6/6 acpi: pci: use build_append_foo() API to construct MCFG
In reply to Wei Yangbuild_append_foo() API doesn't need explicit endianness conversions which eliminates a source of errors and it makes build_mcfg() look like declarative definition of MCFG table in ACPI spec, which makes it easy to review.
--- hw/acpi/pci.c | 30 ++++++++++++++++++------------ include/hw/acpi/acpi-defs.h | 18 ------------------ 2 files changed, 18 insertions(+), 30 deletions(-)
hw/acpi/pci.c +18 -12
@@ -30,17 +30,23 @@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 ); +int mcfg_start = table_data->len; + +acpi_data_push (table_data,sizeof (AcpiTableHeader)); + +/* PCI fw r3.0 MCFG table. */ +/* Base address, processor-relative */ +build_append_int_noprefix (table_data, info->base,8 ); +/* PCI segment group number */ +build_append_int_noprefix (table_data,0 ,2 ); +/* Starting PCI Bus number */ +build_append_int_noprefix (table_data,0 ,1 ); +/* Final PCI Bus number */ +build_append_int_noprefix (table_data,PCIE_MMCFG_BUS (info->size -1 ),1 ); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,4 ); + +build_header (linker, table_data, (void *)(table_data->data + mcfg_start), +"MCFG" , table_data->len - mcfg_start,1 ,NULL ,NULL ); }
include/hw/acpi/acpi-defs.h +0 -18
@@ -449,24 +449,6 @@ struct AcpiSratProcessorGiccAffinity {typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity ; -/* PCI fw r3.0 MCFG table. */ -/* Subtable */ -struct AcpiMcfgAllocation { -uint64_t address;/* Base address, processor-relative */ -uint16_t pci_segment;/* PCI segment group number */ -uint8_t start_bus_number;/* Starting PCI Bus number */ -uint8_t end_bus_number;/* Final PCI Bus number */ -uint32_t reserved; -}QEMU_PACKED ; -typedef struct AcpiMcfgAllocation AcpiMcfgAllocation ; - -struct AcpiTableMcfg { -ACPI_TABLE_HEADER_DEF ; -uint8_t reserved[8 ]; -AcpiMcfgAllocation allocation[0 ]; -}QEMU_PACKED ; -typedef struct AcpiTableMcfg AcpiTableMcfg ; -/* * TCPA Description Table *
Signature · 1 line
2.19.1
Re: [Qemu-devel] [PATCH v3 6/6] acpi: pci: use build_append_foo() API to construct MCFG
Quoted 7 lines · On Wed, 17 Apr 2019 09:40:38 +0800 Wei Yang <[email protected]>…
build_append_foo()API doesn't need explicit endianness conversions which eliminates a source of errors and it makesbuild_mcfg()look like declarative definition of MCFG table in ACPI spec, which makes it easy to review.Signed-off-by Wei Yang <[email protected]>Suggested-by Igor Mammedov <[email protected]>
Thanks for nice cleanup!
with comment fixed up:
Quoted 20 lines
--- hw/acpi/pci.c | 30 ++++++++++++++++++------------ include/hw/acpi/acpi-defs.h | 18 ------------------ 2 files changed, 18 insertions(+), 30 deletions(-)hw/acpi/pci.c +0
-7@@ -30,17 +30,23 @@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 */
hw/acpi/pci.c line 37
Quoted 10 lines
hw/acpi/pci.c +5
-5- 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 ); +int mcfg_start = table_data->len; + +acpi_data_push (table_data,sizeof (AcpiTableHeader)); + +/* PCI fw r3.0 MCFG table. */
It would be better to put spec name as is here so simple search could immediately point to it.
like: PCI Firmware Specification, Revision 3.0
4.1.2 MCFG Table Description
Quoted 44 lines
hw/acpi/pci.c +13
-0+/* Base address, processor-relative */ +build_append_int_noprefix (table_data, info->base,8 ); +/* PCI segment group number */ +build_append_int_noprefix (table_data,0 ,2 ); +/* Starting PCI Bus number */ +build_append_int_noprefix (table_data,0 ,1 ); +/* Final PCI Bus number */ +build_append_int_noprefix (table_data,PCIE_MMCFG_BUS (info->size -1 ),1 ); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,4 ); + +build_header (linker, table_data, (void *)(table_data->data + mcfg_start), +"MCFG" , table_data->len - mcfg_start,1 ,NULL ,NULL ); }include/hw/acpi/acpi-defs.h +0
-18@@ -449,24 +449,6 @@ struct AcpiSratProcessorGiccAffinity {typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity ; -/* PCI fw r3.0 MCFG table. */ -/* Subtable */ -struct AcpiMcfgAllocation { -uint64_t address;/* Base address, processor-relative */ -uint16_t pci_segment;/* PCI segment group number */ -uint8_t start_bus_number;/* Starting PCI Bus number */ -uint8_t end_bus_number;/* Final PCI Bus number */ -uint32_t reserved; -}QEMU_PACKED ; -typedef struct AcpiMcfgAllocation AcpiMcfgAllocation ; - -struct AcpiTableMcfg { -ACPI_TABLE_HEADER_DEF ; -uint8_t reserved[8 ]; -AcpiMcfgAllocation allocation[0 ]; -}QEMU_PACKED ; -typedef struct AcpiTableMcfg AcpiTableMcfg ; -/* * TCPA Description Table *
Philippe Mathieu-Daudé
Reviewed-byRe: [Qemu-arm] [PATCH v3 6/6] acpi: pci: use build_append_foo() API to construct MCFG
Quoted 48 lines · Igor Mammedov
Quoted 7 lines · On Wed, 17 Apr 2019 09:40:38 +0800 Wei Yang <[email protected]>…
build_append_foo()API doesn't need explicit endianness conversions which eliminates a source of errors and it makesbuild_mcfg()look like declarative definition of MCFG table in ACPI spec, which makes it easy to review.Signed-off-by Wei Yang <[email protected]>Suggested-by Igor Mammedov <[email protected]>Thanks for nice cleanup!
with comment fixed up:
Reviewed-by Igor Mammedov <[email protected]>Quoted 20 lines
--- hw/acpi/pci.c | 30 ++++++++++++++++++------------ include/hw/acpi/acpi-defs.h | 18 ------------------ 2 files changed, 18 insertions(+), 30 deletions(-)hw/acpi/pci.c +0
-7@@ -30,17 +30,23 @@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 */ hw/acpi/pci.c line 37
Quoted 10 lines
hw/acpi/pci.c +5
-5- 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 ); +int mcfg_start = table_data->len; + +acpi_data_push (table_data,sizeof (AcpiTableHeader)); + +/* PCI fw r3.0 MCFG table. */ It would be better to put spec name as is here so simple search could immediately point to it.
Quoted 2 lines
like: PCI Firmware Specification, Revision 3.0
4.1.2 MCFG Table Description
Quoted 45 lines
Quoted 44 lines
hw/acpi/pci.c +13
-0+/* Base address, processor-relative */ +build_append_int_noprefix (table_data, info->base,8 ); +/* PCI segment group number */ +build_append_int_noprefix (table_data,0 ,2 ); +/* Starting PCI Bus number */ +build_append_int_noprefix (table_data,0 ,1 ); +/* Final PCI Bus number */ +build_append_int_noprefix (table_data,PCIE_MMCFG_BUS (info->size -1 ),1 ); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,4 ); + +build_header (linker, table_data, (void *)(table_data->data + mcfg_start), +"MCFG" , table_data->len - mcfg_start,1 ,NULL ,NULL ); }include/hw/acpi/acpi-defs.h +0
-18@@ -449,24 +449,6 @@ struct AcpiSratProcessorGiccAffinity {typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity ; -/* PCI fw r3.0 MCFG table. */ -/* Subtable */ -struct AcpiMcfgAllocation { -uint64_t address;/* Base address, processor-relative */ -uint16_t pci_segment;/* PCI segment group number */ -uint8_t start_bus_number;/* Starting PCI Bus number */ -uint8_t end_bus_number;/* Final PCI Bus number */ -uint32_t reserved; -}QEMU_PACKED ; -typedef struct AcpiMcfgAllocation AcpiMcfgAllocation ; - -struct AcpiTableMcfg { -ACPI_TABLE_HEADER_DEF ; -uint8_t reserved[8 ]; -AcpiMcfgAllocation allocation[0 ]; -}QEMU_PACKED ; -typedef struct AcpiTableMcfg AcpiTableMcfg ; -/* * TCPA Description Table *
Re: [Qemu-arm] [Qemu-devel] [PATCH v3 6/6] acpi: pci: use build_append_foo() API to construct MCFG
In reply to Igor MammedovQuoted 11 lines · Igor Mammedov
Quoted 7 lines · On Wed, 17 Apr 2019 09:40:38 +0800 Wei Yang <[email protected]>…
build_append_foo()API doesn't need explicit endianness conversions which eliminates a source of errors and it makesbuild_mcfg()look like declarative definition of MCFG table in ACPI spec, which makes it easy to review.Signed-off-by Wei Yang <[email protected]>Suggested-by Igor Mammedov <[email protected]>Thanks for nice cleanup!
Glad you like it. :-)
Quoted 37 lines
with comment fixed up:
Reviewed-by Igor Mammedov <[email protected]>Quoted 20 lines
--- hw/acpi/pci.c | 30 ++++++++++++++++++------------ include/hw/acpi/acpi-defs.h | 18 ------------------ 2 files changed, 18 insertions(+), 30 deletions(-)hw/acpi/pci.c +0
-7@@ -30,17 +30,23 @@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 */ hw/acpi/pci.c line 37
Quoted 10 lines
hw/acpi/pci.c +5
-5- 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 ); +int mcfg_start = table_data->len; + +acpi_data_push (table_data,sizeof (AcpiTableHeader)); + +/* PCI fw r3.0 MCFG table. */ It would be better to put spec name as is here so simple search could immediately point to it.
Quoted 3 lines
like: PCI Firmware Specification, Revision 3.0
4.1.2 MCFG Table Description
Sure, will change to this.
Signature · 2 lines
Wei Yang Help you, Help me