summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2012-12-08 12:49:01 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2012-12-08 12:49:01 +0000
commiteb18afc7fafab1a66a107ccb41024012c59c9b49 (patch)
treeb8551de79e03d8f2a404ed23b30e5c5deb4a083f /sys/arch/macppc
parent94de1f1d8040cc16b22b094dd387f0168821a237 (diff)
Recognize PowerPC 970 CPUs present in early PowerMac G5 from 2003 (7,2 and
7,3) and let OpenBSD boot on these machines, yay! The 970 are similar to the 970FX except that they are manufactured in 130nm. Fix an issue reported by Andrew Fresh and kirby@ on misc@
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r--sys/arch/macppc/macppc/cpu.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c
index 3a1fa430c54..8908f79d57e 100644
--- a/sys/arch/macppc/macppc/cpu.c
+++ b/sys/arch/macppc/macppc/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.67 2011/05/25 07:42:15 mpi Exp $ */
+/* $OpenBSD: cpu.c,v 1.68 2012/12/08 12:49:00 mpi Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -208,6 +208,7 @@ ppc_check_procid()
cpu = pvr >> 16;
switch (cpu) {
+ case PPC_CPU_IBM970:
case PPC_CPU_IBM970FX:
case PPC_CPU_IBM970MP:
ppc_proc_is_64b = 1;
@@ -282,6 +283,10 @@ cpuattach(struct device *parent, struct device *dev, void *aux)
ppc_altivec = 1;
snprintf(cpu_model, sizeof(cpu_model), "7447A");
break;
+ case PPC_CPU_IBM970:
+ ppc_altivec = 1;
+ snprintf(cpu_model, sizeof(cpu_model), "970");
+ break;
case PPC_CPU_IBM970FX:
ppc_altivec = 1;
snprintf(cpu_model, sizeof(cpu_model), "970FX");
@@ -394,6 +399,7 @@ cpuattach(struct device *parent, struct device *dev, void *aux)
if (cpu == PPC_CPU_MPC7450 && (pvr & 0xffff) < 0x0200)
hid0 &= ~HID0_BTIC;
break;
+ case PPC_CPU_IBM970:
case PPC_CPU_IBM970FX:
/* select NAP mode */
hid0 &= ~(HID0_NAP | HID0_DOZE | HID0_SLEEP);