From owner-svn-src-all@FreeBSD.ORG  Wed Oct 22 17:30:38 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 419B11065673;
	Wed, 22 Oct 2008 17:30:38 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2FD128FC16;
	Wed, 22 Oct 2008 17:30:38 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9MHUcPX034509;
	Wed, 22 Oct 2008 17:30:38 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9MHUc0R034507;
	Wed, 22 Oct 2008 17:30:38 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200810221730.m9MHUc0R034507@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 22 Oct 2008 17:30:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184169 - in head/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Oct 2008 17:30:38 -0000

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");
 			}
 
 			/*