[RFC,2/5] PCI/ACPI: Store ACPI device information in the host bridge structure

Commit Message

Boqun Feng Aug. 11, 2021, 3:36 p.m. UTC

In order to decouple the ACPI device information of a PCI host bridge
from the sysdata, ->private of pci_host_bridge is used to store the ACPI
device, and it's done by the new pci_create_root_bus_priv().

A reader function is also added, to retrieve the ACPI device information
in pci_host_bridge.

Signed-off-by: Boqun Feng <[e-mail]>
---
 drivers/acpi/pci_root.c  | 5 +++--
 include/linux/pci-acpi.h | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index d7deedf3548e..82824841cbda 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -894,8 +894,9 @@  struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
 
 	pci_acpi_root_add_resources(info);
 	pci_add_resource(&info->resources, &root->secondary);
-	bus = pci_create_root_bus(NULL, busnum, ops->pci_ops,
-				  sysdata, &info->resources);
+	bus = pci_create_root_bus_priv(NULL, busnum, ops->pci_ops, sysdata,
+				       &info->resources, &root->device,
+				       sizeof(struct acpi_device *));
 	if (!bus)
 		goto out_release_info;
 
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 5ba475ca9078..21d4cc80aa55 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -80,6 +80,11 @@  extern struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
 					    struct acpi_pci_root_ops *ops,
 					    struct acpi_pci_root_info *info,
 					    void *sd);
+static inline struct acpi_device *
+acpi_pci_root_device(struct pci_host_bridge *bridge)
+{
+	return *((struct acpi_device **)bridge->private);
+}
 
 void acpi_pci_add_bus(struct pci_bus *bus);
 void acpi_pci_remove_bus(struct pci_bus *bus);