| Message ID | 20191120012859.23300-43-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: > Nothing looks at it anymore. With a small extra step we can ditch it (compile tested): https://github.com/aik/linux/commit/14db7061d48220354e83f8e100ab0cc1b7181da4 > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> > --- > arch/powerpc/platforms/powernv/pci-ioda.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c > index d3e375d71cdc..45d940730c30 100644 > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > @@ -3541,9 +3541,7 @@ static void pnv_ioda_release_pe(struct pnv_ioda_pe *pe) > > static void pnv_pci_release_device(struct pci_dev *pdev) > { > - struct pnv_phb *phb = pci_bus_to_pnvhb(pdev->bus); > struct pnv_ioda_pe *pe = pnv_ioda_get_pe(pdev); > - struct pci_dn *pdn = pci_get_pdn(pdev); > > /* The VF PE state is torn down when sriov_disable() is called */ > if (pdev->is_virtfn) > @@ -3560,16 +3558,6 @@ static void pnv_pci_release_device(struct pci_dev *pdev) > if (pdev->is_physfn) > kfree(pdev->dev.archdata.iov_data); > > - /* > - * PCI hotplug can happen as part of EEH error recovery. The @pdn > - * isn't removed and added afterwards in this scenario. We should > - * set the PE number in @pdn to an invalid one. Otherwise, the PE's > - * device count is decreased on removing devices while failing to > - * be increased on adding devices. It leads to unbalanced PE's device > - * count and eventually make normal PCI hotplug path broken. > - */ > - pdn->pe_number = IODA_INVALID_PE; > - > WARN_ON(--pe->device_count < 0); > if (pe->device_count == 0) > pnv_ioda_release_pe(pe); >
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index d3e375d71cdc..45d940730c30 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -3541,9 +3541,7 @@ static void pnv_ioda_release_pe(struct pnv_ioda_pe *pe) static void pnv_pci_release_device(struct pci_dev *pdev) { - struct pnv_phb *phb = pci_bus_to_pnvhb(pdev->bus); struct pnv_ioda_pe *pe = pnv_ioda_get_pe(pdev); - struct pci_dn *pdn = pci_get_pdn(pdev); /* The VF PE state is torn down when sriov_disable() is called */ if (pdev->is_virtfn) @@ -3560,16 +3558,6 @@ static void pnv_pci_release_device(struct pci_dev *pdev) if (pdev->is_physfn) kfree(pdev->dev.archdata.iov_data); - /* - * PCI hotplug can happen as part of EEH error recovery. The @pdn - * isn't removed and added afterwards in this scenario. We should - * set the PE number in @pdn to an invalid one. Otherwise, the PE's - * device count is decreased on removing devices while failing to - * be increased on adding devices. It leads to unbalanced PE's device - * count and eventually make normal PCI hotplug path broken. - */ - pdn->pe_number = IODA_INVALID_PE; - WARN_ON(--pe->device_count < 0); if (pe->device_count == 0) pnv_ioda_release_pe(pe);
Nothing looks at it anymore. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/platforms/powernv/pci-ioda.c | 12 ------------ 1 file changed, 12 deletions(-)