This commit modifies ARM64-specific ACPI PCI support functions to
properly set the numa_node property on host bridges and thus on PCI
devices. Such support requires _PXM objects to be set in DSDT/SSDT
tables describing PCI root bridges
Signed-off-by: Sergey Temerkhanov <s.temerkhanov@xxxxxxxxx>
---
arch/arm64/kernel/pci.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 4f0e3ebfea4b..c45c7a26f984 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -81,7 +81,16 @@ int raw_pci_write(unsigned int domain, unsigned int bus,
int pcibus_to_node(struct pci_bus *bus)
{
- return dev_to_node(&bus->dev);
+ struct pci_config_window *cfg = bus->sysdata;
+ struct acpi_device *adev = NULL;
+ struct device *dev;
+
+ if (!acpi_disabled)
+ adev = to_acpi_device(cfg->parent);
+
+ dev = adev ? &adev->dev : &bus->dev;
+
+ return dev_to_node(dev);
}
EXPORT_SYMBOL(pcibus_to_node);
@@ -186,6 +195,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
struct pci_bus *bus, *child;
struct acpi_pci_root_ops *root_ops;
+ set_dev_node(&root->device->dev, node);
+
ri = kzalloc_node(sizeof(*ri), GFP_KERNEL, node);
if (!ri)
return NULL;
--
2.12.1
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
