Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b174b4fb authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/powernv: Escalate reset when IODA reset fails 



The IODA reset is used to flush out any OS controlled state from the PHB.
This reset can fail if a PHB fatal error has occurred in early boot,
probably due to a because of a bad device. We already do a fundemental
reset of the device in some cases, so this patch just adds a test to force
a full reset if firmware reports an error when performing the IODA reset.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ebb0e13e

arch/powerpc/platforms/powernv/pci-ioda.c

+5 −2
Original line number Diff line number Diff line
@@ -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);