On Fri, 2013-06-21 at 09:54 -0700, Guenter Roeck wrote:
> > v2: Ensure that PCI bus fixup code has been executed before calling
> > device setup code.
> >
> Hi Ben,
>
> any comments/feedback on this approach ?
>
> It is much less invasive than before and should address your concerns.
And also less nice cleanup :-) I'll have a look.
Cheers,
Ben.
> Thanks,
> Guenter
>
> > arch/powerpc/kernel/pci-common.c | 17 ++++++++++++-----
> > 1 file changed, 12 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/powerpc/kernel/pci-common.c
> > b/arch/powerpc/kernel/pci-common.c
> > index 7f2273c..6909b13 100644
> > --- a/arch/powerpc/kernel/pci-common.c
> > +++ b/arch/powerpc/kernel/pci-common.c
> > @@ -992,7 +992,7 @@ void pcibios_setup_bus_self(struct pci_bus *bus)
> > ppc_md.pci_dma_bus_setup(bus);
> > }
> >
> > -void pcibios_setup_device(struct pci_dev *dev)
> > +static void pcibios_setup_device(struct pci_dev *dev)
> > {
> > /* Fixup NUMA node as it may not be setup yet by the generic
> > * code and is needed by the DMA init
> > @@ -1013,6 +1013,17 @@ void pcibios_setup_device(struct pci_dev *dev)
> > ppc_md.pci_irq_fixup(dev);
> > }
> >
> > +int pcibios_add_device(struct pci_dev *dev)
> > +{
> > + /*
> > + * We can only call pcibios_setup_device() after bus setup is complete,
> > + * since some of the platform specific DMA setup code depends on it.
> > + */
> > + if (dev->bus->is_added)
> > + pcibios_setup_device(dev);
> > + return 0;
> > +}
> > +
> > void pcibios_setup_bus_devices(struct pci_bus *bus)
> > {
> > struct pci_dev *dev;
> > @@ -1467,10 +1478,6 @@ int pcibios_enable_device(struct pci_dev *dev, int
> > mask)
> > if (ppc_md.pcibios_enable_device_hook(dev))
> > return -EINVAL;
> >
> > - /* avoid pcie irq fix up impact on cardbus */
> > - if (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS)
> > - pcibios_setup_device(dev);
> > -
> > return pci_enable_resources(dev, mask);
> > }
> >
> > --
> > 1.7.9.7
> >
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
