On Mon, May 27, 2013 at 02:29:43PM +0200, Sergey Gerasimov wrote: > For MPC831x the bus probing function also needs the fixup to assign > addresses to the PCI devices as it was for MPC85xx and MPC86xx. > The fixup of the bridge vendor and device ID should be done early in > PCI probing. Else the bridge is not detected as FIXUP_HEADER is called > too late. > > Signed-off-by: Sergey Gerasimov <sergey.gerasi...@astrosoft-development.com> > > --- > arch/powerpc/sysdev/fsl_pci.c | 68 +++++++++++++++++++------------------------ > 1 file changed, 30 insertions(+), 38 deletions(-) > > diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c > index 028ac1f..94d1bd4 100644 > --- a/arch/powerpc/sysdev/fsl_pci.c > +++ b/arch/powerpc/sysdev/fsl_pci.c > @@ -84,6 +84,34 @@ static int fsl_pcie_check_link(struct pci_controller *hose) > return 0; > } > > +void fsl_pcibios_fixup_bus(struct pci_bus *bus) > +{ > + struct pci_controller *hose = (struct pci_controller *) bus->sysdata; > + int i; > + > + > + if ((bus->parent == hose->bus) > + && ((fsl_pcie_bus_fixup > + && pci_bus_find_capability(bus, 0, PCI_CAP_ID_EXP)) > + || (hose->indirect_type > + & PPC_INDIRECT_TYPE_NO_PCIE_LINK))) { > + for (i = 0; i < 4; ++i) { > + struct resource *res = bus->resource[i]; > + struct resource *par = bus->parent->resource[i]; > + if (res) { > + res->start = 0; > + res->end = 0; > + res->flags = 0; > + } > + if (res && par) { > + res->start = par->start; > + res->end = par->end; > + res->flags = par->flags; > + } > + } > + } > +}
Why are you moving this function? This makes it hardaer to see the changes you make -- and is likely the cause of unintended changes being made due to a bad conflict resolution. In particular, you seem to be reverting commit 13635dfdc6aa8d2890e02dc441decfcb4ae63e14 ("powerpc/fsl/pci: Fix PCIe fixup regression"). Also please confirm that the problem still exists in after "Fix PCIe fixup regression". -Scott _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev