patch-2.3.99-pre9 linux/arch/mips64/kernel/head.S

• Lines: 94
• Date: Sat May 13 08:30:17 2000
• Orig file: v2.3.99-pre8/linux/arch/mips64/kernel/head.S
• Orig date: Sat Feb 26 22:31:41 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/mips64/kernel/head.S linux/arch/mips64/kernel/head.S
@@ -1,4 +1,4 @@
-/* $Id: head.S,v 1.4 2000/01/25 01:35:05 ralf Exp $
+/* $Id: head.S,v 1.6 2000/03/27 21:05:04 ulfc Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -20,6 +20,15 @@
 #include <asm/mipsregs.h>
 #include <asm/stackframe.h>
 
+#define ARC64_TWIDDLE_PC \
+#ifdef CONFIG_ARC64 \
+	/* We get launched at a XKPHYS address but the kernel is linked to \
+	   run at a KSEG0 address, so jump there.  */ \
+	la	t0, 1f \
+	jr	t0 \
+1: \
+#endif
+
 	.text
 
 EXPORT(stext)					# used for profiling
@@ -29,13 +38,7 @@
 
 NESTED(kernel_entry, 16, sp)			# kernel entry point
 
-#ifdef CONFIG_ARC64
-	/* We get launched at a XKPHYS address but the kernel is linked to
-	   run at a KSEG0 address, so jump there.  */
-	la	t0, 1f
-	jr	t0
-1:
-#endif
+	ARC64_TWIDDLE_PC
 
 	ori	sp, 0xf				# align stack on 16 byte.
 	xori	sp, 0xf
@@ -47,24 +50,44 @@
 	CLI					# disable interrupts
 
 	mfc0	t0, CP0_STATUS
-	li	t1, ~(ST0_CU1|ST0_CU2|ST0_CU3)
+	/*
+	 * On IP27, I am seeing the TS bit set when the
+	 * kernel is loaded. Maybe because the kernel is
+	 * in ckseg0 and not xkphys? Clear it anyway ...
+	 */
+	li	t1, ~(ST0_TS|ST0_CU1|ST0_CU2|ST0_CU3)
 	and	t0, t1
-	or	t0, (ST0_CU0|ST0_KX|ST0_SX)
-	mtc0	t0, CP0_STATUS
+	or	t0, (ST0_CU0|ST0_KX|ST0_SX|ST0_FR) # Bogosity: cu0 indicates kernel
+	mtc0	t0, CP0_STATUS			   # thread in copy_thread.
 
 	la	$28, init_task_union		# init current pointer
 	daddiu	t0, $28, KERNEL_STACK_SIZE-32
 	sd	t0, kernelsp
 	dsubu	sp, t0, 4*SZREG			# init stack pointer
-
+	move	t0, $28
+#ifdef CONFIG_SMP
+	mtc0	t0, CP0_WATCHLO
+	dsrl32	t0, t0, 0
+	mtc0	t0, CP0_WATCHHI
+#endif
 	jal	start_kernel
 1:	b	1b				# just in case ...
 	END(kernel_entry)
 
+NESTED(bootstrap, 16, sp)
+	ARC64_TWIDDLE_PC
+	CLI
+	mfc0	t0, CP0_STATUS
+	li	t1, ~(ST0_CU1|ST0_CU2|ST0_CU3)
+	and	t0, t1
+	or	t0, (ST0_CU0|ST0_KX|ST0_SX|ST0_FR) # Bogosity: cu0 indicates kernel
+	mtc0	t0, CP0_STATUS			   # thread in copy_thread.
+	jal	cboot
+	END(bootstrap)
+
 	__FINIT
 
 	.comm	kernelsp, 8, 8			# current stackpointer
-	.comm	current_pgd, 8, 8		# current page tables
 
 #define PAGE_SIZE	0x1000
 
@@ -81,5 +104,5 @@
 	page	swapper_pg_dir, 1
 	page	invalid_pte_table, 1
 	page	invalid_pmd_table, 1
+	page	empty_bad_page_table, 1
 	page	empty_bad_page
-	page	empty_bad_page_table