From owner-p4-projects@FreeBSD.ORG  Sun Nov  2 01:11:29 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A92F16A4D0; Sun,  2 Nov 2003 01:11:29 -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 76F6F16A4CE
	for <perforce@freebsd.org>; Sun,  2 Nov 2003 01:11:29 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E9C1143F75
	for <perforce@freebsd.org>; Sun,  2 Nov 2003 01:11:28 -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 hA29BSXJ059026
	for <perforce@freebsd.org>; Sun, 2 Nov 2003 01:11:28 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA29BSjO059023
	for perforce@freebsd.org; Sun, 2 Nov 2003 01:11:28 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 2 Nov 2003 01:11:28 -0800 (PST)
Message-Id: <200311020911.hA29BSjO059023@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 41100 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 09:11:30 -0000

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

Change 41100 by jmallett@jmallett_dalek on 2003/11/02 01:10:41

	Random uselesss hackery and removal of critical section stuff
	which blows up nicely before thread0 is initialised.

Affected files ...

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

Differences ...

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


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

@@ -46,6 +46,7 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_pager.h>
+#include <vm/pmap.h>
 #include <vm/uma.h>
 #include <vm/uma_int.h>
 
@@ -105,7 +106,7 @@
 	pte = tlb_pte_find(pmap->pm_lev1, va);
 	if (pte_valid(pte))
 		tlb_invalidate_page(va);
-	*pte = MIPS_PA_TO_PFN(pa) | bits;
+	*pte = MIPS_PA_TO_PFN(pa) | bits | PG_G;
 }
 
 void
@@ -140,13 +141,11 @@
 tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
 	va &= ~PAGE_MASK;
-	critical_enter();
 	/* 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);
 	mips_tlbwr();
-	critical_exit();
 }
 
 void
@@ -174,7 +173,7 @@
 void
 tlb_modified(void *badvaddr)
 {
-	pt_entry_t *pte, entry;
+	pt_entry_t *pte;
 	vm_offset_t va;
 
 	va = (vm_offset_t) badvaddr;
@@ -183,6 +182,8 @@
 	/*
 	 * Do we really want to dirty this page?
 	 */
+	if (!pte_valid(pte))
+		panic("write to invalid page");
 	if (pte_ro(pte))
 		panic("write to ro page");
 	if (pte_dirty(pte))
@@ -193,15 +194,9 @@
 	 */
 	*pte |= PG_D;
 
-	/*
-	 * Make a PTE purely to insert into the TLB.
-	 */
-	entry = *pte & MIPS_PFN_MASK;
-	entry |= *pte & PG_HW;
-
 	if (va & PG_ODDPG) {
-		tlb_update(va, pte[-1], entry);
+		tlb_update(va, pte[-1], pte[0]);
 	} else {
-		tlb_update(va, entry, pte[1]);
+		tlb_update(va, pte[0], pte[1]);
 	}
 }