From owner-svn-src-all@FreeBSD.ORG  Tue Aug 21 06:34:21 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D54EE106564A;
	Tue, 21 Aug 2012 06:34:21 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BFF078FC15;
	Tue, 21 Aug 2012 06:34:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7L6YLoL079171;
	Tue, 21 Aug 2012 06:34:21 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7L6YL5C079168;
	Tue, 21 Aug 2012 06:34:21 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201208210634.q7L6YL5C079168@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 21 Aug 2012 06:34:21 +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: r239480 - in head/sys/powerpc: aim include
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: Tue, 21 Aug 2012 06:34:21 -0000

Author: adrian
Date: Tue Aug 21 06:34:21 2012
New Revision: 239480
URL: http://svn.freebsd.org/changeset/base/239480

Log:
  On Nintendo Wii CPUs, the mdp value will be garbage.  Set it to NULL
  so as to not confuse things.
  
  Submitted by:	Margarida Gouveia

Modified:
  head/sys/powerpc/aim/machdep.c
  head/sys/powerpc/include/spr.h

Modified: head/sys/powerpc/aim/machdep.c
==============================================================================
--- head/sys/powerpc/aim/machdep.c	Tue Aug 21 06:33:10 2012	(r239479)
+++ head/sys/powerpc/aim/machdep.c	Tue Aug 21 06:34:21 2012	(r239480)
@@ -257,7 +257,7 @@ powerpc_init(vm_offset_t startkernel, vm
 	size_t		trap_offset;
 	void		*kmdp;
         char		*env;
-	register_t	msr, scratch;
+	register_t	msr, scratch, vers;
 	uint8_t		*cache_check;
 	int		cacheline_warn;
 	#ifndef __powerpc64__
@@ -269,6 +269,14 @@ powerpc_init(vm_offset_t startkernel, vm
 	cacheline_warn = 0;
 
 	/*
+	 * The Wii loader doesn't pass us any environment so, mdp
+	 * points to garbage at this point. The Wii CPU is a 750CL.
+	 */
+	vers = mfpvr();
+	if ((vers & 0xfffff0e0) == (MPC750 << 16 | MPC750CL)) 
+		mdp = NULL;
+
+	/*
 	 * Parse metadata if present and fetch parameters.  Must be done
 	 * before console is inited so cninit gets the right value of
 	 * boothowto.

Modified: head/sys/powerpc/include/spr.h
==============================================================================
--- head/sys/powerpc/include/spr.h	Tue Aug 21 06:33:10 2012	(r239479)
+++ head/sys/powerpc/include/spr.h	Tue Aug 21 06:34:21 2012	(r239480)
@@ -140,6 +140,7 @@
 #define	  MPC603e		  0x0006
 #define	  MPC603ev		  0x0007
 #define	  MPC750		  0x0008
+#define	  MPC750CL		  0x7000	/* Nintendo Wii's Broadway */
 #define	  MPC604ev		  0x0009
 #define	  MPC7400		  0x000c
 #define	  MPC620		  0x0014