2 files changed, 17 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 996d8844cbdf..0401f84f7b89 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -45,6 +45,9 @@
  */
 static int powernv_eeh_init(void)
 {
+        struct pci_controller *hose;
+        struct pnv_phb *phb;
+
         /* We require OPALv3 */
         if (!firmware_has_feature(FW_FEATURE_OPALv3)) {
                 pr_warning("%s: OPALv3 is required !\n", __func__);
@@ -54,6 +57,19 @@ static int powernv_eeh_init(void)
         /* Set probe mode */
         eeh_add_flag(EEH_PROBE_MODE_DEV);
 
+        /*
+         * P7IOC blocks PCI config access to frozen PE, but PHB3
+         * doesn't do that. So we have to selectively enable I/O
+         * prior to collecting error log.
+         */
+        list_for_each_entry(hose, &hose_list, list_node) {
+                phb = hose->private_data;
+
+                if (phb->model == PNV_PHB_MODEL_P7IOC)
+                        eeh_add_flag(EEH_ENABLE_IO_FOR_LOG);
+                break;
+        }
+
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index ba94b5b8d58c..dd1874ca56d9 100644
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -128,7 +128,7 @@ static int pseries_eeh_init(void)
         }
 
         /* Set EEH probe mode */
-        eeh_add_flag(EEH_PROBE_MODE_DEVTREE);
+        eeh_add_flag(EEH_PROBE_MODE_DEVTREE | EEH_ENABLE_IO_FOR_LOG);
 
         return 0;
 }