powerpc/eeh: Retrieve PHB from global list

Currently, the existing PHBs are retrieved from the FDT (Flat
Device Tree) based on the name of FDT node. Specificly, those
FDT nodes whose names have prefix "pci" are regarded as PHBs.
That's inappropriate because some PCI bridges possibilly have
names leading with "pci". It caused EEH is enabled on same
PCI devices for towice.

The patch fixes the above issue. Besides, the PHBs are expected
to be figured out from FDT before enable EEH on them. Therefore,
it's resonable to retrieve the PHBs from the global linked list
traced by variable "hose_list" insteading poking them from FDT.

For the EEH implementation on pSeries platform, RTAS is critical
because all low-level functions are implemented based on RTAS.
Therefore, we should make sure "/rtas" OF node is available and
ready before to enable EEH core. However, it actually introduced
duplicate since the previous pSeries platform dependent initialization
function already do the check. Besides, we want to make eeh core
platform independent, so RTAS related staff should be removed there.
The patch removes the duplicate check on "/rtas" OF node for eeh
core.

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

1 files changed, 5 insertions, 14 deletions

diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 8011088392d..309d38ef732 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -984,7 +984,8 @@ int __exit eeh_ops_unregister(const char *name)
  */
 void __init eeh_init(void)
 {
-        struct device_node *phb, *np;
+        struct pci_controller *hose, *tmp;
+        struct device_node *phb;
         int ret;
 
         /* call platform initialization function */
@@ -1000,19 +1001,9 @@ void __init eeh_init(void)
 
         raw_spin_lock_init(&confirm_error_lock);
 
-        np = of_find_node_by_path("/rtas");
-        if (np == NULL)
-                return;
-
-        /* Enable EEH for all adapters.  Note that eeh requires buid's */
-        for (phb = of_find_node_by_name(NULL, "pci"); phb;
-             phb = of_find_node_by_name(phb, "pci")) {
-                unsigned long buid;
-
-                buid = get_phb_buid(phb);
-                if (buid == 0 || !of_node_to_eeh_dev(phb))
-                        continue;
-
+        /* Enable EEH for all adapters */
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
+                phb = hose->dn;
                 traverse_pci_devices(phb, eeh_early_enable, NULL);
         }