From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 16:12:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 282CC106567B; Tue,  9 Dec 2008 16:12:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DFF801065675
	for <perforce@freebsd.org>; Tue,  9 Dec 2008 16:12:10 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CF45F8FC17
	for <perforce@freebsd.org>; Tue,  9 Dec 2008 16:12:10 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9GCAlJ076899
	for <perforce@freebsd.org>; Tue, 9 Dec 2008 16:12:10 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9GCAPs076893
	for perforce@freebsd.org; Tue, 9 Dec 2008 16:12:10 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Tue, 9 Dec 2008 16:12:10 GMT
Message-Id: <200812091612.mB9GCAPs076893@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154400 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Dec 2008 16:12:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=154400

Change 154400 by nwhitehorn@nwhitehorn_trantor on 2008/12/09 16:11:49

	We don't do anything useful with HID0 on G5 systems, so ignore it.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#4 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#4 (text+ko) ====

@@ -93,6 +93,8 @@
         { "IBM PowerPC 750FX",		IBM750FX,	REVFMT_MAJMIN },
         { "IBM PowerPC 970",		IBM970,		REVFMT_MAJMIN },
         { "IBM PowerPC 970FX",		IBM970FX,	REVFMT_MAJMIN },
+        { "IBM PowerPC 970GX",		IBM970GX,	REVFMT_MAJMIN },
+        { "IBM PowerPC 970MP",		IBM970MP,	REVFMT_MAJMIN },
         { "Motorola PowerPC 7400",	MPC7400,	REVFMT_MAJMIN },
         { "Motorola PowerPC 7410",	MPC7410,	REVFMT_MAJMIN },
         { "Motorola PowerPC 7450",	MPC7450,	REVFMT_MAJMIN },
@@ -118,7 +120,7 @@
 void
 cpu_setup(u_int cpuid)
 {
-	u_int		pvr, maj, min, msr, hid0, hid0lower;
+	u_int		pvr, maj, min, msr, hid0;
 	uint16_t	vers, rev, revfmt;
 	const struct	cputab *cp;
 	const char	*name;
@@ -170,26 +172,6 @@
 	}
 
 	/*
-	 * Read HID0. On 64-bit machines, the bits we care about
-	 * are (irritatingly) in the upper word of the register.
-	 */
-
-	if (ppc64) {
-		hid0 = mfspr64upper(SPR_HID0,msr);
-		hid0lower = mfspr(SPR_HID0);
-	} else {
-		hid0 = mfspr(SPR_HID0);
-		hid0lower = 0;
-	}
-
-	/*
-	 * Set PMC granularity for 64 bit systems (architectural).
-	 */
-
-	if (ppc64)
-		hid0 &= ~HID0_TG;
-
-	/*
 	 * Configure power-saving mode.
 	 */
 	switch (vers) {
@@ -251,11 +233,6 @@
 			break;
 	}
 
-	if (ppc64)
-		mtspr64(SPR_HID0, hid0, hid0lower, msr);
-	else
-		mtspr(SPR_HID0, hid0);
-
 	switch (vers) {
 		case MPC7447A:
 		case MPC7448: