2020-03-01 09:01:09 +00:00
|
|
|
From: Tobias Wolf <dev-NTEO@vplace.de>
|
|
|
|
|
Subject: [v2] MIPS: Fix memory reservation in bootmem_init for certain non-usermem setups
|
|
|
|
|
|
|
|
|
|
Commit 67a3ba25aa95 ("MIPS: Fix incorrect mem=X@Y handling") introduced a new
|
|
|
|
|
issue for rt288x where "PHYS_OFFSET" is 0x0 but the calculated "ramstart" is
|
|
|
|
|
not. As the prerequisite of custom memory map has been removed, this results
|
|
|
|
|
in the full memory range of 0x0 - 0x8000000 to be marked as reserved for this
|
|
|
|
|
platform.
|
|
|
|
|
|
|
|
|
|
v2: Correctly compare that usermem is not null.
|
|
|
|
|
|
|
|
|
|
This patch adds the originally intended prerequisite again.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
--- a/arch/mips/kernel/setup.c
|
|
|
|
|
+++ b/arch/mips/kernel/setup.c
|
kernel: bump 5.4 to 5.4.87
All modification by update_kernel.sh.
Build system: x86_64
Build-tested: ipq806x/R7800, bcm27xx/bcm2711
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Compile-tested [*]: ath79/{generic,tiny}, ipq40xx, octeon,
ramips/mt7621, realtek, x86/64.
Run-tested [*]: ramips/mt7621 (DIR-878 A1, R6800, RT-AC57U),
octeon (EdgeRouter Lite).
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Stijn Segers <foss@volatilesystems.org> [*]
2021-01-06 17:37:16 +00:00
|
|
|
@@ -287,6 +287,8 @@ static unsigned long __init init_initrd(
|
2020-03-01 09:06:45 +00:00
|
|
|
* Initialize the bootmem allocator. It also setup initrd related data
|
|
|
|
|
* if needed.
|
|
|
|
|
*/
|
2020-03-01 09:01:09 +00:00
|
|
|
+static int usermem __initdata;
|
|
|
|
|
+
|
2020-03-01 09:06:45 +00:00
|
|
|
#if defined(CONFIG_SGI_IP27) || (defined(CONFIG_CPU_LOONGSON3) && defined(CONFIG_NUMA))
|
|
|
|
|
|
2020-03-01 09:01:09 +00:00
|
|
|
static void __init bootmem_init(void)
|
kernel: bump 5.4 to 5.4.87
All modification by update_kernel.sh.
Build system: x86_64
Build-tested: ipq806x/R7800, bcm27xx/bcm2711
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Compile-tested [*]: ath79/{generic,tiny}, ipq40xx, octeon,
ramips/mt7621, realtek, x86/64.
Run-tested [*]: ramips/mt7621 (DIR-878 A1, R6800, RT-AC57U),
octeon (EdgeRouter Lite).
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Stijn Segers <foss@volatilesystems.org> [*]
2021-01-06 17:37:16 +00:00
|
|
|
@@ -325,7 +327,7 @@ static void __init bootmem_init(void)
|
2020-03-01 09:01:09 +00:00
|
|
|
/*
|
|
|
|
|
* Reserve any memory between the start of RAM and PHYS_OFFSET
|
|
|
|
|
*/
|
|
|
|
|
- if (ramstart > PHYS_OFFSET)
|
|
|
|
|
+ if (usermem && ramstart > PHYS_OFFSET)
|
2020-03-01 09:06:45 +00:00
|
|
|
memblock_reserve(PHYS_OFFSET, ramstart - PHYS_OFFSET);
|
2020-03-01 09:01:09 +00:00
|
|
|
|
2020-03-01 09:06:45 +00:00
|
|
|
if (PFN_UP(ramstart) > ARCH_PFN_OFFSET) {
|
kernel: bump 5.4 to 5.4.87
All modification by update_kernel.sh.
Build system: x86_64
Build-tested: ipq806x/R7800, bcm27xx/bcm2711
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Compile-tested [*]: ath79/{generic,tiny}, ipq40xx, octeon,
ramips/mt7621, realtek, x86/64.
Run-tested [*]: ramips/mt7621 (DIR-878 A1, R6800, RT-AC57U),
octeon (EdgeRouter Lite).
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Stijn Segers <foss@volatilesystems.org> [*]
2021-01-06 17:37:16 +00:00
|
|
|
@@ -386,8 +388,6 @@ static void __init bootmem_init(void)
|
2020-03-01 09:06:45 +00:00
|
|
|
|
|
|
|
|
#endif /* CONFIG_SGI_IP27 */
|
2020-03-01 09:01:09 +00:00
|
|
|
|
|
|
|
|
-static int usermem __initdata;
|
|
|
|
|
-
|
|
|
|
|
static int __init early_parse_mem(char *p)
|
|
|
|
|
{
|
|
|
|
|
phys_addr_t start, size;
|
