Add identcpu detection for 1-GByte pages

ok mlarkin

4 files changed, 22 insertions, 18 deletions

diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c
index f4ceb6c5588..3bde63ec12f 100644
--- a/sys/arch/amd64/amd64/identcpu.c
+++ b/sys/arch/amd64/amd64/identcpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identcpu.c,v 1.52 2013/11/19 04:12:17 guenther Exp $	*/
+/*	$OpenBSD: identcpu.c,v 1.53 2014/07/03 21:15:28 matthew Exp $	*/
 /*	$NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $	*/
 
 /*
@@ -92,13 +92,14 @@ const struct {
 	{ CPUID_TM,	"TM" },
 	{ CPUID_PBE,	"PBE" }
 }, cpu_ecpuid_features[] = {
-	{ CPUID_MPC,	"MPC" },
-	{ CPUID_NXE,	"NXE" },
-	{ CPUID_MMXX,	"MMXX" },
-	{ CPUID_FFXSR,	"FFXSR" },
-	{ CPUID_LONG,	"LONG" },
-	{ CPUID_3DNOW2,	"3DNOW2" },
-	{ CPUID_3DNOW,	"3DNOW" }
+	{ CPUID_MPC,		"MPC" },
+	{ CPUID_NXE,		"NXE" },
+	{ CPUID_MMXX,		"MMXX" },
+	{ CPUID_FFXSR,		"FFXSR" },
+	{ CPUID_PAGE1GB,	"PAGE1GB" },
+	{ CPUID_LONG,		"LONG" },
+	{ CPUID_3DNOW2,		"3DNOW2" },
+	{ CPUID_3DNOW,		"3DNOW" }
 }, cpu_cpuid_ecxfeatures[] = {
 	{ CPUIDECX_SSE3,	"SSE3" },
 	{ CPUIDECX_PCLMUL,	"PCLMUL" },
diff --git a/sys/arch/amd64/include/specialreg.h b/sys/arch/amd64/include/specialreg.h
index f8ae621d0a8..e8579bc7f4c 100644
--- a/sys/arch/amd64/include/specialreg.h
+++ b/sys/arch/amd64/include/specialreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specialreg.h,v 1.27 2013/08/24 04:26:16 mlarkin Exp $	*/
+/*	$OpenBSD: specialreg.h,v 1.28 2014/07/03 21:15:28 matthew Exp $	*/
 /*	$NetBSD: specialreg.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $	*/
 /*	$NetBSD: x86/specialreg.h,v 1.2 2003/04/25 21:54:30 fvdl Exp $	*/
 
@@ -207,6 +207,7 @@
 #define	CPUID_NXE	0x00100000	/* No-Execute Extension */
 #define	CPUID_MMXX	0x00400000	/* AMD MMX Extensions */
 #define	CPUID_FFXSR	0x02000000	/* fast FP/MMX save/restore */
+#define	CPUID_PAGE1GB	0x04000000	/* 1-GByte pages */
 #define	CPUID_LONG	0x20000000	/* long mode */
 #define	CPUID_3DNOW2	0x40000000	/* 3DNow! Instruction Extension */
 #define	CPUID_3DNOW	0x80000000	/* 3DNow! Instructions */
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 502895f4e36..eb5308023a7 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.539 2014/06/15 11:43:24 sf Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.540 2014/07/03 21:15:28 matthew Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -997,13 +997,14 @@ const struct cpu_cpuid_feature i386_cpuid_features[] = {
 };
 
 const struct cpu_cpuid_feature i386_ecpuid_features[] = {
-	{ CPUID_MPC,	"MPC" },
-	{ CPUID_NXE,	"NXE" },
-	{ CPUID_MMXX,	"MMXX" },
-	{ CPUID_FFXSR,	"FFXSR" },
-	{ CPUID_LONG,	"LONG" },
-	{ CPUID_3DNOW2,	"3DNOW2" },
-	{ CPUID_3DNOW,	"3DNOW" }
+	{ CPUID_MPC,		"MPC" },
+	{ CPUID_NXE,		"NXE" },
+	{ CPUID_MMXX,		"MMXX" },
+	{ CPUID_FFXSR,		"FFXSR" },
+	{ CPUID_PAGE1GB,	"PAGE1GB" },
+	{ CPUID_LONG,		"LONG" },
+	{ CPUID_3DNOW2,		"3DNOW2" },
+	{ CPUID_3DNOW,		"3DNOW" }
 };
 
 const struct cpu_cpuid_feature i386_cpuid_ecxfeatures[] = {
diff --git a/sys/arch/i386/include/specialreg.h b/sys/arch/i386/include/specialreg.h
index 1447eea1186..e145d16c246 100644
--- a/sys/arch/i386/include/specialreg.h
+++ b/sys/arch/i386/include/specialreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specialreg.h,v 1.46 2013/08/24 04:26:16 mlarkin Exp $	*/
+/*	$OpenBSD: specialreg.h,v 1.47 2014/07/03 21:15:28 matthew Exp $	*/
 /*	$NetBSD: specialreg.h,v 1.7 1994/10/27 04:16:26 cgd Exp $	*/
 
 /*-
@@ -206,6 +206,7 @@
 #define	CPUID_NXE	0x00100000	/* No-Execute Extension */
 #define	CPUID_MMXX	0x00400000	/* AMD MMX Extensions */
 #define	CPUID_FFXSR	0x02000000	/* fast FP/MMX save/restore */
+#define	CPUID_PAGE1GB	0x04000000	/* 1-GByte pages */
 #define	CPUID_LONG	0x20000000	/* long mode */
 #define	CPUID_3DNOW2	0x40000000	/* 3DNow! Instruction Extension */
 #define	CPUID_3DNOW	0x80000000	/* 3DNow! Instructions */