On 15.05.17 14:22:05, Lorenzo Pieralisi wrote:
> The introduction of pci_bus_find_numa_node(pci_bus) allows at PCI
> host bridge registration to detect the NUMA node for a given
> struct pci_bus.dev. Implement an ACPI method that, through
> the struct pci_bus.bridge ACPI companion, retrieve and return
> the NUMA node corresponding to a given struct pci_bus.dev.
>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
> drivers/pci/pci-acpi.c | 20 ++++++++++++++++++++
> drivers/pci/pci.c | 2 +-
> include/linux/pci.h | 6 ++++++
> 3 files changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index e9803c1..451342d 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -5406,7 +5406,7 @@ int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent)
>
> int pci_bus_find_numa_node(struct pci_bus *bus)
> {
> - return NUMA_NO_NODE;
> + return acpi_disabled ? NUMA_NO_NODE : acpi_pci_bus_find_numa_node(bus);
I looked into how this works with devicetree.
With ACPI it is set directly in pci_register_host_bridge() with
set_dev_node().
For the DT case the set_dev_node call sets it to NUMA_NO_NODE first.
Since in DT the bridge is a platform device which has the node id
assigned already (if there is one), the bus' node id is set later in
device_add() when deriving it from the parent device which is the
bridge. So this should work.
I have tested it both DT and ACPI.
Thanks,
-Robert
> }
>
> /**
