From owner-p4-projects@FreeBSD.ORG  Sat Aug 30 15:03:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E25C1065670; Sat, 30 Aug 2008 15:03:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E64E01065681
	for <perforce@freebsd.org>; Sat, 30 Aug 2008 15:03:18 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D32228FC12
	for <perforce@freebsd.org>; Sat, 30 Aug 2008 15:03:18 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UF3IaZ049737
	for <perforce@freebsd.org>; Sat, 30 Aug 2008 15:03:18 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UF3IXs049735
	for perforce@freebsd.org; Sat, 30 Aug 2008 15:03:18 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Sat, 30 Aug 2008 15:03:18 GMT
Message-Id: <200808301503.m7UF3IXs049735@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148849 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 30 Aug 2008 15:03:19 -0000

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

Change 148849 by nwhitehorn@nwhitehorn_trantor on 2008/08/30 15:02:20

	Partially fix boot while WITNESS and INVARIANTS are enabled. It will no longer silently hang, but there are still panics from lock-order reversals that will need the standard treatment.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#2 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#2 (text+ko) ====

@@ -902,6 +902,8 @@
 
 		/* Enter the pages */
 		PMAP_LOCK(&ofw_pmap);
+		PMAP_LOCK(kernel_pmap);
+
 		DISABLE_TRANS(msr);
 		for (off = 0; off < translations[i].om_len; off += PAGE_SIZE) {
 			struct	vm_page m;
@@ -915,11 +917,12 @@
 			 * so we need them if we want to keep executing. */
 
 			if (translations[i].om_va + off < SEGMENT_LENGTH) {
-				moea64_kenter(mmup,translations[i].om_va + off,
-					translations[i].om_pa_lo + off);
+				moea64_enter_locked(kernel_pmap, 
+					translations[i].om_va + off, &m, 
+					prot, 1);
 			}
 
-			/* Map the frame buffer into the kernel pmap */
+			/* Map the frame buffer into the kernel pmap instead */
 
 			if ((translations[i].om_va + off >= fbva) && 
 			    (translations[i].om_va + off < fbva + fbsize)) {
@@ -932,6 +935,8 @@
 			ofw_mappings++;
 		}
 		ENABLE_TRANS(msr);
+
+		PMAP_UNLOCK(kernel_pmap);
 		PMAP_UNLOCK(&ofw_pmap);
 	}