* [PATCH] ppc32: Fix boot with ppc970fx CPU
@ 2004-09-10 6:19 Benjamin Herrenschmidt
0 siblings, 0 replies; only message in thread
From: Benjamin Herrenschmidt @ 2004-09-10 6:19 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linus Torvalds, Linux Kernel list
This patch fixes boot on machines with a 970FX CPU, for PPC 32
bits kernels, please apply.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
===== arch/ppc/kernel/cputable.c 1.26 vs edited =====
--- 1.26/arch/ppc/kernel/cputable.c 2004-08-25 01:30:14 +10:00
+++ edited/arch/ppc/kernel/cputable.c 2004-09-10 13:24:08 +10:00
@@ -445,6 +445,15 @@
128, 128,
__setup_cpu_ppc970
},
+ { /* PPC970FX */
+ 0xffff0000, 0x003c0000, "PPC970FX",
+ CPU_FTR_COMMON |
+ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |
+ CPU_FTR_ALTIVEC_COMP | CPU_FTR_CAN_NAP,
+ COMMON_PPC | PPC_FEATURE_64 | PPC_FEATURE_ALTIVEC_COMP,
+ 128, 128,
+ __setup_cpu_ppc970
+ },
#endif /* CONFIG_POWER4 */
#ifdef CONFIG_8xx
{ /* 8xx */
===== arch/ppc/kernel/cpu_setup_power4.S 1.2 vs edited =====
--- 1.2/arch/ppc/kernel/cpu_setup_power4.S 2004-05-04 14:34:46 +10:00
+++ edited/arch/ppc/kernel/cpu_setup_power4.S 2004-09-10 13:24:55 +10:00
@@ -112,7 +112,9 @@
/* We only deal with 970 for now */
mfspr r0,SPRN_PVR
srwi r0,r0,16
- cmpwi r0,0x39
+ cmpwi cr0,r0,0x39
+ cmpwi cr1,r0,0x3c
+ cror 4*cr0+eq,4*cr0+eq,4*cr1+eq
bne 1f
/* Save HID0,1,4 and 5 */
@@ -144,7 +146,9 @@
/* We only deal with 970 for now */
mfspr r0,SPRN_PVR
srwi r0,r0,16
- cmpwi r0,0x39
+ cmpwi cr0,r0,0x39
+ cmpwi cr1,r0,0x3c
+ cror 4*cr0+eq,4*cr0+eq,4*cr1+eq
bne 1f
/* Clear interrupt prefix */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-09-10 6:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-10 6:19 [PATCH] ppc32: Fix boot with ppc970fx CPU Benjamin Herrenschmidt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.