From: Michal Simek <monstr@monstr.eu> To: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, Stephen Rothwell <sfr@canb.auug.org.au>, Ingo Molnar <mingo@elte.hu> Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors Date: Thu, 09 Sep 2010 12:57:19 +0200 [thread overview] Message-ID: <4C88BD8F.5080208@monstr.eu> (raw) In-Reply-To: <1281135046.2168.40.camel@pasglop> Benjamin Herrenschmidt wrote: > On Fri, 2010-08-06 at 10:52 +0200, Michal Simek wrote: >> Benjamin Herrenschmidt wrote: >>> CC: Michal Simek <monstr@monstr.eu> >>> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> >> This patch remove bug which I reported but there is another place which >> needs to be changed. >> >> I am not sure if my patch is correct but at least point you on places >> which is causing compilation errors. >> >> I tested your memblock branch with this fix and microblaze can boot. > > Ok, that's missing in my initial rename patch. I'll fix it up. Thanks. > > Cheers, > Ben. I don't know why but this unfixed old patch is in linux-next today. Not sure which tree contains it. Thanks, Michal >> >> CC arch/microblaze/mm/init.o >> arch/microblaze/mm/init.c: In function 'mm_cmdline_setup': >> arch/microblaze/mm/init.c:236: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c: In function 'mmu_init': >> arch/microblaze/mm/init.c:279: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c:284: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c:285: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c:286: error: 'struct memblock_type' has no >> member named 'region' >> make[1]: *** [arch/microblaze/mm/init.o] Error 1 >> make: *** [arch/microblaze/mm] Error 2 >> >> >> diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c >> index 32a702b..a9d7b9b 100644 >> --- a/arch/microblaze/mm/init.c >> +++ b/arch/microblaze/mm/init.c >> @@ -233,7 +233,7 @@ static void mm_cmdline_setup(void) >> if (maxmem && memory_size > maxmem) { >> memory_size = maxmem; >> memory_end = memory_start + memory_size; >> - memblock.memory.region[0].size = memory_size; >> + memblock.memory.regions[0].size = memory_size; >> } >> } >> } >> @@ -276,14 +276,14 @@ asmlinkage void __init mmu_init(void) >> machine_restart(NULL); >> } >> >> - if ((u32) memblock.memory.region[0].size < 0x1000000) { >> + if ((u32) memblock.memory.regions[0].size < 0x1000000) { >> printk(KERN_EMERG "Memory must be greater than 16MB\n"); >> machine_restart(NULL); >> } >> /* Find main memory where the kernel is */ >> - memory_start = (u32) memblock.memory.region[0].base; >> - memory_end = (u32) memblock.memory.region[0].base + >> - (u32) memblock.memory.region[0].size; >> + memory_start = (u32) memblock.memory.regions[0].base; >> + memory_end = (u32) memblock.memory.regions[0].base + >> + (u32) memblock.memory.regions[0].size; >> memory_size = memory_end - memory_start; >> >> mm_cmdline_setup(); /* FIXME parse args from command line - not >> used */ >> >> >> >>> --- >>> arch/microblaze/mm/init.c | 20 +++++++++----------- >>> 1 files changed, 9 insertions(+), 11 deletions(-) >>> >>> diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c >>> index afd6494..32a702b 100644 >>> --- a/arch/microblaze/mm/init.c >>> +++ b/arch/microblaze/mm/init.c >>> @@ -70,16 +70,16 @@ static void __init paging_init(void) >>> >>> void __init setup_memory(void) >>> { >>> - int i; >>> unsigned long map_size; >>> + struct memblock_region *reg; >>> + >>> #ifndef CONFIG_MMU >>> u32 kernel_align_start, kernel_align_size; >>> >>> /* Find main memory where is the kernel */ >>> - for (i = 0; i < memblock.memory.cnt; i++) { >>> - memory_start = (u32) memblock.memory.regions[i].base; >>> - memory_end = (u32) memblock.memory.regions[i].base >>> - + (u32) memblock.memory.region[i].size; >>> + for_each_memblock(memory, reg) { >>> + memory_start = (u32)reg->base; >>> + memory_end = (u32) reg->base + reg->size; >>> if ((memory_start <= (u32)_text) && >>> ((u32)_text <= memory_end)) { >>> memory_size = memory_end - memory_start; >>> @@ -147,12 +147,10 @@ void __init setup_memory(void) >>> free_bootmem(memory_start, memory_size); >>> >>> /* reserve allocate blocks */ >>> - for (i = 0; i < memblock.reserved.cnt; i++) { >>> - pr_debug("reserved %d - 0x%08x-0x%08x\n", i, >>> - (u32) memblock.reserved.region[i].base, >>> - (u32) memblock_size_bytes(&memblock.reserved, i)); >>> - reserve_bootmem(memblock.reserved.region[i].base, >>> - memblock_size_bytes(&memblock.reserved, i) - 1, BOOTMEM_DEFAULT); >>> + for_each_memblock(reserved, reg) { >>> + pr_debug("reserved - 0x%08x-0x%08x\n", >>> + (u32) reg->base, (u32) reg->size); >>> + reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); >>> } >>> #ifdef CONFIG_MMU >>> init_bootmem_done = 1; >> > > -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian
WARNING: multiple messages have this Message-ID (diff)
From: Michal Simek <monstr@monstr.eu> To: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, Stephen Rothwell <sfr@canb.auug.org.au>, Ingo Molnar <mingo@elte.hu> Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors Date: Thu, 09 Sep 2010 12:57:19 +0200 [thread overview] Message-ID: <4C88BD8F.5080208@monstr.eu> (raw) In-Reply-To: <1281135046.2168.40.camel@pasglop> Benjamin Herrenschmidt wrote: > On Fri, 2010-08-06 at 10:52 +0200, Michal Simek wrote: >> Benjamin Herrenschmidt wrote: >>> CC: Michal Simek <monstr@monstr.eu> >>> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> >> This patch remove bug which I reported but there is another place which >> needs to be changed. >> >> I am not sure if my patch is correct but at least point you on places >> which is causing compilation errors. >> >> I tested your memblock branch with this fix and microblaze can boot. > > Ok, that's missing in my initial rename patch. I'll fix it up. Thanks. > > Cheers, > Ben. I don't know why but this unfixed old patch is in linux-next today. Not sure which tree contains it. Thanks, Michal >> >> CC arch/microblaze/mm/init.o >> arch/microblaze/mm/init.c: In function 'mm_cmdline_setup': >> arch/microblaze/mm/init.c:236: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c: In function 'mmu_init': >> arch/microblaze/mm/init.c:279: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c:284: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c:285: error: 'struct memblock_type' has no >> member named 'region' >> arch/microblaze/mm/init.c:286: error: 'struct memblock_type' has no >> member named 'region' >> make[1]: *** [arch/microblaze/mm/init.o] Error 1 >> make: *** [arch/microblaze/mm] Error 2 >> >> >> diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c >> index 32a702b..a9d7b9b 100644 >> --- a/arch/microblaze/mm/init.c >> +++ b/arch/microblaze/mm/init.c >> @@ -233,7 +233,7 @@ static void mm_cmdline_setup(void) >> if (maxmem && memory_size > maxmem) { >> memory_size = maxmem; >> memory_end = memory_start + memory_size; >> - memblock.memory.region[0].size = memory_size; >> + memblock.memory.regions[0].size = memory_size; >> } >> } >> } >> @@ -276,14 +276,14 @@ asmlinkage void __init mmu_init(void) >> machine_restart(NULL); >> } >> >> - if ((u32) memblock.memory.region[0].size < 0x1000000) { >> + if ((u32) memblock.memory.regions[0].size < 0x1000000) { >> printk(KERN_EMERG "Memory must be greater than 16MB\n"); >> machine_restart(NULL); >> } >> /* Find main memory where the kernel is */ >> - memory_start = (u32) memblock.memory.region[0].base; >> - memory_end = (u32) memblock.memory.region[0].base + >> - (u32) memblock.memory.region[0].size; >> + memory_start = (u32) memblock.memory.regions[0].base; >> + memory_end = (u32) memblock.memory.regions[0].base + >> + (u32) memblock.memory.regions[0].size; >> memory_size = memory_end - memory_start; >> >> mm_cmdline_setup(); /* FIXME parse args from command line - not >> used */ >> >> >> >>> --- >>> arch/microblaze/mm/init.c | 20 +++++++++----------- >>> 1 files changed, 9 insertions(+), 11 deletions(-) >>> >>> diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c >>> index afd6494..32a702b 100644 >>> --- a/arch/microblaze/mm/init.c >>> +++ b/arch/microblaze/mm/init.c >>> @@ -70,16 +70,16 @@ static void __init paging_init(void) >>> >>> void __init setup_memory(void) >>> { >>> - int i; >>> unsigned long map_size; >>> + struct memblock_region *reg; >>> + >>> #ifndef CONFIG_MMU >>> u32 kernel_align_start, kernel_align_size; >>> >>> /* Find main memory where is the kernel */ >>> - for (i = 0; i < memblock.memory.cnt; i++) { >>> - memory_start = (u32) memblock.memory.regions[i].base; >>> - memory_end = (u32) memblock.memory.regions[i].base >>> - + (u32) memblock.memory.region[i].size; >>> + for_each_memblock(memory, reg) { >>> + memory_start = (u32)reg->base; >>> + memory_end = (u32) reg->base + reg->size; >>> if ((memory_start <= (u32)_text) && >>> ((u32)_text <= memory_end)) { >>> memory_size = memory_end - memory_start; >>> @@ -147,12 +147,10 @@ void __init setup_memory(void) >>> free_bootmem(memory_start, memory_size); >>> >>> /* reserve allocate blocks */ >>> - for (i = 0; i < memblock.reserved.cnt; i++) { >>> - pr_debug("reserved %d - 0x%08x-0x%08x\n", i, >>> - (u32) memblock.reserved.region[i].base, >>> - (u32) memblock_size_bytes(&memblock.reserved, i)); >>> - reserve_bootmem(memblock.reserved.region[i].base, >>> - memblock_size_bytes(&memblock.reserved, i) - 1, BOOTMEM_DEFAULT); >>> + for_each_memblock(reserved, reg) { >>> + pr_debug("reserved - 0x%08x-0x%08x\n", >>> + (u32) reg->base, (u32) reg->size); >>> + reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); >>> } >>> #ifdef CONFIG_MMU >>> init_bootmem_done = 1; >> > > -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-09-09 10:57 UTC|newest] Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-08-06 5:14 memblock updates Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 01/43] memblock: Fix memblock_is_region_reserved() to return a boolean Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 02/43] memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 03/43] memblock: No reason to include asm/memblock.h late Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 04/43] memblock: Implement memblock_is_memory and memblock_is_region_memory Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 05/43] memblock/arm: pfn_valid uses memblock_is_memory() Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 06/43] memblock/arm: Use memblock_region_is_memory() for omap fb Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 07/43] memblock: Introduce for_each_memblock() and new accessors Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 08/43] memblock/microblaze: Use " Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 8:52 ` Michal Simek 2010-08-06 8:52 ` Michal Simek 2010-08-06 22:50 ` Benjamin Herrenschmidt 2010-08-06 22:50 ` Benjamin Herrenschmidt 2010-09-09 10:57 ` Michal Simek [this message] 2010-09-09 10:57 ` Michal Simek 2010-09-09 11:06 ` Stephen Rothwell 2010-09-09 11:54 ` Ingo Molnar 2010-09-09 11:54 ` Ingo Molnar 2010-09-10 8:18 ` Benjamin Herrenschmidt 2010-09-10 8:18 ` Benjamin Herrenschmidt 2010-09-11 7:07 ` [PATCH] microblaze, memblock: fix compiling Yinghai Lu 2010-09-11 7:07 ` Yinghai Lu 2010-09-11 7:08 ` [PATCH] powerpc, memblock: fix will memblock reference Yinghai Lu 2010-09-11 7:08 ` Yinghai Lu 2010-09-11 7:34 ` [tip:core/memblock] powerpc, memblock: Fix memblock API change fallout tip-bot for Yinghai Lu 2010-09-11 8:34 ` tip-bot for Yinghai Lu 2010-09-11 7:34 ` [tip:core/memblock] memblock, microblaze: " tip-bot for Yinghai Lu 2010-09-11 8:34 ` tip-bot for Michal Simek 2010-09-11 7:29 ` [PATCH 08/43] memblock/microblaze: Use new accessors Ingo Molnar 2010-09-11 7:29 ` Ingo Molnar 2010-09-10 8:17 ` Benjamin Herrenschmidt 2010-09-10 8:17 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 09/43] memblock/sh: " Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 10/43] memblock/sparc: " Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 11/43] memblock/powerpc: " Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 12/43] memblock/arm: " Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-10 7:11 ` Russell King - ARM Linux 2010-08-10 7:11 ` Russell King - ARM Linux 2010-08-06 5:14 ` [PATCH 13/43] memblock: Remove obsolete accessors Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 14/43] memblock: Remove memblock_find() Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 15/43] memblock: Remove nid_range argument, arch provides memblock_nid_range() instead Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 16/43] memblock: Factor the lowest level alloc function Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 17/43] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:14 ` [PATCH 18/43] memblock: Introduce default allocation limit and use it to replace explicit ones Benjamin Herrenschmidt 2010-08-06 5:14 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 19/43] memblock: Remove rmo_size, burry it in arch/powerpc where it belongs Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 20/43] memblock: Change u64 to phys_addr_t Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 21/43] memblock: Remove unused memblock.debug struct member Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 22/43] memblock: Remove memblock_type.size and add memblock.memory_size instead Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 23/43] memblock: Move memblock arrays to static storage in memblock.c and make their size a variable Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 24/43] memblock: Add debug markers at the end of the array Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 25/43] memblock: Make memblock_find_region() out of memblock_alloc_region() Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 26/43] memblock: Define MEMBLOCK_ERROR internally instead of using ~(phys_addr_t)0 Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 27/43] memblock: Move memblock_init() to the bottom of the file Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 28/43] memblock: split memblock_find_base() out of __memblock_alloc_base() Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 29/43] memblock: Move functions around into a more sensible order Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 30/43] memblock: Add array resizing support Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 31/43] memblock: Add arch function to control coalescing of memblock memory regions Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 32/43] memblock: Add "start" argument to memblock_find_base() Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 33/43] memblock: NUMA allocate can now use early_pfn_map Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 34/43] memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid() Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 35/43] memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 36/43] memblock: Add debugfs files to dump the arrays content Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 37/43] memblock: Expose some memblock bits for use by x86 Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 38/43] memblock: Improve debug output when resizing the reserve array Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 39/43] memblock: Export MEMBLOCK_ERROR Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 40/43] memblock: Make MEMBLOCK_ERROR be 0 Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 41/43] memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCK Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 42/43] memblock: Option for the architecture to put memblock into the .init section Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt 2010-08-06 5:15 ` [PATCH 43/43] memblock: Add memblock_find_in_range() Benjamin Herrenschmidt 2010-08-06 5:15 ` Benjamin Herrenschmidt
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=4C88BD8F.5080208@monstr.eu \ --to=monstr@monstr.eu \ --cc=benh@kernel.crashing.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-next@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=sfr@canb.auug.org.au \ /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.