From: Marcin Nowakowski <marcin.nowakowski@imgtec.com> To: Serge Semin <fancer.lancer@gmail.com>, <ralf@linux-mips.org>, <paul.burton@imgtec.com>, <rabinv@axis.com>, <matt.redfearn@imgtec.com>, <james.hogan@imgtec.com>, <alexander.sverdlin@nokia.com>, <robh+dt@kernel.org>, <frowand.list@gmail.com> Cc: <Sergey.Semin@t-platforms.ru>, <linux-mips@linux-mips.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org> Subject: Re: [PATCH 04/21] MIPS memblock: Alter user-defined memory parameter parser Date: Mon, 23 Jan 2017 08:55:16 +0100 [thread overview] Message-ID: <756b9060-7a21-ad23-9e74-50670f42753e@imgtec.com> (raw) In-Reply-To: <1482113266-13207-5-git-send-email-fancer.lancer@gmail.com> Hi Serge, On 19.12.2016 03:07, Serge Semin wrote: > Both new memblock and boot_mem_map subsystems need to be fully > cleared before a new memory region is added. So the early parser is > correspondingly modified. > > Signed-off-by: Serge Semin <fancer.lancer@gmail.com> > --- > arch/mips/kernel/setup.c | 67 +++++++++++++++++------------- > 1 file changed, 37 insertions(+), 30 deletions(-) > > diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c > index 9da6f8a..789aafe 100644 > --- a/arch/mips/kernel/setup.c > +++ b/arch/mips/kernel/setup.c > @@ -229,6 +229,43 @@ static void __init print_memory_map(void) > } > > /* > + * Parse "mem=size@start" parameter rewriting a defined memory map > + * We look for mem=size@start, where start and size are "value[KkMm]" > + */ > +static int __init early_parse_mem(char *p) > +{ > + static int usermem; usermem variable seems unnecessary now and could easily be removed? > + phys_addr_t start, size; > + > + start = PHYS_OFFSET; > + size = memparse(p, &p); > + if (*p == '@') > + start = memparse(p + 1, &p); > + > + /* > + * If a user specifies memory size, we blow away any automatically > + * generated regions. > + */ > + if (usermem == 0) { > + phys_addr_t ram_start = memblock_start_of_DRAM(); > + phys_addr_t ram_end = memblock_end_of_DRAM() - ram_start; > + > + pr_notice("Discard memory layout %pa - %pa", > + &ram_start, &ram_end); missing \n in printk > + memblock_remove(ram_start, ram_end - ram_start); > + boot_mem_map.nr_map = 0; > + usermem = 1; > + } > + pr_notice("Add userdefined memory region %08zx @ %pa", > + (size_t)size, &start); ditto > + add_memory_region(start, size, BOOT_MEM_RAM); > + return 0; > +} > +early_param("mem", early_parse_mem); > + > +/* > * Manage initrd > */ > #ifdef CONFIG_BLK_DEV_INITRD > @@ -613,31 +650,6 @@ static void __init bootmem_init(void) > * initialization hook for anything else was introduced. > */ > > -static int usermem __initdata; > - > -static int __init early_parse_mem(char *p) > -{ > - phys_addr_t start, size; > - > - /* > - * If a user specifies memory size, we > - * blow away any automatically generated > - * size. > - */ > - if (usermem == 0) { > - boot_mem_map.nr_map = 0; > - usermem = 1; > - } > - start = 0; > - size = memparse(p, &p); > - if (*p == '@') > - start = memparse(p + 1, &p); > - > - add_memory_region(start, size, BOOT_MEM_RAM); > - return 0; > -} > -early_param("mem", early_parse_mem); > - > #ifdef CONFIG_PROC_VMCORE > unsigned long setup_elfcorehdr, setup_elfcorehdr_size; > static int __init early_parse_elfcorehdr(char *p) > @@ -797,11 +809,6 @@ static void __init arch_mem_init(char **cmdline_p) > > parse_early_param(); > > - if (usermem) { > - pr_info("User-defined physical RAM map:\n"); > - print_memory_map(); > - } > - > bootmem_init(); > #ifdef CONFIG_PROC_VMCORE > if (setup_elfcorehdr && setup_elfcorehdr_size) { > Regards, Marcin
WARNING: multiple messages have this Message-ID (diff)
From: Marcin Nowakowski <marcin.nowakowski@imgtec.com> To: Serge Semin <fancer.lancer@gmail.com>, ralf@linux-mips.org, paul.burton@imgtec.com, rabinv@axis.com, matt.redfearn@imgtec.com, james.hogan@imgtec.com, alexander.sverdlin@nokia.com, robh+dt@kernel.org, frowand.list@gmail.com Cc: Sergey.Semin@t-platforms.ru, linux-mips@linux-mips.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 04/21] MIPS memblock: Alter user-defined memory parameter parser Date: Mon, 23 Jan 2017 08:55:16 +0100 [thread overview] Message-ID: <756b9060-7a21-ad23-9e74-50670f42753e@imgtec.com> (raw) Message-ID: <20170123075516.XaQLYluPcrg7T022ogSiILR2IDwAVqMZSOly7u4A8Ko@z> (raw) In-Reply-To: <1482113266-13207-5-git-send-email-fancer.lancer@gmail.com> Hi Serge, On 19.12.2016 03:07, Serge Semin wrote: > Both new memblock and boot_mem_map subsystems need to be fully > cleared before a new memory region is added. So the early parser is > correspondingly modified. > > Signed-off-by: Serge Semin <fancer.lancer@gmail.com> > --- > arch/mips/kernel/setup.c | 67 +++++++++++++++++------------- > 1 file changed, 37 insertions(+), 30 deletions(-) > > diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c > index 9da6f8a..789aafe 100644 > --- a/arch/mips/kernel/setup.c > +++ b/arch/mips/kernel/setup.c > @@ -229,6 +229,43 @@ static void __init print_memory_map(void) > } > > /* > + * Parse "mem=size@start" parameter rewriting a defined memory map > + * We look for mem=size@start, where start and size are "value[KkMm]" > + */ > +static int __init early_parse_mem(char *p) > +{ > + static int usermem; usermem variable seems unnecessary now and could easily be removed? > + phys_addr_t start, size; > + > + start = PHYS_OFFSET; > + size = memparse(p, &p); > + if (*p == '@') > + start = memparse(p + 1, &p); > + > + /* > + * If a user specifies memory size, we blow away any automatically > + * generated regions. > + */ > + if (usermem == 0) { > + phys_addr_t ram_start = memblock_start_of_DRAM(); > + phys_addr_t ram_end = memblock_end_of_DRAM() - ram_start; > + > + pr_notice("Discard memory layout %pa - %pa", > + &ram_start, &ram_end); missing \n in printk > + memblock_remove(ram_start, ram_end - ram_start); > + boot_mem_map.nr_map = 0; > + usermem = 1; > + } > + pr_notice("Add userdefined memory region %08zx @ %pa", > + (size_t)size, &start); ditto > + add_memory_region(start, size, BOOT_MEM_RAM); > + return 0; > +} > +early_param("mem", early_parse_mem); > + > +/* > * Manage initrd > */ > #ifdef CONFIG_BLK_DEV_INITRD > @@ -613,31 +650,6 @@ static void __init bootmem_init(void) > * initialization hook for anything else was introduced. > */ > > -static int usermem __initdata; > - > -static int __init early_parse_mem(char *p) > -{ > - phys_addr_t start, size; > - > - /* > - * If a user specifies memory size, we > - * blow away any automatically generated > - * size. > - */ > - if (usermem == 0) { > - boot_mem_map.nr_map = 0; > - usermem = 1; > - } > - start = 0; > - size = memparse(p, &p); > - if (*p == '@') > - start = memparse(p + 1, &p); > - > - add_memory_region(start, size, BOOT_MEM_RAM); > - return 0; > -} > -early_param("mem", early_parse_mem); > - > #ifdef CONFIG_PROC_VMCORE > unsigned long setup_elfcorehdr, setup_elfcorehdr_size; > static int __init early_parse_elfcorehdr(char *p) > @@ -797,11 +809,6 @@ static void __init arch_mem_init(char **cmdline_p) > > parse_early_param(); > > - if (usermem) { > - pr_info("User-defined physical RAM map:\n"); > - print_memory_map(); > - } > - > bootmem_init(); > #ifdef CONFIG_PROC_VMCORE > if (setup_elfcorehdr && setup_elfcorehdr_size) { > Regards, Marcin
next prev parent reply other threads:[~2017-01-23 7:55 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-19 2:07 [PATCH 00/21] MIPS memblock: Remove bootmem code and switch to NO_BOOTMEM Serge Semin 2016-12-19 2:07 ` [PATCH 01/21] MIPS memblock: Unpin dts memblock sanity check method Serge Semin 2016-12-19 4:21 ` kbuild test robot 2016-12-19 4:21 ` kbuild test robot 2016-12-19 4:28 ` kbuild test robot 2016-12-19 4:28 ` kbuild test robot 2016-12-22 20:57 ` Rob Herring 2016-12-22 21:57 ` Serge Semin 2016-12-19 2:07 ` [PATCH 02/21] MIPS memblock: Add dts mem and reserved-mem callbacks Serge Semin 2016-12-19 4:13 ` kbuild test robot 2016-12-19 4:13 ` kbuild test robot 2016-12-19 2:07 ` [PATCH 03/21] MIPS memblock: Alter traditional add_memory_region() method Serge Semin 2016-12-19 2:07 ` [PATCH 04/21] MIPS memblock: Alter user-defined memory parameter parser Serge Semin 2017-01-23 7:55 ` Marcin Nowakowski [this message] 2017-01-23 7:55 ` Marcin Nowakowski 2016-12-19 2:07 ` [PATCH 05/21] MIPS memblock: Alter initrd memory reservation method Serge Semin 2016-12-19 5:08 ` kbuild test robot 2016-12-19 5:08 ` kbuild test robot 2016-12-19 2:07 ` [PATCH 06/21] MIPS memblock: Alter kexec-crashkernel parameters parser Serge Semin 2016-12-19 2:07 ` [PATCH 07/21] MIPS memblock: Alter elfcorehdr " Serge Semin 2016-12-19 4:09 ` kbuild test robot 2016-12-19 4:09 ` kbuild test robot 2016-12-19 2:07 ` [PATCH 08/21] MIPS memblock: Move kernel parameters parser into individual method Serge Semin 2016-12-19 2:07 ` [PATCH 09/21] MIPS memblock: Move kernel memory reservation to " Serge Semin 2016-12-19 2:07 ` [PATCH 10/21] MIPS memblock: Discard bootmem allocator initialization Serge Semin 2016-12-19 4:28 ` kbuild test robot 2016-12-19 4:28 ` kbuild test robot 2017-01-23 7:55 ` Marcin Nowakowski 2017-01-23 7:55 ` Marcin Nowakowski 2016-12-19 2:07 ` [PATCH 11/21] MIPS memblock: Add memblock sanity check method Serge Semin 2016-12-19 2:07 ` [PATCH 12/21] MIPS memblock: Add memblock print outs in debug Serge Semin 2016-12-19 2:07 ` [PATCH 13/21] MIPS memblock: Add memblock allocator initialization Serge Semin 2016-12-19 2:07 ` [PATCH 14/21] MIPS memblock: Alter IO resources initialization method Serge Semin 2016-12-19 2:07 ` [PATCH 15/21] MIPS memblock: Alter weakened MAAR " Serge Semin 2016-12-19 2:07 ` [PATCH 16/21] MIPS memblock: Alter paging " Serge Semin 2016-12-19 2:07 ` [PATCH 17/21] MIPS memblock: Alter high memory freeing method Serge Semin 2016-12-19 2:07 ` [PATCH 18/21] MIPS memblock: Slightly improve buddy allocator init method Serge Semin 2016-12-19 2:07 ` [PATCH 19/21] MIPS memblock: Add print out method of kernel virtual memory layout Serge Semin 2016-12-19 12:04 ` Matt Redfearn 2016-12-19 12:04 ` Matt Redfearn 2016-12-19 12:09 ` Serge Semin 2016-12-19 13:02 ` James Hogan 2016-12-19 13:02 ` James Hogan 2016-12-19 13:15 ` Serge Semin 2016-12-19 2:07 ` [PATCH 20/21] MIPS memblock: Add free low memory test method call Serge Semin 2016-12-19 2:07 ` [PATCH 21/21] MIPS memblock: Deactivate old bootmem allocator Serge Semin 2017-01-23 7:55 ` [PATCH 00/21] MIPS memblock: Remove bootmem code and switch to NO_BOOTMEM Marcin Nowakowski 2017-01-23 7:55 ` Marcin Nowakowski 2017-03-02 3:06 ` Florian Fainelli 2017-01-23 14:51 ` Joshua Kinard 2017-05-22 9:48 ` Marcin Nowakowski 2017-05-22 9:48 ` Marcin Nowakowski 2017-05-22 10:26 ` Serge Semin 2017-05-22 12:19 ` Marcin Nowakowski 2017-05-22 12:19 ` Marcin Nowakowski 2017-05-22 12:47 ` Joshua Kinard 2017-05-22 13:03 ` Serge Semin 2017-05-22 13:20 ` Alexander Sverdlin 2017-05-22 13:20 ` Alexander Sverdlin 2017-05-22 13:29 ` Serge Semin
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=756b9060-7a21-ad23-9e74-50670f42753e@imgtec.com \ --to=marcin.nowakowski@imgtec.com \ --cc=Sergey.Semin@t-platforms.ru \ --cc=alexander.sverdlin@nokia.com \ --cc=devicetree@vger.kernel.org \ --cc=fancer.lancer@gmail.com \ --cc=frowand.list@gmail.com \ --cc=james.hogan@imgtec.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=matt.redfearn@imgtec.com \ --cc=paul.burton@imgtec.com \ --cc=rabinv@axis.com \ --cc=ralf@linux-mips.org \ --cc=robh+dt@kernel.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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).