From owner-svn-src-stable-9@FreeBSD.ORG  Fri Dec  6 18:32:04 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4F2655D1;
 Fri,  6 Dec 2013 18:32:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3B358157B;
 Fri,  6 Dec 2013 18:32:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6IW4JV076779;
 Fri, 6 Dec 2013 18:32:04 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6IW4lo076778;
 Fri, 6 Dec 2013 18:32:04 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201312061832.rB6IW4lo076778@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 6 Dec 2013 18:32:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r259038 - stable/9/sys/arm/at91
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Dec 2013 18:32:04 -0000

Author: imp
Date: Fri Dec  6 18:32:03 2013
New Revision: 259038
URL: http://svnweb.freebsd.org/changeset/base/259038

Log:
  Bump the maximum VM space from 3 * memory size to a fixed
  256MB. That's all we have room for since we map the hardware registers
  starting at 0xd0000000. This allows my 64MB AT91SAM9G20 to boot again
  after the unmmaped I/O changes were MFC'd at r251897. Other
  subplatforms may need similar treatment.

Modified:
  stable/9/sys/arm/at91/at91_machdep.c

Modified: stable/9/sys/arm/at91/at91_machdep.c
==============================================================================
--- stable/9/sys/arm/at91/at91_machdep.c	Fri Dec  6 18:09:10 2013	(r259037)
+++ stable/9/sys/arm/at91/at91_machdep.c	Fri Dec  6 18:32:03 2013	(r259038)
@@ -426,9 +426,8 @@ initarm(void *arg, void *arg2)
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 
-	pmap_bootstrap(freemempos,
-	    KERNVIRTADDR + 3 * memsize,
-	    &kernel_l1pt);
+	/* Use the full 256MB of KVA we have available, regardless of memory size */
+	pmap_bootstrap(freemempos, KERNVIRTADDR + (256 << 20), &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
 	mutex_init();