From owner-svn-src-all@FreeBSD.ORG  Wed Dec 17 10:54:32 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D10A0EEC;
 Wed, 17 Dec 2014 10:54:32 +0000 (UTC)
Received: from svn.freebsd.org (unknown [IPv6:2001:1900:2254:2068::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 2B7AA122C;
 Wed, 17 Dec 2014 09:35:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBH9YtiE071809;
 Wed, 17 Dec 2014 09:34:55 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBH9Ytqp071808;
 Wed, 17 Dec 2014 09:34:55 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201412170934.sBH9Ytqp071808@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Wed, 17 Dec 2014 09:34:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275858 - head/sys/mips/beri
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.18-1
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: Wed, 17 Dec 2014 10:54:32 -0000

Author: br
Date: Wed Dec 17 09:34:54 2014
New Revision: 275858
URL: https://svnweb.freebsd.org/changeset/base/275858

Log:
  Use memory regions information provided in FDT.
  
  Reviewed by:	brooks
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/mips/beri/beri_machdep.c

Modified: head/sys/mips/beri/beri_machdep.c
==============================================================================
--- head/sys/mips/beri/beri_machdep.c	Wed Dec 17 07:47:25 2014	(r275857)
+++ head/sys/mips/beri/beri_machdep.c	Wed Dec 17 09:34:54 2014	(r275858)
@@ -88,6 +88,11 @@ static void
 mips_init(void)
 {
 	int i;
+#ifdef FDT
+	struct mem_region mr[FDT_MEM_REGIONS];
+	int mr_cnt, val;
+	int j;
+#endif
 
 	for (i = 0; i < 10; i++) {
 		phys_avail[i] = 0;
@@ -102,6 +107,29 @@ mips_init(void)
 
 	physmem = realmem;
 
+#ifdef FDT
+	if (fdt_get_mem_regions(mr, &mr_cnt, &val) == 0) {
+
+		physmem = btoc(val);
+
+		KASSERT((phys_avail[0] >= mr[0].mr_start) && \
+			(phys_avail[0] < (mr[0].mr_start + mr[0].mr_size)),
+			("First region is not within FDT memory range"));
+
+		/* Limit size of the first region */
+		phys_avail[1] = MIN(mr[0].mr_size, ctob(realmem));
+		dump_avail[1] = phys_avail[1];
+
+		/* Add the rest of regions */
+		for (i = 1, j = 2; i < mr_cnt; i++, j+=2) {
+			phys_avail[j] = mr[i].mr_start;
+			phys_avail[j+1] = mr[i].mr_size;
+			dump_avail[j] = phys_avail[j];
+			dump_avail[j+1] = phys_avail[j+1];
+		}
+	}
+#endif
+
 	init_param1();
 	init_param2(physmem);
 	mips_cpu_init();