Commit e98ddb77 authored Sep 12, 2016 by Russell Currey Committed by Michael Ellerman Sep 23, 2016

powerpc/powernv/eeh: Skip finding bus for VF resets



When the PE used in pnv_eeh_reset() is that of a VF,
pnv_eeh_reset_vf_pe() is used.  Unlike the other reset functions called
in pnv_eeh_reset(), the VF reset doesn't require a bus, and if a bus was
missing the function would error out before resetting the VF PE.

To avoid this, reorder the VF reset function to occur before finding and
checking the bus.

Signed-off-by: Russell Currey <ruscur@russell.cc>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 04fec21c

arch/powerpc/platforms/powernv/eeh-powernv.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1090,14 +1090,15 @@ static int pnv_eeh_reset(struct eeh_pe *pe, int option)
		}
		}

		if (pe->type & EEH_PE_VF)
		return pnv_eeh_reset_vf_pe(pe, option);

		bus = eeh_pe_bus_get(pe);
		if (!bus) {
		pr_err("%s: Cannot find PCI bus for PHB#%d-PE#%x\n",
		__func__, pe->phb->global_number, pe->addr);
		return -EIO;
		}
		if (pe->type & EEH_PE_VF)
		return pnv_eeh_reset_vf_pe(pe, option);

		if (pci_is_root_bus(bus) \|\|
		pci_is_root_bus(bus->parent))