From owner-svn-src-all@FreeBSD.ORG  Wed Nov 10 20:28:10 2010
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 B71D1106564A;
	Wed, 10 Nov 2010 20:28:10 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A56398FC08;
	Wed, 10 Nov 2010 20:28:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAAKSAm8036703;
	Wed, 10 Nov 2010 20:28:10 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAAKSA8G036701;
	Wed, 10 Nov 2010 20:28:10 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201011102028.oAAKSA8G036701@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 10 Nov 2010 20:28:10 +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: r215101 - head/sys/powerpc/powerpc
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, 10 Nov 2010 20:28:10 -0000

Author: nwhitehorn
Date: Wed Nov 10 20:28:10 2010
New Revision: 215101
URL: http://svn.freebsd.org/changeset/base/215101

Log:
  Entering deep nap mode on the 970MP requires that both MSR[NAP] and
  MSR[DEEPNAP] be set, not just MSR[DEEPNAP]. Fixing this reduces the idle
  temperature of my CPUs from 57 to 38 degrees and makes one-shot timer
  mode work properly.
  
  Hint from:	mav
  MFC after:	4 days

Modified:
  head/sys/powerpc/powerpc/cpu.c

Modified: head/sys/powerpc/powerpc/cpu.c
==============================================================================
--- head/sys/powerpc/powerpc/cpu.c	Wed Nov 10 20:09:05 2010	(r215100)
+++ head/sys/powerpc/powerpc/cpu.c	Wed Nov 10 20:28:10 2010	(r215101)
@@ -455,8 +455,8 @@ cpu_970_setup(int cpuid, uint16_t vers)
 	/* Configure power-saving mode */
 	switch (vers) {
 	case IBM970MP:
-		hid0_hi |= (HID0_DEEPNAP | HID0_DPM);
-		hid0_hi &= ~(HID0_DOZE | HID0_NAP);
+		hid0_hi |= (HID0_DEEPNAP | HID0_NAP | HID0_DPM);
+		hid0_hi &= ~HID0_DOZE;
 		break;
 	default:
 		hid0_hi |= (HID0_NAP | HID0_DPM);