From owner-svn-src-all@FreeBSD.ORG  Mon Oct 22 03:45:38 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 49BA9A32;
 Mon, 22 Oct 2012 03:45:38 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 2C70A8FC08;
 Mon, 22 Oct 2012 03:45:38 +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 q9M3jcIC024940;
 Mon, 22 Oct 2012 03:45:38 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9M3jboM024938;
 Mon, 22 Oct 2012 03:45:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201210220345.q9M3jboM024938@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 22 Oct 2012 03:45:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241861 - head/sys/powerpc/wii
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 22 Oct 2012 03:45:38 -0000

Author: rpaulo
Date: Mon Oct 22 03:45:37 2012
New Revision: 241861
URL: http://svn.freebsd.org/changeset/base/241861

Log:
  Fix the memory regions to include the 64MB DDR3 memory slot.

Modified:
  head/sys/powerpc/wii/platform_wii.c

Modified: head/sys/powerpc/wii/platform_wii.c
==============================================================================
--- head/sys/powerpc/wii/platform_wii.c	Mon Oct 22 03:44:12 2012	(r241860)
+++ head/sys/powerpc/wii/platform_wii.c	Mon Oct 22 03:45:37 2012	(r241861)
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/vmparam.h>
 
 #include <powerpc/wii/wii_fbreg.h>
+#include <powerpc/wii/wii_ipcreg.h>
 
 #include "platform_if.h"
 
@@ -113,7 +114,7 @@ wii_mem_regions(platform_t plat, struct 
 {
 	/* 24MB 1T-SRAM */
 	avail_regions[0].mr_start = 0x00000000;
-	avail_regions[0].mr_size  = 0x01800000 - 0x0004000;
+	avail_regions[0].mr_size  = 0x01800000;
 
 	/*
 	 * Reserve space for the framebuffer which is located
@@ -122,12 +123,19 @@ wii_mem_regions(platform_t plat, struct 
 	avail_regions[0].mr_size -= WIIFB_FB_LEN;
 
 	/* 64MB GDDR3 SDRAM */
-	avail_regions[1].mr_start = 0x10000000 + 0x0004000;
-	avail_regions[1].mr_size  = 0x04000000 - 0x0004000;
+	avail_regions[1].mr_start = 0x10000000;
+	avail_regions[1].mr_size  = 0x04000000;
 
-	/* XXX for now only use the first memory region */
-#undef MEM_REGIONS
-#define MEM_REGIONS 1
+	/*
+	 * Reserve space for the DSP.
+	 */
+	avail_regions[1].mr_start += 0x4000;
+	avail_regions[1].mr_size -= 0x4000;
+
+	/*
+	 * Reserve space for the IOS I/O memory.
+	 */
+	avail_regions[1].mr_size -= WIIIPC_IOH_LEN + 1;
 
 	*phys = *avail = avail_regions;
 	*physsz = *availsz = MEM_REGIONS;