From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SjtGX-0000IQ-Im for barebox@lists.infradead.org; Wed, 27 Jun 2012 14:30:47 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SjtGV-00087H-Al for barebox@lists.infradead.org; Wed, 27 Jun 2012 16:30:43 +0200 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1SjtGV-000346-9g for barebox@lists.infradead.org; Wed, 27 Jun 2012 16:30:43 +0200 From: Juergen Beisert Date: Wed, 27 Jun 2012 16:30:41 +0200 Message-Id: <1340807442-5440-2-git-send-email-jbe@pengutronix.de> In-Reply-To: <1340807442-5440-1-git-send-email-jbe@pengutronix.de> References: <1340807442-5440-1-git-send-email-jbe@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 1/2] Add a simple watchdog framework To: barebox@lists.infradead.org This patch adds a simple wd command which can setup, trigger and stop a watchdog on the platform. Signed-off-by: Juergen Beisert --- commands/Kconfig | 19 +++++++++++++ commands/Makefile | 1 + commands/wd.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ drivers/Kconfig | 1 + drivers/Makefile | 1 + drivers/watchdog/Kconfig | 9 ++++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/wd_core.c | 61 +++++++++++++++++++++++++++++++++++++++ include/watchdog.h | 24 ++++++++++++++++ 9 files changed, 185 insertions(+) create mode 100644 commands/wd.c create mode 100644 drivers/watchdog/Kconfig create mode 100644 drivers/watchdog/Makefile create mode 100644 drivers/watchdog/wd_core.c create mode 100644 include/watchdog.h diff --git a/commands/Kconfig b/commands/Kconfig index 9fe0c57..2478e3f 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -579,6 +579,25 @@ config CMD_USB help The usb command allows to rescan for USB devices. +menuconfig CMD_WD + bool + depends on WATCHDOG + prompt "wd command " + help + The 'wd' command which allows to start, stop and trigger the onboard + watchdog. + +if CMD_WD + +config CMD_WD_DEFAULT_TIMOUT + int + prompt "default timeout" + help + Define the default timeout value in [seconds] if the first call of + 'wd' is done without a timeout value (which means the watchdog gets + enabled and re-triggered with the default timeout value). +endif + endmenu endif diff --git a/commands/Makefile b/commands/Makefile index e9503da..54191b4 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -60,6 +60,7 @@ obj-$(CONFIG_CMD_MENU) += menu.o obj-$(CONFIG_CMD_PASSWD) += passwd.o obj-$(CONFIG_CMD_LOGIN) += login.o obj-$(CONFIG_CMD_LED) += led.o +obj-$(CONFIG_CMD_WD) += wd.o obj-$(CONFIG_CMD_LED_TRIGGER) += trigger.o obj-$(CONFIG_CMD_USB) += usb.o obj-$(CONFIG_CMD_TIME) += time.o diff --git a/commands/wd.c b/commands/wd.c new file mode 100644 index 0000000..080bab9 --- /dev/null +++ b/commands/wd.c @@ -0,0 +1,68 @@ +/* + * (c) 2012 Juergen Beisert + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include + +/* default timeout in [sec] */ +static unsigned timeout = CONFIG_CMD_WD_DEFAULT_TIMOUT; + +static int do_wd(int argc, char *argv[]) +{ + int rc; + + if (argc > 1) { + if (isdigit(*argv[1])) { + timeout = simple_strtoul(argv[1], NULL, 0); + } else { + printf("numerical parameter expected\n"); + return 1; + } + } + + rc = watchdog_set_timeout(timeout); + if (rc < 0) { + switch (rc) { + case -EINVAL: + printf("Timeout value out of range\n"); + break; + case -ENOSYS: + printf("Watchdog cannot be disabled\n"); + break; + default: + printf("Watchdog fails: '%s'\n", strerror(-rc)); + break; + } + + return 1; + } + + return 0; +} + +BAREBOX_CMD_HELP_START(wd) +BAREBOX_CMD_HELP_USAGE("wd [