From owner-svn-src-stable@FreeBSD.ORG  Thu May 19 17:24:54 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3DF5B1065675;
	Thu, 19 May 2011 17:24:54 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D3BE8FC21;
	Thu, 19 May 2011 17:24:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4JHOs5q046710;
	Thu, 19 May 2011 17:24:54 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4JHOsmg046708;
	Thu, 19 May 2011 17:24:54 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201105191724.p4JHOsmg046708@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 19 May 2011 17:24:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222101 - stable/8/sys/dev/coretemp
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 May 2011 17:24:54 -0000

Author: delphij
Date: Thu May 19 17:24:53 2011
New Revision: 222101
URL: http://svn.freebsd.org/changeset/base/222101

Log:
  MFC r221509:
  
  Detect and set Atom's Tj(max) to 90 if it's not the 45nm D400/D500/N400
  series.

Modified:
  stable/8/sys/dev/coretemp/coretemp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/coretemp/coretemp.c
==============================================================================
--- stable/8/sys/dev/coretemp/coretemp.c	Thu May 19 17:22:48 2011	(r222100)
+++ stable/8/sys/dev/coretemp/coretemp.c	Thu May 19 17:24:53 2011	(r222101)
@@ -197,6 +197,15 @@ coretemp_attach(device_t dev)
 		default:	/* Unknown stepping */
 			break;
 		}
+	} else if (cpu_model == 0x1c) {
+		switch (cpu_stepping) {
+		case 0xa:	/* 45nm Atom D400, N400 and D500 series */
+			sc->sc_tjmax = 100;
+			break;
+		default:
+			sc->sc_tjmax = 90;
+			break;
+		}
 	} else {
 		/*
 		 * Attempt to get Tj(max) from MSR IA32_TEMPERATURE_TARGET.