linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / kernel / head.S

diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index a64e87d..2e9122a 100644 (file)
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -22,11 +22,8 @@
 #include <asm/page.h>
 #include <asm/mipsregs.h>
 #include <asm/stackframe.h>
-#ifdef CONFIG_SGI_IP27
-#include <asm/sn/addrs.h>
-#include <asm/sn/sn0/hubni.h>
-#include <asm/sn/klkernvars.h>
-#endif
+
+#include <kernel-entry-init.h>
 
        .macro  ARC64_TWIDDLE_PC
 #if defined(CONFIG_ARC64) || defined(CONFIG_MAPPED_KERNEL)
@@ -38,18 +35,6 @@
 #endif
        .endm
 
-#ifdef CONFIG_SGI_IP27
-       /*
-        * outputs the local nasid into res.  IP27 stuff.
-        */
-       .macro GET_NASID_ASM res
-       dli     \res, LOCAL_HUB_ADDR(NI_STATUS_REV_ID)
-       ld      \res, (\res)
-       and     \res, NSRI_NODEID_MASK
-       dsrl    \res, NSRI_NODEID_SHFT
-       .endm
-#endif /* CONFIG_SGI_IP27 */
-
        /*
         * inputs are the text nasid in t1, data nasid in t2.
         */
@@ -107,7 +92,7 @@
        .endm
 
        .macro  setup_c0_status_pri
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
        setup_c0_status ST0_KX 0
 #else
        setup_c0_status 0 0
@@ -115,7 +100,7 @@
        .endm
 
        .macro  setup_c0_status_sec
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
        setup_c0_status ST0_KX ST0_BEV
 #else
        setup_c0_status 0 ST0_BEV
@@ -131,16 +116,21 @@
 EXPORT(stext)                                  # used for profiling
 EXPORT(_stext)
 
+#if defined(CONFIG_QEMU) || defined(CONFIG_MIPS_SIM)
+       /*
+        * Give us a fighting chance of running if execution beings at the
+        * kernel load address.  This is needed because this platform does
+        * not have a ELF loader yet.
+        */
+       j       kernel_entry
+#endif
        __INIT
 
 NESTED(kernel_entry, 16, sp)                   # kernel entry point
-       setup_c0_status_pri
 
-#ifdef CONFIG_SGI_IP27
-       GET_NASID_ASM   t1
-       move    t2, t1                          # text and data are here
-       MAPPED_KERNEL_SETUP_TLB
-#endif /* IP27 */
+       kernel_entry_setup                      # cpu specific setup
+
+       setup_c0_status_pri
 
        ARC64_TWIDDLE_PC
 
@@ -157,6 +147,7 @@ NESTED(kernel_entry, 16, sp)                        # kernel entry point
        LONG_S          a2, fw_arg2
        LONG_S          a3, fw_arg3
 
+       MTC0            zero, CP0_CONTEXT       # clear context register
        PTR_LA          $28, init_thread_union
        PTR_ADDIU       sp, $28, _THREAD_SIZE - 32
        set_saved_sp    sp, t0, t1
@@ -165,6 +156,10 @@ NESTED(kernel_entry, 16, sp)                       # kernel entry point
        j               start_kernel
        END(kernel_entry)
 
+#ifdef CONFIG_QEMU
+       __INIT
+#endif
+
 #ifdef CONFIG_SMP
 /*
  * SMP slave cpus entry point.  Board specific code for bootstrap calls this
@@ -172,20 +167,7 @@ NESTED(kernel_entry, 16, sp)                       # kernel entry point
  */
 NESTED(smp_bootstrap, 16, sp)
        setup_c0_status_sec
-
-#ifdef CONFIG_SGI_IP27
-       GET_NASID_ASM   t1
-       dli     t0, KLDIR_OFFSET + (KLI_KERN_VARS * KLDIR_ENT_SIZE) + \
-                   KLDIR_OFF_POINTER + CAC_BASE
-       dsll    t1, NASID_SHFT
-       or      t0, t0, t1
-       ld      t0, 0(t0)                       # t0 points to kern_vars struct
-       lh      t1, KV_RO_NASID_OFFSET(t0)
-       lh      t2, KV_RW_NASID_OFFSET(t0)
-       MAPPED_KERNEL_SETUP_TLB
-       ARC64_TWIDDLE_PC
-#endif /* CONFIG_SGI_IP27 */
-
+       smp_slave_setup
        j       start_secondary
        END(smp_bootstrap)
 #endif /* CONFIG_SMP */
@@ -200,22 +182,16 @@ NESTED(smp_bootstrap, 16, sp)
        .comm   fw_arg2, SZREG, SZREG
        .comm   fw_arg3, SZREG, SZREG
 
-       .macro  page name, order=0
-       .globl  \name
-\name: .size   \name, (_PAGE_SIZE << \order)
-       .org    . + (_PAGE_SIZE << \order)
-       .type   \name, @object
+       .macro page name, order
+       .comm   \name, (_PAGE_SIZE << \order), (_PAGE_SIZE << \order)
        .endm
 
-       .data
-       .align  PAGE_SHIFT
-
        /*
-        * ... but on 64-bit we've got three-level pagetables with a
-        * slightly different layout ...
+        * On 64-bit we've got three-level pagetables with a slightly
+        * different layout ...
         */
        page    swapper_pg_dir, _PGD_ORDER
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
        page    invalid_pmd_table, _PMD_ORDER
 #endif
        page    invalid_pte_table, _PTE_ORDER