diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2012-06-27 16:30:41 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-29 15:16:34 +0200 |
commit | 2928591eab21eb6bf4a085f5f19bf87c21ee7866 (patch) | |
tree | 100ff3787f434c0cc38da6c1d6ee53d7ddc89466 | |
parent | fd4c51aa28acfd61e1802cb5ab1197d808e7da82 (diff) | |
download | barebox-2928591eab21eb6bf4a085f5f19bf87c21ee7866.tar.gz barebox-2928591eab21eb6bf4a085f5f19bf87c21ee7866.tar.xz |
Add a simple watchdog framework
This patch adds a simple wd command which can setup, trigger and stop a watchdog
on the platform.
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | commands/Kconfig | 19 | ||||
-rw-r--r-- | commands/Makefile | 1 | ||||
-rw-r--r-- | commands/wd.c | 68 | ||||
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig | 9 | ||||
-rw-r--r-- | drivers/watchdog/Makefile | 1 | ||||
-rw-r--r-- | drivers/watchdog/wd_core.c | 57 | ||||
-rw-r--r-- | include/watchdog.h | 24 |
9 files changed, 181 insertions, 1 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 52e1f171bb..2c500bfc0f 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -552,6 +552,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 4c8a0a9595..942fbadd8f 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -57,6 +57,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 0000000000..080bab9230 --- /dev/null +++ b/commands/wd.c @@ -0,0 +1,68 @@ +/* + * (c) 2012 Juergen Beisert <kernel@pengutronix.de> + * + * 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 <common.h> +#include <command.h> +#include <errno.h> +#include <linux/ctype.h> +#include <watchdog.h> + +/* 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 [<time>]\n") +BAREBOX_CMD_HELP_SHORT("enable the watchdog to bark in <time> seconds. " + "When <time> 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/drivers/Kconfig b/drivers/Kconfig index c52c56a56a..089dc3f99b 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -15,7 +15,7 @@ source "drivers/mfd/Kconfig" source "drivers/led/Kconfig" source "drivers/eeprom/Kconfig" source "drivers/input/Kconfig" - +source "drivers/watchdog/Kconfig" source "drivers/pwm/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 3aefc1221d..72c4058fea 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_LED) += led/ obj-y += eeprom/ obj-$(CONFIG_PWM) += pwm/ obj-y += input/ +obj-y += watchdog/ diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig new file mode 100644 index 0000000000..c734dfe282 --- /dev/null +++ b/drivers/watchdog/Kconfig @@ -0,0 +1,9 @@ +menuconfig WATCHDOG + bool "Watchdog support " + help + Many platforms support a watchdog to keep track of a working machine. + This framework provides routines to handle these watchdogs. + +if WATCHDOG + +endif diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile new file mode 100644 index 0000000000..630f1b6ca2 --- /dev/null +++ b/drivers/watchdog/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_WATCHDOG) += wd_core.o diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c new file mode 100644 index 0000000000..3d0cfc635d --- /dev/null +++ b/drivers/watchdog/wd_core.c @@ -0,0 +1,57 @@ +/* + * (c) 2012 Juergen Beisert <kernel@pengutronix.de> + * + * 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 <common.h> +#include <command.h> +#include <errno.h> +#include <linux/ctype.h> +#include <watchdog.h> + +/* + * Note: this simple framework supports one watchdog only. + */ +static struct watchdog *watchdog; + +int watchdog_register(struct watchdog *wd) +{ + if (watchdog != NULL) + return -EBUSY; + + watchdog = wd; + return 0; +} +EXPORT_SYMBOL(watchdog_register); + +int watchdog_deregister(struct watchdog *wd) +{ + if (watchdog == NULL || wd != watchdog) + return -ENODEV; + + watchdog = NULL; + return 0; +} +EXPORT_SYMBOL(watchdog_deregister); + +/* + * start, stop or retrigger the watchdog + * timeout in [seconds]. timeout of '0' will disable the watchdog (if possible) + */ +int watchdog_set_timeout(unsigned timeout) +{ + if (watchdog == NULL) + return -ENODEV; + + return watchdog->set_timeout(watchdog, timeout); +} +EXPORT_SYMBOL(watchdog_set_timeout); diff --git a/include/watchdog.h b/include/watchdog.h new file mode 100644 index 0000000000..3e2d08e876 --- /dev/null +++ b/include/watchdog.h @@ -0,0 +1,24 @@ +/* + * 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 + +struct watchdog { + int (*set_timeout)(struct watchdog *, unsigned); +}; + +int watchdog_register(struct watchdog *); +int watchdog_deregister(struct watchdog *); +int watchdog_set_timeout(unsigned); + +#endif /* INCLUDE_WATCHDOG_H */ |