[5.3,1/2] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary

Message ID 20191122105417.11503-1-lee.jones@linaro.org
State Superseded
Headers show
Series
  • [5.3,1/2] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary
Related show

Commit Message

Lee Jones Nov. 22, 2019, 10:54 a.m.
From: Chester Lin <clin@suse.com>


[ Upstream commit 1d31999cf04c21709f72ceb17e65b54a401330da ]

adjust_lowmem_bounds() checks every memblocks in order to find the boundary
between lowmem and highmem. However some memblocks could be marked as NOMAP
so they are not used by kernel, which should be skipped while calculating
the boundary.

Signed-off-by: Chester Lin <clin@suse.com>

Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

---
 arch/arm/mm/mmu.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.24.0

Patch

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index d5e0b908f0ba..25da9b2d9610 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1197,6 +1197,9 @@  void __init adjust_lowmem_bounds(void)
 		phys_addr_t block_start = reg->base;
 		phys_addr_t block_end = reg->base + reg->size;
 
+		if (memblock_is_nomap(reg))
+			continue;
+
 		if (reg->base < vmalloc_limit) {
 			if (block_end > lowmem_limit)
 				/*