 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.147 2009/11/26 00:19:17 matt Exp $	*/
+/*	$NetBSD: locore.s,v 1.148 2009/12/02 15:51:12 tsutsui Exp $	*/
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -542,34 +542,33 @@ Lhpmmu3:
 Lehighcode:
 	/*
 	 * END MMU TRAMPOLINE.  Address register %a5 is now free.
 	 */
 /*
  * Should be running mapped from this point on
  */
 Lenab1:
 /* select the software page size now */
 	lea	_ASM_LABEL(tmpstk),%sp		| temporary stack
 	jbsr	_C_LABEL(uvm_setpagesize)  	| select software page size
-/* set kernel stack, user SP, and initial pcb */
+/* call final pmap setup which initialize lwp0, curlwp, and curpcb */
-	lea	_C_LABEL(lwp0),%a2	| grab lwp0.l_addr
+	jbsr	_C_LABEL(pmap_bootstrap_finalize)
-	movl	%a2@(L_ADDR),%a1	|   set kernel stack to end of area
+/* set kernel stack, user SP */
-	lea	%a1@(USPACE-4),%sp	|   and curlwp so that we don't
+	movl	_C_LABEL(lwp0uarea),%a1	|
-	movl	%a2,_C_LABEL(curlwp)	|   deref NULL in trap()
+	lea	%a1@(USPACE-4),%sp	| set kernel stack to end of area
 	movl	#USRSTACK-4,%a2
 	movl	%a2,%usp		| init user SP
 	movl	%a1,_C_LABEL(curpcb)	| lwp0 is running
 	tstl	_C_LABEL(fputype)	| Have an FPU?
 	jeq	Lenab2			| No, skip.
 	clrl	%a1@(PCB_FPCTX)		| ensure null FP context
 	movl	%a1,%sp@-
 	jbsr	_C_LABEL(m68881_restore) | restore it (does not kill %a1)
 	addql	#4,%sp
 Lenab2:
 /* flush TLB and turn on caches */
 	jbsr	_C_LABEL(_TBIA)		| invalidate TLB
 	cmpl	#MMU_68040,_C_LABEL(mmutype) | 68040?
 	jeq	Lnocache0		| yes, cache already on
 	movl	#CACHE_ON,%d0

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.39 2009/11/27 03:23:09 rmind Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.40 2009/12/02 15:51:12 tsutsui Exp $	*/
 /*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,30 +26,29 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)pmap_bootstrap.c	8.1 (Berkeley) 6/10/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.39 2009/11/27 03:23:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.40 2009/12/02 15:51:12 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <machine/frame.h>
 #include <machine/cpu.h>
 #include <machine/hp300spu.h>
 #include <machine/vmparam.h>
 #include <machine/pte.h>
 #include <hp300/hp300/clockreg.h>
 #include <uvm/uvm_extern.h>
 #define RELOC(v, t)	*((t*)((uintptr_t)&(v) + firstpa))
 #define RELOCPTR(v, t)	((t)((uintptr_t)RELOC((v), t) + firstpa))
 @@ -84,64 +83,64 @@ void *msgbufaddr;
  * Bootstrap the VM system.
+ *
  * Called with MMU off so we must relocate all global references by `firstpa'
  * (don't call any functions here!)  `nextpa' is the first available physical
  * memory address.  Returns an updated first PA reflecting the memory we
  * have allocated.  MMU is still off when we return.
+ *
  * XXX assumes sizeof(u_int) == sizeof(pt_entry_t)
  * XXX a PIC compiler would make this much easier.
  */
 void
 pmap_bootstrap(paddr_t nextpa, paddr_t firstpa)
+{
-	paddr_t kstpa, kptpa, kptmpa, lkptpa, p0upa;
+	paddr_t kstpa, kptpa, kptmpa, lkptpa, lwp0upa;
 	u_int nptpages, kstsize;
 	st_entry_t protoste, *ste;
 	pt_entry_t protopte, *pte, *epte;
 	/*
 	 * Calculate important physical addresses:
+	 *
 	 *	kstpa		kernel segment table	1 page (!040)
 	 *						N pages (040)
+	 *
 	 *	kptpa		statically allocated
 	 *			kernel PT pages		Sysptsize+ pages
+	 *
 	 * [ Sysptsize is the number of pages of PT, IIOMAPSIZE and
 	 *   EIOMAPSIZE are the number of PTEs, hence we need to round
 	 *   the total to a page boundary with IO maps at the end. ]
+	 *
 	 *	kptmpa		kernel PT map		1 page
+	 *
 	 *	lkptpa		last kernel PT page	1 page
+	 *
-	 *	p0upa		proc 0 u-area		UPAGES pages
+	 *	lwp0upa		lwp 0 u-area		UPAGES pages
+	 *
 	 * The KVA corresponding to any of these PAs is:
 	 *	(PA - firstpa + KERNBASE).
 	 */
 	if (RELOC(mmutype, int) == MMU_68040)
 		kstsize = MAXKL2SIZE / (NPTEPG/SG4_LEV2SIZE);
 	else
 		kstsize = 1;
 	kstpa = nextpa;
 	nextpa += kstsize * PAGE_SIZE;
 	kptmpa = nextpa;
 	nextpa += PAGE_SIZE;
 	lkptpa = nextpa;
 	nextpa += PAGE_SIZE;
-	p0upa = nextpa;
+	lwp0upa = nextpa;
 	nextpa += USPACE;
 	kptpa = nextpa;
 	nptpages = RELOC(Sysptsize, int) +
 		(IIOMAPSIZE + EIOMAPSIZE + NPTEPG - 1) / NPTEPG;
 	nextpa += nptpages * PAGE_SIZE;
 	/*
 	 * Initialize segment table and kernel page table map.
+	 *
 	 * On 68030s and earlier MMUs the two are identical except for
 	 * the valid bits so both are initialized with essentially the
 	 * same values.  On the 68040, which has a mandatory 3-level
 	 * structure, the segment table holds the level 1 table and part
 @@ -320,27 +319,27 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	/*
 	 * Validate PTEs for kernel text (RO).  The first page
 	 * of kernel text remains invalid; see locore.s
 	 */
 	pte = &((u_int *)kptpa)[m68k_btop(KERNBASE + PAGE_SIZE)];
 	epte = &pte[m68k_btop(m68k_trunc_page(&etext))];
 	protopte = (firstpa + PAGE_SIZE) | PG_RO | PG_V;
 	while (pte < epte) {
 		*pte++ = protopte;
 		protopte += PAGE_SIZE;
+	}
 	/*
 	 * Validate PTEs for kernel data/bss, dynamic data allocated
-	 * by us so far (nextpa - firstpa bytes), and pages for proc0
+	 * by us so far (nextpa - firstpa bytes), and pages for lwp0
 	 * u-area and page table allocated below (RW).
 	 */
 	epte = &((u_int *)kptpa)[m68k_btop(nextpa - firstpa)];
 	protopte = (protopte & ~PG_PROT) | PG_RW;
 	/*
 	 * Enable copy-back caching of data pages
 	 */
 	if (RELOC(mmutype, int) == MMU_68040)
 		protopte |= PG_CCB;
 	while (pte < epte) {
 		*pte++ = protopte;
 		protopte += PAGE_SIZE;
+	}
 @@ -385,41 +384,41 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	 */
 	RELOC(Sysmap, pt_entry_t *) =
 	    (pt_entry_t *)m68k_ptob((NPTEPG - 2) * NPTEPG);
 	/*
 	 * CLKbase, MMUbase: important registers in internal IO space
 	 * accessed from assembly language.
 	 */
 	RELOC(CLKbase, vaddr_t) =
 		(vaddr_t)RELOC(intiobase, char *) + CLKBASE;
 	RELOC(MMUbase, vaddr_t) =
 		(vaddr_t)RELOC(intiobase, char *) + MMUBASE;
 	/*
-	 * Setup u-area for process 0.
+	 * Setup u-area for lwp 0.
 	 */
 	/*
 	 * Zero the u-area.
 	 * NOTE: `pte' and `epte' aren't PTEs here.
 	 */
-	pte = (u_int *)p0upa;
+	pte = (u_int *)lwp0upa;
-	epte = (u_int *)(p0upa + USPACE);
+	epte = (u_int *)(lwp0upa + USPACE);
 	while (pte < epte)
 		*pte++ = 0;
 	/*
-	 * Remember the u-area address so it can be loaded in the
+	 * Remember the u-area address so it can be loaded in the lwp0
-	 * proc struct p_addr field later.
+	 * via uvm_lwp_setuarea() later in pmap_bootstrap_finalize().
 	 */
-	RELOC(lwp0.l_addr, struct user *) = (struct user *)(p0upa - firstpa);
+	RELOC(lwp0uarea, vaddr_t) = lwp0upa - firstpa;
 	/*
 	 * VM data structures are now initialized, set up data for
 	 * the pmap module.
+	 *
 	 * Note about avail_end: msgbuf is initialized just after
 	 * avail_end in machdep.c.  Since the last page is used
 	 * for rebooting the system (code is copied there and
 	 * excution continues from copied code before the MMU
 	 * is disabled), the msgbuf will get trounced between
 	 * reboots if it's placed in the last physical page.
 	 * To work around this, we move avail_end back one more
 	 * page so the msgbuf can be preserved.