From owner-svn-src-all@FreeBSD.ORG  Sun Jun 21 21:38:13 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E4631065675;
	Sun, 21 Jun 2009 21:38:13 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3CC6C8FC1A;
	Sun, 21 Jun 2009 21:38:13 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5LLcD4l019224;
	Sun, 21 Jun 2009 21:38:13 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5LLcDrp019222;
	Sun, 21 Jun 2009 21:38:13 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <200906212138.n5LLcDrp019222@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sun, 21 Jun 2009 21:38:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194609 - head/sys/arm/arm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Jun 2009 21:38:13 -0000

Author: cognet
Date: Sun Jun 21 21:38:12 2009
New Revision: 194609
URL: http://svn.freebsd.org/changeset/base/194609

Log:
  Disable write-back until I figure out what's wrong with it on the i81342.
  There's no need to disable the MMU once we're done inflating the kernel.

Modified:
  head/sys/arm/arm/elf_trampoline.c

Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c	Sun Jun 21 21:04:12 2009	(r194608)
+++ head/sys/arm/arm/elf_trampoline.c	Sun Jun 21 21:38:12 2009	(r194609)
@@ -550,7 +550,7 @@ setup_pagetables(unsigned int pt_addr, v
 	for (addr = physstart; addr < physend; addr += L1_S_SIZE) {
 		pd[addr >> L1_S_SHIFT] = L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)|
 		    L1_S_DOM(PMAP_DOMAIN_KERNEL) | addr;
-		if (write_back)
+		if (write_back && 0)
 			pd[addr >> L1_S_SHIFT] |= L1_S_B;
 	}
 	/* XXX: See below */
@@ -610,12 +610,6 @@ __start(void)
 		    (unsigned int)&func_end + 800 , 0);
 		if (altdst > dst)
 			dst = altdst;
-		cpu_idcache_wbinv_all();
-		cpu_l2cache_wbinv_all();
-		__asm __volatile("mrc p15, 0, %0, c1, c0, 0\n"
-		    "bic %0, %0, #1\n" /* MMU_ENABLE */
-		    "mcr p15, 0, %0, c1, c0, 0\n"
-		    : "=r" (pt_addr));
 	} else
 #endif
 		dst = 4 + load_kernel((unsigned int)&kernel_start,