From owner-svn-src-head@freebsd.org  Tue Aug 30 23:30:28 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 093D9BC9AB0;
 Tue, 30 Aug 2016 23:30:28 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CAF31D1;
 Tue, 30 Aug 2016 23:30:27 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7UNUQ99011919;
 Tue, 30 Aug 2016 23:30:26 GMT (envelope-from cognet@FreeBSD.org)
Received: (from cognet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7UNUQHL011918;
 Tue, 30 Aug 2016 23:30:26 GMT (envelope-from cognet@FreeBSD.org)
Message-Id: <201608302330.u7UNUQHL011918@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cognet set sender to
 cognet@FreeBSD.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Tue, 30 Aug 2016 23:30:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305096 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Aug 2016 23:30:28 -0000

Author: cognet
Date: Tue Aug 30 23:30:26 2016
New Revision: 305096
URL: https://svnweb.freebsd.org/changeset/base/305096

Log:
  Some old arm ports don't load the kernel at the beginning of the memory,
  because the bootloader, ie redboot, won't let them do so, and so used the
  memory before the kernel for early memory allocation, such as pagetables,
  stacks, etc...
  Make a bit of an effort to try to get that memory mapped.

Modified:
  head/sys/arm/arm/locore-v4.S

Modified: head/sys/arm/arm/locore-v4.S
==============================================================================
--- head/sys/arm/arm/locore-v4.S	Tue Aug 30 22:48:05 2016	(r305095)
+++ head/sys/arm/arm/locore-v4.S	Tue Aug 30 23:30:26 2016	(r305096)
@@ -195,6 +195,16 @@ Lunmapped:
 	ldr	r2, =(KERNVIRTADDR)
 	mov	r3, #64
 	bl	build_pagetables
+#if defined(PHYSADDR) && (KERNVIRTADDR != KERNBASE)
+/* 
+ * If the kernel wasn't loaded at the beginning of the ram, map the memory
+ * before the kernel too, as some ports use that for pagetables, stack, etc...
+ */
+	ldr	r1, =PHYSADDR
+	ldr 	r2, =KERNBASE
+	ldr	r3, =((KERNVIRTADDR - KERNBASE) / L1_S_SIZE)
+	bl	build_pagetables
+#endif
 
 	/* Create a device mapping for early_printf if specified. */
 #if defined(SOCDEV_PA) && defined(SOCDEV_VA)