From owner-p4-projects@FreeBSD.ORG  Sun Nov  2 11:27:13 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BD5516A4D0; Sun,  2 Nov 2003 11:27:13 -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 3541016A4CE
	for <perforce@freebsd.org>; Sun,  2 Nov 2003 11:27:13 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 49AEA43FD7
	for <perforce@freebsd.org>; Sun,  2 Nov 2003 11:27:12 -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 hA2JRCXJ018174
	for <perforce@freebsd.org>; Sun, 2 Nov 2003 11:27:12 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA2JRBhv018171
	for perforce@freebsd.org; Sun, 2 Nov 2003 11:27:11 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 2 Nov 2003 11:27:11 -0800 (PST)
Message-Id: <200311021927.hA2JRBhv018171@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 41124 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: Sun, 02 Nov 2003 19:27:13 -0000

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

Change 41124 by jmallett@jmallett_dalek on 2003/11/02 11:27:07

	Do things a little more programmatically.

Affected files ...

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

Differences ...

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

@@ -106,6 +106,9 @@
 	pte = tlb_pte_find(pmap->pm_lev1, va);
 	if (pte_valid(pte))
 		tlb_invalidate_page(va);
+	if ((bits & PG_V) == 0)
+		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 | PG_G;
 }
 
@@ -140,11 +143,18 @@
 static void
 tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
+	u_long ehi;
+
 	va &= ~PAGE_MASK;
-	/* XXX assumes kernel region - region 3. */
-	mips_wr_entryhi(MIPS_HI_R_KERNEL | MIPS_HI_VA_TO_VPN2(va) /* XXX | ASID */);
-	mips_wr_entrylo0(pte0);
-	mips_wr_entrylo1(pte1);
+	ehi = 0;
+	ehi |= (va & (1UL << 63 | 1UL << 62));
+	if ((va & (1UL << 63)) != 0)
+		ehi |= (0x800000UL - 1) << 40;
+	ehi |= MIPS_HI_VA_TO_VPN2(va);
+	ehi |= /* asid */0;
+	mips_wr_entryhi(ehi);
+	mips_wr_entrylo0(pte0 | PG_G);
+	mips_wr_entrylo1(pte1 | PG_G);
 	mips_tlbwr();
 }
 
@@ -192,7 +202,7 @@
 	 */
 	*pte |= PG_D;
 
-	if (va & PG_ODDPG) {
+	if ((va >> PAGE_SHIFT) & 1) {
 		tlb_update(va, pte[-1], pte[0]);
 	} else {
 		tlb_update(va, pte[0], pte[1]);