Skip to contentSkip to conversation

powerpc/powernv: Force an freset if IODA reset fails

PATCH New Oliver O'Halloran 1 participant 1 message Jan 18, 2019 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/powernv: Force an freset if IODA reset fails

The IODA reset can fail in cases where the PHB has encounted a fatal error during early boot. Typically this is due a malfunctioning device directly below the root complex, but can occur for other reasons. This patch fixes the problem by forcing a reset of the PHB if we get an error back from firmware when doing the IODA reset.

---
 arch/powerpc/platforms/powernv/pci-ioda.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +5 -2
index 1d6406a..53982f8 100644
@@ -3943,9 +3943,12 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
 	 * 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 kernel. The ppc_pci_reset_phbs
-	 * kernel parameter will force this reset too.
+	 * kernel parameter will force this reset too. Additionally,
+	 * if the IODA reset above failed then use a bigger hammer.
+	 * This can happen if we get a PHB fatal error in very early
+	 * boot.
 	 */
-	if (is_kdump_kernel() || pci_reset_phbs) {
+	if (is_kdump_kernel() || pci_reset_phbs || rc) {
 		pr_info("  Issue PHB reset ...\n");
 		pnv_eeh_phb_reset(hose, EEH_RESET_FUNDAMENTAL);
 		pnv_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE);
Signature · 1 line
2.9.4