From owner-svn-src-projects@FreeBSD.ORG  Sat Nov 21 17:01:39 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0774C1065670;
	Sat, 21 Nov 2009 17:01:39 +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 EAEF58FC16;
	Sat, 21 Nov 2009 17:01:38 +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 nALH1cnc085600;
	Sat, 21 Nov 2009 17:01:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nALH1cAc085597;
	Sat, 21 Nov 2009 17:01:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200911211701.nALH1cAc085597@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 21 Nov 2009 17:01:38 +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: r199639 - in projects/ppc64/sys: powerpc/cpufreq
	powerpc64/conf
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: Sat, 21 Nov 2009 17:01:39 -0000

Author: nwhitehorn
Date: Sat Nov 21 17:01:38 2009
New Revision: 199639
URL: http://svn.freebsd.org/changeset/base/199639

Log:
  Make cpufreq work on powerpc64.

Modified:
  projects/ppc64/sys/powerpc/cpufreq/pcr.c
  projects/ppc64/sys/powerpc64/conf/GENERIC

Modified: projects/ppc64/sys/powerpc/cpufreq/pcr.c
==============================================================================
--- projects/ppc64/sys/powerpc/cpufreq/pcr.c	Sat Nov 21 16:45:55 2009	(r199638)
+++ projects/ppc64/sys/powerpc/cpufreq/pcr.c	Sat Nov 21 17:01:38 2009	(r199639)
@@ -108,15 +108,20 @@ static void
 write_scom(register_t address, uint64_t value)
 {
 	register_t msr;
+	#ifndef __powerpc64__
 	register_t hi, lo, scratch;
-
-	hi = (value >> 32) & 0xffffffff;
-	lo = value & 0xffffffff;
+	#endif
 
 	msr = mfmsr();
 	mtmsr(msr & ~PSL_EE); isync();
 
+	#ifdef __powerpc64__
+	mtspr(SPR_SCOMD, value);
+	#else
+	hi = (value >> 32) & 0xffffffff;
+	lo = value & 0xffffffff;
 	mtspr64(SPR_SCOMD, hi, lo, scratch); 
+	#endif
 	isync();
 	mtspr(SPR_SCOMC, address | SCOMC_WRITE);
 	isync();

Modified: projects/ppc64/sys/powerpc64/conf/GENERIC
==============================================================================
--- projects/ppc64/sys/powerpc64/conf/GENERIC	Sat Nov 21 16:45:55 2009	(r199638)
+++ projects/ppc64/sys/powerpc64/conf/GENERIC	Sat Nov 21 17:01:38 2009	(r199639)
@@ -81,7 +81,7 @@ options 	WITNESS_SKIPSPIN	#Don't run wit
 #options 	SMP			# Symmetric MultiProcessor Kernel
 
 # CPU frequency control
-#device		cpufreq
+device		cpufreq
 
 # Standard busses
 device		pci