From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755319AbZA0CSq (ORCPT ); Mon, 26 Jan 2009 21:18:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752703AbZA0CSS (ORCPT ); Mon, 26 Jan 2009 21:18:18 -0500 Received: from acsinet11.oracle.com ([141.146.126.233]:43533 "EHLO acsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752365AbZA0CSR (ORCPT ); Mon, 26 Jan 2009 21:18:17 -0500 Message-ID: <497E6EDA.2050700@oracle.com> Date: Mon, 26 Jan 2009 18:18:02 -0800 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: Matthew Garrett CC: linux-pci@vger.kernel.org, jbarnes@virtuousgeek.org, kristen.c.accardi@intel.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] pcie hotplug: Change link order of pciehp References: <20090127003743.GA27711@srcf.ucam.org> <497E5904.9030407@oracle.com> <20090127010335.GA29035@srcf.ucam.org> In-Reply-To: <20090127010335.GA29035@srcf.ucam.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsmt706.oracle.com [141.146.40.84] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090209.497E6EDF.01C1:SCFSTAT928724,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Matthew Garrett wrote: > commit bf53d46d80486fa613dc345aba5d42a29368056d > Author: Matthew Garrett > 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 Acked-by: Randy Dunlap 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