2019-09-26 08:19:31

by Thomas Bogendoerfer

[permalink] [raw]
Subject: [PATCH] MIPS: init: Prevent adding memory before PHYS_OFFSET

On some SGI machines (IP28 and IP30) a small region of memory is mirrored
to pyhsical address 0 for exception vectors while rest of the memory
is reachable at a higher physical address. ARC PROM marks this
region as reserved, but with commit a94e4f24ec83 ("MIPS: init: Drop
boot_mem_map") this chunk is used, when searching for start of ram,
which breaks at least IP28 and IP30 machines. To fix this
add_region_memory() checks for start address < PHYS_OFFSET and ignores
these chunks.

Fixes: a94e4f24ec83 ("MIPS: init: Drop boot_mem_map")
Signed-off-by: Thomas Bogendoerfer <[email protected]>
---
arch/mips/kernel/setup.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index f5c6b4c6de24..5eec13b8d222 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -108,6 +108,9 @@ void __init add_memory_region(phys_addr_t start, phys_addr_t size, long type)
return;
}

+ if (start < PHYS_OFFSET)
+ return;
+
memblock_add(start, size);
/* Reserve any memory except the ordinary RAM ranges. */
switch (type) {
--
2.13.7


2019-10-03 00:28:46

by Paul Burton

[permalink] [raw]
Subject: Re: [PATCH] MIPS: init: Prevent adding memory before PHYS_OFFSET

Hello,

Thomas Bogendoerfer wrote:
> On some SGI machines (IP28 and IP30) a small region of memory is mirrored
> to pyhsical address 0 for exception vectors while rest of the memory
> is reachable at a higher physical address. ARC PROM marks this
> region as reserved, but with commit a94e4f24ec83 ("MIPS: init: Drop
> boot_mem_map") this chunk is used, when searching for start of ram,
> which breaks at least IP28 and IP30 machines. To fix this
> add_region_memory() checks for start address < PHYS_OFFSET and ignores
> these chunks.

Applied to mips-fixes.

> commit bd848d1b9235
> https://git.kernel.org/mips/c/bd848d1b9235
>
> Fixes: a94e4f24ec83 ("MIPS: init: Drop boot_mem_map")
> Signed-off-by: Thomas Bogendoerfer <[email protected]>
> Signed-off-by: Paul Burton <[email protected]>

Thanks,
Paul

[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]