Commit 361f2a2a authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt

powrpc/powernv: Reset PHB in kdump kernel

In the kdump scenario, the first kerenl doesn't shutdown PCI devices
and the kdump kerenl clean PHB IODA table at the early probe time.
That means the kdump kerenl can't support PCI transactions piled
by the first kerenl. Otherwise, lots of EEH errors and frozen PEs
will be detected.

In order to avoid the EEH errors, the PHB is resetted to drop all
PCI transaction from the first kerenl.
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent d92a208d
...@@ -388,13 +388,16 @@ static s64 ioda_eeh_phb_poll(struct pnv_phb *phb) ...@@ -388,13 +388,16 @@ static s64 ioda_eeh_phb_poll(struct pnv_phb *phb)
if (rc <= 0) if (rc <= 0)
break; break;
msleep(rc); if (system_state < SYSTEM_RUNNING)
udelay(1000 * rc);
else
msleep(rc);
} }
return rc; return rc;
} }
static int ioda_eeh_phb_reset(struct pci_controller *hose, int option) int ioda_eeh_phb_reset(struct pci_controller *hose, int option)
{ {
struct pnv_phb *phb = hose->private_data; struct pnv_phb *phb = hose->private_data;
s64 rc = OPAL_HARDWARE; s64 rc = OPAL_HARDWARE;
...@@ -422,8 +425,12 @@ static int ioda_eeh_phb_reset(struct pci_controller *hose, int option) ...@@ -422,8 +425,12 @@ static int ioda_eeh_phb_reset(struct pci_controller *hose, int option)
* need the PCI bus settlement delay. * need the PCI bus settlement delay.
*/ */
rc = ioda_eeh_phb_poll(phb); rc = ioda_eeh_phb_poll(phb);
if (option == EEH_RESET_DEACTIVATE) if (option == EEH_RESET_DEACTIVATE) {
msleep(EEH_PE_RST_SETTLE_TIME); if (system_state < SYSTEM_RUNNING)
udelay(1000 * EEH_PE_RST_SETTLE_TIME);
else
msleep(EEH_PE_RST_SETTLE_TIME);
}
out: out:
if (rc != OPAL_SUCCESS) if (rc != OPAL_SUCCESS)
return -EIO; return -EIO;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/crash_dump.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -1393,6 +1394,17 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np, ...@@ -1393,6 +1394,17 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
rc = opal_pci_reset(phb_id, OPAL_PCI_IODA_TABLE_RESET, OPAL_ASSERT_RESET); rc = opal_pci_reset(phb_id, OPAL_PCI_IODA_TABLE_RESET, OPAL_ASSERT_RESET);
if (rc) if (rc)
pr_warning(" OPAL Error %ld performing IODA table reset !\n", rc); pr_warning(" OPAL Error %ld performing IODA table reset !\n", rc);
/* If we're running in kdump kerenl, the previous kerenl never
* shutdown PCI devices correctly. We already got IODA table
* cleaned out. So we have to issue PHB reset to stop all PCI
* transactions from previous kerenl.
*/
if (is_kdump_kernel()) {
pr_info(" Issue PHB reset ...\n");
ioda_eeh_phb_reset(hose, EEH_RESET_FUNDAMENTAL);
ioda_eeh_phb_reset(hose, OPAL_DEASSERT_RESET);
}
} }
void __init pnv_pci_init_ioda2_phb(struct device_node *np) void __init pnv_pci_init_ioda2_phb(struct device_node *np)
......
...@@ -205,5 +205,6 @@ extern void pnv_pci_init_ioda2_phb(struct device_node *np); ...@@ -205,5 +205,6 @@ extern void pnv_pci_init_ioda2_phb(struct device_node *np);
extern void pnv_pci_ioda_tce_invalidate(struct iommu_table *tbl, extern void pnv_pci_ioda_tce_invalidate(struct iommu_table *tbl,
__be64 *startp, __be64 *endp, bool rm); __be64 *startp, __be64 *endp, bool rm);
extern void pnv_pci_reset_secondary_bus(struct pci_dev *dev); extern void pnv_pci_reset_secondary_bus(struct pci_dev *dev);
extern int ioda_eeh_phb_reset(struct pci_controller *hose, int option);
#endif /* __POWERNV_PCI_H */ #endif /* __POWERNV_PCI_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment