Module Name: src
Committed By: bouyer
Date: Wed Jun 19 07:44:42 UTC 2013
Modified Files:
src/sys/arch/x86/include [netbsd-5]: mtrr.h specialreg.h
src/sys/arch/x86/x86 [netbsd-5]: mtrr_i686.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1847):
sys/arch/x86/include/mtrr.h: revision 1.5
sys/arch/x86/x86/mtrr_i686.c: revision 1.25
sys/arch/x86/include/specialreg.h: revision 1.55
Increase MTRR_I686_NVAR_MAX from 8 to 16. Avoids
"FIXME: more than 8 MTRRs (10)" message on booting Thinkpad W520 and
similar. While here replace a magic number with MTRR_I686_NVAR_MAX * 2
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/arch/x86/include/mtrr.h
cvs rdiff -u -r1.31.4.2 -r1.31.4.3 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.19.4.1 -r1.19.4.2 src/sys/arch/x86/x86/mtrr_i686.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/include/mtrr.h
diff -u src/sys/arch/x86/include/mtrr.h:1.4 src/sys/arch/x86/include/mtrr.h:1.4.6.1
--- src/sys/arch/x86/include/mtrr.h:1.4 Tue Jul 1 15:27:34 2008
+++ src/sys/arch/x86/include/mtrr.h Wed Jun 19 07:44:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrr.h,v 1.4 2008/07/01 15:27:34 mrg Exp $ */
+/* $NetBSD: mtrr.h,v 1.4.6.1 2013/06/19 07:44:42 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define MTRR_I686_FIXED_IDX16K 1
#define MTRR_I686_FIXED_IDX4K 3
-#define MTRR_I686_NVAR_MAX 8 /* could be upto 255? */
+#define MTRR_I686_NVAR_MAX 16 /* could be upto 255? */
#define MTRR_I686_64K_START 0x00000
#define MTRR_I686_16K_START 0x80000
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.31.4.2 src/sys/arch/x86/include/specialreg.h:1.31.4.3
--- src/sys/arch/x86/include/specialreg.h:1.31.4.2 Wed Nov 28 04:39:03 2012
+++ src/sys/arch/x86/include/specialreg.h Wed Jun 19 07:44:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.31.4.2 2012/11/28 04:39:03 riz Exp $ */
+/* $NetBSD: specialreg.h,v 1.31.4.3 2013/06/19 07:44:42 bouyer Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -314,6 +314,22 @@
#define MSR_MTRRphysMask6 0x20d
#define MSR_MTRRphysBase7 0x20e
#define MSR_MTRRphysMask7 0x20f
+#define MSR_MTRRphysBase8 0x210
+#define MSR_MTRRphysMask8 0x211
+#define MSR_MTRRphysBase9 0x212
+#define MSR_MTRRphysMask9 0x213
+#define MSR_MTRRphysBase10 0x214
+#define MSR_MTRRphysMask10 0x215
+#define MSR_MTRRphysBase11 0x216
+#define MSR_MTRRphysMask11 0x217
+#define MSR_MTRRphysBase12 0x218
+#define MSR_MTRRphysMask12 0x219
+#define MSR_MTRRphysBase13 0x21a
+#define MSR_MTRRphysMask13 0x21b
+#define MSR_MTRRphysBase14 0x21c
+#define MSR_MTRRphysMask14 0x21d
+#define MSR_MTRRphysBase15 0x21e
+#define MSR_MTRRphysMask15 0x21f
#define MSR_MTRRfix64K_00000 0x250
#define MSR_MTRRfix16K_80000 0x258
#define MSR_MTRRfix16K_A0000 0x259
Index: src/sys/arch/x86/x86/mtrr_i686.c
diff -u src/sys/arch/x86/x86/mtrr_i686.c:1.19.4.1 src/sys/arch/x86/x86/mtrr_i686.c:1.19.4.2
--- src/sys/arch/x86/x86/mtrr_i686.c:1.19.4.1 Wed Feb 16 20:54:13 2011
+++ src/sys/arch/x86/x86/mtrr_i686.c Wed Jun 19 07:44:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrr_i686.c,v 1.19.4.1 2011/02/16 20:54:13 bouyer Exp $ */
+/* $NetBSD: mtrr_i686.c,v 1.19.4.2 2013/06/19 07:44:42 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtrr_i686.c,v 1.19.4.1 2011/02/16 20:54:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtrr_i686.c,v 1.19.4.2 2013/06/19 07:44:42 bouyer Exp $");
#include "opt_multiprocessor.h"
@@ -84,6 +84,22 @@ mtrr_raw[] = {
{ MSR_MTRRphysMask6, 0 },
{ MSR_MTRRphysBase7, 0 },
{ MSR_MTRRphysMask7, 0 },
+ { MSR_MTRRphysBase8, 0 },
+ { MSR_MTRRphysMask8, 0 },
+ { MSR_MTRRphysBase9, 0 },
+ { MSR_MTRRphysMask9, 0 },
+ { MSR_MTRRphysBase10, 0 },
+ { MSR_MTRRphysMask10, 0 },
+ { MSR_MTRRphysBase11, 0 },
+ { MSR_MTRRphysMask11, 0 },
+ { MSR_MTRRphysBase12, 0 },
+ { MSR_MTRRphysMask12, 0 },
+ { MSR_MTRRphysBase13, 0 },
+ { MSR_MTRRphysMask13, 0 },
+ { MSR_MTRRphysBase14, 0 },
+ { MSR_MTRRphysMask14, 0 },
+ { MSR_MTRRphysBase15, 0 },
+ { MSR_MTRRphysMask15, 0 },
{ MSR_MTRRfix64K_00000, 0 },
{ MSR_MTRRfix16K_80000, 0 },
{ MSR_MTRRfix16K_A0000, 0 },
@@ -306,8 +322,8 @@ i686_mtrr_init_first(void)
MTRR_I686_NVAR_MAX);
else if (i686_mtrr_vcnt < MTRR_I686_NVAR_MAX) {
for (i = MTRR_I686_NVAR_MAX - i686_mtrr_vcnt; i; i--) {
- mtrr_raw[16 - (i*2)].msraddr = 0;
- mtrr_raw[17 - (i*2)].msraddr = 0;
+ mtrr_raw[(MTRR_I686_NVAR_MAX - i) * 2].msraddr = 0;
+ mtrr_raw[(MTRR_I686_NVAR_MAX - i) * 2 + 1].msraddr = 0;
}
}
