1 files changed, 38 insertions, 33 deletions

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 7d73a13450b0..a5b13ae7fd20 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -48,20 +48,17 @@
         mtspr   SPRN_DBAT##n##L,RB;     \
 1:
 
-        .text
+        .section        .text.head, "ax"
         .stabs  "arch/powerpc/kernel/",N_SO,0,0,0f
         .stabs  "head_32.S",N_SO,0,0,0f
 0:
-        .globl  _stext
-_stext:
+_ENTRY(_stext);
 
 /*
  * _start is defined this way because the XCOFF loader in the OpenFirmware
  * on the powermac expects the entry point to be a procedure descriptor.
  */
-        .text
-        .globl  _start
-_start:
+_ENTRY(_start);
         /*
          * These are here for legacy reasons, the kernel used to
          * need to look like a coff function entry for the pmac
@@ -152,6 +149,9 @@ __after_mmu_off:
 #if defined(CONFIG_BOOTX_TEXT)
         bl      setup_disp_bat
 #endif
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+        bl      setup_cpm_bat
+#endif
 
 /*
  * Call setup_cpu for CPU 0 and initialize 6xx Idle
@@ -469,16 +469,16 @@ InstructionTLBMiss:
         mfctr   r0
         /* Get PTE (linux-style) and check access */
         mfspr   r3,SPRN_IMISS
-        lis     r1,KERNELBASE@h         /* check if kernel address */
-        cmplw   0,r3,r1
+        lis     r1,PAGE_OFFSET@h                /* check if kernel address */
+        cmplw   0,r1,r3
         mfspr   r2,SPRN_SPRG3
         li      r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */
         lwz     r2,PGDIR(r2)
-        blt+    112f
+        bge-    112f
+        mfspr   r2,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
+        rlwimi  r1,r2,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
         lis     r2,swapper_pg_dir@ha    /* if kernel address, use */
         addi    r2,r2,swapper_pg_dir@l  /* kernel page table */
-        mfspr   r1,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
-        rlwinm  r1,r1,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
 112:    tophys(r2,r2)
         rlwimi  r2,r3,12,20,29          /* insert top 10 bits of address */
         lwz     r2,0(r2)                /* get pmd entry */
@@ -543,16 +543,16 @@ DataLoadTLBMiss:
         mfctr   r0
         /* Get PTE (linux-style) and check access */
         mfspr   r3,SPRN_DMISS
-        lis     r1,KERNELBASE@h         /* check if kernel address */
-        cmplw   0,r3,r1
+        lis     r1,PAGE_OFFSET@h                /* check if kernel address */
+        cmplw   0,r1,r3
         mfspr   r2,SPRN_SPRG3
         li      r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */
         lwz     r2,PGDIR(r2)
-        blt+    112f
+        bge-    112f
+        mfspr   r2,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
+        rlwimi  r1,r2,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
         lis     r2,swapper_pg_dir@ha    /* if kernel address, use */
         addi    r2,r2,swapper_pg_dir@l  /* kernel page table */
-        mfspr   r1,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
-        rlwinm  r1,r1,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
 112:    tophys(r2,r2)
         rlwimi  r2,r3,12,20,29          /* insert top 10 bits of address */
         lwz     r2,0(r2)                /* get pmd entry */
@@ -615,16 +615,16 @@ DataStoreTLBMiss:
         mfctr   r0
         /* Get PTE (linux-style) and check access */
         mfspr   r3,SPRN_DMISS
-        lis     r1,KERNELBASE@h         /* check if kernel address */
-        cmplw   0,r3,r1
+        lis     r1,PAGE_OFFSET@h                /* check if kernel address */
+        cmplw   0,r1,r3
         mfspr   r2,SPRN_SPRG3
         li      r1,_PAGE_RW|_PAGE_USER|_PAGE_PRESENT /* access flags */
         lwz     r2,PGDIR(r2)
-        blt+    112f
+        bge-    112f
+        mfspr   r2,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
+        rlwimi  r1,r2,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
         lis     r2,swapper_pg_dir@ha    /* if kernel address, use */
         addi    r2,r2,swapper_pg_dir@l  /* kernel page table */
-        mfspr   r1,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
-        rlwinm  r1,r1,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
 112:    tophys(r2,r2)
         rlwimi  r2,r3,12,20,29          /* insert top 10 bits of address */
         lwz     r2,0(r2)                /* get pmd entry */
@@ -841,7 +841,7 @@ relocate_kernel:
  * r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset
  * on exit, r3, r4, r5 are unchanged, r6 is updated to be >= r5.
  */
-_GLOBAL(copy_and_flush)
+_ENTRY(copy_and_flush)
         addi    r5,r5,-4
         addi    r6,r6,-4
 4:      li      r0,L1_CACHE_BYTES/4
@@ -954,9 +954,9 @@ __secondary_start:
  * included in CONFIG_6xx
  */
 #if !defined(CONFIG_6xx)
-_GLOBAL(__save_cpu_setup)
+_ENTRY(__save_cpu_setup)
         blr
-_GLOBAL(__restore_cpu_setup)
+_ENTRY(__restore_cpu_setup)
         blr
 #endif /* !defined(CONFIG_6xx) */
 
@@ -1080,7 +1080,7 @@ start_here:
 /*
  * Set up the segment registers for a new context.
  */
-_GLOBAL(set_context)
+_ENTRY(set_context)
         mulli   r3,r3,897       /* multiply context by skew factor */
         rlwinm  r3,r3,4,8,27    /* VSID = (context & 0xfffff) << 4 */
         addis   r3,r3,0x6000    /* Set Ks, Ku bits */
@@ -1248,6 +1248,19 @@ setup_disp_bat:
         blr
 #endif /* CONFIG_BOOTX_TEXT */
 
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+setup_cpm_bat:
+        lis     r8, 0xf000
+        ori     r8, r8, 0x002a
+        mtspr   SPRN_DBAT1L, r8
+
+        lis     r11, 0xf000
+        ori     r11, r11, (BL_1M << 2) | 2
+        mtspr   SPRN_DBAT1U, r11
+
+        blr
+#endif
+
 #ifdef CONFIG_8260
 /* Jump into the system reset for the rom.
  * We first disable the MMU, and then jump to the ROM reset address.
@@ -1300,14 +1313,6 @@ empty_zero_page:
 swapper_pg_dir:
         .space  4096
 
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * Used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-        .globl  cmd_line
-cmd_line:
-        .space  512
-
         .globl intercept_table
 intercept_table:
         .long 0, 0, i0x200, i0x300, i0x400, 0, i0x600, i0x700