From owner-freebsd-current@FreeBSD.ORG Sun Dec 10 21:55:32 2006 Return-Path: X-Original-To: current@FreeBSD.ORG Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A5D3E16A505 for ; Sun, 10 Dec 2006 21:55:32 +0000 (UTC) (envelope-from nick@van-laarhoven.org) Received: from smtp-1.orange.nl (smtp-1.orange.nl [193.252.22.241]) by mx1.FreeBSD.org (Postfix) with ESMTP id E219843E4B for ; Sun, 10 Dec 2006 21:48:30 +0000 (GMT) (envelope-from nick@van-laarhoven.org) Received: from uitsmijter.van-laarhoven.org (ap-zvhz-13f05.adsl.wanadoo.nl [81.69.93.5]) by mwinf6006.orange.nl (SMTP Server) with ESMTP id 820B27000082 for ; Sun, 10 Dec 2006 22:49:25 +0100 (CET) X-ME-UUID: 20061210214925532.820B27000082@mwinf6006.orange.nl Received: (qmail 38211 invoked from network); 10 Dec 2006 21:49:25 -0000 Received: from 10.66.0.143 by uitsmijter.van-laarhoven.org (envelope-from , uid 82) with qmail-scanner-1.25 (clamdscan: 0.88.4/2187. f-prot: 4.6.6/3.16.14. spamassassin: 3.1.7. Clear:RC:1(10.66.0.143):. Processed in 0.406023 secs); 10 Dec 2006 21:49:25 -0000 X-Qmail-Scanner-Mail-From: nick@van-laarhoven.org via uitsmijter.van-laarhoven.org X-Qmail-Scanner: 1.25 (Clear:RC:1(10.66.0.143):. Processed in 0.406023 secs) Received: from unknown (HELO van-laarhoven.org) (nick@10.66.0.143) by uitsmijter.van-laarhoven.org with SMTP; 10 Dec 2006 21:49:24 -0000 Received: (nullmailer pid 1445 invoked by uid 1001); Sun, 10 Dec 2006 21:49:23 -0000 Date: Sun, 10 Dec 2006 22:49:23 +0100 (CET) From: Nick Hibma X-X-Sender: nick@localhost To: Sam Leffler In-Reply-To: <457C48A8.4010703@errno.com> Message-ID: <20061210224138.Y1174@localhost> References: <20061210110419.H42195@localhost> <457C48A8.4010703@errno.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: FreeBSD CURRENT Mailing List Subject: Re: Slight interface change on the watchdog fido X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Dec 2006 21:55:32 -0000 >> (*) The i80321_wdog.c cannot be disarmed. Is this correct? >> (**) These have been tested to arm, disarm, and fire. Others have only >> been compile tested. >> >> This change has been tested on 6.2-STABLE and 7-CURRENT. > > FWIW there's another watchdog in xscale/ixp425 for the avila boards. Oops, I missed the watchdogs available in CURRENT: imp at91_st.c ./arm/at91/at91_st.c That one doesn't set *error to error on success. See patch below. ./arm/xscale/ixp425/ixp425_wdog.c Is correct as it is. Index: arm/at91/at91_st.c =================================================================== RCS file: /home/ncvs/src/sys/arm/at91/at91_st.c,v retrieving revision 1.5 diff -u -r1.5 at91_st.c --- arm/at91/at91_st.c 9 Aug 2006 20:58:55 -0000 1.5 +++ arm/at91/at91_st.c 10 Dec 2006 21:47:26 -0000 @@ -170,10 +170,13 @@ uint32_t wdog; int t; - wdog = 0; t = cmd & WD_INTERVAL; - if (cmd != 0 && t >= 22 && t <= 37) + if (cmd != 0 && t >= 22 && t <= 37) { wdog = (1 << (t - 22)) | ST_WDMR_RSTEN; + *error = 0; + } else { + wdog = 0; + } WR4(ST_WDMR, wdog); WR4(ST_CR, ST_CR_WDRST); }