[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 08/13] hw/i386/acpi: Use TYPE_PXB_BUS property acpi_uid for DS
From: |
Jonathan Cameron |
Subject: |
[PATCH v4 08/13] hw/i386/acpi: Use TYPE_PXB_BUS property acpi_uid for DSDT |
Date: |
Tue, 2 Jul 2024 14:14:13 +0100 |
Rather than relying on PCI internals, use the new acpi_property
to obtain the ACPI _UID values. These are still the same
as the PCI Bus numbers so no functional change.
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
v4: New patch.
---
hw/i386/acpi-build.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index ee92783836..cc32f1e6d4 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1550,6 +1550,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
QLIST_FOREACH(bus, &bus->child, sibling) {
uint8_t bus_num = pci_bus_num(bus);
uint8_t numa_node = pci_bus_numa_node(bus);
+ uint8_t uid;
/* look only for expander root buses */
if (!pci_bus_is_root(bus)) {
@@ -1560,14 +1561,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
root_bus_limit = bus_num - 1;
}
+ uid = object_property_get_uint(OBJECT(bus), "acpi_uid",
+ &error_fatal);
scope = aml_scope("\\_SB");
if (pci_bus_is_cxl(bus)) {
- dev = aml_device("CL%.02X", bus_num);
+ dev = aml_device("CL%.02X", uid);
} else {
- dev = aml_device("PC%.02X", bus_num);
+ dev = aml_device("PC%.02X", uid);
}
- aml_append(dev, aml_name_decl("_UID", aml_int(bus_num)));
+ aml_append(dev, aml_name_decl("_UID", aml_int(uid)));
aml_append(dev, aml_name_decl("_BBN", aml_int(bus_num)));
if (pci_bus_is_cxl(bus)) {
struct Aml *aml_pkg = aml_package(2);
--
2.43.0
[PATCH v4 07/13] hw/pci-bridge: Add acpi_uid property to TYPE_PXB_BUS, Jonathan Cameron, 2024/07/02
[PATCH v4 08/13] hw/i386/acpi: Use TYPE_PXB_BUS property acpi_uid for DSDT,
Jonathan Cameron <=
[PATCH v4 09/13] hw/pci-host/gpex-acpi: Use acpi_uid property., Jonathan Cameron, 2024/07/02
[PATCH v4 10/13] hw/acpi: Generic Port Affinity Structure support, Jonathan Cameron, 2024/07/02
[PATCH v4 11/13] bios-tables-test: Allow for new acpihmat-generic-x test data., Jonathan Cameron, 2024/07/02
[PATCH v4 12/13] bios-tables-test: Add complex SRAT / HMAT test for GI GP, Jonathan Cameron, 2024/07/02
[PATCH v4 13/13] bios-tables-test: Add data for complex numa test (GI, GP etc), Jonathan Cameron, 2024/07/02