svn commit: r186797 - in head/sys: amd64/amd64 amd64/include i386/cpufreq

[Jung-uk Kim]

Author: jkim
Date: Mon Jan  5 21:51:49 2009
New Revision: 186797
URL: http://svn.freebsd.org/changeset/base/186797

Log:
  Add Centaur/IDT/VIA vendor ID for Nano family, which has long mode support.

Modified:
  head/sys/amd64/amd64/identcpu.c
  head/sys/amd64/include/cputypes.h
  head/sys/amd64/include/specialreg.h
  head/sys/i386/cpufreq/est.c

Modified: head/sys/amd64/amd64/identcpu.c
==============================================================================
--- head/sys/amd64/amd64/identcpu.c	Mon Jan  5 21:00:22 2009	(r186796)
+++ head/sys/amd64/amd64/identcpu.c	Mon Jan  5 21:51:49 2009	(r186797)
@@ -102,6 +102,7 @@ static struct {
 } cpu_vendors[] = {
 	{ INTEL_VENDOR_ID,	CPU_VENDOR_INTEL },	/* GenuineIntel */
 	{ AMD_VENDOR_ID,	CPU_VENDOR_AMD },	/* AuthenticAMD */
+	{ CENTAUR_VENDOR_ID,	CPU_VENDOR_CENTAUR },	/* CentaurHauls */
 };
 
 int cpu_cores;

Modified: head/sys/amd64/include/cputypes.h
==============================================================================
--- head/sys/amd64/include/cputypes.h	Mon Jan  5 21:00:22 2009	(r186796)
+++ head/sys/amd64/include/cputypes.h	Mon Jan  5 21:51:49 2009	(r186797)
@@ -47,7 +47,9 @@
  * Vendors of processor.
  */
 #define	CPU_VENDOR_AMD		0x1022		/* AMD */
+#define	CPU_VENDOR_IDT		0x111d		/* Centaur/IDT/VIA */
 #define	CPU_VENDOR_INTEL	0x8086		/* Intel */
+#define	CPU_VENDOR_CENTAUR	CPU_VENDOR_IDT
 
 #ifndef LOCORE
 extern int	cpu;

Modified: head/sys/amd64/include/specialreg.h
==============================================================================
--- head/sys/amd64/include/specialreg.h	Mon Jan  5 21:00:22 2009	(r186796)
+++ head/sys/amd64/include/specialreg.h	Mon Jan  5 21:51:49 2009	(r186797)
@@ -205,6 +205,7 @@
  * CPUID manufacturers identifiers
  */
 #define	AMD_VENDOR_ID		"AuthenticAMD"
+#define	CENTAUR_VENDOR_ID	"CentaurHauls"
 #define	INTEL_VENDOR_ID		"GenuineIntel"
 
 /*

Modified: head/sys/i386/cpufreq/est.c
==============================================================================
--- head/sys/i386/cpufreq/est.c	Mon Jan  5 21:00:22 2009	(r186796)
+++ head/sys/i386/cpufreq/est.c	Mon Jan  5 21:51:49 2009	(r186797)
@@ -55,10 +55,6 @@ __FBSDID("$FreeBSD$");
 #define MSR_MISC_ENABLE		0x1a0
 #define MSR_SS_ENABLE		(1<<16)
 
-#ifndef CPU_VENDOR_CENTAUR
-#define	CPU_VENDOR_CENTAUR	0x111d
-#endif
-
 /* Frequency and MSR control values. */
 typedef struct {
 	uint16_t	freq;