xtensa: adjust boot parameters address when INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is selected

jcmvbkbc · czankel · commit c5a771d0678f · 2013-07-08T01:18:56.000-07:00
The virtual address of boot parameters chain is passed to the kernel via
a2 register. Adjust it in case it is remapped during MMUv3 -&gt; 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.

Cc: stable@vger.kernel.org
Reported-by: Baruch Siach &lt;baruch@tkos.co.il&gt;
Signed-off-by: Max Filippov &lt;jcmvbkbc@gmail.com&gt;
Signed-off-by: Chris Zankel &lt;chris@zankel.net&gt;
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
@@ -68,6 +68,15 @@ _SetupMMU:
 
 #ifdef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
 	initialize_mmu
+#if defined(CONFIG_MMU) && XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
+	rsr	a2, excsave1
+	movi	a3, 0x08000000
+	bgeu	a2, a3, 1f
+	movi	a3, 0xd0000000
+	add	a2, a2, a3
+	wsr	a2, excsave1
+1:
+#endif
 #endif
 	.end	no-absolute-literals
 
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)`
`152`	`152`	`{`
`153`	`153`	`meminfo_t* mi;`
`154`	`154`	`mi = (meminfo_t*)(tag->data);`
`155`		`- initrd_start = (void*)(mi->start);`
`156`		`- initrd_end = (void*)(mi->end);`
	`155`	`+ initrd_start = __va(mi->start);`
	`156`	`+ initrd_end = __va(mi->end);`
`157`	`157`
`158`	`158`	`return 0;`
`159`	`159`	`}`
`@@ -164,7 +164,7 @@ __tagtable(BP_TAG_INITRD, parse_tag_initrd);`
`164`	`164`
`165`	`165`	`static int __init parse_tag_fdt(const bp_tag_t *tag)`
`166`	`166`	`{`
`167`		`- dtb_start = (void *)(tag->data[0]);`
	`167`	`+ dtb_start = __va(tag->data[0]);`
`168`	`168`	`return 0;`
`169`	`169`	`}`
`170`	`170`