Commit c5a771d0 authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: adjust boot parameters address when INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is selected

The virtual address of boot parameters chain is passed to the kernel via
a2 register. Adjust it in case it is remapped during MMUv3 -> MMUv2
mapping change, i.e. when it is in the first 128M.

Also fix interpretation of initrd and FDT addresses passed in the boot
parameters: these are physical addresses.

Reported-by: default avatarBaruch Siach <>
Signed-off-by: default avatarMax Filippov <>
Signed-off-by: default avatarChris Zankel <>
parent 661b40b0
......@@ -68,6 +68,15 @@ _SetupMMU:
rsr a2, excsave1
movi a3, 0x08000000
bgeu a2, a3, 1f
movi a3, 0xd0000000
add a2, a2, a3
wsr a2, excsave1
.end no-absolute-literals
......@@ -152,8 +152,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)
meminfo_t* mi;
mi = (meminfo_t*)(tag->data);
initrd_start = (void*)(mi->start);
initrd_end = (void*)(mi->end);
initrd_start = __va(mi->start);
initrd_end = __va(mi->end);
return 0;
......@@ -164,7 +164,7 @@ __tagtable(BP_TAG_INITRD, parse_tag_initrd);
static int __init parse_tag_fdt(const bp_tag_t *tag)
dtb_start = (void *)(tag->data[0]);
dtb_start = __va(tag->data[0]);
return 0;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment