On Wed, Feb 9, 2011 at 8:19 AM, Tobias Klauser <tklauser@xxxxxxxxxx> wrote:
> This driver adds support for the Altera Timer in the Watchdog Timer
> configuration. This component is usually found on SOPC (System on
> Programmable Chip) for Altera FPGAs.
>
> Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
> Reviewed-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
> ---
> Thanks a lot to Jamie Iles and Walter Goossens for their feedback on v2.
>
> changes for v3:
> Â- Make altera_wdt_setup static void (as suggested by Jamie)
> Â- Use const __be32 * for devicetree properties (as suggested by Walter)
> changes for v2:
> Â- Get driver properties from devicetree (and document them), thus the
> Â driver depends on OF
> Â- Do not select WATCHDOG_NOWAYOUT, but instead implement a software
> Â timer resetting the watchdog timer when the device is not open
> Â- Only support a single instance of the watchdog, so the private data
> Â can be kept in static data
> Â- Use devm_* functions in altera_wdt_probe to simplify cleanup and
> Â error handling
> Â- Remove empty altera_wdt_shutdown function
> Â- Add MODULE_LICENSE (GPL)
>
>
> Â.../devicetree/bindings/watchdog/altera_wdt.txt  Â|  Â7 +
> Âdrivers/watchdog/Kconfig              |  Â8 +
> Âdrivers/watchdog/Makefile             Â|  Â1 +
> Âdrivers/watchdog/altera_wdt.c           Â| Â309 ++++++++++++++++++++
> Â4 files changed, 325 insertions(+), 0 deletions(-)
> Âcreate mode 100644 Documentation/devicetree/bindings/watchdog/altera_wdt.txt
> Âcreate mode 100644 drivers/watchdog/altera_wdt.c
>
> diff --git a/Documentation/devicetree/bindings/watchdog/altera_wdt.txt b/Documentation/devicetree/bindings/watchdog/altera_wdt.txt
> new file mode 100644
> index 0000000..16ac949
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/altera_wdt.txt
> @@ -0,0 +1,7 @@
> +Altera Watchdog Timer
> +
> +Required properties:
> +- compatible : should be "ALTR,wdt-1.0"
> +- clock-frequency : frequency of the clock input
> +- timeout : load value of the timer (number of clock ticks until watchdog
> + Â Â Â Â Â Âresets)
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index bd6a33d..ebcafb0 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -69,6 +69,14 @@ config WM8350_WATCHDOG
> Â Â Â Â ÂSupport for the watchdog in the WM8350 AudioPlus PMIC. ÂWhen
> Â Â Â Â Âthe watchdog triggers the system will be reset.
>
> +config ALTERA_WDT
> + Â Â Â tristate "Altera Watchdog Timer"
> + Â Â Â depends on OF
> + Â Â Â help
> + Â Â Â Â Support for the Altera Timer in the Watchdog Timer configuration. This
> + Â Â Â Â component is found on SOPC (System on Programmable Chip) for Altera
> + Â Â Â Â FPGAs.
> +
> Â# ALPHA Architecture
>
> Â# ARM Architecture
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index fd9c8c0..48a2167 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -153,4 +153,5 @@ obj-$(CONFIG_WATCHDOG_CP1XXX) Â Â Â Â Â Â Â += cpwd.o
> Âobj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o
> Âobj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o
> Âobj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o
> +obj-$(CONFIG_ALTERA_WDT) += altera_wdt.o
> Âobj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
> diff --git a/drivers/watchdog/altera_wdt.c b/drivers/watchdog/altera_wdt.c
> new file mode 100644
> index 0000000..2a7f14a
> --- /dev/null
> +++ b/drivers/watchdog/altera_wdt.c
> @@ -0,0 +1,309 @@
> +/*
> + * Driver for the Altera Watchdog Timer
> + *
> + * Copyright (C) 2011 Tobias Klauser <tklauser@xxxxxxxxxx>
> + * Copyright (C) 2005 Walter Goossens
> + *
> + * Originally based on wdt.c which is
> + *
> + * Copyright (C) 1995-1997 Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
> + *
> + * Software timeout heartbeat code based on pika_wdt.c which is
> + *
> + * Copyright (c) 2008 PIKA Technologies
> + *
> + * 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.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/kernel.h>
> +#include <linux/miscdevice.h>
> +#include <linux/watchdog.h>
> +#include <linux/platform_device.h>
> +#include <linux/fs.h>
> +#include <linux/init.h>
> +#include <linux/jiffies.h>
> +#include <linux/timer.h>
> +#include <linux/io.h>
> +#include <linux/uaccess.h>
> +#include <linux/of_platform.h>
> +
> +#define WATCHDOG_NAME Â"altera_wdt"
> +
> +/* Register offsets */
> +#define ALTERA_WDT_STATUS Â Â Â0x00
> +#define ALTERA_WDT_CONTROL Â Â 0x04
> +#define ALTERA_WDT_PERIODL Â Â 0x08
> +#define ALTERA_WDT_PERIODH Â Â 0x0C
> +
> +#define ALTERA_WDT_RUN_BIT Â Â 0x04
> +
> +/* User land timeout */
> +#define WDT_HEARTBEAT 15
> +static int heartbeat = WDT_HEARTBEAT;
> +module_param(heartbeat, int, 0);
> +MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
> + Â Â Â "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
> +
> +static int nowayout = WATCHDOG_NOWAYOUT;
> +module_param(nowayout, int, 0);
> +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
> + Â Â Â "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> +
> +static struct {
> + Â Â Â void __iomem *base;
> + Â Â Â unsigned long wdt_timeout; Â Â Â/* timeout of the hardware timer */
> +
> + Â Â Â unsigned long next_heartbeat; Â /* the next_heartbeat for the timer */
> + Â Â Â unsigned long is_open;
> + Â Â Â char expect_close;
> + Â Â Â struct timer_list timer; Â Â Â Â/* software timer that pings the watchdog */
> +} altera_wdt_priv;
> +
> +/*
> + * Start the watchdog. Once it has been started, it cannot be stopped anymore.
> + */
> +static void altera_wdt_setup(void)
> +{
> + Â Â Â u32 control = readl(altera_wdt_priv.base + ALTERA_WDT_CONTROL);
> +
> + Â Â Â writel(control | ALTERA_WDT_RUN_BIT, altera_wdt_priv.base + ALTERA_WDT_CONTROL);
> +}
> +
> +/*
> + * Tickle the watchdog (reset the watchdog timer)
> + */
> +static void altera_wdt_reset(void)
> +{
> + Â Â Â /* It doesn't matter what value we write */
> + Â Â Â writel(1, altera_wdt_priv.base + ALTERA_WDT_PERIODL);
> +}
> +
> +/*
> + * Software timer tick
> + */
> +static void altera_wdt_ping(unsigned long data)
> +{
> + Â Â Â if (time_before(jiffies, altera_wdt_priv.next_heartbeat) ||
> + Â Â Â Â Â Â Â Â Â Â Â (!nowayout && !altera_wdt_priv.is_open)) {
> + Â Â Â Â Â Â Â altera_wdt_reset();
> + Â Â Â Â Â Â Â mod_timer(&altera_wdt_priv.timer, jiffies + altera_wdt_priv.wdt_timeout);
> + Â Â Â } else
> + Â Â Â Â Â Â Â pr_crit(WATCHDOG_NAME ": I will reset your machine!\n");
> +}
> +
> +static void altera_wdt_keepalive(void)
> +{
> + Â Â Â altera_wdt_priv.next_heartbeat = jiffies + heartbeat * HZ;
> +}
> +
> +static void altera_wdt_start(void)
> +{
> + Â Â Â altera_wdt_keepalive();
> + Â Â Â mod_timer(&altera_wdt_priv.timer, jiffies + altera_wdt_priv.wdt_timeout);
> +}
> +
> +static int altera_wdt_open(struct inode *inode, struct file *file)
> +{
> + Â Â Â /* /dev/watchdog can only be opened once */
> + Â Â Â if (test_and_set_bit(0, &altera_wdt_priv.is_open))
> + Â Â Â Â Â Â Â return -EBUSY;
> +
> + Â Â Â altera_wdt_start();
> +
> + Â Â Â return nonseekable_open(inode, file);
> +}
> +
> +static int altera_wdt_release(struct inode *inode, struct file *file)
> +{
> + Â Â Â /* stop internal ping */
> + Â Â Â if (!altera_wdt_priv.expect_close)
> + Â Â Â Â Â Â Â del_timer(&altera_wdt_priv.timer);
> +
> + Â Â Â clear_bit(0, &altera_wdt_priv.is_open);
> + Â Â Â altera_wdt_priv.expect_close = 0;
> +
> + Â Â Â return 0;
> +}
> +
> +static ssize_t altera_wdt_write(struct file *file, const char __user *data,
> + Â Â Â Â Â Â Â size_t len, loff_t *ppos)
> +{
> + Â Â Â if (!len)
> + Â Â Â Â Â Â Â return 0;
> +
> + Â Â Â /* Scan for magic character */
> + Â Â Â if (!nowayout) {
> + Â Â Â Â Â Â Â size_t i;
> +
> + Â Â Â Â Â Â Â altera_wdt_priv.expect_close = 0;
> +
> + Â Â Â Â Â Â Â for (i = 0; i < len; i++) {
> + Â Â Â Â Â Â Â Â Â Â Â char c;
> + Â Â Â Â Â Â Â Â Â Â Â if (get_user(c, data + i))
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return -EFAULT;
> + Â Â Â Â Â Â Â Â Â Â Â if (c == 'V') {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â altera_wdt_priv.expect_close = 42;
For what this value is used? Why 42? It's never checked in code to such a value.
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
> + Â Â Â Â Â Â Â Â Â Â Â }
> + Â Â Â Â Â Â Â }
> + Â Â Â }
> +
> + Â Â Â altera_wdt_keepalive();
> +
> + Â Â Â return len;
> +}
> +
> +static const struct watchdog_info altera_wdt_info = {
> +    .identity        = "Altera Watchdog",
> +    .options        Â= WDIOF_SETTIMEOUT |
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WDIOF_KEEPALIVEPING |
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WDIOF_MAGICCLOSE,
> +    .firmware_version    = 1,
> +};
> +
> +static long altera_wdt_ioctl(struct file *file, unsigned int cmd,
> + Â Â Â Â Â Â Â unsigned long arg)
> +{
> + Â Â Â void __user *argp = (void __user *) arg;
> + Â Â Â int __user *p = argp;
> + Â Â Â int new_value;
> +
> + Â Â Â switch (cmd) {
> + Â Â Â case WDIOC_GETSUPPORT:
> + Â Â Â Â Â Â Â return copy_to_user(argp, &altera_wdt_info, sizeof(altera_wdt_info));
> +
> + Â Â Â case WDIOC_GETSTATUS:
> + Â Â Â case WDIOC_GETBOOTSTATUS:
> + Â Â Â Â Â Â Â return put_user(0, p);
> +
> + Â Â Â case WDIOC_KEEPALIVE:
> + Â Â Â Â Â Â Â altera_wdt_keepalive();
> + Â Â Â Â Â Â Â return 0;
> +
> + Â Â Â case WDIOC_SETTIMEOUT:
> + Â Â Â Â Â Â Â if (get_user(new_value, p))
> + Â Â Â Â Â Â Â Â Â Â Â return -EFAULT;
> +
> + Â Â Â Â Â Â Â heartbeat = new_value;
> + Â Â Â Â Â Â Â altera_wdt_keepalive();
> +
> + Â Â Â Â Â Â Â return put_user(new_value, p); Â/* return current value */
> +
> + Â Â Â case WDIOC_GETTIMEOUT:
> + Â Â Â Â Â Â Â return put_user(heartbeat, p);
> +
> + Â Â Â default:
> + Â Â Â Â Â Â Â return -ENOTTY;
> + Â Â Â }
> +}
> +
> +static const struct file_operations altera_wdt_fops = {
> +    .owner     Â= THIS_MODULE,
> +    .llseek     = no_llseek,
> +    .open      = altera_wdt_open,
> +    .release    Â= altera_wdt_release,
> +    .write     Â= altera_wdt_write,
> + Â Â Â .unlocked_ioctl = altera_wdt_ioctl,
> +};
> +
> +static struct miscdevice altera_wdt_miscdev = {
> + Â Â Â .minor Â= WATCHDOG_MINOR,
> +    .name  = "watchdog",
> +    .fops  = &altera_wdt_fops,
> +};
> +
> +static int __devinit altera_wdt_probe(struct platform_device *pdev)
> +{
> + Â Â Â struct resource *res, *mem;
> + Â Â Â const __be32 *freq_prop, *timeout_prop;
> + Â Â Â unsigned long timeout;
> + Â Â Â int ret;
> +
> + Â Â Â res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + Â Â Â if (!res)
> + Â Â Â Â Â Â Â return -ENOENT;
> +
> + Â Â Â mem = devm_request_mem_region(&pdev->dev, res->start,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â resource_size(res), pdev->name);
> + Â Â Â if (!mem)
> + Â Â Â Â Â Â Â return -EBUSY;
> +
> + Â Â Â altera_wdt_priv.base = devm_ioremap_nocache(&pdev->dev, mem->start,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â resource_size(mem));
> + Â Â Â if (!altera_wdt_priv.base)
> + Â Â Â Â Â Â Â return -ENOMEM;
> +
> + Â Â Â freq_prop = of_get_property(pdev->dev.of_node, "clock-frequency", NULL);
> + Â Â Â if (!freq_prop)
> + Â Â Â Â Â Â Â return -ENODEV;
> +
> + Â Â Â timeout_prop = of_get_property(pdev->dev.of_node, "timeout", NULL);
> + Â Â Â if (!timeout_prop)
> + Â Â Â Â Â Â Â return -ENODEV;
> +
> + Â Â Â /* Add 1 as the timeout property actually holds the load value */
> + Â Â Â timeout = be32_to_cpup(timeout_prop) + 1;
> + Â Â Â /* Convert timeout to msecs */
> + Â Â Â timeout = timeout / (be32_to_cpup(freq_prop) / MSEC_PER_SEC);
> + Â Â Â /* Tickle the watchdog twice per timeout period */
> + Â Â Â altera_wdt_priv.wdt_timeout = msecs_to_jiffies(timeout / 2);
> +
> + Â Â Â ret = misc_register(&altera_wdt_miscdev);
> + Â Â Â if (ret)
> + Â Â Â Â Â Â Â return ret;
> +
> + Â Â Â altera_wdt_setup();
> + Â Â Â altera_wdt_priv.next_heartbeat = jiffies + heartbeat * HZ;
> + Â Â Â setup_timer(&altera_wdt_priv.timer, altera_wdt_ping, 0);
> + Â Â Â mod_timer(&altera_wdt_priv.timer, jiffies + altera_wdt_priv.wdt_timeout);
> +
> + Â Â Â pr_info(WATCHDOG_NAME " enabled (heartbeat=%d sec, nowayout=%d)\n",
> + Â Â Â Â Â Â Â heartbeat, nowayout);
> +
> + Â Â Â return 0;
> +}
> +
> +static int __devexit altera_wdt_remove(struct platform_device *pdev)
> +{
> + Â Â Â misc_deregister(&altera_wdt_miscdev);
> + Â Â Â return 0;
> +}
> +
> +static struct of_device_id altera_wdt_match[] = {
> + Â Â Â { .compatible = "altr,wdt-1.0", },
> + Â Â Â {},
> +};
> +MODULE_DEVICE_TABLE(of, altera_wdt_match);
> +
> +static struct platform_driver altera_wdt_driver = {
> +    .probe     Â= altera_wdt_probe,
> +    .remove     = __devexit_p(altera_wdt_remove),
> +    .driver     = {
> +        .owner     Â= THIS_MODULE,
> +        .name      = WATCHDOG_NAME,
> + Â Â Â Â Â Â Â .of_match_table = altera_wdt_match,
> + Â Â Â },
> +};
> +
> +static int __init altera_wdt_init(void)
> +{
> + Â Â Â return platform_driver_register(&altera_wdt_driver);
> +}
> +
> +static void __exit altera_wdt_exit(void)
> +{
> + Â Â Â platform_driver_unregister(&altera_wdt_driver);
> +}
> +
> +module_init(altera_wdt_init);
> +module_exit(altera_wdt_exit);
> +
> +MODULE_AUTHOR("Walter Goossens, Tobias Klauser <tklauser@xxxxxxxxxx>");
> +MODULE_DESCRIPTION("Driver for Altera Watchdog Timer");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
> +MODULE_ALIAS("platform:" WATCHDOG_NAME);
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
> Please read the FAQ at Âhttp://www.tux.org/lkml/
>
thanks,
marek
--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer
Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
icq: 290551086
web: http://open-nandra.com
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
