[MINIOS][IA64] mini-os without linux-optimization in hypervisor

Make mini-os runnable again without the special linux optimization for the
identity mapping in the hypervisor.

Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>

2 files changed, 31 insertions, 21 deletions

diff --git a/extras/mini-os/arch/ia64/ia64.S b/extras/mini-os/arch/ia64/ia64.S
index 63721b4c36..4374c750e7 100644
--- a/extras/mini-os/arch/ia64/ia64.S
+++ b/extras/mini-os/arch/ia64/ia64.S
@@ -105,7 +105,7 @@ ENTRY(_start)
 	/*
 	 * Now pin mappings into the TLB for kernel text and data
 	 */
-	mov	r18=KERNEL_TR_PAGE_SIZE<<2
+	mov	r18=KERNEL_TR_PAGE_SIZE<<IA64_ITIR_PS
 	movl	r17=KERNEL_START
 	;;
 	mov	cr.itir=r18
@@ -204,7 +204,10 @@ ENTRY(_start)
 	;;
 	or	out0=r16, r15			// make a region 7 address
 	;;
-
+	ssm	psr.i | psr.ic
+	;;
+	srlz.i
+	;;
 	br.call.sptk.many rp=start_kernel
 	;;
 	add	r2=3,r0
diff --git a/extras/mini-os/arch/ia64/ivt.S b/extras/mini-os/arch/ia64/ivt.S
index 86f8bb4060..58ff32559f 100644
--- a/extras/mini-os/arch/ia64/ivt.S
+++ b/extras/mini-os/arch/ia64/ivt.S
@@ -587,13 +587,11 @@ END(save_special_regs)
 
 
 ENTRY(hypervisor_callback)
-		// Calculate the stack address for storing.
-		// Use the kernel stack here because it's mapped wired!
-		// -> no nested tlb faults!
-	movl	r18=kstack+KSTACK_PAGES * PAGE_SIZE - 16 - TF_SIZE
-
-	//add	r18=-TF_SIZE,sp
-	add	r30=0xabab,r0
+	/*
+	 * Use the thread stack here for storing the trap frame.
+	 * It's not wired mapped, so nested data tlb faults may occur!
+	 */
+	add	r18=-TF_SIZE,sp
 	;;
 {	.mib
 	nop	0x02
@@ -602,7 +600,7 @@ ENTRY(hypervisor_callback)
 	;;
 }
 	add	sp=-16,r18		// the new stack
-	alloc	r15=ar.pfs,0,0,1,0	// 1 out for do_trap_error
+	alloc	r15=ar.pfs,0,0,1,0	// 1 out for do_hypervisor_callback
 	;;
 	mov	out0=r18		// the trap frame
 	movl	r22=XSI_PSR_IC
@@ -617,13 +615,8 @@ ENTRY(hypervisor_callback)
 	movl	r22=XSI_PSR_IC
 	;;
 	st4	[r22]=r0		// rsm psr.ic
-
-	add	r16=16,sp		// load EF-pointer again
-	;;
-	//mov	r18=sp
-	movl	r18=kstack+KSTACK_PAGES * PAGE_SIZE - 16 - TF_SIZE
+	add	r18=16,sp		// load EF-pointer again
 	;;
-
 			// must have r18-efp, calls rfi at the end.
 	br.sptk	restore_tf_rse_switch
 	;;
@@ -654,9 +647,7 @@ ENTRY(trap_error)
 	mov	out0=r18		// the trap frame
 	add	sp=-16,r18		// C-call abi
 	;;
-
-	//bsw.1
-	movl r30=XSI_BANKNUM
+	movl r30=XSI_BANKNUM		// bsw.1
 	mov r31=1;;
 #if defined(BIG_ENDIAN)			// swap because mini-os is in BE
 	mux1	r31=r31,@rev;;
@@ -752,6 +743,7 @@ IVT_ERR(Alternate_Instruction_TLB, 3, 0x0c00)
 
 IVT_ENTRY(Alternate_Data_TLB, 0x1000)
 	mov	r30=4			// trap number
+adt_common:
 	mov	r16=cr.ifa		// where did it happen
 	mov	r31=pr			// save predicates
 	;;
@@ -765,7 +757,7 @@ IVT_ENTRY(Alternate_Data_TLB, 0x1000)
 //		// No return
 //
 //adt_regf_addr:
-//	extr.u	r17=r16,60,4	// get region number
+//	extr.u	r17=r16,60,4		// get region number
 //	;;
 //	cmp.eq	p14,p15=0xf,r17
 //	;;
@@ -799,8 +791,23 @@ adt_reg7_addr:
 
 IVT_END(Alternate_Data_TLB)
 
+/*
+ * Handling of nested data tlb is needed, because in hypervisor_callback()
+ * the stack is used to store the register trap frame. This stack is allocated
+ * dynamically (as identity mapped address) and therewidth no tr mapped page!
+ */
+IVT_ENTRY(Data_Nested_TLB, 0x1400)
+
+	mov	r30=5			// trap number
+	add	r28=-TF_SIZE,sp		// r28 is never used in trap handling
+	;;
+	mov	cr.ifa=r28
+	;;
+	br.sptk	adt_common
+IVT_END(Data_Nested_TLB)
+
+
 
-IVT_ERR(Data_Nested_TLB, 5, 0x1400)
 IVT_ERR(Instruction_Key_Miss, 6, 0x1800)
 IVT_ERR(Data_Key_Miss, 7, 0x1c00)
 IVT_ERR(Dirty_Bit, 8, 0x2000)