From owner-p4-projects@FreeBSD.ORG  Sun Jan  4 21:20:29 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B66AA16A4D5; Sun,  4 Jan 2004 21:20:28 -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 6F51216A4CE
	for <perforce@freebsd.org>; Sun,  4 Jan 2004 21:20:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F16A043D39
	for <perforce@freebsd.org>; Sun,  4 Jan 2004 21:20:26 -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 i055KQ0B018960
	for <perforce@freebsd.org>; Sun, 4 Jan 2004 21:20:26 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i055KQI9018957
	for perforce@freebsd.org; Sun, 4 Jan 2004 21:20:26 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 4 Jan 2004 21:20:26 -0800 (PST)
Message-Id: <200401050520.i055KQI9018957@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 44804 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: Mon, 05 Jan 2004 05:20:29 -0000

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

Change 44804 by jmallett@jmallett_oingo on 2004/01/04 21:19:53

	Or, y'know, I could have had no clue what I was doing and made
	a mistake due to not reading docs carefully.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/tlb.c#19 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/tlb.c#19 (text+ko) ====

@@ -66,32 +66,12 @@
 static int tlb_maxasid = MIPS_TLB_NUM_ASIDS;
 #endif
 
-/*
- * Set up the page size, chop off the low PAGE_SHIFT bits,
- * and then shift off the upper bits.
- */
-static u_long
-tlb_pagemask(vm_size_t pageshift)
-{
-	u_long pm;
-
-	pm = ~0UL;
-	pm >>= PAGE_SHIFT + 1;
-	pm <<= PAGE_SHIFT + 1;
-	pm <<= 7;
-	pm >>= 7;
-
-	return (pm);
-}
-
 void
 tlb_bootstrap(vm_size_t pages, vm_offset_t (*ptalloc)(vm_size_t))
 {
 	pt_entry_t *pte;
 	vm_size_t i;
 
-	mips_wr_pagemask(tlb_pagemask(PAGE_SHIFT));
-
 	/*
 	 * Set up KPT.
 	 */
@@ -109,10 +89,11 @@
 	}
 
 	/*
-	 * Initialise ASID and clear TLB.
+	 * Initialise ASID and clear TLB and set up for 4K pages.
 	 */
 	mips_wr_entryhi(0);
 	tlb_invalidate_all();
+	mips_wr_pagemask(0); /* XXX 4K */
 
 	/*
 	 * Just one wired TLB entry.
@@ -186,7 +167,6 @@
 	mips_wr_entrylo0(pte0);
 	mips_wr_entrylo1(pte1);
 	mips_wr_entryhi(ehi);
-	mips_wr_pagemask(tlb_pagemask(PAGE_SHIFT));
 	if (i < 0)
 		mips_tlbwr();
 	else