From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 23:30:18 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D6B016A4D1; Fri,  7 Nov 2003 23:30:18 -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 2465716A4CF
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 23:30:18 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9AFD943FF2
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 23:30:17 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA87UHXJ034882
	for <perforce@freebsd.org>; Fri, 7 Nov 2003 23:30:17 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA87UH1R034879
	for perforce@freebsd.org; Fri, 7 Nov 2003 23:30:17 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Fri, 7 Nov 2003 23:30:17 -0800 (PST)
Message-Id: <200311080730.hA87UH1R034879@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 41731 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: Sat, 08 Nov 2003 07:30:18 -0000

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

Change 41731 by jmallett@jmallett_dalek on 2003/11/07 23:30:06

	Use the TLB more effectively.

Affected files ...

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

Differences ...

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

@@ -110,6 +110,13 @@
 		printf("pmap %p entering invalid mapping for va %lx to pa %lx [%lx]\n",
 		       pmap, (u_long)va, (u_long)pa, (u_long)bits);
 	*pte = MIPS_PA_TO_PFN(pa) | bits;
+#if notyet
+	if ((va >> PAGE_SHIFT) & 1) {
+		tlb_update(va, pte[-1], pte[0]);
+	} else {
+		tlb_update(va, pte[0], pte[1]);
+	}
+#endif
 }
 
 void
@@ -144,6 +151,7 @@
 tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
 	u_long ehi;
+	long i;
 
 	va &= ~PAGE_MASK;
 	ehi = 0;
@@ -153,9 +161,15 @@
 	ehi |= MIPS_HI_VA_TO_VPN2(va);
 	ehi |= /* asid */0;
 	mips_wr_entryhi(ehi);
+	mips_tlbp();
+	i = mips_rd_index();
 	mips_wr_entrylo0(pte0 | PG_G);
 	mips_wr_entrylo1(pte1 | PG_G);
-	mips_tlbwr();
+	mips_wr_entryhi(ehi);
+	if (i < 0)
+		mips_tlbwr();
+	else
+		mips_tlbwi();
 }
 
 void
@@ -193,7 +207,6 @@
 tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
 	va &= ~PAGE_MASK;
-	tlb_invalidate_page(va);
 	tlb_insert(va, pte0, pte1);
 }