diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-12-29 18:10:18 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-12-29 18:10:18 +0000 |
| commit | c3fdb77601d94cb163844b92e7a89c70e28dc2ae (patch) | |
| tree | 1566bc11f619246bededb852c486403851401c38 /sys/arch | |
| parent | a7da0ea7b17a1ffea64fe1ef52117a4718917498 (diff) | |
Bus clock doesn't matter on the Xeon 3600/5600 and Xeon 6500/7500, so don't
print the "can't get bus clock" message. While there, adjust comments for
the i3/i5/i7 CPUs and include the relevant Xeon models. The Intel marketing
people seem to have less influence on the Xeon names, so they describe the
CPU generation much better.
ok marco@, deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/est.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/est.c b/sys/arch/amd64/amd64/est.c index b7a166d64d4..7ac4af733b7 100644 --- a/sys/arch/amd64/amd64/est.c +++ b/sys/arch/amd64/amd64/est.c @@ -1,4 +1,4 @@ -/* $OpenBSD: est.c,v 1.21 2010/07/05 22:47:41 jsg Exp $ */ +/* $OpenBSD: est.c,v 1.22 2010/12/29 18:10:17 kettenis Exp $ */ /* * Copyright (c) 2003 Michael Eriksson. * All rights reserved. @@ -216,9 +216,11 @@ p3_get_bus_clock(struct cpu_info *ci) break; } break; - case 0x1a: /* Core i7 */ - case 0x1e: /* Core i5 */ - case 0x25: /* Core i3 */ + case 0x1a: /* Core i7, Xeon 3500/5500 */ + case 0x1e: /* Core i5/i7, Xeon 3400 */ + case 0x25: /* Core i3/i5, Xeon 3400 */ + case 0x2c: /* Core i7, Xeon 3600/5600 */ + case 0x2e: /* Xeon 6500/7500 */ break; default: printf("%s: unknown i686 model 0x%x, can't get bus clock\n", diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index fd7453aa2ae..c9009d61036 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.485 2010/10/02 23:31:34 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.486 2010/12/29 18:10:17 kettenis Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2101,9 +2101,11 @@ p3_get_bus_clock(struct cpu_info *ci) goto print_msr; } break; - case 0x1a: /* Core i7 */ - case 0x1e: /* Core i5 */ - case 0x25: /* Core i3 */ + case 0x1a: /* Core i7, Xeon 3500/5500 */ + case 0x1e: /* Core i5/i7, Xeon 3400 */ + case 0x25: /* Core i3/i5, Xeon 3400 */ + case 0x2c: /* Core i7, Xeon 3600/5600 */ + case 0x2e: /* Xeon 6500/7500 */ break; default: printf("%s: unknown i686 model 0x%x, can't get bus clock", |