From owner-svn-src-all@FreeBSD.ORG  Tue Oct 22 05:22:46 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AB34EE6F;
 Tue, 22 Oct 2013 05:22:46 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 997232E88;
 Tue, 22 Oct 2013 05:22:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9M5MkrL035462;
 Tue, 22 Oct 2013 05:22:46 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9M5Mk5b035461;
 Tue, 22 Oct 2013 05:22:46 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201310220522.r9M5Mk5b035461@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Tue, 22 Oct 2013 05:22:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256873 - head/sys/arm/allwinner
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 22 Oct 2013 05:22:46 -0000

Author: gonzo
Date: Tue Oct 22 05:22:46 2013
New Revision: 256873
URL: http://svnweb.freebsd.org/changeset/base/256873

Log:
  Make watchdog function conform watchdog(9):
  Set error to 0 when watchdog is armed and disable it when timeout
  is too large to be set.

Modified:
  head/sys/arm/allwinner/a10_wdog.c

Modified: head/sys/arm/allwinner/a10_wdog.c
==============================================================================
--- head/sys/arm/allwinner/a10_wdog.c	Tue Oct 22 05:22:25 2013	(r256872)
+++ head/sys/arm/allwinner/a10_wdog.c	Tue Oct 22 05:22:46 2013	(r256873)
@@ -150,6 +150,18 @@ a10wd_watchdog_fn(void *private, u_int c
 			    (wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) |
 			    WDOG_MODE_EN | WDOG_MODE_RST_EN);
 			WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART);
+			*error = 0;
+		}
+		else {
+			/* 
+			 * Can't arm
+			 * disable watchdog as watchdog(9) requires
+			 */
+			device_printf(sc->dev,
+			    "Can't arm, timeout is more than 16 sec\n");
+			mtx_unlock(&sc->mtx);
+			WRITE(sc, WDOG_MODE, 0);
+			return;
 		}
 	}
 	else