From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 30/31] x86: Use walk_system_ream_range()instead of e820.map directly Date: Sun, 28 Mar 2010 19:43:23 -0700 Message-ID: <1269830604-26214-31-git-send-email-yinghai@kernel.org> References: <1269830604-26214-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Be Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu List-Id: linux-arch.vger.kernel.org So we can make e820 to be __initdata Signed-off-by: Yinghai Lu --- arch/x86/kernel/tboot.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index cc2c604..cf27d64 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -170,34 +170,30 @@ static void tboot_create_trampoline(void) #ifdef CONFIG_ACPI_SLEEP -static void add_mac_region(phys_addr_t start, unsigned long size) +static int +add_mac_region(unsigned long start_pfn, unsigned long nr_pages, void *arg) { + u64 start = start_pfn; + u64 size = nr_pages; struct tboot_mac_region *mr; - phys_addr_t end = start + size; if (tboot->num_mac_regions >= MAX_TB_MAC_REGIONS) panic("tboot: Too many MAC regions\n"); if (start && size) { mr = &tboot->mac_regions[tboot->num_mac_regions++]; - mr->start = round_down(start, PAGE_SIZE); - mr->size = round_up(end, PAGE_SIZE) - mr->start; + mr->start = start << PAGE_SHIFT; + mr->size = (u32) (size << PAGE_SHIFT); } + + return 0; } static int tboot_setup_sleep(void) { - int i; - tboot->num_mac_regions = 0; - for (i = 0; i < e820.nr_map; i++) { - if ((e820.map[i].type != E820_RAM) - && (e820.map[i].type != E820_RESERVED_KERN)) - continue; - - add_mac_region(e820.map[i].addr, e820.map[i].size); - } + walk_system_ram_range(0, max_pfn, NULL, add_mac_region); tboot->acpi_sinfo.kernel_s3_resume_vector = acpi_wakeup_address; -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from acsinet11.oracle.com ([141.146.126.233]:56020 "EHLO acsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755889Ab0C2CrD (ORCPT ); Sun, 28 Mar 2010 22:47:03 -0400 From: Yinghai Lu Subject: [PATCH 30/31] x86: Use walk_system_ream_range()instead of e820.map directly Date: Sun, 28 Mar 2010 19:43:23 -0700 Message-ID: <1269830604-26214-31-git-send-email-yinghai@kernel.org> In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> References: <1269830604-26214-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt , Linus Torvalds Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20100329024323.2DkVnX08A0OEelOWl9Ed8v3aqT5rktU4fzp5RxeAd5Y@z> So we can make e820 to be __initdata Signed-off-by: Yinghai Lu --- arch/x86/kernel/tboot.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index cc2c604..cf27d64 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -170,34 +170,30 @@ static void tboot_create_trampoline(void) #ifdef CONFIG_ACPI_SLEEP -static void add_mac_region(phys_addr_t start, unsigned long size) +static int +add_mac_region(unsigned long start_pfn, unsigned long nr_pages, void *arg) { + u64 start = start_pfn; + u64 size = nr_pages; struct tboot_mac_region *mr; - phys_addr_t end = start + size; if (tboot->num_mac_regions >= MAX_TB_MAC_REGIONS) panic("tboot: Too many MAC regions\n"); if (start && size) { mr = &tboot->mac_regions[tboot->num_mac_regions++]; - mr->start = round_down(start, PAGE_SIZE); - mr->size = round_up(end, PAGE_SIZE) - mr->start; + mr->start = start << PAGE_SHIFT; + mr->size = (u32) (size << PAGE_SHIFT); } + + return 0; } static int tboot_setup_sleep(void) { - int i; - tboot->num_mac_regions = 0; - for (i = 0; i < e820.nr_map; i++) { - if ((e820.map[i].type != E820_RAM) - && (e820.map[i].type != E820_RESERVED_KERN)) - continue; - - add_mac_region(e820.map[i].addr, e820.map[i].size); - } + walk_system_ram_range(0, max_pfn, NULL, add_mac_region); tboot->acpi_sinfo.kernel_s3_resume_vector = acpi_wakeup_address; -- 1.6.4.2