From patchwork Fri Dec 18 20:09:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 68798 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBIKSDrY022241 for ; Fri, 18 Dec 2009 20:28:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755588AbZLRUL5 (ORCPT ); Fri, 18 Dec 2009 15:11:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752516AbZLRUL5 (ORCPT ); Fri, 18 Dec 2009 15:11:57 -0500 Received: from hera.kernel.org ([140.211.167.34]:55346 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932640AbZLRULJ (ORCPT ); Fri, 18 Dec 2009 15:11:09 -0500 Received: from [10.6.76.26] (sca-ea-fw-1.Sun.COM [192.18.43.225]) (authenticated bits=0) by hera.kernel.org (8.14.3/8.14.3) with ESMTP id nBIKAeax021366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 18 Dec 2009 20:10:40 GMT Message-ID: <4B2BE18D.1040108@kernel.org> Date: Fri, 18 Dec 2009 12:09:49 -0800 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Jesse Barnes , Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" CC: "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" Subject: [PATCH 5/7] x86/pci: add cap_resource -v2 References: <4B2BE063.4040704@kernel.org> In-Reply-To: <4B2BE063.4040704@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Index: linux-2.6/arch/x86/pci/amd_bus.c =================================================================== --- linux-2.6.orig/arch/x86/pci/amd_bus.c +++ linux-2.6/arch/x86/pci/amd_bus.c @@ -201,7 +201,7 @@ static int __init early_fill_mp_bus_info memset(range, 0, sizeof(range)); /* 0xfd00000000-0xffffffffff for HT */ - range[0].end = (0xfdULL<<32) - 1; + range[0].end = cap_resource((0xfdULL<<32) - 1); /* need to take out [0, TOM) for RAM*/ address = MSR_K8_TOP_MEM1; @@ -286,7 +286,8 @@ static int __init early_fill_mp_bus_info } } - update_res(info, start, end, IORESOURCE_MEM, 1); + update_res(info, cap_resource(start), cap_resource(end), + IORESOURCE_MEM, 1); subtract_range(range, RANGE_NUM, start, end); printk(KERN_CONT "\n"); } @@ -321,7 +322,8 @@ static int __init early_fill_mp_bus_info if (!range[i].end) continue; - update_res(info, range[i].start, range[i].end, + update_res(info, cap_resource(range[i].start), + cap_resource(range[i].end), IORESOURCE_MEM, 1); } } Index: linux-2.6/arch/x86/pci/bus_numa.c =================================================================== --- linux-2.6.orig/arch/x86/pci/bus_numa.c +++ linux-2.6/arch/x86/pci/bus_numa.c @@ -55,6 +55,9 @@ void __init update_res(struct pci_root_i if (start > end) return; + if (start == (resource_size_t)~0) + return; + if (!merge) goto addit; Index: linux-2.6/arch/x86/pci/intel_bus.c =================================================================== --- linux-2.6.orig/arch/x86/pci/intel_bus.c +++ linux-2.6/arch/x86/pci/intel_bus.c @@ -6,6 +6,8 @@ #include #include #include +#include + #include #include "bus_numa.h" @@ -85,7 +87,8 @@ static void __devinit pci_root_bus_res(s mmioh_base |= ((u64)(dword & 0x7ffff)) << 32; pci_read_config_dword(dev, IOH_LMMIOH_LIMITU, &dword); mmioh_end |= ((u64)(dword & 0x7ffff)) << 32; - update_res(info, mmioh_base, mmioh_end, IORESOURCE_MEM, 0); + update_res(info, cap_resource(mmioh_base), cap_resource(mmioh_end), + IORESOURCE_MEM, 0); print_ioh_resources(info); } Index: linux-2.6/include/linux/range.h =================================================================== --- linux-2.6.orig/include/linux/range.h +++ linux-2.6/include/linux/range.h @@ -19,4 +19,12 @@ int clean_sort_range(struct range *range void sort_range(struct range *range, int nr_range); + +static inline resource_size_t cap_resource(u64 val) +{ + if (val > (resource_size_t)~0) + return (resource_size_t)~0; + else + return val; +} #endif