powerpc/eeh: Create eeh_dev from pci_dn instead of device_node

The patch adds function traverse_pci_dn(), which is similar to
traverse_pci_devices() except it takes pci_dn, not device_node
as parameter. The pci_dev.c has been reworked to create eeh_dev
from pci_dn, instead of device_node.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

2 files changed, 47 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/eeh_dev.c b/arch/powerpc/kernel/eeh_dev.c
index e5274ee9a75f..aabba94ff9cb 100644
--- a/arch/powerpc/kernel/eeh_dev.c
+++ b/arch/powerpc/kernel/eeh_dev.c
@@ -43,13 +43,13 @@
 
 /**
  * eeh_dev_init - Create EEH device according to OF node
- * @dn: device node
+ * @pdn: PCI device node
  * @data: PHB
  *
  * It will create EEH device according to the given OF node. The function
  * might be called by PCI emunation, DR, PHB hotplug.
  */
-void *eeh_dev_init(struct device_node *dn, void *data)
+void *eeh_dev_init(struct pci_dn *pdn, void *data)
 {
         struct pci_controller *phb = data;
         struct eeh_dev *edev;
@@ -63,8 +63,8 @@ void *eeh_dev_init(struct device_node *dn, void *data)
         }
 
         /* Associate EEH device with OF node */
-        PCI_DN(dn)->edev = edev;
-        edev->dn  = dn;
+        pdn->edev = edev;
+        edev->pdn = pdn;
         edev->phb = phb;
         INIT_LIST_HEAD(&edev->list);
 
@@ -80,16 +80,16 @@ void *eeh_dev_init(struct device_node *dn, void *data)
  */
 void eeh_dev_phb_init_dynamic(struct pci_controller *phb)
 {
-        struct device_node *dn = phb->dn;
+        struct pci_dn *root = phb->pci_data;
 
         /* EEH PE for PHB */
         eeh_phb_pe_create(phb);
 
         /* EEH device for PHB */
-        eeh_dev_init(dn, phb);
+        eeh_dev_init(root, phb);
 
         /* EEH devices for children OF nodes */
-        traverse_pci_devices(dn, eeh_dev_init, phb);
+        traverse_pci_dn(root, eeh_dev_init, phb);
 }
 
 /**
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index d139f72ff9d5..65b98367005c 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -246,6 +246,46 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
         return NULL;
 }
 
+static struct pci_dn *pci_dn_next_one(struct pci_dn *root,
+                                      struct pci_dn *pdn)
+{
+        struct list_head *next = pdn->child_list.next;
+
+        if (next != &pdn->child_list)
+                return list_entry(next, struct pci_dn, list);
+
+        while (1) {
+                if (pdn == root)
+                        return NULL;
+
+                next = pdn->list.next;
+                if (next != &pdn->parent->child_list)
+                        break;
+
+                pdn = pdn->parent;
+        }
+
+        return list_entry(next, struct pci_dn, list);
+}
+
+void *traverse_pci_dn(struct pci_dn *root,
+                      void *(*fn)(struct pci_dn *, void *),
+                      void *data)
+{
+        struct pci_dn *pdn = root;
+        void *ret;
+
+        /* Only scan the child nodes */
+        for (pdn = pci_dn_next_one(root, pdn); pdn;
+             pdn = pci_dn_next_one(root, pdn)) {
+                ret = fn(pdn, data);
+                if (ret)
+                        return ret;
+        }
+
+        return NULL;
+}
+
 /** 
  * pci_devs_phb_init_dynamic - setup pci devices under this PHB
  * phb: pci-to-host bridge (top-level bridge connecting to cpu)