Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[cascardo/linux.git] / arch / powerpc / platforms / powernv / eeh-powernv.c
index a7087f4..ce738ab 100644 (file)
@@ -286,10 +286,82 @@ static int pnv_eeh_post_init(void)
        return ret;
 }
 
+static int pnv_eeh_cap_start(struct pci_dn *pdn)
+{
+       u32 status;
+
+       if (!pdn)
+               return 0;
+
+       pnv_pci_cfg_read(pdn, PCI_STATUS, 2, &status);
+       if (!(status & PCI_STATUS_CAP_LIST))
+               return 0;
+
+       return PCI_CAPABILITY_LIST;
+}
+
+static int pnv_eeh_find_cap(struct pci_dn *pdn, int cap)
+{
+       int pos = pnv_eeh_cap_start(pdn);
+       int cnt = 48;   /* Maximal number of capabilities */
+       u32 id;
+
+       if (!pos)
+               return 0;
+
+       while (cnt--) {
+               pnv_pci_cfg_read(pdn, pos, 1, &pos);
+               if (pos < 0x40)
+                       break;
+
+               pos &= ~3;
+               pnv_pci_cfg_read(pdn, pos + PCI_CAP_LIST_ID, 1, &id);
+               if (id == 0xff)
+                       break;
+
+               /* Found */
+               if (id == cap)
+                       return pos;
+
+               /* Next one */
+               pos += PCI_CAP_LIST_NEXT;
+       }
+
+       return 0;
+}
+
+static int pnv_eeh_find_ecap(struct pci_dn *pdn, int cap)
+{
+       struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
+       u32 header;
+       int pos = 256, ttl = (4096 - 256) / 8;
+
+       if (!edev || !edev->pcie_cap)
+               return 0;
+       if (pnv_pci_cfg_read(pdn, pos, 4, &header) != PCIBIOS_SUCCESSFUL)
+               return 0;
+       else if (!header)
+               return 0;
+
+       while (ttl-- > 0) {
+               if (PCI_EXT_CAP_ID(header) == cap && pos)
+                       return pos;
+
+               pos = PCI_EXT_CAP_NEXT(header);
+               if (pos < 256)
+                       break;
+
+               if (pnv_pci_cfg_read(pdn, pos, 4, &header) != PCIBIOS_SUCCESSFUL)
+                       break;
+       }
+
+       return 0;
+}
+
 /**
- * pnv_eeh_dev_probe - Do probe on PCI device
- * @dev: PCI device
- * @flag: unused
+ * pnv_eeh_probe - Do probe on PCI device
+ * @pdn: PCI device node
+ * @data: unused
  *
  * When EEH module is installed during system boot, all PCI devices
  * are checked one by one to see if it supports EEH. The function
@@ -303,12 +375,12 @@ static int pnv_eeh_post_init(void)
  * was possiblly triggered by EEH core, the binding between EEH device
  * and the PCI device isn't built yet.
  */
-static int pnv_eeh_dev_probe(struct pci_dev *dev, void *flag)
+static void *pnv_eeh_probe(struct pci_dn *pdn, void *data)
 {
-       struct pci_controller *hose = pci_bus_to_host(dev->bus);
+       struct pci_controller *hose = pdn->phb;
        struct pnv_phb *phb = hose->private_data;
-       struct device_node *dn = pci_device_to_OF_node(dev);
-       struct eeh_dev *edev = of_node_to_eeh_dev(dn);
+       struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
+       uint32_t pcie_flags;
        int ret;
 
        /*
@@ -317,40 +389,42 @@ static int pnv_eeh_dev_probe(struct pci_dev *dev, void *flag)
         * the root bridge. So it's not reasonable to continue
         * the probing.
         */
-       if (!dn || !edev || edev->pe)
-               return 0;
+       if (!edev || edev->pe)
+               return NULL;
 
        /* Skip for PCI-ISA bridge */
-       if ((dev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
-               return 0;
+       if ((pdn->class_code >> 8) == PCI_CLASS_BRIDGE_ISA)
+               return NULL;
 
        /* Initialize eeh device */
-       edev->class_code = dev->class;
+       edev->class_code = pdn->class_code;
        edev->mode      &= 0xFFFFFF00;
-       if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
+       edev->pcix_cap = pnv_eeh_find_cap(pdn, PCI_CAP_ID_PCIX);
+       edev->pcie_cap = pnv_eeh_find_cap(pdn, PCI_CAP_ID_EXP);
+       edev->aer_cap  = pnv_eeh_find_ecap(pdn, PCI_EXT_CAP_ID_ERR);
+       if ((edev->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {
                edev->mode |= EEH_DEV_BRIDGE;
-       edev->pcix_cap = pci_find_capability(dev, PCI_CAP_ID_PCIX);
-       if (pci_is_pcie(dev)) {
-               edev->pcie_cap = pci_pcie_cap(dev);
-
-               if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
-                       edev->mode |= EEH_DEV_ROOT_PORT;
-               else if (pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM)
-                       edev->mode |= EEH_DEV_DS_PORT;
-
-               edev->aer_cap = pci_find_ext_capability(dev,
-                                                       PCI_EXT_CAP_ID_ERR);
+               if (edev->pcie_cap) {
+                       pnv_pci_cfg_read(pdn, edev->pcie_cap + PCI_EXP_FLAGS,
+                                        2, &pcie_flags);
+                       pcie_flags = (pcie_flags & PCI_EXP_FLAGS_TYPE) >> 4;
+                       if (pcie_flags == PCI_EXP_TYPE_ROOT_PORT)
+                               edev->mode |= EEH_DEV_ROOT_PORT;
+                       else if (pcie_flags == PCI_EXP_TYPE_DOWNSTREAM)
+                               edev->mode |= EEH_DEV_DS_PORT;
+               }
        }
 
-       edev->config_addr       = ((dev->bus->number << 8) | dev->devfn);
-       edev->pe_config_addr    = phb->bdfn_to_pe(phb, dev->bus, dev->devfn & 0xff);
+       edev->config_addr    = (pdn->busno << 8) | (pdn->devfn);
+       edev->pe_config_addr = phb->ioda.pe_rmap[edev->config_addr];
 
        /* Create PE */
        ret = eeh_add_to_parent_pe(edev);
        if (ret) {
-               pr_warn("%s: Can't add PCI dev %s to parent PE (%d)\n",
-                       __func__, pci_name(dev), ret);
-               return ret;
+               pr_warn("%s: Can't add PCI dev %04x:%02x:%02x.%01x to parent PE (%d)\n",
+                       __func__, hose->global_number, pdn->busno,
+                       PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn), ret);
+               return NULL;
        }
 
        /*
@@ -369,8 +443,10 @@ static int pnv_eeh_dev_probe(struct pci_dev *dev, void *flag)
         * Broadcom Austin 4-ports NICs (14e4:1657)
         * Broadcom Shiner 2-ports 10G NICs (14e4:168e)
         */
-       if ((dev->vendor == PCI_VENDOR_ID_BROADCOM && dev->device == 0x1657) ||
-           (dev->vendor == PCI_VENDOR_ID_BROADCOM && dev->device == 0x168e))
+       if ((pdn->vendor_id == PCI_VENDOR_ID_BROADCOM &&
+            pdn->device_id == 0x1657) ||
+           (pdn->vendor_id == PCI_VENDOR_ID_BROADCOM &&
+            pdn->device_id == 0x168e))
                edev->pe->state |= EEH_PE_CFG_RESTRICTED;
 
        /*
@@ -380,7 +456,8 @@ static int pnv_eeh_dev_probe(struct pci_dev *dev, void *flag)
         * to PE reset.
         */
        if (!edev->pe->bus)
-               edev->pe->bus = dev->bus;
+               edev->pe->bus = pci_find_bus(hose->global_number,
+                                            pdn->busno);
 
        /*
         * Enable EEH explicitly so that we will do EEH check
@@ -391,7 +468,7 @@ static int pnv_eeh_dev_probe(struct pci_dev *dev, void *flag)
        /* Save memory bars */
        eeh_save_bars(edev);
 
-       return 0;
+       return NULL;
 }
 
 /**
@@ -407,14 +484,61 @@ static int pnv_eeh_set_option(struct eeh_pe *pe, int option)
 {
        struct pci_controller *hose = pe->phb;
        struct pnv_phb *phb = hose->private_data;
-       int ret = -EEXIST;
+       bool freeze_pe = false;
+       int opt, ret = 0;
+       s64 rc;
 
-       /*
-        * What we need do is pass it down for hardware
-        * implementation to handle it.
-        */
-       if (phb->eeh_ops && phb->eeh_ops->set_option)
-               ret = phb->eeh_ops->set_option(pe, option);
+       /* Sanity check on option */
+       switch (option) {
+       case EEH_OPT_DISABLE:
+               return -EPERM;
+       case EEH_OPT_ENABLE:
+               return 0;
+       case EEH_OPT_THAW_MMIO:
+               opt = OPAL_EEH_ACTION_CLEAR_FREEZE_MMIO;
+               break;
+       case EEH_OPT_THAW_DMA:
+               opt = OPAL_EEH_ACTION_CLEAR_FREEZE_DMA;
+               break;
+       case EEH_OPT_FREEZE_PE:
+               freeze_pe = true;
+               opt = OPAL_EEH_ACTION_SET_FREEZE_ALL;
+               break;
+       default:
+               pr_warn("%s: Invalid option %d\n", __func__, option);
+               return -EINVAL;
+       }
+
+       /* If PHB supports compound PE, to handle it */
+       if (freeze_pe) {
+               if (phb->freeze_pe) {
+                       phb->freeze_pe(phb, pe->addr);
+               } else {
+                       rc = opal_pci_eeh_freeze_set(phb->opal_id,
+                                                    pe->addr, opt);
+                       if (rc != OPAL_SUCCESS) {
+                               pr_warn("%s: Failure %lld freezing "
+                                       "PHB#%x-PE#%x\n",
+                                       __func__, rc,
+                                       phb->hose->global_number, pe->addr);
+                               ret = -EIO;
+                       }
+               }
+       } else {
+               if (phb->unfreeze_pe) {
+                       ret = phb->unfreeze_pe(phb, pe->addr, opt);
+               } else {
+                       rc = opal_pci_eeh_freeze_clear(phb->opal_id,
+                                                      pe->addr, opt);
+                       if (rc != OPAL_SUCCESS) {
+                               pr_warn("%s: Failure %lld enable %d "
+                                       "for PHB#%x-PE#%x\n",
+                                       __func__, rc, option,
+                                       phb->hose->global_number, pe->addr);
+                               ret = -EIO;
+                       }
+               }
+       }
 
        return ret;
 }
@@ -431,6 +555,159 @@ static int pnv_eeh_get_pe_addr(struct eeh_pe *pe)
        return pe->addr;
 }
 
+static void pnv_eeh_get_phb_diag(struct eeh_pe *pe)
+{
+       struct pnv_phb *phb = pe->phb->private_data;
+       s64 rc;
+
+       rc = opal_pci_get_phb_diag_data2(phb->opal_id, pe->data,
+                                        PNV_PCI_DIAG_BUF_SIZE);
+       if (rc != OPAL_SUCCESS)
+               pr_warn("%s: Failure %lld getting PHB#%x diag-data\n",
+                       __func__, rc, pe->phb->global_number);
+}
+
+static int pnv_eeh_get_phb_state(struct eeh_pe *pe)
+{
+       struct pnv_phb *phb = pe->phb->private_data;
+       u8 fstate;
+       __be16 pcierr;
+       s64 rc;
+       int result = 0;
+
+       rc = opal_pci_eeh_freeze_status(phb->opal_id,
+                                       pe->addr,
+                                       &fstate,
+                                       &pcierr,
+                                       NULL);
+       if (rc != OPAL_SUCCESS) {
+               pr_warn("%s: Failure %lld getting PHB#%x state\n",
+                       __func__, rc, phb->hose->global_number);
+               return EEH_STATE_NOT_SUPPORT;
+       }
+
+       /*
+        * Check PHB state. If the PHB is frozen for the
+        * first time, to dump the PHB diag-data.
+        */
+       if (be16_to_cpu(pcierr) != OPAL_EEH_PHB_ERROR) {
+               result = (EEH_STATE_MMIO_ACTIVE  |
+                         EEH_STATE_DMA_ACTIVE   |
+                         EEH_STATE_MMIO_ENABLED |
+                         EEH_STATE_DMA_ENABLED);
+       } else if (!(pe->state & EEH_PE_ISOLATED)) {
+               eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
+               pnv_eeh_get_phb_diag(pe);
+
+               if (eeh_has_flag(EEH_EARLY_DUMP_LOG))
+                       pnv_pci_dump_phb_diag_data(pe->phb, pe->data);
+       }
+
+       return result;
+}
+
+static int pnv_eeh_get_pe_state(struct eeh_pe *pe)
+{
+       struct pnv_phb *phb = pe->phb->private_data;
+       u8 fstate;
+       __be16 pcierr;
+       s64 rc;
+       int result;
+
+       /*
+        * We don't clobber hardware frozen state until PE
+        * reset is completed. In order to keep EEH core
+        * moving forward, we have to return operational
+        * state during PE reset.
+        */
+       if (pe->state & EEH_PE_RESET) {
+               result = (EEH_STATE_MMIO_ACTIVE  |
+                         EEH_STATE_DMA_ACTIVE   |
+                         EEH_STATE_MMIO_ENABLED |
+                         EEH_STATE_DMA_ENABLED);
+               return result;
+       }
+
+       /*
+        * Fetch PE state from hardware. If the PHB
+        * supports compound PE, let it handle that.
+        */
+       if (phb->get_pe_state) {
+               fstate = phb->get_pe_state(phb, pe->addr);
+       } else {
+               rc = opal_pci_eeh_freeze_status(phb->opal_id,
+                                               pe->addr,
+                                               &fstate,
+                                               &pcierr,
+                                               NULL);
+               if (rc != OPAL_SUCCESS) {
+                       pr_warn("%s: Failure %lld getting PHB#%x-PE%x state\n",
+                               __func__, rc, phb->hose->global_number,
+                               pe->addr);
+                       return EEH_STATE_NOT_SUPPORT;
+               }
+       }
+
+       /* Figure out state */
+       switch (fstate) {
+       case OPAL_EEH_STOPPED_NOT_FROZEN:
+               result = (EEH_STATE_MMIO_ACTIVE  |
+                         EEH_STATE_DMA_ACTIVE   |
+                         EEH_STATE_MMIO_ENABLED |
+                         EEH_STATE_DMA_ENABLED);
+               break;
+       case OPAL_EEH_STOPPED_MMIO_FREEZE:
+               result = (EEH_STATE_DMA_ACTIVE |
+                         EEH_STATE_DMA_ENABLED);
+               break;
+       case OPAL_EEH_STOPPED_DMA_FREEZE:
+               result = (EEH_STATE_MMIO_ACTIVE |
+                         EEH_STATE_MMIO_ENABLED);
+               break;
+       case OPAL_EEH_STOPPED_MMIO_DMA_FREEZE:
+               result = 0;
+               break;
+       case OPAL_EEH_STOPPED_RESET:
+               result = EEH_STATE_RESET_ACTIVE;
+               break;
+       case OPAL_EEH_STOPPED_TEMP_UNAVAIL:
+               result = EEH_STATE_UNAVAILABLE;
+               break;
+       case OPAL_EEH_STOPPED_PERM_UNAVAIL:
+               result = EEH_STATE_NOT_SUPPORT;
+               break;
+       default:
+               result = EEH_STATE_NOT_SUPPORT;
+               pr_warn("%s: Invalid PHB#%x-PE#%x state %x\n",
+                       __func__, phb->hose->global_number,
+                       pe->addr, fstate);
+       }
+
+       /*
+        * If PHB supports compound PE, to freeze all
+        * slave PEs for consistency.
+        *
+        * If the PE is switching to frozen state for the
+        * first time, to dump the PHB diag-data.
+        */
+       if (!(result & EEH_STATE_NOT_SUPPORT) &&
+           !(result & EEH_STATE_UNAVAILABLE) &&
+           !(result & EEH_STATE_MMIO_ACTIVE) &&
+           !(result & EEH_STATE_DMA_ACTIVE)  &&
+           !(pe->state & EEH_PE_ISOLATED)) {
+               if (phb->freeze_pe)
+                       phb->freeze_pe(phb, pe->addr);
+
+               eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
+               pnv_eeh_get_phb_diag(pe);
+
+               if (eeh_has_flag(EEH_EARLY_DUMP_LOG))
+                       pnv_pci_dump_phb_diag_data(pe->phb, pe->data);
+       }
+
+       return result;
+}
+
 /**
  * pnv_eeh_get_state - Retrieve PE state
  * @pe: EEH PE
@@ -443,26 +720,189 @@ static int pnv_eeh_get_pe_addr(struct eeh_pe *pe)
  */
 static int pnv_eeh_get_state(struct eeh_pe *pe, int *delay)
 {
-       struct pci_controller *hose = pe->phb;
+       int ret;
+
+       if (pe->type & EEH_PE_PHB)
+               ret = pnv_eeh_get_phb_state(pe);
+       else
+               ret = pnv_eeh_get_pe_state(pe);
+
+       if (!delay)
+               return ret;
+
+       /*
+        * If the PE state is temporarily unavailable,
+        * to inform the EEH core delay for default
+        * period (1 second)
+        */
+       *delay = 0;
+       if (ret & EEH_STATE_UNAVAILABLE)
+               *delay = 1000;
+
+       return ret;
+}
+
+static s64 pnv_eeh_phb_poll(struct pnv_phb *phb)
+{
+       s64 rc = OPAL_HARDWARE;
+
+       while (1) {
+               rc = opal_pci_poll(phb->opal_id);
+               if (rc <= 0)
+                       break;
+
+               if (system_state < SYSTEM_RUNNING)
+                       udelay(1000 * rc);
+               else
+                       msleep(rc);
+       }
+
+       return rc;
+}
+
+int pnv_eeh_phb_reset(struct pci_controller *hose, int option)
+{
        struct pnv_phb *phb = hose->private_data;
-       int ret = EEH_STATE_NOT_SUPPORT;
+       s64 rc = OPAL_HARDWARE;
+
+       pr_debug("%s: Reset PHB#%x, option=%d\n",
+                __func__, hose->global_number, option);
+
+       /* Issue PHB complete reset request */
+       if (option == EEH_RESET_FUNDAMENTAL ||
+           option == EEH_RESET_HOT)
+               rc = opal_pci_reset(phb->opal_id,
+                                   OPAL_RESET_PHB_COMPLETE,
+                                   OPAL_ASSERT_RESET);
+       else if (option == EEH_RESET_DEACTIVATE)
+               rc = opal_pci_reset(phb->opal_id,
+                                   OPAL_RESET_PHB_COMPLETE,
+                                   OPAL_DEASSERT_RESET);
+       if (rc < 0)
+               goto out;
 
-       if (phb->eeh_ops && phb->eeh_ops->get_state) {
-               ret = phb->eeh_ops->get_state(pe);
+       /*
+        * Poll state of the PHB until the request is done
+        * successfully. The PHB reset is usually PHB complete
+        * reset followed by hot reset on root bus. So we also
+        * need the PCI bus settlement delay.
+        */
+       rc = pnv_eeh_phb_poll(phb);
+       if (option == EEH_RESET_DEACTIVATE) {
+               if (system_state < SYSTEM_RUNNING)
+                       udelay(1000 * EEH_PE_RST_SETTLE_TIME);
+               else
+                       msleep(EEH_PE_RST_SETTLE_TIME);
+       }
+out:
+       if (rc != OPAL_SUCCESS)
+               return -EIO;
 
-               /*
-                * If the PE state is temporarily unavailable,
-                * to inform the EEH core delay for default
-                * period (1 second)
-                */
-               if (delay) {
-                       *delay = 0;
-                       if (ret & EEH_STATE_UNAVAILABLE)
-                               *delay = 1000;
+       return 0;
+}
+
+static int pnv_eeh_root_reset(struct pci_controller *hose, int option)
+{
+       struct pnv_phb *phb = hose->private_data;
+       s64 rc = OPAL_HARDWARE;
+
+       pr_debug("%s: Reset PHB#%x, option=%d\n",
+                __func__, hose->global_number, option);
+
+       /*
+        * During the reset deassert time, we needn't care
+        * the reset scope because the firmware does nothing
+        * for fundamental or hot reset during deassert phase.
+        */
+       if (option == EEH_RESET_FUNDAMENTAL)
+               rc = opal_pci_reset(phb->opal_id,
+                                   OPAL_RESET_PCI_FUNDAMENTAL,
+                                   OPAL_ASSERT_RESET);
+       else if (option == EEH_RESET_HOT)
+               rc = opal_pci_reset(phb->opal_id,
+                                   OPAL_RESET_PCI_HOT,
+                                   OPAL_ASSERT_RESET);
+       else if (option == EEH_RESET_DEACTIVATE)
+               rc = opal_pci_reset(phb->opal_id,
+                                   OPAL_RESET_PCI_HOT,
+                                   OPAL_DEASSERT_RESET);
+       if (rc < 0)
+               goto out;
+
+       /* Poll state of the PHB until the request is done */
+       rc = pnv_eeh_phb_poll(phb);
+       if (option == EEH_RESET_DEACTIVATE)
+               msleep(EEH_PE_RST_SETTLE_TIME);
+out:
+       if (rc != OPAL_SUCCESS)
+               return -EIO;
+
+       return 0;
+}
+
+static int pnv_eeh_bridge_reset(struct pci_dev *dev, int option)
+{
+       struct pci_dn *pdn = pci_get_pdn_by_devfn(dev->bus, dev->devfn);
+       struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
+       int aer = edev ? edev->aer_cap : 0;
+       u32 ctrl;
+
+       pr_debug("%s: Reset PCI bus %04x:%02x with option %d\n",
+                __func__, pci_domain_nr(dev->bus),
+                dev->bus->number, option);
+
+       switch (option) {
+       case EEH_RESET_FUNDAMENTAL:
+       case EEH_RESET_HOT:
+               /* Don't report linkDown event */
+               if (aer) {
+                       eeh_ops->read_config(pdn, aer + PCI_ERR_UNCOR_MASK,
+                                            4, &ctrl);
+                       ctrl |= PCI_ERR_UNC_SURPDN;
+                       eeh_ops->write_config(pdn, aer + PCI_ERR_UNCOR_MASK,
+                                             4, ctrl);
                }
+
+               eeh_ops->read_config(pdn, PCI_BRIDGE_CONTROL, 2, &ctrl);
+               ctrl |= PCI_BRIDGE_CTL_BUS_RESET;
+               eeh_ops->write_config(pdn, PCI_BRIDGE_CONTROL, 2, ctrl);
+
+               msleep(EEH_PE_RST_HOLD_TIME);
+               break;
+       case EEH_RESET_DEACTIVATE:
+               eeh_ops->read_config(pdn, PCI_BRIDGE_CONTROL, 2, &ctrl);
+               ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET;
+               eeh_ops->write_config(pdn, PCI_BRIDGE_CONTROL, 2, ctrl);
+
+               msleep(EEH_PE_RST_SETTLE_TIME);
+
+               /* Continue reporting linkDown event */
+               if (aer) {
+                       eeh_ops->read_config(pdn, aer + PCI_ERR_UNCOR_MASK,
+                                            4, &ctrl);
+                       ctrl &= ~PCI_ERR_UNC_SURPDN;
+                       eeh_ops->write_config(pdn, aer + PCI_ERR_UNCOR_MASK,
+                                             4, ctrl);
+               }
+
+               break;
        }
 
-       return ret;
+       return 0;
+}
+
+void pnv_pci_reset_secondary_bus(struct pci_dev *dev)
+{
+       struct pci_controller *hose;
+
+       if (pci_is_root_bus(dev->bus)) {
+               hose = pci_bus_to_host(dev->bus);
+               pnv_eeh_root_reset(hose, EEH_RESET_HOT);
+               pnv_eeh_root_reset(hose, EEH_RESET_DEACTIVATE);
+       } else {
+               pnv_eeh_bridge_reset(dev, EEH_RESET_HOT);
+               pnv_eeh_bridge_reset(dev, EEH_RESET_DEACTIVATE);
+       }
 }
 
 /**
@@ -470,16 +910,68 @@ static int pnv_eeh_get_state(struct eeh_pe *pe, int *delay)
  * @pe: EEH PE
  * @option: reset option
  *
- * Reset the specified PE
+ * Do reset on the indicated PE. For PCI bus sensitive PE,
+ * we need to reset the parent p2p bridge. The PHB has to
+ * be reinitialized if the p2p bridge is root bridge. For
+ * PCI device sensitive PE, we will try to reset the device
+ * through FLR. For now, we don't have OPAL APIs to do HARD
+ * reset yet, so all reset would be SOFT (HOT) reset.
  */
 static int pnv_eeh_reset(struct eeh_pe *pe, int option)
 {
        struct pci_controller *hose = pe->phb;
-       struct pnv_phb *phb = hose->private_data;
-       int ret = -EEXIST;
+       struct pci_bus *bus;
+       int ret;
+
+       /*
+        * For PHB reset, we always have complete reset. For those PEs whose
+        * primary bus derived from root complex (root bus) or root port
+        * (usually bus#1), we apply hot or fundamental reset on the root port.
+        * For other PEs, we always have hot reset on the PE primary bus.
+        *
+        * Here, we have different design to pHyp, which always clear the
+        * frozen state during PE reset. However, the good idea here from
+        * benh is to keep frozen state before we get PE reset done completely
+        * (until BAR restore). With the frozen state, HW drops illegal IO
+        * or MMIO access, which can incur recrusive frozen PE during PE
+        * reset. The side effect is that EEH core has to clear the frozen
+        * state explicitly after BAR restore.
+        */
+       if (pe->type & EEH_PE_PHB) {
+               ret = pnv_eeh_phb_reset(hose, option);
+       } else {
+               struct pnv_phb *phb;
+               s64 rc;
+
+               /*
+                * The frozen PE might be caused by PAPR error injection
+                * registers, which are expected to be cleared after hitting
+                * frozen PE as stated in the hardware spec. Unfortunately,
+                * that's not true on P7IOC. So we have to clear it manually
+                * to avoid recursive EEH errors during recovery.
+                */
+               phb = hose->private_data;
+               if (phb->model == PNV_PHB_MODEL_P7IOC &&
+                   (option == EEH_RESET_HOT ||
+                   option == EEH_RESET_FUNDAMENTAL)) {
+                       rc = opal_pci_reset(phb->opal_id,
+                                           OPAL_RESET_PHB_ERROR,
+                                           OPAL_ASSERT_RESET);
+                       if (rc != OPAL_SUCCESS) {
+                               pr_warn("%s: Failure %lld clearing "
+                                       "error injection registers\n",
+                                       __func__, rc);
+                               return -EIO;
+                       }
+               }
 
-       if (phb->eeh_ops && phb->eeh_ops->reset)
-               ret = phb->eeh_ops->reset(pe, option);
+               bus = eeh_pe_bus_get(pe);
+               if (pci_is_root_bus(bus) ||
+                       pci_is_root_bus(bus->parent))
+                       ret = pnv_eeh_root_reset(hose, option);
+               else
+                       ret = pnv_eeh_bridge_reset(bus->self, option);
+       }
 
        return ret;
 }
@@ -607,9 +1099,9 @@ static int pnv_eeh_err_inject(struct eeh_pe *pe, int type, int func,
        return 0;
 }
 
-static inline bool pnv_eeh_cfg_blocked(struct device_node *dn)
+static inline bool pnv_eeh_cfg_blocked(struct pci_dn *pdn)
 {
-       struct eeh_dev *edev = of_node_to_eeh_dev(dn);
+       struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
 
        if (!edev || !edev->pe)
                return false;
@@ -620,51 +1112,377 @@ static inline bool pnv_eeh_cfg_blocked(struct device_node *dn)
        return false;
 }
 
-static int pnv_eeh_read_config(struct device_node *dn,
+static int pnv_eeh_read_config(struct pci_dn *pdn,
                               int where, int size, u32 *val)
 {
-       if (pnv_eeh_cfg_blocked(dn)) {
+       if (!pdn)
+               return PCIBIOS_DEVICE_NOT_FOUND;
+
+       if (pnv_eeh_cfg_blocked(pdn)) {
                *val = 0xFFFFFFFF;
                return PCIBIOS_SET_FAILED;
        }
 
-       return pnv_pci_cfg_read(dn, where, size, val);
+       return pnv_pci_cfg_read(pdn, where, size, val);
 }
 
-static int pnv_eeh_write_config(struct device_node *dn,
+static int pnv_eeh_write_config(struct pci_dn *pdn,
                                int where, int size, u32 val)
 {
-       if (pnv_eeh_cfg_blocked(dn))
+       if (!pdn)
+               return PCIBIOS_DEVICE_NOT_FOUND;
+
+       if (pnv_eeh_cfg_blocked(pdn))
                return PCIBIOS_SET_FAILED;
 
-       return pnv_pci_cfg_write(dn, where, size, val);
+       return pnv_pci_cfg_write(pdn, where, size, val);
+}
+
+static void pnv_eeh_dump_hub_diag_common(struct OpalIoP7IOCErrorData *data)
+{
+       /* GEM */
+       if (data->gemXfir || data->gemRfir ||
+           data->gemRirqfir || data->gemMask || data->gemRwof)
+               pr_info("  GEM: %016llx %016llx %016llx %016llx %016llx\n",
+                       be64_to_cpu(data->gemXfir),
+                       be64_to_cpu(data->gemRfir),
+                       be64_to_cpu(data->gemRirqfir),
+                       be64_to_cpu(data->gemMask),
+                       be64_to_cpu(data->gemRwof));
+
+       /* LEM */
+       if (data->lemFir || data->lemErrMask ||
+           data->lemAction0 || data->lemAction1 || data->lemWof)
+               pr_info("  LEM: %016llx %016llx %016llx %016llx %016llx\n",
+                       be64_to_cpu(data->lemFir),
+                       be64_to_cpu(data->lemErrMask),
+                       be64_to_cpu(data->lemAction0),
+                       be64_to_cpu(data->lemAction1),
+                       be64_to_cpu(data->lemWof));
+}
+
+static void pnv_eeh_get_and_dump_hub_diag(struct pci_controller *hose)
+{
+       struct pnv_phb *phb = hose->private_data;
+       struct OpalIoP7IOCErrorData *data = &phb->diag.hub_diag;
+       long rc;
+
+       rc = opal_pci_get_hub_diag_data(phb->hub_id, data, sizeof(*data));
+       if (rc != OPAL_SUCCESS) {
+               pr_warn("%s: Failed to get HUB#%llx diag-data (%ld)\n",
+                       __func__, phb->hub_id, rc);
+               return;
+       }
+
+       switch (data->type) {
+       case OPAL_P7IOC_DIAG_TYPE_RGC:
+               pr_info("P7IOC diag-data for RGC\n\n");
+               pnv_eeh_dump_hub_diag_common(data);
+               if (data->rgc.rgcStatus || data->rgc.rgcLdcp)
+                       pr_info("  RGC: %016llx %016llx\n",
+                               be64_to_cpu(data->rgc.rgcStatus),
+                               be64_to_cpu(data->rgc.rgcLdcp));
+               break;
+       case OPAL_P7IOC_DIAG_TYPE_BI:
+               pr_info("P7IOC diag-data for BI %s\n\n",
+                       data->bi.biDownbound ? "Downbound" : "Upbound");
+               pnv_eeh_dump_hub_diag_common(data);
+               if (data->bi.biLdcp0 || data->bi.biLdcp1 ||
+                   data->bi.biLdcp2 || data->bi.biFenceStatus)
+                       pr_info("  BI:  %016llx %016llx %016llx %016llx\n",
+                               be64_to_cpu(data->bi.biLdcp0),
+                               be64_to_cpu(data->bi.biLdcp1),
+                               be64_to_cpu(data->bi.biLdcp2),
+                               be64_to_cpu(data->bi.biFenceStatus));
+               break;
+       case OPAL_P7IOC_DIAG_TYPE_CI:
+               pr_info("P7IOC diag-data for CI Port %d\n\n",
+                       data->ci.ciPort);
+               pnv_eeh_dump_hub_diag_common(data);
+               if (data->ci.ciPortStatus || data->ci.ciPortLdcp)
+                       pr_info("  CI:  %016llx %016llx\n",
+                               be64_to_cpu(data->ci.ciPortStatus),
+                               be64_to_cpu(data->ci.ciPortLdcp));
+               break;
+       case OPAL_P7IOC_DIAG_TYPE_MISC:
+               pr_info("P7IOC diag-data for MISC\n\n");
+               pnv_eeh_dump_hub_diag_common(data);
+               break;
+       case OPAL_P7IOC_DIAG_TYPE_I2C:
+               pr_info("P7IOC diag-data for I2C\n\n");
+               pnv_eeh_dump_hub_diag_common(data);
+               break;
+       default:
+               pr_warn("%s: Invalid type of HUB#%llx diag-data (%d)\n",
+                       __func__, phb->hub_id, data->type);
+       }
+}
+
+static int pnv_eeh_get_pe(struct pci_controller *hose,
+                         u16 pe_no, struct eeh_pe **pe)
+{
+       struct pnv_phb *phb = hose->private_data;
+       struct pnv_ioda_pe *pnv_pe;
+       struct eeh_pe *dev_pe;
+       struct eeh_dev edev;
+
+       /*
+        * If PHB supports compound PE, to fetch
+        * the master PE because slave PE is invisible
+        * to EEH core.
+        */
+       pnv_pe = &phb->ioda.pe_array[pe_no];
+       if (pnv_pe->flags & PNV_IODA_PE_SLAVE) {
+               pnv_pe = pnv_pe->master;
+               WARN_ON(!pnv_pe ||
+                       !(pnv_pe->flags & PNV_IODA_PE_MASTER));
+               pe_no = pnv_pe->pe_number;
+       }
+
+       /* Find the PE according to PE# */
+       memset(&edev, 0, sizeof(struct eeh_dev));
+       edev.phb = hose;
+       edev.pe_config_addr = pe_no;
+       dev_pe = eeh_pe_get(&edev);
+       if (!dev_pe)
+               return -EEXIST;
+
+       /* Freeze the (compound) PE */
+       *pe = dev_pe;
+       if (!(dev_pe->state & EEH_PE_ISOLATED))
+               phb->freeze_pe(phb, pe_no);
+
+       /*
+        * At this point, we're sure the (compound) PE should
+        * have been frozen. However, we still need poke until
+        * hitting the frozen PE on top level.
+        */
+       dev_pe = dev_pe->parent;
+       while (dev_pe && !(dev_pe->type & EEH_PE_PHB)) {
+               int ret;
+               int active_flags = (EEH_STATE_MMIO_ACTIVE |
+                                   EEH_STATE_DMA_ACTIVE);
+
+               ret = eeh_ops->get_state(dev_pe, NULL);
+               if (ret <= 0 || (ret & active_flags) == active_flags) {
+                       dev_pe = dev_pe->parent;
+                       continue;
+               }
+
+               /* Frozen parent PE */
+               *pe = dev_pe;
+               if (!(dev_pe->state & EEH_PE_ISOLATED))
+                       phb->freeze_pe(phb, dev_pe->addr);
+
+               /* Next one */
+               dev_pe = dev_pe->parent;
+       }
+
+       return 0;
 }
 
 /**
  * pnv_eeh_next_error - Retrieve next EEH error to handle
  * @pe: Affected PE
  *
- * Using OPAL API, to retrieve next EEH error for EEH core to handle
+ * The function is expected to be called by EEH core while it gets
+ * special EEH event (without binding PE). The function calls to
+ * OPAL APIs for next error to handle. The informational error is
+ * handled internally by platform. However, the dead IOC, dead PHB,
+ * fenced PHB and frozen PE should be handled by EEH core eventually.
  */
 static int pnv_eeh_next_error(struct eeh_pe **pe)
 {
        struct pci_controller *hose;
-       struct pnv_phb *phb = NULL;
+       struct pnv_phb *phb;
+       struct eeh_pe *phb_pe, *parent_pe;
+       __be64 frozen_pe_no;
+       __be16 err_type, severity;
+       int active_flags = (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE);
+       long rc;
+       int state, ret = EEH_NEXT_ERR_NONE;
+
+       /*
+        * While running here, it's safe to purge the event queue.
+        * And we should keep the cached OPAL notifier event sychronized
+        * between the kernel and firmware.
+        */
+       eeh_remove_event(NULL, false);
+       opal_notifier_update_evt(OPAL_EVENT_PCI_ERROR, 0x0ul);
 
        list_for_each_entry(hose, &hose_list, list_node) {
+               /*
+                * If the subordinate PCI buses of the PHB has been
+                * removed or is exactly under error recovery, we
+                * needn't take care of it any more.
+                */
                phb = hose->private_data;
-               break;
-       }
+               phb_pe = eeh_phb_pe_get(hose);
+               if (!phb_pe || (phb_pe->state & EEH_PE_ISOLATED))
+                       continue;
+
+               rc = opal_pci_next_error(phb->opal_id,
+                                        &frozen_pe_no, &err_type, &severity);
+               if (rc != OPAL_SUCCESS) {
+                       pr_devel("%s: Invalid return value on "
+                                "PHB#%x (0x%lx) from opal_pci_next_error",
+                                __func__, hose->global_number, rc);
+                       continue;
+               }
+
+               /* If the PHB doesn't have error, stop processing */
+               if (be16_to_cpu(err_type) == OPAL_EEH_NO_ERROR ||
+                   be16_to_cpu(severity) == OPAL_EEH_SEV_NO_ERROR) {
+                       pr_devel("%s: No error found on PHB#%x\n",
+                                __func__, hose->global_number);
+                       continue;
+               }
+
+               /*
+                * Processing the error. We're expecting the error with
+                * highest priority reported upon multiple errors on the
+                * specific PHB.
+                */
+               pr_devel("%s: Error (%d, %d, %llu) on PHB#%x\n",
+                       __func__, be16_to_cpu(err_type),
+                       be16_to_cpu(severity), be64_to_cpu(frozen_pe_no),
+                       hose->global_number);
+               switch (be16_to_cpu(err_type)) {
+               case OPAL_EEH_IOC_ERROR:
+                       if (be16_to_cpu(severity) == OPAL_EEH_SEV_IOC_DEAD) {
+                               pr_err("EEH: dead IOC detected\n");
+                               ret = EEH_NEXT_ERR_DEAD_IOC;
+                       } else if (be16_to_cpu(severity) == OPAL_EEH_SEV_INF) {
+                               pr_info("EEH: IOC informative error "
+                                       "detected\n");
+                               pnv_eeh_get_and_dump_hub_diag(hose);
+                               ret = EEH_NEXT_ERR_NONE;
+                       }
+
+                       break;
+               case OPAL_EEH_PHB_ERROR:
+                       if (be16_to_cpu(severity) == OPAL_EEH_SEV_PHB_DEAD) {
+                               *pe = phb_pe;
+                               pr_err("EEH: dead PHB#%x detected, "
+                                      "location: %s\n",
+                                       hose->global_number,
+                                       eeh_pe_loc_get(phb_pe));
+                               ret = EEH_NEXT_ERR_DEAD_PHB;
+                       } else if (be16_to_cpu(severity) ==
+                                  OPAL_EEH_SEV_PHB_FENCED) {
+                               *pe = phb_pe;
+                               pr_err("EEH: Fenced PHB#%x detected, "
+                                      "location: %s\n",
+                                       hose->global_number,
+                                       eeh_pe_loc_get(phb_pe));
+                               ret = EEH_NEXT_ERR_FENCED_PHB;
+                       } else if (be16_to_cpu(severity) == OPAL_EEH_SEV_INF) {
+                               pr_info("EEH: PHB#%x informative error "
+                                       "detected, location: %s\n",
+                                       hose->global_number,
+                                       eeh_pe_loc_get(phb_pe));
+                               pnv_eeh_get_phb_diag(phb_pe);
+                               pnv_pci_dump_phb_diag_data(hose, phb_pe->data);
+                               ret = EEH_NEXT_ERR_NONE;
+                       }
+
+                       break;
+               case OPAL_EEH_PE_ERROR:
+                       /*
+                        * If we can't find the corresponding PE, we
+                        * just try to unfreeze.
+                        */
+                       if (pnv_eeh_get_pe(hose,
+                               be64_to_cpu(frozen_pe_no), pe)) {
+                               /* Try best to clear it */
+                               pr_info("EEH: Clear non-existing PHB#%x-PE#%llx\n",
+                                       hose->global_number, frozen_pe_no);
+                               pr_info("EEH: PHB location: %s\n",
+                                       eeh_pe_loc_get(phb_pe));
+                               opal_pci_eeh_freeze_clear(phb->opal_id,
+                                       frozen_pe_no,
+                                       OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);
+                               ret = EEH_NEXT_ERR_NONE;
+                       } else if ((*pe)->state & EEH_PE_ISOLATED ||
+                                  eeh_pe_passed(*pe)) {
+                               ret = EEH_NEXT_ERR_NONE;
+                       } else {
+                               pr_err("EEH: Frozen PE#%x "
+                                      "on PHB#%x detected\n",
+                                      (*pe)->addr,
+                                       (*pe)->phb->global_number);
+                               pr_err("EEH: PE location: %s, "
+                                      "PHB location: %s\n",
+                                      eeh_pe_loc_get(*pe),
+                                      eeh_pe_loc_get(phb_pe));
+                               ret = EEH_NEXT_ERR_FROZEN_PE;
+                       }
+
+                       break;
+               default:
+                       pr_warn("%s: Unexpected error type %d\n",
+                               __func__, be16_to_cpu(err_type));
+               }
 
-       if (phb && phb->eeh_ops->next_error)
-               return phb->eeh_ops->next_error(pe);
+               /*
+                * EEH core will try recover from fenced PHB or
+                * frozen PE. In the time for frozen PE, EEH core
+                * enable IO path for that before collecting logs,
+                * but it ruins the site. So we have to dump the
+                * log in advance here.
+                */
+               if ((ret == EEH_NEXT_ERR_FROZEN_PE  ||
+                   ret == EEH_NEXT_ERR_FENCED_PHB) &&
+                   !((*pe)->state & EEH_PE_ISOLATED)) {
+                       eeh_pe_state_mark(*pe, EEH_PE_ISOLATED);
+                       pnv_eeh_get_phb_diag(*pe);
+
+                       if (eeh_has_flag(EEH_EARLY_DUMP_LOG))
+                               pnv_pci_dump_phb_diag_data((*pe)->phb,
+                                                          (*pe)->data);
+               }
 
-       return -EEXIST;
+               /*
+                * We probably have the frozen parent PE out there and
+                * we need have to handle frozen parent PE firstly.
+                */
+               if (ret == EEH_NEXT_ERR_FROZEN_PE) {
+                       parent_pe = (*pe)->parent;
+                       while (parent_pe) {
+                               /* Hit the ceiling ? */
+                               if (parent_pe->type & EEH_PE_PHB)
+                                       break;
+
+                               /* Frozen parent PE ? */
+                               state = eeh_ops->get_state(parent_pe, NULL);
+                               if (state > 0 &&
+                                   (state & active_flags) != active_flags)
+                                       *pe = parent_pe;
+
+                               /* Next parent level */
+                               parent_pe = parent_pe->parent;
+                       }
+
+                       /* We possibly migrate to another PE */
+                       eeh_pe_state_mark(*pe, EEH_PE_ISOLATED);
+               }
+
+               /*
+                * 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;
+       }
+
+       return ret;
 }
 
-static int pnv_eeh_restore_config(struct device_node *dn)
+static int pnv_eeh_restore_config(struct pci_dn *pdn)
 {
-       struct eeh_dev *edev = of_node_to_eeh_dev(dn);
+       struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
        struct pnv_phb *phb;
        s64 ret;
 
@@ -687,8 +1505,7 @@ static struct eeh_ops pnv_eeh_ops = {
        .name                   = "powernv",
        .init                   = pnv_eeh_init,
        .post_init              = pnv_eeh_post_init,
-       .of_probe               = NULL,
-       .dev_probe              = pnv_eeh_dev_probe,
+       .probe                  = pnv_eeh_probe,
        .set_option             = pnv_eeh_set_option,
        .get_pe_addr            = pnv_eeh_get_pe_addr,
        .get_state              = pnv_eeh_get_state,