4 files changed, 9 insertions, 2 deletions

diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index c5eb86f3d452..867c39b45df6 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -81,6 +81,7 @@ struct pci_dn;
 #define EEH_PE_KEEP             (1 << 8)        /* Keep PE on hotplug   */
 #define EEH_PE_CFG_RESTRICTED   (1 << 9)        /* Block config on error */
 #define EEH_PE_REMOVED          (1 << 10)       /* Removed permanently  */
+#define EEH_PE_PRI_BUS          (1 << 11)       /* Cached primary bus   */
 
 struct eeh_pe {
         int type;                       /* PE type: PHB/Bus/Device      */
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 8d14feb40f12..f69ecaa7ce33 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -564,6 +564,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus)
          */
         eeh_pe_state_mark(pe, EEH_PE_KEEP);
         if (bus) {
+                eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
                 pci_lock_rescan_remove();
                 pcibios_remove_pci_devices(bus);
                 pci_unlock_rescan_remove();
@@ -803,6 +804,7 @@ perm_error:
          * the their PCI config any more.
          */
         if (frozen_bus) {
+                eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
                 eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
 
                 pci_lock_rescan_remove();
@@ -886,6 +888,7 @@ static void eeh_handle_special_event(void)
                                         continue;
 
                                 /* Notify all devices to be down */
+                                eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
                                 bus = eeh_pe_bus_get(phb_pe);
                                 eeh_pe_dev_traverse(pe,
                                         eeh_report_failure, NULL);
diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index ca9e5371930e..98f81800e00c 100644
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -928,7 +928,7 @@ struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe)
                 bus = pe->phb->bus;
         } else if (pe->type & EEH_PE_BUS ||
                    pe->type & EEH_PE_DEVICE) {
-                if (pe->bus) {
+                if (pe->state & EEH_PE_PRI_BUS) {
                         bus = pe->bus;
                         goto out;
                 }
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 5f152b95ca0c..87f47e55aab6 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -444,9 +444,12 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data)
          * PCI devices of the PE are expected to be removed prior
          * to PE reset.
          */
-        if (!edev->pe->bus)
+        if (!(edev->pe->state & EEH_PE_PRI_BUS)) {
                 edev->pe->bus = pci_find_bus(hose->global_number,
                                              pdn->busno);
+                if (edev->pe->bus)
+                        edev->pe->state |= EEH_PE_PRI_BUS;
+        }
 
         /*
          * Enable EEH explicitly so that we will do EEH check