From owner-svn-src-all@FreeBSD.ORG  Sun May 23 02:16:30 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 5041D1065678;
	Sun, 23 May 2010 02:16:30 +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 3E89A8FC0A;
	Sun, 23 May 2010 02:16:30 +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 o4N2GUqK037725;
	Sun, 23 May 2010 02:16:30 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4N2GUfg037723;
	Sun, 23 May 2010 02:16:30 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201005230216.o4N2GUfg037723@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 23 May 2010 02:16:30 +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: r208426 - stable/8/sys/powerpc/cpufreq
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: Sun, 23 May 2010 02:16:30 -0000

Author: nwhitehorn
Date: Sun May 23 02:16:29 2010
New Revision: 208426
URL: http://svn.freebsd.org/changeset/base/208426

Log:
  MFC r208150:
  
  On SMP G5 systems, sometimes the power-mode-data property is only found
  on CPU 0, so look there if it is not otherwise available.

Modified:
  stable/8/sys/powerpc/cpufreq/pcr.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/cpufreq/pcr.c
==============================================================================
--- stable/8/sys/powerpc/cpufreq/pcr.c	Sun May 23 02:15:31 2010	(r208425)
+++ stable/8/sys/powerpc/cpufreq/pcr.c	Sun May 23 02:16:29 2010	(r208426)
@@ -202,6 +202,11 @@ pcr_attach(device_t dev)
 		return (ENXIO);
 	}
 
+	if (OF_getproplen(cpu, "power-mode-data") <= 0) {
+		/* Use the first CPU's node */
+		cpu = OF_child(OF_parent(cpu));
+	}
+
 	/*
 	 * Collect the PCR values for each mode from the device tree.
 	 * These include bus timing information, and so cannot be