pcie hotplug: Change link order of pciehp
PATCH 1/1 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.
---
drivers/pci/hotplug/Makefile +1 -1
@@ -5,11 +5,11 @@ obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o +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
Signature · 1 line
Matthew Garrett | [email protected]
Quoted 11 lines · Matthew Garrett
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
_OSCmethod so should be loaded first - if it fails to bind (either due to a missing_OSCmethod 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 <[email protected]>
Hi,
I'd prefer to have a comment in the Makefile (not just in git) that link order is important for those 2 drivers and why.
We do that in several other similar situations and I believe that having it in the Makefile is preferable.
Quoted 20 lines
---
drivers/pci/hotplug/Makefile +1
-1@@ -5,11 +5,11 @@ obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o +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
Signature · 1 line
~Randy
commit bf53d46d80486fa613dc345aba5d42a29368056d
Author: Matthew Garrett <[email protected]> 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.
---
drivers/pci/hotplug/Makefile +5 -1
@@ -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
Signature · 1 line
Matthew Garrett | [email protected]
Randy Dunlap
Acked-byQuoted 13 lines · Matthew Garrett
commit
bf53d46d80486fa613dc345aba5d42a29368056dAuthor: Matthew Garrett <[email protected]> Date: Tue Jan 27 11:29:02 2009 +1100pcie 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
_OSCmethod so should be loaded first - if it fails to bind (either due to a missing_OSCmethod or the firmware refusing to hand off control) then we can fall back to acpiphp or a vendor-specific driver.
Quoted 4 lines
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 <[email protected]>
Thanks.
Quoted 24 lines
---
drivers/pci/hotplug/Makefile +5
-1@@ -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
Signature · 1 line
~Randy
Quoted 14 lines · Randy Dunlap
Quoted 13 lines · Matthew Garrett
commit
bf53d46d80486fa613dc345aba5d42a29368056dAuthor: Matthew Garrett <[email protected]> Date: Tue Jan 27 11:29:02 2009 +1100pcie 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
_OSCmethod so should be loaded first - if it fails to bind (either due to a missing_OSCmethod or the firmware refusing to hand off control) then we can fall back to acpiphp or a vendor-specific driver.
Quoted 6 lines
Quoted 4 lines
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 <[email protected]>Acked-by Randy Dunlap <[email protected]>
Ok, applied to my for-linus branch, since this is actually affecting users now.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center