From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755223Ab2F1BZG (ORCPT ); Wed, 27 Jun 2012 21:25:06 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:53640 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752407Ab2F1BZD (ORCPT ); Wed, 27 Jun 2012 21:25:03 -0400 X-IronPort-AV: E=Sophos;i="4.77,488,1336320000"; d="scan'208";a="5278897" Message-ID: <4FEBB377.2080309@cn.fujitsu.com> Date: Thu, 28 Jun 2012 09:29:27 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: rob@landley.net, tglx@linutronix.de, Ingo Molnar , x86@kernel.org, "linux-kernel@vger.kernel.org" , bhelgaas@google.com, "H. Peter Anvin" Subject: Re: [PATCH 2/2] x86: reimplement mem boot option References: <4FD99C88.2010002@cn.fujitsu.com> <4FD99CFA.6060801@cn.fujitsu.com> In-Reply-To: <4FD99CFA.6060801@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/06/28 09:25:08, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/06/28 09:25:14, Serialize complete at 2012/06/28 09:25:14 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Pin...... At 06/14/2012 04:12 PM, Wen Congyang Wrote: > Current mem boot option only can work for non efi environment. If the user > specifies add_efi_memmap, it cannot work for efi environment. In > the efi environment, we call e820_add_region() to add the memory map. So > we can modify __e820_add_region() and the mem boot option can work for > efi environment. > > Signed-off-by: Wen Congyang > --- > arch/x86/kernel/e820.c | 29 +++++++++++++++++++++++++---- > 1 files changed, 25 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c > index 4185797..20bc467 100644 > --- a/arch/x86/kernel/e820.c > +++ b/arch/x86/kernel/e820.c > @@ -47,6 +47,7 @@ unsigned long pci_mem_start = 0xaeedbabe; > #ifdef CONFIG_PCI > EXPORT_SYMBOL(pci_mem_start); > #endif > +static u64 mem_limit = ~0ULL; > > /* > * This function checks if any part of the range is mapped > @@ -119,6 +120,20 @@ static void __init __e820_add_region(struct e820map *e820x, u64 start, u64 size, > return; > } > > + if (start >= mem_limit) { > + printk(KERN_ERR "e820: ignoring [mem %#010llx-%#010llx]\n", > + (unsigned long long)start, > + (unsigned long long)(start + size - 1)); > + return; > + } > + > + if (mem_limit - start < size) { > + printk(KERN_ERR "e820: ingoring [mem %#010llx-%#010llx]\n", > + (unsigned long long)mem_limit, > + (unsigned long long)(start + size - 1)); > + size = mem_limit - start; > + } > + > e820x->map[x].addr = start; > e820x->map[x].size = size; > e820x->map[x].type = type; > @@ -809,7 +824,7 @@ static int userdef __initdata; > /* "mem=nopentium" disables the 4MB page tables. */ > static int __init parse_memopt(char *p) > { > - u64 mem_size; > + char *oldp; > > if (!p) > return -EINVAL; > @@ -825,11 +840,11 @@ static int __init parse_memopt(char *p) > } > > userdef = 1; > - mem_size = memparse(p, &p); > + oldp = p; > + mem_limit = memparse(p, &p); > /* don't remove all of memory when handling "mem={invalid}" param */ > - if (mem_size == 0) > + if (mem_limit == 0 || p == oldp) > return -EINVAL; > - e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1); > > return 0; > } > @@ -881,6 +896,12 @@ early_param("memmap", parse_memmap_opt); > > void __init finish_e820_parsing(void) > { > + if (mem_limit != ~0ULL) { > + userdef = 1; > + e820_remove_range(mem_limit, ULLONG_MAX - mem_limit, > + E820_RAM, 1); > + } > + > if (userdef) { > u32 nr = e820.nr_map; >