Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
  powerpc/nvram: Enable use Generic NVRAM driver for different size chips
  powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
  powerpc/ps3: Workaround for flash memory I/O error
  powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
  powerpc/perf_counters: Reduce stack usage of power_check_constraints
  powerpc: Fix bug where perf_counters breaks oprofile
  powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
  powerpc/irq: Improve nanodoc
  powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
  powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
  powerpc/book3e: Add missing page sizes
  powerpc/pseries: Fix to handle slb resize across migration
  powerpc/powermac: Thermal control turns system off too eagerly
  powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
  powerpc/405ex: support cuImage via included dtb
  powerpc/405ex: provide necessary fixup function to support cuImage
  powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
  powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
  powerpc/44x: Update Arches defconfig
  powerpc/44x: Update Arches dts
  ...

Fix up conflicts in drivers/char/agp/uninorth-agp.c

1 files changed, 63 insertions, 39 deletions

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 43e073477c34..66bcda34a6bb 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -120,9 +120,15 @@ BEGIN_FW_FTR_SECTION
 2:
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif /* CONFIG_PPC_ISERIES */
+
+        /* Hard enable interrupts */
+#ifdef CONFIG_PPC_BOOK3E
+        wrteei  1
+#else
         mfmsr   r11
         ori     r11,r11,MSR_EE
         mtmsrd  r11,1
+#endif /* CONFIG_PPC_BOOK3E */
 
 #ifdef SHOW_SYSCALLS
         bl      .do_show_syscall
@@ -168,15 +174,25 @@ syscall_exit:
 #endif
         clrrdi  r12,r1,THREAD_SHIFT
 
-        /* disable interrupts so current_thread_info()->flags can't change,
-           and so that we don't get interrupted after loading SRR0/1. */
         ld      r8,_MSR(r1)
+#ifdef CONFIG_PPC_BOOK3S
+        /* No MSR:RI on BookE */
         andi.   r10,r8,MSR_RI
         beq-    unrecov_restore
+#endif
+
+        /* Disable interrupts so current_thread_info()->flags can't change,
+         * and so that we don't get interrupted after loading SRR0/1.
+         */
+#ifdef CONFIG_PPC_BOOK3E
+        wrteei  0
+#else
         mfmsr   r10
         rldicl  r10,r10,48,1
         rotldi  r10,r10,16
         mtmsrd  r10,1
+#endif /* CONFIG_PPC_BOOK3E */
+
         ld      r9,TI_FLAGS(r12)
         li      r11,-_LAST_ERRNO
         andi.   r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)
@@ -194,9 +210,13 @@ syscall_error_cont:
          * userspace and we take an exception after restoring r13,
          * we end up corrupting the userspace r13 value.
          */
+#ifdef CONFIG_PPC_BOOK3S
+        /* No MSR:RI on BookE */
         li      r12,MSR_RI
         andc    r11,r10,r12
         mtmsrd  r11,1                   /* clear MSR.RI */
+#endif /* CONFIG_PPC_BOOK3S */
+
         beq-    1f
         ACCOUNT_CPU_USER_EXIT(r11, r12)
         ld      r13,GPR13(r1)   /* only restore r13 if returning to usermode */
@@ -206,7 +226,7 @@ syscall_error_cont:
         mtcr    r5
         mtspr   SPRN_SRR0,r7
         mtspr   SPRN_SRR1,r8
-        rfid
+        RFI
         b       .       /* prevent speculative execution */
 
 syscall_error:  
@@ -276,9 +296,13 @@ syscall_exit_work:
         beq     .ret_from_except_lite
 
         /* Re-enable interrupts */
+#ifdef CONFIG_PPC_BOOK3E
+        wrteei  1
+#else
         mfmsr   r10
         ori     r10,r10,MSR_EE
         mtmsrd  r10,1
+#endif /* CONFIG_PPC_BOOK3E */
 
         bl      .save_nvgprs
         addi    r3,r1,STACK_FRAME_OVERHEAD
@@ -380,7 +404,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
         and.    r0,r0,r22
         beq+    1f
         andc    r22,r22,r0
-        mtmsrd  r22
+        MTMSRD(r22)
         isync
 1:      std     r20,_NIP(r1)
         mfcr    r23
@@ -399,6 +423,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
         std     r6,PACACURRENT(r13)     /* Set new 'current' */
 
         ld      r8,KSP(r4)      /* new stack pointer */
+#ifdef CONFIG_PPC_BOOK3S
 BEGIN_FTR_SECTION
   BEGIN_FTR_SECTION_NESTED(95)
         clrrdi  r6,r8,28        /* get its ESID */
@@ -445,8 +470,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         slbie   r6              /* Workaround POWER5 < DD2.1 issue */
         slbmte  r7,r0
         isync
-
 2:
+#endif /* !CONFIG_PPC_BOOK3S */
+
         clrrdi  r7,r8,THREAD_SHIFT      /* base of new stack */
         /* Note: this uses SWITCH_FRAME_SIZE rather than INT_FRAME_SIZE
            because we don't need to leave the 288-byte ABI gap at the
@@ -490,10 +516,14 @@ _GLOBAL(ret_from_except_lite)
          * can't change between when we test it and when we return
          * from the interrupt.
          */
+#ifdef CONFIG_PPC_BOOK3E
+        wrteei  0
+#else
         mfmsr   r10             /* Get current interrupt state */
         rldicl  r9,r10,48,1     /* clear MSR_EE */
         rotldi  r9,r9,16
         mtmsrd  r9,1            /* Update machine state */
+#endif /* CONFIG_PPC_BOOK3E */
 
 #ifdef CONFIG_PREEMPT
         clrrdi  r9,r1,THREAD_SHIFT      /* current_thread_info() */
@@ -540,6 +570,9 @@ ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES)
         rldicl  r4,r3,49,63             /* r0 = (r3 >> 15) & 1 */
         stb     r4,PACAHARDIRQEN(r13)
 
+#ifdef CONFIG_PPC_BOOK3E
+        b       .exception_return_book3e
+#else
         ld      r4,_CTR(r1)
         ld      r0,_LINK(r1)
         mtctr   r4
@@ -588,6 +621,8 @@ ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES)
         rfid
         b       .       /* prevent speculative execution */
 
+#endif /* CONFIG_PPC_BOOK3E */
+
 iseries_check_pending_irqs:
 #ifdef CONFIG_PPC_ISERIES
         ld      r5,SOFTE(r1)
@@ -638,6 +673,11 @@ do_work:
         li      r0,1
         stb     r0,PACASOFTIRQEN(r13)
         stb     r0,PACAHARDIRQEN(r13)
+#ifdef CONFIG_PPC_BOOK3E
+        wrteei  1
+        bl      .preempt_schedule
+        wrteei  0
+#else
         ori     r10,r10,MSR_EE
         mtmsrd  r10,1           /* reenable interrupts */
         bl      .preempt_schedule
@@ -646,6 +686,7 @@ do_work:
         rldicl  r10,r10,48,1    /* disable interrupts again */
         rotldi  r10,r10,16
         mtmsrd  r10,1
+#endif /* CONFIG_PPC_BOOK3E */
         ld      r4,TI_FLAGS(r9)
         andi.   r0,r4,_TIF_NEED_RESCHED
         bne     1b
@@ -654,8 +695,12 @@ do_work:
 user_work:
 #endif
         /* Enable interrupts */
+#ifdef CONFIG_PPC_BOOK3E
+        wrteei  1
+#else
         ori     r10,r10,MSR_EE
         mtmsrd  r10,1
+#endif /* CONFIG_PPC_BOOK3E */
 
         andi.   r0,r4,_TIF_NEED_RESCHED
         beq     1f
@@ -762,7 +807,7 @@ _GLOBAL(enter_rtas)
 
 _STATIC(rtas_return_loc)
         /* relocation is off at this point */
-        mfspr   r4,SPRN_SPRG3           /* Get PACA */
+        mfspr   r4,SPRN_SPRG_PACA       /* Get PACA */
         clrldi  r4,r4,2                 /* convert to realmode address */
 
         bcl     20,31,$+4
@@ -793,7 +838,7 @@ _STATIC(rtas_restore_regs)
         REST_8GPRS(14, r1)              /* Restore the non-volatiles */
         REST_10GPRS(22, r1)             /* ditto */
 
-        mfspr   r13,SPRN_SPRG3
+        mfspr   r13,SPRN_SPRG_PACA
 
         ld      r4,_CCR(r1)
         mtcr    r4
@@ -823,33 +868,24 @@ _GLOBAL(enter_prom)
          * of all registers that it saves.  We therefore save those registers
          * PROM might touch to the stack.  (r0, r3-r13 are caller saved)
          */
-        SAVE_8GPRS(2, r1)
+        SAVE_GPR(2, r1)
         SAVE_GPR(13, r1)
         SAVE_8GPRS(14, r1)
         SAVE_10GPRS(22, r1)
-        mfcr    r4
-        std     r4,_CCR(r1)
-        mfctr   r5
-        std     r5,_CTR(r1)
-        mfspr   r6,SPRN_XER
-        std     r6,_XER(r1)
-        mfdar   r7
-        std     r7,_DAR(r1)
-        mfdsisr r8
-        std     r8,_DSISR(r1)
-        mfsrr0  r9
-        std     r9,_SRR0(r1)
-        mfsrr1  r10
-        std     r10,_SRR1(r1)
+        mfcr    r10
         mfmsr   r11
+        std     r10,_CCR(r1)
         std     r11,_MSR(r1)
 
         /* Get the PROM entrypoint */
-        ld      r0,GPR4(r1)
-        mtlr    r0
+        mtlr    r4
 
         /* Switch MSR to 32 bits mode
          */
+#ifdef CONFIG_PPC_BOOK3E
+        rlwinm  r11,r11,0,1,31
+        mtmsr   r11
+#else /* CONFIG_PPC_BOOK3E */
         mfmsr   r11
         li      r12,1
         rldicr  r12,r12,MSR_SF_LG,(63-MSR_SF_LG)
@@ -858,10 +894,10 @@ _GLOBAL(enter_prom)
         rldicr  r12,r12,MSR_ISF_LG,(63-MSR_ISF_LG)
         andc    r11,r11,r12
         mtmsrd  r11
+#endif /* CONFIG_PPC_BOOK3E */
         isync
 
-        /* Restore arguments & enter PROM here... */
-        ld      r3,GPR3(r1)
+        /* Enter PROM here... */
         blrl
 
         /* Just make sure that r1 top 32 bits didn't get
@@ -871,7 +907,7 @@ _GLOBAL(enter_prom)
 
         /* Restore the MSR (back to 64 bits) */
         ld      r0,_MSR(r1)
-        mtmsrd  r0
+        MTMSRD(r0)
         isync
 
         /* Restore other registers */
@@ -881,18 +917,6 @@ _GLOBAL(enter_prom)
         REST_10GPRS(22, r1)
         ld      r4,_CCR(r1)
         mtcr    r4
-        ld      r5,_CTR(r1)
-        mtctr   r5
-        ld      r6,_XER(r1)
-        mtspr   SPRN_XER,r6
-        ld      r7,_DAR(r1)
-        mtdar   r7
-        ld      r8,_DSISR(r1)
-        mtdsisr r8
-        ld      r9,_SRR0(r1)
-        mtsrr0  r9
-        ld      r10,_SRR1(r1)
-        mtsrr1  r10
         
         addi    r1,r1,PROM_FRAME_SIZE
         ld      r0,16(r1)