Module Name: src
Committed By: msaitoh
Date: Thu Jul 2 05:11:50 UTC 2015
Modified Files:
src/sys/arch/x86/x86: intel_busclock.c
Log Message:
Fix bus clock for Airmont from the latest Intel SDM.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/intel_busclock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/intel_busclock.c
diff -u src/sys/arch/x86/x86/intel_busclock.c:1.23 src/sys/arch/x86/x86/intel_busclock.c:1.24
--- src/sys/arch/x86/x86/intel_busclock.c:1.23 Wed May 27 00:08:50 2015
+++ src/sys/arch/x86/x86/intel_busclock.c Thu Jul 2 05:11:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_busclock.c,v 1.23 2015/05/27 00:08:50 msaitoh Exp $ */
+/* $NetBSD: intel_busclock.c,v 1.24 2015/07/02 05:11:50 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.23 2015/05/27 00:08:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.24 2015/07/02 05:11:50 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -276,7 +276,7 @@ p3_get_bus_clock(struct cpu_info *ci)
"unable to determine bus speed");
goto print_msr;
}
- bus = (msr >> 0) & 0x1f;
+ bus = (msr >> 0) & 0x0f;
switch (bus) {
case 0:
bus_clock = 8333;
@@ -288,33 +288,21 @@ p3_get_bus_clock(struct cpu_info *ci)
bus_clock = 13333;
break;
case 3:
- bus_clock = 11650;
- break;
- case 4:
- bus_clock = 8333;
- break;
- case 5:
- bus_clock = 10000;
- break;
- case 6:
- bus_clock = 13333;
- break;
- case 7:
bus_clock = 11666;
break;
- case 12:
+ case 4:
bus_clock = 8000;
break;
- case 13:
+ case 5:
bus_clock = 9333;
break;
- case 14:
+ case 6:
bus_clock = 9000;
break;
- case 15:
+ case 7:
bus_clock = 8888;
break;
- case 20:
+ case 8:
bus_clock = 8750;
break;
default:
