From patchwork Sat Dec 12 02:11:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 66899 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBC2D6dk021393 for ; Sat, 12 Dec 2009 02:13:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761399AbZLLCM6 (ORCPT ); Fri, 11 Dec 2009 21:12:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762656AbZLLCM6 (ORCPT ); Fri, 11 Dec 2009 21:12:58 -0500 Received: from hera.kernel.org ([140.211.167.34]:47225 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761399AbZLLCM5 (ORCPT ); Fri, 11 Dec 2009 21:12:57 -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 nBC2CjpT019700 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 12 Dec 2009 02:12:46 GMT Message-ID: <4B22FBEB.7040204@kernel.org> Date: Fri, 11 Dec 2009 18:11:55 -0800 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Ingo Molnar , Jesse Barnes , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton CC: "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , Gertjan van Wingerde Subject: [PATCH 61/7] x86/pci: add cap_4g References: <4B22D4DA.2000104@kernel.org> <4B22D74D.4020201@kernel.org> In-Reply-To: <4B22D74D.4020201@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_4g((0xfdULL<<32) - 1); /* need to take out [0, TOM) for RAM*/ address = MSR_K8_TOP_MEM1; @@ -286,7 +286,7 @@ static int __init early_fill_mp_bus_info } } - update_res(info, start, end, IORESOURCE_MEM, 1); + update_res(info, cap_4g(start), cap_4g(end), IORESOURCE_MEM, 1); subtract_range(range, RANGE_NUM, start, end); printk(KERN_CONT "\n"); } @@ -321,7 +321,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_4g(range[i].start), + cap_4g(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,10 @@ void __init update_res(struct pci_root_i if (start > end) return; + if (sizeof(resource_size_t) < sizeof(u64) && + start == 0xffffffff) + 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" @@ -81,7 +83,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_4g(mmioh_base), cap_4g(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,14 @@ int clean_sort_range(struct range *range void sort_range(struct range *range, int nr_range); +static inline u64 cap_4g(u64 val) +{ + if (sizeof(resource_size_t) >= sizeof(u64)) + return val; + + if (val < 1ULL) + return val; + + return 0xffffffff; +} #endif