From owner-p4-projects@FreeBSD.ORG  Sat Apr 12 17:07:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 248F2106568A; Sat, 12 Apr 2008 17:07:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF042106566C
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 17:07:48 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A12DF8FC29
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 17:07:48 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CH7mWw094656
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 17:07:48 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CH7mJI094654
	for perforce@freebsd.org; Sat, 12 Apr 2008 17:07:48 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 12 Apr 2008 17:07:48 GMT
Message-Id: <200804121707.m3CH7mJI094654@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 139914 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2008 17:07:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=139914

Change 139914 by gonzo@gonzo_jeeves on 2008/04/12 17:07:10

	o Use paramteres passed from RB532 loader to set memory size 
	   properly.
	o Add TODO entry for platform_reset.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#5 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#5 (text+ko) ====

@@ -88,6 +88,11 @@
 platform_reset(void)
 {
 	volatile unsigned int * p = (void *)0xb8008000;
+	/* 
+	 * TODO: we should take care of TLB stuff here. Otherwise
+	 * board does not boots properly next time
+	 */
+
 	/* Write 0x8000_0001 to the Reset register */
 	*p = 0x80000001;
 
@@ -108,19 +113,36 @@
 }
 
 void
-platform_start(__register_t a0 __unused, __register_t a1 __unused, 
+platform_start(__register_t a0, __register_t a1,
     __register_t a2 __unused, __register_t a3 __unused)
 {
 	uint64_t platform_counter_freq;
 	vm_offset_t kernend;
-	int i;
+	int argc = a0;
+	char **argv = (char **)a1;
+	int i, mem;
+
 
 	/* clear the BSS and SBSS segments */
 	kernend = round_page((vm_offset_t)&end);
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
+	/*
+	 * Looking for mem=XXM argument
+	 */
+	mem = 0; /* Just something to start with */
+	for (i=0; i < argc; i++) {
+		if (strncmp(argv[i], "mem=", 4) == 0) {
+			mem = strtol(argv[i] + 4, NULL, 0);
+			break;
+		}
+	}
+
 	bootverbose = 1;
-	realmem = btoc(32 << 20);
+	if (mem > 0)
+		realmem = btoc(mem << 20);
+	else
+		realmem = btoc(32 << 20);
 
 	for (i = 0; i < 10; i++) {
 		phys_avail[i] = 0;
@@ -142,6 +164,14 @@
 	platform_counter_freq = 330000000UL;
 	mips_timer_init_params(platform_counter_freq, 1);
 	cninit();
+	/* Panic here, after cninit */ 
+	if (mem == 0)
+		panic("No mem=XX parameter in arguments");
+
+	printf("cmd line: ");
+	for (i=0; i < argc; i++)
+		printf("%s ", argv[i]);
+	printf("\n");
 
 	init_param2(physmem);
 	mips_cpu_init();