From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 32/37] x86: Align e820 ram range to page Date: Tue, 15 Jun 2010 22:42:41 -0700 Message-ID: <1276666966-14259-33-git-send-email-yinghai@kernel.org> References: <1276666966-14259-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1276666966-14259-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Andrew Morton , Benjamin Herrenschmidt Cc: David Miller , Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu List-Id: linux-arch.vger.kernel.org for 2.6.34 To workaround wrong BIOS memory map. Signed-off-by: Yinghai Lu --- arch/x86/kernel/e820.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 63b46ac..025e139 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -910,6 +910,47 @@ static int __init parse_memmap_opt(char *p) } early_param("memmap", parse_memmap_opt); +static void __init e820_align_ram_page(void) +{ + int i; + bool changed = false;; + + for (i = 0; i < e820.nr_map; i++) { + struct e820entry *entry = &e820.map[i]; + u64 start, end; + u64 start_aligned, end_aligned; + + if (entry->type != E820_RAM) + continue; + + start = entry->addr; + end = start + entry->size; + + start_aligned = round_up(start, PAGE_SIZE); + end_aligned = round_down(end, PAGE_SIZE); + + if (end_aligned <= start_aligned) { + e820_update_range(start, end - start, E820_RAM, E820_RESERVED); + changed = true; + continue; + } + if (start < start_aligned) { + e820_update_range(start, start_aligned - start, E820_RAM, E820_RESERVED); + changed = true; + } + if (end_aligned < end) { + e820_update_range(end_aligned, end - end_aligned, E820_RAM, E820_RESERVED); + changed = true; + } + } + + if (changed) { + sanitize_e820_map(); + printk(KERN_INFO "aligned physical RAM map:\n"); + e820_print_map("aligned"); + } +} + void __init finish_e820_parsing(void) { if (userdef) { @@ -922,6 +963,9 @@ void __init finish_e820_parsing(void) printk(KERN_INFO "user-defined physical RAM map:\n"); e820_print_map("user"); } + + /* In case, We have RAM entres that are not PAGE aligned */ + e820_align_ram_page(); } static inline const char *e820_type_to_string(int e820_type) -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet10.oracle.com ([148.87.113.121]:28667 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757093Ab0FPFqi (ORCPT ); Wed, 16 Jun 2010 01:46:38 -0400 From: Yinghai Lu Subject: [PATCH 32/37] x86: Align e820 ram range to page Date: Tue, 15 Jun 2010 22:42:41 -0700 Message-ID: <1276666966-14259-33-git-send-email-yinghai@kernel.org> In-Reply-To: <1276666966-14259-1-git-send-email-yinghai@kernel.org> References: <1276666966-14259-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Andrew Morton , Benjamin Herrenschmidt Cc: David Miller , Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20100616054241.0f0985v-3o6BGG7loVGQJ9Xj4RahDE3GfrXQc54elTE@z> for 2.6.34 To workaround wrong BIOS memory map. Signed-off-by: Yinghai Lu --- arch/x86/kernel/e820.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 63b46ac..025e139 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -910,6 +910,47 @@ static int __init parse_memmap_opt(char *p) } early_param("memmap", parse_memmap_opt); +static void __init e820_align_ram_page(void) +{ + int i; + bool changed = false;; + + for (i = 0; i < e820.nr_map; i++) { + struct e820entry *entry = &e820.map[i]; + u64 start, end; + u64 start_aligned, end_aligned; + + if (entry->type != E820_RAM) + continue; + + start = entry->addr; + end = start + entry->size; + + start_aligned = round_up(start, PAGE_SIZE); + end_aligned = round_down(end, PAGE_SIZE); + + if (end_aligned <= start_aligned) { + e820_update_range(start, end - start, E820_RAM, E820_RESERVED); + changed = true; + continue; + } + if (start < start_aligned) { + e820_update_range(start, start_aligned - start, E820_RAM, E820_RESERVED); + changed = true; + } + if (end_aligned < end) { + e820_update_range(end_aligned, end - end_aligned, E820_RAM, E820_RESERVED); + changed = true; + } + } + + if (changed) { + sanitize_e820_map(); + printk(KERN_INFO "aligned physical RAM map:\n"); + e820_print_map("aligned"); + } +} + void __init finish_e820_parsing(void) { if (userdef) { @@ -922,6 +963,9 @@ void __init finish_e820_parsing(void) printk(KERN_INFO "user-defined physical RAM map:\n"); e820_print_map("user"); } + + /* In case, We have RAM entres that are not PAGE aligned */ + e820_align_ram_page(); } static inline const char *e820_type_to_string(int e820_type) -- 1.6.4.2