* [PATCH v5 1/5] watchdog: davinci: change driver to use WDT core
2013-12-04 19:39 [PATCH v5 0/5] Update Davinci watchdog driver Ivan Khoronzhuk
@ 2013-12-04 19:39 ` Ivan Khoronzhuk
2013-12-04 20:48 ` Guenter Roeck
2013-12-05 11:26 ` [PATCH v6 " Ivan Khoronzhuk
2013-12-04 19:39 ` [PATCH v5 2/5] watchdog: davinci: use davinci_wdt_device structure to hold device data Ivan Khoronzhuk
` (4 subsequent siblings)
5 siblings, 2 replies; 13+ messages in thread
From: Ivan Khoronzhuk @ 2013-12-04 19:39 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: linux-arm-kernel, mark.rutland, wim, nsekhar, linux-watchdog,
devicetree, Pawel.Moll, swarren, ijc+devicetree, galak,
rob.herring, linux-kernel, grant.likely, grygorii.strashko,
Ivan Khoronzhuk
To reduce code duplicate and increase code readability use WDT core
code to handle WDT interface.
Remove io_lock as the WDT core uses mutex to lock each wdt device.
Remove wdt_state as the WDT core tracks state with its own variable.
The watchdog_init_timeout() can read timeout value from timeout-sec
property if the passed value is out of bounds. The heartbeat is
initialized in next way. If heartbeat is not set thought module
parameter, try to read it's value from WDT node timeout-sec property.
If node has no one, use default value.
The heartbeat is hold in wdd->timeout by WDT core, so use it in
order to set timeout period.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
drivers/watchdog/Kconfig | 1 +
drivers/watchdog/davinci_wdt.c | 147 ++++++++++------------------------------
2 files changed, 36 insertions(+), 112 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 5be6e91..3ca69c8 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -271,6 +271,7 @@ config IOP_WATCHDOG
config DAVINCI_WATCHDOG
tristate "DaVinci watchdog"
depends on ARCH_DAVINCI
+ select WATCHDOG_CORE
help
Say Y here if to include support for the watchdog timer
in the DaVinci DM644x/DM646x processors.
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index dd625cc..3701f06 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -3,7 +3,7 @@
*
* Watchdog driver for DaVinci DM644x/DM646x processors
*
- * Copyright (C) 2006 Texas Instruments.
+ * Copyright (C) 2006-2013 Texas Instruments.
*
* 2007 (c) MontaVista Software, Inc. This file is licensed under
* the terms of the GNU General Public License version 2. This program
@@ -15,18 +15,12 @@
#include <linux/moduleparam.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/init.h>
-#include <linux/bitops.h>
#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/device.h>
#include <linux/clk.h>
-#include <linux/slab.h>
#include <linux/err.h>
#define MODULE_NAME "DAVINCI-WDT: "
@@ -61,31 +55,12 @@
#define WDKEY_SEQ0 (0xa5c6 << 16)
#define WDKEY_SEQ1 (0xda7e << 16)
-static int heartbeat = DEFAULT_HEARTBEAT;
-
-static DEFINE_SPINLOCK(io_lock);
-static unsigned long wdt_status;
-#define WDT_IN_USE 0
-#define WDT_OK_TO_CLOSE 1
-#define WDT_REGION_INITED 2
-#define WDT_DEVICE_INITED 3
-
+static int heartbeat;
static void __iomem *wdt_base;
struct clk *wdt_clk;
+static struct watchdog_device wdt_wdd;
-static void wdt_service(void)
-{
- spin_lock(&io_lock);
-
- /* put watchdog in service state */
- iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
- /* put watchdog in active state */
- iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
-
- spin_unlock(&io_lock);
-}
-
-static void wdt_enable(void)
+static int davinci_wdt_start(struct watchdog_device *wdd)
{
u32 tgcr;
u32 timer_margin;
@@ -93,8 +68,6 @@ static void wdt_enable(void)
wdt_freq = clk_get_rate(wdt_clk);
- spin_lock(&io_lock);
-
/* disable, internal clock source */
iowrite32(0, wdt_base + TCR);
/* reset timer, set mode to 64-bit watchdog, and unreset */
@@ -105,9 +78,9 @@ static void wdt_enable(void)
iowrite32(0, wdt_base + TIM12);
iowrite32(0, wdt_base + TIM34);
/* set timeout period */
- timer_margin = (((u64)heartbeat * wdt_freq) & 0xffffffff);
+ timer_margin = (((u64)wdd->timeout * wdt_freq) & 0xffffffff);
iowrite32(timer_margin, wdt_base + PRD12);
- timer_margin = (((u64)heartbeat * wdt_freq) >> 32);
+ timer_margin = (((u64)wdd->timeout * wdt_freq) >> 32);
iowrite32(timer_margin, wdt_base + PRD34);
/* enable run continuously */
iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);
@@ -119,84 +92,28 @@ static void wdt_enable(void)
iowrite32(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
/* put watchdog in active state */
iowrite32(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
-
- spin_unlock(&io_lock);
-}
-
-static int davinci_wdt_open(struct inode *inode, struct file *file)
-{
- if (test_and_set_bit(WDT_IN_USE, &wdt_status))
- return -EBUSY;
-
- wdt_enable();
-
- return nonseekable_open(inode, file);
+ return 0;
}
-static ssize_t
-davinci_wdt_write(struct file *file, const char *data, size_t len,
- loff_t *ppos)
+static int davinci_wdt_ping(struct watchdog_device *wdd)
{
- if (len)
- wdt_service();
-
- return len;
+ /* put watchdog in service state */
+ iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
+ /* put watchdog in active state */
+ iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
+ return 0;
}
-static const struct watchdog_info ident = {
+static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
.identity = "DaVinci Watchdog",
};
-static long davinci_wdt_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- int ret = -ENOTTY;
-
- switch (cmd) {
- case WDIOC_GETSUPPORT:
- ret = copy_to_user((struct watchdog_info *)arg, &ident,
- sizeof(ident)) ? -EFAULT : 0;
- break;
-
- case WDIOC_GETSTATUS:
- case WDIOC_GETBOOTSTATUS:
- ret = put_user(0, (int *)arg);
- break;
-
- case WDIOC_KEEPALIVE:
- wdt_service();
- ret = 0;
- break;
-
- case WDIOC_GETTIMEOUT:
- ret = put_user(heartbeat, (int *)arg);
- break;
- }
- return ret;
-}
-
-static int davinci_wdt_release(struct inode *inode, struct file *file)
-{
- wdt_service();
- clear_bit(WDT_IN_USE, &wdt_status);
-
- return 0;
-}
-
-static const struct file_operations davinci_wdt_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = davinci_wdt_write,
- .unlocked_ioctl = davinci_wdt_ioctl,
- .open = davinci_wdt_open,
- .release = davinci_wdt_release,
-};
-
-static struct miscdevice davinci_wdt_miscdev = {
- .minor = WATCHDOG_MINOR,
- .name = "watchdog",
- .fops = &davinci_wdt_fops,
+static const struct watchdog_ops davinci_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = davinci_wdt_start,
+ .stop = davinci_wdt_ping,
+ .ping = davinci_wdt_ping,
};
static int davinci_wdt_probe(struct platform_device *pdev)
@@ -204,6 +121,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
int ret = 0;
struct device *dev = &pdev->dev;
struct resource *wdt_mem;
+ struct watchdog_device *wdd;
wdt_clk = devm_clk_get(dev, NULL);
if (WARN_ON(IS_ERR(wdt_clk)))
@@ -211,29 +129,34 @@ static int davinci_wdt_probe(struct platform_device *pdev)
clk_prepare_enable(wdt_clk);
- if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
- heartbeat = DEFAULT_HEARTBEAT;
+ wdd = &wdt_wdd;
+ wdd->info = &davinci_wdt_info;
+ wdd->ops = &davinci_wdt_ops;
+ wdd->min_timeout = 1;
+ wdd->max_timeout = MAX_HEARTBEAT;
+ wdd->timeout = DEFAULT_HEARTBEAT;
+
+ watchdog_init_timeout(wdd, heartbeat, dev);
+
+ dev_info(dev, "heartbeat %d sec\n", wdd->timeout);
- dev_info(dev, "heartbeat %d sec\n", heartbeat);
+ watchdog_set_nowayout(wdd, 1);
wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
wdt_base = devm_ioremap_resource(dev, wdt_mem);
if (IS_ERR(wdt_base))
return PTR_ERR(wdt_base);
- ret = misc_register(&davinci_wdt_miscdev);
- if (ret < 0) {
- dev_err(dev, "cannot register misc device\n");
- } else {
- set_bit(WDT_DEVICE_INITED, &wdt_status);
- }
+ ret = watchdog_register_device(wdd);
+ if (ret < 0)
+ dev_err(dev, "cannot register watchdog device\n");
return ret;
}
static int davinci_wdt_remove(struct platform_device *pdev)
{
- misc_deregister(&davinci_wdt_miscdev);
+ watchdog_unregister_device(&wdt_wdd);
clk_disable_unprepare(wdt_clk);
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v5 1/5] watchdog: davinci: change driver to use WDT core
2013-12-04 19:39 ` [PATCH v5 1/5] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
@ 2013-12-04 20:48 ` Guenter Roeck
2013-12-05 11:26 ` [PATCH v6 " Ivan Khoronzhuk
1 sibling, 0 replies; 13+ messages in thread
From: Guenter Roeck @ 2013-12-04 20:48 UTC (permalink / raw)
To: Ivan Khoronzhuk
Cc: Santosh Shilimkar, linux-arm-kernel, mark.rutland, wim, nsekhar,
linux-watchdog, devicetree, Pawel.Moll, swarren, ijc+devicetree,
galak, rob.herring, linux-kernel, grant.likely, grygorii.strashko
On Wed, Dec 04, 2013 at 09:39:26PM +0200, Ivan Khoronzhuk wrote:
> To reduce code duplicate and increase code readability use WDT core
> code to handle WDT interface.
>
> Remove io_lock as the WDT core uses mutex to lock each wdt device.
> Remove wdt_state as the WDT core tracks state with its own variable.
>
> The watchdog_init_timeout() can read timeout value from timeout-sec
> property if the passed value is out of bounds. The heartbeat is
> initialized in next way. If heartbeat is not set thought module
> parameter, try to read it's value from WDT node timeout-sec property.
> If node has no one, use default value.
>
> The heartbeat is hold in wdd->timeout by WDT core, so use it in
> order to set timeout period.
>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Looks good, except you did not explain ...
>
> - dev_info(dev, "heartbeat %d sec\n", heartbeat);
> + watchdog_set_nowayout(wdd, 1);
>
why nowayout is enforced.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v6 1/5] watchdog: davinci: change driver to use WDT core
2013-12-04 19:39 ` [PATCH v5 1/5] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
2013-12-04 20:48 ` Guenter Roeck
@ 2013-12-05 11:26 ` Ivan Khoronzhuk
1 sibling, 0 replies; 13+ messages in thread
From: Ivan Khoronzhuk @ 2013-12-05 11:26 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: mark.rutland, devicetree, grygorii.strashko, linux-watchdog,
Pawel.Moll, swarren, ijc+devicetree, nsekhar, galak, rob.herring,
linux-kernel, wim, linux, grant.likely, Ivan Khoronzhuk,
linux-arm-kernel
To reduce code duplicate and increase code readability use WDT core
code to handle WDT interface.
Remove io_lock as the WDT core uses mutex to lock each wdt device.
Remove wdt_state as the WDT core tracks state with its own variable.
The watchdog_init_timeout() can read timeout value from timeout-sec
property if the passed value is out of bounds. The heartbeat is
initialized in next way. If heartbeat is not set thought module
parameter, try to read it's value from WDT node timeout-sec property.
If node has no one, use default value.
The heartbeat is hold in wdd->timeout by WDT core, so use it in
order to set timeout period.
Davinci WDT can't be stopped and once it's expired - it can be
rearmed only after hardware reset, that's why nowayout feature
is enforced.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
drivers/watchdog/Kconfig | 1 +
drivers/watchdog/davinci_wdt.c | 147 ++++++++++------------------------------
2 files changed, 36 insertions(+), 112 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 5be6e91..3ca69c8 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -271,6 +271,7 @@ config IOP_WATCHDOG
config DAVINCI_WATCHDOG
tristate "DaVinci watchdog"
depends on ARCH_DAVINCI
+ select WATCHDOG_CORE
help
Say Y here if to include support for the watchdog timer
in the DaVinci DM644x/DM646x processors.
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index dd625cc..3701f06 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -3,7 +3,7 @@
*
* Watchdog driver for DaVinci DM644x/DM646x processors
*
- * Copyright (C) 2006 Texas Instruments.
+ * Copyright (C) 2006-2013 Texas Instruments.
*
* 2007 (c) MontaVista Software, Inc. This file is licensed under
* the terms of the GNU General Public License version 2. This program
@@ -15,18 +15,12 @@
#include <linux/moduleparam.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/init.h>
-#include <linux/bitops.h>
#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/device.h>
#include <linux/clk.h>
-#include <linux/slab.h>
#include <linux/err.h>
#define MODULE_NAME "DAVINCI-WDT: "
@@ -61,31 +55,12 @@
#define WDKEY_SEQ0 (0xa5c6 << 16)
#define WDKEY_SEQ1 (0xda7e << 16)
-static int heartbeat = DEFAULT_HEARTBEAT;
-
-static DEFINE_SPINLOCK(io_lock);
-static unsigned long wdt_status;
-#define WDT_IN_USE 0
-#define WDT_OK_TO_CLOSE 1
-#define WDT_REGION_INITED 2
-#define WDT_DEVICE_INITED 3
-
+static int heartbeat;
static void __iomem *wdt_base;
struct clk *wdt_clk;
+static struct watchdog_device wdt_wdd;
-static void wdt_service(void)
-{
- spin_lock(&io_lock);
-
- /* put watchdog in service state */
- iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
- /* put watchdog in active state */
- iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
-
- spin_unlock(&io_lock);
-}
-
-static void wdt_enable(void)
+static int davinci_wdt_start(struct watchdog_device *wdd)
{
u32 tgcr;
u32 timer_margin;
@@ -93,8 +68,6 @@ static void wdt_enable(void)
wdt_freq = clk_get_rate(wdt_clk);
- spin_lock(&io_lock);
-
/* disable, internal clock source */
iowrite32(0, wdt_base + TCR);
/* reset timer, set mode to 64-bit watchdog, and unreset */
@@ -105,9 +78,9 @@ static void wdt_enable(void)
iowrite32(0, wdt_base + TIM12);
iowrite32(0, wdt_base + TIM34);
/* set timeout period */
- timer_margin = (((u64)heartbeat * wdt_freq) & 0xffffffff);
+ timer_margin = (((u64)wdd->timeout * wdt_freq) & 0xffffffff);
iowrite32(timer_margin, wdt_base + PRD12);
- timer_margin = (((u64)heartbeat * wdt_freq) >> 32);
+ timer_margin = (((u64)wdd->timeout * wdt_freq) >> 32);
iowrite32(timer_margin, wdt_base + PRD34);
/* enable run continuously */
iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);
@@ -119,84 +92,28 @@ static void wdt_enable(void)
iowrite32(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
/* put watchdog in active state */
iowrite32(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
-
- spin_unlock(&io_lock);
-}
-
-static int davinci_wdt_open(struct inode *inode, struct file *file)
-{
- if (test_and_set_bit(WDT_IN_USE, &wdt_status))
- return -EBUSY;
-
- wdt_enable();
-
- return nonseekable_open(inode, file);
+ return 0;
}
-static ssize_t
-davinci_wdt_write(struct file *file, const char *data, size_t len,
- loff_t *ppos)
+static int davinci_wdt_ping(struct watchdog_device *wdd)
{
- if (len)
- wdt_service();
-
- return len;
+ /* put watchdog in service state */
+ iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
+ /* put watchdog in active state */
+ iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
+ return 0;
}
-static const struct watchdog_info ident = {
+static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
.identity = "DaVinci Watchdog",
};
-static long davinci_wdt_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- int ret = -ENOTTY;
-
- switch (cmd) {
- case WDIOC_GETSUPPORT:
- ret = copy_to_user((struct watchdog_info *)arg, &ident,
- sizeof(ident)) ? -EFAULT : 0;
- break;
-
- case WDIOC_GETSTATUS:
- case WDIOC_GETBOOTSTATUS:
- ret = put_user(0, (int *)arg);
- break;
-
- case WDIOC_KEEPALIVE:
- wdt_service();
- ret = 0;
- break;
-
- case WDIOC_GETTIMEOUT:
- ret = put_user(heartbeat, (int *)arg);
- break;
- }
- return ret;
-}
-
-static int davinci_wdt_release(struct inode *inode, struct file *file)
-{
- wdt_service();
- clear_bit(WDT_IN_USE, &wdt_status);
-
- return 0;
-}
-
-static const struct file_operations davinci_wdt_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = davinci_wdt_write,
- .unlocked_ioctl = davinci_wdt_ioctl,
- .open = davinci_wdt_open,
- .release = davinci_wdt_release,
-};
-
-static struct miscdevice davinci_wdt_miscdev = {
- .minor = WATCHDOG_MINOR,
- .name = "watchdog",
- .fops = &davinci_wdt_fops,
+static const struct watchdog_ops davinci_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = davinci_wdt_start,
+ .stop = davinci_wdt_ping,
+ .ping = davinci_wdt_ping,
};
static int davinci_wdt_probe(struct platform_device *pdev)
@@ -204,6 +121,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
int ret = 0;
struct device *dev = &pdev->dev;
struct resource *wdt_mem;
+ struct watchdog_device *wdd;
wdt_clk = devm_clk_get(dev, NULL);
if (WARN_ON(IS_ERR(wdt_clk)))
@@ -211,29 +129,34 @@ static int davinci_wdt_probe(struct platform_device *pdev)
clk_prepare_enable(wdt_clk);
- if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
- heartbeat = DEFAULT_HEARTBEAT;
+ wdd = &wdt_wdd;
+ wdd->info = &davinci_wdt_info;
+ wdd->ops = &davinci_wdt_ops;
+ wdd->min_timeout = 1;
+ wdd->max_timeout = MAX_HEARTBEAT;
+ wdd->timeout = DEFAULT_HEARTBEAT;
+
+ watchdog_init_timeout(wdd, heartbeat, dev);
+
+ dev_info(dev, "heartbeat %d sec\n", wdd->timeout);
- dev_info(dev, "heartbeat %d sec\n", heartbeat);
+ watchdog_set_nowayout(wdd, 1);
wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
wdt_base = devm_ioremap_resource(dev, wdt_mem);
if (IS_ERR(wdt_base))
return PTR_ERR(wdt_base);
- ret = misc_register(&davinci_wdt_miscdev);
- if (ret < 0) {
- dev_err(dev, "cannot register misc device\n");
- } else {
- set_bit(WDT_DEVICE_INITED, &wdt_status);
- }
+ ret = watchdog_register_device(wdd);
+ if (ret < 0)
+ dev_err(dev, "cannot register watchdog device\n");
return ret;
}
static int davinci_wdt_remove(struct platform_device *pdev)
{
- misc_deregister(&davinci_wdt_miscdev);
+ watchdog_unregister_device(&wdt_wdd);
clk_disable_unprepare(wdt_clk);
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v5 2/5] watchdog: davinci: use davinci_wdt_device structure to hold device data
2013-12-04 19:39 [PATCH v5 0/5] Update Davinci watchdog driver Ivan Khoronzhuk
2013-12-04 19:39 ` [PATCH v5 1/5] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
@ 2013-12-04 19:39 ` Ivan Khoronzhuk
2013-12-04 19:39 ` [PATCH v5 3/5] watchdog: davinci: add GET_TIMELEFT option support Ivan Khoronzhuk
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Ivan Khoronzhuk @ 2013-12-04 19:39 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: linux-arm-kernel, mark.rutland, wim, nsekhar, linux-watchdog,
devicetree, Pawel.Moll, swarren, ijc+devicetree, galak,
rob.herring, linux-kernel, grant.likely, grygorii.strashko,
Ivan Khoronzhuk
Some SoCs, like Keystone 2, can support more than one WDT and each
watchdog device has to use it's own base address, clock source,
watchdog device, so add new davinci_wdt_device structure to hold
device data.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter roeck <linux@roeck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
drivers/watchdog/davinci_wdt.c | 74 ++++++++++++++++++++++++++--------------
1 file changed, 48 insertions(+), 26 deletions(-)
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 3701f06..b6b82d1d 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -56,51 +56,63 @@
#define WDKEY_SEQ1 (0xda7e << 16)
static int heartbeat;
-static void __iomem *wdt_base;
-struct clk *wdt_clk;
-static struct watchdog_device wdt_wdd;
+
+/*
+ * struct to hold data for each WDT device
+ * @base - base io address of WD device
+ * @clk - source clock of WDT
+ * @wdd - hold watchdog device as is in WDT core
+ */
+struct davinci_wdt_device {
+ void __iomem *base;
+ struct clk *clk;
+ struct watchdog_device wdd;
+};
static int davinci_wdt_start(struct watchdog_device *wdd)
{
u32 tgcr;
u32 timer_margin;
unsigned long wdt_freq;
+ struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
- wdt_freq = clk_get_rate(wdt_clk);
+ wdt_freq = clk_get_rate(davinci_wdt->clk);
/* disable, internal clock source */
- iowrite32(0, wdt_base + TCR);
+ iowrite32(0, davinci_wdt->base + TCR);
/* reset timer, set mode to 64-bit watchdog, and unreset */
- iowrite32(0, wdt_base + TGCR);
+ iowrite32(0, davinci_wdt->base + TGCR);
tgcr = TIMMODE_64BIT_WDOG | TIM12RS_UNRESET | TIM34RS_UNRESET;
- iowrite32(tgcr, wdt_base + TGCR);
+ iowrite32(tgcr, davinci_wdt->base + TGCR);
/* clear counter regs */
- iowrite32(0, wdt_base + TIM12);
- iowrite32(0, wdt_base + TIM34);
+ iowrite32(0, davinci_wdt->base + TIM12);
+ iowrite32(0, davinci_wdt->base + TIM34);
/* set timeout period */
timer_margin = (((u64)wdd->timeout * wdt_freq) & 0xffffffff);
- iowrite32(timer_margin, wdt_base + PRD12);
+ iowrite32(timer_margin, davinci_wdt->base + PRD12);
timer_margin = (((u64)wdd->timeout * wdt_freq) >> 32);
- iowrite32(timer_margin, wdt_base + PRD34);
+ iowrite32(timer_margin, davinci_wdt->base + PRD34);
/* enable run continuously */
- iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);
+ iowrite32(ENAMODE12_PERIODIC, davinci_wdt->base + TCR);
/* Once the WDT is in pre-active state write to
* TIM12, TIM34, PRD12, PRD34, TCR, TGCR, WDTCR are
* write protected (except for the WDKEY field)
*/
/* put watchdog in pre-active state */
- iowrite32(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ0 | WDEN, davinci_wdt->base + WDTCR);
/* put watchdog in active state */
- iowrite32(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ1 | WDEN, davinci_wdt->base + WDTCR);
return 0;
}
static int davinci_wdt_ping(struct watchdog_device *wdd)
{
+ struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
+
/* put watchdog in service state */
- iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ0, davinci_wdt->base + WDTCR);
/* put watchdog in active state */
- iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ1, davinci_wdt->base + WDTCR);
return 0;
}
@@ -122,14 +134,21 @@ static int davinci_wdt_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct resource *wdt_mem;
struct watchdog_device *wdd;
+ struct davinci_wdt_device *davinci_wdt;
+
+ davinci_wdt = devm_kzalloc(dev, sizeof(*davinci_wdt), GFP_KERNEL);
+ if (!davinci_wdt)
+ return -ENOMEM;
- wdt_clk = devm_clk_get(dev, NULL);
- if (WARN_ON(IS_ERR(wdt_clk)))
- return PTR_ERR(wdt_clk);
+ davinci_wdt->clk = devm_clk_get(dev, NULL);
+ if (WARN_ON(IS_ERR(davinci_wdt->clk)))
+ return PTR_ERR(davinci_wdt->clk);
- clk_prepare_enable(wdt_clk);
+ clk_prepare_enable(davinci_wdt->clk);
- wdd = &wdt_wdd;
+ platform_set_drvdata(pdev, davinci_wdt);
+
+ wdd = &davinci_wdt->wdd;
wdd->info = &davinci_wdt_info;
wdd->ops = &davinci_wdt_ops;
wdd->min_timeout = 1;
@@ -140,12 +159,13 @@ static int davinci_wdt_probe(struct platform_device *pdev)
dev_info(dev, "heartbeat %d sec\n", wdd->timeout);
+ watchdog_set_drvdata(wdd, davinci_wdt);
watchdog_set_nowayout(wdd, 1);
wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- wdt_base = devm_ioremap_resource(dev, wdt_mem);
- if (IS_ERR(wdt_base))
- return PTR_ERR(wdt_base);
+ davinci_wdt->base = devm_ioremap_resource(dev, wdt_mem);
+ if (IS_ERR(davinci_wdt->base))
+ return PTR_ERR(davinci_wdt->base);
ret = watchdog_register_device(wdd);
if (ret < 0)
@@ -156,8 +176,10 @@ static int davinci_wdt_probe(struct platform_device *pdev)
static int davinci_wdt_remove(struct platform_device *pdev)
{
- watchdog_unregister_device(&wdt_wdd);
- clk_disable_unprepare(wdt_clk);
+ struct davinci_wdt_device *davinci_wdt = platform_get_drvdata(pdev);
+
+ watchdog_unregister_device(&davinci_wdt->wdd);
+ clk_disable_unprepare(davinci_wdt->clk);
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v5 3/5] watchdog: davinci: add GET_TIMELEFT option support
2013-12-04 19:39 [PATCH v5 0/5] Update Davinci watchdog driver Ivan Khoronzhuk
2013-12-04 19:39 ` [PATCH v5 1/5] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
2013-12-04 19:39 ` [PATCH v5 2/5] watchdog: davinci: use davinci_wdt_device structure to hold device data Ivan Khoronzhuk
@ 2013-12-04 19:39 ` Ivan Khoronzhuk
2013-12-04 19:39 ` [PATCH v5 4/5] watchdog: davinci: add "timeout-sec" property Ivan Khoronzhuk
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Ivan Khoronzhuk @ 2013-12-04 19:39 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: linux-arm-kernel, mark.rutland, wim, nsekhar, linux-watchdog,
devicetree, Pawel.Moll, swarren, ijc+devicetree, galak,
rob.herring, linux-kernel, grant.likely, grygorii.strashko,
Ivan Khoronzhuk
Currently, the davinci watchdog can be read while counting,
so we can add ability to report the remaining time before
the system will reboot.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
drivers/watchdog/davinci_wdt.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index b6b82d1d..cd6ff9d 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -116,6 +116,31 @@ static int davinci_wdt_ping(struct watchdog_device *wdd)
return 0;
}
+static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
+{
+ u64 timer_counter;
+ unsigned long freq;
+ u32 val;
+ struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
+
+ /* if timeout has occured then return 0 */
+ val = ioread32(davinci_wdt->base + WDTCR);
+ if (val & WDFLAG)
+ return 0;
+
+ freq = clk_get_rate(davinci_wdt->clk);
+
+ if (!freq)
+ return 0;
+
+ timer_counter = ioread32(davinci_wdt->base + TIM12);
+ timer_counter |= ((u64)ioread32(davinci_wdt->base + TIM34) << 32);
+
+ do_div(timer_counter, freq);
+
+ return wdd->timeout - timer_counter;
+}
+
static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
.identity = "DaVinci Watchdog",
@@ -126,6 +151,7 @@ static const struct watchdog_ops davinci_wdt_ops = {
.start = davinci_wdt_start,
.stop = davinci_wdt_ping,
.ping = davinci_wdt_ping,
+ .get_timeleft = davinci_wdt_get_timeleft,
};
static int davinci_wdt_probe(struct platform_device *pdev)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v5 4/5] watchdog: davinci: add "timeout-sec" property
2013-12-04 19:39 [PATCH v5 0/5] Update Davinci watchdog driver Ivan Khoronzhuk
` (2 preceding siblings ...)
2013-12-04 19:39 ` [PATCH v5 3/5] watchdog: davinci: add GET_TIMELEFT option support Ivan Khoronzhuk
@ 2013-12-04 19:39 ` Ivan Khoronzhuk
2013-12-04 19:39 ` [PATCH v5 5/5] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
2013-12-09 16:27 ` [PATCH v5 0/5] Update Davinci watchdog driver Santosh Shilimkar
5 siblings, 0 replies; 13+ messages in thread
From: Ivan Khoronzhuk @ 2013-12-04 19:39 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: linux-arm-kernel, mark.rutland, wim, nsekhar, linux-watchdog,
devicetree, Pawel.Moll, swarren, ijc+devicetree, galak,
rob.herring, linux-kernel, grant.likely, grygorii.strashko,
Ivan Khoronzhuk
Since Davinci WDT has been switched to use WDT core, it became able
to support timeout-sec property, so add it to it's binding description.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
.../devicetree/bindings/watchdog/davinci-wdt.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
index 75558cc..e450134 100644
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -4,9 +4,13 @@ Required properties:
- compatible : Should be "ti,davinci-wdt"
- reg : Should contain WDT registers location and length
+Optional properties:
+- timeout-sec : Contains the watchdog timeout in seconds
+
Examples:
wdt: wdt@2320000 {
compatible = "ti,davinci-wdt";
reg = <0x02320000 0x80>;
+ timeout-sec = <30>;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v5 5/5] watchdog: davinci: reuse driver for keystone arch
2013-12-04 19:39 [PATCH v5 0/5] Update Davinci watchdog driver Ivan Khoronzhuk
` (3 preceding siblings ...)
2013-12-04 19:39 ` [PATCH v5 4/5] watchdog: davinci: add "timeout-sec" property Ivan Khoronzhuk
@ 2013-12-04 19:39 ` Ivan Khoronzhuk
2013-12-09 16:27 ` [PATCH v5 0/5] Update Davinci watchdog driver Santosh Shilimkar
5 siblings, 0 replies; 13+ messages in thread
From: Ivan Khoronzhuk @ 2013-12-04 19:39 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: linux-arm-kernel, mark.rutland, wim, nsekhar, linux-watchdog,
devicetree, Pawel.Moll, swarren, ijc+devicetree, galak,
rob.herring, linux-kernel, grant.likely, grygorii.strashko,
Ivan Khoronzhuk
The keystone arch uses the same IP watchdog, so add "ti,keystone-wdt"
compatible and correct identity.
The Keystone arch is using clocks in DT and source clock for watchdog
has to be specified, so add this to binding.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
.../devicetree/bindings/watchdog/davinci-wdt.txt | 12 ++++++++++--
drivers/watchdog/Kconfig | 4 ++--
drivers/watchdog/davinci_wdt.c | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
index e450134..e60b9a1 100644
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -1,11 +1,18 @@
-DaVinci Watchdog Timer (WDT) Controller
+Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
Required properties:
-- compatible : Should be "ti,davinci-wdt"
+- compatible : Should be "ti,davinci-wdt", "ti,keystone-wdt"
- reg : Should contain WDT registers location and length
Optional properties:
- timeout-sec : Contains the watchdog timeout in seconds
+- clocks : the clock feeding the watchdog timer.
+ Needed if platform uses clocks.
+ See clock-bindings.txt
+
+Documentation:
+Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
+Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
Examples:
@@ -13,4 +20,5 @@ wdt: wdt@2320000 {
compatible = "ti,davinci-wdt";
reg = <0x02320000 0x80>;
timeout-sec = <30>;
+ clocks = <&clkwdtimer0>;
};
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3ca69c8..2958e09 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -270,11 +270,11 @@ config IOP_WATCHDOG
config DAVINCI_WATCHDOG
tristate "DaVinci watchdog"
- depends on ARCH_DAVINCI
+ depends on ARCH_DAVINCI || ARCH_KEYSTONE
select WATCHDOG_CORE
help
Say Y here if to include support for the watchdog timer
- in the DaVinci DM644x/DM646x processors.
+ in the DaVinci DM644x/DM646x or Keystone processors.
To compile this driver as a module, choose M here: the
module will be called davinci_wdt.
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index cd6ff9d..f3774eb 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -143,7 +143,7 @@ static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
- .identity = "DaVinci Watchdog",
+ .identity = "DaVinci/Keystone Watchdog",
};
static const struct watchdog_ops davinci_wdt_ops = {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v5 0/5] Update Davinci watchdog driver
2013-12-04 19:39 [PATCH v5 0/5] Update Davinci watchdog driver Ivan Khoronzhuk
` (4 preceding siblings ...)
2013-12-04 19:39 ` [PATCH v5 5/5] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
@ 2013-12-09 16:27 ` Santosh Shilimkar
2013-12-14 19:17 ` Santosh Shilimkar
5 siblings, 1 reply; 13+ messages in thread
From: Santosh Shilimkar @ 2013-12-09 16:27 UTC (permalink / raw)
To: Ivan Khoronzhuk, wim
Cc: mark.rutland, devicetree, grygorii.strashko, linux-watchdog,
Pawel.Moll, swarren, ijc+devicetree, nsekhar, galak, rob.herring,
linux-kernel, grant.likely, linux-arm-kernel
Wim,
On Wednesday 04 December 2013 02:39 PM, Ivan Khoronzhuk wrote:
> These patches are intended to update Davinci watchdog to use WDT core
> and reuse driver for keystone arch, because Keystone uses the similar
> IP like Davinci.
>
[..]
> v4..v5:
> - watchdog: davinci: change driver to use WDT core
> switched off CONFIG_WATCHDOG_NOWAYOUT option
>
Can you please apply the series to your watchdog tree ?
Do let me know if you want us to prepare a git branch
to pull from.
Regards,
Santosh
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v5 0/5] Update Davinci watchdog driver
2013-12-09 16:27 ` [PATCH v5 0/5] Update Davinci watchdog driver Santosh Shilimkar
@ 2013-12-14 19:17 ` Santosh Shilimkar
2013-12-26 17:55 ` Santosh Shilimkar
0 siblings, 1 reply; 13+ messages in thread
From: Santosh Shilimkar @ 2013-12-14 19:17 UTC (permalink / raw)
To: wim
Cc: mark.rutland, devicetree, grygorii.strashko, linux-watchdog,
Pawel.Moll, swarren, ijc+devicetree, nsekhar, galak, rob.herring,
linux-kernel, grant.likely, Ivan Khoronzhuk, Andrew Morton,
linux-arm-kernel
Wim,
On Monday 09 December 2013 11:27 AM, Santosh Shilimkar wrote:
> Wim,
>
> On Wednesday 04 December 2013 02:39 PM, Ivan Khoronzhuk wrote:
>> These patches are intended to update Davinci watchdog to use WDT core
>> and reuse driver for keystone arch, because Keystone uses the similar
>> IP like Davinci.
>>
>
> [..]
>
>> v4..v5:
>> - watchdog: davinci: change driver to use WDT core
>> switched off CONFIG_WATCHDOG_NOWAYOUT option
>>
> Can you please apply the series to your watchdog tree ?
> Do let me know if you want us to prepare a git branch
> to pull from.
>
ping..
Regards,
Santosh
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v5 0/5] Update Davinci watchdog driver
2013-12-14 19:17 ` Santosh Shilimkar
@ 2013-12-26 17:55 ` Santosh Shilimkar
2013-12-26 18:17 ` Wim Van Sebroeck
0 siblings, 1 reply; 13+ messages in thread
From: Santosh Shilimkar @ 2013-12-26 17:55 UTC (permalink / raw)
To: wim, Guenter Roeck
Cc: mark.rutland, devicetree, grygorii.strashko, linux-watchdog,
Pawel.Moll, swarren, ijc+devicetree, nsekhar, galak, rob.herring,
linux-kernel, grant.likely, Ivan Khoronzhuk, Andrew Morton,
linux-arm-kernel
On Saturday 14 December 2013 02:17 PM, Santosh Shilimkar wrote:
> Wim,
>
> On Monday 09 December 2013 11:27 AM, Santosh Shilimkar wrote:
>> Wim,
>>
>> On Wednesday 04 December 2013 02:39 PM, Ivan Khoronzhuk wrote:
>>> These patches are intended to update Davinci watchdog to use WDT core
>>> and reuse driver for keystone arch, because Keystone uses the similar
>>> IP like Davinci.
>>>
>>
>> [..]
>>
>>> v4..v5:
>>> - watchdog: davinci: change driver to use WDT core
>>> switched off CONFIG_WATCHDOG_NOWAYOUT option
>>>
>> Can you please apply the series to your watchdog tree ?
>> Do let me know if you want us to prepare a git branch
>> to pull from.
>>
> ping..
>
I haven't heard anything on this yet from you Wim.
Guenter,
I have seen you actively reviewing the $subject patch series.
Will you be able to pick the series up for 3.14 merge window
considering almost no response from Wim so far on it ?
Regards,
Santosh
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v5 0/5] Update Davinci watchdog driver
2013-12-26 17:55 ` Santosh Shilimkar
@ 2013-12-26 18:17 ` Wim Van Sebroeck
[not found] ` <20131226181725.GL10136-1F/o1hAF34+bEvaWgpTR7kEOCMrvLtNR@public.gmane.org>
0 siblings, 1 reply; 13+ messages in thread
From: Wim Van Sebroeck @ 2013-12-26 18:17 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: Guenter Roeck, Ivan Khoronzhuk, linux-arm-kernel, mark.rutland,
nsekhar, linux-watchdog, devicetree, Pawel.Moll, swarren,
ijc+devicetree, galak, rob.herring, linux-kernel, grant.likely,
grygorii.strashko, Andrew Morton
Hi Santosh,
> >> On Wednesday 04 December 2013 02:39 PM, Ivan Khoronzhuk wrote:
> >>> These patches are intended to update Davinci watchdog to use WDT core
> >>> and reuse driver for keystone arch, because Keystone uses the similar
> >>> IP like Davinci.
> >>>
> >>
> >> [..]
> >>
> >>> v4..v5:
> >>> - watchdog: davinci: change driver to use WDT core
> >>> switched off CONFIG_WATCHDOG_NOWAYOUT option
> >>>
> >> Can you please apply the series to your watchdog tree ?
> >> Do let me know if you want us to prepare a git branch
> >> to pull from.
> >>
> > ping..
> >
> I haven't heard anything on this yet from you Wim.
>
> Guenter,
> I have seen you actively reviewing the $subject patch series.
> Will you be able to pick the series up for 3.14 merge window
> considering almost no response from Wim so far on it ?
I have review the patches and they will go in my tree tomorrow.
I'm first finished the 2 new drivers. Then the davinci patches will go in
and then the s3c2410 patches and then I will review the w836* patches.
After that I will look at the mpc8xxx patches, the at91 patches, the remove
debug from pcwd_usb and whatever is still in my mailbox.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 13+ messages in thread