From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Si0Z6-0007rm-Mr for barebox@lists.infradead.org; Fri, 22 Jun 2012 09:54:08 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Si0Z4-0004jg-Ro for barebox@lists.infradead.org; Fri, 22 Jun 2012 09:54:08 +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 1Si0Z2-0006za-NN for barebox@lists.infradead.org; Fri, 22 Jun 2012 11:54:04 +0200 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1Si0Z2-0001PI-Lz for barebox@lists.infradead.org; Fri, 22 Jun 2012 11:54:04 +0200 From: Juergen Beisert Date: Fri, 22 Jun 2012 11:54:02 +0200 Message-Id: <1340358843-30614-2-git-send-email-jbe@pengutronix.de> In-Reply-To: <1340358843-30614-1-git-send-email-jbe@pengutronix.de> References: <1340358843-30614-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 --- drivers/Kconfig | 1 + drivers/Makefile | 1 + drivers/watchdog/Kconfig | 10 ++++++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/wd_core.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ include/watchdog.h | 18 ++++++++++++++ 6 files changed, 89 insertions(+) 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/drivers/Kconfig b/drivers/Kconfig index 037b0d4..e193063 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -18,5 +18,6 @@ source "drivers/input/Kconfig" source "drivers/pwm/Kconfig" source "drivers/dma/Kconfig" +source "drivers/watchdog/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index f40b321..52a44c9 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -16,3 +16,4 @@ obj-y += eeprom/ obj-$(CONFIG_PWM) += pwm/ obj-y += input/ obj-y += dma/ +obj-y += watchdog/ diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig new file mode 100644 index 0000000..b5970c9 --- /dev/null +++ b/drivers/watchdog/Kconfig @@ -0,0 +1,10 @@ +menuconfig WATCHDOG + bool "Watchdog support " + help + +if WATCHDOG + +config WATCHDOG_CORE + bool + +endif diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile new file mode 100644 index 0000000..7a446d7 --- /dev/null +++ b/drivers/watchdog/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_WATCHDOG_CORE) += wd_core.o diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c new file mode 100644 index 0000000..50f1441 --- /dev/null +++ b/drivers/watchdog/wd_core.c @@ -0,0 +1,58 @@ +/* + * (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 + +static unsigned timeout = 20; /* timeout in [sec] */ + +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 == -EINVAL) { + if (timeout == 0) + printf("Watchdog cannot be disabled\n"); + else + printf("Timeout value out of range\n"); + return rc; + } + return 0; +} + +BAREBOX_CMD_HELP_START(wd) +BAREBOX_CMD_HELP_USAGE("wd \n") +BAREBOX_CMD_HELP_SHORT("enable the watchdog to bark in seconds. " + "When is 0, the watchdog gets disabled,\n" + "without a parameter the watchdog will be re-triggered\n") +BAREBOX_CMD_HELP_END + +BAREBOX_CMD_START(wd) + .cmd = do_wd, + .usage = "enable/disable/trigger the watchdog", + BAREBOX_CMD_HELP(cmd_wd_help) +BAREBOX_CMD_END diff --git a/include/watchdog.h b/include/watchdog.h new file mode 100644 index 0000000..d052a10 --- /dev/null +++ b/include/watchdog.h @@ -0,0 +1,18 @@ +/* + * 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. + */ + +#ifndef INCLUDE_WATCHDOG_H +# define INCLUDE_WATCHDOG_H + +extern int watchdog_set_timeout(unsigned); + +#endif /* INCLUDE_WATCHDOG_H */ -- 1.7.10 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox