Module Name:    src
Committed By:   msaitoh
Date:           Wed May 27 00:08:50 UTC 2015

Modified Files:
        src/sys/arch/x86/x86: intel_busclock.c

Log Message:
Add new bus clock for Airmont.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 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.22 src/sys/arch/x86/x86/intel_busclock.c:1.23
--- src/sys/arch/x86/x86/intel_busclock.c:1.22	Tue May 26 16:08:01 2015
+++ src/sys/arch/x86/x86/intel_busclock.c	Wed May 27 00:08:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_busclock.c,v 1.22 2015/05/26 16:08:01 msaitoh Exp $	*/
+/*	$NetBSD: intel_busclock.c,v 1.23 2015/05/27 00:08: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.22 2015/05/26 16:08:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.23 2015/05/27 00:08: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) & 0xf;
+		bus = (msr >> 0) & 0x1f;
 		switch (bus) {
 		case 0:
 			bus_clock =  8333;
@@ -314,6 +314,9 @@ p3_get_bus_clock(struct cpu_info *ci)
 		case 15:
 			bus_clock =  8888;
 			break;
+		case 20:
+			bus_clock =  8750;
+			break;
 		default:
 			aprint_debug("%s: unknown Airmont FSB_FREQ value %d",
 			    device_xname(ci->ci_dev), bus);

Reply via email to