2019-02-27 09:44:30

by Thomas Bogendoerfer

Subject: [PATCH v2] MIPS: fix memory setup for platforms with PHYS_OFFSET != 0

For platforms, which use a PHYS_OFFSET != 0, symbol _end also
contains that offset. So when calling memblock_reserve() for
reserving kernel the size argument needs to be adjusted.

Fixes: bcec54bf3118 ("mips: switch to NO_BOOTMEM")
Acked-by: Mike Rapoport <[email protected]>
Signed-off-by: Thomas Bogendoerfer <[email protected]>
---
arch/mips/kernel/setup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 8c6c48ed786a..d2e5a5ad0e6f 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -384,7 +384,8 @@ static void __init bootmem_init(void)
init_initrd();
reserved_end = (unsigned long) PFN_UP(__pa_symbol(&_end));

- memblock_reserve(PHYS_OFFSET, reserved_end << PAGE_SHIFT);
+ memblock_reserve(PHYS_OFFSET,
+ (reserved_end << PAGE_SHIFT) - PHYS_OFFSET);

/*
* max_low_pfn is not a number of pages. The number of pages
--
2.13.7

2019-02-28 02:51:55

by Paul Burton

Subject: Re: [PATCH v2] MIPS: fix memory setup for platforms with PHYS_OFFSET != 0

Hello,

Thomas Bogendoerfer wrote:
> For platforms, which use a PHYS_OFFSET != 0, symbol _end also
> contains that offset. So when calling memblock_reserve() for
> reserving kernel the size argument needs to be adjusted.
>
> Fixes: bcec54bf3118 ("mips: switch to NO_BOOTMEM")
> Acked-by: Mike Rapoport <[email protected]>
> Signed-off-by: Thomas Bogendoerfer <[email protected]>

Applied to mips-fixes.

Thanks,
Paul

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