[src/trunk]: src/sys/arch/x86/x86 Fix bus clock for Airmont from the latest I...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7783cc3dafc1
branches:  trunk
changeset: 809322:7783cc3dafc1
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jul 02 05:11:50 2015 +0000

description:
Fix bus clock for Airmont from the latest Intel SDM.

diffstat:

 sys/arch/x86/x86/intel_busclock.c |  28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diffs (66 lines):

diff -r 09cbde61c01b -r 7783cc3dafc1 sys/arch/x86/x86/intel_busclock.c
--- a/sys/arch/x86/x86/intel_busclock.c Thu Jul 02 03:50:21 2015 +0000
+++ b/sys/arch/x86/x86/intel_busclock.c Thu Jul 02 05:11:50 2015 +0000
@@ -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 @@
                            "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 @@
                        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: