Re: [PATCH 12/43] memblock/arm: Use new accessors

view
thread

Previous thread: [PATCH 23/43] memblock: Move memblock arrays to static storage in memblock.c and make their size a variable by Benjamin Herrenschmidt on Thursday, August 5, 2010 - 10:15 pm. (1 message)

Next thread: bios kernel HD swap by alto.tom on Thursday, August 5, 2010 - 10:28 pm. (2 messages)

[view original message]

From: Benjamin Herrenschmidt

Subject: memblock updates

Date: Thursday, August 5, 2010 - 10:14 pm

Hi folks !

Here's my current branch. This time build tested on sparc(64), arm,
powerpc and sh. I don't have a microblaze compiler at hand.

Not much difference from the previous one. Off the top of my head:

 - Added the memblock_is_region_reserved() fix at the beginning
   (I'll send that to Linus separately if we decide this series
   shouldn't go in 2.6.36)
 - Split the patch adding the new accessors into separate patches
   for adding the accessors, converting each arch, and removing
   the old accessors. This makes it clearer, easier to review,
   etc... I added a couple new accessors for ARM.
 - Added the ARM updates based on what's upstream now (involves
   new memblock_is_memory() and memblock_is_memory_region() for
   use by ARM, nothing fancy there).

So very little changes. I haven't changed the init sections so
the warnings reported by Steven are still there. I will fix them
as an addon patch as I don't believe there's any actual breakage.

Now, what do you guys want to do with this now ? I can ask Linus
to pull now or we can wait until the end of the merge window and
put it into -next for another round...

Cheers,
Ben.

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 21/43] memblock: Remove unused memblock.debug struct member

Date: Thursday, August 5, 2010 - 10:15 pm

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 include/linux/memblock.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index b65045a..0fe6dd5 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -32,7 +32,6 @@ struct memblock_type {
 };
 
 struct memblock {
-	unsigned long debug;
 	phys_addr_t current_limit;
 	struct memblock_type memory;
 	struct memblock_type reserved;
@@ -55,9 +54,11 @@ extern phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align);
 #define MEMBLOCK_ALLOC_ACCESSIBLE	0
 
 extern phys_addr_t __init memblock_alloc_base(phys_addr_t size,
-		phys_addr_t, phys_addr_t max_addr);
+					 phys_addr_t align,
+					 phys_addr_t max_addr);
 extern phys_addr_t __init __memblock_alloc_base(phys_addr_t size,
-		phys_addr_t align, phys_addr_t max_addr);
+					   phys_addr_t align,
+					   phys_addr_t max_addr);
 extern phys_addr_t __init memblock_phys_mem_size(void);
 extern phys_addr_t memblock_end_of_DRAM(void);
 extern void __init memblock_enforce_memory_limit(phys_addr_t memory_limit);
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 11/43] memblock/powerpc: Use new accessors

Date: Thursday, August 5, 2010 - 10:14 pm

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/powerpc/mm/hash_utils_64.c |    8 ++--
 arch/powerpc/mm/mem.c           |   92 ++++++++++++++-------------------------
 arch/powerpc/mm/numa.c          |   17 ++++---
 3 files changed, 46 insertions(+), 71 deletions(-)

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index b1a3784..4072b87 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -588,7 +588,7 @@ static void __init htab_initialize(void)
 	unsigned long pteg_count;
 	unsigned long prot;
 	unsigned long base = 0, size = 0, limit;
-	int i;
+	struct memblock_region *reg;
 
 	DBG(&quot; -&gt; htab_initialize()\n&quot;);
 
@@ -659,9 +659,9 @@ static void __init htab_initialize(void)
 	 */
 
 	/* create bolted the linear mapping in the hash table */
-	for (i=0; i &lt; memblock.memory.cnt; i++) {
-		base = (unsigned long)__va(memblock.memory.regions[i].base);
-		size = memblock.memory.region[i].size;
+	for_each_memblock(memory, reg) {
+		base = (unsigned long)__va(reg-&gt;base);
+		size = reg-&gt;size;
 
 		DBG(&quot;creating mapping for region: %lx..%lx (prot: %lx)\n&quot;,
 		    base, size, prot);
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index a33f5c1..52df542 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -82,18 +82,11 @@ int page_is_ram(unsigned long pfn)
 	return pfn &lt; max_pfn;
 #else
 	unsigned long paddr = (pfn &lt;&lt; PAGE_SHIFT);
-	int i;
-	for (i=0; i &lt; memblock.memory.cnt; i++) {
-		unsigned long base;
+	struct memblock_region *reg;
 
-		base = memblock.memory.regions[i].base;
-
-		if ((paddr &gt;= base) &amp;&amp;
-			(paddr &lt; (base + memblock.memory.regions[i].size))) {
+	for_each_memblock(memory, reg)
+		if (paddr &gt;= reg-&gt;base &amp;&amp; paddr &lt; (reg-&gt;base + reg-&gt;size))
 			return 1;
-		}
-	}
-
 	return 0;
 #endif
 }
@@ -149,23 +142,19 @@ int
 walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
 		void *arg, int (*func)(unsigned long, unsigned ...[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 09/43] memblock/sh: Use new accessors

Date: Thursday, August 5, 2010 - 10:14 pm

CC: Paul Mundt &lt;lethal@linux-sh.org&gt;
Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/sh/mm/init.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index d0e2491..b977475 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -200,7 +200,6 @@ static void __init bootmem_init_one_node(unsigned int nid)
 	unsigned long total_pages, paddr;
 	unsigned long end_pfn;
 	struct pglist_data *p;
-	int i;
 
 	p = NODE_DATA(nid);
 
@@ -226,11 +225,12 @@ static void __init bootmem_init_one_node(unsigned int nid)
 	 * reservations in other nodes.
 	 */
 	if (nid == 0) {
+		struct memblock_region *reg;
+
 		/* Reserve the sections we're already using. */
-		for (i = 0; i &lt; memblock.reserved.cnt; i++)
-			reserve_bootmem(memblock.reserved.region[i].base,
-					memblock_size_bytes(&amp;memblock.reserved, i),
-					BOOTMEM_DEFAULT);
+		for_each_memblock(reserved, reg) {
+			reserve_bootmem(reg-&gt;base, reg-&gt;size, BOOTMEM_DEFAULT);
+		}
 	}
 
 	sparse_memory_present_with_active_regions(nid);
@@ -238,13 +238,14 @@ static void __init bootmem_init_one_node(unsigned int nid)
 
 static void __init do_init_bootmem(void)
 {
+	struct memblock_region *reg;
 	int i;
 
 	/* Add active regions with valid PFNs. */
-	for (i = 0; i &lt; memblock.memory.cnt; i++) {
+	for_each_memblock(memory, reg) {
 		unsigned long start_pfn, end_pfn;
-		start_pfn = memblock.memory.region[i].base &gt;&gt; PAGE_SHIFT;
-		end_pfn = start_pfn + memblock_size_pages(&amp;memblock.memory, i);
+		start_pfn = memblock_region_base_pfn(reg);
+		end_pfn = memblock_region_end_pfn(reg);
 		__add_active_range(0, start_pfn, end_pfn);
 	}
 
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 16/43] memblock: Factor the lowest level alloc function

Date: Thursday, August 5, 2010 - 10:14 pm

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 mm/memblock.c |   59 ++++++++++++++++++++++++++------------------------------
 1 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 13807f2..e264e8c 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -294,8 +294,8 @@ static u64 memblock_align_up(u64 addr, u64 size)
 	return (addr + (size - 1)) &amp; ~(size - 1);
 }
 
-static u64 __init memblock_alloc_nid_unreserved(u64 start, u64 end,
-					   u64 size, u64 align)
+static u64 __init memblock_alloc_region(u64 start, u64 end,
+				   u64 size, u64 align)
 {
 	u64 base, res_base;
 	long j;
@@ -318,6 +318,13 @@ static u64 __init memblock_alloc_nid_unreserved(u64 start, u64 end,
 	return ~(u64)0;
 }
 
+u64 __weak __init memblock_nid_range(u64 start, u64 end, int *nid)
+{
+	*nid = 0;
+
+	return end;
+}
+
 static u64 __init memblock_alloc_nid_region(struct memblock_region *mp,
 				       u64 size, u64 align, int nid)
 {
@@ -333,8 +340,7 @@ static u64 __init memblock_alloc_nid_region(struct memblock_region *mp,
 
 		this_end = memblock_nid_range(start, end, &amp;this_nid);
 		if (this_nid == nid) {
-			u64 ret = memblock_alloc_nid_unreserved(start, this_end,
-							   size, align);
+			u64 ret = memblock_alloc_region(start, this_end, size, align);
 			if (ret != ~(u64)0)
 				return ret;
 		}
@@ -351,6 +357,10 @@ u64 __init memblock_alloc_nid(u64 size, u64 align, int nid)
 
 	BUG_ON(0 == size);
 
+	/* We do a bottom-up search for a region with the right
+	 * nid since that's easier considering how memblock_nid_range()
+	 * works
+	 */
 	size = memblock_align_up(size, align);
 
 	for (i = 0; i &lt; mem-&gt;cnt; i++) {
@@ -383,7 +393,7 @@ u64 __init memblock_alloc_base(u64 size, u64 align, u64 max_addr)
 
 u64 __init __memblock_alloc_base(u64 size, u64 align, u64 max_addr)
 {
-	long i, j;
+	long i;
 	u64 base = 0;
 	u64 res_base;
 
@@ -396,33 +406,24 @@ u64 __init __memblock_alloc_base(u64 size, u64 ...[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 15/43] memblock: Remove nid_range argument, arch provides memblock_nid_range() instead

Date: Thursday, August 5, 2010 - 10:14 pm

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/sparc/mm/init_64.c  |   16 ++++++----------
 include/linux/memblock.h |    7 +++++--
 mm/memblock.c            |   13 ++++++++-----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index dd68025..0883113 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -785,8 +785,7 @@ static int find_node(unsigned long addr)
 	return -1;
 }
 
-static unsigned long long nid_range(unsigned long long start,
-				    unsigned long long end, int *nid)
+u64 memblock_nid_range(u64 start, u64 end, int *nid)
 {
 	*nid = find_node(start);
 	start += PAGE_SIZE;
@@ -804,8 +803,7 @@ static unsigned long long nid_range(unsigned long long start,
 	return start;
 }
 #else
-static unsigned long long nid_range(unsigned long long start,
-				    unsigned long long end, int *nid)
+u64 memblock_nid_range(u64 start, u64 end, int *nid)
 {
 	*nid = 0;
 	return end;
@@ -822,8 +820,7 @@ static void __init allocate_node_data(int nid)
 	struct pglist_data *p;
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
-	paddr = memblock_alloc_nid(sizeof(struct pglist_data),
-			      SMP_CACHE_BYTES, nid, nid_range);
+	paddr = memblock_alloc_nid(sizeof(struct pglist_data), SMP_CACHE_BYTES, nid);
 	if (!paddr) {
 		prom_printf(&quot;Cannot allocate pglist_data for nid[%d]\n&quot;, nid);
 		prom_halt();
@@ -843,8 +840,7 @@ static void __init allocate_node_data(int nid)
 	if (p-&gt;node_spanned_pages) {
 		num_pages = bootmem_bootmap_pages(p-&gt;node_spanned_pages);
 
-		paddr = memblock_alloc_nid(num_pages &lt;&lt; PAGE_SHIFT, PAGE_SIZE, nid,
-				      nid_range);
+		paddr = memblock_alloc_nid(num_pages &lt;&lt; PAGE_SHIFT, PAGE_SIZE, nid);
 		if (!paddr) {
 			prom_printf(&quot;Cannot allocate bootmap for nid[%d]\n&quot;,
 				  nid);
@@ -984,7 +980,7 @@ static void __init add_node_ranges(void)
 			unsigned long this_end;
 			int nid;
 
-			this_end = nid_range(start, end, &amp;nid);
+			this_end = ...[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Thursday, August 5, 2010 - 10:14 pm

CC: Michal Simek &lt;monstr@monstr.eu&gt;
Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 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 &lt; 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-&gt;base;
+		memory_end = (u32) reg-&gt;base + reg-&gt;size;
 		if ((memory_start &lt;= (u32)_text) &amp;&amp;
 					((u32)_text &lt;= 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 &lt; memblock.reserved.cnt; i++) {
-		pr_debug(&quot;reserved %d - 0x%08x-0x%08x\n&quot;, i,
-			(u32) memblock.reserved.region[i].base,
-			(u32) memblock_size_bytes(&amp;memblock.reserved, i));
-		reserve_bootmem(memblock.reserved.region[i].base,
-			memblock_size_bytes(&amp;memblock.reserved, i) - 1, BOOTMEM_DEFAULT);
+	for_each_memblock(reserved, reg) {
+		pr_debug(&quot;reserved - 0x%08x-0x%08x\n&quot;,
+			 (u32) reg-&gt;base, (u32) reg-&gt;size);
+		reserve_bootmem(reg-&gt;base, reg-&gt;size, BOOTMEM_DEFAULT);
 	}
 #ifdef CONFIG_MMU
 	init_bootmem_done = 1;
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Michal Simek

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Friday, August 6, 2010 - 1:52 am

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.

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 &amp;&amp; memory_size &gt; 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 &lt; 0x1000000) {
+       if ((u32) memblock.memory.regions[0].size &lt; 0x1000000) {
                 printk(KERN_EMERG &quot;Memory must be greater than 16MB\n&quot;);
                 machine_restart(NULL);
         }
         /* Find main memory where the kernel is */
-       memory_start = (u32) ...[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Friday, August 6, 2010 - 3:50 pm

Ok, that's missing in my initial rename patch. I'll fix it up. Thanks.

Cheers,


--

[ message continues ]

[view original message]

From: Michal Simek

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Thursday, September 9, 2010 - 3:57 am

I don't know why but this unfixed old patch is in linux-next today. Not 
sure which tree contains it.

Thanks,


-- 
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
--

[ message continues ]

[view original message]

From: Stephen Rothwell

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Thursday, September 9, 2010 - 4:06 am

Hi Michal,


It came in via the tip tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[ message continues ]

[view original message]

From: Ingo Molnar

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Thursday, September 9, 2010 - 4:54 am

Yep, i asked benh to have a look (see the mail below) but got no 
response, as i assumed it had all been taken care of.

Ben, Peter?

	Ingo

----- Forwarded message from Ingo Molnar &lt;mingo@elte.hu&gt; -----

Date: Tue, 31 Aug 2010 09:29:47 +0200
From: Ingo Molnar &lt;mingo@elte.hu&gt;
To: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
Cc: linux-kernel@vger.kernel.org, mingo@redhat.com, hpa@zytor.com,
	tglx@linutronix.de, linux-tip-commits@vger.kernel.org
Subject: Re: [tip:core/memblock] memblock: Rename memblock_region to
	memblock_type and memblock_property to memblock_region



Btw., because this is an older base, before we can push this to 
linux-next i suspect we'll need fixes for those architectures that did a 
memblock conversion in this cycle?

Thanks,

	Ingo
	
--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Friday, September 10, 2010 - 1:18 am

Sorry, I must have been confused... I had pushed out a git branch a
while back with those updates and the ARM bits, at least I think I
did :-) I might have FAILed there. I'll check next week, I'm about to
board on a plane right now.

Cheers,


--

[ message continues ]

[view original message]

From: Yinghai Lu

Subject: [PATCH] microblaze, memblock: fix compiling

Date: Saturday, September 11, 2010 - 12:07 am

From: Michal Simek &lt;monstr@monstr.eu&gt;

  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

with this fix and microblaze can boot

Signed-off-by: Yinghai Lu &lt;yinghai@kernel.org&gt;

Index: linux-2.6/arch/microblaze/mm/init.c
===================================================================
--- linux-2.6.orig/arch/microblaze/mm/init.c
+++ linux-2.6/arch/microblaze/mm/init.c
@@ -228,7 +228,7 @@ static void mm_cmdline_setup(void)
 		if (maxmem &amp;&amp; memory_size &gt; maxmem) {
 			memory_size = maxmem;
 			memory_end = memory_start + memory_size;
-			memblock.memory.region[0].size = memory_size;
+			memblock.memory.regions[0].size = memory_size;
 		}
 	}
 }
@@ -271,14 +271,14 @@ asmlinkage void __init mmu_init(void)
 		machine_restart(NULL);
 	}
 
-	if ((u32) memblock.memory.region[0].size &lt; 0x1000000) {
+	if ((u32) memblock.memory.regions[0].size &lt; 0x1000000) {
 		printk(KERN_EMERG &quot;Memory must be greater than 16MB\n&quot;);
 		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;
 
 ...[ message continues ]

[view original message]

From: Yinghai Lu

Subject: [PATCH] powerpc, memblock: fix will memblock reference

Date: Saturday, September 11, 2010 - 12:08 am

for wii?

Signed-off-by: Yinghai Lu &lt;yinghai@kernel.org&gt;

Index: linux-2.6/arch/powerpc/platforms/embedded6xx/wii.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/embedded6xx/wii.c
+++ linux-2.6/arch/powerpc/platforms/embedded6xx/wii.c
@@ -65,7 +65,7 @@ static int __init page_aligned(unsigned
 
 void __init wii_memory_fixups(void)
 {
-	struct memblock_region *p = memblock.memory.region;
+	struct memblock_region *p = memblock.memory.regions;
 
 	/*
 	 * This is part of a workaround to allow the use of two
--

[ message continues ]

[view original message]

From: tip-bot for Yinghai Lu

Subject: [tip:core/memblock] powerpc, memblock: Fix memblock API change fallout

Date: Saturday, September 11, 2010 - 12:34 am

Commit-ID:  0d63b32c4c6692f7df7b87be3a71353948a3ab18
Gitweb:     http://git.kernel.org/tip/0d63b32c4c6692f7df7b87be3a71353948a3ab18
Author:     Yinghai Lu &lt;yinghai@kernel.org&gt;
AuthorDate: Sat, 11 Sep 2010 00:08:42 -0700
Committer:  Ingo Molnar &lt;mingo@elte.hu&gt;
CommitDate: Sat, 11 Sep 2010 09:26:43 +0200

powerpc, memblock: Fix memblock API change fallout

Fix memblock API change fallout in the WII code.

Signed-off-by: Yinghai Lu &lt;yinghai@kernel.org&gt;
Cc: linux-mm@kvack.org
Cc: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
LKML-Reference: &lt;4C8B2AFA.2000705@kernel.org&gt;
Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
---
 arch/powerpc/platforms/embedded6xx/wii.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 8450c29..649473a 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -65,7 +65,7 @@ static int __init page_aligned(unsigned long x)
 
 void __init wii_memory_fixups(void)
 {
-	struct memblock_region *p = memblock.memory.region;
+	struct memblock_region *p = memblock.memory.regions;
 
 	/*
 	 * This is part of a workaround to allow the use of two
--

[ message continues ]

[view original message]

From: tip-bot for Yinghai Lu

Subject: [tip:core/memblock] powerpc, memblock: Fix memblock API change fallout

Date: Saturday, September 11, 2010 - 1:34 am

Commit-ID:  823108a056c52a83c32ca199a57566a36fad4d19
Gitweb:     http://git.kernel.org/tip/823108a056c52a83c32ca199a57566a36fad4d19
Author:     Yinghai Lu &lt;yinghai@kernel.org&gt;
AuthorDate: Sat, 11 Sep 2010 00:08:42 -0700
Committer:  Ingo Molnar &lt;mingo@elte.hu&gt;
CommitDate: Sat, 11 Sep 2010 10:30:28 +0200

powerpc, memblock: Fix memblock API change fallout

Fix memblock API change fallout in the WII code.

Signed-off-by: Yinghai Lu &lt;yinghai@kernel.org&gt;
Cc: linux-mm@kvack.org
Cc: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
LKML-Reference: &lt;4C8B2AFA.2000705@kernel.org&gt;
Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
---
 arch/powerpc/platforms/embedded6xx/wii.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 8450c29..649473a 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -65,7 +65,7 @@ static int __init page_aligned(unsigned long x)
 
 void __init wii_memory_fixups(void)
 {
-	struct memblock_region *p = memblock.memory.region;
+	struct memblock_region *p = memblock.memory.regions;
 
 	/*
 	 * This is part of a workaround to allow the use of two
--

[ message continues ]

[view original message]

From: tip-bot for Yinghai Lu

Subject: [tip:core/memblock] memblock, microblaze: Fix memblock API change fallout

Date: Saturday, September 11, 2010 - 12:34 am

Commit-ID:  78cf195c41a69521f4b3e3fd8b8bd4ecbfcdac85
Gitweb:     http://git.kernel.org/tip/78cf195c41a69521f4b3e3fd8b8bd4ecbfcdac85
Author:     Yinghai Lu &lt;yinghai@kernel.org&gt;
AuthorDate: Sat, 11 Sep 2010 00:07:06 -0700
Committer:  Ingo Molnar &lt;mingo@elte.hu&gt;
CommitDate: Sat, 11 Sep 2010 09:26:43 +0200

memblock, microblaze: Fix memblock API change fallout

Michal Simek reported this build failure:

  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'
 ...

Adopt Microblaze to the memblock API changes.

Reported-by: Michal Simek &lt;monstr@monstr.eu&gt;
Signed-off-by: Yinghai Lu &lt;yinghai@kernel.org&gt;
Cc: linux-mm@kvack.org
Cc: Stephen Rothwell &lt;sfr@canb.auug.org.au&gt;
Cc: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
LKML-Reference: &lt;4C8B2A9A.1040303@kernel.org&gt;
Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
---
 arch/microblaze/mm/init.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 840026c..c843786 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -228,7 +228,7 @@ static void mm_cmdline_setup(void)
 		if (maxmem &amp;&amp; memory_size &gt; maxmem) {
 			memory_size = maxmem;
 			memory_end = memory_start + memory_size;
-			memblock.memory.region[0].size = memory_size;
+			memblock.memory.regions[0].size = memory_size;
 		}
 	}
 }
@@ -271,14 +271,14 @@ asmlinkage void __init mmu_init(void)
 		machine_restart(NULL);
 	}
 
-	if ((u32) memblock.memory.region[0].size &lt; 0x1000000) {
+	if ((u32) memblock.memory.regions[0].size &lt; 0x1000000) {
 		printk(KERN_EMERG &quot;Memory must be greater than 16MB\n&quot;);
 		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) ...[ message continues ]

[view original message]

From: tip-bot for Michal Simek

Subject: [tip:core/memblock] memblock, microblaze: Fix memblock API change fallout

Date: Saturday, September 11, 2010 - 1:34 am

Commit-ID:  da5ab11cdfdf496448e0e9cdbbc2dfe207a96c94
Gitweb:     http://git.kernel.org/tip/da5ab11cdfdf496448e0e9cdbbc2dfe207a96c94
Author:     Michal Simek &lt;monstr@monstr.eu&gt;
AuthorDate: Sat, 11 Sep 2010 00:07:06 -0700
Committer:  Ingo Molnar &lt;mingo@elte.hu&gt;
CommitDate: Sat, 11 Sep 2010 10:30:28 +0200

memblock, microblaze: Fix memblock API change fallout

Adopt Microblaze to the memblock API changes, to fix this
build failure:

  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'
 ...

Signed-off-by: Yinghai Lu &lt;yinghai@kernel.org&gt;
Cc: linux-mm@kvack.org
Cc: Stephen Rothwell &lt;sfr@canb.auug.org.au&gt;
Cc: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
LKML-Reference: &lt;4C8B2A9A.1040303@kernel.org&gt;
Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
---
 arch/microblaze/mm/init.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 840026c..c843786 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -228,7 +228,7 @@ static void mm_cmdline_setup(void)
 		if (maxmem &amp;&amp; memory_size &gt; maxmem) {
 			memory_size = maxmem;
 			memory_end = memory_start + memory_size;
-			memblock.memory.region[0].size = memory_size;
+			memblock.memory.regions[0].size = memory_size;
 		}
 	}
 }
@@ -271,14 +271,14 @@ asmlinkage void __init mmu_init(void)
 		machine_restart(NULL);
 	}
 
-	if ((u32) memblock.memory.region[0].size &lt; 0x1000000) {
+	if ((u32) memblock.memory.regions[0].size &lt; 0x1000000) {
 		printk(KERN_EMERG &quot;Memory must be greater than 16MB\n&quot;);
 		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 ...[ message continues ]

[view original message]

From: Ingo Molnar

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Saturday, September 11, 2010 - 12:29 am

Note, i applied the build error fixes from Yinghai. Please double-check 
things once you have the time.

Thanks,

	Ingo
--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: Re: [PATCH 08/43] memblock/microblaze: Use new accessors

Date: Friday, September 10, 2010 - 1:17 am

I'm pretty sure I had all that fixed up including the ARM stuff. I
wonder if Ingo picked my latest stuff (or maybe I failed to push it
out).

I'm still travelling, I'll be back next week at which point I can have a
look.

Cheers,


--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 17/43] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE

Date: Thursday, August 5, 2010 - 10:14 pm

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/powerpc/mm/hash_utils_64.c |    2 +-
 include/linux/memblock.h        |    1 +
 mm/memblock.c                   |    2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 4072b87..a542ff5 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -625,7 +625,7 @@ static void __init htab_initialize(void)
 		if (machine_is(cell))
 			limit = 0x80000000;
 		else
-			limit = 0;
+			limit = MEMBLOCK_ALLOC_ANYWHERE;
 
 		table = memblock_alloc_base(htab_size_bytes, htab_size_bytes, limit);
 
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 367dea6..3cf3304 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -50,6 +50,7 @@ extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid);
 extern u64 __init memblock_alloc(u64 size, u64 align);
 extern u64 __init memblock_alloc_base(u64 size,
 		u64, u64 max_addr);
+#define MEMBLOCK_ALLOC_ANYWHERE	0
 extern u64 __init __memblock_alloc_base(u64 size,
 		u64 align, u64 max_addr);
 extern u64 __init memblock_phys_mem_size(void);
diff --git a/mm/memblock.c b/mm/memblock.c
index e264e8c..0131684 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -15,8 +15,6 @@
 #include &lt;linux/bitops.h&gt;
 #include &lt;linux/memblock.h&gt;
 
-#define MEMBLOCK_ALLOC_ANYWHERE	0
-
 struct memblock memblock;
 
 static int memblock_debug;
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 14/43] memblock: Remove memblock_find()

Date: Thursday, August 5, 2010 - 10:14 pm

Nobody uses it anymore. It's semantics were ... weird

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 include/linux/memblock.h |    1 -
 mm/memblock.c            |   32 --------------------------------
 2 files changed, 0 insertions(+), 33 deletions(-)

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 7d70fdd..776c7d9 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -60,7 +60,6 @@ extern int memblock_is_memory(u64 addr);
 extern int memblock_is_region_memory(u64 base, u64 size);
 extern int __init memblock_is_reserved(u64 addr);
 extern int memblock_is_region_reserved(u64 base, u64 size);
-extern int memblock_find(struct memblock_region *res);
 
 extern void memblock_dump_all(void);
 
diff --git a/mm/memblock.c b/mm/memblock.c
index aa88c62..8a118b7 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -531,35 +531,3 @@ int memblock_is_region_reserved(u64 base, u64 size)
 	return memblock_overlaps_region(&amp;memblock.reserved, base, size) &gt;= 0;
 }
 
-/*
- * Given a &lt;base, len&gt;, find which memory regions belong to this range.
- * Adjust the request and return a contiguous chunk.
- */
-int memblock_find(struct memblock_region *res)
-{
-	int i;
-	u64 rstart, rend;
-
-	rstart = res-&gt;base;
-	rend = rstart + res-&gt;size - 1;
-
-	for (i = 0; i &lt; memblock.memory.cnt; i++) {
-		u64 start = memblock.memory.regions[i].base;
-		u64 end = start + memblock.memory.regions[i].size - 1;
-
-		if (start &gt; rend)
-			return -1;
-
-		if ((end &gt;= rstart) &amp;&amp; (start &lt; rend)) {
-			/* adjust the request */
-			if (rstart &lt; start)
-				rstart = start;
-			if (rend &gt; end)
-				rend = end;
-			res-&gt;base = rstart;
-			res-&gt;size = rend - rstart + 1;
-			return 0;
-		}
-	}
-	return -1;
-}
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 04/43] memblock: Implement memblock_is_memory and memblock_is_region_memory

Date: Thursday, August 5, 2010 - 10:14 pm

To make it fast, we steal ARM's binary search for memblock_is_memory()
and we use that to also the replace existing implementation of
memblock_is_reserved().

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 include/linux/memblock.h |    2 ++
 mm/memblock.c            |   42 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 4b69313..47bceb1 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -56,6 +56,8 @@ extern u64 __init __memblock_alloc_base(u64 size,
 extern u64 __init memblock_phys_mem_size(void);
 extern u64 memblock_end_of_DRAM(void);
 extern void __init memblock_enforce_memory_limit(u64 memory_limit);
+extern int memblock_is_memory(u64 addr);
+extern int memblock_is_region_memory(u64 base, u64 size);
 extern int __init memblock_is_reserved(u64 addr);
 extern int memblock_is_region_reserved(u64 base, u64 size);
 extern int memblock_find(struct memblock_region *res);
diff --git a/mm/memblock.c b/mm/memblock.c
index 6f407cc..aa88c62 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -487,17 +487,43 @@ void __init memblock_enforce_memory_limit(u64 memory_limit)
 	}
 }
 
+static int memblock_search(struct memblock_type *type, u64 addr)
+{
+	unsigned int left = 0, right = type-&gt;cnt;
+
+	do {
+		unsigned int mid = (right + left) / 2;
+
+		if (addr &lt; type-&gt;regions[mid].base)
+			right = mid;
+		else if (addr &gt;= (type-&gt;regions[mid].base +
+				  type-&gt;regions[mid].size))
+			left = mid + 1;
+		else
+			return mid;
+	} while (left &lt; right);
+	return -1;
+}
+
 int __init memblock_is_reserved(u64 addr)
 {
-	int i;
+	return memblock_search(&amp;memblock.reserved, addr) != -1;
+}
 
-	for (i = 0; i &lt; memblock.reserved.cnt; i++) {
-		u64 upper = memblock.reserved.regions[i].base +
-			memblock.reserved.regions[i].size - 1;
-		if ((addr &gt;= memblock.reserved.regions[i].base) &amp;&amp; (addr &lt;= upper))
-			return ...[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 12/43] memblock/arm: Use new accessors

Date: Thursday, August 5, 2010 - 10:14 pm

CC: Russell King &lt;linux@arm.linux.org.uk&gt;
Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/arm/mm/init.c |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index e739223..8504906 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -150,6 +150,7 @@ static void __init find_limits(struct meminfo *mi,
 static void __init arm_bootmem_init(struct meminfo *mi,
 	unsigned long start_pfn, unsigned long end_pfn)
 {
+	struct memblock_region *reg;
 	unsigned int boot_pages;
 	phys_addr_t bitmap;
 	pg_data_t *pgdat;
@@ -180,13 +181,13 @@ static void __init arm_bootmem_init(struct meminfo *mi,
 	/*
 	 * Reserve the memblock reserved regions in bootmem.
 	 */
-	for (i = 0; i &lt; memblock.reserved.cnt; i++) {
-		phys_addr_t start = memblock_start_pfn(&amp;memblock.reserved, i);
-		if (start &gt;= start_pfn &amp;&amp;
-		    memblock_end_pfn(&amp;memblock.reserved, i) &lt;= end_pfn)
+	for_each_memblock(reserved, reg) {
+		phys_addr_t start = memblock_region_base_pfn(reg);
+		phys_addr_t end = memblock_region_end_pfn(reg);
+		if (start &gt;= start_pfn &amp;&amp; end &lt;= end_pfn)
 			reserve_bootmem_node(pgdat, __pfn_to_phys(start),
-				memblock_size_bytes(&amp;memblock.reserved, i),
-				BOOTMEM_DEFAULT);
+					     (end - start) &lt;&lt; PAGE_SHIFT,
+					     BOOTMEM_DEFAULT);
 	}
 }
 
@@ -247,10 +248,12 @@ static void arm_memory_present(void)
 #else
 static void arm_memory_present(void)
 {
+	struct memblock_region *reg;
 	int i;
-	for (i = 0; i &lt; memblock.memory.cnt; i++)
-		memory_present(0, memblock_start_pfn(&amp;memblock.memory, i),
-				  memblock_end_pfn(&amp;memblock.memory, i));
+
+	for_each_memblock(memory, reg) {
+		memory_present(0, memblock_region_base_pfn(reg),
+			       memblock_region_end_pfn(reg));
 }
 #endif
 
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Russell King - ARM Linux

Subject: Re: [PATCH 12/43] memblock/arm: Use new accessors

Date: Tuesday, August 10, 2010 - 12:11 am

Acked-by: Russell King &lt;rmk+kernel@arm.linux.org.uk&gt;
--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 13/43] memblock: Remove obsolete accessors

Date: Thursday, August 5, 2010 - 10:14 pm

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 include/linux/memblock.h |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index c914112..7d70fdd 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -64,29 +64,6 @@ extern int memblock_find(struct memblock_region *res);
 
 extern void memblock_dump_all(void);
 
-/* Obsolete accessors */
-static inline u64
-memblock_size_bytes(struct memblock_type *type, unsigned long region_nr)
-{
-	return type-&gt;regions[region_nr].size;
-}
-static inline u64
-memblock_size_pages(struct memblock_type *type, unsigned long region_nr)
-{
-	return memblock_size_bytes(type, region_nr) &gt;&gt; PAGE_SHIFT;
-}
-static inline u64
-memblock_start_pfn(struct memblock_type *type, unsigned long region_nr)
-{
-	return type-&gt;regions[region_nr].base &gt;&gt; PAGE_SHIFT;
-}
-static inline u64
-memblock_end_pfn(struct memblock_type *type, unsigned long region_nr)
-{
-	return memblock_start_pfn(type, region_nr) +
-	       memblock_size_pages(type, region_nr);
-}
-
 /*
  * pfn conversion functions
  *
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 06/43] memblock/arm: Use memblock_region_is_memory() for omap fb

Date: Thursday, August 5, 2010 - 10:14 pm

Instead of the deprecated memblock_find()

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/arm/plat-omap/fb.c    |    6 +-----
 drivers/video/omap2/vram.c |    8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 05bf228..441af2b 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -173,11 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg,
 
 static int valid_sdram(unsigned long addr, unsigned long size)
 {
-	struct memblock_region res;
-
-	res.base = addr;
-	res.size = size;
-	return !memblock_find(&amp;res) &amp;&amp; res.base == addr &amp;&amp; res.size == size;
+	return memblock_region_is_memory(addr, size);
 }
 
 static int reserve_sdram(unsigned long addr, unsigned long size)
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 0f2532b..34514a8 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -554,12 +554,8 @@ void __init omap_vram_reserve_sdram_memblock(void)
 	size = PAGE_ALIGN(size);
 
 	if (paddr) {
-		struct memblock_region res;
-
-		res.base = paddr;
-		res.size = size;
-		if ((paddr &amp; ~PAGE_MASK) || memblock_find(&amp;res) ||
-		    res.base != paddr || res.size != size) {
+		if ((paddr &amp; ~PAGE_MASK) ||
+		    !memblock_region_is_memory(paddr, size)) {
 			pr_err(&quot;Illegal SDRAM region for VRAM\n&quot;);
 			return;
 		}
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 02/43] memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region

Date: Thursday, August 5, 2010 - 10:14 pm

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/arm/mm/init.c                       |    2 +-
 arch/arm/plat-omap/fb.c                  |    2 +-
 arch/microblaze/mm/init.c                |    4 +-
 arch/powerpc/mm/hash_utils_64.c          |    2 +-
 arch/powerpc/mm/mem.c                    |   26 +++---
 arch/powerpc/platforms/embedded6xx/wii.c |    2 +-
 arch/sparc/mm/init_64.c                  |    6 +-
 drivers/video/omap2/vram.c               |    2 +-
 include/linux/memblock.h                 |   24 ++--
 mm/memblock.c                            |  168 +++++++++++++++---------------
 10 files changed, 118 insertions(+), 120 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 7185b00..d1496e6 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -237,7 +237,7 @@ static void __init arm_bootmem_free(struct meminfo *mi, unsigned long min,
 #ifndef CONFIG_SPARSEMEM
 int pfn_valid(unsigned long pfn)
 {
-	struct memblock_region *mem = &amp;memblock.memory;
+	struct memblock_type *mem = &amp;memblock.memory;
 	unsigned int left = 0, right = mem-&gt;cnt;
 
 	do {
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 0054b95..05bf228 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -173,7 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg,
 
 static int valid_sdram(unsigned long addr, unsigned long size)
 {
-	struct memblock_property res;
+	struct memblock_region res;
 
 	res.base = addr;
 	res.size = size;
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index db59349..afd6494 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -77,8 +77,8 @@ void __init setup_memory(void)
 
 	/* Find main memory where is the kernel */
 	for (i = 0; i &lt; memblock.memory.cnt; i++) {
-		memory_start = (u32) memblock.memory.region[i].base;
-		memory_end = (u32) memblock.memory.region[i].base
+		memory_start = (u32) ...[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 05/43] memblock/arm: pfn_valid uses memblock_is_memory()

Date: Thursday, August 5, 2010 - 10:14 pm

The implementation is pretty much similar. There is a -small- added
overhead by having another function call and the address shift.

If that becomes a concern, I suppose we could actually have memblock
itself expose a memblock_pfn_valid() which then ARM can use directly
with an appropriate #define...

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 arch/arm/mm/init.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index d1496e6..e739223 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -237,20 +237,7 @@ static void __init arm_bootmem_free(struct meminfo *mi, unsigned long min,
 #ifndef CONFIG_SPARSEMEM
 int pfn_valid(unsigned long pfn)
 {
-	struct memblock_type *mem = &amp;memblock.memory;
-	unsigned int left = 0, right = mem-&gt;cnt;
-
-	do {
-		unsigned int mid = (right + left) / 2;
-
-		if (pfn &lt; memblock_start_pfn(mem, mid))
-			right = mid;
-		else if (pfn &gt;= memblock_end_pfn(mem, mid))
-			left = mid + 1;
-		else
-			return 1;
-	} while (left &lt; right);
-	return 0;
+	return memblock_is_memory(pfn &lt;&lt; PAGE_SHIFT);
 }
 EXPORT_SYMBOL(pfn_valid);
 
-- 
1.7.0.4

--

[ message continues ]

[view original message]

From: Benjamin Herrenschmidt

Subject: [PATCH 01/43] memblock: Fix memblock_is_region_reserved() to return a boolean

Date: Thursday, August 5, 2010 - 10:14 pm

All callers expect a boolean result which is true if the region
overlaps a reserved region. However, the implementation actually
returns -1 if there is no overlap, and a region index (0 based)
if there is.

Make it behave as callers (and common sense) expect.

Signed-off-by: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
---
 mm/memblock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 3024eb3..43840b3 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -504,7 +504,7 @@ int __init memblock_is_reserved(u64 addr)
 
 int memblock_is_region_reserved(u64 base, u64 size)
 {
-	return memblock_overlaps_region(&amp;memblock.reserved, base, size);
+	return memblock_overlaps_region(&amp;memblock.reserved, base, size) &gt;= 0;
 }
 
 /*
-- 
1.7.0.4

--

[ message continues ]

Navigation

Popular discussions


linux-kernel:
Greg KH	Og dreams of kernels
Jens Axboe	[PATCH 31/33] Fusion: sg chaining support
Arnd Bergmann	Re: finding your own dead "CONFIG_" variables
Mark Brown	[PATCH 2/2] Subject: natsemi: Allow users to disable workaround for DspCfg reset
Tony Breeds	[LGUEST] Look in object dir for .config
git:
Brian Downing	Re: Git in a Nutshell guide
John Benes	Re: master has some toys
Matthias Lederhofer