From 03c7d1193db9d2be84b3bda312af139ce6fa0b2e Mon Sep 17 00:00:00 2001
From: Dariusz Swiderski <dms@cvs.openbsd.org>
Date: Mon, 27 Jul 2009 11:28:56 +0000
Subject: add bus speed recognition on Nehalem based cpus, this makes Enhanced
 SpeedStep work on new machines, but requires acpimadt0 to be enabled.

ok by jsg@ and claudio@
---
 sys/arch/amd64/amd64/est.c   | 5 ++++-
 sys/arch/i386/i386/machdep.c | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/amd64/amd64/est.c b/sys/arch/amd64/amd64/est.c
index 6eed7d27070..b1a3bee44d9 100644
--- a/sys/arch/amd64/amd64/est.c
+++ b/sys/arch/amd64/amd64/est.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: est.c,v 1.13 2009/06/08 23:18:05 gwk Exp $ */
+/*	$OpenBSD: est.c,v 1.14 2009/07/27 11:28:55 dms Exp $ */
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.
@@ -196,6 +196,9 @@ p3_get_bus_clock(struct cpu_info *ci)
 			break;
 		}
 		break;
+       case 0x1a: /* Nehalem based Core i7 and Xeon */
+               bus_clock = BUS133; 
+               break;
 	case 0x1c: /* Atom */
 		msr = rdmsr(MSR_FSB_FREQ);
 		bus = (msr >> 0) & 0x7;
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 2969cc3413c..ea65c0cd522 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.453 2009/06/15 17:01:26 beck Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.454 2009/07/27 11:28:55 dms Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -2021,6 +2021,9 @@ p3_get_bus_clock(struct cpu_info *ci)
 			goto print_msr;
 		}
 		break;
+       case 0x1a: /* Nehalem based Core i7 and Xeon */
+               bus_clock = BUS133;
+               break;
 	case 0x1c: /* Atom */
 		msr = rdmsr(MSR_FSB_FREQ);
 		bus = (msr >> 0) & 0x7;
-- 
cgit v1.2.3