powerpc/eeh: Handle multiple EEH errors

For one PCI error relevant OPAL event, we possibly have multiple
EEH errors for that. For example, multiple frozen PEs detected on
different PHBs. Unfortunately, we didn't cover the case. The patch
enumarates the return value from eeh_ops::next_error() and change
eeh_handle_special_event() and eeh_ops::next_error() to handle all
existing EEH errors.

As Ben pointed out, we needn't list_for_each_entry_safe() since we
are not deleting any PHB from the hose_list and the EEH serialized
lock should be held while purging EEH events. The patch covers those
suggestions as well.

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

1 files changed, 24 insertions, 15 deletions

diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
index 007ac4989841..8dd16f4675a2 100644
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
@@ -735,12 +735,12 @@ static int ioda_eeh_get_pe(struct pci_controller *hose,
  */
 static int ioda_eeh_next_error(struct eeh_pe **pe)
 {
-        struct pci_controller *hose, *tmp;
+        struct pci_controller *hose;
         struct pnv_phb *phb;
         u64 frozen_pe_no;
         u16 err_type, severity;
         long rc;
-        int ret = 1;
+        int ret = EEH_NEXT_ERR_NONE;
 
         /*
          * While running here, it's safe to purge the event queue.
@@ -750,7 +750,7 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
         eeh_remove_event(NULL);
         opal_notifier_update_evt(OPAL_EVENT_PCI_ERROR, 0x0ul);
 
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
+        list_for_each_entry(hose, &hose_list, list_node) {
                 /*
                  * If the subordinate PCI buses of the PHB has been
                  * removed, we needn't take care of it any more.
@@ -789,19 +789,19 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
                 switch (err_type) {
                 case OPAL_EEH_IOC_ERROR:
                         if (severity == OPAL_EEH_SEV_IOC_DEAD) {
-                                list_for_each_entry_safe(hose, tmp,
-                                                &hose_list, list_node) {
+                                list_for_each_entry(hose, &hose_list,
+                                                    list_node) {
                                         phb = hose->private_data;
                                         phb->eeh_state |= PNV_EEH_STATE_REMOVED;
                                 }
 
                                 pr_err("EEH: dead IOC detected\n");
-                                ret = 4;
-                                goto out;
+                                ret = EEH_NEXT_ERR_DEAD_IOC;
                         } else if (severity == OPAL_EEH_SEV_INF) {
                                 pr_info("EEH: IOC informative error "
                                         "detected\n");
                                 ioda_eeh_hub_diag(hose);
+                                ret = EEH_NEXT_ERR_NONE;
                         }
 
                         break;
@@ -813,21 +813,20 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
                                 pr_err("EEH: dead PHB#%x detected\n",
                                         hose->global_number);
                                 phb->eeh_state |= PNV_EEH_STATE_REMOVED;
-                                ret = 3;
-                                goto out;
+                                ret = EEH_NEXT_ERR_DEAD_PHB;
                         } else if (severity == OPAL_EEH_SEV_PHB_FENCED) {
                                 if (ioda_eeh_get_phb_pe(hose, pe))
                                         break;
 
                                 pr_err("EEH: fenced PHB#%x detected\n",
                                         hose->global_number);
-                                ret = 2;
-                                goto out;
+                                ret = EEH_NEXT_ERR_FENCED_PHB;
                         } else if (severity == OPAL_EEH_SEV_INF) {
                                 pr_info("EEH: PHB#%x informative error "
                                         "detected\n",
                                         hose->global_number);
                                 ioda_eeh_phb_diag(hose);
+                                ret = EEH_NEXT_ERR_NONE;
                         }
 
                         break;
@@ -837,13 +836,23 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
 
                         pr_err("EEH: Frozen PE#%x on PHB#%x detected\n",
                                 (*pe)->addr, (*pe)->phb->global_number);
-                        ret = 1;
-                        goto out;
+                        ret = EEH_NEXT_ERR_FROZEN_PE;
+                        break;
+                default:
+                        pr_warn("%s: Unexpected error type %d\n",
+                                __func__, err_type);
                 }
+
+                /*
+                 * If we have no errors on the specific PHB or only
+                 * informative error there, we continue poking it.
+                 * Otherwise, we need actions to be taken by upper
+                 * layer.
+                 */
+                if (ret > EEH_NEXT_ERR_INF)
+                        break;
         }
 
-        ret = 0;
-out:
         return ret;
 }