pci_expander_brdige:acpi: Support pxb-pcie for ARM
v10 cover pci_expander_brdige:acpi: Support pxb-pcie for ARM
Changes with v9v9->v10:
Refactor patch2 to drop useless macros and variables. Split patch2 into two patches.
Changes with v8v8->v9:
Rebase to master
Changes with v7v7->v8:
Fix the error:no member named 'fw_cfg' in 'struct PCMachineState'
Changes with v6v6->v7:
Refactor fw_cfg_write_extra_pci_roots
Add API PCI_GET_PCIE_HOST_STATE
Fix typos
Changes with v5v5->v6: stat crs_range_insert in aml_build.h
Changes with v4v4->v5: Not using specific resources for PXB.
Instead, the resources for pxb are composed of the bar space of the pci-bridge/pcie-root-port behined it and the config space of devices behind it.
Only if the bios(uefi for arm) support multiple roots, configure space of devices behind pxbs could be obtained. The newest uefi work is updated for discussion by the following link:
https://edk2.groups.io/g/devel/topic/78135572#67173
[PATCH v2 0/4] Add extra pci roots support for Arm
Currently pxb-pcie is not supported by arm,
the reason for it is pxb-pcie is not described in DSDT table and only one main host bridge is described in acpi tables, which means it is not impossible to present different io numas for different devices.
This series of patches make arm to support PXB-PCIE.
Users can configure pxb-pcie with certain numa, Example command is:
-device pxb-pcie,id=pci.7,bus_nr=128,numa_node=0,bus=pcie.0,addr=0x9
Jiahui Cen (2):
fw_cfg: Refactor extra pci roots addition
hw/arm/virt: Write extra pci roots into fw_cfg
Yubo Miao (7):
acpi/gpex: Extract two APIs from acpi_dsdt_add_pci
acpi: Extract crs build form acpi_build.c acpi/gpex: Build tables for pxb
acpi: Align the size to 128k
unit-test: The files changed.
unit-test: Add testcase for pxb
unit-test: Add the binary file and clear diff.h
hw/acpi/aml-build.c | 285 +++++++++++++++++++ hw/arm/virt-acpi-build.c | 31 ++- hw/arm/virt.c | 7 +- hw/i386/acpi-build.c | 293 -------------------- hw/i386/pc.c | 18 +- hw/nvram/fw_cfg.c | 23 ++ hw/pci-host/gpex-acpi.c | 166 +++++++---- include/hw/acpi/aml-build.h | 22 ++ include/hw/arm/virt.h | 1 + include/hw/nvram/fw_cfg.h | 9 + include/hw/pci-host/gpex.h | 1 + tests/data/acpi/virt/DSDT.pxb | Bin 0 -> 7802 bytes tests/qtest/bios-tables-test.c | 58 +++- 13 files changed, 545 insertions(+), 369 deletions(-) create mode 100644 tests/data/acpi/virt/DSDT.pxb
Signature · 1 line
2.28.0
PATCH v10 1/9 acpi/gpex: Extract two APIs from acpi_dsdt_add_pci
From: Yubo Miao <[email protected]>
Extract two APIs acpi_dsdt_add_pci_route_table and acpi_dsdt_add_pci_osc from acpi_dsdt_add_pci. The first API is used to specify the pci route table and the second API is used to declare the operation system capabilities. These two APIs would be used to specify the pxb-pcie in DSDT.
--- hw/pci-host/gpex-acpi.c | 112 +++++++++++--------- 1 file changed, 63 insertions(+), 49 deletions(-)
hw/pci-host/gpex-acpi.c +63 -49
@@ -2,21 +2,11 @@#include "hw/acpi/aml-build.h" #include "hw/pci-host/gpex.h" -void acpi_dsdt_add_gpex (Aml *scope,struct GPEXConfig *cfg) +static void acpi_dsdt_add_pci_route_table (Aml *dev,uint32_t irq) { -int nr_pcie_buses = cfg->ecam.size /PCIE_MMCFG_SIZE_MIN ; -Aml *method, *crs, *ifctx, *UUID , *ifctx1, *elsectx, *buf; +Aml *method, *crs;int i, slot_no; -Aml *dev =aml_device ("%s" ,"PCI0" ); -aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0A08" ))); -aml_append (dev,aml_name_decl ("_CID" ,aml_string ("PNP0A03" ))); -aml_append (dev,aml_name_decl ("_SEG" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("_BBN" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("_STR" ,aml_unicode ("PCIe 0 Device" ))); -aml_append (dev,aml_name_decl ("_CCA" ,aml_int (1 ))); -/* Declare the PCI Routing Table. */ Aml *rt_pkg =aml_varpackage (PCI_SLOT_MAX *PCI_NUM_PINS );for (slot_no =0 ; slot_no <PCI_SLOT_MAX ; slot_no++) {
@@ -34,7 +24,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)/* Create GSI link device */ for (i =0 ; i <PCI_NUM_PINS ; i++) { -uint32_t irqs = cfg->irq + i; +uint32_t irqs = irq + i;Aml *dev_gsi =aml_device ("GSI%d" , i);aml_append (dev_gsi,aml_name_decl ("_HID" ,aml_string ("PNP0C0F" )));aml_append (dev_gsi,aml_name_decl ("_UID" ,aml_int (i)));
@@ -52,43 +42,11 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)aml_append (dev_gsi, method);aml_append (dev, dev_gsi); } +} - method =aml_method ("_CBA" ,0 ,AML_NOTSERIALIZED ); -aml_append (method,aml_return (aml_int (cfg->ecam.base))); -aml_append (dev, method); - -Aml *rbuf =aml_resource_template (); -aml_append (rbuf, -aml_word_bus_number (AML_MIN_FIXED ,AML_MAX_FIXED ,AML_POS_DECODE , -0x0000 ,0x0000 , nr_pcie_buses -1 ,0x0000 , - nr_pcie_buses)); -if (cfg->mmio32.size) { -aml_append (rbuf, -aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED , -AML_NON_CACHEABLE ,AML_READ_WRITE ,0x0000 , - cfg->mmio32.base, - cfg->mmio32.base + cfg->mmio32.size -1 , -0x0000 , - cfg->mmio32.size)); - } -if (cfg->pio.size) { -aml_append (rbuf, -aml_dword_io (AML_MIN_FIXED ,AML_MAX_FIXED ,AML_POS_DECODE , -AML_ENTIRE_RANGE ,0x0000 ,0x0000 , - cfg->pio.size -1 , - cfg->pio.base, - cfg->pio.size)); - } -if (cfg->mmio64.size) { -aml_append (rbuf, -aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED , -AML_NON_CACHEABLE ,AML_READ_WRITE ,0x0000 , - cfg->mmio64.base, - cfg->mmio64.base + cfg->mmio64.size -1 , -0x0000 , - cfg->mmio64.size)); - } -aml_append (dev,aml_name_decl ("_CRS" , rbuf)); +static void acpi_dsdt_add_pci_osc (Aml *dev) +{ +Aml *method, *UUID , *ifctx, *ifctx1, *elsectx, *buf;/* Declare an _OSC (OS Control Handoff) method */ aml_append (dev,aml_name_decl ("SUPP" ,aml_int (0 )));
@@ -160,6 +118,62 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) buf =aml_buffer (1 , byte_list);aml_append (method,aml_return (buf));aml_append (dev, method); +} + +void acpi_dsdt_add_gpex (Aml *scope,struct GPEXConfig *cfg) +{ +int nr_pcie_buses = cfg->ecam.size /PCIE_MMCFG_SIZE_MIN ; +Aml *method, *crs, *dev, *rbuf; + + dev =aml_device ("%s" ,"PCI0" ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0A08" ))); +aml_append (dev,aml_name_decl ("_CID" ,aml_string ("PNP0A03" ))); +aml_append (dev,aml_name_decl ("_SEG" ,aml_int (0 ))); +aml_append (dev,aml_name_decl ("_BBN" ,aml_int (0 ))); +aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); +aml_append (dev,aml_name_decl ("_STR" ,aml_unicode ("PCIe 0 Device" ))); +aml_append (dev,aml_name_decl ("_CCA" ,aml_int (1 ))); + +acpi_dsdt_add_pci_route_table (dev, cfg->irq); + + method =aml_method ("_CBA" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_return (aml_int (cfg->ecam.base))); +aml_append (dev, method); + + rbuf =aml_resource_template (); +aml_append (rbuf, +aml_word_bus_number (AML_MIN_FIXED ,AML_MAX_FIXED ,AML_POS_DECODE , +0x0000 ,0x0000 , nr_pcie_buses -1 ,0x0000 , + nr_pcie_buses)); +if (cfg->mmio32.size) { +aml_append (rbuf, +aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED , +AML_NON_CACHEABLE ,AML_READ_WRITE ,0x0000 , + cfg->mmio32.base, + cfg->mmio32.base + cfg->mmio32.size -1 , +0x0000 , + cfg->mmio32.size)); + } +if (cfg->pio.size) { +aml_append (rbuf, +aml_dword_io (AML_MIN_FIXED ,AML_MAX_FIXED ,AML_POS_DECODE , +AML_ENTIRE_RANGE ,0x0000 ,0x0000 , + cfg->pio.size -1 , + cfg->pio.base, + cfg->pio.size)); + } +if (cfg->mmio64.size) { +aml_append (rbuf, +aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED , +AML_NON_CACHEABLE ,AML_READ_WRITE ,0x0000 , + cfg->mmio64.base, + cfg->mmio64.base + cfg->mmio64.size -1 , +0x0000 , + cfg->mmio64.size)); + } +aml_append (dev,aml_name_decl ("_CRS" , rbuf)); + +acpi_dsdt_add_pci_osc (dev);Aml *dev_res0 =aml_device ("%s" ,"RES0" );aml_append (dev_res0,aml_name_decl ("_HID" ,aml_string ("PNP0C02" )));
Signature · 1 line
2.28.0
PATCH v10 2/9 fw_cfg: Refactor extra pci roots addition
In reply to Jiahui CenExtract extra pci roots addition from pc machine, which could be used by other machines.
In order to make uefi get the extra roots, it is necessary to write extra roots into fw_cfg. And only if the uefi knows there are extra roots, the config spaces of devices behind the root could be obtained.
--- hw/i386/pc.c | 18 +-------------- hw/nvram/fw_cfg.c | 23 ++++++++++++++++++++ include/hw/nvram/fw_cfg.h | 9 ++++++++ 3 files changed, 33 insertions(+), 17 deletions(-)
hw/i386/pc.c +1 -17
@@ -777,27 +777,11 @@ void pc_machine_done(Notifier *notifier, void *data)PCMachineState *pcms =container_of (notifier, PCMachineState, machine_done);X86MachineState *x86ms =X86_MACHINE (pcms); -PCIBus *bus = pcms->bus;/* set the number of CPUs */ x86_rtc_set_cpus_count (x86ms->rtc, x86ms->boot_cpus); -if (bus) { -int extra_hosts =0 ; - - QLIST_FOREACH(bus, &bus->child, sibling) { -/* look for expander root buses */ -if (pci_bus_is_root (bus)) { - extra_hosts++; - } - } -if (extra_hosts && x86ms->fw_cfg) { -uint64_t *val =g_malloc (sizeof (*val)); - *val =cpu_to_le64 (extra_hosts); -fw_cfg_add_file (x86ms->fw_cfg, -"etc/extra-pci-roots" , val,sizeof (*val)); - } - } +fw_cfg_add_extra_pci_roots (pcms->bus, x86ms->fw_cfg);acpi_setup ();if (x86ms->fw_cfg) {
hw/nvram/fw_cfg.c +23 -0
@@ -40,6 +40,7 @@#include "qemu/cutils.h" #include "qapi/error.h" #include "hw/acpi/aml-build.h" +#include "hw/pci/pci_bus.h" #define FW_CFG_FILE_SLOTS_DFLT 0x20
@@ -1061,6 +1062,28 @@ bool fw_cfg_add_from_generator(FWCfgState *s, const char *filename,return true; } +void fw_cfg_add_extra_pci_roots (PCIBus *bus,FWCfgState *s) +{ +int extra_hosts =0 ; + +if (!bus) { +return ; + } + + QLIST_FOREACH(bus, &bus->child, sibling) { +/* look for expander root buses */ +if (pci_bus_is_root (bus)) { + extra_hosts++; + } + } + +if (extra_hosts && s) { +uint64_t *val =g_malloc (sizeof (*val)); + *val =cpu_to_le64 (extra_hosts); +fw_cfg_add_file (s,"etc/extra-pci-roots" , val,sizeof (*val)); + } +} +static void fw_cfg_machine_reset (void *opaque) {MachineClass *mc =MACHINE_GET_CLASS (qdev_get_machine ());
include/hw/nvram/fw_cfg.h +9 -0
@@ -308,6 +308,15 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data,bool fw_cfg_add_from_generator (FWCfgState *s,const char *filename,const char *gen_id,Error **errp); +/** +* fw_cfg_add_extra_pci_roots: +* @bus: main pci root bus to be scanned from +* @s: fw_cfg device being modified +* +* Add a new fw_cfg item... +*/ +void fw_cfg_add_extra_pci_roots (PCIBus *bus,FWCfgState *s); +FWCfgState *fw_cfg_init_io_dma (uint32_t iobase,uint32_t dma_iobase,AddressSpace *dma_as);FWCfgState *fw_cfg_init_io (uint32_t iobase);
Signature · 1 line
2.28.0
Re: [PATCH v10 2/9] fw_cfg: Refactor extra pci roots addition
Quoted 21 lines · Jiahui Cen
Extract extra pci roots addition from pc machine, which could be used by other machines.
In order to make uefi get the extra roots, it is necessary to write extra roots into
fw_cfg. And only if the uefi knows there are extra roots, the config spaces of devices behind the root could be obtained.Signed-off-by Jiahui Cen <[email protected]>Signed-off-by Yubo Miao <[email protected]>--- hw/i386/pc.c | 18 +-------------- hw/nvram/fw_cfg.c | 23 ++++++++++++++++++++ include/hw/nvram/fw_cfg.h | 9 ++++++++ 3 files changed, 33 insertions(+), 17 deletions(-)hw/nvram/fw_cfg.c +0
-0
hw/nvram/fw_cfg.c line 43
Quoted 4 lines
hw/nvram/fw_cfg.c +1
-0@@ -40,6 +40,7 @@#include "qemu/cutils.h" #include "qapi/error.h" #include "hw/acpi/aml-build.h" +#include "hw/pci/pci_bus.h"
Stumbling at this (now merged as commit 0abd38885ac), not sure how we let PCI stuff mixed within this generic device. We have TYPE_FW_CFG_DATA_GENERATOR_INTERFACE to avoid that.
Quoted 31 lines
hw/nvram/fw_cfg.c +22
-0#define FW_CFG_FILE_SLOTS_DFLT 0x20@@ -1061,6 +1062,28 @@ bool fw_cfg_add_from_generator(FWCfgState *s, const char *filename,return true; } +void fw_cfg_add_extra_pci_roots (PCIBus *bus,FWCfgState *s) +{ +int extra_hosts =0 ; + +if (!bus) { +return ; + } + + QLIST_FOREACH(bus, &bus->child, sibling) { +/* look for expander root buses */ +if (pci_bus_is_root (bus)) { + extra_hosts++; + } + } + +if (extra_hosts && s) { +uint64_t *val =g_malloc (sizeof (*val)); + *val =cpu_to_le64 (extra_hosts); +fw_cfg_add_file (s,"etc/extra-pci-roots" , val,sizeof (*val)); + } +} +static void fw_cfg_machine_reset (void *opaque) {MachineClass *mc =MACHINE_GET_CLASS (qdev_get_machine ());
PATCH v10 3/9 hw/arm/virt: Write extra pci roots into fw_cfg
In reply to Jiahui CenAdd bus property to virt machine for primary PCI root bus and use it to add extra pci roots behind it.
--- hw/arm/virt.c | 7 +++++-- include/hw/arm/virt.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
hw/arm/virt.c +5 -2
@@ -1289,7 +1289,8 @@ static void create_pcie(VirtMachineState *vms) } pci =PCI_HOST_BRIDGE (dev); -if (pci->bus) { + vms->bus = pci->bus; +if (vms->bus) {for (i =0 ; i < nb_nics; i++) {NICInfo *nd = &nd_table[i];
@@ -1346,7 +1347,7 @@ static void create_pcie(VirtMachineState *vms)switch (vms->iommu) {case VIRT_IOMMU_SMMUV3 : -create_smmu (vms, pci->bus); +create_smmu (vms, vms->bus);qemu_fdt_setprop_cells (vms->fdt, nodename,"iommu-map" ,0x0 , vms->iommu_phandle,0x0 ,0x10000 );break ;
@@ -1481,6 +1482,8 @@ void virt_machine_done(Notifier *notifier, void *data)exit (1 ); } +fw_cfg_add_extra_pci_roots (vms->bus, vms->fw_cfg); +virt_acpi_setup (vms);virt_build_smbios (vms); }
include/hw/arm/virt.h +1 -0
@@ -163,6 +163,7 @@ struct VirtMachineState {DeviceState *gic;DeviceState *acpi_dev;Notifier powerdown_notifier; +PCIBus *bus; };#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
Signature · 1 line
2.28.0
PATCH v10 4/9 acpi: Extract crs build form acpi_build.c
In reply to Jiahui CenFrom: Yubo Miao <[email protected]>
Extract crs build form acpi_build.c, the function could also be used to build the crs for pxbs for arm. The resources are composed by two parts:
1. The bar space of pci-bridge/pcie-root-ports
2. The resources needed by devices behind PXBs.
The base and limit of memory/io are obtained from the config via two APIs:pci_bridge_get_base and pci_bridge_get_limit
--- hw/acpi/aml-build.c | 285 +++++++++++++++++++ hw/i386/acpi-build.c | 293 -------------------- include/hw/acpi/aml-build.h | 22 ++ 3 files changed, 307 insertions(+), 293 deletions(-)
hw/acpi/aml-build.c +285 -0
@@ -27,6 +27,9 @@#include "sysemu/numa.h" #include "hw/boards.h" #include "hw/acpi/tpm.h" +#include "hw/pci/pci_host.h" +#include "hw/pci/pci_bus.h" +#include "hw/pci/pci_bridge.h" static GArray *build_alloc_array (void ) {
@@ -55,6 +58,128 @@ static void build_append_array(GArray *array, GArray *val)#define ACPI_NAMESEG_LEN 4 +void crs_range_insert (GPtrArray *ranges,uint64_t base,uint64_t limit) +{ +CrsRangeEntry *entry; + + entry =g_malloc (sizeof (*entry)); + entry->base = base; + entry->limit = limit; + +g_ptr_array_add (ranges, entry); +} + +static void crs_range_free (gpointer data) +{ +CrsRangeEntry *entry = (CrsRangeEntry *)data; +g_free (entry); +} + +void crs_range_set_init (CrsRangeSet *range_set) +{ + range_set->io_ranges =g_ptr_array_new_with_free_func (crs_range_free); + range_set->mem_ranges =g_ptr_array_new_with_free_func (crs_range_free); + range_set->mem_64bit_ranges = +g_ptr_array_new_with_free_func (crs_range_free); +} + +void crs_range_set_free (CrsRangeSet *range_set) +{ +g_ptr_array_free (range_set->io_ranges, true); +g_ptr_array_free (range_set->mem_ranges, true); +g_ptr_array_free (range_set->mem_64bit_ranges, true); +} + +static gint crs_range_compare (gconstpointer a,gconstpointer b) +{ +CrsRangeEntry *entry_a = *(CrsRangeEntry **)a; +CrsRangeEntry *entry_b = *(CrsRangeEntry **)b; + +if (entry_a->base < entry_b->base) { +return -1 ; + }else if (entry_a->base > entry_b->base) { +return 1 ; + }else { +return 0 ; + } +} + +/* +* crs_replace_with_free_ranges - given the 'used' ranges within [start - end] +* interval, computes the 'free' ranges from the same interval. +* Example: If the input array is { [a1 - a2],[b1 - b2] }, the function +* will return { [base - a1], [a2 - b1], [b2 - limit] }. +*/ +void crs_replace_with_free_ranges (GPtrArray *ranges, +uint64_t start,uint64_t end) +{ +GPtrArray *free_ranges =g_ptr_array_new (); +uint64_t free_base = start; +int i; + +g_ptr_array_sort (ranges, crs_range_compare); +for (i =0 ; i < ranges->len; i++) { +CrsRangeEntry *used =g_ptr_array_index (ranges, i); + +if (free_base < used->base) { +crs_range_insert (free_ranges, free_base, used->base -1 ); + } + + free_base = used->limit +1 ; + } + +if (free_base < end) { +crs_range_insert (free_ranges, free_base, end); + } + +g_ptr_array_set_size (ranges,0 ); +for (i =0 ; i < free_ranges->len; i++) { +g_ptr_array_add (ranges,g_ptr_array_index (free_ranges, i)); + } + +g_ptr_array_free (free_ranges, true); +} + +/* +* crs_range_merge - merges adjacent ranges in the given array. +* Array elements are deleted and replaced with the merged ranges. +*/ +static void crs_range_merge (GPtrArray *range) +{ +GPtrArray *tmp =g_ptr_array_new_with_free_func (crs_range_free); +CrsRangeEntry *entry; +uint64_t range_base, range_limit; +int i; + +if (!range->len) { +return ; + } + +g_ptr_array_sort (range, crs_range_compare); + + entry =g_ptr_array_index (range,0 ); + range_base = entry->base; + range_limit = entry->limit; +for (i =1 ; i < range->len; i++) { + entry =g_ptr_array_index (range, i); +if (entry->base -1 == range_limit) { + range_limit = entry->limit; + }else { +crs_range_insert (tmp, range_base, range_limit); + range_base = entry->base; + range_limit = entry->limit; + } + } +crs_range_insert (tmp, range_base, range_limit); + +g_ptr_array_set_size (range,0 ); +for (i =0 ; i < tmp->len; i++) { + entry =g_ptr_array_index (tmp, i); +crs_range_insert (range, entry->base, entry->limit); + } +g_ptr_array_free (tmp, true); +} +static void build_append_nameseg (GArray *array,const char *seg) {
@@ -1951,6 +2076,166 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL); } +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set) +{ +Aml *crs =aml_resource_template (); +CrsRangeSet temp_range_set; +CrsRangeEntry *entry; +uint8_t max_bus =pci_bus_num (host->bus); +uint8_t type; +int devfn; +int i; + +crs_range_set_init (&temp_range_set); +for (devfn =0 ; devfn <ARRAY_SIZE (host->bus->devices); devfn++) { +uint64_t range_base, range_limit; +PCIDevice *dev = host->bus->devices[devfn]; + +if (!dev) { +continue ; + } + +for (i =0 ; i <PCI_NUM_REGIONS ; i++) { +PCIIORegion *r = &dev->io_regions[i]; + + range_base = r->addr; + range_limit = r->addr + r->size -1 ; + +/* +* Work-around for old bioses +* that do not support multiple root buses +*/ +if (!range_base || range_base > range_limit) { +continue ; + } + +if (r->type &PCI_BASE_ADDRESS_SPACE_IO ) { +crs_range_insert (temp_range_set.io_ranges, + range_base, range_limit); + }else {/* "memory" */ +uint64_t length = range_limit - range_base +1 ; +if (range_limit <=UINT32_MAX && length <=UINT32_MAX ) { +crs_range_insert (temp_range_set.mem_ranges, range_base, + range_limit); + }else { +crs_range_insert (temp_range_set.mem_64bit_ranges, + range_base, range_limit); + } + } + } + + type = dev->config[PCI_HEADER_TYPE ] & ~PCI_HEADER_TYPE_MULTI_FUNCTION ; +if (type ==PCI_HEADER_TYPE_BRIDGE ) { +uint8_t subordinate = dev->config[PCI_SUBORDINATE_BUS ]; +if (subordinate > max_bus) { + max_bus = subordinate; + } + + range_base =pci_bridge_get_base (dev,PCI_BASE_ADDRESS_SPACE_IO ); + range_limit =pci_bridge_get_limit (dev,PCI_BASE_ADDRESS_SPACE_IO ); + +/* +* Work-around for old bioses +* that do not support multiple root buses +*/ +if (range_base && range_base <= range_limit) { +crs_range_insert (temp_range_set.io_ranges, + range_base, range_limit); + } + + range_base = +pci_bridge_get_base (dev,PCI_BASE_ADDRESS_SPACE_MEMORY ); + range_limit = +pci_bridge_get_limit (dev,PCI_BASE_ADDRESS_SPACE_MEMORY ); + +/* +* Work-around for old bioses +* that do not support multiple root buses +*/ +if (range_base && range_base <= range_limit) { +uint64_t length = range_limit - range_base +1 ; +if (range_limit <=UINT32_MAX && length <=UINT32_MAX ) { +crs_range_insert (temp_range_set.mem_ranges, + range_base, range_limit); + }else { +crs_range_insert (temp_range_set.mem_64bit_ranges, + range_base, range_limit); + } + } + + range_base = +pci_bridge_get_base (dev,PCI_BASE_ADDRESS_MEM_PREFETCH ); + range_limit = +pci_bridge_get_limit (dev,PCI_BASE_ADDRESS_MEM_PREFETCH ); + +/* +* Work-around for old bioses +* that do not support multiple root buses +*/ +if (range_base && range_base <= range_limit) { +uint64_t length = range_limit - range_base +1 ; +if (range_limit <=UINT32_MAX && length <=UINT32_MAX ) { +crs_range_insert (temp_range_set.mem_ranges, + range_base, range_limit); + }else { +crs_range_insert (temp_range_set.mem_64bit_ranges, + range_base, range_limit); + } + } + } + } + +crs_range_merge (temp_range_set.io_ranges); +for (i =0 ; i < temp_range_set.io_ranges->len; i++) { + entry =g_ptr_array_index (temp_range_set.io_ranges, i); +aml_append (crs, +aml_word_io (AML_MIN_FIXED ,AML_MAX_FIXED , +AML_POS_DECODE ,AML_ENTIRE_RANGE , +0 , entry->base, entry->limit,0 , + entry->limit - entry->base +1 )); +crs_range_insert (range_set->io_ranges, entry->base, entry->limit); + } + +crs_range_merge (temp_range_set.mem_ranges); +for (i =0 ; i < temp_range_set.mem_ranges->len; i++) { + entry =g_ptr_array_index (temp_range_set.mem_ranges, i); +assert (entry->limit <=UINT32_MAX && + (entry->limit - entry->base +1 ) <=UINT32_MAX ); +aml_append (crs, +aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED , +AML_MAX_FIXED ,AML_NON_CACHEABLE , +AML_READ_WRITE , +0 , entry->base, entry->limit,0 , + entry->limit - entry->base +1 )); +crs_range_insert (range_set->mem_ranges, entry->base, entry->limit); + } + +crs_range_merge (temp_range_set.mem_64bit_ranges); +for (i =0 ; i < temp_range_set.mem_64bit_ranges->len; i++) { + entry =g_ptr_array_index (temp_range_set.mem_64bit_ranges, i); +aml_append (crs, +aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED , +AML_MAX_FIXED ,AML_NON_CACHEABLE , +AML_READ_WRITE , +0 , entry->base, entry->limit,0 , + entry->limit - entry->base +1 )); +crs_range_insert (range_set->mem_64bit_ranges, + entry->base, entry->limit); + } + +crs_range_set_free (&temp_range_set); + +aml_append (crs, +aml_word_bus_number (AML_MIN_FIXED ,AML_MAX_FIXED ,AML_POS_DECODE , +0 , +pci_bus_num (host->bus), + max_bus, +0 , + max_bus -pci_bus_num (host->bus) +1 )); + +return crs; +} +/* ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors */ static Aml *aml_serial_bus_device(uint8_t serial_bus_type, uint8_t flags, uint16_t type_flags,
hw/i386/acpi-build.c +0 -293
299 lines not on this page · raw message
include/hw/acpi/aml-build.h +22 -0
@@ -224,6 +224,20 @@ struct AcpiBuildTables {BIOSLinker *linker; } AcpiBuildTables; +typedef +struct CrsRangeEntry { +uint64_t base; +uint64_t limit; +}CrsRangeEntry ; + +typedef +struct CrsRangeSet { +GPtrArray *io_ranges; +GPtrArray *mem_ranges; +GPtrArray *mem_64bit_ranges; +}CrsRangeSet ; + +/* * ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors * Serial Bus Type
@@ -432,6 +446,14 @@ build_append_gas_from_struct(GArray *table, const struct AcpiGenericAddress *s) s->access_width, s->address); } +void crs_range_insert (GPtrArray *ranges,uint64_t base,uint64_t limit); +void crs_replace_with_free_ranges (GPtrArray *ranges, +uint64_t start,uint64_t end); +void crs_range_set_init (CrsRangeSet *range_set); +void crs_range_set_free (CrsRangeSet *range_set); + +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set); +void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags);
Signature · 1 line
2.28.0
PATCH v10 5/9 acpi/gpex: Build tables for pxb
In reply to Jiahui CenFrom: Yubo Miao <[email protected]>
The resources of pxbs are obtained by crs_build and the resources used by pxbs would be moved from the resources defined for host-bridge.
The resources for pxb are composed of following two parts:
1. The bar space of the pci-bridge/pcie-root-port behined it
2. The config space of devices behind it.
--- hw/arm/virt-acpi-build.c | 6 ++- hw/pci-host/gpex-acpi.c | 54 ++++++++++++++++++++ include/hw/pci-host/gpex.h | 1 + 3 files changed, 59 insertions(+), 2 deletions(-)
hw/arm/virt-acpi-build.c +4 -2
@@ -153,7 +153,8 @@ static void acpi_dsdt_add_virtio(Aml *scope, }static void acpi_dsdt_add_pci (Aml *scope,const MemMapEntry *memmap, -uint32_t irq,bool use_highmem,bool highmem_ecam) +uint32_t irq,bool use_highmem,bool highmem_ecam, +VirtMachineState *vms) {int ecam_id =VIRT_ECAM_ID (highmem_ecam);struct GPEXConfig cfg = {
@@ -161,6 +162,7 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, .pio = memmap[VIRT_PCIE_PIO], .ecam = memmap[ecam_id], .irq = irq, + .bus = vms->bus, };if (use_highmem) {
@@ -609,7 +611,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)acpi_dsdt_add_virtio (scope, &memmap[VIRT_MMIO ], (irqmap[VIRT_MMIO ] +ARM_SPI_BASE ),NUM_VIRTIO_TRANSPORTS );acpi_dsdt_add_pci (scope, memmap, (irqmap[VIRT_PCIE ] +ARM_SPI_BASE ), - vms->highmem, vms->highmem_ecam); + vms->highmem, vms->highmem_ecam, vms);if (vms->acpi_dev) { build_ged_aml(scope, "\\_SB."GED_DEVICE, HOTPLUG_HANDLER(vms->acpi_dev),
hw/pci-host/gpex-acpi.c +54 -0
67 lines not on this page · raw message
include/hw/pci-host/gpex.h +1 -0
@@ -59,6 +59,7 @@ struct GPEXConfig {MemMapEntry mmio64;MemMapEntry pio;int irq; +PCIBus *bus; };int gpex_set_irq_num (GPEXHost *s,int index,int gsi);
Signature · 1 line
2.28.0
PATCH v10 6/9 acpi: Align the size to 128k
In reply to Jiahui CenFrom: Yubo Miao <[email protected]>
If table size is changed between virt_acpi_build and virt_acpi_build_update, the table size would not be updated to UEFI, therefore, just align the size to 128kb, which is enough and same with x86. It would warn if 64k is not enough and the align size should be updated.
--- hw/arm/virt-acpi-build.c | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+)
hw/arm/virt-acpi-build.c +25 -0
@@ -57,6 +57,8 @@#define ARM_SPI_BASE 32 +#define ACPI_BUILD_TABLE_SIZE 0x20000 +static void acpi_dsdt_add_cpus (Aml *scope,int smp_cpus) {uint16_t i;
@@ -656,6 +658,15 @@ struct AcpiBuildState {bool patched; } AcpiBuildState; +static void acpi_align_size (GArray *blob,unsigned align) +{ +/* +* Align size to multiple of given size. This reduces the chance +* we need to change size in the future (breaking cross version migration). +*/ +g_array_set_size (blob,ROUND_UP (acpi_data_len (blob), align)); +} +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
@@ -743,6 +754,20 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_rsdp (tables->rsdp, tables->linker, &rsdp_data); } +/* +* The align size is 128, warn if 64k is not enough therefore +* the align size could be resized. +*/ +if (tables_blob->len >ACPI_BUILD_TABLE_SIZE /2 ) { +warn_report ("ACPI table size %u exceeds %d bytes," +" migration may not work" , + tables_blob->len,ACPI_BUILD_TABLE_SIZE /2 ); +error_printf ("Try removing CPUs, NUMA nodes, memory slots" +" or PCI bridges." ); + } +acpi_align_size (tables_blob,ACPI_BUILD_TABLE_SIZE ); + +/* Cleanup memory that's no longer used. */ g_array_free (table_offsets, true); }
Signature · 1 line
2.28.0
PATCH v10 7/9 unit-test: The files changed.
In reply to Jiahui CenFrom: Yubo Miao <[email protected]>
The unit-test is seperated into three patches:
1. The files changed and list in bios-tables-test-allowed-diff.h
2. The unit-test
3. The binary file and clear bios-tables-test-allowed-diff.h
The ASL diff would also be listed.
Sice there are 1000+lines diff, some changes would be omitted.
* Original Table Header:
* Signature "DSDT" - * Length 0x000014BB (5307) + * Length 0x00001E7A (7802) * Revision 0x02 - * Checksum 0xD1 + * Checksum 0x57 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1)
+ Device (PC80)
+ {
+ Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware ID
+ Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
+ Name (_ADR, Zero) // _ADR: Address
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_SEG, Zero) // _SEG: PCI Segment
+ Name (_BBN, 0x80) // _BBN: BIOS Bus Number
+ Name (_UID, 0x80) // _UID: Unique ID
+ Name (_STR, Unicode ("pxb Device")) // _STR: Description String
+ Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
+ {
+ Package (0x04)
+ {
+ 0xFFFF,
+ Zero,
+ GSI0,
+ Zero+ },
+
Packages are omitted.
+ Package (0x04)
+ {
+ 0x001FFFFF,
+ 0x03,
+ GSI2,
+ Zero
+ }
+ })
+ Device (GSI0)
+ {
+ Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000023,
+ }
+ })
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000023,
+ }
+ })
+ Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings
+ {
+ }+ }
GSI1,2,3 are omitted.
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+ 0x0000, // Granularity
+ 0x0080, // Range Minimum
+ 0x0080, // Range Maximum
+ 0x0000, // Translation Offset
+ 0x0001, // Length
+ ,, )
+ })
+ Name (SUPP, Zero)
+ Name (CTRL, Zero)
+ Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
+ {
+ CreateDWordField (Arg3, Zero, CDW1)
+ If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
+ {
+ CreateDWordField (Arg3, 0x04, CDW2)
+ CreateDWordField (Arg3, 0x08, CDW3)
+ SUPP = CDW2 /* \_SB_.PC80._OSC.CDW2 */
+ CTRL = CDW3 /* \_SB_.PC80._OSC.CDW3 */
+ CTRL &= 0x1F
+ If ((Arg1 != One))
+ {+ CDW1 |= 0x08
+ }
+
+ If ((CDW3 != CTRL))
+ {
+ CDW1 |= 0x10
+ }
+
+ CDW3 = CTRL /* \_SB_.PC80.CTRL */
+ Return (Arg3)
+ }
+ Else
+ {+ CDW1 |= 0x04
+ Return (Arg3)
+ }
+ }
DSM is are omitted
Device (PCI0)
{
Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware ID
WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
0x0000, // Granularity
0x0000, // Range Minimum
- 0x00FF, // Range Maximum
+ 0x007F, // Range Maximum
0x0000, // Translation Offset
- 0x0100, // Length
+ 0x0080, // Length--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+)
tests/qtest/bios-tables-test-allowed-diff.h +1 -0
@@ -1 +1,2 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/DSDT.pxb",
Signature · 1 line
2.28.0
PATCH v10 8/9 unit-test: Add testcase for pxb
In reply to Jiahui CenFrom: Yubo Miao <[email protected]>
Add testcase for pxb to make sure the ACPI table is correct for guest.
--- tests/qtest/bios-tables-test.c | 58 ++++++++++++++++++-- 1 file changed, 52 insertions(+), 6 deletions(-)
tests/qtest/bios-tables-test.c +52 -6
@@ -671,12 +671,21 @@ static void test_acpi_one(const char *params, test_data *data)* TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3) * when arm/virt boad starts to support it. */ - args =g_strdup_printf ("-machine %s %s -accel tcg -nodefaults -nographic " -"-drive if=pflash,format=raw,file=%s,readonly " -"-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s" , - data->machine, data->tcg_only ?"" :"-accel kvm" , - data->uefi_fl1, data->uefi_fl2, data->cd, params ? params :"" ); - +if (data->cd) { + args =g_strdup_printf ("-machine %s %s -accel tcg " +"-nodefaults -nographic " +"-drive if=pflash,format=raw,file=%s,readonly " +"-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s" , + data->machine, data->tcg_only ?"" :"-accel kvm" , + data->uefi_fl1, data->uefi_fl2, data->cd, params ? params :"" ); + }else { + args =g_strdup_printf ("-machine %s %s -accel tcg " +"-nodefaults -nographic " +"-drive if=pflash,format=raw,file=%s,readonly " +"-drive if=pflash,format=raw,file=%s,snapshot=on %s" , + data->machine, data->tcg_only ?"" :"-accel kvm" , + data->uefi_fl1, data->uefi_fl2, params ? params :"" ); + } }else { args =g_strdup_printf ("-machine %s %s -accel tcg " "-net none -display none %s "
@@ -1176,6 +1185,40 @@ static void test_acpi_virt_tcg_numamem(void) } +#ifdef CONFIG_PXB +static void test_acpi_virt_tcg_pxb (void ) +{ +test_data data = { + .machine ="virt" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , + .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" , + .ram_start =0x40000000ULL , + .scan_len =128ULL *1024 *1024 , + }; +/* +* While using -cdrom, the cdrom would auto plugged into pxb-pcie, +* the reason is the bus of pxb-pcie is also root bus, it would lead +* to the error only PCI/PCIE bridge could plug onto pxb. +* Therefore,thr cdrom is defined and plugged onto the scsi controller +* to solve the conflicts. +*/ + data.variant =".pxb" ; +test_acpi_one (" -device pcie-root-port,chassis=1,id=pci.1" +" -device virtio-scsi-pci,id=scsi0,bus=pci.1" +" -drive file=" +"tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2," +"if=none,media=cdrom,id=drive-scsi0-0-0-1,readonly=on" +" -device scsi-cd,bus=scsi0.0,scsi-id=0," +"drive=drive-scsi0-0-0-1,id=scsi0-0-0-1,bootindex=1" +" -cpu cortex-a57" +" -device pxb-pcie,bus_nr=128" , + &data); + +free_test_data (&data); +} +#endif +static void test_acpi_tcg_acpi_hmat (const char *machine) {test_data data;
@@ -1287,6 +1330,9 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/virt" , test_acpi_virt_tcg);qtest_add_func ("acpi/virt/numamem" , test_acpi_virt_tcg_numamem);qtest_add_func ("acpi/virt/memhp" , test_acpi_virt_tcg_memhp); +#ifdef CONFIG_PXB +qtest_add_func ("acpi/virt/pxb" , test_acpi_virt_tcg_pxb); +#endif } ret =g_test_run ();boot_sector_cleanup (disk);
Signature · 1 line
2.28.0
PATCH v10 9/9 unit-test: Add the binary file and clear diff.h
In reply to Jiahui CenFrom: Yubo Miao <[email protected]>
Add the binary file DSDT.pxb and clear bios-tables-test-allowed-diff.h
--- tests/data/acpi/virt/DSDT.pxb | Bin 0 -> 7802 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-)
tests/data/acpi/virt/DSDT.pxb new file binary +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
@@ -1,2 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/DSDT.pxb",
Signature · 1 line
2.28.0
Quoted 4 lines · Jiahui Cen
Changes with v9
v9->v10:
Refactor patch2 to drop useless macros and variables. Split patch2 into two patches.
I tagged this for after the release. To help make sure this is not lost pls ping me after the release.
Thanks!
Quoted 73 lines
Changes with v8
v8->v9:
Rebase to masterChanges with v7
v7->v8:
Fix the error:no member named 'fw_cfg' in 'struct PCMachineState'Changes with v6
v6->v7:
Refactorfw_cfg_write_extra_pci_roots
Add APIPCI_GET_PCIE_HOST_STATE
Fix typosChanges with v5
v5->v6: statcrs_range_insertinaml_build.hChanges with v4
v4->v5: Not using specific resources for PXB.
Instead, the resources for pxb are composed of the bar space of the pci-bridge/pcie-root-port behined it and the config space of devices behind it.Only if the bios(uefi for arm) support multiple roots, configure space of devices behind pxbs could be obtained. The newest uefi work is updated for discussion by the following link:
https://edk2.groups.io/g/devel/topic/78135572#67173
[PATCH v2 0/4] Add extra pci roots support for ArmCurrently pxb-pcie is not supported by arm,
the reason for it is pxb-pcie is not described in DSDT table and only one main host bridge is described in acpi tables, which means it is not impossible to present different io numas for different devices.This series of patches make arm to support PXB-PCIE.
Users can configure pxb-pcie with certain numa, Example command is:
-device pxb-pcie,id=pci.7,bus_nr=128,numa_node=0,bus=pcie.0,addr=0x9Jiahui Cen (2):
fw_cfg: Refactor extra pci roots addition
hw/arm/virt: Write extra pci roots intofw_cfgYubo Miao (7):
acpi/gpex: Extract two APIs fromacpi_dsdt_add_pci
acpi: Extract crs build formacpi_build.cacpi/gpex: Build tables for pxb
acpi: Align the size to 128k
unit-test: The files changed.
unit-test: Add testcase for pxb
unit-test: Add the binary file and cleardiff.hhw/acpi/aml-build.c | 285 +++++++++++++++++++ hw/arm/virt-acpi-build.c | 31 ++- hw/arm/virt.c | 7 +- hw/i386/acpi-build.c | 293 -------------------- hw/i386/pc.c | 18 +- hw/nvram/fw_cfg.c | 23 ++ hw/pci-host/gpex-acpi.c | 166 +++++++---- include/hw/acpi/aml-build.h | 22 ++ include/hw/arm/virt.h | 1 + include/hw/nvram/fw_cfg.h | 9 + include/hw/pci-host/gpex.h | 1 + tests/data/acpi/virt/DSDT.pxb | Bin 0 -> 7802 bytes tests/qtest/bios-tables-test.c | 58 +++- 13 files changed, 545 insertions(+), 369 deletions(-) create mode 100644 tests/data/acpi/virt/DSDT.pxbSignature · 1 line
2.28.0
Hi Michael,
Quoted 8 lines · Michael S. Tsirkin
Quoted 4 lines · Jiahui Cen
Changes with v9
v9->v10:
Refactor patch2 to drop useless macros and variables. Split patch2 into two patches.I tagged this for after the release. To help make sure this is not lost pls ping me after the release.
OK. I'll ping you after the release.
Thanks,
Jiahui.
Quoted 76 lines
Quoted 55 lines
Changes with v8
v8->v9:
Rebase to masterChanges with v7
v7->v8:
Fix the error:no member named 'fw_cfg' in 'struct PCMachineState'Changes with v6
v6->v7:
Refactorfw_cfg_write_extra_pci_roots
Add APIPCI_GET_PCIE_HOST_STATE
Fix typosChanges with v5
v5->v6: statcrs_range_insertinaml_build.hChanges with v4
v4->v5: Not using specific resources for PXB.
Instead, the resources for pxb are composed of the bar space of the pci-bridge/pcie-root-port behined it and the config space of devices behind it.Only if the bios(uefi for arm) support multiple roots, configure space of devices behind pxbs could be obtained. The newest uefi work is updated for discussion by the following link:
https://edk2.groups.io/g/devel/topic/78135572#67173
[PATCH v2 0/4] Add extra pci roots support for ArmCurrently pxb-pcie is not supported by arm,
the reason for it is pxb-pcie is not described in DSDT table and only one main host bridge is described in acpi tables, which means it is not impossible to present different io numas for different devices.This series of patches make arm to support PXB-PCIE.
Users can configure pxb-pcie with certain numa, Example command is:
-device pxb-pcie,id=pci.7,bus_nr=128,numa_node=0,bus=pcie.0,addr=0x9Jiahui Cen (2):
fw_cfg: Refactor extra pci roots addition
hw/arm/virt: Write extra pci roots intofw_cfgYubo Miao (7):
acpi/gpex: Extract two APIs fromacpi_dsdt_add_pci
acpi: Extract crs build formacpi_build.cacpi/gpex: Build tables for pxb
acpi: Align the size to 128k
unit-test: The files changed.
unit-test: Add testcase for pxb
unit-test: Add the binary file and cleardiff.hQuoted 18 lines
hw/acpi/aml-build.c | 285 +++++++++++++++++++ hw/arm/virt-acpi-build.c | 31 ++- hw/arm/virt.c | 7 +- hw/i386/acpi-build.c | 293 -------------------- hw/i386/pc.c | 18 +- hw/nvram/fw_cfg.c | 23 ++ hw/pci-host/gpex-acpi.c | 166 +++++++---- include/hw/acpi/aml-build.h | 22 ++ include/hw/arm/virt.h | 1 + include/hw/nvram/fw_cfg.h | 9 + include/hw/pci-host/gpex.h | 1 + tests/data/acpi/virt/DSDT.pxb | Bin 0 -> 7802 bytes tests/qtest/bios-tables-test.c | 58 +++- 13 files changed, 545 insertions(+), 369 deletions(-) create mode 100644 tests/data/acpi/virt/DSDT.pxbSignature · 1 line
2.28.0.