1 files changed, 9 insertions, 3 deletions

diff --git a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S
index 468721d9ebd2..ba396438ede3 100644
--- a/arch/ppc/kernel/cpu_setup_6xx.S
+++ b/arch/ppc/kernel/cpu_setup_6xx.S
@@ -12,10 +12,9 @@
 #include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/page.h>
-#include <asm/ppc_asm.h>
 #include <asm/cputable.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cache.h>
 
 _GLOBAL(__setup_cpu_601)
@@ -249,8 +248,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_NO_DPM)
         sync
         isync
 
-        /* Enable L2 HW prefetch
+        /* Enable L2 HW prefetch, if L2 is enabled
          */
+        mfspr   r3,SPRN_L2CR
+        andis.  r3,r3,L2CR_L2E@h
+        beqlr
         mfspr   r3,SPRN_MSSCR0
         ori     r3,r3,3
         sync
@@ -324,6 +326,7 @@ _GLOBAL(__save_cpu_setup)
         cmplwi  cr4,r3,0x8002   /* 7457 */
         cmplwi  cr5,r3,0x8003   /* 7447A */
         cmplwi  cr6,r3,0x7000   /* 750FX */
+        cmplwi  cr7,r3,0x8004   /* 7448 */
         /* cr1 is 7400 || 7410 */
         cror    4*cr1+eq,4*cr1+eq,4*cr2+eq
         /* cr0 is 74xx */
@@ -331,6 +334,7 @@ _GLOBAL(__save_cpu_setup)
         cror    4*cr0+eq,4*cr0+eq,4*cr4+eq
         cror    4*cr0+eq,4*cr0+eq,4*cr1+eq
         cror    4*cr0+eq,4*cr0+eq,4*cr5+eq
+        cror    4*cr0+eq,4*cr0+eq,4*cr7+eq
         bne     1f
         /* Backup 74xx specific regs */
         mfspr   r4,SPRN_MSSCR0
@@ -393,6 +397,7 @@ _GLOBAL(__restore_cpu_setup)
         cmplwi  cr4,r3,0x8002   /* 7457 */
         cmplwi  cr5,r3,0x8003   /* 7447A */
         cmplwi  cr6,r3,0x7000   /* 750FX */
+        cmplwi  cr7,r3,0x8004   /* 7448 */
         /* cr1 is 7400 || 7410 */
         cror    4*cr1+eq,4*cr1+eq,4*cr2+eq
         /* cr0 is 74xx */
@@ -400,6 +405,7 @@ _GLOBAL(__restore_cpu_setup)
         cror    4*cr0+eq,4*cr0+eq,4*cr4+eq
         cror    4*cr0+eq,4*cr0+eq,4*cr1+eq
         cror    4*cr0+eq,4*cr0+eq,4*cr5+eq
+        cror    4*cr0+eq,4*cr0+eq,4*cr7+eq
         bne     2f
         /* Restore 74xx specific regs */
         lwz     r4,CS_MSSCR0(r5)