pci/of: Match PCI devices to OF nodes dynamically

powerpc has two different ways of matching PCI devices to their
corresponding OF node (if any) for historical reasons. The ppc64 one
does a scan looking for matching bus/dev/fn, while the ppc32 one does a
scan looking only for matching dev/fn on each level in order to be
agnostic to busses being renumbered (which Linux does on some
platforms).

This removes both and instead moves the matching code to the PCI core
itself. It's the most logical place to do it: when a pci_dev is created,
we know the parent and thus can do a single level scan for the matching
device_node (if any).

The benefit is that all archs now get the matching for free. There's one
hook the arch might want to provide to match a PHB bus to its device
node. A default weak implementation is provided that looks for the
parent device device node, but it's not entirely reliable on powerpc for
various reasons so powerpc provides its own.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>

4 files changed, 70 insertions, 2 deletions

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index c85f744270a5..f27f4a1488a1 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -70,4 +70,6 @@ obj-$(CONFIG_PCI_STUB) += pci-stub.o
 
 obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
 
+obj-$(CONFIG_OF) += of.o
+
 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 083034710fa6..1d002b1c2bf4 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -158,7 +158,7 @@ static void dlpar_pci_add_bus(struct device_node *dn)
         /* Scan below the new bridge */
         if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
             dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
-                of_scan_pci_bridge(dn, dev);
+                of_scan_pci_bridge(dev);
 
         /* Map IO space for child bus, which may or may not succeed */
         pcibios_map_io_space(dev->subordinate);
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
new file mode 100644
index 000000000000..c94d37ec55c8
--- /dev/null
+++ b/drivers/pci/of.c
@@ -0,0 +1,61 @@
+/*
+ * PCI <-> OF mapping helpers
+ *
+ * Copyright 2011 IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/of.h>
+#include <linux/of_pci.h>
+#include "pci.h"
+
+void pci_set_of_node(struct pci_dev *dev)
+{
+        if (!dev->bus->dev.of_node)
+                return;
+        dev->dev.of_node = of_pci_find_child_device(dev->bus->dev.of_node,
+                                                    dev->devfn);
+}
+
+void pci_release_of_node(struct pci_dev *dev)
+{
+        of_node_put(dev->dev.of_node);
+        dev->dev.of_node = NULL;
+}
+
+void pci_set_bus_of_node(struct pci_bus *bus)
+{
+        if (bus->self == NULL)
+                bus->dev.of_node = pcibios_get_phb_of_node(bus);
+        else
+                bus->dev.of_node = of_node_get(bus->self->dev.of_node);
+}
+
+void pci_release_bus_of_node(struct pci_bus *bus)
+{
+        of_node_put(bus->dev.of_node);
+        bus->dev.of_node = NULL;
+}
+
+struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)
+{
+        /* This should only be called for PHBs */
+        if (WARN_ON(bus->self || bus->parent))
+                return NULL;
+
+        /* Look for a node pointer in either the intermediary device we
+         * create above the root bus or it's own parent. Normally only
+         * the later is populated.
+         */
+        if (bus->bridge->of_node)
+                return of_node_get(bus->bridge->of_node);
+        if (bus->bridge->parent->of_node)
+                return of_node_get(bus->bridge->parent->of_node);
+        return NULL;
+}
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 48849ffdd672..c28c7b91910e 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -52,6 +52,7 @@ static void release_pcibus_dev(struct device *dev)
         if (pci_bus->bridge)
                 put_device(pci_bus->bridge);
         pci_bus_remove_resources(pci_bus);
+        pci_release_bus_of_node(pci_bus);
         kfree(pci_bus);
 }
 
@@ -588,7 +589,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
 
         child->self = bridge;
         child->bridge = get_device(&bridge->dev);
-
+        pci_set_bus_of_node(child);
         pci_set_bus_speed(child);
 
         /* Set up default resource pointers and names.. */
@@ -1038,6 +1039,7 @@ static void pci_release_dev(struct device *dev)
 
         pci_dev = to_pci_dev(dev);
         pci_release_capabilities(pci_dev);
+        pci_release_of_node(pci_dev);
         kfree(pci_dev);
 }
 
@@ -1157,6 +1159,8 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
         dev->vendor = l & 0xffff;
         dev->device = (l >> 16) & 0xffff;
 
+        pci_set_of_node(dev);
+
         if (pci_setup_device(dev)) {
                 kfree(dev);
                 return NULL;
@@ -1409,6 +1413,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
                 goto dev_reg_err;
         b->bridge = get_device(dev);
         device_enable_async_suspend(b->bridge);
+        pci_set_bus_of_node(b);
 
         if (!parent)
                 set_dev_node(b->bridge, pcibus_to_node(b));