From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:43:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C197A16A417; Mon, 6 Nov 2006 00:43:33 +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 7283016A415 for ; Mon, 6 Nov 2006 00:43:33 +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 45D2443D46 for ; Mon, 6 Nov 2006 00:43:33 +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 kA60hXal025964 for ; Mon, 6 Nov 2006 00:43:33 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA60hXPs025960 for perforce@freebsd.org; Mon, 6 Nov 2006 00:43:33 GMT (envelope-from cognet@freebsd.org) Date: Mon, 6 Nov 2006 00:43:33 GMT Message-Id: <200611060043.kA60hXPs025960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=109320 Change 109320 by cognet@cognet on 2006/11/06 00:43:18 Ok, change the way we do the reset to use the watchdog instead, by starting it up with a timeout of 0. The previous way of jumping into the address 0 of the rom didn't work everytime, I don't know why. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#15 (text+ko) ==== @@ -169,34 +169,14 @@ void cpu_reset(void) { - u_int32_t 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_bs_tag, IXP425_EXP_VBASE, - EXP_CNFG0_OFFSET); - reg |= EXP_CNFG0_MEM_MAP; - bus_space_write_4(&ixp425_bs_tag, IXP425_EXP_VBASE, - EXP_CNFG0_OFFSET, reg); - cpu_idcache_wbinv_all(); - cpu_control(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE - | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE - , 0xffffffff); - - /* 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)); - + bus_space_write_4(&ixp425_bs_tag, IXP425_TIMER_VBASE, + IXP425_OST_WDOG_KEY, OST_WDOG_KEY_MAJICK); + bus_space_write_4(&ixp425_bs_tag, IXP425_TIMER_VBASE, + IXP425_OST_WDOG, 0); + bus_space_write_4(&ixp425_bs_tag, IXP425_TIMER_VBASE, + IXP425_OST_WDOG_ENAB, OST_WDOG_ENAB_RST_ENA | + OST_WDOG_ENAB_CNT_ENA); printf("Reset failed!\n"); for(;;); }