Module Name: src
Committed By: msaitoh
Date: Thu Nov 7 18:17:13 UTC 2013
Modified Files:
src/sys/arch/x86/x86: intel_busclock.c
Log Message:
Get bus clock for some Atom processors.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/arch/x86/x86/intel_busclock.c:1.14
--- src/sys/arch/x86/x86/intel_busclock.c:1.13 Sat Sep 24 10:49:13 2011
+++ src/sys/arch/x86/x86/intel_busclock.c Thu Nov 7 18:17:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_busclock.c,v 1.13 2011/09/24 10:49:13 jym Exp $ */
+/* $NetBSD: intel_busclock.c,v 1.14 2013/11/07 18:17:13 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.13 2011/09/24 10:49:13 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.14 2013/11/07 18:17:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -213,6 +213,66 @@ p3_get_bus_clock(struct cpu_info *ci)
goto print_msr;
}
break;
+ case 0x1c: /* Atom */
+ case 0x26:
+ case 0x27:
+ case 0x35:
+ case 0x36:
+ if (rdmsr_safe(MSR_FSB_FREQ, &msr) == EFAULT) {
+ aprint_debug_dev(ci->ci_dev,
+ "unable to determine bus speed");
+ goto print_msr;
+ }
+ bus = (msr >> 0) & 0x7;
+ switch (bus) {
+ case 7:
+ bus_clock = 8333;
+ break;
+ case 5:
+ bus_clock = 10000;
+ break;
+ case 1:
+ bus_clock = 13333;
+ break;
+ case 3:
+ bus_clock = 16667;
+ break;
+ default:
+ aprint_debug("%s: unknown Atom FSB_FREQ value %d",
+ device_xname(ci->ci_dev), bus);
+ goto print_msr;
+ }
+ break;
+ case 0x37: /* Silvermont */
+ case 0x4d:
+ if (rdmsr_safe(MSR_FSB_FREQ, &msr) == EFAULT) {
+ aprint_debug_dev(ci->ci_dev,
+ "unable to determine bus speed");
+ goto print_msr;
+ }
+ bus = (msr >> 0) & 0x7;
+ switch (bus) {
+ case 4:
+ bus_clock = 8000;
+ break;
+ case 0:
+ bus_clock = 8333;
+ break;
+ case 1:
+ bus_clock = 10000;
+ break;
+ case 2:
+ bus_clock = 13333;
+ break;
+ case 3:
+ bus_clock = 16667;
+ break;
+ default:
+ aprint_debug("%s: unknown Silvermont FSB_FREQ value %d",
+ device_xname(ci->ci_dev), bus);
+ goto print_msr;
+ }
+ break;
default:
aprint_debug("%s: unknown i686 model %d, can't get bus clock",
device_xname(ci->ci_dev),
