Skip to contentSkip to conversation

watchdog: atlas7: add watchdog driver of CSRatlas7

PATCH Superseded Barry Song 2 participants 3 messages Sep 14, 2015 – Sep 21, 2015 Watchdog device drivers

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Barry Song

author
#0 lore raw

PATCH v2 1/1 watchdog: atlas7: add watchdog driver of CSRatlas7

From: Guo Zeng <[email protected]>

This patch adds watchdog driver for CSRatlas7 platform. On CSRatlas7, the 6th timer can act as a watchdog timer when the Watchdog mode is enabled.

---
-v2: split into a separated driver for atlas7 from sirfsoc_wdt

 drivers/watchdog/Kconfig      |  10 ++
 drivers/watchdog/Makefile     |   1 +
 drivers/watchdog/atlas7_wdt.c | 249 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 260 insertions(+)
 create mode 100644 drivers/watchdog/atlas7_wdt.c
drivers/watchdog/Kconfig +10 -0
index c68edc1..c4bad67 100644
@@ -578,6 +578,16 @@ config LPC18XX_WATCHDOG
 	  To compile this driver as a module, choose M here: the
 	  module will be called lpc18xx_wdt.
 
+config ATLAS7_WATCHDOG
+	tristate "CSRatlas7 watchdog"
+	depends on ARCH_ATLAS7
+	help
+	  Say Y here to include Watchdog timer support for the watchdog
+	  existing on the CSRatlas7 series platforms.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called atlas7_wdt.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
drivers/watchdog/Makefile +1 -0
index 0c616e3..33a1529 100644
@@ -68,6 +68,7 @@ obj-$(CONFIG_MESON_WATCHDOG) += meson_wdt.o
 obj-$(CONFIG_MEDIATEK_WATCHDOG) += mtk_wdt.o
 obj-$(CONFIG_DIGICOLOR_WATCHDOG) += digicolor_wdt.o
 obj-$(CONFIG_LPC18XX_WATCHDOG) += lpc18xx_wdt.o
+obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
 
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
drivers/watchdog/atlas7_wdt.c new file +249 -0

249 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 66 lines · Barry Song

From: Guo Zeng <[email protected]>

This patch adds watchdog driver for CSRatlas7 platform. On CSRatlas7, the 6th timer can act as a watchdog timer when the Watchdog mode is enabled.

---
-v2: split into a separated driver for atlas7 from sirfsoc_wdt

  drivers/watchdog/Kconfig      |  10 ++
  drivers/watchdog/Makefile     |   1 +
  drivers/watchdog/atlas7_wdt.c | 249 ++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 260 insertions(+)

create mode 100644 drivers/watchdog/atlas7_wdt.c

drivers/watchdog/Kconfig +10 -0
index c68edc1..c4bad67 100644
@@ -578,6 +578,16 @@ config LPC18XX_WATCHDOG
  	  To compile this driver as a module, choose M here: the
  	  module will be called lpc18xx_wdt.
 
+config ATLAS7_WATCHDOG
+	tristate "CSRatlas7 watchdog"
+	depends on ARCH_ATLAS7
+	help
+	  Say Y here to include Watchdog timer support for the watchdog
+	  existing on the CSRatlas7 series platforms.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called atlas7_wdt.
+
  # AVR32 Architecture
 
  config AT32AP700X_WDT
drivers/watchdog/Makefile +1 -0
index 0c616e3..33a1529 100644
@@ -68,6 +68,7 @@ obj-$(CONFIG_MESON_WATCHDOG) += meson_wdt.o
  obj-$(CONFIG_MEDIATEK_WATCHDOG) += mtk_wdt.o
  obj-$(CONFIG_DIGICOLOR_WATCHDOG) += digicolor_wdt.o
  obj-$(CONFIG_LPC18XX_WATCHDOG) += lpc18xx_wdt.o
+obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
 
  # AVR32 Architecture
  obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
drivers/watchdog/atlas7_wdt.c new file +9 -0
new file mode 100644
index 0000000..d5eceb5
@@ -0,0 +1,249 @@
+/*
+ * Watchdog driver for CSRatlas7
+ *
+ * Copyright (c) 2015 Cambridge Silicon Radio Limited, a CSR plc group company.
+ *
+ * Licensed under GPLv2 or later.
+ */
+
+#include <linux/module.h>

drivers/watchdog/atlas7_wdt.c line 19

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+#include <linux/watchdog.h>
+#include <linux/platform_device.h>
+#include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+
+#define ATLAS7_TIMER_WDT_INDEX		5
+#define ATLAS7_WDT_MIN_TIMEOUT		10		/* 20 secs */

10 secs ?

This seems arbitrary, though. Why not the more common 1 second ?

drivers/watchdog/atlas7_wdt.c line 20

Quoted 1 line
drivers/watchdog/atlas7_wdt.c new file +1 -0
+#define ATLAS7_WDT_MAX_TIMEOUT		28	/* 28 secs for 150Mhz */

Doesn't this depend on the clock rate ? If so, why make it constant ? Maybe it is constant, but then it should be explained.

drivers/watchdog/atlas7_wdt.c line 21

Quoted 1 line
drivers/watchdog/atlas7_wdt.c new file +1 -0
+#define ATLAS7_WDT_DEFAULT_TIMEOUT	20		/* 20 secs */

Why 20 seconds ?

Quoted 24 lines
drivers/watchdog/atlas7_wdt.c new file +24 -0
+
+#define ATLAS7_WDT_CNT_CTRL	0
+#define ATLAS7_WDT_CNT_MATCH	0x18
+#define ATLAS7_WDT_CNT	0x48
+#define ATLAS7_WDT_EN	0x64
+
+static unsigned int timeout = ATLAS7_WDT_DEFAULT_TIMEOUT;
+static bool nowayout = WATCHDOG_NOWAYOUT;
+
+module_param(timeout, uint, 0);
+module_param(nowayout, bool, 0);
+
+MODULE_PARM_DESC(timeout, "Default watchdog timeout (in seconds)");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+			__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+struct atlas7_wdog {
+	struct device *dev;
+	void __iomem *base;
+	unsigned long tick_rate;
+	struct clk *clk;
+};
+
+static unsigned int atlas7_wdt_gettimeleft(struct watchdog_device *wdd)

drivers/watchdog/atlas7_wdt.c line 55

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+{
+	struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+	u32 counter, match;
+	unsigned int time_left;
+
+	counter = readl(wdt->base + ATLAS7_WDT_CNT +
+		4 * ATLAS7_TIMER_WDT_INDEX);
+	match = readl(wdt->base + ATLAS7_WDT_CNT_MATCH +
+			4 * ATLAS7_TIMER_WDT_INDEX);
+	time_left = match - counter;

Can counter be larger than match ?

drivers/watchdog/atlas7_wdt.c line 60

Quoted 5 lines
drivers/watchdog/atlas7_wdt.c new file +5 -0
+
+	return  time_left / wdt->tick_rate;
+}
+
+static int atlas7_wdt_updatetimeout(struct watchdog_device *wdd)

Please name this function atlas7_wdt_ping.

drivers/watchdog/atlas7_wdt.c line 71

Quoted 11 lines
drivers/watchdog/atlas7_wdt.c new file +11 -0
+{
+	struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+	u32 timeout_ticks;
+
+	timeout_ticks = wdd->timeout * wdt->tick_rate;
+
+	writel(readl(wdt->base + ATLAS7_WDT_CNT +
+			4 * ATLAS7_TIMER_WDT_INDEX) +
+			timeout_ticks,
+			wdt->base + ATLAS7_WDT_CNT_MATCH +
+				4 * ATLAS7_TIMER_WDT_INDEX);

The indentation seems a bit random. Please align with '('. I don't mind if expression continuation is a bit deeper, but then it should be consistent, not just for one of the expressions.

Actually, it might make sense to define macros for the expressions, to make the code easier to read and reduce the possibility of errors.

drivers/watchdog/atlas7_wdt.c line 84

Quoted 13 lines
drivers/watchdog/atlas7_wdt.c new file +13 -0
+
+	return 0;
+}
+
+static int atlas7_wdt_enable(struct watchdog_device *wdd)
+{
+	struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+	atlas7_wdt_updatetimeout(wdd);
+	writel(readl(wdt->base + ATLAS7_WDT_CNT_CTRL +
+			4 * ATLAS7_TIMER_WDT_INDEX) | 0x3,
+			wdt->base + ATLAS7_WDT_CNT_CTRL +
+			4 * ATLAS7_TIMER_WDT_INDEX);

Same as above.

Quoted 4 lines
drivers/watchdog/atlas7_wdt.c new file +4 -0
+	writel(1, wdt->base + ATLAS7_WDT_EN);
+
+	return 0;
+}

drivers/watchdog/atlas7_wdt.c line 98

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+
+static int atlas7_wdt_disable(struct watchdog_device *wdd)
+{
+	struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+	writel(0, wdt->base + ATLAS7_WDT_EN);
+	writel(readl(wdt->base + ATLAS7_WDT_CNT_CTRL +
+			4 * ATLAS7_TIMER_WDT_INDEX) &  ~0x3,
+			wdt->base + ATLAS7_WDT_CNT_CTRL +
+			4 * ATLAS7_TIMER_WDT_INDEX);

Same as above.

drivers/watchdog/atlas7_wdt.c line 106

Quoted 8 lines
drivers/watchdog/atlas7_wdt.c new file +8 -0
+
+	return 0;
+}
+
+static int atlas7_wdt_settimeout(struct watchdog_device *wdd, unsigned int to)
+{
+	wdd->timeout = to;
+	atlas7_wdt_updatetimeout(wdd);

Calling code calls ping. No need to do it here.

Quoted 44 lines
drivers/watchdog/atlas7_wdt.c new file +44 -0
+
+	return 0;
+}
+
+#define OPTIONS (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
+
+static const struct watchdog_info atlas7_wdt_ident = {
+	.options          =     OPTIONS,
+	.firmware_version =	0,
+	.identity         =	"atlas7 Watchdog",
+};
+
+static struct watchdog_ops atlas7_wdt_ops = {
+	.owner = THIS_MODULE,
+	.start = atlas7_wdt_enable,
+	.stop = atlas7_wdt_disable,
+	.get_timeleft = atlas7_wdt_gettimeleft,
+	.ping = atlas7_wdt_updatetimeout,
+	.set_timeout = atlas7_wdt_settimeout,
+};
+
+static struct watchdog_device atlas7_wdd = {
+	.info = &atlas7_wdt_ident,
+	.ops = &atlas7_wdt_ops,
+	.timeout = ATLAS7_WDT_DEFAULT_TIMEOUT,
+	.min_timeout = ATLAS7_WDT_MIN_TIMEOUT,
+	.max_timeout = ATLAS7_WDT_MAX_TIMEOUT,
+};
+
+static const struct of_device_id atlas7_wdt_ids[] = {
+	{ .compatible = "sirf,atlas7-tick"},
+	{}
+};
+
+static int atlas7_wdt_probe(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	struct atlas7_wdog *wdt;
+	struct resource *res;
+	struct clk *clk;
+	int ret;
+
+	wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
+	if (!wdt)

drivers/watchdog/atlas7_wdt.c line 160

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+		return -ENOMEM;
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	wdt->base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(wdt->base))
+		return PTR_ERR(wdt->base);
+
+	clk = of_clk_get(np, 0);
+	if (IS_ERR(clk)) {
+		ret = PTR_ERR(clk);
+		goto err;

clk_get failed, so there is no need to to call clk_put() below. Besides, wdt->clk is not set anyway.

drivers/watchdog/atlas7_wdt.c line 164

Quoted 4 lines
drivers/watchdog/atlas7_wdt.c new file +4 -0
+	}
+	ret = clk_prepare_enable(clk);
+	if (ret)
+		goto err;

wdt->clk is not set, so calling clk_put on it below won't work.

drivers/watchdog/atlas7_wdt.c line 167

Quoted 3 lines
drivers/watchdog/atlas7_wdt.c new file +3 -0
+
+	writel(0, wdt->base + ATLAS7_WDT_CNT_CTRL +
+			4 * ATLAS7_TIMER_WDT_INDEX);

What is this for ? Please explain.

drivers/watchdog/atlas7_wdt.c line 168

Quoted 1 line
drivers/watchdog/atlas7_wdt.c new file +1 -0
+	wdt->tick_rate = clk_get_rate(clk);

tick_rate can (at least in theory) be 0, so you should check it here.

drivers/watchdog/atlas7_wdt.c line 170

Quoted 2 lines
drivers/watchdog/atlas7_wdt.c new file +2 -0
+	wdt->clk = clk;
+

You should also set atlas7_wdd.parent.

drivers/watchdog/atlas7_wdt.c line 178

Quoted 8 lines
drivers/watchdog/atlas7_wdt.c new file +8 -0
+	watchdog_init_timeout(&atlas7_wdd, timeout, &pdev->dev);
+	watchdog_set_nowayout(&atlas7_wdd, nowayout);
+	ret = watchdog_register_device(&atlas7_wdd);
+	if (ret)
+		goto err1;
+
+	watchdog_set_drvdata(&atlas7_wdd, wdt);
+	platform_set_drvdata(pdev, &atlas7_wdd);

Those functions should be called before the call to watchdog_register_device(), to avoid race conditions.

Quoted 21 lines
drivers/watchdog/atlas7_wdt.c new file +21 -0
+
+	return 0;
+
+err1:
+	clk_disable_unprepare(wdt->clk);
+err:
+	clk_put(wdt->clk);
+	return ret;
+}
+
+static void atlas7_wdt_shutdown(struct platform_device *pdev)
+{
+	struct watchdog_device *wdd = platform_get_drvdata(pdev);
+	struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+	atlas7_wdt_disable(wdd);
+	clk_disable_unprepare(wdt->clk);
+}
+
+static int atlas7_wdt_remove(struct platform_device *pdev)
+{

drivers/watchdog/atlas7_wdt.c line 209

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+	struct watchdog_device *wdd = platform_get_drvdata(pdev);
+	struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+	atlas7_wdt_shutdown(pdev);
+	clk_put(wdt->clk);
+	return 0;
+}
+
+#ifdef	CONFIG_PM_SLEEP
+static int atlas7_wdt_suspend(struct device *dev)

Please use __maybe_unused. Then the #ifdef should not be necessary.

Stopping the timer is not necessary here ?

Quoted 41 lines
drivers/watchdog/atlas7_wdt.c new file +40 -0
+{
+	return 0;
+}
+
+static int atlas7_wdt_resume(struct device *dev)
+{
+	struct watchdog_device *wdd = dev_get_drvdata(dev);
+
+	/*
+	 * NOTE: Since timer controller registers settings are saved
+	 * and restored back by the timer-atlas7.c, so we need not
+	 * update WD settings except refreshing timeout.
+	 */
+	atlas7_wdt_updatetimeout(wdd);
+
+	return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(atlas7_wdt_pm_ops,
+		atlas7_wdt_suspend, atlas7_wdt_resume);
+
+MODULE_DEVICE_TABLE(of, atlas7_wdt_ids);
+
+static struct platform_driver atlas7_wdt_driver = {
+	.driver = {
+		.name = "atlas7-wdt",
+		.pm = &atlas7_wdt_pm_ops,
+		.of_match_table	= atlas7_wdt_ids,
+	},
+	.probe = atlas7_wdt_probe,
+	.remove = atlas7_wdt_remove,
+	.shutdown = atlas7_wdt_shutdown,
+};
+module_platform_driver(atlas7_wdt_driver);
+
+MODULE_DESCRIPTION("CSRatlas7 watchdog driver");
+MODULE_AUTHOR("Guo Zeng <[email protected]>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:atlas7-wdt");
author
#2 lore raw

Hi Guenter,
thanks a lot.

2015-09-15 0:10 GMT+08:00 Guenter Roeck <[email protected]>:

Quoted 84 lines · Barry Song
Quoted 69 lines

From: Guo Zeng <[email protected]>

This patch adds watchdog driver for CSRatlas7 platform. On CSRatlas7, the 6th timer can act as a watchdog timer when the Watchdog mode is enabled.

---
-v2: split into a separated driver for atlas7 from sirfsoc_wdt

  drivers/watchdog/Kconfig      |  10 ++
  drivers/watchdog/Makefile     |   1 +
  drivers/watchdog/atlas7_wdt.c | 249
++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 260 insertions(+)

create mode 100644 drivers/watchdog/atlas7_wdt.c

drivers/watchdog/Kconfig +10 -0
index c68edc1..c4bad67 100644
@@ -578,6 +578,16 @@ config LPC18XX_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called lpc18xx_wdt.
 
+config ATLAS7_WATCHDOG
+       tristate "CSRatlas7 watchdog"
+       depends on ARCH_ATLAS7
+       help
+         Say Y here to include Watchdog timer support for the watchdog
+         existing on the CSRatlas7 series platforms.
+
+         To compile this driver as a module, choose M here: the
+         module will be called atlas7_wdt.
+
  # AVR32 Architecture
 
  config AT32AP700X_WDT
drivers/watchdog/Makefile +1 -0
index 0c616e3..33a1529 100644
@@ -68,6 +68,7 @@ obj-$(CONFIG_MESON_WATCHDOG) += meson_wdt.o
  obj-$(CONFIG_MEDIATEK_WATCHDOG) += mtk_wdt.o
  obj-$(CONFIG_DIGICOLOR_WATCHDOG) += digicolor_wdt.o
  obj-$(CONFIG_LPC18XX_WATCHDOG) += lpc18xx_wdt.o
+obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
 
  # AVR32 Architecture
  obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
drivers/watchdog/atlas7_wdt.c new file +4 -0
new file mode 100644
index 0000000..d5eceb5
@@ -0,0 +1,249 @@
+/*
+ * Watchdog driver for CSRatlas7
+ *
+ * Copyright (c) 2015 Cambridge Silicon Radio Limited, a CSR plc group

company.
+ *
+ * Licensed under GPLv2 or later.
+ */

drivers/watchdog/atlas7_wdt.c new file +2 -0
+
+#include <linux/module.h>

drivers/watchdog/atlas7_wdt.c line 19

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+#include <linux/watchdog.h>
+#include <linux/platform_device.h>
+#include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <linux/clk.h>
+
+#define ATLAS7_TIMER_WDT_INDEX         5
+#define ATLAS7_WDT_MIN_TIMEOUT         10              /* 20 secs */

10 secs ?

Quoted 1 line

This seems arbitrary, though. Why not the more common 1 second ?

i guess the min can be the TIMER_MARGIN_MIN. it seems people generally set min_timeout = 1 in its driver. so if our TIMER_MARGIN_MIN is less than 1, we can use 1.

Quoted 6 lines
Quoted 2 lines

+#define ATLAS7_WDT_MAX_TIMEOUT 28 /* 28 secs for 150Mhz */

Doesn't this depend on the clock rate ? If so, why make it constant ? Maybe it is constant, but then it should be explained.

this should be TIMER_MARGIN_MAX and depends on the rate of clock input.

Quoted 5 lines
Quoted 2 lines

+#define ATLAS7_WDT_DEFAULT_TIMEOUT 20 /* 20 secs */

Why 20 seconds ?

it is a param. 20 should be a typical timeout value if we don't change it.

Quoted 32 lines
Quoted 32 lines
drivers/watchdog/atlas7_wdt.c new file +14 -0
+
+#define ATLAS7_WDT_CNT_CTRL    0
+#define ATLAS7_WDT_CNT_MATCH   0x18
+#define ATLAS7_WDT_CNT 0x48
+#define ATLAS7_WDT_EN  0x64
+
+static unsigned int timeout = ATLAS7_WDT_DEFAULT_TIMEOUT;
+static bool nowayout = WATCHDOG_NOWAYOUT;
+
+module_param(timeout, uint, 0);
+module_param(nowayout, bool, 0);
+
+MODULE_PARM_DESC(timeout, "Default watchdog timeout (in seconds)");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started

(default="

drivers/watchdog/atlas7_wdt.c new file +15 -0
+                       __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+struct atlas7_wdog {
+       struct device *dev;
+       void __iomem *base;
+       unsigned long tick_rate;
+       struct clk *clk;
+};
+
+static unsigned int atlas7_wdt_gettimeleft(struct watchdog_device *wdd)
+{
+       struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+       u32 counter, match;
+       unsigned int time_left;
+
Quoted 8 lines

drivers/watchdog/atlas7_wdt.c line 55

Quoted 5 lines
drivers/watchdog/atlas7_wdt.c new file +5 -0
+       counter = readl(wdt->base + ATLAS7_WDT_CNT +
+               4 * ATLAS7_TIMER_WDT_INDEX);
+       match = readl(wdt->base + ATLAS7_WDT_CNT_MATCH +
+                       4 * ATLAS7_TIMER_WDT_INDEX);
+       time_left = match - counter;

Can counter be larger than match ?

this does't matter as the delta is still right since the result is "unsigned int", but it seems we need to move to second?

Quoted 9 lines

drivers/watchdog/atlas7_wdt.c line 60

Quoted 6 lines
drivers/watchdog/atlas7_wdt.c new file +5 -0
+
+       return  time_left / wdt->tick_rate;
+}
+
+static int atlas7_wdt_updatetimeout(struct watchdog_device *wdd)

Please name this function atlas7_wdt_ping.

nice.

Quoted 121 lines

drivers/watchdog/atlas7_wdt.c line 71

Quoted 12 lines
drivers/watchdog/atlas7_wdt.c new file +11 -0
+{
+       struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+       u32 timeout_ticks;
+
+       timeout_ticks = wdd->timeout * wdt->tick_rate;
+
+       writel(readl(wdt->base + ATLAS7_WDT_CNT +
+                       4 * ATLAS7_TIMER_WDT_INDEX) +
+                       timeout_ticks,
+                       wdt->base + ATLAS7_WDT_CNT_MATCH +
+                               4 * ATLAS7_TIMER_WDT_INDEX);

The indentation seems a bit random. Please align with '('. I don't mind if expression continuation is a bit deeper, but then it should be consistent, not just for one of the expressions.

Actually, it might make sense to define macros for the expressions, to make the code easier to read and reduce the possibility of errors.

drivers/watchdog/atlas7_wdt.c line 84

Quoted 13 lines
drivers/watchdog/atlas7_wdt.c new file +13 -0
+
+       return 0;
+}
+
+static int atlas7_wdt_enable(struct watchdog_device *wdd)
+{
+       struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+       atlas7_wdt_updatetimeout(wdd);
+       writel(readl(wdt->base + ATLAS7_WDT_CNT_CTRL +
+                       4 * ATLAS7_TIMER_WDT_INDEX) | 0x3,
+                       wdt->base + ATLAS7_WDT_CNT_CTRL +
+                       4 * ATLAS7_TIMER_WDT_INDEX);

Same as above.

Quoted 4 lines
drivers/watchdog/atlas7_wdt.c new file +4 -0
+       writel(1, wdt->base + ATLAS7_WDT_EN);
+
+       return 0;
+}

drivers/watchdog/atlas7_wdt.c line 98

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+
+static int atlas7_wdt_disable(struct watchdog_device *wdd)
+{
+       struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+       writel(0, wdt->base + ATLAS7_WDT_EN);
+       writel(readl(wdt->base + ATLAS7_WDT_CNT_CTRL +
+                       4 * ATLAS7_TIMER_WDT_INDEX) &  ~0x3,
+                       wdt->base + ATLAS7_WDT_CNT_CTRL +
+                       4 * ATLAS7_TIMER_WDT_INDEX);

Same as above.

drivers/watchdog/atlas7_wdt.c line 106

Quoted 9 lines
drivers/watchdog/atlas7_wdt.c new file +5 -0
+
+       return 0;
+}
+
+static int atlas7_wdt_settimeout(struct watchdog_device *wdd, unsigned

int to)

drivers/watchdog/atlas7_wdt.c new file +3 -0
+{
+       wdd->timeout = to;
+       atlas7_wdt_updatetimeout(wdd);

Calling code calls ping. No need to do it here.

Quoted 51 lines
drivers/watchdog/atlas7_wdt.c new file +5 -0
+
+       return 0;
+}
+
+#define OPTIONS (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |

WDIOF_MAGICCLOSE)

drivers/watchdog/atlas7_wdt.c new file +45 -0
+
+static const struct watchdog_info atlas7_wdt_ident = {
+       .options          =     OPTIONS,
+       .firmware_version =     0,
+       .identity         =     "atlas7 Watchdog",
+};
+
+static struct watchdog_ops atlas7_wdt_ops = {
+       .owner = THIS_MODULE,
+       .start = atlas7_wdt_enable,
+       .stop = atlas7_wdt_disable,
+       .get_timeleft = atlas7_wdt_gettimeleft,
+       .ping = atlas7_wdt_updatetimeout,
+       .set_timeout = atlas7_wdt_settimeout,
+};
+
+static struct watchdog_device atlas7_wdd = {
+       .info = &atlas7_wdt_ident,
+       .ops = &atlas7_wdt_ops,
+       .timeout = ATLAS7_WDT_DEFAULT_TIMEOUT,
+       .min_timeout = ATLAS7_WDT_MIN_TIMEOUT,
+       .max_timeout = ATLAS7_WDT_MAX_TIMEOUT,
+};
+
+static const struct of_device_id atlas7_wdt_ids[] = {
+       { .compatible = "sirf,atlas7-tick"},
+       {}
+};
+
+static int atlas7_wdt_probe(struct platform_device *pdev)
+{
+       struct device_node *np = pdev->dev.of_node;
+       struct atlas7_wdog *wdt;
+       struct resource *res;
+       struct clk *clk;
+       int ret;
+
+       wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
+       if (!wdt)
+               return -ENOMEM;
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       wdt->base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(wdt->base))
+               return PTR_ERR(wdt->base);
+
Quoted 8 lines

drivers/watchdog/atlas7_wdt.c line 160

Quoted 4 lines
drivers/watchdog/atlas7_wdt.c new file +4 -0
+       clk = of_clk_get(np, 0);
+       if (IS_ERR(clk)) {
+               ret = PTR_ERR(clk);
+               goto err;

clk_get failed, so there is no need to to call clk_put() below. Besides, wdt->clk is not set anyway.

right.

Quoted 12 lines

drivers/watchdog/atlas7_wdt.c line 164

Quoted 5 lines
drivers/watchdog/atlas7_wdt.c new file +4 -0
+       }
+       ret = clk_prepare_enable(clk);
+       if (ret)
+               goto err;

wdt->clk is not set, so calling clk_put on it below won't work.

Quoted 3 lines
drivers/watchdog/atlas7_wdt.c new file +3 -0
+
+       writel(0, wdt->base + ATLAS7_WDT_CNT_CTRL +
+                       4 * ATLAS7_TIMER_WDT_INDEX);

this is for disabling the HW at first.

Quoted 8 lines

What is this for ? Please explain.

Quoted 1 line

+ wdt->tick_rate = clk_get_rate(clk);

tick_rate can (at least in theory) be 0, so you should check it here.

i have some different idea here, it should be something clock driver need to handle, if it is 0, system should have been hung ealier.

Quoted 93 lines

drivers/watchdog/atlas7_wdt.c line 170

Quoted 3 lines
drivers/watchdog/atlas7_wdt.c new file +2 -0
+       wdt->clk = clk;
+

You should also set atlas7_wdd.parent.

drivers/watchdog/atlas7_wdt.c line 178

Quoted 8 lines
drivers/watchdog/atlas7_wdt.c new file +8 -0
+       watchdog_init_timeout(&atlas7_wdd, timeout, &pdev->dev);
+       watchdog_set_nowayout(&atlas7_wdd, nowayout);
+       ret = watchdog_register_device(&atlas7_wdd);
+       if (ret)
+               goto err1;
+
+       watchdog_set_drvdata(&atlas7_wdd, wdt);
+       platform_set_drvdata(pdev, &atlas7_wdd);

Those functions should be called before the call to watchdog_register_device(),
to avoid race conditions.

Quoted 21 lines
drivers/watchdog/atlas7_wdt.c new file +21 -0
+
+       return 0;
+
+err1:
+       clk_disable_unprepare(wdt->clk);
+err:
+       clk_put(wdt->clk);
+       return ret;
+}
+
+static void atlas7_wdt_shutdown(struct platform_device *pdev)
+{
+       struct watchdog_device *wdd = platform_get_drvdata(pdev);
+       struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+       atlas7_wdt_disable(wdd);
+       clk_disable_unprepare(wdt->clk);
+}
+
+static int atlas7_wdt_remove(struct platform_device *pdev)
+{

drivers/watchdog/atlas7_wdt.c line 209

Quoted 10 lines
drivers/watchdog/atlas7_wdt.c new file +10 -0
+       struct watchdog_device *wdd = platform_get_drvdata(pdev);
+       struct atlas7_wdog *wdt = watchdog_get_drvdata(wdd);
+
+       atlas7_wdt_shutdown(pdev);
+       clk_put(wdt->clk);
+       return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int atlas7_wdt_suspend(struct device *dev)

Please use __maybe_unused. Then the #ifdef should not be necessary.

Stopping the timer is not necessary here ?

Quoted 33 lines
drivers/watchdog/atlas7_wdt.c new file +33 -0
+{
+       return 0;
+}
+
+static int atlas7_wdt_resume(struct device *dev)
+{
+       struct watchdog_device *wdd = dev_get_drvdata(dev);
+
+       /*
+        * NOTE: Since timer controller registers settings are saved
+        * and restored back by the timer-atlas7.c, so we need not
+        * update WD settings except refreshing timeout.
+        */
+       atlas7_wdt_updatetimeout(wdd);
+
+       return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(atlas7_wdt_pm_ops,
+               atlas7_wdt_suspend, atlas7_wdt_resume);
+
+MODULE_DEVICE_TABLE(of, atlas7_wdt_ids);
+
+static struct platform_driver atlas7_wdt_driver = {
+       .driver = {
+               .name = "atlas7-wdt",
+               .pm = &atlas7_wdt_pm_ops,
+               .of_match_table = atlas7_wdt_ids,
+       },
+       .probe = atlas7_wdt_probe,
+       .remove = atlas7_wdt_remove,
+       .shutdown = atlas7_wdt_shutdown,
Quoted 8 lines

drivers/watchdog/atlas7_wdt.c line 249

Quoted 8 lines
drivers/watchdog/atlas7_wdt.c new file +7 -0
+};
+module_platform_driver(atlas7_wdt_driver);
+
+MODULE_DESCRIPTION("CSRatlas7 watchdog driver");
+MODULE_AUTHOR("Guo Zeng <[email protected]>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:atlas7-wdt");

-barry