From patchwork Thu Jan 6 17:12:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 459561 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p06HCOIk006095 for ; Thu, 6 Jan 2011 17:12:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753504Ab1AFRM1 (ORCPT ); Thu, 6 Jan 2011 12:12:27 -0500 Received: from g6t0184.atlanta.hp.com ([15.193.32.61]:6336 "EHLO g6t0184.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753455Ab1AFRM0 (ORCPT ); Thu, 6 Jan 2011 12:12:26 -0500 Received: from g5t0029.atlanta.hp.com (g5t0029.atlanta.hp.com [16.228.8.141]) by g6t0184.atlanta.hp.com (Postfix) with ESMTP id D641EC0E9; Thu, 6 Jan 2011 17:12:25 +0000 (UTC) Received: from ldl (ldl.usa.hp.com [16.125.112.222]) by g5t0029.atlanta.hp.com (Postfix) with ESMTP id 5C0B720429; Thu, 6 Jan 2011 17:12:25 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 371ADCF001C; Thu, 6 Jan 2011 10:12:25 -0700 (MST) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OYZ-KhtELW5d; Thu, 6 Jan 2011 10:12:25 -0700 (MST) Received: from eh.fc.hp.com (bob.lnx.usa.hp.com [16.125.112.218]) by ldl (Postfix) with ESMTP id 20C2DCF0012; Thu, 6 Jan 2011 10:12:25 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id F067626127; Thu, 6 Jan 2011 10:12:24 -0700 (MST) Subject: [PATCH 1/2] x86/PCI: don't use native Broadcom CNB20LE driver when ACPI is available To: Jesse Barnes From: Bjorn Helgaas Cc: Kyle McMartin , linux-pci@vger.kernel.org, "Ira W. Snyder" , Yinghai Lu , mjg@redhat.com Date: Thu, 06 Jan 2011 10:12:24 -0700 Message-ID: <20110106171224.20904.76184.stgit@bob.kio> In-Reply-To: <20110106171139.20904.71941.stgit@bob.kio> References: <20110106171139.20904.71941.stgit@bob.kio> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 06 Jan 2011 17:12:27 +0000 (UTC) diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c index 0846a5b..ab8269b 100644 --- a/arch/x86/pci/broadcom_bus.c +++ b/arch/x86/pci/broadcom_bus.c @@ -9,6 +9,7 @@ * option) any later version. */ +#include #include #include #include @@ -25,12 +26,14 @@ static void __devinit cnb20le_res(struct pci_dev *dev) u8 fbus, lbus; int i; +#ifdef CONFIG_ACPI /* - * The x86_pci_root_bus_res_quirks() function already refuses to use - * this information if ACPI _CRS was used. Therefore, we don't bother - * checking if ACPI is enabled, and just generate the information - * for both the ACPI _CRS and no ACPI cases. + * We should get host bridge information from ACPI unless the BIOS + * doesn't support it. */ + if (acpi_os_get_root_pointer()) + return; +#endif info = &pci_root_info[pci_root_num]; pci_root_num++;