svn commit: r184169 - in head/sys: amd64/amd64 i386/i386

[Jung-uk Kim]

Author: jkim
Date: Wed Oct 22 17:30:37 2008
New Revision: 184169
URL: http://svn.freebsd.org/changeset/base/184169

Log:
  Add AMD Family 0Fh, Model 6Bh, Stepping 2 to the list of invariant TSCs
  and fix i386 test.

Modified:
  head/sys/amd64/amd64/identcpu.c
  head/sys/i386/i386/identcpu.c

Modified: head/sys/amd64/amd64/identcpu.c
==============================================================================
--- head/sys/amd64/amd64/identcpu.c	Wed Oct 22 16:50:12 2008	(r184168)
+++ head/sys/amd64/amd64/identcpu.c	Wed Oct 22 17:30:37 2008	(r184169)
@@ -347,12 +347,17 @@ printcpuinfo(void)
 			    "AuthenticAMD") == 0)
 				cpu_feature &= ~CPUID_HTT;
 
+			/*
+			 * If this CPU supports P-state invariant TSC then
+			 * mention the capability.
+			 */
 			if (!tsc_is_invariant &&
 			    (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
 			    ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
-			    AMD64_CPU_FAMILY(cpu_id) >= 0x10))) {
+			    AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
+			    cpu_id == 0x60fb2))) {
 				tsc_is_invariant = 1;
-				printf("\n  P-state invariant TSC");
+				printf("\n  TSC: P-state invariant");
 			}
 
 			/*

Modified: head/sys/i386/i386/identcpu.c
==============================================================================
--- head/sys/i386/i386/identcpu.c	Wed Oct 22 16:50:12 2008	(r184168)
+++ head/sys/i386/i386/identcpu.c	Wed Oct 22 17:30:37 2008	(r184169)
@@ -841,12 +841,17 @@ printcpuinfo(void)
 			    "AuthenticAMD") == 0)
 				cpu_feature &= ~CPUID_HTT;
 
+			/*
+			 * If this CPU supports P-state invariant TSC then
+			 * mention the capability.
+			 */
 			if (!tsc_is_invariant &&
-			    ((strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
-			    (amd_pminfo & AMDPM_TSC_INVARIANT) != 0) ||
-			    I386_CPU_FAMILY(cpu_id) >= 0x10)) {
+			    (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
+			    ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
+			    AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
+			    cpu_id == 0x60fb2))) {
 				tsc_is_invariant = 1;
-				printf("\n  P-state invariant TSC");
+				printf("\n  TSC: P-state invariant");
 			}
 
 			/*