From owner-p4-projects@FreeBSD.ORG  Tue Jul 18 22:58:45 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5AE5B16A4E6; Tue, 18 Jul 2006 22:58:45 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 349C016A4DD
	for <perforce@freebsd.org>; Tue, 18 Jul 2006 22:58:45 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AADF743D45
	for <perforce@freebsd.org>; Tue, 18 Jul 2006 22:58:40 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6IMweG2040870
	for <perforce@freebsd.org>; Tue, 18 Jul 2006 22:58:40 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6IMweEl040867
	for perforce@freebsd.org; Tue, 18 Jul 2006 22:58:40 GMT
	(envelope-from cognet@freebsd.org)
Date: Tue, 18 Jul 2006 22:58:40 GMT
Message-Id: <200607182258.k6IMweEl040867@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101884 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: Tue, 18 Jul 2006 22:58:45 -0000

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

Change 101884 by cognet@cognet on 2006/07/18 22:58:18

	Working cpu_reset().

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#2 (text+ko) ====

@@ -46,6 +46,8 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
 
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
@@ -93,6 +95,7 @@
 	struct ixp425_softc *sc = device_get_softc(dev);
 	int unit = device_get_unit(dev);
 	sc->sc_iot = &ixp425_bs_tag;
+	ixp425_softc = sc;
 
 	/*
 	 * Mapping for PCI CSR
@@ -158,8 +161,31 @@
 void
 cpu_reset()
 {
+	int reg;
+
 	(void) disable_interrupts(I32_bit|F32_bit);
 	IXPREG(IXP425_INT_ENABLE) = 0;
+	/*
+         * Map the boot Flash device down at physical address 0.
+         */
+        reg = bus_space_read_4(ixp425_softc->sc_iot, IXP425_EXP_VBASE,
+	    EXP_CNFG0_OFFSET);
+        reg |= EXP_CNFG0_MEM_MAP;
+        bus_space_write_4(ixp425_softc->sc_iot, IXP425_EXP_VBASE,
+	    EXP_CNFG0_OFFSET, reg);
+	pmap_kenter_section(0x00000000, 0x00000000, 0);
+	cpu_idcache_wbinv_all();
+	/* Jump into the bootcode's reset vector. */
+	__asm __volatile(
+	    "mrc p15, 0, %0, c1, c0, 0\n"
+	    "bic %0, %0, #1\n" /* Disable MMU */
+	    "mcr p15, 0, %0, c1, c0, 0\n"
+	    "nop\n"
+	    "nop\n"
+	    "nop\n"
+	    "mov pc, #0\n"
+	    : "=r" (reg));
+
 	printf("Reset failed!\n");
 	for(;;);
 }