From owner-p4-projects@FreeBSD.ORG  Thu Mar 11 20:24:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 869AC16A4D0; Thu, 11 Mar 2004 20:24:06 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5BEC716A4CE
	for <perforce@freebsd.org>; Thu, 11 Mar 2004 20:24:06 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 55C2043D41
	for <perforce@freebsd.org>; Thu, 11 Mar 2004 20:24:06 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C4O6Ge036948
	for <perforce@freebsd.org>; Thu, 11 Mar 2004 20:24:06 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C4O5XI036945
	for perforce@freebsd.org; Thu, 11 Mar 2004 20:24:05 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Thu, 11 Mar 2004 20:24:05 -0800 (PST)
Message-Id: <200403120424.i2C4O5XI036945@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48756 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 12 Mar 2004 04:24:07 -0000

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

Change 48756 by jmallett@jmallett_oingo on 2004/03/11 20:23:49

	Run on real kstack...  Seems to work.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/locore.S#11 edit
.. //depot/projects/mips/sys/mips/mips/machdep.c#40 edit
.. //depot/projects/mips/sys/mips/mips/pmap.c#31 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/locore.S#11 (text+ko) ====

@@ -28,12 +28,13 @@
 
 #include <machine/asm.h>
 #include <machine/cpuregs.h>
+#include <machine/param.h>
 
 #include "assym.s"
 
 	.data
 GLOBAL(stackspace)
-	.space 131072
+	.space PAGE_SIZE /* Smaller than it should be since it's temp. */
 GLOBAL(topstack)
 /*
  * Dummy interrupt table to keep sysctl happy until
@@ -90,6 +91,11 @@
 	jal	platform_start
 	nop
 
+	ld	sp, kstack0
+	daddiu	sp, KSTACK_PAGES << PAGE_SHIFT
+	dsrl	sp, 3
+	dsll	sp, 3
+
 	/* Start MI things rolling. */
 	jal	mi_startup
 	nop

==== //depot/projects/mips/sys/mips/mips/machdep.c#40 (text+ko) ====

@@ -198,7 +198,6 @@
 struct kva_md_info kmi;
 
 vm_offset_t kstack0;
-vm_paddr_t kstack0_phys;
 
 vm_size_t physsz;
 

==== //depot/projects/mips/sys/mips/mips/pmap.c#31 (text+ko) ====

@@ -270,6 +270,11 @@
 	msgbufinit(msgbufp, MSGBUF_SIZE);
 
 	/*
+	 * Steal thread0 kstack.
+	 */
+	kstack0 = pmap_steal_memory(KSTACK_PAGES << PAGE_SHIFT);
+
+	/*
 	 * Initialise TLB management, and have it allocate page tables.
 	 */
 	tlb_bootstrap(physsz >> PAGE_SHIFT, pmap_steal_memory);