Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Russell Currey and committed by
Michael Ellerman
e98ddb77 04fec21c

+3 -2
+3 -2
arch/powerpc/platforms/powernv/eeh-powernv.c
··· 1090 1090 } 1091 1091 } 1092 1092 1093 + if (pe->type & EEH_PE_VF) 1094 + return pnv_eeh_reset_vf_pe(pe, option); 1095 + 1093 1096 bus = eeh_pe_bus_get(pe); 1094 1097 if (!bus) { 1095 1098 pr_err("%s: Cannot find PCI bus for PHB#%d-PE#%x\n", 1096 1099 __func__, pe->phb->global_number, pe->addr); 1097 1100 return -EIO; 1098 1101 } 1099 - if (pe->type & EEH_PE_VF) 1100 - return pnv_eeh_reset_vf_pe(pe, option); 1101 1102 1102 1103 if (pci_is_root_bus(bus) || 1103 1104 pci_is_root_bus(bus->parent))