| Message ID | 20180817102645.3839621-1-arnd@arndb.de |
|---|---|
| Headers | show |
| Series | PCI: turn some __weak functions into callbacks | expand |
On Mon, Aug 20, 2018 at 1:17 PM Arnd Bergmann <arnd@arndb.de> wrote: > > On Mon, Aug 20, 2018 at 10:31 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Fri, Aug 17, 2018 at 12:32 PM Arnd Bergmann <arnd@arndb.de> wrote: > > > > -static struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, > > > - struct pci_ops *ops, void *sysdata, struct list_head *resources) > > > +void pcibios_scan_root(int busnum) > > > { > > > + struct pci_sysdata *sd; > > > struct pci_host_bridge *bridge; > > > int error; > > > > > > - bridge = pci_alloc_host_bridge(0); > > > - if (!bridge) > > > - return NULL; > > > + bridge = pci_alloc_host_bridge(sizeof(sd)); > > > + if (!bridge) { > > > + printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum); > > > + return; > > > + } > > > + sd = pci_host_bridge_priv(bridge); > > > > This looks fishy, as bridge->private is not set at this point AFAICS, > > unless one of the previous patches changes that. > > bridge->private what comes after the bridge structure, and it's allocated > by pci_alloc_host_bridge() passing the size of the structure we want > for this private area. I see, sorry for the noise.
Hi Bjorn and others, Triggered by Christoph's patches, I had another go at converting all of the remaining pci host bridge implementations to be based on pci_alloc_host_bridge and a separate registration function. This is made possible through work from Lorenzo and others to convert many of the existing drivers, as well as the removal of some of the older architectures that nobody used. I'm adding a bit of duplication into the less maintained code here, but it makes everything more consistent, and gives an easy place to hook up callback functions etc. The three parts of this series are: a) push up the registration into the callers (this is where code gets added) b) clean up some of the more common host bridge implementations again to integrate that code better. This could be done for the rest as well, or we could just leave them alone. c) start moving the __weak functions into callbacks in pci_host_bridge. This is intentionally incomplete, since it is a lot of work to do it for all those functions, and I want to get consensus on the approach first, as well as maybe get other developers to help out with the rest. Please have a look. Arnd [1] https://lore.kernel.org/lkml/4288331.jNpl6KXlNO@wuerfel/ [2] https://patchwork.kernel.org/patch/10555657/ Arnd Bergmann (15): PCI: clean up legacy host bridge scan functions PCI: move pci_scan_bus into callers PCI: move pci_scan_root_bus into callers PCI: export pci_register_host_bridge PCI: move pci_create_root_bus into callers powerpc/pci: fold pci_create_root_bus into pcibios_scan_phb PCI/ACPI: clean up acpi_pci_root_create() x86: PCI: clean up pcibios_scan_root() PCI: xenfront: clean up pcifront_scan_root() sparc/PCI: simplify pci_scan_one_pbm PCI: hyperv: convert to pci_scan_root_bus_bridge PCI: make pcibios_bus_add_device() a callback function PCI: turn pcibios_alloc_irq into a callback PCI: make pcibios_root_bridge_prepare a callback PCI: make pcibios_add_bus/remove_bus callbacks arch/arm64/kernel/pci.c | 40 ++----- arch/ia64/pci/pci.c | 25 +---- arch/ia64/sn/kernel/io_init.c | 27 +++++ arch/microblaze/pci/pci-common.c | 27 +++++ arch/powerpc/include/asm/pci-bridge.h | 3 + arch/powerpc/kernel/pci-common.c | 60 +++++------ arch/s390/pci/pci.c | 30 +++++- arch/sh/drivers/pci/pci.c | 1 + arch/sh/drivers/pci/pcie-sh7786.c | 3 +- arch/sh/include/asm/pci.h | 2 + arch/sparc/kernel/pci.c | 40 ++++--- arch/sparc/kernel/pcic.c | 35 ++++++ arch/x86/pci/acpi.c | 15 +-- arch/x86/pci/common.c | 42 ++++---- arch/xtensa/kernel/pci.c | 27 +++++ drivers/acpi/pci_root.c | 43 +++++--- drivers/parisc/dino.c | 28 +++++ drivers/parisc/lba_pci.c | 28 +++++ drivers/pci/bus.c | 8 +- drivers/pci/controller/pci-hyperv.c | 47 ++++---- drivers/pci/controller/vmd.c | 30 +++++- drivers/pci/hotplug/ibmphp_core.c | 35 ++++++ drivers/pci/pci-driver.c | 13 ++- drivers/pci/probe.c | 150 +++++++++----------------- drivers/pci/xen-pcifront.c | 40 +++---- include/linux/acpi.h | 2 + include/linux/pci.h | 17 ++- 27 files changed, 514 insertions(+), 304 deletions(-) -- 2.18.0