arm64: only consider memblocks with NOMAP cleared for linear mapping

Ard Biesheuvel · wildea01 · commit 68709f45385a · 2015-12-09T16:57:23.000Z
Take the new memblock attribute MEMBLOCK_NOMAP into account when
deciding whether a certain region is or should be covered by the
kernel direct mapping.

Reviewed-by: Matt Fleming &lt;matt@codeblueprint.co.uk&gt;
Signed-off-by: Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;
Signed-off-by: Will Deacon &lt;will.deacon@arm.com&gt;
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
@@ -120,7 +120,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
 #ifdef CONFIG_HAVE_ARCH_PFN_VALID
 int pfn_valid(unsigned long pfn)
 {
-	return memblock_is_memory(pfn << PAGE_SHIFT);
+	return memblock_is_map_memory(pfn << PAGE_SHIFT);
 }
 EXPORT_SYMBOL(pfn_valid);
 #endif
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
@@ -372,6 +372,8 @@ static void __init map_mem(void)
 
 		if (start >= end)
 			break;
+		if (memblock_is_nomap(reg))
+			continue;
 
 		if (ARM64_SWAPPER_USES_SECTION_MAPS) {
 			/*

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)`
`120`	`120`	`#ifdef CONFIG_HAVE_ARCH_PFN_VALID`
`121`	`121`	`int pfn_valid(unsigned long pfn)`
`122`	`122`	`{`
`123`		`- return memblock_is_memory(pfn << PAGE_SHIFT);`
	`123`	`+ return memblock_is_map_memory(pfn << PAGE_SHIFT);`
`124`	`124`	`}`
`125`	`125`	`EXPORT_SYMBOL(pfn_valid);`
`126`	`126`	`#endif`