From patchwork Mon Apr 12 22:33:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai X-Patchwork-Id: 92107 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3CMab9s024771 for ; Mon, 12 Apr 2010 22:36:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753956Ab0DLWgg (ORCPT ); Mon, 12 Apr 2010 18:36:36 -0400 Received: from acsinet12.oracle.com ([141.146.126.234]:35028 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753592Ab0DLWgg (ORCPT ); Mon, 12 Apr 2010 18:36:36 -0400 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by acsinet12.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o3CMZYJN025194 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Apr 2010 22:35:36 GMT Received: from acsmt355.oracle.com (acsmt355.oracle.com [141.146.40.155]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o3CMZWmf022274; Mon, 12 Apr 2010 22:35:33 GMT Received: from abhmt020.oracle.com by acsmt354.oracle.com with ESMTP id 168675231271111674; Mon, 12 Apr 2010 15:34:34 -0700 Received: from [10.6.76.26] (/10.6.76.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Apr 2010 15:34:34 -0700 Message-ID: <4BC39FAF.4030808@oracle.com> Date: Mon, 12 Apr 2010 15:33:19 -0700 From: Yinghai User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100228 SUSE/3.0.3-1.1.1 Thunderbird/3.0.3 MIME-Version: 1.0 To: "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar CC: Andy Isaacson , Yinghai , guenter.roeck@ericsson.com, Linus Torvalds , Bjorn Helgaas , "linux-pci@vger.kernel.org" , "x86@kernel.org" , "linux-kernel@vger.kernel.org" , Thomas Renninger Subject: [PATCH -v2 2/2] x86, pci, acpi: Inherent BUSY flag when setup_resource for root bus References: <20100409223532.GC11130@hexapodia.org> <4BBFB1D8.6090802@oracle.com> <20100410000030.GE11130@hexapodia.org> <4BBFD019.9040405@oracle.com> <20100410014308.GG11130@hexapodia.org> <4BBFD8EF.6020108@oracle.com> <20100410015711.GH11130@hexapodia.org> <4BBFE66C.2040603@oracle.com> <20100412185416.GA19959@hexapodia.org> <4BC375D9.4040503@oracle.com> <20100412200224.GO11130@hexapodia.org> In-Reply-To: <20100412200224.GO11130@hexapodia.org> X-Source-IP: acsmt355.oracle.com [141.146.40.155] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090204.4BC3A036.008C:SCFMA4539814,ss=1,fgs=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.3 (demeter.kernel.org [140.211.167.41]); Mon, 12 Apr 2010 22:36:37 +0000 (UTC) Index: linux-2.6/arch/x86/pci/acpi.c =================================================================== --- linux-2.6.orig/arch/x86/pci/acpi.c +++ linux-2.6/arch/x86/pci/acpi.c @@ -175,6 +175,10 @@ setup_resource(struct acpi_resource *acp "conflicts with %s %pR\n", res, conflict->name, conflict); } else { + /* In case it falls in big reserved region */ + if (res->parent->flags & IORESOURCE_BUSY) + res->flags |= IORESOURCE_BUSY; + pci_bus_add_resource(info->bus, res, 0); info->res_num++; if (addr.translation_offset) Index: linux-2.6/drivers/pci/bus.c =================================================================== --- linux-2.6.orig/drivers/pci/bus.c +++ linux-2.6/drivers/pci/bus.c @@ -103,6 +103,10 @@ pci_bus_alloc_resource(struct pci_bus *b if (!r) continue; + /* Driver can not reserve it later, so don't use it */ + if (r->flags & IORESOURCE_BUSY) + continue; + /* type_mask must match */ if ((res->flags ^ r->flags) & type_mask) continue;