Merge tag 'powerpc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:
 "Some nice cleanups like removing bootmem, and removal of
  __get_cpu_var().

  There is one patch to mm/gup.c.  This is the generic GUP
  implementation, but is only used by us and arm(64).  We have an ack
  from Steve Capper, and although we didn't get an ack from Andrew he
  told us to take the patch through the powerpc tree.

  There's one cxl patch.  This is in drivers/misc, but Greg said he was
  happy for us to manage fixes for it.

  There is an infrastructure patch to support an IPMI driver for OPAL.

  There is also an RTC driver for OPAL.  We weren't able to get any
  response from the RTC maintainer, Alessandro Zummo, so in the end we
  just merged the driver.

  The usual batch of Freescale updates from Scott"

* tag 'powerpc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (101 commits)
  powerpc/powernv: Return to cpu offline loop when finished in KVM guest
  powerpc/book3s: Fix partial invalidation of TLBs in MCE code.
  powerpc/mm: don't do tlbie for updatepp request with NO HPTE fault
  powerpc/xmon: Cleanup the breakpoint flags
  powerpc/xmon: Enable HW instruction breakpoint on POWER8
  powerpc/mm/thp: Use tlbiel if possible
  powerpc/mm/thp: Remove code duplication
  powerpc/mm/hugetlb: Sanity check gigantic hugepage count
  powerpc/oprofile: Disable pagefaults during user stack read
  powerpc/mm: Check for matching hpte without taking hpte lock
  powerpc: Drop useless warning in eeh_init()
  powerpc/powernv: Cleanup unused MCE definitions/declarations.
  powerpc/eeh: Dump PHB diag-data early
  powerpc/eeh: Recover EEH error on ownership change for BCM5719
  powerpc/eeh: Set EEH_PE_RESET on PE reset
  powerpc/eeh: Refactor eeh_reset_pe()
  powerpc: Remove more traces of bootmem
  powerpc/pseries: Initialise nvram_pstore_info's buf_lock
  cxl: Name interrupts in /proc/interrupt
  cxl: Return error to PSL if IRQ demultiplexing fails & print clearer warning
  ...

1 files changed, 26 insertions, 15 deletions

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 2248a1999c64..e1b6d8e17289 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -143,6 +143,8 @@ static int __init eeh_setup(char *str)
 {
         if (!strcmp(str, "off"))
                 eeh_add_flag(EEH_FORCE_DISABLED);
+        else if (!strcmp(str, "early_log"))
+                eeh_add_flag(EEH_EARLY_DUMP_LOG);
 
         return 1;
 }
@@ -758,30 +760,41 @@ static void eeh_reset_pe_once(struct eeh_pe *pe)
 int eeh_reset_pe(struct eeh_pe *pe)
 {
         int flags = (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE);
-        int i, rc;
+        int i, state, ret;
+
+        /* Mark as reset and block config space */
+        eeh_pe_state_mark(pe, EEH_PE_RESET | EEH_PE_CFG_BLOCKED);
 
         /* Take three shots at resetting the bus */
-        for (i=0; i<3; i++) {
+        for (i = 0; i < 3; i++) {
                 eeh_reset_pe_once(pe);
 
                 /*
                  * EEH_PE_ISOLATED is expected to be removed after
                  * BAR restore.
                  */
-                rc = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);
-                if ((rc & flags) == flags)
-                        return 0;
+                state = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);
+                if ((state & flags) == flags) {
+                        ret = 0;
+                        goto out;
+                }
 
-                if (rc < 0) {
-                        pr_err("%s: Unrecoverable slot failure on PHB#%d-PE#%x",
+                if (state < 0) {
+                        pr_warn("%s: Unrecoverable slot failure on PHB#%d-PE#%x",
                                 __func__, pe->phb->global_number, pe->addr);
-                        return -1;
+                        ret = -ENOTRECOVERABLE;
+                        goto out;
                 }
-                pr_err("EEH: bus reset %d failed on PHB#%d-PE#%x, rc=%d\n",
-                        i+1, pe->phb->global_number, pe->addr, rc);
+
+                /* We might run out of credits */
+                ret = -EIO;
+                pr_warn("%s: Failure %d resetting PHB#%x-PE#%x\n (%d)\n",
+                        __func__, state, pe->phb->global_number, pe->addr, (i + 1));
         }
 
-        return -1;
+out:
+        eeh_pe_state_clear(pe, EEH_PE_RESET | EEH_PE_CFG_BLOCKED);
+        return ret;
 }
 
 /**
@@ -920,11 +933,8 @@ int eeh_init(void)
                 pr_warn("%s: Platform EEH operation not found\n",
                         __func__);
                 return -EEXIST;
-        } else if ((ret = eeh_ops->init())) {
-                pr_warn("%s: Failed to call platform init function (%d)\n",
-                        __func__, ret);
+        } else if ((ret = eeh_ops->init()))
                 return ret;
-        }
 
         /* Initialize EEH event */
         ret = eeh_event_init();
@@ -1209,6 +1219,7 @@ int eeh_unfreeze_pe(struct eeh_pe *pe, bool sw_state)
 static struct pci_device_id eeh_reset_ids[] = {
         { PCI_DEVICE(0x19a2, 0x0710) }, /* Emulex, BE     */
         { PCI_DEVICE(0x10df, 0xe220) }, /* Emulex, Lancer */
+        { PCI_DEVICE(0x14e4, 0x1657) }, /* Broadcom BCM5719 */
         { 0 }
 };