| Message ID | 20191120012859.23300-46-oohall@gmail.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | [Very,RFC,01/46] powerpc/eeh: Don't attempt to restore VF config space after reset | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (784eee1cc44801366d4f197e0ade7739ee8e1e83) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (0695f8bca93ea0c57f0e8e21b4b4db70183b3d1c) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (c74386d50fbaf4a54fd3fe560f1abc709c0cff4b) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (7d6475051fb3d9339c5c760ed9883bc0a9048b21) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linux-next (5d1131b4d61e52e5702e0fa4bcbec81ac7d6ef52) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
On 20/11/2019 12:28, Oliver O'Halloran wrote: > :toot: > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Squash it into 26/46 "powernv/pci: Remove pdn from pnv_pci_cfg_{read|write}". Thanks, > --- > arch/powerpc/platforms/powernv/pci.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c > index 0eeea8652426..6383dcfec606 100644 > --- a/arch/powerpc/platforms/powernv/pci.c > +++ b/arch/powerpc/platforms/powernv/pci.c > @@ -750,17 +750,12 @@ static int pnv_pci_read_config(struct pci_bus *bus, > unsigned int devfn, > int where, int size, u32 *val) > { > - struct pci_dn *pdn; > struct pnv_phb *phb = pci_bus_to_pnvhb(bus); > u16 bdfn = bus->number << 8 | devfn; > struct eeh_dev *edev; > int ret; > > *val = 0xFFFFFFFF; > - pdn = pci_get_pdn_by_devfn(bus, devfn); > - if (!pdn) > - return PCIBIOS_DEVICE_NOT_FOUND; > - > edev = pnv_eeh_find_edev(phb, bdfn); > if (!pnv_eeh_pre_cfg_check(edev)) > return PCIBIOS_DEVICE_NOT_FOUND; > @@ -781,16 +776,11 @@ static int pnv_pci_write_config(struct pci_bus *bus, > unsigned int devfn, > int where, int size, u32 val) > { > - struct pci_dn *pdn; > struct pnv_phb *phb = pci_bus_to_pnvhb(bus); > u16 bdfn = bus->number << 8 | devfn; > struct eeh_dev *edev; > int ret; > > - pdn = pci_get_pdn_by_devfn(bus, devfn); > - if (!pdn) > - return PCIBIOS_DEVICE_NOT_FOUND; > - > edev = pnv_eeh_find_edev(phb, bdfn); > if (!pnv_eeh_pre_cfg_check(edev)) > return PCIBIOS_DEVICE_NOT_FOUND; >
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c index 0eeea8652426..6383dcfec606 100644 --- a/arch/powerpc/platforms/powernv/pci.c +++ b/arch/powerpc/platforms/powernv/pci.c @@ -750,17 +750,12 @@ static int pnv_pci_read_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val) { - struct pci_dn *pdn; struct pnv_phb *phb = pci_bus_to_pnvhb(bus); u16 bdfn = bus->number << 8 | devfn; struct eeh_dev *edev; int ret; *val = 0xFFFFFFFF; - pdn = pci_get_pdn_by_devfn(bus, devfn); - if (!pdn) - return PCIBIOS_DEVICE_NOT_FOUND; - edev = pnv_eeh_find_edev(phb, bdfn); if (!pnv_eeh_pre_cfg_check(edev)) return PCIBIOS_DEVICE_NOT_FOUND; @@ -781,16 +776,11 @@ static int pnv_pci_write_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val) { - struct pci_dn *pdn; struct pnv_phb *phb = pci_bus_to_pnvhb(bus); u16 bdfn = bus->number << 8 | devfn; struct eeh_dev *edev; int ret; - pdn = pci_get_pdn_by_devfn(bus, devfn); - if (!pdn) - return PCIBIOS_DEVICE_NOT_FOUND; - edev = pnv_eeh_find_edev(phb, bdfn); if (!pnv_eeh_pre_cfg_check(edev)) return PCIBIOS_DEVICE_NOT_FOUND;
:toot: Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/platforms/powernv/pci.c | 10 ---------- 1 file changed, 10 deletions(-)