From owner-svn-src-stable-8@FreeBSD.ORG  Sun May 23 02:32:53 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28F27106564A;
	Sun, 23 May 2010 02:32:52 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D573F8FC0A;
	Sun, 23 May 2010 02:32:52 +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 o4N2WqU6041574;
	Sun, 23 May 2010 02:32:52 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4N2Wq60041572;
	Sun, 23 May 2010 02:32:52 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201005230232.o4N2Wq60041572@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 23 May 2010 02:32:52 +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: r208430 - stable/8/sys/powerpc/powermac
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 May 2010 02:32:53 -0000

Author: nwhitehorn
Date: Sun May 23 02:32:52 2010
New Revision: 208430
URL: http://svn.freebsd.org/changeset/base/208430

Log:
  MFC r208167:
  
  Enable smu(4) to report fan speeds on late-model Powermac G5s.

Modified:
  stable/8/sys/powerpc/powermac/smu.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)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/powerpc/powermac/smu.c
==============================================================================
--- stable/8/sys/powerpc/powermac/smu.c	Sun May 23 02:31:37 2010	(r208429)
+++ stable/8/sys/powerpc/powermac/smu.c	Sun May 23 02:32:52 2010	(r208430)
@@ -643,14 +643,34 @@ static int
 smu_fan_read_rpm(device_t smu, struct smu_fan *fan)
 {
 	struct smu_cmd cmd;
+	int rpm, error;
 
-	cmd.cmd = SMU_FAN;
-	cmd.len = 1;
-	cmd.data[0] = 1;
+	if (!fan->old_style) {
+		cmd.cmd = SMU_FAN;
+		cmd.len = 2;
+		cmd.data[0] = 0x31;
+		cmd.data[1] = fan->reg;
+
+		error = smu_run_cmd(smu, &cmd, 1);
+		if (error)
+			fan->old_style = 1;
+
+		rpm = (cmd.data[0] << 8) | cmd.data[1];
+	}
 
-	smu_run_cmd(smu, &cmd, 1);
+	if (fan->old_style) {
+		cmd.cmd = SMU_FAN;
+		cmd.len = 1;
+		cmd.data[0] = 1;
+
+		error = smu_run_cmd(smu, &cmd, 1);
+		if (error)
+			return (error);
 
-	return ((cmd.data[fan->reg*2+1] << 8) | cmd.data[fan->reg*2+2]);
+		rpm = (cmd.data[fan->reg*2+1] << 8) | cmd.data[fan->reg*2+2];
+	}
+
+	return (rpm);
 }
 
 static int
@@ -666,6 +686,9 @@ smu_fanrpm_sysctl(SYSCTL_HANDLER_ARGS)
 	fan = &sc->sc_fans[arg2];
 
 	rpm = smu_fan_read_rpm(smu, fan);
+	if (rpm < 0)
+		return (rpm);
+
 	error = sysctl_handle_int(oidp, &rpm, 0, req);
 
 	if (error || !req->newptr)