From owner-svn-src-all@FreeBSD.ORG  Mon Sep 19 10:58:31 2011
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 37E99106567C;
	Mon, 19 Sep 2011 10:58:31 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2735C8FC17;
	Mon, 19 Sep 2011 10:58:31 +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 p8JAwVC6076947;
	Mon, 19 Sep 2011 10:58:31 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8JAwVv2076945;
	Mon, 19 Sep 2011 10:58:31 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201109191058.p8JAwVv2076945@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 19 Sep 2011 10:58:31 +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: r225662 - head/sys/dev/coretemp
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: Mon, 19 Sep 2011 10:58:31 -0000

Author: attilio
Date: Mon Sep 19 10:58:30 2011
New Revision: 225662
URL: http://svn.freebsd.org/changeset/base/225662

Log:
  #PROCHOT assertion is sticky after reading the MSR (accordingly with
  Intel manuals) it must be cleared by writing a 0.
  Fix that.
  
  Sponsored by:	Sandvine Incorporated
  Reported by:	rstone
  Reviewed by:	delphij, emaste, rstone
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/sys/dev/coretemp/coretemp.c

Modified: head/sys/dev/coretemp/coretemp.c
==============================================================================
--- head/sys/dev/coretemp/coretemp.c	Mon Sep 19 10:28:59 2011	(r225661)
+++ head/sys/dev/coretemp/coretemp.c	Mon Sep 19 10:58:30 2011	(r225662)
@@ -384,6 +384,7 @@ coretemp_get_val_sysctl(SYSCTL_HANDLER_A
 	}
 
 	if (msr & THERM_STATUS_LOG) {
+		coretemp_clear_thermal_msr(device_get_unit(dev));
 		sc->sc_throttle_log = 1;
 
 		/*
@@ -424,8 +425,10 @@ coretemp_throttle_log_sysctl(SYSCTL_HAND
 	msr = coretemp_get_thermal_msr(device_get_unit(dev));
 	sc = device_get_softc(dev);
 
-	if (msr & THERM_STATUS_LOG)
+	if (msr & THERM_STATUS_LOG) {
+		coretemp_clear_thermal_msr(device_get_unit(dev));
 		sc->sc_throttle_log = 1;
+	}
 
 	val = sc->sc_throttle_log;