lkml.org 
[lkml]   [2019]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[Resend] arch: mips: Fix initrd_start and initrd_end when read from DT
Date
When the bootloader passes arguments to linux kernel through device tree,
it passes the address of initrd_start and initrd_stop, which are in kseg0.
But when linux kernel reads these addresses from device tree, it converts
them to virtual addresses inside the function
__early_init_dt_declare_initrd.

At a later point then in the function init_initrd, it is checking for
initrd_start to be lower than PAGE_OFFSET, which for a 32 CPU it is not,
therefore it would disable the initrd by setting 0 to initrd_start and
initrd_stop.

The fix consists of checking if linux kernel received a device tree and not
having enable extended virtual address and in that case convert them back
to physical addresses that point in kseg0 as expected.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
arch/mips/kernel/setup.c | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 8d1dc6c..774ee00 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -264,6 +264,17 @@ static unsigned long __init init_initrd(void)
pr_err("initrd start must be page aligned\n");
goto disable;
}
+
+ /*
+ * In case the initrd_start and initrd_end are read from DT,
+ * then they are converted to virtual address, therefore convert
+ * them back to physical address.
+ */
+ if (!IS_ENABLED(CONFIG_EVA) && fw_arg0 == -2) {
+ initrd_start = initrd_start - PAGE_OFFSET + PHYS_OFFSET;
+ initrd_end = initrd_end - PAGE_OFFSET + PHYS_OFFSET;
+ }
+
if (initrd_start < PAGE_OFFSET) {
pr_err("initrd start < PAGE_OFFSET\n");
goto disable;
--
2.7.4
\
 
 \ /
  Last update: 2019-04-16 12:18    [W:0.026 / U:27.576 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site