From: Yinghai Lu <yinghai@kernel.org> To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, Andrew Morton <akpm@linux-foundation.org>, David Miller <davem@davemloft.net>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Linus Torvalds <torvalds@linux-foundation.org> Cc: Johannes Weiner <hannes@cmpxchg.org>, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org> Subject: [PATCH 32/33] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Date: Tue, 30 Mar 2010 19:17:17 -0700 [thread overview] Message-ID: <1270001838-15857-33-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org> So we can make e820 to be __initdata Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Yinghai Lu <yinghai@kernel.org> To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, Andrew Morton <akpm@linux-foundation.org>, David Miller <davem@davemloft.net>, Be Cc: Johannes Weiner <hannes@cmpxchg.org>, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org> Subject: [PATCH 32/33] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Date: Tue, 30 Mar 2010 19:17:17 -0700 [thread overview] Message-ID: <1270001838-15857-33-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org> So we can make e820 to be __initdata Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- 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
next prev parent reply other threads:[~2010-03-31 2:21 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-03-31 2:16 [PATCH -v11 00/33] use lmb with x86 Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 01/33] x86: Make e820_remove_range() to handle all covered case Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 02/33] lmb: Move lmb.c to mm/ Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 03/33] lmb: Seperate region array from lmb_region struct Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 04/33] lmb: Seperate __lmb_find_base() from __lmb_alloc_base() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 05/33] lmb: Add lmb_find_area() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 06/33] lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-04-07 23:35 ` Michael Ellerman 2010-04-07 23:36 ` Yinghai 2010-03-31 2:16 ` [PATCH 07/33] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 08/33] lmb: Add lmb_to_bootmem() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 09/33] lmb: Add get_free_all_memory_range() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 10/33] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 11/33] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 12/33] lmb: Add find_memory_core_early() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 13/33] lmb: Add lmb_find_area_node() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 14/33] lmb: Add lmb_free_memory_size() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 15/33] lmb: Add lmb_memory_size() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 16/33] lmb: Add lmb_reserve_area_overlap_ok() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 17/33] lmb: Use lmb_debug to control debug message print out Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 18/33] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 19/33] x86: Add sanitize_e820_map() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 20/33] x86, lmb: Add lmb_find_area_size() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 21/33] x86, lmb: Add x86 version of __lmb_find_area() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 22/33] x86: Use lmb to replace early_res Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 23/33] x86: Replace e820_/_early string with lmb_ Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 24/33] nobootmem: use lmb.default_alloc_limit in alloc_bootmem path Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 25/33] x86, lmb: turn off ARCH_LMB_FIND_AREA Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-04-07 23:38 ` Michael Ellerman 2010-04-07 23:40 ` Yinghai 2010-03-31 2:17 ` [PATCH 26/33] x86: Remove not used early_res code Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 27/33] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 28/33] x86: Align e820 ram range to page Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 29/33] x86: Use wake_system_ram_range instead of e820_any_mapped in agp path Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 30/33] x86: Add get_centaur_ram_top() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 31/33] x86: Change e820_any_mapped() to __init Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu [this message] 2010-03-31 2:17 ` [PATCH 32/33] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Yinghai Lu 2010-03-31 2:17 ` [PATCH 33/33] x86: make e820 to be __initdata Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1270001838-15857-33-git-send-email-yinghai@kernel.org \ --to=yinghai@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=benh@kernel.crashing.org \ --cc=davem@davemloft.net \ --cc=hannes@cmpxchg.org \ --cc=hpa@zytor.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.