Skip to contentSkip to conversation

watchdog/at91sam9_wdt: Convert to use the new framework

PATCH NAK Wenyou Yang 4 participants 20 messages Feb 1, 2013 – Feb 18, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v4 cover watchdog/at91sam9_wdt: Convert to use the new framework

Hi, All

The purpose of the patch series is to convert at91sam9_wdt to use the watchdog framework,

Because the Watchdog Mode Register(WDT_MR) which WDDIS bit to disable or disable the watchdog can be written only once after reset. so if you want to use the watchdog in the kernel, you must be sure the watchdog doesn't be disabled in the at91bootstrap.

It is tested on at91sam9m10g45ek both DT and non-DT support, at91sam9g25ek with DT support by building Documentation/watchdog/src/watchdog-simple.c.

It is based on v3.8-rc6 + Arnd Bergmann's at91_wdt_dt_ids cannot be __init
+ Fabio Porcedda's add timeout-sec property binding

ChangeLog
v4:
- remove the patch: Use module_platform_driver().
- add tested on at91sam9m10g45ek both DT and non-DT support.
- rebase on v3.8-rc6

v3:
- The helper function 'watchdog_is_open' is moved to include/linux/watchdog.h
- Remove '__init' annotation from the function 'at91wdt_probe'
- Rebase on v3.8-rc2

v2:
- Remove the patches to add devive tree support which Fabio Porcedda has applied.
- Replace __raw_readl, __raw_writel with readl_relaxed, writel_relaxed.
- Rebase on v3.7-rc8.

Best Regards
Wenyou Yang

Wenyou Yang (8):
watchdog: add the function watchdog_is_open watchdog/at91sam9_wdt: Remove at91wdt_private and add at91wdt_drvdata
struct
watchdog/at91sam9_wdt: Convert to use the watchdog framework watchdog/at91sam9_wdt: Adjust the options of watchdog_info watchdog/at91sam9_wdt: Add nowayout helpers to Watchdog Timer Driver
Kernel API
watchdog/at91sam9_wdt: Remove the __initdata of at91wdt_wdd
ARM: dts: add the watchdog nodes for at91sam9x5 and at91sam9n12 SoC
ARM: dts: add the watchdog nodes for at91sam9g25ek and

    at91sam9m10g45ek boards
 arch/arm/boot/dts/at91sam9m10g45ek.dts |    4 +
 arch/arm/boot/dts/at91sam9n12.dtsi     |    6 +
 arch/arm/boot/dts/at91sam9x5.dtsi      |    6 +
 arch/arm/boot/dts/at91sam9x5ek.dtsi    |    4 +
 drivers/watchdog/at91sam9_wdt.c        |  272 +++++++++++++-------------------
 include/linux/watchdog.h               |    8 +
 6 files changed, 140 insertions(+), 160 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v4 1/8 watchdog: add the function watchdog_is_open

Add the function watchdog_is_open to check whether or not the /dev/watchdog? is opened

Cc wim at iguana.be
Cc linux-watchdog at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 include/linux/watchdog.h |    8 ++++++++
 1 file changed, 8 insertions(+)
include/linux/watchdog.h +8 -0
index e40cc2b..7ea4465 100644
@@ -111,6 +111,14 @@ static inline bool watchdog_active(struct watchdog_device *wdd)
 	return test_bit(WDOG_ACTIVE, &wdd->status);
 }
 
+/* Use the following function to check whether or not
+ * the /dev/watchdog? is opened
+ */
+static inline bool watchdog_is_open(struct watchdog_device *wddev)
+{
+	return test_bit(WDOG_DEV_OPEN, &wddev->status);
+}
+
 /* Use the following function to set the nowayout feature */
 static inline void watchdog_set_nowayout(struct watchdog_device *wdd, bool nowayout)
 {
Signature · 1 line
1.7.9.5
#2 lore raw

Re: [PATCH v4 1/8] watchdog: add the function watchdog_is_open

Hi Wenyou,

Quoted 20 lines

Add the function watchdog_is_open to check whether or not the /dev/watchdog? is opened

---
 include/linux/watchdog.h |    8 ++++++++
 1 file changed, 8 insertions(+)
include/linux/watchdog.h +1 -0
index e40cc2b..7ea4465 100644
@@ -111,6 +111,14 @@ static inline bool watchdog_active(struct watchdog_device *wdd)
 	return test_bit(WDOG_ACTIVE, &wdd->status);
 }
 
+/* Use the following function to check whether or not

include/linux/watchdog.h static inline bool watchdog_active(struct watchdog_device *wdd) · line 124

Quoted 10 lines
include/linux/watchdog.h +7 -0
+ * the /dev/watchdog? is opened
+ */
+static inline bool watchdog_is_open(struct watchdog_device *wddev)
+{
+	return test_bit(WDOG_DEV_OPEN, &wddev->status);
+}
+
 /* Use the following function to set the nowayout feature */
 static inline void watchdog_set_nowayout(struct watchdog_device *wdd, bool nowayout)
 {

NAK, this is not good. You should use watchdog_active instead.
Reason: your device could have been opened as for instance /dev/watchdog0.

Kind regards,
Wim.

#3 lore raw

PATCH v4 2/8 watchdog/at91sam9_wdt: Remove at91wdt_private and add at91wdt_drvdata struct

In reply to Wenyou Yang

Remove the global variable at91wdt_private, add the struct at91wdt_drvdata as a substitute, and set it as the driver data of the at91wdt_wdd.

Cc wim at iguana.be
Cc linux-watchdog at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/watchdog/at91sam9_wdt.c |   88 +++++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 41 deletions(-)
drivers/watchdog/at91sam9_wdt.c +47 -41
index 61129fc..66d3afb 100644
@@ -38,11 +38,6 @@
 
 #define DRV_NAME "AT91SAM9 Watchdog"
 
-#define wdt_read(field) \
-	__raw_readl(at91wdt_private.base + field)
-#define wdt_write(field, val) \
-	__raw_writel((val), at91wdt_private.base + field)
-
 /* AT91SAM9 watchdog runs a 12bit counter @ 256Hz,
  * use this to convert a watchdog
  * value from/to milliseconds.
@@ -72,23 +67,33 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
 
 static void at91_ping(unsigned long data);
 
-static struct {
-	void __iomem *base;
-	unsigned long next_heartbeat;	/* the next_heartbeat for the timer */
-	unsigned long open;
-	char expect_close;
-	struct timer_list timer;	/* The timer that pings the watchdog */
-} at91wdt_private;
+struct at91wdt_drvdata {
+	void __iomem	*phybase;
+	bool		is_enable;	/* indicate if the watchdog is eabled */
+	unsigned long	next_heartbeat;	/* the next_heartbeat for the timer */
+	struct timer_list	timer;	/* The timer that pings the watchdog */
+};
 
 /* ......................................................................... */
 
+static inline unsigned int wdt_read(struct at91wdt_drvdata *driver_data,
+					unsigned int field)
+{
+	return readl_relaxed(driver_data->phybase + field);
+}
+
+static inline void wdt_write(struct at91wdt_drvdata *driver_data,
+				unsigned int field, unsigned int val)
+{
+	writel_relaxed((val), driver_data->phybase + field);
+}
 
 /*
  * Reload the watchdog timer.  (ie, pat the watchdog)
  */
-static inline void at91_wdt_reset(void)
+static inline void at91_wdt_reset(struct at91wdt_drvdata *driver_data)
 {
-	wdt_write(AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);
+	wdt_write(driver_data, AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);
 }
 
 /*
@@ -96,10 +101,12 @@ static inline void at91_wdt_reset(void)
  */
 static void at91_ping(unsigned long data)
 {
-	if (time_before(jiffies, at91wdt_private.next_heartbeat) ||
-			(!nowayout && !at91wdt_private.open)) {
-		at91_wdt_reset();
-		mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);
+	struct watchdog_device *wddev = (struct watchdog_device *)data;
+	struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev);
+
+	if (time_before(jiffies, driver_data->next_heartbeat)) {
+		at91_wdt_reset(driver_data);
+		mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
 	} else
 		pr_crit("I will reset your machine !\n");
 }
@@ -109,11 +116,8 @@ static void at91_ping(unsigned long data)
  */
 static int at91_wdt_open(struct inode *inode, struct file *file)
 {
-	if (test_and_set_bit(0, &at91wdt_private.open))
-		return -EBUSY;
-
-	at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;
-	mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);
+	driver_data->next_heartbeat = jiffies + heartbeat * HZ;
+	mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
 
 	return nonseekable_open(inode, file);
 }
@@ -123,13 +127,8 @@ static int at91_wdt_open(struct inode *inode, struct file *file)
  */
 static int at91_wdt_close(struct inode *inode, struct file *file)
 {
-	clear_bit(0, &at91wdt_private.open);
+	del_timer(&driver_data->timer);
 
-	/* stop internal ping */
-	if (!at91wdt_private.expect_close)
-		del_timer(&at91wdt_private.timer);
-
-	at91wdt_private.expect_close = 0;
 	return 0;
 }
 
@@ -191,7 +190,7 @@ static long at91_wdt_ioctl(struct file *file,
 		return put_user(0, p);
 
 	case WDIOC_KEEPALIVE:
-		at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;
+		driver_data->next_heartbeat = jiffies + heartbeat * HZ;
 		return 0;
 
 	case WDIOC_SETTIMEOUT:
@@ -199,7 +198,7 @@ static long at91_wdt_ioctl(struct file *file,
 			return -EFAULT;
 
 		heartbeat = new_value;
-		at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;
+		driver_data->next_heartbeat = jiffies + heartbeat * HZ;
 
 		return put_user(new_value, p);  /* return current value */
 
@@ -222,20 +221,16 @@ static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len,
 	if (!nowayout) {
 		size_t i;
 
-		at91wdt_private.expect_close = 0;
 
 		for (i = 0; i < len; i++) {
 			char c;
 			if (get_user(c, data + i))
 				return -EFAULT;
-			if (c == 'V') {
-				at91wdt_private.expect_close = 42;
-				break;
 			}
 		}
 	}
 
-	at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;
+	driver_data->next_heartbeat = jiffies + heartbeat * HZ;
 
 	return len;
 }
@@ -265,9 +260,19 @@ static struct watchdog_device at91wdt_wdd __initdata = {
 
 static int __init at91wdt_probe(struct platform_device *pdev)
 {
+	struct at91wdt_drvdata *driver_data;
 	struct resource	*r;
 	int res;
 
+	driver_data = devm_kzalloc(&pdev->dev,
+				sizeof(*driver_data), GFP_KERNEL);
+	if (!driver_data) {
+		dev_err(&pdev->dev, "Unable to alloacate watchdog device\n");
+		return -ENOMEM;
+	}
+
+	watchdog_set_drvdata(&at91wdt_wdd, driver_data);
+
 	if (at91wdt_miscdev.parent)
 		return -EBUSY;
 	at91wdt_miscdev.parent = &pdev->dev;
@@ -275,8 +280,8 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!r)
 		return -ENODEV;
-	at91wdt_private.base = ioremap(r->start, resource_size(r));
-	if (!at91wdt_private.base) {
+	driver_data->phybase = ioremap(r->start, resource_size(r));
+	if (!driver_data->phybase) {
 		dev_err(&pdev->dev, "failed to map registers, aborting.\n");
 		return -ENOMEM;
 	}
@@ -292,9 +297,10 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 	if (res)
 		return res;
 
-	at91wdt_private.next_heartbeat = jiffies + at91wdt_wdd.timeout * HZ;
-	setup_timer(&at91wdt_private.timer, at91_ping, 0);
-	mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);
+	driver_data->next_heartbeat = jiffies + at91wdt_wdd.timeout * HZ;
+	setup_timer(&driver_data->timer, at91_ping,
+					(unsigned long)&at91wdt_wdd);
+	mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
 
 	pr_info("enabled (heartbeat=%d sec, nowayout=%d)\n",
 		at91wdt_wdd.timeout, nowayout);
Signature · 1 line
1.7.9.5
#4 lore raw

Re: [PATCH v4 2/8] watchdog/at91sam9_wdt: Remove at91wdt_private and add at91wdt_drvdata struct

Hi Wenyou,

Quoted 2 lines

Remove the global variable at91wdt_private, add the struct at91wdt_drvdata as a substitute, and set it as the driver data of the at91wdt_wdd.

I rather have this after the conversion of the watchdog to the new framework.

Kind regards,
Wim.

#5 lore raw

RE: [PATCH v4 2/8] watchdog/at91sam9_wdt: Remove at91wdt_private and add at91wdt_drvdata struct

Hi Wim

Quoted 2 lines

I rather have this after the conversion of the watchdog to the new framework.

Thanks a lot.

OK , I will do it later.

Best Regards,
Wenyou Yang

#6 lore raw

PATCH v4 3/8 watchdog/at91sam9_wdt: Convert to use the watchdog framework

In reply to Wenyou Yang

According to Documentation/watchdog/convert_drivers_to_kernel_api.txt, remove the file_operations struct, miscdevice, and obsolete includes

Since the at91sam watchdog inherent characteristics, add the watchdog
operations: at91wdt_start, at91wdt_stop and at91wdt_ping.

Cc wim at iguana.be
Cc linux-watchdog at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/watchdog/at91sam9_wdt.c |  199 ++++++++++++++-------------------------
 1 file changed, 72 insertions(+), 127 deletions(-)
drivers/watchdog/at91sam9_wdt.c +72 -127
index 66d3afb..ce7930b 100644
@@ -13,16 +13,17 @@
  * The Watchdog Timer Mode Register can be only written to once. If the
  * timeout need to be set from Linux, be sure that the bootstrap or the
  * bootloader doesn't write to this register.
+ * The Watchdog Timer default is running with maximum counter value
+ * (WDV=0xfff) at reset, i.e., at power-up. It MUST be either disabled
+ * or be reprogrammed within the maxinum margin(16s).
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/errno.h>
-#include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
@@ -31,7 +32,6 @@
 #include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/bitops.h>
-#include <linux/uaccess.h>
 #include <linux/of.h>
 
 #include "at91sam9_wdt.h"
@@ -65,8 +65,6 @@ module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
 	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
-static void at91_ping(unsigned long data);
-
 struct at91wdt_drvdata {
 	void __iomem	*phybase;
 	bool		is_enable;	/* indicate if the watchdog is eabled */
@@ -99,7 +97,7 @@ static inline void at91_wdt_reset(struct at91wdt_drvdata *driver_data)
 /*
  * Timer tick
  */
-static void at91_ping(unsigned long data)
+static void at91wdt_timer_tick(unsigned long data)
 {
 	struct watchdog_device *wddev = (struct watchdog_device *)data;
 	struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev);
@@ -107,45 +105,31 @@ static void at91_ping(unsigned long data)
 	if (time_before(jiffies, driver_data->next_heartbeat)) {
 		at91_wdt_reset(driver_data);
 		mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
-	} else
-		pr_crit("I will reset your machine !\n");
-}
-
-/*
- * Watchdog device is opened, and watchdog starts running.
- */
-static int at91_wdt_open(struct inode *inode, struct file *file)
-{
-	driver_data->next_heartbeat = jiffies + heartbeat * HZ;
-	mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
 
-	return nonseekable_open(inode, file);
-}
-
-/*
- * Close the watchdog device.
- */
-static int at91_wdt_close(struct inode *inode, struct file *file)
-{
-	del_timer(&driver_data->timer);
-
-	return 0;
+		if (!watchdog_is_open(wddev))
+			driver_data->next_heartbeat = jiffies
+						+ wddev->timeout * HZ;
+	} else {
+		pr_crit("I will reset your machine !\n");
+	}
 }
 
-/*
- * Set the watchdog time interval in 1/256Hz (write-once)
- * Counter is 12 bit.
- */
-static int at91_wdt_settimeout(unsigned int timeout)
+static int at91wdt_enable(struct watchdog_device *wddev, unsigned int timeout)
 {
+	struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev);
 	unsigned int reg;
-	unsigned int mr;
 
-	/* Check if disabled */
-	mr = wdt_read(AT91_WDT_MR);
-	if (mr & AT91_WDT_WDDIS) {
-		pr_err("sorry, watchdog is disabled\n");
-		return -EIO;
+	/*
+	 * Check if the watchdog is disabled,
+	 * if disabled, the reason is the bootstrap or the bootloader has
+	 * written the Watchdog Timer Mode Register to disable the
+	 * watchdog timer
+	 */
+	reg = wdt_read(driver_data, AT91_WDT_MR);
+	if (reg & AT91_WDT_WDDIS) {
+		driver_data->is_enable = false;
+		pr_info("sorry, watchdog is disabled\n");
+		return -1;
 	}
 
 	/*
@@ -159,7 +143,9 @@ static int at91_wdt_settimeout(unsigned int timeout)
 		| AT91_WDT_WDDBGHLT	/* disabled in debug mode */
 		| AT91_WDT_WDD		/* restart at any time */
 		| (timeout & AT91_WDT_WDV);  /* timer value */
-	wdt_write(AT91_WDT_MR, reg);
+	wdt_write(driver_data, AT91_WDT_MR, reg);
+
+	driver_data->is_enable = true;
 
 	return 0;
 }
@@ -170,99 +156,63 @@ static const struct watchdog_info at91_wdt_info = {
 						WDIOF_MAGICCLOSE,
 };
 
-/*
- * Handle commands from user-space.
- */
-static long at91_wdt_ioctl(struct file *file,
-		unsigned int cmd, unsigned long arg)
+static int at91wdt_start(struct watchdog_device *wddev)
 {
-	void __user *argp = (void __user *)arg;
-	int __user *p = argp;
-	int new_value;
-
-	switch (cmd) {
-	case WDIOC_GETSUPPORT:
-		return copy_to_user(argp, &at91_wdt_info,
-				    sizeof(at91_wdt_info)) ? -EFAULT : 0;
-
-	case WDIOC_GETSTATUS:
-	case WDIOC_GETBOOTSTATUS:
-		return put_user(0, p);
+	struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev);
 
-	case WDIOC_KEEPALIVE:
-		driver_data->next_heartbeat = jiffies + heartbeat * HZ;
+	if (driver_data->is_enable) {
+		driver_data->next_heartbeat = jiffies + wddev->timeout * HZ;
+		mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
 		return 0;
-
-	case WDIOC_SETTIMEOUT:
-		if (get_user(new_value, p))
-			return -EFAULT;
-
-		heartbeat = new_value;
-		driver_data->next_heartbeat = jiffies + heartbeat * HZ;
-
-		return put_user(new_value, p);  /* return current value */
-
-	case WDIOC_GETTIMEOUT:
-		return put_user(heartbeat, p);
+	} else {
+		return -EIO;
 	}
-	return -ENOTTY;
 }
 
-/*
- * Pat the watchdog whenever device is written to.
- */
-static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len,
-								loff_t *ppos)
+static int at91wdt_stop(struct watchdog_device *wddev)
 {
-	if (!len)
-		return 0;
+	struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev);
 
-	/* Scan for magic character */
-	if (!nowayout) {
-		size_t i;
+	if (driver_data->is_enable)
+		return -EIO;
+	else
+		return 0;
+}
 
+static int at91wdt_ping(struct watchdog_device *wddev)
+{
+	struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev);
 
-		for (i = 0; i < len; i++) {
-			char c;
-			if (get_user(c, data + i))
-				return -EFAULT;
-			}
-		}
+	if (driver_data->is_enable) {
+		driver_data->next_heartbeat = jiffies + wddev->timeout * HZ;
+		 mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
+		return 0;
+	} else {
+		return -EIO;
 	}
-
-	driver_data->next_heartbeat = jiffies + heartbeat * HZ;
-
-	return len;
 }
-
 /* ......................................................................... */
 
-static const struct file_operations at91wdt_fops = {
-	.owner			= THIS_MODULE,
-	.llseek			= no_llseek,
-	.unlocked_ioctl	= at91_wdt_ioctl,
-	.open			= at91_wdt_open,
-	.release		= at91_wdt_close,
-	.write			= at91_wdt_write,
-};
-
-static struct miscdevice at91wdt_miscdev = {
-	.minor		= WATCHDOG_MINOR,
-	.name		= "watchdog",
-	.fops		= &at91wdt_fops,
+static struct watchdog_ops at91wdt_ops = {
+	.owner = THIS_MODULE,
+	.start = at91wdt_start,
+	.stop = at91wdt_stop,
+	.ping = at91wdt_ping,
 };
 
 static struct watchdog_device at91wdt_wdd __initdata = {
 	.timeout = WDT_HEARTBEAT,
 	.min_timeout = MIN_HEARTBEAT,
 	.max_timeout = MAX_HEARTBEAT,
+	.info = &at91_wdt_info,
+	.ops = &at91wdt_ops,
 };
 
 static int __init at91wdt_probe(struct platform_device *pdev)
 {
 	struct at91wdt_drvdata *driver_data;
 	struct resource	*r;
-	int res;
+	int ret;
 
 	driver_data = devm_kzalloc(&pdev->dev,
 				sizeof(*driver_data), GFP_KERNEL);
@@ -273,32 +223,32 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 
 	watchdog_set_drvdata(&at91wdt_wdd, driver_data);
 
-	if (at91wdt_miscdev.parent)
-		return -EBUSY;
-	at91wdt_miscdev.parent = &pdev->dev;
-
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!r)
 		return -ENODEV;
+
 	driver_data->phybase = ioremap(r->start, resource_size(r));
 	if (!driver_data->phybase) {
 		dev_err(&pdev->dev, "failed to map registers, aborting.\n");
 		return -ENOMEM;
 	}
 
-	watchdog_init_timeout(&at91wdt_wdd, heartbeat, pdev->dev.of_node);
+	ret = watchdog_register_device(&at91wdt_wdd);
+	if (ret) {
+		dev_err(&pdev->dev, "cannot register watchdog (%d)\n", ret);
+		return ret;
+	}
 
-	/* Set watchdog */
-	res = at91_wdt_settimeout(ms_to_ticks(WDT_HW_TIMEOUT * 1000));
-	if (res)
-		return res;
+	watchdog_init_timeout(&at91wdt_wdd, heartbeat, pdev->dev.of_node);
 
-	res = misc_register(&at91wdt_miscdev);
-	if (res)
-		return res;
+	ret = at91wdt_enable(&at91wdt_wdd, ms_to_ticks(WDT_HW_TIMEOUT * 1000));
+	if (ret) {
+		pr_info("the watchdog has been disabled\n");
+		return 0;
+	}
 
 	driver_data->next_heartbeat = jiffies + at91wdt_wdd.timeout * HZ;
-	setup_timer(&driver_data->timer, at91_ping,
+	setup_timer(&driver_data->timer, at91wdt_timer_tick,
 					(unsigned long)&at91wdt_wdd);
 	mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);
 
@@ -310,13 +260,9 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 
 static int __exit at91wdt_remove(struct platform_device *pdev)
 {
-	int res;
-
-	res = misc_deregister(&at91wdt_miscdev);
-	if (!res)
-		at91wdt_miscdev.parent = NULL;
+	watchdog_unregister_device(&at91wdt_wdd);
 
-	return res;
+	return 0;
 }
 
 #if defined(CONFIG_OF)
@@ -353,4 +299,3 @@ module_exit(at91sam_wdt_exit);
 MODULE_AUTHOR("Renaud CERRATO <[email protected]>");
 MODULE_DESCRIPTION("Watchdog driver for Atmel AT91SAM9x processors");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
Signature · 1 line
1.7.9.5
#7 lore raw

Re: [PATCH v4 3/8] watchdog/at91sam9_wdt: Convert to use the watchdog framework

Hi Wenyou,

Quoted 6 lines

According to Documentation/watchdog/convert_drivers_to_kernel_api.txt, remove the file_operations struct, miscdevice, and obsolete includes

Since the at91sam watchdog inherent characteristics, add the watchdog
operations: at91wdt_start, at91wdt_stop and at91wdt_ping.

This code not only converts the watchdog to the new framework, but it also adds the is_enable related code changes which should be a seperate patch.

So I took your original patch and changed it to the below at91sam9_wdt watchdog conversion patch. Note: this is also without Fabio's timeout-sec patch, this one needs to come after the conversion.

Please test this patch and let me know if this works (the watchdog should behave the same before as after this patch).

Kind regards,
Wim.
---

drivers/watchdog/Kconfig +1 -0
index 5e8a034..c36fcb0 100644
@@ -125,6 +125,7 @@ config AT91RM9200_WATCHDOG
 config AT91SAM9X_WATCHDOG
 	tristate "AT91SAM9X / AT91CAP9 watchdog"
 	depends on ARCH_AT91 && !ARCH_AT91RM9200
+	select WATCHDOG_CORE
 	help
 	  Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
 	  reboot your system when the timeout is reached.
drivers/watchdog/at91sam9_wdt.c +42 -119

250 lines not on this page · raw message

#8 lore raw

RE: [PATCH v4 3/8] watchdog/at91sam9_wdt: Convert to use the watchdog framework

Hi Wim,

Quoted 10 lines

This code not only converts the watchdog to the new framework, but it also adds the is_enable related code changes which should be a seperate patch.

So I took your original patch and changed it to the below at91sam9_wdt watchdog conversion patch. Note: this is also without Fabio's timeout-sec patch, this one needs to come after the conversion.

Please test this patch and let me know if this works (the watchdog should behave the same before as after this patch).

Sorry for so late reply due to Chinese New Year's holiday.

I applied it on the linux-watchdog trees,
and tested it on at91sam9m10g45ek both DT and non-DT support, at91sam9g25ek with DT support.

It works OK after one compilation error fixed.

Review

Quoted 1 line
(quoted diff) +1 -0
+	at91wdt_private.next_heartbeat = jiffies + wdd->timeout * HZ;

+ at91wdt_private.next_heartbeat = jiffies + at91_wdt_dev.timeout * HZ;

Thank you very much.

Best Regards,
Wenyou Yang

#9 lore raw

PATCH v4 4/8 watchdog/at91sam9_wdt: Adjust the options of watchdog_info

In reply to Wenyou Yang

Since the Watchdog Timer Mode Register can be only written only once, so the watchdog_info shall not support WDIOF_SETTIMEOUT and WDIOF_MAGICCLOSE options, remove them.

Cc wim at iguana.be
Cc linux-watchdog at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/watchdog/at91sam9_wdt.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/watchdog/at91sam9_wdt.c +1 -2
index ce7930b..c6d9f1f 100644
@@ -152,8 +152,7 @@ static int at91wdt_enable(struct watchdog_device *wddev, unsigned int timeout)
 
 static const struct watchdog_info at91_wdt_info = {
 	.identity	= DRV_NAME,
-	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
-						WDIOF_MAGICCLOSE,
+	.options	= WDIOF_KEEPALIVEPING,
 };
 
 static int at91wdt_start(struct watchdog_device *wddev)
Signature · 1 line
1.7.9.5
#10 lore raw

Re: [PATCH v4 4/8] watchdog/at91sam9_wdt: Adjust the options of watchdog_info

Hi Wenyou,

Quoted 3 lines

Since the Watchdog Timer Mode Register can be only written only once, so the watchdog_info shall not support WDIOF_SETTIMEOUT and WDIOF_MAGICCLOSE options, remove them.

Ik you keep using the timer, then you don't have to remove this.

Kind regards,
Wim.

#11 lore raw

Re: [PATCH v4 4/8] watchdog/at91sam9_wdt: Adjust the options of watchdog_info

Hello,

Quoted 7 lines · Wim Van Sebroeck

Hi Wenyou,

Quoted 3 lines

Since the Watchdog Timer Mode Register can be only written only once, so the watchdog_info shall not support WDIOF_SETTIMEOUT and WDIOF_MAGICCLOSE options, remove them.

Ik you keep using the timer, then you don't have to remove this.

Why removing especially WDIOF_MAGICCLOSE (and the timer needed for that)? This is a feature removal. Without there isn't even a need for nowayout option as it is implicitly set anyway. Nevertheless I would prefere keeping the timer to allow a user to let the kernel triggering the timer upon MAGICCLOSE.

Alexander

#12 lore raw

PATCH v4 5/8 watchdog/at91sam9_wdt: Add nowayout helpers to Watchdog Timer Driver Kernel API

In reply to Wenyou Yang
Cc wim at iguana.be
Cc linux-watchdog at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/watchdog/at91sam9_wdt.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/watchdog/at91sam9_wdt.c +2 -0
index c6d9f1f..e60a718 100644
@@ -238,6 +238,8 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	watchdog_set_nowayout(&at91wdt_wdd, nowayout);
+
 	watchdog_init_timeout(&at91wdt_wdd, heartbeat, pdev->dev.of_node);
 
 	ret = at91wdt_enable(&at91wdt_wdd, ms_to_ticks(WDT_HW_TIMEOUT * 1000));
Signature · 1 line
1.7.9.5
#13 lore raw

Re: [PATCH v4 5/8] watchdog/at91sam9_wdt: Add nowayout helpers to Watchdog Timer Driver Kernel API

Hi Wenyou

drivers/watchdog/at91sam9_wdt.c static int __init at91wdt_probe(struct platform_device *pdev) · line 245

Quoted 13 lines
drivers/watchdog/at91sam9_wdt.c +2 -0
index c6d9f1f..e60a718 100644
@@ -238,6 +238,8 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	watchdog_set_nowayout(&at91wdt_wdd, nowayout);
+
 	watchdog_init_timeout(&at91wdt_wdd, heartbeat, pdev->dev.of_node);
 
 	ret = at91wdt_enable(&at91wdt_wdd, ms_to_ticks(WDT_HW_TIMEOUT * 1000));

allready part of the patch I just sent you.

Kind regards,
Wim.

#14 lore raw

PATCH v4 6/8 watchdog/at91sam9_wdt: Remove the __initdata of at91wdt_wdd

In reply to Wenyou Yang

For this variable will be used in the timer handler.

Cc wim at iguana.be
Cc linux-watchdog at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/watchdog/at91sam9_wdt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/at91sam9_wdt.c +1 -1
index e60a718..3fc90ba 100644
@@ -199,7 +199,7 @@ static struct watchdog_ops at91wdt_ops = {
 	.ping = at91wdt_ping,
 };
 
-static struct watchdog_device at91wdt_wdd __initdata = {
+static struct watchdog_device at91wdt_wdd = {
 	.timeout = WDT_HEARTBEAT,
 	.min_timeout = MIN_HEARTBEAT,
 	.max_timeout = MAX_HEARTBEAT,
Signature · 1 line
1.7.9.5
#15 lore raw

Re: [PATCH v4 6/8] watchdog/at91sam9_wdt: Remove the __initdata of at91wdt_wdd

Hi Wenyou,

Quoted 15 lines

For this variable will be used in the timer handler.

---
 drivers/watchdog/at91sam9_wdt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/at91sam9_wdt.c +0 -0
index e60a718..3fc90ba 100644

drivers/watchdog/at91sam9_wdt.c static struct watchdog_ops at91wdt_ops = { · line 205

Quoted 8 lines
drivers/watchdog/at91sam9_wdt.c +1 -1
@@ -199,7 +199,7 @@ static struct watchdog_ops at91wdt_ops = {
 	.ping = at91wdt_ping,
 };
 
-static struct watchdog_device at91wdt_wdd __initdata = {
+static struct watchdog_device at91wdt_wdd = {
 	.timeout = WDT_HEARTBEAT,
 	.min_timeout = MIN_HEARTBEAT,
 	.max_timeout = MAX_HEARTBEAT,

should imho also have been part of your previous patches. Anyway, it's also like this in the patch I just sent you.

Kind regards,
Wim.

#16 lore raw

PATCH v4 7/8 ARM: dts: add the watchdog nodes for at91sam9x5 and at91sam9n12 SoC

In reply to Wenyou Yang
Cc linux at arm.linux.org.uk
Cc linux-kernel at vger.kernel.org
---
 arch/arm/boot/dts/at91sam9n12.dtsi |    6 ++++++
 arch/arm/boot/dts/at91sam9x5.dtsi  |    6 ++++++
 2 files changed, 12 insertions(+)
arch/arm/boot/dts/at91sam9n12.dtsi +6 -0
index 80e29c6..8fecdd1 100644
@@ -381,6 +381,12 @@
 				#size-cells = <0>;
 				status = "disabled";
 			};
+
+			watchdog at fffffe40 {
+				compatible = "atmel,at91sam9260-wdt";
+				reg = <0xfffffe40 0x10>;
+				status = "disabled";
+			};
 		};
 
 		nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9x5.dtsi +6 -0
index 8ecca69..eadba6d 100644
@@ -511,6 +511,12 @@
 					trigger-value = <0x6>;
 				};
 			};
+
+			watchdog at fffffe40 {
+				compatible = "atmel,at91sam9260-wdt";
+				reg = <0xfffffe40 0x10>;
+				status = "disabled";
+			};
 		};
 
 		nand0: nand at 40000000 {
Signature · 1 line
1.7.9.5
#17 lore raw

PATCH v4 8/8 ARM: dts: add the watchdog nodes for at91sam9g25ek and at91sam9m10g45ek boards

In reply to Wenyou Yang

Tested on the at91sam9g25ek and at91sam9m10g45ek boards

Cc linux at arm.linux.org.uk
Cc linux-kernel at vger.kernel.org
---
 arch/arm/boot/dts/at91sam9m10g45ek.dts |    4 ++++
 arch/arm/boot/dts/at91sam9x5ek.dtsi    |    4 ++++
 2 files changed, 8 insertions(+)
arch/arm/boot/dts/at91sam9m10g45ek.dts +4 -0
index 20c3191..0832c7a 100644
@@ -59,6 +59,10 @@
 				status = "okay";
 			};
 
+			watchdog at fffffd40 {
+				status = "okay";
+			};
+
 			mmc0: mmc at fff80000 {
 				pinctrl-0 = <
 					&pinctrl_board_mmc0
arch/arm/boot/dts/at91sam9x5ek.dtsi +4 -0
index 8a7cf1d..afddf75 100644
@@ -69,6 +69,10 @@
 				status = "okay";
 			};
 
+			watchdog at fffffe40 {
+				status = "okay";
+			};
+
 			pinctrl@fffff400 {
 				mmc0 {
 					pinctrl_board_mmc0: mmc0-board {
Signature · 1 line
1.7.9.5
#18 lore raw

v4 cover watchdog/at91sam9_wdt: Convert to use the new framework

In reply to Wenyou Yang

On 02/01/2013 08:06 AM, Wenyou Yang :

Quoted 8 lines

Hi, All

The purpose of the patch series is to convert at91sam9_wdt to use the watchdog framework,

Because the Watchdog Mode Register(WDT_MR) which WDDIS bit to disable or disable the watchdog can be written only once after reset. so if you want to use the watchdog in the kernel, you must be sure the watchdog doesn't be disabled in the at91bootstrap.

Quoted 5 lines

It is tested on at91sam9m10g45ek both DT and non-DT support, at91sam9g25ek with DT support by building Documentation/watchdog/src/watchdog-simple.c.

It is based on v3.8-rc6 + Arnd Bergmann's at91_wdt_dt_ids cannot be __init
+ Fabio Porcedda's add timeout-sec property binding

On my side, I give my acknowledgement to the whole patch series:

I hope that once Fabio Porcedda's series is merged, this series can be applied on top of it seamlessly and quickly.

Wim,
Tell us if you need that we resend this series or rebase it on top of another git tree.

Thanks for your work and for your reviews.

Best regards,

Quoted 40 lines

ChangeLog
v4:
- remove the patch: Use module_platform_driver().
- add tested on at91sam9m10g45ek both DT and non-DT support.
- rebase on v3.8-rc6

v3:
- The helper function 'watchdog_is_open' is moved to include/linux/watchdog.h
- Remove '__init' annotation from the function 'at91wdt_probe'
- Rebase on v3.8-rc2

v2:
- Remove the patches to add devive tree support which Fabio Porcedda has applied.
- Replace __raw_readl, __raw_writel with readl_relaxed, writel_relaxed.
- Rebase on v3.7-rc8.

Best Regards
Wenyou Yang

Wenyou Yang (8):
watchdog: add the function watchdog_is_open watchdog/at91sam9_wdt: Remove at91wdt_private and add at91wdt_drvdata
struct
watchdog/at91sam9_wdt: Convert to use the watchdog framework watchdog/at91sam9_wdt: Adjust the options of watchdog_info watchdog/at91sam9_wdt: Add nowayout helpers to Watchdog Timer Driver
Kernel API
watchdog/at91sam9_wdt: Remove the __initdata of at91wdt_wdd
ARM: dts: add the watchdog nodes for at91sam9x5 and at91sam9n12 SoC
ARM: dts: add the watchdog nodes for at91sam9g25ek and

    at91sam9m10g45ek boards
 arch/arm/boot/dts/at91sam9m10g45ek.dts |    4 +
 arch/arm/boot/dts/at91sam9n12.dtsi     |    6 +
 arch/arm/boot/dts/at91sam9x5.dtsi      |    6 +
 arch/arm/boot/dts/at91sam9x5ek.dtsi    |    4 +
 drivers/watchdog/at91sam9_wdt.c        |  272 +++++++++++++-------------------
 include/linux/watchdog.h               |    8 +
 6 files changed, 140 insertions(+), 160 deletions(-)
Signature · 1 line
Nicolas Ferre
#19 lore raw

Hi Nicolas,

Quoted 16 lines
Quoted 11 lines

The purpose of the patch series is to convert at91sam9_wdt to use the watchdog framework,

Because the Watchdog Mode Register(WDT_MR) which WDDIS bit to disable or disable the watchdog can be written only once after reset. so if you want to use the watchdog in the kernel, you must be sure the watchdog doesn't be disabled in the at91bootstrap.

It is tested on at91sam9m10g45ek both DT and non-DT support, at91sam9g25ek with DT support by building Documentation/watchdog/src/watchdog-simple.c.

It is based on v3.8-rc6 + Arnd Bergmann's at91_wdt_dt_ids cannot be __init
+ Fabio Porcedda's add timeout-sec property binding

On my side, I give my acknowledgement to the whole patch series:

Quoted 8 lines

I hope that once Fabio Porcedda's series is merged, this series can be applied on top of it seamlessly and quickly.

Wim,
Tell us if you need that we resend this series or rebase it on top of another git tree.

Thanks for your work and for your reviews.

This is how I'm going to do it:
1) We are going to add my reworked version of Fabio's v7 patch of the core timeout-sec part.
2) then we are going to do the conversion of the at91sam9 driver but without doing the other changes that Wenyou proposed.
3) Then we add the driver related part of Fabio's patches (I don't want non converted drivers to have the watchdog_core select, hence we do the conversion of at91sam9 first in step 2).
4) then we can see what is still needed of Wenyou's patches.
-> all will go through the linuw-watchdog trees.

Note: I know we have another patch in Greg's driver tree that changes the module_platform_driver_probe, but that should not interfere with these patches.

Kind regards,
Wim.