| Message ID | 20191120012859.23300-30-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: > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> > --- > arch/powerpc/platforms/powernv/pci-ioda.c | 32 +++++++++++++++++------ > 1 file changed, 24 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c > index 1c90feed233d..5bd7c1b058da 100644 > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > @@ -760,6 +760,11 @@ static int pnv_ioda_set_peltv(struct pnv_phb *phb, > } > } > > + /* > + * Walk the bridges up to the root. Along the way mark this PE as > + * downstream of the bridge PE(s) so that errors upstream errors Too many "errors" in "errors upstream errors". Otherwise Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> > + * also cause this PE to be frozen. > + */ > if (pe->flags & (PNV_IODA_PE_BUS_ALL | PNV_IODA_PE_BUS)) > pdev = pe->pbus->self; > else if (pe->flags & PNV_IODA_PE_DEV) > @@ -768,16 +773,27 @@ static int pnv_ioda_set_peltv(struct pnv_phb *phb, > else if (pe->flags & PNV_IODA_PE_VF) > pdev = pe->parent_dev; > #endif /* CONFIG_PCI_IOV */ > + > while (pdev) { > - struct pci_dn *pdn = pci_get_pdn(pdev); > - struct pnv_ioda_pe *parent; > + struct pnv_ioda_pe *parent = pnv_ioda_get_pe(pdev); > > - if (pdn && pdn->pe_number != IODA_INVALID_PE) { > - parent = &phb->ioda.pe_array[pdn->pe_number]; > - ret = pnv_ioda_set_one_peltv(phb, parent, pe, is_add); > - if (ret) > - return ret; > - } > + /* > + * FIXME: This is called from pcibios_setup_bridge(), which is called > + * from the bottom (leaf) bridge to the root. This means that this > + * doesn't actually setup the PELT-V entries since the PEs for > + * the bridges above assigned after this is run for the leaf. > + * > + * FIXMEFIXME: might not be true since moving PE configuration > + * into pcibios_bus_add_device(). > + */ > + if (!parent) > + break; > + > + WARN_ON(!parent || parent->pe_number == IODA_INVALID_PE); > + > + ret = pnv_ioda_set_one_peltv(phb, parent, pe, is_add); > + if (ret) > + return ret; > > pdev = pdev->bus->self; > } >
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 1c90feed233d..5bd7c1b058da 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -760,6 +760,11 @@ static int pnv_ioda_set_peltv(struct pnv_phb *phb, } } + /* + * Walk the bridges up to the root. Along the way mark this PE as + * downstream of the bridge PE(s) so that errors upstream errors + * also cause this PE to be frozen. + */ if (pe->flags & (PNV_IODA_PE_BUS_ALL | PNV_IODA_PE_BUS)) pdev = pe->pbus->self; else if (pe->flags & PNV_IODA_PE_DEV) @@ -768,16 +773,27 @@ static int pnv_ioda_set_peltv(struct pnv_phb *phb, else if (pe->flags & PNV_IODA_PE_VF) pdev = pe->parent_dev; #endif /* CONFIG_PCI_IOV */ + while (pdev) { - struct pci_dn *pdn = pci_get_pdn(pdev); - struct pnv_ioda_pe *parent; + struct pnv_ioda_pe *parent = pnv_ioda_get_pe(pdev); - if (pdn && pdn->pe_number != IODA_INVALID_PE) { - parent = &phb->ioda.pe_array[pdn->pe_number]; - ret = pnv_ioda_set_one_peltv(phb, parent, pe, is_add); - if (ret) - return ret; - } + /* + * FIXME: This is called from pcibios_setup_bridge(), which is called + * from the bottom (leaf) bridge to the root. This means that this + * doesn't actually setup the PELT-V entries since the PEs for + * the bridges above assigned after this is run for the leaf. + * + * FIXMEFIXME: might not be true since moving PE configuration + * into pcibios_bus_add_device(). + */ + if (!parent) + break; + + WARN_ON(!parent || parent->pe_number == IODA_INVALID_PE); + + ret = pnv_ioda_set_one_peltv(phb, parent, pe, is_add); + if (ret) + return ret; pdev = pdev->bus->self; }
Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/platforms/powernv/pci-ioda.c | 32 +++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-)