Matthew Garrett wrote: > commit bf53d46d80486fa613dc345aba5d42a29368056d > Author: Matthew Garrett <mjg@xxxxxxxxxx> > Date: Tue Jan 27 11:29:02 2009 +1100 > > pcie hotplug: Change link order of pciehp > > Some hardware exposes PCIE slots in such a way that they can be claimed by > either the acpiphp or pciehp driver. pciehp is the preferred driver if the > firmware allows the OS to claim control via the _OSC method so should be > loaded first - if it fails to bind (either due to a missing _OSC method or > the firmware refusing to hand off control) then we can fall back to acpiphp or > a vendor-specific driver. > > This patch simply changes the link order to ensure that pciehp will be > initialised before acpiphp if both are statically built into the kernel. > > Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx> Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Thanks. > --- > > diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile > index e31fb91..2aa117c 100644 > --- a/drivers/pci/hotplug/Makefile > +++ b/drivers/pci/hotplug/Makefile > @@ -5,11 +5,15 @@ > obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o > obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o > obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o > + > +# pciehp should be linked before acpiphp in order to allow the native driver > +# to attempt to bind first. We can then fall back to generic support. > + > +obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o > obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o > obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM) += acpiphp_ibm.o > obj-$(CONFIG_HOTPLUG_PCI_CPCI_ZT5550) += cpcihp_zt5550.o > obj-$(CONFIG_HOTPLUG_PCI_CPCI_GENERIC) += cpcihp_generic.o > -obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o > obj-$(CONFIG_HOTPLUG_PCI_SHPC) += shpchp.o > obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o > obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o > -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
