From owner-svn-src-head@FreeBSD.ORG  Fri Nov 12 20:26:35 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 25E7310656A3;
	Fri, 12 Nov 2010 20:26:35 +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 13DA18FC20;
	Fri, 12 Nov 2010 20:26:35 +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 oACKQYRT022375;
	Fri, 12 Nov 2010 20:26:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACKQYwf022373;
	Fri, 12 Nov 2010 20:26:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201011122026.oACKQYwf022373@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 12 Nov 2010 20:26:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215197 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2010 20:26:35 -0000

Author: nwhitehorn
Date: Fri Nov 12 20:26:34 2010
New Revision: 215197
URL: http://svn.freebsd.org/changeset/base/215197

Log:
  Partially revert r215182. There appears to be a silicon bug on the 970
  that causes AP bringup to fail if some of the Cell HID-register code
  is anywhere in the instruction stream. Pending a better solution, cache
  performance on SMP Cell systems running without a hypervisor will be
  suboptimal.

Modified:
  head/sys/powerpc/aim/mp_cpudep.c

Modified: head/sys/powerpc/aim/mp_cpudep.c
==============================================================================
--- head/sys/powerpc/aim/mp_cpudep.c	Fri Nov 12 20:01:53 2010	(r215196)
+++ head/sys/powerpc/aim/mp_cpudep.c	Fri Nov 12 20:26:34 2010	(r215197)
@@ -228,8 +228,8 @@ cpudep_save_config(void *dummy)
 		powerpc_sync();
 
 		break;
-#ifdef __powerpc64__
 	case IBMCELLBE:
+		#ifdef NOTYET /* Causes problems if in instruction stream on 970 */
 		if (mfmsr() & PSL_HV) {
 			bsp_state[0] = mfspr(SPR_HID0);
 			bsp_state[1] = mfspr(SPR_HID1);
@@ -238,11 +238,11 @@ cpudep_save_config(void *dummy)
 
 			bsp_state[4] = mfspr(SPR_CELL_TSCR);
 		}
+		#endif
 
 		bsp_state[5] = mfspr(SPR_CELL_TSRL);
 
 		break;
-#endif
 	case MPC7450:
 	case MPC7455:
 	case MPC7457:
@@ -303,8 +303,8 @@ cpudep_ap_setup()
 
 		powerpc_sync();
 		break;
-#ifdef __powerpc64__
 	case IBMCELLBE:
+		#ifdef NOTYET /* Causes problems if in instruction stream on 970 */
 		if (mfmsr() & PSL_HV) {
 			mtspr(SPR_HID0, bsp_state[0]);
 			mtspr(SPR_HID1, bsp_state[1]);
@@ -313,11 +313,11 @@ cpudep_ap_setup()
 
 			mtspr(SPR_CELL_TSCR, bsp_state[4]);
 		}
+		#endif
 
 		mtspr(SPR_CELL_TSRL, bsp_state[5]);
 
 		break;
-#endif
 	case MPC7450:
 	case MPC7455:
 	case MPC7457: