* [Qemu-devel] [PATCH v2] acpi: pci: use build_append_foo() API to construct MCFG
@ 2019-05-17 0:43 Wei Yang
2019-05-17 11:05 ` Igor Mammedov
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yang @ 2019-05-17 0:43 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: yang.zhong, peter.maydell, mst, shannon.zhaosl, Wei Yang,
imammedo, philmd
build_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.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Suggested-by: Igor Mammedov <imammedo@redhat.com>
---
v2:
* miss the reserved[8] of MCFG in last version, add it back
* drop SOBs and make sure bios-tables-test all OK
---
hw/acpi/pci.c | 35 +++++++++++++++++++++++------------
include/hw/acpi/acpi-defs.h | 18 ------------------
2 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
index fa0fa30bb9..49df7b7d54 100644
--- a/hw/acpi/pci.c
+++ b/hw/acpi/pci.c
@@ -30,17 +30,28 @@
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 Firmware Specification, Revision 3.0
+ * 4.1.2 MCFG Table Description.
+ */
+ /* Reserved */
+ build_append_int_noprefix(table_data, 0, 8);
+ /* 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);
}
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index f9aa4bd398..57a3f58b0c 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
*
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v2] acpi: pci: use build_append_foo() API to construct MCFG
2019-05-17 0:43 [Qemu-devel] [PATCH v2] acpi: pci: use build_append_foo() API to construct MCFG Wei Yang
@ 2019-05-17 11:05 ` Igor Mammedov
0 siblings, 0 replies; 2+ messages in thread
From: Igor Mammedov @ 2019-05-17 11:05 UTC (permalink / raw)
To: Wei Yang
Cc: yang.zhong, peter.maydell, mst, qemu-devel, shannon.zhaosl,
qemu-arm, philmd
On Fri, 17 May 2019 08:43:24 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> build_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.
>
> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
> Suggested-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
>
> ---
> v2:
> * miss the reserved[8] of MCFG in last version, add it back
> * drop SOBs and make sure bios-tables-test all OK
> ---
> hw/acpi/pci.c | 35 +++++++++++++++++++++++------------
> include/hw/acpi/acpi-defs.h | 18 ------------------
> 2 files changed, 23 insertions(+), 30 deletions(-)
>
> diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
> index fa0fa30bb9..49df7b7d54 100644
> --- a/hw/acpi/pci.c
> +++ b/hw/acpi/pci.c
> @@ -30,17 +30,28 @@
>
> 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 Firmware Specification, Revision 3.0
> + * 4.1.2 MCFG Table Description.
> + */
> + /* Reserved */
> + build_append_int_noprefix(table_data, 0, 8);
> + /* 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);
> }
>
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index f9aa4bd398..57a3f58b0c 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
> *
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-17 11:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-17 0:43 [Qemu-devel] [PATCH v2] acpi: pci: use build_append_foo() API to construct MCFG Wei Yang
2019-05-17 11:05 ` Igor Mammedov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.