From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 30 13:54:18 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7F9431065673;
	Fri, 30 Apr 2010 13:54:18 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 70F298FC1F;
	Fri, 30 Apr 2010 13:54:18 +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 o3UDsI10084327;
	Fri, 30 Apr 2010 13:54:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3UDsIO0084325;
	Fri, 30 Apr 2010 13:54:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201004301354.o3UDsIO0084325@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 30 Apr 2010 13:54:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207435 - projects/ppc64/sys/powerpc/cpufreq
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Apr 2010 13:54:18 -0000

Author: nwhitehorn
Date: Fri Apr 30 13:54:18 2010
New Revision: 207435
URL: http://svn.freebsd.org/changeset/base/207435

Log:
  On SMP G5 systems, sometimes the power-mode-data property is only found
  on CPU 0. This fixes cpufreq attach on PowerMac 11,2.

Modified:
  projects/ppc64/sys/powerpc/cpufreq/pcr.c

Modified: projects/ppc64/sys/powerpc/cpufreq/pcr.c
==============================================================================
--- projects/ppc64/sys/powerpc/cpufreq/pcr.c	Fri Apr 30 13:43:20 2010	(r207434)
+++ projects/ppc64/sys/powerpc/cpufreq/pcr.c	Fri Apr 30 13:54:18 2010	(r207435)
@@ -207,6 +207,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