head.S fix for unusual load addrs

PATCH New Jesse Barnes 1 participant 1 message Apr 17, 2003

Share & tools

Jesse Barnes

author

2003-04-17 22:50 UTC #0 lore raw

PATCH 1/1 head.S fix for unusual load addrs

David, is something like this ok with you? On our systems, elilo won't load the kernel where head.S expects it, so we look at the ip to figure it out.

Thanks,
Jesse

arch/ia64/kernel/head.S +5 -1

@@ -66,16 +66,20 @@
 	 */
 	rsm psr.i | psr.ic
 	mov r16=((ia64_rid(IA64_REGION_ID_KERNEL, PAGE_OFFSET) << 8) | (IA64_GRANULE_SHIFT << 2))
+	mov r3=ip		// used to figure out which physical addr we loaded at
 	;;
 	srlz.i
 	mov r18=KERNEL_TR_PAGE_SHIFT<<2
 	movl r17=KERNEL_START
+	dep r2=0,r3,0,12	// drop the low 12 bits, they're used later for pte info
 	;;
 	mov rr[r17]=r16
 	mov cr.itir=r18
 	mov cr.ifa=r17
 	mov r16=IA64_TR_KERNEL
-	movl r18=((1 << KERNEL_TR_PAGE_SHIFT) | PAGE_KERNEL)
+	movl r18=PAGE_KERNEL	// rwx kernel text & data
+	;;
+	or r18=r2,r18		// put the pte bits in with the physical page number from r2
 	;;
 	srlz.i
 	;;