* [PATCH] Add watchdog driver for w90p910
@ 2009-07-24 15:06 Wan ZongShun
2009-07-30 1:17 ` Wan ZongShun
2009-08-04 20:10 ` Wim Van Sebroeck
0 siblings, 2 replies; 19+ messages in thread
From: Wan ZongShun @ 2009-07-24 15:06 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear Wim Van Sebroeck,
This is a watchdog driver for my w90p910 platform.
Thanks!
Add watchdog driver for w90p910 platform.
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/watchdog/Kconfig | 9 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/w90p910_wdt.c | 340 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 350 insertions(+), 0 deletions(-)
create mode 100644 drivers/watchdog/w90p910_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b1ccc04..fba4b91 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -266,6 +266,15 @@ config STMP3XXX_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called stmp3xxx_wdt.
+config W90P910_WATCHDOG
+ tristate "Nuvoton W90P910 watchdog"
+ depends on ARCH_W90X900
+ help
+ Say Y here if to include support for the watchdog timer
+ for the Nuvoton W90P910 SoC.
+ To compile this driver as a module, choose M here: the
+ module will be called w90p910_wdt.
+
# AVR32 Architecture
config AT32AP700X_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 3d77429..ecc05b4 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
+obj-$(CONFIG_W90P910_WATCHDOG) += w90p910_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
new file mode 100644
index 0000000..a73f85a
--- /dev/null
+++ b/drivers/watchdog/w90p910_wdt.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2009 Nuvoton technology corporation.
+ *
+ * Wan ZongShun <mcuos.com@gmail.com>
+ *
+ * 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;version 2 of the License.
+ *
+ */
+
+#include <linux/bitops.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/watchdog.h>
+#include <linux/uaccess.h>
+
+#define WDT_DEFAULT_TIME_LEVEL 0 /* if 0, time = 2^14 clocks */
+#define WDT_MAX_TIME_LEVEL 3 /* if 3, time = 2^20 clocks */
+#define REG_WTCR 0x1c
+#define WTCLK (0x01 << 10)
+#define WTE (0x01 << 7) /*wdt enable*/
+#define WTIE (0x01 << 6) /*wdt interrupt enable*/
+#define WTISBIT (0x04)
+#define WTIS (0x03 << 4)
+#define WTIF (0x01 << 3)
+#define WTRF (0x01 << 2)
+#define WTRE (0x01 << 1)
+#define WTR 0x01
+
+static int wdt_time = WDT_DEFAULT_TIME_LEVEL;
+static int nowayout = WATCHDOG_NOWAYOUT;
+
+module_param(wdt_time, int, 0);
+MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
+ __MODULE_STRING(WDT_DEFAULT_TIME) ")");
+
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout,
+ "Watchdog cannot be stopped once started (default="
+ __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+#endif
+
+struct w90p910_wdt {
+ struct resource *res;
+ struct clk *wdt_clock;
+ struct platform_device *pdev;
+ unsigned int open_lock;
+ unsigned int wdt_irq;
+ void __iomem *wdt_base;
+ char expect_close;
+ spinlock_t wdt_lock;
+};
+
+static unsigned long w90p910wdt_busy;
+struct w90p910_wdt *w90p910_wdt;
+
+static void w90p910_wdt_keepalive(void)
+{
+ unsigned int val;
+
+ spin_lock(&w90p910_wdt->wdt_lock);
+
+ val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
+ val |= (WTR | WTIF);
+ __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&w90p910_wdt->wdt_lock);
+}
+
+static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
+{
+ w90p910_wdt_keepalive();
+ return IRQ_HANDLED;
+}
+
+static inline void w90p910_wdt_stop(void)
+{
+ unsigned int val;
+
+ spin_lock(&w90p910_wdt->wdt_lock);
+
+ val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
+ val &= ~WTE;
+ __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&w90p910_wdt->wdt_lock);
+}
+
+static inline void w90p910_wdt_start(void)
+{
+ unsigned int val;
+
+ spin_lock(&w90p910_wdt->wdt_lock);
+
+ val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
+ val |= (WTRE | WTIE | WTE | WTR | WTCLK | WTIF);
+ val |= (wdt_time << 0x04);
+ __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&w90p910_wdt->wdt_lock);
+}
+
+static int w90p910_wdt_open(struct inode *inode, struct file *file)
+{
+
+ if (test_and_set_bit(0, &w90p910wdt_busy))
+ return -EBUSY;
+
+ w90p910_wdt_start();
+ return nonseekable_open(inode, file);
+}
+
+static int w90p910_wdt_close(struct inode *inode, struct file *file)
+{
+ if (!nowayout)
+ w90p910_wdt_stop();
+
+ clear_bit(0, &w90p910wdt_busy);
+ return 0;
+}
+
+static int w90p910_wdt_settimeout(int new_time_level)
+{
+ unsigned int val;
+
+ if ((new_time_level < 0) || (new_time_level > WDT_MAX_TIME_LEVEL))
+ return -EINVAL;
+
+ val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
+ val &= ~WTIS;
+ val |= new_time_level;
+ __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
+
+ wdt_time = new_time_level;
+ return 0;
+}
+
+static struct watchdog_info w90p910_wdt_info = {
+ .identity = "w90p910 watchdog",
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+};
+
+static long w90p910_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, &w90p910_wdt_info,
+ sizeof(w90p910_wdt_info)) ? -EFAULT : 0;
+ case WDIOC_GETSTATUS:
+ case WDIOC_GETBOOTSTATUS:
+ return put_user(0, p);
+ case WDIOC_SETOPTIONS:
+ if (get_user(new_value, p))
+ return -EFAULT;
+ if (new_value & WDIOS_DISABLECARD)
+ w90p910_wdt_stop();
+ if (new_value & WDIOS_ENABLECARD)
+ w90p910_wdt_start();
+ return 0;
+ case WDIOC_KEEPALIVE:
+ w90p910_wdt_keepalive();
+ return 0;
+ case WDIOC_SETTIMEOUT:
+ if (get_user(new_value, p))
+ return -EFAULT;
+ if (w90p910_wdt_settimeout(new_value))
+ return -EINVAL;
+
+ w90p910_wdt_start();
+
+ return put_user(wdt_time, p);
+ case WDIOC_GETTIMEOUT:
+ return put_user(wdt_time, p);
+ default:
+ return -ENOTTY;
+ }
+}
+
+static ssize_t w90p910_wdt_write(struct file *file, const char *data,
+ size_t len, loff_t *ppos)
+{
+ w90p910_wdt_keepalive();
+ return len;
+}
+
+static const struct file_operations w90p910wdt_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .unlocked_ioctl = w90p910_wdt_ioctl,
+ .open = w90p910_wdt_open,
+ .release = w90p910_wdt_close,
+ .write = w90p910_wdt_write,
+};
+
+static struct miscdevice w90p910wdt_miscdev = {
+ .minor = WATCHDOG_MINOR,
+ .name = "watchdog",
+ .fops = &w90p910wdt_fops,
+};
+
+static int __devinit w90p910wdt_probe(struct platform_device *pdev)
+{
+ int ret;
+
+ w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
+ if (!w90p910_wdt)
+ return -ENOMEM;
+
+ w90p910_wdt->pdev = pdev;
+
+ w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (w90p910_wdt->res == NULL) {
+ dev_err(&pdev->dev, "no memory resource specified\n");
+ ret = -ENOENT;
+ goto err_get;
+ }
+
+ if (!request_mem_region(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res), pdev->name)) {
+ dev_err(&pdev->dev, "failed to get memory region\n");
+ ret = -ENOENT;
+ goto err_req;
+ }
+
+ w90p910_wdt->wdt_base = ioremap(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res));
+ if (w90p910_wdt->wdt_base == NULL) {
+ dev_err(&pdev->dev, "failed to ioremap() region\n");
+ ret = -EINVAL;
+ goto err_req;
+ }
+
+ w90p910_wdt->wdt_irq = platform_get_irq(pdev, 0);
+ ret = request_irq(w90p910_wdt->wdt_irq,
+ w90p910_wdt_irq, 0, pdev->name, NULL);
+ if (ret != 0) {
+ dev_err(&pdev->dev, "failed to install irq (%d)\n", ret);
+ goto err_map;
+ }
+
+ w90p910_wdt->wdt_clock = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(w90p910_wdt->wdt_clock)) {
+ dev_err(&pdev->dev, "failed to find watchdog clock source\n");
+ ret = PTR_ERR(w90p910_wdt->wdt_clock);
+ goto err_irq;
+ }
+
+ clk_enable(w90p910_wdt->wdt_clock);
+
+ if (misc_register(&w90p910wdt_miscdev)) {
+ dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
+ WATCHDOG_MINOR, ret);
+ goto err_clk;
+ }
+
+ return 0;
+
+err_clk:
+ clk_disable(w90p910_wdt->wdt_clock);
+ clk_put(w90p910_wdt->wdt_clock);
+err_irq:
+ free_irq(w90p910_wdt->wdt_irq, NULL);
+err_map:
+ iounmap(w90p910_wdt->wdt_base);
+err_req:
+ release_mem_region(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res));
+err_get:
+ kfree(w90p910_wdt);
+ return ret;
+}
+
+static int __devexit w90p910wdt_remove(struct platform_device *pdev)
+{
+ free_irq(w90p910_wdt->wdt_irq, NULL);
+
+ clk_disable(w90p910_wdt->wdt_clock);
+ clk_put(w90p910_wdt->wdt_clock);
+
+ iounmap(w90p910_wdt->wdt_base);
+
+ release_mem_region(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res));
+
+ kfree(w90p910_wdt);
+
+ misc_deregister(&w90p910wdt_miscdev);
+ return 0;
+}
+
+static void w90p910wdt_shutdown(struct platform_device *pdev)
+{
+ w90p910_wdt_stop();
+}
+
+static struct platform_driver w90p910wdt_driver = {
+ .probe = w90p910wdt_probe,
+ .remove = __devexit_p(w90p910wdt_remove),
+ .shutdown = w90p910wdt_shutdown,
+ .driver = {
+ .name = "w90p910-wdt",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init w90p910_wdt_init(void)
+{
+ return platform_driver_register(&w90p910wdt_driver);
+}
+
+static void __exit w90p910_wdt_exit(void)
+{
+ platform_driver_unregister(&w90p910wdt_driver);
+}
+
+module_init(w90p910_wdt_init);
+module_exit(w90p910_wdt_exit);
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
+MODULE_DESCRIPTION("Watchdog driver for W90P910");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:w90p910-wdt");
--
1.5.6.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-07-24 15:06 [PATCH] Add watchdog driver for w90p910 Wan ZongShun
@ 2009-07-30 1:17 ` Wan ZongShun
2009-07-30 5:00 ` Wim Van Sebroeck
2009-08-04 20:10 ` Wim Van Sebroeck
1 sibling, 1 reply; 19+ messages in thread
From: Wan ZongShun @ 2009-07-30 1:17 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear Wim,
How about this watchdog patch?
Would you mind applying?
Thanks for your help.
2009/7/24, Wan ZongShun <mcuos.com@gmail.com>:
> Dear Wim Van Sebroeck,
>
> This is a watchdog driver for my w90p910 platform.
>
> Thanks!
>
>
>
> Add watchdog driver for w90p910 platform.
>
> Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
>
> ---
> drivers/watchdog/Kconfig | 9 +
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/w90p910_wdt.c | 340 ++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 350 insertions(+), 0 deletions(-)
> create mode 100644 drivers/watchdog/w90p910_wdt.c
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index b1ccc04..fba4b91 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -266,6 +266,15 @@ config STMP3XXX_WATCHDOG
> To compile this driver as a module, choose M here: the
> module will be called stmp3xxx_wdt.
>
> +config W90P910_WATCHDOG
> + tristate "Nuvoton W90P910 watchdog"
> + depends on ARCH_W90X900
> + help
> + Say Y here if to include support for the watchdog timer
> + for the Nuvoton W90P910 SoC.
> + To compile this driver as a module, choose M here: the
> + module will be called w90p910_wdt.
> +
> # AVR32 Architecture
>
> config AT32AP700X_WDT
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 3d77429..ecc05b4 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -44,6 +44,7 @@ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
> obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
> obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
> obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
> +obj-$(CONFIG_W90P910_WATCHDOG) += w90p910_wdt.o
>
> # AVR32 Architecture
> obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
> new file mode 100644
> index 0000000..a73f85a
> --- /dev/null
> +++ b/drivers/watchdog/w90p910_wdt.c
> @@ -0,0 +1,340 @@
> +/*
> + * Copyright (c) 2009 Nuvoton technology corporation.
> + *
> + * Wan ZongShun <mcuos.com@gmail.com>
> + *
> + * 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;version 2 of the License.
> + *
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/errno.h>
> +#include <linux/fs.h>
> +#include <linux/init.h>
> +#include <linux/io.h>
> +#include <linux/clk.h>
> +#include <linux/kernel.h>
> +#include <linux/miscdevice.h>
> +#include <linux/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/types.h>
> +#include <linux/watchdog.h>
> +#include <linux/uaccess.h>
> +
> +#define WDT_DEFAULT_TIME_LEVEL 0 /* if 0, time = 2^14 clocks */
> +#define WDT_MAX_TIME_LEVEL 3 /* if 3, time = 2^20 clocks */
> +#define REG_WTCR 0x1c
> +#define WTCLK (0x01 << 10)
> +#define WTE (0x01 << 7) /*wdt enable*/
> +#define WTIE (0x01 << 6) /*wdt interrupt enable*/
> +#define WTISBIT (0x04)
> +#define WTIS (0x03 << 4)
> +#define WTIF (0x01 << 3)
> +#define WTRF (0x01 << 2)
> +#define WTRE (0x01 << 1)
> +#define WTR 0x01
> +
> +static int wdt_time = WDT_DEFAULT_TIME_LEVEL;
> +static int nowayout = WATCHDOG_NOWAYOUT;
> +
> +module_param(wdt_time, int, 0);
> +MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
> + __MODULE_STRING(WDT_DEFAULT_TIME) ")");
> +
> +#ifdef CONFIG_WATCHDOG_NOWAYOUT
> +module_param(nowayout, int, 0);
> +MODULE_PARM_DESC(nowayout,
> + "Watchdog cannot be stopped once started (default="
> + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> +#endif
> +
> +struct w90p910_wdt {
> + struct resource *res;
> + struct clk *wdt_clock;
> + struct platform_device *pdev;
> + unsigned int open_lock;
> + unsigned int wdt_irq;
> + void __iomem *wdt_base;
> + char expect_close;
> + spinlock_t wdt_lock;
> +};
> +
> +static unsigned long w90p910wdt_busy;
> +struct w90p910_wdt *w90p910_wdt;
> +
> +static void w90p910_wdt_keepalive(void)
> +{
> + unsigned int val;
> +
> + spin_lock(&w90p910_wdt->wdt_lock);
> +
> + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> + val |= (WTR | WTIF);
> + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> +
> + spin_unlock(&w90p910_wdt->wdt_lock);
> +}
> +
> +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
> +{
> + w90p910_wdt_keepalive();
> + return IRQ_HANDLED;
> +}
> +
> +static inline void w90p910_wdt_stop(void)
> +{
> + unsigned int val;
> +
> + spin_lock(&w90p910_wdt->wdt_lock);
> +
> + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> + val &= ~WTE;
> + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> +
> + spin_unlock(&w90p910_wdt->wdt_lock);
> +}
> +
> +static inline void w90p910_wdt_start(void)
> +{
> + unsigned int val;
> +
> + spin_lock(&w90p910_wdt->wdt_lock);
> +
> + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> + val |= (WTRE | WTIE | WTE | WTR | WTCLK | WTIF);
> + val |= (wdt_time << 0x04);
> + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> +
> + spin_unlock(&w90p910_wdt->wdt_lock);
> +}
> +
> +static int w90p910_wdt_open(struct inode *inode, struct file *file)
> +{
> +
> + if (test_and_set_bit(0, &w90p910wdt_busy))
> + return -EBUSY;
> +
> + w90p910_wdt_start();
> + return nonseekable_open(inode, file);
> +}
> +
> +static int w90p910_wdt_close(struct inode *inode, struct file *file)
> +{
> + if (!nowayout)
> + w90p910_wdt_stop();
> +
> + clear_bit(0, &w90p910wdt_busy);
> + return 0;
> +}
> +
> +static int w90p910_wdt_settimeout(int new_time_level)
> +{
> + unsigned int val;
> +
> + if ((new_time_level < 0) || (new_time_level > WDT_MAX_TIME_LEVEL))
> + return -EINVAL;
> +
> + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> + val &= ~WTIS;
> + val |= new_time_level;
> + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> +
> + wdt_time = new_time_level;
> + return 0;
> +}
> +
> +static struct watchdog_info w90p910_wdt_info = {
> + .identity = "w90p910 watchdog",
> + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
> +};
> +
> +static long w90p910_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, &w90p910_wdt_info,
> + sizeof(w90p910_wdt_info)) ? -EFAULT : 0;
> + case WDIOC_GETSTATUS:
> + case WDIOC_GETBOOTSTATUS:
> + return put_user(0, p);
> + case WDIOC_SETOPTIONS:
> + if (get_user(new_value, p))
> + return -EFAULT;
> + if (new_value & WDIOS_DISABLECARD)
> + w90p910_wdt_stop();
> + if (new_value & WDIOS_ENABLECARD)
> + w90p910_wdt_start();
> + return 0;
> + case WDIOC_KEEPALIVE:
> + w90p910_wdt_keepalive();
> + return 0;
> + case WDIOC_SETTIMEOUT:
> + if (get_user(new_value, p))
> + return -EFAULT;
> + if (w90p910_wdt_settimeout(new_value))
> + return -EINVAL;
> +
> + w90p910_wdt_start();
> +
> + return put_user(wdt_time, p);
> + case WDIOC_GETTIMEOUT:
> + return put_user(wdt_time, p);
> + default:
> + return -ENOTTY;
> + }
> +}
> +
> +static ssize_t w90p910_wdt_write(struct file *file, const char *data,
> + size_t len, loff_t *ppos)
> +{
> + w90p910_wdt_keepalive();
> + return len;
> +}
> +
> +static const struct file_operations w90p910wdt_fops = {
> + .owner = THIS_MODULE,
> + .llseek = no_llseek,
> + .unlocked_ioctl = w90p910_wdt_ioctl,
> + .open = w90p910_wdt_open,
> + .release = w90p910_wdt_close,
> + .write = w90p910_wdt_write,
> +};
> +
> +static struct miscdevice w90p910wdt_miscdev = {
> + .minor = WATCHDOG_MINOR,
> + .name = "watchdog",
> + .fops = &w90p910wdt_fops,
> +};
> +
> +static int __devinit w90p910wdt_probe(struct platform_device *pdev)
> +{
> + int ret;
> +
> + w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
> + if (!w90p910_wdt)
> + return -ENOMEM;
> +
> + w90p910_wdt->pdev = pdev;
> +
> + w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (w90p910_wdt->res == NULL) {
> + dev_err(&pdev->dev, "no memory resource specified\n");
> + ret = -ENOENT;
> + goto err_get;
> + }
> +
> + if (!request_mem_region(w90p910_wdt->res->start,
> + resource_size(w90p910_wdt->res), pdev->name)) {
> + dev_err(&pdev->dev, "failed to get memory region\n");
> + ret = -ENOENT;
> + goto err_req;
> + }
> +
> + w90p910_wdt->wdt_base = ioremap(w90p910_wdt->res->start,
> + resource_size(w90p910_wdt->res));
> + if (w90p910_wdt->wdt_base == NULL) {
> + dev_err(&pdev->dev, "failed to ioremap() region\n");
> + ret = -EINVAL;
> + goto err_req;
> + }
> +
> + w90p910_wdt->wdt_irq = platform_get_irq(pdev, 0);
> + ret = request_irq(w90p910_wdt->wdt_irq,
> + w90p910_wdt_irq, 0, pdev->name, NULL);
> + if (ret != 0) {
> + dev_err(&pdev->dev, "failed to install irq (%d)\n", ret);
> + goto err_map;
> + }
> +
> + w90p910_wdt->wdt_clock = clk_get(&pdev->dev, NULL);
> + if (IS_ERR(w90p910_wdt->wdt_clock)) {
> + dev_err(&pdev->dev, "failed to find watchdog clock source\n");
> + ret = PTR_ERR(w90p910_wdt->wdt_clock);
> + goto err_irq;
> + }
> +
> + clk_enable(w90p910_wdt->wdt_clock);
> +
> + if (misc_register(&w90p910wdt_miscdev)) {
> + dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
> + WATCHDOG_MINOR, ret);
> + goto err_clk;
> + }
> +
> + return 0;
> +
> +err_clk:
> + clk_disable(w90p910_wdt->wdt_clock);
> + clk_put(w90p910_wdt->wdt_clock);
> +err_irq:
> + free_irq(w90p910_wdt->wdt_irq, NULL);
> +err_map:
> + iounmap(w90p910_wdt->wdt_base);
> +err_req:
> + release_mem_region(w90p910_wdt->res->start,
> + resource_size(w90p910_wdt->res));
> +err_get:
> + kfree(w90p910_wdt);
> + return ret;
> +}
> +
> +static int __devexit w90p910wdt_remove(struct platform_device *pdev)
> +{
> + free_irq(w90p910_wdt->wdt_irq, NULL);
> +
> + clk_disable(w90p910_wdt->wdt_clock);
> + clk_put(w90p910_wdt->wdt_clock);
> +
> + iounmap(w90p910_wdt->wdt_base);
> +
> + release_mem_region(w90p910_wdt->res->start,
> + resource_size(w90p910_wdt->res));
> +
> + kfree(w90p910_wdt);
> +
> + misc_deregister(&w90p910wdt_miscdev);
> + return 0;
> +}
> +
> +static void w90p910wdt_shutdown(struct platform_device *pdev)
> +{
> + w90p910_wdt_stop();
> +}
> +
> +static struct platform_driver w90p910wdt_driver = {
> + .probe = w90p910wdt_probe,
> + .remove = __devexit_p(w90p910wdt_remove),
> + .shutdown = w90p910wdt_shutdown,
> + .driver = {
> + .name = "w90p910-wdt",
> + .owner = THIS_MODULE,
> + },
> +};
> +
> +static int __init w90p910_wdt_init(void)
> +{
> + return platform_driver_register(&w90p910wdt_driver);
> +}
> +
> +static void __exit w90p910_wdt_exit(void)
> +{
> + platform_driver_unregister(&w90p910wdt_driver);
> +}
> +
> +module_init(w90p910_wdt_init);
> +module_exit(w90p910_wdt_exit);
> +
> +MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
> +MODULE_DESCRIPTION("Watchdog driver for W90P910");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
> +MODULE_ALIAS("platform:w90p910-wdt");
> --
> 1.5.6.3
>
--
Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-07-30 1:17 ` Wan ZongShun
@ 2009-07-30 5:00 ` Wim Van Sebroeck
2009-07-30 5:03 ` Wan ZongShun
0 siblings, 1 reply; 19+ messages in thread
From: Wim Van Sebroeck @ 2009-07-30 5:00 UTC (permalink / raw)
To: Wan ZongShun; +Cc: linux-arm-kernel, linux-kernel
Hi Wan,
will be reviewed still this week.
Kind regards,
Wim.
> Dear Wim,
>
> How about this watchdog patch?
> Would you mind applying?
>
> Thanks for your help.
>
> 2009/7/24, Wan ZongShun <mcuos.com@gmail.com>:
> > Dear Wim Van Sebroeck,
> >
> > This is a watchdog driver for my w90p910 platform.
> >
> > Thanks!
> >
> >
> >
> > Add watchdog driver for w90p910 platform.
> >
> > Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
> >
> > ---
> > drivers/watchdog/Kconfig | 9 +
> > drivers/watchdog/Makefile | 1 +
> > drivers/watchdog/w90p910_wdt.c | 340 ++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 350 insertions(+), 0 deletions(-)
> > create mode 100644 drivers/watchdog/w90p910_wdt.c
> >
> > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > index b1ccc04..fba4b91 100644
> > --- a/drivers/watchdog/Kconfig
> > +++ b/drivers/watchdog/Kconfig
> > @@ -266,6 +266,15 @@ config STMP3XXX_WATCHDOG
> > To compile this driver as a module, choose M here: the
> > module will be called stmp3xxx_wdt.
> >
> > +config W90P910_WATCHDOG
> > + tristate "Nuvoton W90P910 watchdog"
> > + depends on ARCH_W90X900
> > + help
> > + Say Y here if to include support for the watchdog timer
> > + for the Nuvoton W90P910 SoC.
> > + To compile this driver as a module, choose M here: the
> > + module will be called w90p910_wdt.
> > +
> > # AVR32 Architecture
> >
> > config AT32AP700X_WDT
> > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > index 3d77429..ecc05b4 100644
> > --- a/drivers/watchdog/Makefile
> > +++ b/drivers/watchdog/Makefile
> > @@ -44,6 +44,7 @@ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
> > obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
> > obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
> > obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
> > +obj-$(CONFIG_W90P910_WATCHDOG) += w90p910_wdt.o
> >
> > # AVR32 Architecture
> > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> > diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
> > new file mode 100644
> > index 0000000..a73f85a
> > --- /dev/null
> > +++ b/drivers/watchdog/w90p910_wdt.c
> > @@ -0,0 +1,340 @@
> > +/*
> > + * Copyright (c) 2009 Nuvoton technology corporation.
> > + *
> > + * Wan ZongShun <mcuos.com@gmail.com>
> > + *
> > + * 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;version 2 of the License.
> > + *
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/errno.h>
> > +#include <linux/fs.h>
> > +#include <linux/init.h>
> > +#include <linux/io.h>
> > +#include <linux/clk.h>
> > +#include <linux/kernel.h>
> > +#include <linux/miscdevice.h>
> > +#include <linux/module.h>
> > +#include <linux/moduleparam.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/types.h>
> > +#include <linux/watchdog.h>
> > +#include <linux/uaccess.h>
> > +
> > +#define WDT_DEFAULT_TIME_LEVEL 0 /* if 0, time = 2^14 clocks */
> > +#define WDT_MAX_TIME_LEVEL 3 /* if 3, time = 2^20 clocks */
> > +#define REG_WTCR 0x1c
> > +#define WTCLK (0x01 << 10)
> > +#define WTE (0x01 << 7) /*wdt enable*/
> > +#define WTIE (0x01 << 6) /*wdt interrupt enable*/
> > +#define WTISBIT (0x04)
> > +#define WTIS (0x03 << 4)
> > +#define WTIF (0x01 << 3)
> > +#define WTRF (0x01 << 2)
> > +#define WTRE (0x01 << 1)
> > +#define WTR 0x01
> > +
> > +static int wdt_time = WDT_DEFAULT_TIME_LEVEL;
> > +static int nowayout = WATCHDOG_NOWAYOUT;
> > +
> > +module_param(wdt_time, int, 0);
> > +MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
> > + __MODULE_STRING(WDT_DEFAULT_TIME) ")");
> > +
> > +#ifdef CONFIG_WATCHDOG_NOWAYOUT
> > +module_param(nowayout, int, 0);
> > +MODULE_PARM_DESC(nowayout,
> > + "Watchdog cannot be stopped once started (default="
> > + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> > +#endif
> > +
> > +struct w90p910_wdt {
> > + struct resource *res;
> > + struct clk *wdt_clock;
> > + struct platform_device *pdev;
> > + unsigned int open_lock;
> > + unsigned int wdt_irq;
> > + void __iomem *wdt_base;
> > + char expect_close;
> > + spinlock_t wdt_lock;
> > +};
> > +
> > +static unsigned long w90p910wdt_busy;
> > +struct w90p910_wdt *w90p910_wdt;
> > +
> > +static void w90p910_wdt_keepalive(void)
> > +{
> > + unsigned int val;
> > +
> > + spin_lock(&w90p910_wdt->wdt_lock);
> > +
> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> > + val |= (WTR | WTIF);
> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> > +
> > + spin_unlock(&w90p910_wdt->wdt_lock);
> > +}
> > +
> > +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
> > +{
> > + w90p910_wdt_keepalive();
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static inline void w90p910_wdt_stop(void)
> > +{
> > + unsigned int val;
> > +
> > + spin_lock(&w90p910_wdt->wdt_lock);
> > +
> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> > + val &= ~WTE;
> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> > +
> > + spin_unlock(&w90p910_wdt->wdt_lock);
> > +}
> > +
> > +static inline void w90p910_wdt_start(void)
> > +{
> > + unsigned int val;
> > +
> > + spin_lock(&w90p910_wdt->wdt_lock);
> > +
> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> > + val |= (WTRE | WTIE | WTE | WTR | WTCLK | WTIF);
> > + val |= (wdt_time << 0x04);
> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> > +
> > + spin_unlock(&w90p910_wdt->wdt_lock);
> > +}
> > +
> > +static int w90p910_wdt_open(struct inode *inode, struct file *file)
> > +{
> > +
> > + if (test_and_set_bit(0, &w90p910wdt_busy))
> > + return -EBUSY;
> > +
> > + w90p910_wdt_start();
> > + return nonseekable_open(inode, file);
> > +}
> > +
> > +static int w90p910_wdt_close(struct inode *inode, struct file *file)
> > +{
> > + if (!nowayout)
> > + w90p910_wdt_stop();
> > +
> > + clear_bit(0, &w90p910wdt_busy);
> > + return 0;
> > +}
> > +
> > +static int w90p910_wdt_settimeout(int new_time_level)
> > +{
> > + unsigned int val;
> > +
> > + if ((new_time_level < 0) || (new_time_level > WDT_MAX_TIME_LEVEL))
> > + return -EINVAL;
> > +
> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> > + val &= ~WTIS;
> > + val |= new_time_level;
> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
> > +
> > + wdt_time = new_time_level;
> > + return 0;
> > +}
> > +
> > +static struct watchdog_info w90p910_wdt_info = {
> > + .identity = "w90p910 watchdog",
> > + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
> > +};
> > +
> > +static long w90p910_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, &w90p910_wdt_info,
> > + sizeof(w90p910_wdt_info)) ? -EFAULT : 0;
> > + case WDIOC_GETSTATUS:
> > + case WDIOC_GETBOOTSTATUS:
> > + return put_user(0, p);
> > + case WDIOC_SETOPTIONS:
> > + if (get_user(new_value, p))
> > + return -EFAULT;
> > + if (new_value & WDIOS_DISABLECARD)
> > + w90p910_wdt_stop();
> > + if (new_value & WDIOS_ENABLECARD)
> > + w90p910_wdt_start();
> > + return 0;
> > + case WDIOC_KEEPALIVE:
> > + w90p910_wdt_keepalive();
> > + return 0;
> > + case WDIOC_SETTIMEOUT:
> > + if (get_user(new_value, p))
> > + return -EFAULT;
> > + if (w90p910_wdt_settimeout(new_value))
> > + return -EINVAL;
> > +
> > + w90p910_wdt_start();
> > +
> > + return put_user(wdt_time, p);
> > + case WDIOC_GETTIMEOUT:
> > + return put_user(wdt_time, p);
> > + default:
> > + return -ENOTTY;
> > + }
> > +}
> > +
> > +static ssize_t w90p910_wdt_write(struct file *file, const char *data,
> > + size_t len, loff_t *ppos)
> > +{
> > + w90p910_wdt_keepalive();
> > + return len;
> > +}
> > +
> > +static const struct file_operations w90p910wdt_fops = {
> > + .owner = THIS_MODULE,
> > + .llseek = no_llseek,
> > + .unlocked_ioctl = w90p910_wdt_ioctl,
> > + .open = w90p910_wdt_open,
> > + .release = w90p910_wdt_close,
> > + .write = w90p910_wdt_write,
> > +};
> > +
> > +static struct miscdevice w90p910wdt_miscdev = {
> > + .minor = WATCHDOG_MINOR,
> > + .name = "watchdog",
> > + .fops = &w90p910wdt_fops,
> > +};
> > +
> > +static int __devinit w90p910wdt_probe(struct platform_device *pdev)
> > +{
> > + int ret;
> > +
> > + w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
> > + if (!w90p910_wdt)
> > + return -ENOMEM;
> > +
> > + w90p910_wdt->pdev = pdev;
> > +
> > + w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + if (w90p910_wdt->res == NULL) {
> > + dev_err(&pdev->dev, "no memory resource specified\n");
> > + ret = -ENOENT;
> > + goto err_get;
> > + }
> > +
> > + if (!request_mem_region(w90p910_wdt->res->start,
> > + resource_size(w90p910_wdt->res), pdev->name)) {
> > + dev_err(&pdev->dev, "failed to get memory region\n");
> > + ret = -ENOENT;
> > + goto err_req;
> > + }
> > +
> > + w90p910_wdt->wdt_base = ioremap(w90p910_wdt->res->start,
> > + resource_size(w90p910_wdt->res));
> > + if (w90p910_wdt->wdt_base == NULL) {
> > + dev_err(&pdev->dev, "failed to ioremap() region\n");
> > + ret = -EINVAL;
> > + goto err_req;
> > + }
> > +
> > + w90p910_wdt->wdt_irq = platform_get_irq(pdev, 0);
> > + ret = request_irq(w90p910_wdt->wdt_irq,
> > + w90p910_wdt_irq, 0, pdev->name, NULL);
> > + if (ret != 0) {
> > + dev_err(&pdev->dev, "failed to install irq (%d)\n", ret);
> > + goto err_map;
> > + }
> > +
> > + w90p910_wdt->wdt_clock = clk_get(&pdev->dev, NULL);
> > + if (IS_ERR(w90p910_wdt->wdt_clock)) {
> > + dev_err(&pdev->dev, "failed to find watchdog clock source\n");
> > + ret = PTR_ERR(w90p910_wdt->wdt_clock);
> > + goto err_irq;
> > + }
> > +
> > + clk_enable(w90p910_wdt->wdt_clock);
> > +
> > + if (misc_register(&w90p910wdt_miscdev)) {
> > + dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
> > + WATCHDOG_MINOR, ret);
> > + goto err_clk;
> > + }
> > +
> > + return 0;
> > +
> > +err_clk:
> > + clk_disable(w90p910_wdt->wdt_clock);
> > + clk_put(w90p910_wdt->wdt_clock);
> > +err_irq:
> > + free_irq(w90p910_wdt->wdt_irq, NULL);
> > +err_map:
> > + iounmap(w90p910_wdt->wdt_base);
> > +err_req:
> > + release_mem_region(w90p910_wdt->res->start,
> > + resource_size(w90p910_wdt->res));
> > +err_get:
> > + kfree(w90p910_wdt);
> > + return ret;
> > +}
> > +
> > +static int __devexit w90p910wdt_remove(struct platform_device *pdev)
> > +{
> > + free_irq(w90p910_wdt->wdt_irq, NULL);
> > +
> > + clk_disable(w90p910_wdt->wdt_clock);
> > + clk_put(w90p910_wdt->wdt_clock);
> > +
> > + iounmap(w90p910_wdt->wdt_base);
> > +
> > + release_mem_region(w90p910_wdt->res->start,
> > + resource_size(w90p910_wdt->res));
> > +
> > + kfree(w90p910_wdt);
> > +
> > + misc_deregister(&w90p910wdt_miscdev);
> > + return 0;
> > +}
> > +
> > +static void w90p910wdt_shutdown(struct platform_device *pdev)
> > +{
> > + w90p910_wdt_stop();
> > +}
> > +
> > +static struct platform_driver w90p910wdt_driver = {
> > + .probe = w90p910wdt_probe,
> > + .remove = __devexit_p(w90p910wdt_remove),
> > + .shutdown = w90p910wdt_shutdown,
> > + .driver = {
> > + .name = "w90p910-wdt",
> > + .owner = THIS_MODULE,
> > + },
> > +};
> > +
> > +static int __init w90p910_wdt_init(void)
> > +{
> > + return platform_driver_register(&w90p910wdt_driver);
> > +}
> > +
> > +static void __exit w90p910_wdt_exit(void)
> > +{
> > + platform_driver_unregister(&w90p910wdt_driver);
> > +}
> > +
> > +module_init(w90p910_wdt_init);
> > +module_exit(w90p910_wdt_exit);
> > +
> > +MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
> > +MODULE_DESCRIPTION("Watchdog driver for W90P910");
> > +MODULE_LICENSE("GPL");
> > +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
> > +MODULE_ALIAS("platform:w90p910-wdt");
> > --
> > 1.5.6.3
> >
>
>
> --
> Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-07-30 5:00 ` Wim Van Sebroeck
@ 2009-07-30 5:03 ` Wan ZongShun
0 siblings, 0 replies; 19+ messages in thread
From: Wan ZongShun @ 2009-07-30 5:03 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Hi Wim ,
Okay, got it, thanks a lot for your help!
2009/7/30 Wim Van Sebroeck <wim@iguana.be>:
> Hi Wan,
>
> will be reviewed still this week.
>
> Kind regards,
> Wim.
>
>> Dear Wim,
>>
>> How about this watchdog patch?
>> Would you mind applying?
>>
>> Thanks for your help.
>>
>> 2009/7/24, Wan ZongShun <mcuos.com@gmail.com>:
>> > Dear Wim Van Sebroeck,
>> >
>> > This is a watchdog driver for my w90p910 platform.
>> >
>> > Thanks!
>> >
>> >
>> >
>> > Add watchdog driver for w90p910 platform.
>> >
>> > Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
>> >
>> > ---
>> > drivers/watchdog/Kconfig | 9 +
>> > drivers/watchdog/Makefile | 1 +
>> > drivers/watchdog/w90p910_wdt.c | 340 ++++++++++++++++++++++++++++++++++++++++
>> > 3 files changed, 350 insertions(+), 0 deletions(-)
>> > create mode 100644 drivers/watchdog/w90p910_wdt.c
>> >
>> > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
>> > index b1ccc04..fba4b91 100644
>> > --- a/drivers/watchdog/Kconfig
>> > +++ b/drivers/watchdog/Kconfig
>> > @@ -266,6 +266,15 @@ config STMP3XXX_WATCHDOG
>> > To compile this driver as a module, choose M here: the
>> > module will be called stmp3xxx_wdt.
>> >
>> > +config W90P910_WATCHDOG
>> > + tristate "Nuvoton W90P910 watchdog"
>> > + depends on ARCH_W90X900
>> > + help
>> > + Say Y here if to include support for the watchdog timer
>> > + for the Nuvoton W90P910 SoC.
>> > + To compile this driver as a module, choose M here: the
>> > + module will be called w90p910_wdt.
>> > +
>> > # AVR32 Architecture
>> >
>> > config AT32AP700X_WDT
>> > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
>> > index 3d77429..ecc05b4 100644
>> > --- a/drivers/watchdog/Makefile
>> > +++ b/drivers/watchdog/Makefile
>> > @@ -44,6 +44,7 @@ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
>> > obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
>> > obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
>> > obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
>> > +obj-$(CONFIG_W90P910_WATCHDOG) += w90p910_wdt.o
>> >
>> > # AVR32 Architecture
>> > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
>> > diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
>> > new file mode 100644
>> > index 0000000..a73f85a
>> > --- /dev/null
>> > +++ b/drivers/watchdog/w90p910_wdt.c
>> > @@ -0,0 +1,340 @@
>> > +/*
>> > + * Copyright (c) 2009 Nuvoton technology corporation.
>> > + *
>> > + * Wan ZongShun <mcuos.com@gmail.com>
>> > + *
>> > + * 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;version 2 of the License.
>> > + *
>> > + */
>> > +
>> > +#include <linux/bitops.h>
>> > +#include <linux/errno.h>
>> > +#include <linux/fs.h>
>> > +#include <linux/init.h>
>> > +#include <linux/io.h>
>> > +#include <linux/clk.h>
>> > +#include <linux/kernel.h>
>> > +#include <linux/miscdevice.h>
>> > +#include <linux/module.h>
>> > +#include <linux/moduleparam.h>
>> > +#include <linux/platform_device.h>
>> > +#include <linux/interrupt.h>
>> > +#include <linux/types.h>
>> > +#include <linux/watchdog.h>
>> > +#include <linux/uaccess.h>
>> > +
>> > +#define WDT_DEFAULT_TIME_LEVEL 0 /* if 0, time = 2^14 clocks */
>> > +#define WDT_MAX_TIME_LEVEL 3 /* if 3, time = 2^20 clocks */
>> > +#define REG_WTCR 0x1c
>> > +#define WTCLK (0x01 << 10)
>> > +#define WTE (0x01 << 7) /*wdt enable*/
>> > +#define WTIE (0x01 << 6) /*wdt interrupt enable*/
>> > +#define WTISBIT (0x04)
>> > +#define WTIS (0x03 << 4)
>> > +#define WTIF (0x01 << 3)
>> > +#define WTRF (0x01 << 2)
>> > +#define WTRE (0x01 << 1)
>> > +#define WTR 0x01
>> > +
>> > +static int wdt_time = WDT_DEFAULT_TIME_LEVEL;
>> > +static int nowayout = WATCHDOG_NOWAYOUT;
>> > +
>> > +module_param(wdt_time, int, 0);
>> > +MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
>> > + __MODULE_STRING(WDT_DEFAULT_TIME) ")");
>> > +
>> > +#ifdef CONFIG_WATCHDOG_NOWAYOUT
>> > +module_param(nowayout, int, 0);
>> > +MODULE_PARM_DESC(nowayout,
>> > + "Watchdog cannot be stopped once started (default="
>> > + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
>> > +#endif
>> > +
>> > +struct w90p910_wdt {
>> > + struct resource *res;
>> > + struct clk *wdt_clock;
>> > + struct platform_device *pdev;
>> > + unsigned int open_lock;
>> > + unsigned int wdt_irq;
>> > + void __iomem *wdt_base;
>> > + char expect_close;
>> > + spinlock_t wdt_lock;
>> > +};
>> > +
>> > +static unsigned long w90p910wdt_busy;
>> > +struct w90p910_wdt *w90p910_wdt;
>> > +
>> > +static void w90p910_wdt_keepalive(void)
>> > +{
>> > + unsigned int val;
>> > +
>> > + spin_lock(&w90p910_wdt->wdt_lock);
>> > +
>> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
>> > + val |= (WTR | WTIF);
>> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
>> > +
>> > + spin_unlock(&w90p910_wdt->wdt_lock);
>> > +}
>> > +
>> > +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
>> > +{
>> > + w90p910_wdt_keepalive();
>> > + return IRQ_HANDLED;
>> > +}
>> > +
>> > +static inline void w90p910_wdt_stop(void)
>> > +{
>> > + unsigned int val;
>> > +
>> > + spin_lock(&w90p910_wdt->wdt_lock);
>> > +
>> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
>> > + val &= ~WTE;
>> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
>> > +
>> > + spin_unlock(&w90p910_wdt->wdt_lock);
>> > +}
>> > +
>> > +static inline void w90p910_wdt_start(void)
>> > +{
>> > + unsigned int val;
>> > +
>> > + spin_lock(&w90p910_wdt->wdt_lock);
>> > +
>> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
>> > + val |= (WTRE | WTIE | WTE | WTR | WTCLK | WTIF);
>> > + val |= (wdt_time << 0x04);
>> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
>> > +
>> > + spin_unlock(&w90p910_wdt->wdt_lock);
>> > +}
>> > +
>> > +static int w90p910_wdt_open(struct inode *inode, struct file *file)
>> > +{
>> > +
>> > + if (test_and_set_bit(0, &w90p910wdt_busy))
>> > + return -EBUSY;
>> > +
>> > + w90p910_wdt_start();
>> > + return nonseekable_open(inode, file);
>> > +}
>> > +
>> > +static int w90p910_wdt_close(struct inode *inode, struct file *file)
>> > +{
>> > + if (!nowayout)
>> > + w90p910_wdt_stop();
>> > +
>> > + clear_bit(0, &w90p910wdt_busy);
>> > + return 0;
>> > +}
>> > +
>> > +static int w90p910_wdt_settimeout(int new_time_level)
>> > +{
>> > + unsigned int val;
>> > +
>> > + if ((new_time_level < 0) || (new_time_level > WDT_MAX_TIME_LEVEL))
>> > + return -EINVAL;
>> > +
>> > + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
>> > + val &= ~WTIS;
>> > + val |= new_time_level;
>> > + __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
>> > +
>> > + wdt_time = new_time_level;
>> > + return 0;
>> > +}
>> > +
>> > +static struct watchdog_info w90p910_wdt_info = {
>> > + .identity = "w90p910 watchdog",
>> > + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
>> > +};
>> > +
>> > +static long w90p910_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, &w90p910_wdt_info,
>> > + sizeof(w90p910_wdt_info)) ? -EFAULT : 0;
>> > + case WDIOC_GETSTATUS:
>> > + case WDIOC_GETBOOTSTATUS:
>> > + return put_user(0, p);
>> > + case WDIOC_SETOPTIONS:
>> > + if (get_user(new_value, p))
>> > + return -EFAULT;
>> > + if (new_value & WDIOS_DISABLECARD)
>> > + w90p910_wdt_stop();
>> > + if (new_value & WDIOS_ENABLECARD)
>> > + w90p910_wdt_start();
>> > + return 0;
>> > + case WDIOC_KEEPALIVE:
>> > + w90p910_wdt_keepalive();
>> > + return 0;
>> > + case WDIOC_SETTIMEOUT:
>> > + if (get_user(new_value, p))
>> > + return -EFAULT;
>> > + if (w90p910_wdt_settimeout(new_value))
>> > + return -EINVAL;
>> > +
>> > + w90p910_wdt_start();
>> > +
>> > + return put_user(wdt_time, p);
>> > + case WDIOC_GETTIMEOUT:
>> > + return put_user(wdt_time, p);
>> > + default:
>> > + return -ENOTTY;
>> > + }
>> > +}
>> > +
>> > +static ssize_t w90p910_wdt_write(struct file *file, const char *data,
>> > + size_t len, loff_t *ppos)
>> > +{
>> > + w90p910_wdt_keepalive();
>> > + return len;
>> > +}
>> > +
>> > +static const struct file_operations w90p910wdt_fops = {
>> > + .owner = THIS_MODULE,
>> > + .llseek = no_llseek,
>> > + .unlocked_ioctl = w90p910_wdt_ioctl,
>> > + .open = w90p910_wdt_open,
>> > + .release = w90p910_wdt_close,
>> > + .write = w90p910_wdt_write,
>> > +};
>> > +
>> > +static struct miscdevice w90p910wdt_miscdev = {
>> > + .minor = WATCHDOG_MINOR,
>> > + .name = "watchdog",
>> > + .fops = &w90p910wdt_fops,
>> > +};
>> > +
>> > +static int __devinit w90p910wdt_probe(struct platform_device *pdev)
>> > +{
>> > + int ret;
>> > +
>> > + w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
>> > + if (!w90p910_wdt)
>> > + return -ENOMEM;
>> > +
>> > + w90p910_wdt->pdev = pdev;
>> > +
>> > + w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> > + if (w90p910_wdt->res == NULL) {
>> > + dev_err(&pdev->dev, "no memory resource specified\n");
>> > + ret = -ENOENT;
>> > + goto err_get;
>> > + }
>> > +
>> > + if (!request_mem_region(w90p910_wdt->res->start,
>> > + resource_size(w90p910_wdt->res), pdev->name)) {
>> > + dev_err(&pdev->dev, "failed to get memory region\n");
>> > + ret = -ENOENT;
>> > + goto err_req;
>> > + }
>> > +
>> > + w90p910_wdt->wdt_base = ioremap(w90p910_wdt->res->start,
>> > + resource_size(w90p910_wdt->res));
>> > + if (w90p910_wdt->wdt_base == NULL) {
>> > + dev_err(&pdev->dev, "failed to ioremap() region\n");
>> > + ret = -EINVAL;
>> > + goto err_req;
>> > + }
>> > +
>> > + w90p910_wdt->wdt_irq = platform_get_irq(pdev, 0);
>> > + ret = request_irq(w90p910_wdt->wdt_irq,
>> > + w90p910_wdt_irq, 0, pdev->name, NULL);
>> > + if (ret != 0) {
>> > + dev_err(&pdev->dev, "failed to install irq (%d)\n", ret);
>> > + goto err_map;
>> > + }
>> > +
>> > + w90p910_wdt->wdt_clock = clk_get(&pdev->dev, NULL);
>> > + if (IS_ERR(w90p910_wdt->wdt_clock)) {
>> > + dev_err(&pdev->dev, "failed to find watchdog clock source\n");
>> > + ret = PTR_ERR(w90p910_wdt->wdt_clock);
>> > + goto err_irq;
>> > + }
>> > +
>> > + clk_enable(w90p910_wdt->wdt_clock);
>> > +
>> > + if (misc_register(&w90p910wdt_miscdev)) {
>> > + dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
>> > + WATCHDOG_MINOR, ret);
>> > + goto err_clk;
>> > + }
>> > +
>> > + return 0;
>> > +
>> > +err_clk:
>> > + clk_disable(w90p910_wdt->wdt_clock);
>> > + clk_put(w90p910_wdt->wdt_clock);
>> > +err_irq:
>> > + free_irq(w90p910_wdt->wdt_irq, NULL);
>> > +err_map:
>> > + iounmap(w90p910_wdt->wdt_base);
>> > +err_req:
>> > + release_mem_region(w90p910_wdt->res->start,
>> > + resource_size(w90p910_wdt->res));
>> > +err_get:
>> > + kfree(w90p910_wdt);
>> > + return ret;
>> > +}
>> > +
>> > +static int __devexit w90p910wdt_remove(struct platform_device *pdev)
>> > +{
>> > + free_irq(w90p910_wdt->wdt_irq, NULL);
>> > +
>> > + clk_disable(w90p910_wdt->wdt_clock);
>> > + clk_put(w90p910_wdt->wdt_clock);
>> > +
>> > + iounmap(w90p910_wdt->wdt_base);
>> > +
>> > + release_mem_region(w90p910_wdt->res->start,
>> > + resource_size(w90p910_wdt->res));
>> > +
>> > + kfree(w90p910_wdt);
>> > +
>> > + misc_deregister(&w90p910wdt_miscdev);
>> > + return 0;
>> > +}
>> > +
>> > +static void w90p910wdt_shutdown(struct platform_device *pdev)
>> > +{
>> > + w90p910_wdt_stop();
>> > +}
>> > +
>> > +static struct platform_driver w90p910wdt_driver = {
>> > + .probe = w90p910wdt_probe,
>> > + .remove = __devexit_p(w90p910wdt_remove),
>> > + .shutdown = w90p910wdt_shutdown,
>> > + .driver = {
>> > + .name = "w90p910-wdt",
>> > + .owner = THIS_MODULE,
>> > + },
>> > +};
>> > +
>> > +static int __init w90p910_wdt_init(void)
>> > +{
>> > + return platform_driver_register(&w90p910wdt_driver);
>> > +}
>> > +
>> > +static void __exit w90p910_wdt_exit(void)
>> > +{
>> > + platform_driver_unregister(&w90p910wdt_driver);
>> > +}
>> > +
>> > +module_init(w90p910_wdt_init);
>> > +module_exit(w90p910_wdt_exit);
>> > +
>> > +MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
>> > +MODULE_DESCRIPTION("Watchdog driver for W90P910");
>> > +MODULE_LICENSE("GPL");
>> > +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
>> > +MODULE_ALIAS("platform:w90p910-wdt");
>> > --
>> > 1.5.6.3
>> >
>>
>>
>> --
>> Wan z.s
>
--
Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-07-24 15:06 [PATCH] Add watchdog driver for w90p910 Wan ZongShun
2009-07-30 1:17 ` Wan ZongShun
@ 2009-08-04 20:10 ` Wim Van Sebroeck
2009-08-05 2:55 ` Wan ZongShun
2009-08-05 11:37 ` [PATCH] " Wan ZongShun
1 sibling, 2 replies; 19+ messages in thread
From: Wim Van Sebroeck @ 2009-08-04 20:10 UTC (permalink / raw)
To: Wan ZongShun; +Cc: linux-arm-kernel, linux-kernel
Hi Wan,
I reviewed your code and have some comments and questions.
...
> +struct w90p910_wdt {
> + struct resource *res;
> + struct clk *wdt_clock;
> + struct platform_device *pdev;
> + unsigned int open_lock;
> + unsigned int wdt_irq;
> + void __iomem *wdt_base;
> + char expect_close;
> + spinlock_t wdt_lock;
> +};
Where is the spinlock initialized?
...
> +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
> +{
> + w90p910_wdt_keepalive();
> + return IRQ_HANDLED;
> +}
How does the interrupt work? what does the watchdog do when it times out?
(Is there a datasheet available somewhere?)
...
> +static int w90p910_wdt_settimeout(int new_time_level)
> +{
> + unsigned int val;
> +
> + if ((new_time_level < 0) || (new_time_level > WDT_MAX_TIME_LEVEL))
> + return -EINVAL;
> +
> + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
> + val &= ~WTIS;
> + val |= new_time_level;
Shouldn't this be val |= (new_time_level << 0x04); ?
The read-write cyclus to REG_WTCR should also be guarded with a spinlock.
Can you incorporate the call to w90p910_wdt_start() in the ioctl code into this function?
...
> +static ssize_t w90p910_wdt_write(struct file *file, const char *data,
> + size_t len, loff_t *ppos)
should be: ..., const char __user *data, ...
...
> +static int __devinit w90p910wdt_probe(struct platform_device *pdev)
> +{
> + int ret;
> +
> + w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
> + if (!w90p910_wdt)
> + return -ENOMEM;
> +
> + w90p910_wdt->pdev = pdev;
> +
> + w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (w90p910_wdt->res == NULL) {
> + dev_err(&pdev->dev, "no memory resource specified\n");
> + ret = -ENOENT;
> + goto err_get;
> + }
> +
> + if (!request_mem_region(w90p910_wdt->res->start,
> + resource_size(w90p910_wdt->res), pdev->name)) {
> + dev_err(&pdev->dev, "failed to get memory region\n");
> + ret = -ENOENT;
> + goto err_req;
This should be: goto err_get;
...
> +
> +static int __devexit w90p910wdt_remove(struct platform_device *pdev)
> +{
The misc_deregister(&w90p910wdt_miscdev); should go first. We don't want userspace interactivity when we clean up all reservations.
> + free_irq(w90p910_wdt->wdt_irq, NULL);
> +
> + clk_disable(w90p910_wdt->wdt_clock);
> + clk_put(w90p910_wdt->wdt_clock);
> +
> + iounmap(w90p910_wdt->wdt_base);
> +
> + release_mem_region(w90p910_wdt->res->start,
> + resource_size(w90p910_wdt->res));
> +
> + kfree(w90p910_wdt);
> +
> + misc_deregister(&w90p910wdt_miscdev);
see comment about misc_deregister above.
For the rest the code looks good to me.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-08-04 20:10 ` Wim Van Sebroeck
@ 2009-08-05 2:55 ` Wan ZongShun
2009-08-05 7:08 ` Wim Van Sebroeck
2009-08-05 11:37 ` [PATCH] " Wan ZongShun
1 sibling, 1 reply; 19+ messages in thread
From: Wan ZongShun @ 2009-08-05 2:55 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear Wim,
I'm much obliged to you for helping me.
Before resubmitting fixed patch, I think it better to answer you
regarding your questions.
2009/8/5 Wim Van Sebroeck <wim@iguana.be>:
> Hi Wan,
>
> I reviewed your code and have some comments and questions.
>
> ...
>
>> +struct w90p910_wdt {
>> + struct resource *res;
>> + struct clk *wdt_clock;
>> + struct platform_device *pdev;
>> + unsigned int open_lock;
>> + unsigned int wdt_irq;
>> + void __iomem *wdt_base;
>> + char expect_close;
>> + spinlock_t wdt_lock;
>> +};
>
> Where is the spinlock initialized?
Sure, I forget it. sorry.
>
>> +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
>> +{
>> + w90p910_wdt_keepalive();
>> + return IRQ_HANDLED;
>> +}
>
> How does the interrupt work? what does the watchdog do when it times out?
> (Is there a datasheet available somewhere?)
>
The mechanism of watchdog of w90p910 is that the interrupt will occur
periodicity every a given time interval.
Hmm, there are only two choices to confirm the system running, one to
clear this WTIF and WTR bits in handler of interrupt, the other to
reset them in user application before interrupt occurs.
>> +static int w90p910_wdt_settimeout(int new_time_level)
>> +{
>> + unsigned int val;
>> +
>> + if ((new_time_level < 0) || (new_time_level > WDT_MAX_TIME_LEVEL))
>> + return -EINVAL;
>> +
>> + val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
>> + val &= ~WTIS;
>> + val |= new_time_level;
>
> Shouldn't this be val |= (new_time_level << 0x04); ?
sure.
> The read-write cyclus to REG_WTCR should also be guarded with a spinlock.
> Can you incorporate the call to w90p910_wdt_start() in the ioctl code into this function?
>
Do you mean that I should merge the "w90p910_wdt_settimeout" to
"w90p910_wdt_start()"? or contrary?
>
>> +static ssize_t w90p910_wdt_write(struct file *file, const char *data,
>> + size_t len, loff_t *ppos)
>
> should be: ..., const char __user *data, ...
>
sure.
>
>> +static int __devinit w90p910wdt_probe(struct platform_device *pdev)
>> +{
>> + int ret;
>> +
>> + w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
>> + if (!w90p910_wdt)
>> + return -ENOMEM;
>> +
>> + w90p910_wdt->pdev = pdev;
>> +
>> + w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> + if (w90p910_wdt->res == NULL) {
>> + dev_err(&pdev->dev, "no memory resource specified\n");
>> + ret = -ENOENT;
>> + goto err_get;
>> + }
>> +
>> + if (!request_mem_region(w90p910_wdt->res->start,
>> + resource_size(w90p910_wdt->res), pdev->name)) {
>> + dev_err(&pdev->dev, "failed to get memory region\n");
>> + ret = -ENOENT;
>> + goto err_req;
>
> This should be: goto err_get;
sure.
> ...
>
>> +
>> +static int __devexit w90p910wdt_remove(struct platform_device *pdev)
>> +{
>
> The misc_deregister(&w90p910wdt_miscdev); should go first. We don't want userspace interactivity when we clean up all reservations.
>
>> + free_irq(w90p910_wdt->wdt_irq, NULL);
>> +
>> + clk_disable(w90p910_wdt->wdt_clock);
>> + clk_put(w90p910_wdt->wdt_clock);
>> +
>> + iounmap(w90p910_wdt->wdt_base);
>> +
>> + release_mem_region(w90p910_wdt->res->start,
>> + resource_size(w90p910_wdt->res));
>> +
>> + kfree(w90p910_wdt);
>> +
>> + misc_deregister(&w90p910wdt_miscdev);
>
> see comment about misc_deregister above.
>
> For the rest the code looks good to me.
>
> Kind regards,
> Wim.
>
>
--
Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-08-05 2:55 ` Wan ZongShun
@ 2009-08-05 7:08 ` Wim Van Sebroeck
2009-08-05 8:00 ` Wan ZongShun
0 siblings, 1 reply; 19+ messages in thread
From: Wim Van Sebroeck @ 2009-08-05 7:08 UTC (permalink / raw)
To: Wan ZongShun; +Cc: linux-arm-kernel, linux-kernel
Hi Wan,
> I'm much obliged to you for helping me.
With pleasure :-).
> >> +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
> >> +{
> >> + w90p910_wdt_keepalive();
> >> + return IRQ_HANDLED;
> >> +}
> >
> > How does the interrupt work? what does the watchdog do when it times out?
> > (Is there a datasheet available somewhere?)
> >
>
> The mechanism of watchdog of w90p910 is that the interrupt will occur
> periodicity every a given time interval.
>
> Hmm, there are only two choices to confirm the system running, one to
> clear this WTIF and WTR bits in handler of interrupt, the other to
> reset them in user application before interrupt occurs.
Hmm, I'm confused now. how does the watchdog then reboot your system?
The way we implement watchdog's in linux is that you start the watchdog and that userspace needs to trigger/ping/keep-the-watchdog-alive before the timeout period is finished/over. If the userspace daemon can keep doing this (or with other words: the system is healthy enough to operate normally without to much delay) your system doesn't get rebooted. If it doesn't manage to do it, then the watchdog knows that your system is not stable/healthy enough and will reboot your system.
Here I think that the watchdog is started. Then userspace start pinging the watchdog and everything is OK. If userspace doesn't ping the watchdog in time an interrupt is being generated and instead of rebooting the system, the watchdog is being triggered... If this is indeed what it does then this is wrong.
> > The read-write cyclus to REG_WTCR should also be guarded with a spinlock.
> > Can you incorporate the call to w90p910_wdt_start() in the ioctl code into this function?
> >
>
> Do you mean that I should merge the "w90p910_wdt_settimeout" to
> "w90p910_wdt_start()"? or contrary?
I mean the contrary.
If your watchdog needs to be restarted when you set a new timeout, then it is best to have this in the settimeout function.
It is also better to do a ping to the watchdog once the new timeout was set. It might however be that a ping is enough and that a restart is not needed.
So something like the following diff could be it:
--- w90p910_wdt.c 2009-08-05 06:44:14.286477908 +0000
+++ w90p910_wdt.c 2009-08-05 06:46:04.496353102 +0000
@@ -144,6 +144,9 @@
__raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
wdt_time = new_time_level;
+
+ w90p910_wdt_start();
+
return 0;
}
@@ -182,9 +185,7 @@
return -EFAULT;
if (w90p910_wdt_settimeout(new_value))
return -EINVAL;
-
- w90p910_wdt_start();
-
+ w90p910_wdt_keepalive();
return put_user(wdt_time, p);
case WDIOC_GETTIMEOUT:
return put_user(wdt_time, p);
---
I have an additional question: which timeout values can you set? is it 0, 1, 2 and 3 seconds?
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-08-05 7:08 ` Wim Van Sebroeck
@ 2009-08-05 8:00 ` Wan ZongShun
2009-08-05 10:31 ` Wim Van Sebroeck
0 siblings, 1 reply; 19+ messages in thread
From: Wan ZongShun @ 2009-08-05 8:00 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear wim,
2009/8/5 Wim Van Sebroeck <wim@iguana.be>:
> Hi Wan,
>
>> I'm much obliged to you for helping me.
>
> With pleasure :-).
>
>> >> +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
>> >> +{
>> >> + w90p910_wdt_keepalive();
>> >> + return IRQ_HANDLED;
>> >> +}
>> >
>> > How does the interrupt work? what does the watchdog do when it times out?
>> > (Is there a datasheet available somewhere?)
>> >
>>
>> The mechanism of watchdog of w90p910 is that the interrupt will occur
>> periodicity every a given time interval.
>>
>> Hmm, there are only two choices to confirm the system running, one to
>> clear this WTIF and WTR bits in handler of interrupt, the other to
>> reset them in user application before interrupt occurs.
>
> Hmm, I'm confused now. how does the watchdog then reboot your system?
> The way we implement watchdog's in linux is that you start the watchdog and that userspace needs to trigger/ping/keep-the-watchdog-alive before the timeout period is finished/over. If the userspace daemon can keep doing this (or with other words: the system is healthy enough to operate normally without to much delay) your system doesn't get rebooted. If it doesn't manage to do it, then the watchdog knows that your system is not stable/healthy enough and will reboot your system.
Thanks a lot for your reviewing again.
Good, above what you said is just apply to my watchdog.
> Here I think that the watchdog is started. Then userspace start pinging the watchdog and everything is OK. If userspace doesn't ping the watchdog in time an interrupt is being generated and instead of rebooting the system, the watchdog is being triggered... If this is indeed what it does then this is wrong.
If so, I can not do handling the interrupt and only provide a api for
userspace to trigger/ping/keep-the-watchdog-alive.
>
>> > The read-write cyclus to REG_WTCR should also be guarded with a spinlock.
>> > Can you incorporate the call to w90p910_wdt_start() in the ioctl code into this function?
>> >
>>
>> Do you mean that I should merge the "w90p910_wdt_settimeout" to
>> "w90p910_wdt_start()"? or contrary?
>
> I mean the contrary.
> If your watchdog needs to be restarted when you set a new timeout, then it is best to have this in the settimeout function.
> It is also better to do a ping to the watchdog once the new timeout was set. It might however be that a ping is enough and that a restart is not needed.
> So something like the following diff could be it:
> --- w90p910_wdt.c 2009-08-05 06:44:14.286477908 +0000
> +++ w90p910_wdt.c 2009-08-05 06:46:04.496353102 +0000
> @@ -144,6 +144,9 @@
> __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
>
> wdt_time = new_time_level;
> +
> + w90p910_wdt_start();
> +
> return 0;
> }
>
> @@ -182,9 +185,7 @@
> return -EFAULT;
> if (w90p910_wdt_settimeout(new_value))
> return -EINVAL;
> -
> - w90p910_wdt_start();
> -
> + w90p910_wdt_keepalive();
> return put_user(wdt_time, p);
> case WDIOC_GETTIMEOUT:
> return put_user(wdt_time, p);
> ---
>
Okay, got it.
> I have an additional question: which timeout values can you set? is it 0, 1, 2 and 3 seconds?
The 0, 1, 2 and 3 is not seconds, rather than 'level' , it means my
watchdog controller can only set four grades,
When WTIS bit of REG_WTCR was set one value of the 0, 1, 2 and 3, the
real time interval can be calculated via following formula .
WTIS real time interval (formula)
0x00 ((2^ 14 ) * ((external crystal freq) / 256))seconds
0x01 ((2^ 16 ) * ((external crystal freq) / 256))seconds
0x02 ((2^ 18 ) * ((external crystal freq) / 256))seconds
0x03 ((2^ 20 ) * ((external crystal freq) / 256))seconds
The external crystal freq is 15Mhz in w90p910 evaluation board. so I
set the '0x00' as a default value, it means the real time interval is
0.28 second approximately.
>
> Kind regards,
> Wim.
>
>
--
Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-08-05 8:00 ` Wan ZongShun
@ 2009-08-05 10:31 ` Wim Van Sebroeck
2009-08-05 10:44 ` Wan ZongShun
2009-08-05 13:20 ` [PATCH v2] " Wan ZongShun
0 siblings, 2 replies; 19+ messages in thread
From: Wim Van Sebroeck @ 2009-08-05 10:31 UTC (permalink / raw)
To: Wan ZongShun; +Cc: linux-arm-kernel, linux-kernel
Hi Wan,
> > I have an additional question: which timeout values can you set? is it 0, 1, 2 and 3 seconds?
>
> The 0, 1, 2 and 3 is not seconds, rather than 'level' , it means my
> watchdog controller can only set four grades,
> When WTIS bit of REG_WTCR was set one value of the 0, 1, 2 and 3, the
> real time interval can be calculated via following formula .
>
> WTIS real time interval (formula)
> 0x00 ((2^ 14 ) * ((external crystal freq) / 256))seconds
> 0x01 ((2^ 16 ) * ((external crystal freq) / 256))seconds
> 0x02 ((2^ 18 ) * ((external crystal freq) / 256))seconds
> 0x03 ((2^ 20 ) * ((external crystal freq) / 256))seconds
>
> The external crystal freq is 15Mhz in w90p910 evaluation board. so I
> set the '0x00' as a default value, it means the real time interval is
> 0.28 second approximately.
Hmm, the watchdog API works in seconds.
A timer will need to be used like in similar watchdog drivers (like at91sam9_wdt.c, pcwd.c).
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-08-05 10:31 ` Wim Van Sebroeck
@ 2009-08-05 10:44 ` Wan ZongShun
2009-08-05 13:20 ` [PATCH v2] " Wan ZongShun
1 sibling, 0 replies; 19+ messages in thread
From: Wan ZongShun @ 2009-08-05 10:44 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear Wim,
2009/8/5, Wim Van Sebroeck <wim@iguana.be>:
> Hi Wan,
>
> > > I have an additional question: which timeout values can you set? is it 0, 1, 2 and 3 seconds?
> >
> > The 0, 1, 2 and 3 is not seconds, rather than 'level' , it means my
> > watchdog controller can only set four grades,
> > When WTIS bit of REG_WTCR was set one value of the 0, 1, 2 and 3, the
> > real time interval can be calculated via following formula .
> >
> > WTIS real time interval (formula)
> > 0x00 ((2^ 14 ) * ((external crystal freq) / 256))seconds
> > 0x01 ((2^ 16 ) * ((external crystal freq) / 256))seconds
> > 0x02 ((2^ 18 ) * ((external crystal freq) / 256))seconds
> > 0x03 ((2^ 20 ) * ((external crystal freq) / 256))seconds
> >
> > The external crystal freq is 15Mhz in w90p910 evaluation board. so I
> > set the '0x00' as a default value, it means the real time interval is
> > 0.28 second approximately.
>
> Hmm, the watchdog API works in seconds.
> A timer will need to be used like in similar watchdog drivers (like at91sam9_wdt.c, pcwd.c).
Do you mean that we should provide userspace a setting seconds api?
it like following:
ioctl(fd, WDIOC_SETTIMEOUT,&value);
the value must be seconds?
Hmm, but the w90p910 only provides four grades seconds setting, rather
than all seconds time can be set, if so, how to write the wdt driver
so that the patch can be accepted for you?any idea?
>
> Kind regards,
> Wim.
>
>
--
Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-08-04 20:10 ` Wim Van Sebroeck
2009-08-05 2:55 ` Wan ZongShun
@ 2009-08-05 11:37 ` Wan ZongShun
2009-08-20 12:16 ` Wim Van Sebroeck
1 sibling, 1 reply; 19+ messages in thread
From: Wan ZongShun @ 2009-08-05 11:37 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear Wim,
>> +static irqreturn_t w90p910_wdt_irq(int irq, void *dev_id)
>> +{
>> + w90p910_wdt_keepalive();
>> + return IRQ_HANDLED;
>> +}
>
> How does the interrupt work? what does the watchdog do when it times out?
> (Is there a datasheet available somewhere?)
>
Here is the w90p910 datasheet link, now the ic was renames nuc910.
Maybe you can give me a good idea,
hmm, regarding the timer as your mentioned (at91sam9_wdt.c), I am
studying it and will resubmit a updated patch to you. thanks a lot for
your help !
http://www.nuvoton-usa.com/hq/enu/ProductAndSales/ProductLines/ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller/NUC910A.htm
>
>> +static int w90p910_wdt_settimeout(int new_time_level)
>> +{
>> + unsigned int val;
>> +
>> + if ((new_time_level < 0) || (new_time_level > WDT_MAX_TIME_LEVEL))
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] Add watchdog driver for w90p910
2009-08-05 10:31 ` Wim Van Sebroeck
2009-08-05 10:44 ` Wan ZongShun
@ 2009-08-05 13:20 ` Wan ZongShun
2009-08-17 2:40 ` Wan ZongShun
1 sibling, 1 reply; 19+ messages in thread
From: Wan ZongShun @ 2009-08-05 13:20 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear Wim,
Maybe I did not know well regarding linux watchdog driver before, but, now Via your help
and researching further the timer used in watchdog driver,I rewrite my wdt driver, Now, I
can set any time interval in userspace rather than setting the time level. :)
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/watchdog/Kconfig | 9 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/w90p910_wdt.c | 330 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 340 insertions(+), 0 deletions(-)
create mode 100644 drivers/watchdog/w90p910_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b1ccc04..fba4b91 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -266,6 +266,15 @@ config STMP3XXX_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called stmp3xxx_wdt.
+config W90P910_WATCHDOG
+ tristate "Nuvoton W90P910 watchdog"
+ depends on ARCH_W90X900
+ help
+ Say Y here if to include support for the watchdog timer
+ for the Nuvoton W90P910 SoC.
+ To compile this driver as a module, choose M here: the
+ module will be called w90p910_wdt.
+
# AVR32 Architecture
config AT32AP700X_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 3d77429..ecc05b4 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
+obj-$(CONFIG_W90P910_WATCHDOG) += w90p910_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
new file mode 100644
index 0000000..4e954c3
--- /dev/null
+++ b/drivers/watchdog/w90p910_wdt.c
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2009 Nuvoton technology corporation.
+ *
+ * Wan ZongShun <mcuos.com@gmail.com>
+ *
+ * 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;version 2 of the License.
+ *
+ */
+
+#include <linux/bitops.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/watchdog.h>
+#include <linux/uaccess.h>
+
+#define REG_WTCR 0x1c
+#define WTCLK (0x01 << 10)
+#define WTE (0x01 << 7) /*wdt enable*/
+#define WTISBIT (0x04)
+#define WTIS (0x03 << 4)
+#define WTIF (0x01 << 3)
+#define WTRF (0x01 << 2)
+#define WTRE (0x01 << 1)
+#define WTR 0x01
+#define WDT_TIMEOUT (HZ/2)
+#define WDT_HEARTBEAT 15
+#define WDT_HW_TIMEOUT 0x02 /* 4 seconds */
+
+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) ")");
+
+struct w90p910_wdt {
+ struct resource *res;
+ struct clk *wdt_clock;
+ struct platform_device *pdev;
+ void __iomem *wdt_base;
+ char expect_close;
+ struct timer_list timer;
+ spinlock_t wdt_lock;
+ unsigned long next_heartbeat;
+};
+
+static unsigned long w90p910wdt_busy;
+struct w90p910_wdt *w90p910_wdt;
+
+static inline void w90p910_wdt_keepalive(void)
+{
+ unsigned int val;
+
+ spin_lock(&w90p910_wdt->wdt_lock);
+
+ val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
+ val |= (WTR | WTIF);
+ __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&w90p910_wdt->wdt_lock);
+}
+
+static inline void w90p910_wdt_start(void)
+{
+ unsigned int val;
+
+ spin_lock(&w90p910_wdt->wdt_lock);
+
+ val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
+ val |= (WTRE | WTE | WTR | WTCLK | WTIF);
+ __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&w90p910_wdt->wdt_lock);
+}
+
+static int w90p910_wdt_settimeout(unsigned int timeout)
+{
+ unsigned int val;
+ spin_lock(&w90p910_wdt->wdt_lock);
+
+ val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
+ val &= ~WTIS;
+ val |= (timeout << 0x04);
+ __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&w90p910_wdt->wdt_lock);
+
+ return 0;
+}
+
+static int w90p910_wdt_open(struct inode *inode, struct file *file)
+{
+
+ if (test_and_set_bit(0, &w90p910wdt_busy))
+ return -EBUSY;
+
+ w90p910_wdt_start();
+ w90p910_wdt_settimeout(WDT_HW_TIMEOUT);
+
+ w90p910_wdt->next_heartbeat = jiffies + heartbeat * HZ;
+ mod_timer(&w90p910_wdt->timer, jiffies + WDT_TIMEOUT);
+
+ return nonseekable_open(inode, file);
+}
+
+static int w90p910_wdt_close(struct inode *inode, struct file *file)
+{
+ clear_bit(0, &w90p910wdt_busy);
+
+ if (!w90p910_wdt->expect_close)
+ del_timer(&w90p910_wdt->timer);
+
+ w90p910_wdt->expect_close = 0;
+ return 0;
+}
+
+static struct watchdog_info w90p910_wdt_info = {
+ .identity = "w90p910 watchdog",
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+ WDIOF_MAGICCLOSE,
+};
+
+static long w90p910_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, &w90p910_wdt_info,
+ sizeof(w90p910_wdt_info)) ? -EFAULT : 0;
+ case WDIOC_GETSTATUS:
+ case WDIOC_GETBOOTSTATUS:
+ return put_user(0, p);
+
+ case WDIOC_KEEPALIVE:
+ w90p910_wdt->next_heartbeat = jiffies + heartbeat * HZ;
+ return 0;
+
+ case WDIOC_SETTIMEOUT:
+ if (get_user(new_value, p))
+ return -EFAULT;
+
+ heartbeat = new_value;
+ w90p910_wdt->next_heartbeat = jiffies + heartbeat * HZ;
+
+ return put_user(new_value, p);
+ case WDIOC_GETTIMEOUT:
+ return put_user(heartbeat, p);
+ default:
+ return -ENOTTY;
+ }
+}
+
+static ssize_t w90p910_wdt_write(struct file *file, const char __user *data,
+ size_t len, loff_t *ppos)
+{
+ /* Scan for magic character */
+ if (!nowayout) {
+ size_t i;
+
+ w90p910_wdt->expect_close = 0;
+
+ for (i = 0; i < len; i++) {
+ char c;
+ if (get_user(c, data + i))
+ return -EFAULT;
+ if (c == 'V') {
+ w90p910_wdt->expect_close = 42;
+ break;
+ }
+ }
+ }
+
+ w90p910_wdt->next_heartbeat = jiffies + heartbeat * HZ;
+ return len;
+}
+
+static void w90p910_ping(unsigned long data)
+{
+ if (time_before(jiffies, w90p910_wdt->next_heartbeat) ||
+ (!nowayout && !w90p910wdt_busy)) {
+ w90p910_wdt_keepalive();
+ mod_timer(&w90p910_wdt->timer, jiffies + WDT_TIMEOUT);
+ } else
+ dev_warn(&w90p910_wdt->pdev->dev, "Will reset the machine !\n");
+}
+
+static const struct file_operations w90p910wdt_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .unlocked_ioctl = w90p910_wdt_ioctl,
+ .open = w90p910_wdt_open,
+ .release = w90p910_wdt_close,
+ .write = w90p910_wdt_write,
+};
+
+static struct miscdevice w90p910wdt_miscdev = {
+ .minor = WATCHDOG_MINOR,
+ .name = "watchdog",
+ .fops = &w90p910wdt_fops,
+};
+
+static int __devinit w90p910wdt_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+
+ w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
+ if (!w90p910_wdt)
+ return -ENOMEM;
+
+ w90p910_wdt->pdev = pdev;
+
+ spin_lock_init(&w90p910_wdt->wdt_lock);
+
+ w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (w90p910_wdt->res == NULL) {
+ dev_err(&pdev->dev, "no memory resource specified\n");
+ ret = -ENOENT;
+ goto err_get;
+ }
+
+ if (!request_mem_region(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res), pdev->name)) {
+ dev_err(&pdev->dev, "failed to get memory region\n");
+ ret = -ENOENT;
+ goto err_get;
+ }
+
+ w90p910_wdt->wdt_base = ioremap(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res));
+ if (w90p910_wdt->wdt_base == NULL) {
+ dev_err(&pdev->dev, "failed to ioremap() region\n");
+ ret = -EINVAL;
+ goto err_req;
+ }
+
+ w90p910_wdt->wdt_clock = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(w90p910_wdt->wdt_clock)) {
+ dev_err(&pdev->dev, "failed to find watchdog clock source\n");
+ ret = PTR_ERR(w90p910_wdt->wdt_clock);
+ goto err_map;
+ }
+
+ clk_enable(w90p910_wdt->wdt_clock);
+
+ if (misc_register(&w90p910wdt_miscdev)) {
+ dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
+ WATCHDOG_MINOR, ret);
+ goto err_clk;
+ }
+
+ setup_timer(&w90p910_wdt->timer, w90p910_ping, 0);
+
+ return 0;
+
+err_clk:
+ clk_disable(w90p910_wdt->wdt_clock);
+ clk_put(w90p910_wdt->wdt_clock);
+err_map:
+ iounmap(w90p910_wdt->wdt_base);
+err_req:
+ release_mem_region(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res));
+err_get:
+ kfree(w90p910_wdt);
+ return ret;
+}
+
+static int __devexit w90p910wdt_remove(struct platform_device *pdev)
+{
+ misc_deregister(&w90p910wdt_miscdev);
+
+ clk_disable(w90p910_wdt->wdt_clock);
+ clk_put(w90p910_wdt->wdt_clock);
+
+ iounmap(w90p910_wdt->wdt_base);
+
+ release_mem_region(w90p910_wdt->res->start,
+ resource_size(w90p910_wdt->res));
+
+ kfree(w90p910_wdt);
+
+ return 0;
+}
+
+static struct platform_driver w90p910wdt_driver = {
+ .probe = w90p910wdt_probe,
+ .remove = __devexit_p(w90p910wdt_remove),
+ .driver = {
+ .name = "w90p910-wdt",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init w90p910_wdt_init(void)
+{
+ return platform_driver_register(&w90p910wdt_driver);
+}
+
+static void __exit w90p910_wdt_exit(void)
+{
+ platform_driver_unregister(&w90p910wdt_driver);
+}
+
+module_init(w90p910_wdt_init);
+module_exit(w90p910_wdt_exit);
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
+MODULE_DESCRIPTION("Watchdog driver for W90P910");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:w90p910-wdt");
--
1.5.6.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v2] Add watchdog driver for w90p910
2009-08-05 13:20 ` [PATCH v2] " Wan ZongShun
@ 2009-08-17 2:40 ` Wan ZongShun
2009-08-17 9:14 ` Wim Van Sebroeck
0 siblings, 1 reply; 19+ messages in thread
From: Wan ZongShun @ 2009-08-17 2:40 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1504 bytes --]
Dear Wim,
Thanks for your w90p910-v2.diff, I appreciated it.
I have tested it and only modified the quote of 'expect_close',
and now the patch works very well.:)
At the same time, I renamed this driver name, due to I
have changed the corresponding device name in my arch file.
The attached file is fixed patch relative to this w90p910-v2.diff.
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/watchdog/w90p910_wdt.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
index 3cb8972..741db53 100644
--- a/drivers/watchdog/w90p910_wdt.c
+++ b/drivers/watchdog/w90p910_wdt.c
@@ -137,7 +137,7 @@ static int w90p910_wdt_open(struct inode *inode, struct file *file)
static int w90p910_wdt_close(struct inode *inode, struct file *file)
{
- if (expect_close == 42)
+ if (w90p910_wdt->expect_close == 42)
w90p910_wdt_stop();
else {
dev_crit(&w90p910_wdt->pdev->dev,
@@ -328,7 +328,7 @@ static struct platform_driver w90p910wdt_driver = {
.probe = w90p910wdt_probe,
.remove = __devexit_p(w90p910wdt_remove),
.driver = {
- .name = "w90p910-wdt",
+ .name = "nuc900-wdt",
.owner = THIS_MODULE,
},
};
@@ -350,4 +350,4 @@ MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
MODULE_DESCRIPTION("Watchdog driver for W90P910");
MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:w90p910-wdt");
+MODULE_ALIAS("platform:nuc900-wdt");
--
1.5.6.3
[-- Attachment #2: 0002-wan-fix-wim-wdt-driver.patch --]
[-- Type: text/x-patch, Size: 1198 bytes --]
Fix watchdog driver for w90p910 platform.
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/watchdog/w90p910_wdt.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
index 3cb8972..741db53 100644
--- a/drivers/watchdog/w90p910_wdt.c
+++ b/drivers/watchdog/w90p910_wdt.c
@@ -137,7 +137,7 @@ static int w90p910_wdt_open(struct inode *inode, struct file *file)
static int w90p910_wdt_close(struct inode *inode, struct file *file)
{
- if (expect_close == 42)
+ if (w90p910_wdt->expect_close == 42)
w90p910_wdt_stop();
else {
dev_crit(&w90p910_wdt->pdev->dev,
@@ -328,7 +328,7 @@ static struct platform_driver w90p910wdt_driver = {
.probe = w90p910wdt_probe,
.remove = __devexit_p(w90p910wdt_remove),
.driver = {
- .name = "w90p910-wdt",
+ .name = "nuc900-wdt",
.owner = THIS_MODULE,
},
};
@@ -350,4 +350,4 @@ MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
MODULE_DESCRIPTION("Watchdog driver for W90P910");
MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:w90p910-wdt");
+MODULE_ALIAS("platform:nuc900-wdt");
--
1.5.6.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v2] Add watchdog driver for w90p910
2009-08-17 2:40 ` Wan ZongShun
@ 2009-08-17 9:14 ` Wim Van Sebroeck
2009-08-17 9:19 ` Wan ZongShun
2009-08-17 10:00 ` Wan ZongShun
0 siblings, 2 replies; 19+ messages in thread
From: Wim Van Sebroeck @ 2009-08-17 9:14 UTC (permalink / raw)
To: Wan ZongShun; +Cc: linux-arm-kernel, linux-kernel
Hi Wan,
> At the same time, I renamed this driver name, due to I
> have changed the corresponding device name in my arch file.
Isn't it best to rename the driver in drivers/watchdog also to nuc900_wdt.c ?
Thanks,
Wim.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] Add watchdog driver for w90p910
2009-08-17 9:14 ` Wim Van Sebroeck
@ 2009-08-17 9:19 ` Wan ZongShun
2009-08-17 10:00 ` Wan ZongShun
1 sibling, 0 replies; 19+ messages in thread
From: Wan ZongShun @ 2009-08-17 9:19 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Dear Wim,
2009/8/17 Wim Van Sebroeck <wim@iguana.be>:
> Hi Wan,
>
>> At the same time, I renamed this driver name, due to I
>> have changed the corresponding device name in my arch file.
>
> Isn't it best to rename the driver in drivers/watchdog also to nuc900_wdt.c ?
Of course , If you permit :).
Waiting for me, I will fix the patch regarding this, and re-submit it to you.
Thanks for your help.
> Thanks,
> Wim.
>
>
--
Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] Add watchdog driver for w90p910
2009-08-17 9:14 ` Wim Van Sebroeck
2009-08-17 9:19 ` Wan ZongShun
@ 2009-08-17 10:00 ` Wan ZongShun
2009-08-17 11:02 ` Wim Van Sebroeck
1 sibling, 1 reply; 19+ messages in thread
From: Wan ZongShun @ 2009-08-17 10:00 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
Dear Wim,
Wim Van Sebroeck:
> Hi Wan,
>
>> At the same time, I renamed this driver name, due to I
>> have changed the corresponding device name in my arch file.
>
> Isn't it best to rename the driver in drivers/watchdog also to nuc900_wdt.c ?
The attached file is my fix patch relative to w90p910-v2.diff.
Also, I renamed all w90p910 to nuc900, Due to it applies to all
Nuc9xx series SoCs.
Thanks a lot for your help.
> Thanks,
> Wim.
>
>
[-- Attachment #2: 0002-fix-again-wim-driver.patch --]
[-- Type: text/x-patch, Size: 19729 bytes --]
fix watchdog driver for w90p910 platform.
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/watchdog/Kconfig | 8 +-
drivers/watchdog/Makefile | 2 +-
drivers/watchdog/nuc900_wdt.c | 353 ++++++++++++++++++++++++++++++++++++++++
drivers/watchdog/w90p910_wdt.c | 353 ----------------------------------------
4 files changed, 358 insertions(+), 358 deletions(-)
create mode 100644 drivers/watchdog/nuc900_wdt.c
delete mode 100644 drivers/watchdog/w90p910_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index fba4b91..352b658 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -266,14 +266,14 @@ config STMP3XXX_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called stmp3xxx_wdt.
-config W90P910_WATCHDOG
- tristate "Nuvoton W90P910 watchdog"
+config NUC900_WATCHDOG
+ tristate "Nuvoton NUC900 watchdog"
depends on ARCH_W90X900
help
Say Y here if to include support for the watchdog timer
- for the Nuvoton W90P910 SoC.
+ for the Nuvoton NUC900 series SoCs.
To compile this driver as a module, choose M here: the
- module will be called w90p910_wdt.
+ module will be called nuc900_wdt.
# AVR32 Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index ecc05b4..ecad9fa 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
-obj-$(CONFIG_W90P910_WATCHDOG) += w90p910_wdt.o
+obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
new file mode 100644
index 0000000..adefe3a
--- /dev/null
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2009 Nuvoton technology corporation.
+ *
+ * Wan ZongShun <mcuos.com@gmail.com>
+ *
+ * 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;version 2 of the License.
+ *
+ */
+
+#include <linux/bitops.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/watchdog.h>
+#include <linux/uaccess.h>
+
+#define REG_WTCR 0x1c
+#define WTCLK (0x01 << 10)
+#define WTE (0x01 << 7) /*wdt enable*/
+#define WTIS (0x03 << 4)
+#define WTIF (0x01 << 3)
+#define WTRF (0x01 << 2)
+#define WTRE (0x01 << 1)
+#define WTR (0x01 << 0)
+/*
+ * The watchdog time interval can be calculated via following formula:
+ * WTIS real time interval (formula)
+ * 0x00 ((2^ 14 ) * ((external crystal freq) / 256))seconds
+ * 0x01 ((2^ 16 ) * ((external crystal freq) / 256))seconds
+ * 0x02 ((2^ 18 ) * ((external crystal freq) / 256))seconds
+ * 0x03 ((2^ 20 ) * ((external crystal freq) / 256))seconds
+ *
+ * The external crystal freq is 15Mhz in the nuc900 evaluation board.
+ * So 0x00 = +-0.28 seconds, 0x01 = +-1.12 seconds, 0x02 = +-4.48 seconds,
+ * 0x03 = +- 16.92 seconds..
+ */
+#define WDT_HW_TIMEOUT 0x02
+#define WDT_TIMEOUT (HZ/2)
+#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) ")");
+
+struct nuc900_wdt {
+ struct resource *res;
+ struct clk *wdt_clock;
+ struct platform_device *pdev;
+ void __iomem *wdt_base;
+ char expect_close;
+ struct timer_list timer;
+ spinlock_t wdt_lock;
+ unsigned long next_heartbeat;
+};
+
+static unsigned long nuc900wdt_busy;
+struct nuc900_wdt *nuc900_wdt;
+
+static inline void nuc900_wdt_keepalive(void)
+{
+ unsigned int val;
+
+ spin_lock(&nuc900_wdt->wdt_lock);
+
+ val = __raw_readl(nuc900_wdt->wdt_base + REG_WTCR);
+ val |= (WTR | WTIF);
+ __raw_writel(val, nuc900_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&nuc900_wdt->wdt_lock);
+}
+
+static inline void nuc900_wdt_start(void)
+{
+ unsigned int val;
+
+ spin_lock(&nuc900_wdt->wdt_lock);
+
+ val = __raw_readl(nuc900_wdt->wdt_base + REG_WTCR);
+ val |= (WTRE | WTE | WTR | WTCLK | WTIF);
+ val &= ~WTIS;
+ val |= (WDT_HW_TIMEOUT << 0x04);
+ __raw_writel(val, nuc900_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&nuc900_wdt->wdt_lock);
+
+ nuc900_wdt->next_heartbeat = jiffies + heartbeat * HZ;
+ mod_timer(&nuc900_wdt->timer, jiffies + WDT_TIMEOUT);
+}
+
+static inline void nuc900_wdt_stop(void)
+{
+ unsigned int val;
+
+ del_timer(&nuc900_wdt->timer);
+
+ spin_lock(&nuc900_wdt->wdt_lock);
+
+ val = __raw_readl(nuc900_wdt->wdt_base + REG_WTCR);
+ val &= ~WTE;
+ __raw_writel(val, nuc900_wdt->wdt_base + REG_WTCR);
+
+ spin_unlock(&nuc900_wdt->wdt_lock);
+}
+
+static inline void nuc900_wdt_ping(void)
+{
+ nuc900_wdt->next_heartbeat = jiffies + heartbeat * HZ;
+}
+
+static int nuc900_wdt_open(struct inode *inode, struct file *file)
+{
+
+ if (test_and_set_bit(0, &nuc900wdt_busy))
+ return -EBUSY;
+
+ nuc900_wdt_start();
+
+ return nonseekable_open(inode, file);
+}
+
+static int nuc900_wdt_close(struct inode *inode, struct file *file)
+{
+ if (nuc900_wdt->expect_close == 42)
+ nuc900_wdt_stop();
+ else {
+ dev_crit(&nuc900_wdt->pdev->dev,
+ "Unexpected close, not stopping watchdog!\n");
+ nuc900_wdt_ping();
+ }
+
+ nuc900_wdt->expect_close = 0;
+ clear_bit(0, &nuc900wdt_busy);
+ return 0;
+}
+
+static const struct watchdog_info nuc900_wdt_info = {
+ .identity = "nuc900 watchdog",
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+ WDIOF_MAGICCLOSE,
+};
+
+static long nuc900_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, &nuc900_wdt_info,
+ sizeof(nuc900_wdt_info)) ? -EFAULT : 0;
+ case WDIOC_GETSTATUS:
+ case WDIOC_GETBOOTSTATUS:
+ return put_user(0, p);
+
+ case WDIOC_KEEPALIVE:
+ nuc900_wdt_ping();
+ return 0;
+
+ case WDIOC_SETTIMEOUT:
+ if (get_user(new_value, p))
+ return -EFAULT;
+
+ heartbeat = new_value;
+ nuc900_wdt_ping();
+
+ return put_user(new_value, p);
+ case WDIOC_GETTIMEOUT:
+ return put_user(heartbeat, p);
+ default:
+ return -ENOTTY;
+ }
+}
+
+static ssize_t nuc900_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;
+
+ nuc900_wdt->expect_close = 0;
+
+ for (i = 0; i < len; i++) {
+ char c;
+ if (get_user(c, data + i))
+ return -EFAULT;
+ if (c == 'V') {
+ nuc900_wdt->expect_close = 42;
+ break;
+ }
+ }
+ }
+
+ nuc900_wdt_ping();
+ return len;
+}
+
+static void nuc900_wdt_timer_ping(unsigned long data)
+{
+ if (time_before(jiffies, nuc900_wdt->next_heartbeat)) {
+ nuc900_wdt_keepalive();
+ mod_timer(&nuc900_wdt->timer, jiffies + WDT_TIMEOUT);
+ } else
+ dev_warn(&nuc900_wdt->pdev->dev, "Will reset the machine !\n");
+}
+
+static const struct file_operations nuc900wdt_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .unlocked_ioctl = nuc900_wdt_ioctl,
+ .open = nuc900_wdt_open,
+ .release = nuc900_wdt_close,
+ .write = nuc900_wdt_write,
+};
+
+static struct miscdevice nuc900wdt_miscdev = {
+ .minor = WATCHDOG_MINOR,
+ .name = "watchdog",
+ .fops = &nuc900wdt_fops,
+};
+
+static int __devinit nuc900wdt_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+
+ nuc900_wdt = kzalloc(sizeof(struct nuc900_wdt), GFP_KERNEL);
+ if (!nuc900_wdt)
+ return -ENOMEM;
+
+ nuc900_wdt->pdev = pdev;
+
+ spin_lock_init(&nuc900_wdt->wdt_lock);
+
+ nuc900_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (nuc900_wdt->res == NULL) {
+ dev_err(&pdev->dev, "no memory resource specified\n");
+ ret = -ENOENT;
+ goto err_get;
+ }
+
+ if (!request_mem_region(nuc900_wdt->res->start,
+ resource_size(nuc900_wdt->res), pdev->name)) {
+ dev_err(&pdev->dev, "failed to get memory region\n");
+ ret = -ENOENT;
+ goto err_get;
+ }
+
+ nuc900_wdt->wdt_base = ioremap(nuc900_wdt->res->start,
+ resource_size(nuc900_wdt->res));
+ if (nuc900_wdt->wdt_base == NULL) {
+ dev_err(&pdev->dev, "failed to ioremap() region\n");
+ ret = -EINVAL;
+ goto err_req;
+ }
+
+ nuc900_wdt->wdt_clock = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(nuc900_wdt->wdt_clock)) {
+ dev_err(&pdev->dev, "failed to find watchdog clock source\n");
+ ret = PTR_ERR(nuc900_wdt->wdt_clock);
+ goto err_map;
+ }
+
+ clk_enable(nuc900_wdt->wdt_clock);
+
+ setup_timer(&nuc900_wdt->timer, nuc900_wdt_timer_ping, 0);
+
+ if (misc_register(&nuc900wdt_miscdev)) {
+ dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
+ WATCHDOG_MINOR, ret);
+ goto err_clk;
+ }
+
+ return 0;
+
+err_clk:
+ clk_disable(nuc900_wdt->wdt_clock);
+ clk_put(nuc900_wdt->wdt_clock);
+err_map:
+ iounmap(nuc900_wdt->wdt_base);
+err_req:
+ release_mem_region(nuc900_wdt->res->start,
+ resource_size(nuc900_wdt->res));
+err_get:
+ kfree(nuc900_wdt);
+ return ret;
+}
+
+static int __devexit nuc900wdt_remove(struct platform_device *pdev)
+{
+ misc_deregister(&nuc900wdt_miscdev);
+
+ clk_disable(nuc900_wdt->wdt_clock);
+ clk_put(nuc900_wdt->wdt_clock);
+
+ iounmap(nuc900_wdt->wdt_base);
+
+ release_mem_region(nuc900_wdt->res->start,
+ resource_size(nuc900_wdt->res));
+
+ kfree(nuc900_wdt);
+
+ return 0;
+}
+
+static struct platform_driver nuc900wdt_driver = {
+ .probe = nuc900wdt_probe,
+ .remove = __devexit_p(nuc900wdt_remove),
+ .driver = {
+ .name = "nuc900-wdt",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init nuc900_wdt_init(void)
+{
+ return platform_driver_register(&nuc900wdt_driver);
+}
+
+static void __exit nuc900_wdt_exit(void)
+{
+ platform_driver_unregister(&nuc900wdt_driver);
+}
+
+module_init(nuc900_wdt_init);
+module_exit(nuc900_wdt_exit);
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
+MODULE_DESCRIPTION("Watchdog driver for NUC900");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:nuc900-wdt");
diff --git a/drivers/watchdog/w90p910_wdt.c b/drivers/watchdog/w90p910_wdt.c
deleted file mode 100644
index 3cb8972..0000000
--- a/drivers/watchdog/w90p910_wdt.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2009 Nuvoton technology corporation.
- *
- * Wan ZongShun <mcuos.com@gmail.com>
- *
- * 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;version 2 of the License.
- *
- */
-
-#include <linux/bitops.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/kernel.h>
-#include <linux/miscdevice.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/types.h>
-#include <linux/watchdog.h>
-#include <linux/uaccess.h>
-
-#define REG_WTCR 0x1c
-#define WTCLK (0x01 << 10)
-#define WTE (0x01 << 7) /*wdt enable*/
-#define WTIS (0x03 << 4)
-#define WTIF (0x01 << 3)
-#define WTRF (0x01 << 2)
-#define WTRE (0x01 << 1)
-#define WTR (0x01 << 0)
-/*
- * The watchdog time interval can be calculated via following formula:
- * WTIS real time interval (formula)
- * 0x00 ((2^ 14 ) * ((external crystal freq) / 256))seconds
- * 0x01 ((2^ 16 ) * ((external crystal freq) / 256))seconds
- * 0x02 ((2^ 18 ) * ((external crystal freq) / 256))seconds
- * 0x03 ((2^ 20 ) * ((external crystal freq) / 256))seconds
- *
- * The external crystal freq is 15Mhz in the w90p910 evaluation board.
- * So 0x00 = +-0.28 seconds, 0x01 = +-1.12 seconds, 0x02 = +-4.48 seconds,
- * 0x03 = +- 16.92 seconds..
- */
-#define WDT_HW_TIMEOUT 0x02
-#define WDT_TIMEOUT (HZ/2)
-#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) ")");
-
-struct w90p910_wdt {
- struct resource *res;
- struct clk *wdt_clock;
- struct platform_device *pdev;
- void __iomem *wdt_base;
- char expect_close;
- struct timer_list timer;
- spinlock_t wdt_lock;
- unsigned long next_heartbeat;
-};
-
-static unsigned long w90p910wdt_busy;
-struct w90p910_wdt *w90p910_wdt;
-
-static inline void w90p910_wdt_keepalive(void)
-{
- unsigned int val;
-
- spin_lock(&w90p910_wdt->wdt_lock);
-
- val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
- val |= (WTR | WTIF);
- __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
-
- spin_unlock(&w90p910_wdt->wdt_lock);
-}
-
-static inline void w90p910_wdt_start(void)
-{
- unsigned int val;
-
- spin_lock(&w90p910_wdt->wdt_lock);
-
- val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
- val |= (WTRE | WTE | WTR | WTCLK | WTIF);
- val &= ~WTIS;
- val |= (WDT_HW_TIMEOUT << 0x04);
- __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
-
- spin_unlock(&w90p910_wdt->wdt_lock);
-
- w90p910_wdt->next_heartbeat = jiffies + heartbeat * HZ;
- mod_timer(&w90p910_wdt->timer, jiffies + WDT_TIMEOUT);
-}
-
-static inline void w90p910_wdt_stop(void)
-{
- unsigned int val;
-
- del_timer(&w90p910_wdt->timer);
-
- spin_lock(&w90p910_wdt->wdt_lock);
-
- val = __raw_readl(w90p910_wdt->wdt_base + REG_WTCR);
- val &= ~WTE;
- __raw_writel(val, w90p910_wdt->wdt_base + REG_WTCR);
-
- spin_unlock(&w90p910_wdt->wdt_lock);
-}
-
-static inline void w90p910_wdt_ping(void)
-{
- w90p910_wdt->next_heartbeat = jiffies + heartbeat * HZ;
-}
-
-static int w90p910_wdt_open(struct inode *inode, struct file *file)
-{
-
- if (test_and_set_bit(0, &w90p910wdt_busy))
- return -EBUSY;
-
- w90p910_wdt_start();
-
- return nonseekable_open(inode, file);
-}
-
-static int w90p910_wdt_close(struct inode *inode, struct file *file)
-{
- if (expect_close == 42)
- w90p910_wdt_stop();
- else {
- dev_crit(&w90p910_wdt->pdev->dev,
- "Unexpected close, not stopping watchdog!\n");
- w90p910_wdt_ping();
- }
-
- w90p910_wdt->expect_close = 0;
- clear_bit(0, &w90p910wdt_busy);
- return 0;
-}
-
-static const struct watchdog_info w90p910_wdt_info = {
- .identity = "w90p910 watchdog",
- .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
- WDIOF_MAGICCLOSE,
-};
-
-static long w90p910_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, &w90p910_wdt_info,
- sizeof(w90p910_wdt_info)) ? -EFAULT : 0;
- case WDIOC_GETSTATUS:
- case WDIOC_GETBOOTSTATUS:
- return put_user(0, p);
-
- case WDIOC_KEEPALIVE:
- w90p910_wdt_ping();
- return 0;
-
- case WDIOC_SETTIMEOUT:
- if (get_user(new_value, p))
- return -EFAULT;
-
- heartbeat = new_value;
- w90p910_wdt_ping();
-
- return put_user(new_value, p);
- case WDIOC_GETTIMEOUT:
- return put_user(heartbeat, p);
- default:
- return -ENOTTY;
- }
-}
-
-static ssize_t w90p910_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;
-
- w90p910_wdt->expect_close = 0;
-
- for (i = 0; i < len; i++) {
- char c;
- if (get_user(c, data + i))
- return -EFAULT;
- if (c == 'V') {
- w90p910_wdt->expect_close = 42;
- break;
- }
- }
- }
-
- w90p910_wdt_ping();
- return len;
-}
-
-static void w90p910_wdt_timer_ping(unsigned long data)
-{
- if (time_before(jiffies, w90p910_wdt->next_heartbeat)) {
- w90p910_wdt_keepalive();
- mod_timer(&w90p910_wdt->timer, jiffies + WDT_TIMEOUT);
- } else
- dev_warn(&w90p910_wdt->pdev->dev, "Will reset the machine !\n");
-}
-
-static const struct file_operations w90p910wdt_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .unlocked_ioctl = w90p910_wdt_ioctl,
- .open = w90p910_wdt_open,
- .release = w90p910_wdt_close,
- .write = w90p910_wdt_write,
-};
-
-static struct miscdevice w90p910wdt_miscdev = {
- .minor = WATCHDOG_MINOR,
- .name = "watchdog",
- .fops = &w90p910wdt_fops,
-};
-
-static int __devinit w90p910wdt_probe(struct platform_device *pdev)
-{
- int ret = 0;
-
- w90p910_wdt = kzalloc(sizeof(struct w90p910_wdt), GFP_KERNEL);
- if (!w90p910_wdt)
- return -ENOMEM;
-
- w90p910_wdt->pdev = pdev;
-
- spin_lock_init(&w90p910_wdt->wdt_lock);
-
- w90p910_wdt->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (w90p910_wdt->res == NULL) {
- dev_err(&pdev->dev, "no memory resource specified\n");
- ret = -ENOENT;
- goto err_get;
- }
-
- if (!request_mem_region(w90p910_wdt->res->start,
- resource_size(w90p910_wdt->res), pdev->name)) {
- dev_err(&pdev->dev, "failed to get memory region\n");
- ret = -ENOENT;
- goto err_get;
- }
-
- w90p910_wdt->wdt_base = ioremap(w90p910_wdt->res->start,
- resource_size(w90p910_wdt->res));
- if (w90p910_wdt->wdt_base == NULL) {
- dev_err(&pdev->dev, "failed to ioremap() region\n");
- ret = -EINVAL;
- goto err_req;
- }
-
- w90p910_wdt->wdt_clock = clk_get(&pdev->dev, NULL);
- if (IS_ERR(w90p910_wdt->wdt_clock)) {
- dev_err(&pdev->dev, "failed to find watchdog clock source\n");
- ret = PTR_ERR(w90p910_wdt->wdt_clock);
- goto err_map;
- }
-
- clk_enable(w90p910_wdt->wdt_clock);
-
- setup_timer(&w90p910_wdt->timer, w90p910_wdt_timer_ping, 0);
-
- if (misc_register(&w90p910wdt_miscdev)) {
- dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
- WATCHDOG_MINOR, ret);
- goto err_clk;
- }
-
- return 0;
-
-err_clk:
- clk_disable(w90p910_wdt->wdt_clock);
- clk_put(w90p910_wdt->wdt_clock);
-err_map:
- iounmap(w90p910_wdt->wdt_base);
-err_req:
- release_mem_region(w90p910_wdt->res->start,
- resource_size(w90p910_wdt->res));
-err_get:
- kfree(w90p910_wdt);
- return ret;
-}
-
-static int __devexit w90p910wdt_remove(struct platform_device *pdev)
-{
- misc_deregister(&w90p910wdt_miscdev);
-
- clk_disable(w90p910_wdt->wdt_clock);
- clk_put(w90p910_wdt->wdt_clock);
-
- iounmap(w90p910_wdt->wdt_base);
-
- release_mem_region(w90p910_wdt->res->start,
- resource_size(w90p910_wdt->res));
-
- kfree(w90p910_wdt);
-
- return 0;
-}
-
-static struct platform_driver w90p910wdt_driver = {
- .probe = w90p910wdt_probe,
- .remove = __devexit_p(w90p910wdt_remove),
- .driver = {
- .name = "w90p910-wdt",
- .owner = THIS_MODULE,
- },
-};
-
-static int __init w90p910_wdt_init(void)
-{
- return platform_driver_register(&w90p910wdt_driver);
-}
-
-static void __exit w90p910_wdt_exit(void)
-{
- platform_driver_unregister(&w90p910wdt_driver);
-}
-
-module_init(w90p910_wdt_init);
-module_exit(w90p910_wdt_exit);
-
-MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
-MODULE_DESCRIPTION("Watchdog driver for W90P910");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:w90p910-wdt");
--
1.5.6.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v2] Add watchdog driver for w90p910
2009-08-17 10:00 ` Wan ZongShun
@ 2009-08-17 11:02 ` Wim Van Sebroeck
2009-08-17 11:04 ` Wan ZongShun
0 siblings, 1 reply; 19+ messages in thread
From: Wim Van Sebroeck @ 2009-08-17 11:02 UTC (permalink / raw)
To: Wan ZongShun; +Cc: Wim Van Sebroeck, linux-arm-kernel, linux-kernel
Hi Wan,
I added your nuc900_wdt driver to the linux-2.6-watchdog-next tree.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] Add watchdog driver for w90p910
2009-08-17 11:02 ` Wim Van Sebroeck
@ 2009-08-17 11:04 ` Wan ZongShun
0 siblings, 0 replies; 19+ messages in thread
From: Wan ZongShun @ 2009-08-17 11:04 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-arm-kernel, linux-kernel
Hi Wim,
I am profoundly grateful.
Thanks a lot for your help.
2009/8/17 Wim Van Sebroeck <wim@iguana.be>:
> Hi Wan,
>
> I added your nuc900_wdt driver to the linux-2.6-watchdog-next tree.
>
> Kind regards,
> Wim.
>
>
--
Wan z.s
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Add watchdog driver for w90p910
2009-08-05 11:37 ` [PATCH] " Wan ZongShun
@ 2009-08-20 12:16 ` Wim Van Sebroeck
0 siblings, 0 replies; 19+ messages in thread
From: Wim Van Sebroeck @ 2009-08-20 12:16 UTC (permalink / raw)
To: Wan ZongShun; +Cc: linux-arm-kernel, linux-kernel
Hi Wan,
> Here is the w90p910 datasheet link, now the ic was renames nuc910.
> Maybe you can give me a good idea,
> hmm, regarding the timer as your mentioned (at91sam9_wdt.c), I am
> studying it and will resubmit a updated patch to you. thanks a lot for
> your help !
>
> http://www.nuvoton-usa.com/hq/enu/ProductAndSales/ProductLines/ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller/NUC910A.htm
This is the hardware reference manual. Is there one that describes the registers?
Thanks in advance,
Wim.
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2009-08-20 12:16 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-24 15:06 [PATCH] Add watchdog driver for w90p910 Wan ZongShun
2009-07-30 1:17 ` Wan ZongShun
2009-07-30 5:00 ` Wim Van Sebroeck
2009-07-30 5:03 ` Wan ZongShun
2009-08-04 20:10 ` Wim Van Sebroeck
2009-08-05 2:55 ` Wan ZongShun
2009-08-05 7:08 ` Wim Van Sebroeck
2009-08-05 8:00 ` Wan ZongShun
2009-08-05 10:31 ` Wim Van Sebroeck
2009-08-05 10:44 ` Wan ZongShun
2009-08-05 13:20 ` [PATCH v2] " Wan ZongShun
2009-08-17 2:40 ` Wan ZongShun
2009-08-17 9:14 ` Wim Van Sebroeck
2009-08-17 9:19 ` Wan ZongShun
2009-08-17 10:00 ` Wan ZongShun
2009-08-17 11:02 ` Wim Van Sebroeck
2009-08-17 11:04 ` Wan ZongShun
2009-08-05 11:37 ` [PATCH] " Wan ZongShun
2009-08-20 12:16 ` Wim Van Sebroeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).