* [PATCH v6 1/3] dt: bindings: add documentation for zx2967 family watchdog controller
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: jun.nie, wim, linux, robh+dt, mark.rutland, mathieu.poirier
Cc: linux-arm-kernel, linux-watchdog, devicetree, linux-kernel,
shawnguo, baoyou.xie, xie.baoyou, chen.chaokai, wang.qiang01
This patch adds dt-binding documentation for zx2967 family
watchdog controller.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
---
.../bindings/watchdog/zte,zx2967-wdt.txt | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
new file mode 100644
index 0000000..06ce677
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
@@ -0,0 +1,32 @@
+ZTE zx2967 Watchdog timer
+
+Required properties:
+
+- compatible : should be one of the following.
+ * zte,zx296718-wdt
+- reg : Specifies base physical address and size of the registers.
+- clocks : Pairs of phandle and specifier referencing the controller's clocks.
+- resets : Reference to the reset controller controlling the watchdog
+ controller.
+
+Optional properties:
+
+- timeout-sec : Contains the watchdog timeout in seconds.
+- zte,wdt-reset-sysctrl : Directs how to reset system by the watchdog.
+ if we don't want to restart system when watchdog been triggered,
+ it's not required, vice versa.
+ It should include following fields.
+ * phandle of aon-sysctrl.
+ * offset of register that be written, should be 0xb0.
+ * configure value that be written to aon-sysctrl.
+ * bit mask, corresponding bits will be affected.
+
+Example:
+
+wdt: watchdog@1465000 {
+ compatible = "zte,zx296718-wdt";
+ reg = <0x1465000 0x1000>;
+ clocks = <&topcrm WDT_WCLK>;
+ resets = <&toprst 35>;
+ zte,wdt-reset-sysctrl = <&aon_sysctrl 0xb0 1 0x115>;
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v6 1/3] dt: bindings: add documentation for zx2967 family watchdog controller
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds dt-binding documentation for zx2967 family
watchdog controller.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
---
.../bindings/watchdog/zte,zx2967-wdt.txt | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
new file mode 100644
index 0000000..06ce677
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
@@ -0,0 +1,32 @@
+ZTE zx2967 Watchdog timer
+
+Required properties:
+
+- compatible : should be one of the following.
+ * zte,zx296718-wdt
+- reg : Specifies base physical address and size of the registers.
+- clocks : Pairs of phandle and specifier referencing the controller's clocks.
+- resets : Reference to the reset controller controlling the watchdog
+ controller.
+
+Optional properties:
+
+- timeout-sec : Contains the watchdog timeout in seconds.
+- zte,wdt-reset-sysctrl : Directs how to reset system by the watchdog.
+ if we don't want to restart system when watchdog been triggered,
+ it's not required, vice versa.
+ It should include following fields.
+ * phandle of aon-sysctrl.
+ * offset of register that be written, should be 0xb0.
+ * configure value that be written to aon-sysctrl.
+ * bit mask, corresponding bits will be affected.
+
+Example:
+
+wdt: watchdog at 1465000 {
+ compatible = "zte,zx296718-wdt";
+ reg = <0x1465000 0x1000>;
+ clocks = <&topcrm WDT_WCLK>;
+ resets = <&toprst 35>;
+ zte,wdt-reset-sysctrl = <&aon_sysctrl 0xb0 1 0x115>;
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v6 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: jun.nie, wim, linux, robh+dt, mark.rutland, mathieu.poirier
Cc: linux-arm-kernel, linux-watchdog, devicetree, linux-kernel,
shawnguo, baoyou.xie, xie.baoyou, chen.chaokai, wang.qiang01
Add the zx2967 watchdog controller driver as maintained by ARM ZTE
architecture maintainers, as they're parts of the core IP.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index edfdea3..275c434 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1990,11 +1990,13 @@ F: drivers/clk/zte/
F: drivers/reset/reset-zx2967.c
F: drivers/soc/zte/
F: drivers/thermal/zx*
+F: drivers/watchdog/zx2967_wdt.c
F: Documentation/devicetree/bindings/arm/zte.txt
F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
F: Documentation/devicetree/bindings/soc/zte/
F: Documentation/devicetree/bindings/thermal/zx*
+F: Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
F: include/dt-bindings/soc/zx*.h
ARM/ZYNQ ARCHITECTURE
--
2.7.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v6 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: jun.nie-QSEj5FYQhm4dnm+yROfE0A, wim-IQzOog9fTRqzQB+pC5nmwQ,
linux-0h96xk9xTtrk1uMJSBkQmQ, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
mark.rutland-5wv7dgnIgG8, mathieu.poirier-QSEj5FYQhm4dnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
shawnguo-DgEjT+Ai2ygdnm+yROfE0A,
baoyou.xie-QSEj5FYQhm4dnm+yROfE0A,
xie.baoyou-Th6q7B73Y6EnDS1+zs4M5A,
chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A,
wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A
Add the zx2967 watchdog controller driver as maintained by ARM ZTE
architecture maintainers, as they're parts of the core IP.
Signed-off-by: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index edfdea3..275c434 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1990,11 +1990,13 @@ F: drivers/clk/zte/
F: drivers/reset/reset-zx2967.c
F: drivers/soc/zte/
F: drivers/thermal/zx*
+F: drivers/watchdog/zx2967_wdt.c
F: Documentation/devicetree/bindings/arm/zte.txt
F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
F: Documentation/devicetree/bindings/soc/zte/
F: Documentation/devicetree/bindings/thermal/zx*
+F: Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
F: include/dt-bindings/soc/zx*.h
ARM/ZYNQ ARCHITECTURE
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v6 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: linux-arm-kernel
Add the zx2967 watchdog controller driver as maintained by ARM ZTE
architecture maintainers, as they're parts of the core IP.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index edfdea3..275c434 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1990,11 +1990,13 @@ F: drivers/clk/zte/
F: drivers/reset/reset-zx2967.c
F: drivers/soc/zte/
F: drivers/thermal/zx*
+F: drivers/watchdog/zx2967_wdt.c
F: Documentation/devicetree/bindings/arm/zte.txt
F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
F: Documentation/devicetree/bindings/soc/zte/
F: Documentation/devicetree/bindings/thermal/zx*
+F: Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
F: include/dt-bindings/soc/zx*.h
ARM/ZYNQ ARCHITECTURE
--
2.7.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: jun.nie, wim, linux, robh+dt, mark.rutland, mathieu.poirier
Cc: linux-arm-kernel, linux-watchdog, devicetree, linux-kernel,
shawnguo, baoyou.xie, xie.baoyou, chen.chaokai, wang.qiang01
This patch adds watchdog controller driver for ZTE's zx2967 family.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile | 1 +
drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 287 insertions(+)
create mode 100644 drivers/watchdog/zx2967_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index acb00b5..05093a2 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called aspeed_wdt.
+config ZX2967_WATCHDOG
+ tristate "ZTE zx2967 SoCs watchdog support"
+ depends on ARCH_ZX
+ select WATCHDOG_CORE
+ help
+ Say Y here to include support for the watchdog timer
+ in ZTE zx2967 SoCs.
+ To compile this driver as a module, choose M here: the
+ module will be called zx2967_wdt.
+
# AVR32 Architecture
config AT32AP700X_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 0c3d35e..bf2d296 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
+obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c
new file mode 100644
index 0000000..8278471
--- /dev/null
+++ b/drivers/watchdog/zx2967_wdt.c
@@ -0,0 +1,276 @@
+/*
+ * watchdog driver for ZTE's zx2967 family
+ *
+ * Copyright (C) 2017 ZTE Ltd.
+ *
+ * Author: Baoyou Xie <baoyou.xie@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/watchdog.h>
+
+#define ZX2967_WDT_CFG_REG 0x4
+#define ZX2967_WDT_LOAD_REG 0x8
+#define ZX2967_WDT_REFRESH_REG 0x18
+#define ZX2967_WDT_START_REG 0x1c
+
+#define ZX2967_WDT_REFRESH_MASK 0x3f
+
+#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) - 1) << 8)
+#define ZX2967_WDT_START_EN 0x1
+
+#define ZX2967_WDT_WRITEKEY 0x12340000
+
+#define ZX2967_WDT_DIV_DEFAULT 16
+#define ZX2967_WDT_DEFAULT_TIMEOUT 32
+#define ZX2967_WDT_MIN_TIMEOUT 1
+#define ZX2967_WDT_MAX_TIMEOUT 524
+#define ZX2967_WDT_MAX_COUNT 0xffff
+
+#define ZX2967_WDT_CLK_FREQ 0x8000
+
+#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
+
+struct zx2967_wdt {
+ struct watchdog_device wdt_device;
+ void __iomem *reg_base;
+ struct clk *clock;
+};
+
+static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
+{
+ return readl_relaxed(wdt->reg_base + reg);
+}
+
+static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg, u32 val)
+{
+ writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
+}
+
+static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
+ val ^= ZX2967_WDT_REFRESH_MASK;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
+}
+
+static int
+zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+ unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
+ unsigned int count;
+
+ count = timeout * ZX2967_WDT_CLK_FREQ;
+ if (count > divisor * ZX2967_WDT_MAX_COUNT)
+ divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
+ count = DIV_ROUND_UP(count, divisor);
+ zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG, ZX2967_WDT_CFG_DIV(divisor));
+ zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
+ zx2967_wdt_refresh(wdt);
+ wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
+
+ return 0;
+}
+
+static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
+ val |= ZX2967_WDT_START_EN;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
+}
+
+static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
+ val &= ~ZX2967_WDT_START_EN;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
+}
+
+static int zx2967_wdt_start(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ zx2967_wdt_set_timeout(wdd, wdd->timeout);
+ __zx2967_wdt_start(wdt);
+
+ return 0;
+}
+
+static int zx2967_wdt_stop(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ __zx2967_wdt_stop(wdt);
+
+ return 0;
+}
+
+static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ zx2967_wdt_refresh(wdt);
+
+ return 0;
+}
+
+#define ZX2967_WDT_OPTIONS \
+ (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
+static const struct watchdog_info zx2967_wdt_ident = {
+ .options = ZX2967_WDT_OPTIONS,
+ .identity = "zx2967 watchdog",
+};
+
+static struct watchdog_ops zx2967_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = zx2967_wdt_start,
+ .stop = zx2967_wdt_stop,
+ .ping = zx2967_wdt_keepalive,
+ .set_timeout = zx2967_wdt_set_timeout,
+};
+
+static void zx2967_wdt_reset_sysctrl(struct device *dev)
+{
+ int ret;
+ void __iomem *regmap;
+ unsigned int offset, mask, config;
+ struct of_phandle_args out_args;
+
+ ret = of_parse_phandle_with_fixed_args(dev->of_node,
+ "zte,wdt-reset-sysctrl", 3, 0, &out_args);
+ if (ret)
+ return;
+
+ offset = out_args.args[0];
+ config = out_args.args[1];
+ mask = out_args.args[2];
+
+ regmap = syscon_node_to_regmap(out_args.np);
+ if (IS_ERR(regmap)) {
+ of_node_put(out_args.np);
+ return;
+ }
+
+ regmap_update_bits(regmap, offset, mask, config);
+ of_node_put(out_args.np);
+}
+
+static int zx2967_wdt_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct zx2967_wdt *wdt;
+ struct resource *base;
+ int ret;
+ struct reset_control *rstc;
+
+ wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
+ if (!wdt)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, wdt);
+
+ wdt->wdt_device.info = &zx2967_wdt_ident;
+ wdt->wdt_device.ops = &zx2967_wdt_ops;
+ wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
+ wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
+ wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
+ wdt->wdt_device.parent = &pdev->dev;
+
+ base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ wdt->reg_base = devm_ioremap_resource(dev, base);
+ if (IS_ERR(wdt->reg_base)) {
+ dev_err(dev, "ioremap failed\n");
+ return PTR_ERR(wdt->reg_base);
+ }
+
+ zx2967_wdt_reset_sysctrl(dev);
+
+ wdt->clock = devm_clk_get(dev, NULL);
+ if (IS_ERR(wdt->clock)) {
+ dev_err(dev, "failed to find watchdog clock source\n");
+ return PTR_ERR(wdt->clock);
+ }
+
+ ret = clk_prepare_enable(wdt->clock);
+ if (ret < 0) {
+ dev_err(dev, "failed to enable clock\n");
+ return ret;
+ }
+ clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
+
+ rstc = devm_reset_control_get(dev, NULL);
+ if (IS_ERR(rstc)) {
+ dev_err(dev, "failed to get rstc");
+ ret = PTR_ERR(rstc);
+ goto err;
+ }
+
+ reset_control_assert(rstc);
+ usleep_range(500, 20000);
+ reset_control_deassert(rstc);
+
+ watchdog_set_drvdata(&wdt->wdt_device, wdt);
+ watchdog_init_timeout(&wdt->wdt_device,
+ ZX2967_WDT_DEFAULT_TIMEOUT, dev);
+ watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
+
+ ret = watchdog_register_device(&wdt->wdt_device);
+ if (ret)
+ goto err;
+
+ dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
+ wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
+
+ return 0;
+
+err:
+ clk_disable_unprepare(wdt->clock);
+ return ret;
+}
+
+static int zx2967_wdt_remove(struct platform_device *pdev)
+{
+ struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
+
+ watchdog_unregister_device(&wdt->wdt_device);
+ clk_disable_unprepare(wdt->clock);
+
+ return 0;
+}
+
+static const struct of_device_id zx2967_wdt_match[] = {
+ { .compatible = "zte,zx296718-wdt", },
+ {}
+};
+MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
+
+static struct platform_driver zx2967_wdt_driver = {
+ .probe = zx2967_wdt_probe,
+ .remove = zx2967_wdt_remove,
+ .driver = {
+ .name = "zx2967-wdt",
+ .of_match_table = of_match_ptr(zx2967_wdt_match),
+ },
+};
+module_platform_driver(zx2967_wdt_driver);
+
+MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
+MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: jun.nie-QSEj5FYQhm4dnm+yROfE0A, wim-IQzOog9fTRqzQB+pC5nmwQ,
linux-0h96xk9xTtrk1uMJSBkQmQ, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
mark.rutland-5wv7dgnIgG8, mathieu.poirier-QSEj5FYQhm4dnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
shawnguo-DgEjT+Ai2ygdnm+yROfE0A,
baoyou.xie-QSEj5FYQhm4dnm+yROfE0A,
xie.baoyou-Th6q7B73Y6EnDS1+zs4M5A,
chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A,
wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A
This patch adds watchdog controller driver for ZTE's zx2967 family.
Signed-off-by: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile | 1 +
drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 287 insertions(+)
create mode 100644 drivers/watchdog/zx2967_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index acb00b5..05093a2 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called aspeed_wdt.
+config ZX2967_WATCHDOG
+ tristate "ZTE zx2967 SoCs watchdog support"
+ depends on ARCH_ZX
+ select WATCHDOG_CORE
+ help
+ Say Y here to include support for the watchdog timer
+ in ZTE zx2967 SoCs.
+ To compile this driver as a module, choose M here: the
+ module will be called zx2967_wdt.
+
# AVR32 Architecture
config AT32AP700X_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 0c3d35e..bf2d296 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
+obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c
new file mode 100644
index 0000000..8278471
--- /dev/null
+++ b/drivers/watchdog/zx2967_wdt.c
@@ -0,0 +1,276 @@
+/*
+ * watchdog driver for ZTE's zx2967 family
+ *
+ * Copyright (C) 2017 ZTE Ltd.
+ *
+ * Author: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/watchdog.h>
+
+#define ZX2967_WDT_CFG_REG 0x4
+#define ZX2967_WDT_LOAD_REG 0x8
+#define ZX2967_WDT_REFRESH_REG 0x18
+#define ZX2967_WDT_START_REG 0x1c
+
+#define ZX2967_WDT_REFRESH_MASK 0x3f
+
+#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) - 1) << 8)
+#define ZX2967_WDT_START_EN 0x1
+
+#define ZX2967_WDT_WRITEKEY 0x12340000
+
+#define ZX2967_WDT_DIV_DEFAULT 16
+#define ZX2967_WDT_DEFAULT_TIMEOUT 32
+#define ZX2967_WDT_MIN_TIMEOUT 1
+#define ZX2967_WDT_MAX_TIMEOUT 524
+#define ZX2967_WDT_MAX_COUNT 0xffff
+
+#define ZX2967_WDT_CLK_FREQ 0x8000
+
+#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
+
+struct zx2967_wdt {
+ struct watchdog_device wdt_device;
+ void __iomem *reg_base;
+ struct clk *clock;
+};
+
+static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
+{
+ return readl_relaxed(wdt->reg_base + reg);
+}
+
+static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg, u32 val)
+{
+ writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
+}
+
+static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
+ val ^= ZX2967_WDT_REFRESH_MASK;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
+}
+
+static int
+zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+ unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
+ unsigned int count;
+
+ count = timeout * ZX2967_WDT_CLK_FREQ;
+ if (count > divisor * ZX2967_WDT_MAX_COUNT)
+ divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
+ count = DIV_ROUND_UP(count, divisor);
+ zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG, ZX2967_WDT_CFG_DIV(divisor));
+ zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
+ zx2967_wdt_refresh(wdt);
+ wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
+
+ return 0;
+}
+
+static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
+ val |= ZX2967_WDT_START_EN;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
+}
+
+static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
+ val &= ~ZX2967_WDT_START_EN;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
+}
+
+static int zx2967_wdt_start(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ zx2967_wdt_set_timeout(wdd, wdd->timeout);
+ __zx2967_wdt_start(wdt);
+
+ return 0;
+}
+
+static int zx2967_wdt_stop(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ __zx2967_wdt_stop(wdt);
+
+ return 0;
+}
+
+static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ zx2967_wdt_refresh(wdt);
+
+ return 0;
+}
+
+#define ZX2967_WDT_OPTIONS \
+ (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
+static const struct watchdog_info zx2967_wdt_ident = {
+ .options = ZX2967_WDT_OPTIONS,
+ .identity = "zx2967 watchdog",
+};
+
+static struct watchdog_ops zx2967_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = zx2967_wdt_start,
+ .stop = zx2967_wdt_stop,
+ .ping = zx2967_wdt_keepalive,
+ .set_timeout = zx2967_wdt_set_timeout,
+};
+
+static void zx2967_wdt_reset_sysctrl(struct device *dev)
+{
+ int ret;
+ void __iomem *regmap;
+ unsigned int offset, mask, config;
+ struct of_phandle_args out_args;
+
+ ret = of_parse_phandle_with_fixed_args(dev->of_node,
+ "zte,wdt-reset-sysctrl", 3, 0, &out_args);
+ if (ret)
+ return;
+
+ offset = out_args.args[0];
+ config = out_args.args[1];
+ mask = out_args.args[2];
+
+ regmap = syscon_node_to_regmap(out_args.np);
+ if (IS_ERR(regmap)) {
+ of_node_put(out_args.np);
+ return;
+ }
+
+ regmap_update_bits(regmap, offset, mask, config);
+ of_node_put(out_args.np);
+}
+
+static int zx2967_wdt_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct zx2967_wdt *wdt;
+ struct resource *base;
+ int ret;
+ struct reset_control *rstc;
+
+ wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
+ if (!wdt)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, wdt);
+
+ wdt->wdt_device.info = &zx2967_wdt_ident;
+ wdt->wdt_device.ops = &zx2967_wdt_ops;
+ wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
+ wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
+ wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
+ wdt->wdt_device.parent = &pdev->dev;
+
+ base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ wdt->reg_base = devm_ioremap_resource(dev, base);
+ if (IS_ERR(wdt->reg_base)) {
+ dev_err(dev, "ioremap failed\n");
+ return PTR_ERR(wdt->reg_base);
+ }
+
+ zx2967_wdt_reset_sysctrl(dev);
+
+ wdt->clock = devm_clk_get(dev, NULL);
+ if (IS_ERR(wdt->clock)) {
+ dev_err(dev, "failed to find watchdog clock source\n");
+ return PTR_ERR(wdt->clock);
+ }
+
+ ret = clk_prepare_enable(wdt->clock);
+ if (ret < 0) {
+ dev_err(dev, "failed to enable clock\n");
+ return ret;
+ }
+ clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
+
+ rstc = devm_reset_control_get(dev, NULL);
+ if (IS_ERR(rstc)) {
+ dev_err(dev, "failed to get rstc");
+ ret = PTR_ERR(rstc);
+ goto err;
+ }
+
+ reset_control_assert(rstc);
+ usleep_range(500, 20000);
+ reset_control_deassert(rstc);
+
+ watchdog_set_drvdata(&wdt->wdt_device, wdt);
+ watchdog_init_timeout(&wdt->wdt_device,
+ ZX2967_WDT_DEFAULT_TIMEOUT, dev);
+ watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
+
+ ret = watchdog_register_device(&wdt->wdt_device);
+ if (ret)
+ goto err;
+
+ dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
+ wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
+
+ return 0;
+
+err:
+ clk_disable_unprepare(wdt->clock);
+ return ret;
+}
+
+static int zx2967_wdt_remove(struct platform_device *pdev)
+{
+ struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
+
+ watchdog_unregister_device(&wdt->wdt_device);
+ clk_disable_unprepare(wdt->clock);
+
+ return 0;
+}
+
+static const struct of_device_id zx2967_wdt_match[] = {
+ { .compatible = "zte,zx296718-wdt", },
+ {}
+};
+MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
+
+static struct platform_driver zx2967_wdt_driver = {
+ .probe = zx2967_wdt_probe,
+ .remove = zx2967_wdt_remove,
+ .driver = {
+ .name = "zx2967-wdt",
+ .of_match_table = of_match_ptr(zx2967_wdt_match),
+ },
+};
+module_platform_driver(zx2967_wdt_driver);
+
+MODULE_AUTHOR("Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>");
+MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-25 2:44 ` Baoyou Xie
0 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-01-25 2:44 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds watchdog controller driver for ZTE's zx2967 family.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile | 1 +
drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 287 insertions(+)
create mode 100644 drivers/watchdog/zx2967_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index acb00b5..05093a2 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called aspeed_wdt.
+config ZX2967_WATCHDOG
+ tristate "ZTE zx2967 SoCs watchdog support"
+ depends on ARCH_ZX
+ select WATCHDOG_CORE
+ help
+ Say Y here to include support for the watchdog timer
+ in ZTE zx2967 SoCs.
+ To compile this driver as a module, choose M here: the
+ module will be called zx2967_wdt.
+
# AVR32 Architecture
config AT32AP700X_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 0c3d35e..bf2d296 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
+obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c
new file mode 100644
index 0000000..8278471
--- /dev/null
+++ b/drivers/watchdog/zx2967_wdt.c
@@ -0,0 +1,276 @@
+/*
+ * watchdog driver for ZTE's zx2967 family
+ *
+ * Copyright (C) 2017 ZTE Ltd.
+ *
+ * Author: Baoyou Xie <baoyou.xie@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/watchdog.h>
+
+#define ZX2967_WDT_CFG_REG 0x4
+#define ZX2967_WDT_LOAD_REG 0x8
+#define ZX2967_WDT_REFRESH_REG 0x18
+#define ZX2967_WDT_START_REG 0x1c
+
+#define ZX2967_WDT_REFRESH_MASK 0x3f
+
+#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) - 1) << 8)
+#define ZX2967_WDT_START_EN 0x1
+
+#define ZX2967_WDT_WRITEKEY 0x12340000
+
+#define ZX2967_WDT_DIV_DEFAULT 16
+#define ZX2967_WDT_DEFAULT_TIMEOUT 32
+#define ZX2967_WDT_MIN_TIMEOUT 1
+#define ZX2967_WDT_MAX_TIMEOUT 524
+#define ZX2967_WDT_MAX_COUNT 0xffff
+
+#define ZX2967_WDT_CLK_FREQ 0x8000
+
+#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
+
+struct zx2967_wdt {
+ struct watchdog_device wdt_device;
+ void __iomem *reg_base;
+ struct clk *clock;
+};
+
+static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
+{
+ return readl_relaxed(wdt->reg_base + reg);
+}
+
+static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg, u32 val)
+{
+ writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
+}
+
+static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
+ val ^= ZX2967_WDT_REFRESH_MASK;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
+}
+
+static int
+zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+ unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
+ unsigned int count;
+
+ count = timeout * ZX2967_WDT_CLK_FREQ;
+ if (count > divisor * ZX2967_WDT_MAX_COUNT)
+ divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
+ count = DIV_ROUND_UP(count, divisor);
+ zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG, ZX2967_WDT_CFG_DIV(divisor));
+ zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
+ zx2967_wdt_refresh(wdt);
+ wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
+
+ return 0;
+}
+
+static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
+ val |= ZX2967_WDT_START_EN;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
+}
+
+static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
+{
+ u32 val;
+
+ val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
+ val &= ~ZX2967_WDT_START_EN;
+ zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
+}
+
+static int zx2967_wdt_start(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ zx2967_wdt_set_timeout(wdd, wdd->timeout);
+ __zx2967_wdt_start(wdt);
+
+ return 0;
+}
+
+static int zx2967_wdt_stop(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ __zx2967_wdt_stop(wdt);
+
+ return 0;
+}
+
+static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
+{
+ struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
+
+ zx2967_wdt_refresh(wdt);
+
+ return 0;
+}
+
+#define ZX2967_WDT_OPTIONS \
+ (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
+static const struct watchdog_info zx2967_wdt_ident = {
+ .options = ZX2967_WDT_OPTIONS,
+ .identity = "zx2967 watchdog",
+};
+
+static struct watchdog_ops zx2967_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = zx2967_wdt_start,
+ .stop = zx2967_wdt_stop,
+ .ping = zx2967_wdt_keepalive,
+ .set_timeout = zx2967_wdt_set_timeout,
+};
+
+static void zx2967_wdt_reset_sysctrl(struct device *dev)
+{
+ int ret;
+ void __iomem *regmap;
+ unsigned int offset, mask, config;
+ struct of_phandle_args out_args;
+
+ ret = of_parse_phandle_with_fixed_args(dev->of_node,
+ "zte,wdt-reset-sysctrl", 3, 0, &out_args);
+ if (ret)
+ return;
+
+ offset = out_args.args[0];
+ config = out_args.args[1];
+ mask = out_args.args[2];
+
+ regmap = syscon_node_to_regmap(out_args.np);
+ if (IS_ERR(regmap)) {
+ of_node_put(out_args.np);
+ return;
+ }
+
+ regmap_update_bits(regmap, offset, mask, config);
+ of_node_put(out_args.np);
+}
+
+static int zx2967_wdt_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct zx2967_wdt *wdt;
+ struct resource *base;
+ int ret;
+ struct reset_control *rstc;
+
+ wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
+ if (!wdt)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, wdt);
+
+ wdt->wdt_device.info = &zx2967_wdt_ident;
+ wdt->wdt_device.ops = &zx2967_wdt_ops;
+ wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
+ wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
+ wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
+ wdt->wdt_device.parent = &pdev->dev;
+
+ base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ wdt->reg_base = devm_ioremap_resource(dev, base);
+ if (IS_ERR(wdt->reg_base)) {
+ dev_err(dev, "ioremap failed\n");
+ return PTR_ERR(wdt->reg_base);
+ }
+
+ zx2967_wdt_reset_sysctrl(dev);
+
+ wdt->clock = devm_clk_get(dev, NULL);
+ if (IS_ERR(wdt->clock)) {
+ dev_err(dev, "failed to find watchdog clock source\n");
+ return PTR_ERR(wdt->clock);
+ }
+
+ ret = clk_prepare_enable(wdt->clock);
+ if (ret < 0) {
+ dev_err(dev, "failed to enable clock\n");
+ return ret;
+ }
+ clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
+
+ rstc = devm_reset_control_get(dev, NULL);
+ if (IS_ERR(rstc)) {
+ dev_err(dev, "failed to get rstc");
+ ret = PTR_ERR(rstc);
+ goto err;
+ }
+
+ reset_control_assert(rstc);
+ usleep_range(500, 20000);
+ reset_control_deassert(rstc);
+
+ watchdog_set_drvdata(&wdt->wdt_device, wdt);
+ watchdog_init_timeout(&wdt->wdt_device,
+ ZX2967_WDT_DEFAULT_TIMEOUT, dev);
+ watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
+
+ ret = watchdog_register_device(&wdt->wdt_device);
+ if (ret)
+ goto err;
+
+ dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
+ wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
+
+ return 0;
+
+err:
+ clk_disable_unprepare(wdt->clock);
+ return ret;
+}
+
+static int zx2967_wdt_remove(struct platform_device *pdev)
+{
+ struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
+
+ watchdog_unregister_device(&wdt->wdt_device);
+ clk_disable_unprepare(wdt->clock);
+
+ return 0;
+}
+
+static const struct of_device_id zx2967_wdt_match[] = {
+ { .compatible = "zte,zx296718-wdt", },
+ {}
+};
+MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
+
+static struct platform_driver zx2967_wdt_driver = {
+ .probe = zx2967_wdt_probe,
+ .remove = zx2967_wdt_remove,
+ .driver = {
+ .name = "zx2967-wdt",
+ .of_match_table = of_match_ptr(zx2967_wdt_match),
+ },
+};
+module_platform_driver(zx2967_wdt_driver);
+
+MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
+MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
2017-01-25 2:44 ` Baoyou Xie
@ 2017-01-25 16:23 ` Mathieu Poirier
-1 siblings, 0 replies; 19+ messages in thread
From: Mathieu Poirier @ 2017-01-25 16:23 UTC (permalink / raw)
To: Baoyou Xie
Cc: jun.nie, wim, linux, robh+dt, mark.rutland, linux-arm-kernel,
linux-watchdog, devicetree, linux-kernel, shawnguo, xie.baoyou,
chen.chaokai, wang.qiang01
On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> This patch adds watchdog controller driver for ZTE's zx2967 family.
>
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
> drivers/watchdog/Kconfig | 10 ++
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 287 insertions(+)
> create mode 100644 drivers/watchdog/zx2967_wdt.c
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index acb00b5..05093a2 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
> To compile this driver as a module, choose M here: the
> module will be called aspeed_wdt.
>
> +config ZX2967_WATCHDOG
> + tristate "ZTE zx2967 SoCs watchdog support"
> + depends on ARCH_ZX
> + select WATCHDOG_CORE
> + help
> + Say Y here to include support for the watchdog timer
> + in ZTE zx2967 SoCs.
> + To compile this driver as a module, choose M here: the
> + module will be called zx2967_wdt.
> +
> # AVR32 Architecture
>
> config AT32AP700X_WDT
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 0c3d35e..bf2d296 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
> obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
> obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
> obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
> +obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
>
> # AVR32 Architecture
> obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c
> new file mode 100644
> index 0000000..8278471
> --- /dev/null
> +++ b/drivers/watchdog/zx2967_wdt.c
> @@ -0,0 +1,276 @@
> +/*
> + * watchdog driver for ZTE's zx2967 family
> + *
> + * Copyright (C) 2017 ZTE Ltd.
> + *
> + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> + *
> + * License terms: GNU General Public License (GPL) version 2
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/io.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/reset.h>
> +#include <linux/watchdog.h>
> +
> +#define ZX2967_WDT_CFG_REG 0x4
> +#define ZX2967_WDT_LOAD_REG 0x8
> +#define ZX2967_WDT_REFRESH_REG 0x18
> +#define ZX2967_WDT_START_REG 0x1c
> +
> +#define ZX2967_WDT_REFRESH_MASK 0x3f
> +
> +#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) - 1) << 8)
> +#define ZX2967_WDT_START_EN 0x1
> +
> +#define ZX2967_WDT_WRITEKEY 0x12340000
> +
> +#define ZX2967_WDT_DIV_DEFAULT 16
> +#define ZX2967_WDT_DEFAULT_TIMEOUT 32
> +#define ZX2967_WDT_MIN_TIMEOUT 1
> +#define ZX2967_WDT_MAX_TIMEOUT 524
> +#define ZX2967_WDT_MAX_COUNT 0xffff
> +
> +#define ZX2967_WDT_CLK_FREQ 0x8000
> +
> +#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
> +
> +struct zx2967_wdt {
> + struct watchdog_device wdt_device;
> + void __iomem *reg_base;
> + struct clk *clock;
> +};
> +
> +static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
> +{
> + return readl_relaxed(wdt->reg_base + reg);
> +}
> +
> +static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg, u32 val)
> +{
> + writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
> +}
> +
> +static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
> +{
> + u32 val;
> +
> + val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
> + val ^= ZX2967_WDT_REFRESH_MASK;
> + zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
> +}
> +
> +static int
> +zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> + unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
> + unsigned int count;
> +
> + count = timeout * ZX2967_WDT_CLK_FREQ;
> + if (count > divisor * ZX2967_WDT_MAX_COUNT)
> + divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
> + count = DIV_ROUND_UP(count, divisor);
> + zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG, ZX2967_WDT_CFG_DIV(divisor));
> + zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
> + zx2967_wdt_refresh(wdt);
> + wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
> +
> + return 0;
> +}
> +
> +static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
> +{
> + u32 val;
> +
> + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> + val |= ZX2967_WDT_START_EN;
> + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> +}
> +
> +static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
> +{
> + u32 val;
> +
> + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> + val &= ~ZX2967_WDT_START_EN;
> + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> +}
> +
> +static int zx2967_wdt_start(struct watchdog_device *wdd)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> +
> + zx2967_wdt_set_timeout(wdd, wdd->timeout);
> + __zx2967_wdt_start(wdt);
> +
> + return 0;
> +}
> +
> +static int zx2967_wdt_stop(struct watchdog_device *wdd)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> +
> + __zx2967_wdt_stop(wdt);
> +
> + return 0;
> +}
> +
> +static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> +
> + zx2967_wdt_refresh(wdt);
> +
> + return 0;
> +}
> +
> +#define ZX2967_WDT_OPTIONS \
> + (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
> +static const struct watchdog_info zx2967_wdt_ident = {
> + .options = ZX2967_WDT_OPTIONS,
> + .identity = "zx2967 watchdog",
> +};
> +
> +static struct watchdog_ops zx2967_wdt_ops = {
> + .owner = THIS_MODULE,
> + .start = zx2967_wdt_start,
> + .stop = zx2967_wdt_stop,
> + .ping = zx2967_wdt_keepalive,
> + .set_timeout = zx2967_wdt_set_timeout,
> +};
> +
> +static void zx2967_wdt_reset_sysctrl(struct device *dev)
> +{
> + int ret;
> + void __iomem *regmap;
> + unsigned int offset, mask, config;
> + struct of_phandle_args out_args;
> +
> + ret = of_parse_phandle_with_fixed_args(dev->of_node,
> + "zte,wdt-reset-sysctrl", 3, 0, &out_args);
> + if (ret)
> + return;
> +
> + offset = out_args.args[0];
> + config = out_args.args[1];
> + mask = out_args.args[2];
> +
> + regmap = syscon_node_to_regmap(out_args.np);
> + if (IS_ERR(regmap)) {
> + of_node_put(out_args.np);
> + return;
> + }
> +
> + regmap_update_bits(regmap, offset, mask, config);
> + of_node_put(out_args.np);
> +}
> +
> +static int zx2967_wdt_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct zx2967_wdt *wdt;
> + struct resource *base;
> + int ret;
> + struct reset_control *rstc;
> +
> + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> + if (!wdt)
> + return -ENOMEM;
> +
> + platform_set_drvdata(pdev, wdt);
> +
> + wdt->wdt_device.info = &zx2967_wdt_ident;
> + wdt->wdt_device.ops = &zx2967_wdt_ops;
> + wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
> + wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
> + wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
> + wdt->wdt_device.parent = &pdev->dev;
> +
> + base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + wdt->reg_base = devm_ioremap_resource(dev, base);
> + if (IS_ERR(wdt->reg_base)) {
> + dev_err(dev, "ioremap failed\n");
> + return PTR_ERR(wdt->reg_base);
> + }
> +
> + zx2967_wdt_reset_sysctrl(dev);
> +
> + wdt->clock = devm_clk_get(dev, NULL);
> + if (IS_ERR(wdt->clock)) {
> + dev_err(dev, "failed to find watchdog clock source\n");
> + return PTR_ERR(wdt->clock);
> + }
> +
> + ret = clk_prepare_enable(wdt->clock);
> + if (ret < 0) {
> + dev_err(dev, "failed to enable clock\n");
> + return ret;
> + }
> + clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
> +
> + rstc = devm_reset_control_get(dev, NULL);
> + if (IS_ERR(rstc)) {
> + dev_err(dev, "failed to get rstc");
> + ret = PTR_ERR(rstc);
> + goto err;
> + }
> +
> + reset_control_assert(rstc);
> + usleep_range(500, 20000);
Alright, I'm officially confused.
First and foremost you still haven't provided an explanation as to why this is
required. Second, in your previous submission you had:
mdelay(10);
That is a busy loop of 10ms. In this post using usleep_range() is a step in the
right direction but the min and max values to wait for don't make sense. Here
you have 500 and 20000, which is 0.5ms and 20ms.
> + reset_control_deassert(rstc);
> +
> + watchdog_set_drvdata(&wdt->wdt_device, wdt);
> + watchdog_init_timeout(&wdt->wdt_device,
> + ZX2967_WDT_DEFAULT_TIMEOUT, dev);
> + watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
> +
> + ret = watchdog_register_device(&wdt->wdt_device);
> + if (ret)
> + goto err;
> +
> + dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
> + wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
> +
> + return 0;
> +
> +err:
> + clk_disable_unprepare(wdt->clock);
> + return ret;
> +}
> +
> +static int zx2967_wdt_remove(struct platform_device *pdev)
> +{
> + struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
> +
> + watchdog_unregister_device(&wdt->wdt_device);
> + clk_disable_unprepare(wdt->clock);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id zx2967_wdt_match[] = {
> + { .compatible = "zte,zx296718-wdt", },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
> +
> +static struct platform_driver zx2967_wdt_driver = {
> + .probe = zx2967_wdt_probe,
> + .remove = zx2967_wdt_remove,
> + .driver = {
> + .name = "zx2967-wdt",
> + .of_match_table = of_match_ptr(zx2967_wdt_match),
> + },
> +};
> +module_platform_driver(zx2967_wdt_driver);
> +
> +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> +MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
> +MODULE_LICENSE("GPL v2");
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-25 16:23 ` Mathieu Poirier
0 siblings, 0 replies; 19+ messages in thread
From: Mathieu Poirier @ 2017-01-25 16:23 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> This patch adds watchdog controller driver for ZTE's zx2967 family.
>
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
> drivers/watchdog/Kconfig | 10 ++
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 287 insertions(+)
> create mode 100644 drivers/watchdog/zx2967_wdt.c
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index acb00b5..05093a2 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
> To compile this driver as a module, choose M here: the
> module will be called aspeed_wdt.
>
> +config ZX2967_WATCHDOG
> + tristate "ZTE zx2967 SoCs watchdog support"
> + depends on ARCH_ZX
> + select WATCHDOG_CORE
> + help
> + Say Y here to include support for the watchdog timer
> + in ZTE zx2967 SoCs.
> + To compile this driver as a module, choose M here: the
> + module will be called zx2967_wdt.
> +
> # AVR32 Architecture
>
> config AT32AP700X_WDT
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 0c3d35e..bf2d296 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
> obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
> obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
> obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
> +obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
>
> # AVR32 Architecture
> obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c
> new file mode 100644
> index 0000000..8278471
> --- /dev/null
> +++ b/drivers/watchdog/zx2967_wdt.c
> @@ -0,0 +1,276 @@
> +/*
> + * watchdog driver for ZTE's zx2967 family
> + *
> + * Copyright (C) 2017 ZTE Ltd.
> + *
> + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> + *
> + * License terms: GNU General Public License (GPL) version 2
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/io.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/reset.h>
> +#include <linux/watchdog.h>
> +
> +#define ZX2967_WDT_CFG_REG 0x4
> +#define ZX2967_WDT_LOAD_REG 0x8
> +#define ZX2967_WDT_REFRESH_REG 0x18
> +#define ZX2967_WDT_START_REG 0x1c
> +
> +#define ZX2967_WDT_REFRESH_MASK 0x3f
> +
> +#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) - 1) << 8)
> +#define ZX2967_WDT_START_EN 0x1
> +
> +#define ZX2967_WDT_WRITEKEY 0x12340000
> +
> +#define ZX2967_WDT_DIV_DEFAULT 16
> +#define ZX2967_WDT_DEFAULT_TIMEOUT 32
> +#define ZX2967_WDT_MIN_TIMEOUT 1
> +#define ZX2967_WDT_MAX_TIMEOUT 524
> +#define ZX2967_WDT_MAX_COUNT 0xffff
> +
> +#define ZX2967_WDT_CLK_FREQ 0x8000
> +
> +#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
> +
> +struct zx2967_wdt {
> + struct watchdog_device wdt_device;
> + void __iomem *reg_base;
> + struct clk *clock;
> +};
> +
> +static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
> +{
> + return readl_relaxed(wdt->reg_base + reg);
> +}
> +
> +static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg, u32 val)
> +{
> + writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
> +}
> +
> +static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
> +{
> + u32 val;
> +
> + val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
> + val ^= ZX2967_WDT_REFRESH_MASK;
> + zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
> +}
> +
> +static int
> +zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> + unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
> + unsigned int count;
> +
> + count = timeout * ZX2967_WDT_CLK_FREQ;
> + if (count > divisor * ZX2967_WDT_MAX_COUNT)
> + divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
> + count = DIV_ROUND_UP(count, divisor);
> + zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG, ZX2967_WDT_CFG_DIV(divisor));
> + zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
> + zx2967_wdt_refresh(wdt);
> + wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
> +
> + return 0;
> +}
> +
> +static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
> +{
> + u32 val;
> +
> + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> + val |= ZX2967_WDT_START_EN;
> + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> +}
> +
> +static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
> +{
> + u32 val;
> +
> + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> + val &= ~ZX2967_WDT_START_EN;
> + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> +}
> +
> +static int zx2967_wdt_start(struct watchdog_device *wdd)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> +
> + zx2967_wdt_set_timeout(wdd, wdd->timeout);
> + __zx2967_wdt_start(wdt);
> +
> + return 0;
> +}
> +
> +static int zx2967_wdt_stop(struct watchdog_device *wdd)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> +
> + __zx2967_wdt_stop(wdt);
> +
> + return 0;
> +}
> +
> +static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
> +{
> + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> +
> + zx2967_wdt_refresh(wdt);
> +
> + return 0;
> +}
> +
> +#define ZX2967_WDT_OPTIONS \
> + (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
> +static const struct watchdog_info zx2967_wdt_ident = {
> + .options = ZX2967_WDT_OPTIONS,
> + .identity = "zx2967 watchdog",
> +};
> +
> +static struct watchdog_ops zx2967_wdt_ops = {
> + .owner = THIS_MODULE,
> + .start = zx2967_wdt_start,
> + .stop = zx2967_wdt_stop,
> + .ping = zx2967_wdt_keepalive,
> + .set_timeout = zx2967_wdt_set_timeout,
> +};
> +
> +static void zx2967_wdt_reset_sysctrl(struct device *dev)
> +{
> + int ret;
> + void __iomem *regmap;
> + unsigned int offset, mask, config;
> + struct of_phandle_args out_args;
> +
> + ret = of_parse_phandle_with_fixed_args(dev->of_node,
> + "zte,wdt-reset-sysctrl", 3, 0, &out_args);
> + if (ret)
> + return;
> +
> + offset = out_args.args[0];
> + config = out_args.args[1];
> + mask = out_args.args[2];
> +
> + regmap = syscon_node_to_regmap(out_args.np);
> + if (IS_ERR(regmap)) {
> + of_node_put(out_args.np);
> + return;
> + }
> +
> + regmap_update_bits(regmap, offset, mask, config);
> + of_node_put(out_args.np);
> +}
> +
> +static int zx2967_wdt_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct zx2967_wdt *wdt;
> + struct resource *base;
> + int ret;
> + struct reset_control *rstc;
> +
> + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> + if (!wdt)
> + return -ENOMEM;
> +
> + platform_set_drvdata(pdev, wdt);
> +
> + wdt->wdt_device.info = &zx2967_wdt_ident;
> + wdt->wdt_device.ops = &zx2967_wdt_ops;
> + wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
> + wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
> + wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
> + wdt->wdt_device.parent = &pdev->dev;
> +
> + base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + wdt->reg_base = devm_ioremap_resource(dev, base);
> + if (IS_ERR(wdt->reg_base)) {
> + dev_err(dev, "ioremap failed\n");
> + return PTR_ERR(wdt->reg_base);
> + }
> +
> + zx2967_wdt_reset_sysctrl(dev);
> +
> + wdt->clock = devm_clk_get(dev, NULL);
> + if (IS_ERR(wdt->clock)) {
> + dev_err(dev, "failed to find watchdog clock source\n");
> + return PTR_ERR(wdt->clock);
> + }
> +
> + ret = clk_prepare_enable(wdt->clock);
> + if (ret < 0) {
> + dev_err(dev, "failed to enable clock\n");
> + return ret;
> + }
> + clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
> +
> + rstc = devm_reset_control_get(dev, NULL);
> + if (IS_ERR(rstc)) {
> + dev_err(dev, "failed to get rstc");
> + ret = PTR_ERR(rstc);
> + goto err;
> + }
> +
> + reset_control_assert(rstc);
> + usleep_range(500, 20000);
Alright, I'm officially confused.
First and foremost you still haven't provided an explanation as to why this is
required. Second, in your previous submission you had:
mdelay(10);
That is a busy loop of 10ms. In this post using usleep_range() is a step in the
right direction but the min and max values to wait for don't make sense. Here
you have 500 and 20000, which is 0.5ms and 20ms.
> + reset_control_deassert(rstc);
> +
> + watchdog_set_drvdata(&wdt->wdt_device, wdt);
> + watchdog_init_timeout(&wdt->wdt_device,
> + ZX2967_WDT_DEFAULT_TIMEOUT, dev);
> + watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
> +
> + ret = watchdog_register_device(&wdt->wdt_device);
> + if (ret)
> + goto err;
> +
> + dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
> + wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
> +
> + return 0;
> +
> +err:
> + clk_disable_unprepare(wdt->clock);
> + return ret;
> +}
> +
> +static int zx2967_wdt_remove(struct platform_device *pdev)
> +{
> + struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
> +
> + watchdog_unregister_device(&wdt->wdt_device);
> + clk_disable_unprepare(wdt->clock);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id zx2967_wdt_match[] = {
> + { .compatible = "zte,zx296718-wdt", },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
> +
> +static struct platform_driver zx2967_wdt_driver = {
> + .probe = zx2967_wdt_probe,
> + .remove = zx2967_wdt_remove,
> + .driver = {
> + .name = "zx2967-wdt",
> + .of_match_table = of_match_ptr(zx2967_wdt_match),
> + },
> +};
> +module_platform_driver(zx2967_wdt_driver);
> +
> +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> +MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
> +MODULE_LICENSE("GPL v2");
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
2017-01-25 16:23 ` Mathieu Poirier
(?)
@ 2017-01-26 1:32 ` Baoyou Xie
2017-01-26 16:17 ` Mathieu Poirier
-1 siblings, 1 reply; 19+ messages in thread
From: Baoyou Xie @ 2017-01-26 1:32 UTC (permalink / raw)
To: Mathieu Poirier
Cc: Jun Nie, wim, Guenter Roeck, Rob Herring, Mark Rutland,
linux-arm Mailing List, linux-watchdog, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou, chen.chaokai,
wang.qiang01
[-- Attachment #1: Type: text/plain, Size: 11801 bytes --]
On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier@linaro.org>
wrote:
> On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > This patch adds watchdog controller driver for ZTE's zx2967 family.
> >
> > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > ---
> > drivers/watchdog/Kconfig | 10 ++
> > drivers/watchdog/Makefile | 1 +
> > drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++
> ++++++++++++
> > 3 files changed, 287 insertions(+)
> > create mode 100644 drivers/watchdog/zx2967_wdt.c
> >
> > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > index acb00b5..05093a2 100644
> > --- a/drivers/watchdog/Kconfig
> > +++ b/drivers/watchdog/Kconfig
> > @@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
> > To compile this driver as a module, choose M here: the
> > module will be called aspeed_wdt.
> >
> > +config ZX2967_WATCHDOG
> > + tristate "ZTE zx2967 SoCs watchdog support"
> > + depends on ARCH_ZX
> > + select WATCHDOG_CORE
> > + help
> > + Say Y here to include support for the watchdog timer
> > + in ZTE zx2967 SoCs.
> > + To compile this driver as a module, choose M here: the
> > + module will be called zx2967_wdt.
> > +
> > # AVR32 Architecture
> >
> > config AT32AP700X_WDT
> > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > index 0c3d35e..bf2d296 100644
> > --- a/drivers/watchdog/Makefile
> > +++ b/drivers/watchdog/Makefile
> > @@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
> > obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
> > obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
> > obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
> > +obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
> >
> > # AVR32 Architecture
> > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> > diff --git a/drivers/watchdog/zx2967_wdt.c
> b/drivers/watchdog/zx2967_wdt.c
> > new file mode 100644
> > index 0000000..8278471
> > --- /dev/null
> > +++ b/drivers/watchdog/zx2967_wdt.c
> > @@ -0,0 +1,276 @@
> > +/*
> > + * watchdog driver for ZTE's zx2967 family
> > + *
> > + * Copyright (C) 2017 ZTE Ltd.
> > + *
> > + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> > + *
> > + * License terms: GNU General Public License (GPL) version 2
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/delay.h>
> > +#include <linux/io.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > +#include <linux/of_address.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/regmap.h>
> > +#include <linux/reset.h>
> > +#include <linux/watchdog.h>
> > +
> > +#define ZX2967_WDT_CFG_REG 0x4
> > +#define ZX2967_WDT_LOAD_REG 0x8
> > +#define ZX2967_WDT_REFRESH_REG 0x18
> > +#define ZX2967_WDT_START_REG 0x1c
> > +
> > +#define ZX2967_WDT_REFRESH_MASK 0x3f
> > +
> > +#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) -
> 1) << 8)
> > +#define ZX2967_WDT_START_EN 0x1
> > +
> > +#define ZX2967_WDT_WRITEKEY 0x12340000
> > +
> > +#define ZX2967_WDT_DIV_DEFAULT 16
> > +#define ZX2967_WDT_DEFAULT_TIMEOUT 32
> > +#define ZX2967_WDT_MIN_TIMEOUT 1
> > +#define ZX2967_WDT_MAX_TIMEOUT 524
> > +#define ZX2967_WDT_MAX_COUNT 0xffff
> > +
> > +#define ZX2967_WDT_CLK_FREQ 0x8000
> > +
> > +#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
> > +
> > +struct zx2967_wdt {
> > + struct watchdog_device wdt_device;
> > + void __iomem *reg_base;
> > + struct clk *clock;
> > +};
> > +
> > +static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
> > +{
> > + return readl_relaxed(wdt->reg_base + reg);
> > +}
> > +
> > +static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg,
> u32 val)
> > +{
> > + writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
> > +}
> > +
> > +static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
> > +{
> > + u32 val;
> > +
> > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
> > + val ^= ZX2967_WDT_REFRESH_MASK;
> > + zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
> > +}
> > +
> > +static int
> > +zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int
> timeout)
> > +{
> > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > + unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
> > + unsigned int count;
> > +
> > + count = timeout * ZX2967_WDT_CLK_FREQ;
> > + if (count > divisor * ZX2967_WDT_MAX_COUNT)
> > + divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
> > + count = DIV_ROUND_UP(count, divisor);
> > + zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG,
> ZX2967_WDT_CFG_DIV(divisor));
> > + zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
> > + zx2967_wdt_refresh(wdt);
> > + wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
> > +
> > + return 0;
> > +}
> > +
> > +static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
> > +{
> > + u32 val;
> > +
> > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > + val |= ZX2967_WDT_START_EN;
> > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > +}
> > +
> > +static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
> > +{
> > + u32 val;
> > +
> > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > + val &= ~ZX2967_WDT_START_EN;
> > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > +}
> > +
> > +static int zx2967_wdt_start(struct watchdog_device *wdd)
> > +{
> > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > +
> > + zx2967_wdt_set_timeout(wdd, wdd->timeout);
> > + __zx2967_wdt_start(wdt);
> > +
> > + return 0;
> > +}
> > +
> > +static int zx2967_wdt_stop(struct watchdog_device *wdd)
> > +{
> > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > +
> > + __zx2967_wdt_stop(wdt);
> > +
> > + return 0;
> > +}
> > +
> > +static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
> > +{
> > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > +
> > + zx2967_wdt_refresh(wdt);
> > +
> > + return 0;
> > +}
> > +
> > +#define ZX2967_WDT_OPTIONS \
> > + (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
> > +static const struct watchdog_info zx2967_wdt_ident = {
> > + .options = ZX2967_WDT_OPTIONS,
> > + .identity = "zx2967 watchdog",
> > +};
> > +
> > +static struct watchdog_ops zx2967_wdt_ops = {
> > + .owner = THIS_MODULE,
> > + .start = zx2967_wdt_start,
> > + .stop = zx2967_wdt_stop,
> > + .ping = zx2967_wdt_keepalive,
> > + .set_timeout = zx2967_wdt_set_timeout,
> > +};
> > +
> > +static void zx2967_wdt_reset_sysctrl(struct device *dev)
> > +{
> > + int ret;
> > + void __iomem *regmap;
> > + unsigned int offset, mask, config;
> > + struct of_phandle_args out_args;
> > +
> > + ret = of_parse_phandle_with_fixed_args(dev->of_node,
> > + "zte,wdt-reset-sysctrl", 3, 0, &out_args);
> > + if (ret)
> > + return;
> > +
> > + offset = out_args.args[0];
> > + config = out_args.args[1];
> > + mask = out_args.args[2];
> > +
> > + regmap = syscon_node_to_regmap(out_args.np);
> > + if (IS_ERR(regmap)) {
> > + of_node_put(out_args.np);
> > + return;
> > + }
> > +
> > + regmap_update_bits(regmap, offset, mask, config);
> > + of_node_put(out_args.np);
> > +}
> > +
> > +static int zx2967_wdt_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct zx2967_wdt *wdt;
> > + struct resource *base;
> > + int ret;
> > + struct reset_control *rstc;
> > +
> > + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> > + if (!wdt)
> > + return -ENOMEM;
> > +
> > + platform_set_drvdata(pdev, wdt);
> > +
> > + wdt->wdt_device.info = &zx2967_wdt_ident;
> > + wdt->wdt_device.ops = &zx2967_wdt_ops;
> > + wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
> > + wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
> > + wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
> > + wdt->wdt_device.parent = &pdev->dev;
> > +
> > + base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + wdt->reg_base = devm_ioremap_resource(dev, base);
> > + if (IS_ERR(wdt->reg_base)) {
> > + dev_err(dev, "ioremap failed\n");
> > + return PTR_ERR(wdt->reg_base);
> > + }
> > +
> > + zx2967_wdt_reset_sysctrl(dev);
> > +
> > + wdt->clock = devm_clk_get(dev, NULL);
> > + if (IS_ERR(wdt->clock)) {
> > + dev_err(dev, "failed to find watchdog clock source\n");
> > + return PTR_ERR(wdt->clock);
> > + }
> > +
> > + ret = clk_prepare_enable(wdt->clock);
> > + if (ret < 0) {
> > + dev_err(dev, "failed to enable clock\n");
> > + return ret;
> > + }
> > + clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
> > +
> > + rstc = devm_reset_control_get(dev, NULL);
> > + if (IS_ERR(rstc)) {
> > + dev_err(dev, "failed to get rstc");
> > + ret = PTR_ERR(rstc);
> > + goto err;
> > + }
> > +
> > + reset_control_assert(rstc);
> > + usleep_range(500, 20000);
>
> Alright, I'm officially confused.
>
> First and foremost you still haven't provided an explanation as to why
> this is
> required. Second, in your previous submission you had:
>
> mdelay(10);
>
> That is a busy loop of 10ms. In this post using usleep_range() is a step
> in the
> right direction but the min and max values to wait for don't make sense.
> Here
> you have 500 and 20000, which is 0.5ms and 20ms.
>
> In fact, sleeping for 0.5ms is enough.
we extended the sleeping time to 20ms, the purpose is merging the timer
interrupts. of course, it's happy to replace it with usleep_range(500,
1000).
> > + reset_control_deassert(rstc);
> > +
> > + watchdog_set_drvdata(&wdt->wdt_device, wdt);
> > + watchdog_init_timeout(&wdt->wdt_device,
> > + ZX2967_WDT_DEFAULT_TIMEOUT, dev);
> > + watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
> > +
> > + ret = watchdog_register_device(&wdt->wdt_device);
> > + if (ret)
> > + goto err;
> > +
> > + dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
> > + wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
> > +
> > + return 0;
> > +
> > +err:
> > + clk_disable_unprepare(wdt->clock);
> > + return ret;
> > +}
> > +
> > +static int zx2967_wdt_remove(struct platform_device *pdev)
> > +{
> > + struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
> > +
> > + watchdog_unregister_device(&wdt->wdt_device);
> > + clk_disable_unprepare(wdt->clock);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct of_device_id zx2967_wdt_match[] = {
> > + { .compatible = "zte,zx296718-wdt", },
> > + {}
> > +};
> > +MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
> > +
> > +static struct platform_driver zx2967_wdt_driver = {
> > + .probe = zx2967_wdt_probe,
> > + .remove = zx2967_wdt_remove,
> > + .driver = {
> > + .name = "zx2967-wdt",
> > + .of_match_table = of_match_ptr(zx2967_wdt_match),
> > + },
> > +};
> > +module_platform_driver(zx2967_wdt_driver);
> > +
> > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> > +MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
> > +MODULE_LICENSE("GPL v2");
> > --
> > 2.7.4
> >
>
[-- Attachment #2: Type: text/html, Size: 16002 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-26 16:17 ` Mathieu Poirier
0 siblings, 0 replies; 19+ messages in thread
From: Mathieu Poirier @ 2017-01-26 16:17 UTC (permalink / raw)
To: Baoyou Xie
Cc: Jun Nie, wim, Guenter Roeck, Rob Herring, Mark Rutland,
linux-arm Mailing List, linux-watchdog, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou, chen.chaokai,
wang.qiang01
On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier@linaro.org>
> wrote:
>
> > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > This patch adds watchdog controller driver for ZTE's zx2967 family.
> > >
> > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > > ---
> > > drivers/watchdog/Kconfig | 10 ++
> > > drivers/watchdog/Makefile | 1 +
> > > drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++
> > ++++++++++++
> > > 3 files changed, 287 insertions(+)
> > > create mode 100644 drivers/watchdog/zx2967_wdt.c
> > >
> > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > > index acb00b5..05093a2 100644
> > > --- a/drivers/watchdog/Kconfig
> > > +++ b/drivers/watchdog/Kconfig
> > > @@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
> > > To compile this driver as a module, choose M here: the
> > > module will be called aspeed_wdt.
> > >
> > > +config ZX2967_WATCHDOG
> > > + tristate "ZTE zx2967 SoCs watchdog support"
> > > + depends on ARCH_ZX
> > > + select WATCHDOG_CORE
> > > + help
> > > + Say Y here to include support for the watchdog timer
> > > + in ZTE zx2967 SoCs.
> > > + To compile this driver as a module, choose M here: the
> > > + module will be called zx2967_wdt.
> > > +
> > > # AVR32 Architecture
> > >
> > > config AT32AP700X_WDT
> > > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > > index 0c3d35e..bf2d296 100644
> > > --- a/drivers/watchdog/Makefile
> > > +++ b/drivers/watchdog/Makefile
> > > @@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
> > > obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
> > > obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
> > > obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
> > > +obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
> > >
> > > # AVR32 Architecture
> > > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> > > diff --git a/drivers/watchdog/zx2967_wdt.c
> > b/drivers/watchdog/zx2967_wdt.c
> > > new file mode 100644
> > > index 0000000..8278471
> > > --- /dev/null
> > > +++ b/drivers/watchdog/zx2967_wdt.c
> > > @@ -0,0 +1,276 @@
> > > +/*
> > > + * watchdog driver for ZTE's zx2967 family
> > > + *
> > > + * Copyright (C) 2017 ZTE Ltd.
> > > + *
> > > + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> > > + *
> > > + * License terms: GNU General Public License (GPL) version 2
> > > + */
> > > +
> > > +#include <linux/clk.h>
> > > +#include <linux/delay.h>
> > > +#include <linux/io.h>
> > > +#include <linux/mfd/syscon.h>
> > > +#include <linux/module.h>
> > > +#include <linux/of_address.h>
> > > +#include <linux/platform_device.h>
> > > +#include <linux/regmap.h>
> > > +#include <linux/reset.h>
> > > +#include <linux/watchdog.h>
> > > +
> > > +#define ZX2967_WDT_CFG_REG 0x4
> > > +#define ZX2967_WDT_LOAD_REG 0x8
> > > +#define ZX2967_WDT_REFRESH_REG 0x18
> > > +#define ZX2967_WDT_START_REG 0x1c
> > > +
> > > +#define ZX2967_WDT_REFRESH_MASK 0x3f
> > > +
> > > +#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) -
> > 1) << 8)
> > > +#define ZX2967_WDT_START_EN 0x1
> > > +
> > > +#define ZX2967_WDT_WRITEKEY 0x12340000
> > > +
> > > +#define ZX2967_WDT_DIV_DEFAULT 16
> > > +#define ZX2967_WDT_DEFAULT_TIMEOUT 32
> > > +#define ZX2967_WDT_MIN_TIMEOUT 1
> > > +#define ZX2967_WDT_MAX_TIMEOUT 524
> > > +#define ZX2967_WDT_MAX_COUNT 0xffff
> > > +
> > > +#define ZX2967_WDT_CLK_FREQ 0x8000
> > > +
> > > +#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
> > > +
> > > +struct zx2967_wdt {
> > > + struct watchdog_device wdt_device;
> > > + void __iomem *reg_base;
> > > + struct clk *clock;
> > > +};
> > > +
> > > +static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
> > > +{
> > > + return readl_relaxed(wdt->reg_base + reg);
> > > +}
> > > +
> > > +static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg,
> > u32 val)
> > > +{
> > > + writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
> > > +}
> > > +
> > > +static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
> > > + val ^= ZX2967_WDT_REFRESH_MASK;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
> > > +}
> > > +
> > > +static int
> > > +zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int
> > timeout)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > + unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
> > > + unsigned int count;
> > > +
> > > + count = timeout * ZX2967_WDT_CLK_FREQ;
> > > + if (count > divisor * ZX2967_WDT_MAX_COUNT)
> > > + divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
> > > + count = DIV_ROUND_UP(count, divisor);
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG,
> > ZX2967_WDT_CFG_DIV(divisor));
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
> > > + zx2967_wdt_refresh(wdt);
> > > + wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > + val |= ZX2967_WDT_START_EN;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > +}
> > > +
> > > +static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > + val &= ~ZX2967_WDT_START_EN;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > +}
> > > +
> > > +static int zx2967_wdt_start(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + zx2967_wdt_set_timeout(wdd, wdd->timeout);
> > > + __zx2967_wdt_start(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int zx2967_wdt_stop(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + __zx2967_wdt_stop(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + zx2967_wdt_refresh(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +#define ZX2967_WDT_OPTIONS \
> > > + (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
> > > +static const struct watchdog_info zx2967_wdt_ident = {
> > > + .options = ZX2967_WDT_OPTIONS,
> > > + .identity = "zx2967 watchdog",
> > > +};
> > > +
> > > +static struct watchdog_ops zx2967_wdt_ops = {
> > > + .owner = THIS_MODULE,
> > > + .start = zx2967_wdt_start,
> > > + .stop = zx2967_wdt_stop,
> > > + .ping = zx2967_wdt_keepalive,
> > > + .set_timeout = zx2967_wdt_set_timeout,
> > > +};
> > > +
> > > +static void zx2967_wdt_reset_sysctrl(struct device *dev)
> > > +{
> > > + int ret;
> > > + void __iomem *regmap;
> > > + unsigned int offset, mask, config;
> > > + struct of_phandle_args out_args;
> > > +
> > > + ret = of_parse_phandle_with_fixed_args(dev->of_node,
> > > + "zte,wdt-reset-sysctrl", 3, 0, &out_args);
> > > + if (ret)
> > > + return;
> > > +
> > > + offset = out_args.args[0];
> > > + config = out_args.args[1];
> > > + mask = out_args.args[2];
> > > +
> > > + regmap = syscon_node_to_regmap(out_args.np);
> > > + if (IS_ERR(regmap)) {
> > > + of_node_put(out_args.np);
> > > + return;
> > > + }
> > > +
> > > + regmap_update_bits(regmap, offset, mask, config);
> > > + of_node_put(out_args.np);
> > > +}
> > > +
> > > +static int zx2967_wdt_probe(struct platform_device *pdev)
> > > +{
> > > + struct device *dev = &pdev->dev;
> > > + struct zx2967_wdt *wdt;
> > > + struct resource *base;
> > > + int ret;
> > > + struct reset_control *rstc;
> > > +
> > > + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> > > + if (!wdt)
> > > + return -ENOMEM;
> > > +
> > > + platform_set_drvdata(pdev, wdt);
> > > +
> > > + wdt->wdt_device.info = &zx2967_wdt_ident;
> > > + wdt->wdt_device.ops = &zx2967_wdt_ops;
> > > + wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
> > > + wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
> > > + wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
> > > + wdt->wdt_device.parent = &pdev->dev;
> > > +
> > > + base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > > + wdt->reg_base = devm_ioremap_resource(dev, base);
> > > + if (IS_ERR(wdt->reg_base)) {
> > > + dev_err(dev, "ioremap failed\n");
> > > + return PTR_ERR(wdt->reg_base);
> > > + }
> > > +
> > > + zx2967_wdt_reset_sysctrl(dev);
> > > +
> > > + wdt->clock = devm_clk_get(dev, NULL);
> > > + if (IS_ERR(wdt->clock)) {
> > > + dev_err(dev, "failed to find watchdog clock source\n");
> > > + return PTR_ERR(wdt->clock);
> > > + }
> > > +
> > > + ret = clk_prepare_enable(wdt->clock);
> > > + if (ret < 0) {
> > > + dev_err(dev, "failed to enable clock\n");
> > > + return ret;
> > > + }
> > > + clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
> > > +
> > > + rstc = devm_reset_control_get(dev, NULL);
> > > + if (IS_ERR(rstc)) {
> > > + dev_err(dev, "failed to get rstc");
> > > + ret = PTR_ERR(rstc);
> > > + goto err;
> > > + }
> > > +
> > > + reset_control_assert(rstc);
> > > + usleep_range(500, 20000);
> >
> > Alright, I'm officially confused.
> >
> > First and foremost you still haven't provided an explanation as to why
> > this is
> > required. Second, in your previous submission you had:
> >
> > mdelay(10);
> >
> > That is a busy loop of 10ms. In this post using usleep_range() is a step
> > in the
> > right direction but the min and max values to wait for don't make sense.
> > Here
> > you have 500 and 20000, which is 0.5ms and 20ms.
> >
> > In fact, sleeping for 0.5ms is enough.
> we extended the sleeping time to 20ms, the purpose is merging the timer
> interrupts. of course, it's happy to replace it with usleep_range(500,
> 1000).
"merging the timer interrupts" - you mean trying to get the WD tick to be closer
to other timers? If so I really don't see why. Timers are asynchronous by
nature and there can be dozens of them enabled at any given time.
Unless there is a H/W constraint requiring a delay between the assert/deassert
of the WD, I don't think adding a wait operation (of any kind) make sense.
>
>
>
> > > + reset_control_deassert(rstc);
> > > +
> > > + watchdog_set_drvdata(&wdt->wdt_device, wdt);
> > > + watchdog_init_timeout(&wdt->wdt_device,
> > > + ZX2967_WDT_DEFAULT_TIMEOUT, dev);
> > > + watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
> > > +
> > > + ret = watchdog_register_device(&wdt->wdt_device);
> > > + if (ret)
> > > + goto err;
> > > +
> > > + dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
> > > + wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
> > > +
> > > + return 0;
> > > +
> > > +err:
> > > + clk_disable_unprepare(wdt->clock);
> > > + return ret;
> > > +}
> > > +
> > > +static int zx2967_wdt_remove(struct platform_device *pdev)
> > > +{
> > > + struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
> > > +
> > > + watchdog_unregister_device(&wdt->wdt_device);
> > > + clk_disable_unprepare(wdt->clock);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static const struct of_device_id zx2967_wdt_match[] = {
> > > + { .compatible = "zte,zx296718-wdt", },
> > > + {}
> > > +};
> > > +MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
> > > +
> > > +static struct platform_driver zx2967_wdt_driver = {
> > > + .probe = zx2967_wdt_probe,
> > > + .remove = zx2967_wdt_remove,
> > > + .driver = {
> > > + .name = "zx2967-wdt",
> > > + .of_match_table = of_match_ptr(zx2967_wdt_match),
> > > + },
> > > +};
> > > +module_platform_driver(zx2967_wdt_driver);
> > > +
> > > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> > > +MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
> > > +MODULE_LICENSE("GPL v2");
> > > --
> > > 2.7.4
> > >
> >
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-26 16:17 ` Mathieu Poirier
0 siblings, 0 replies; 19+ messages in thread
From: Mathieu Poirier @ 2017-01-26 16:17 UTC (permalink / raw)
To: Baoyou Xie
Cc: Jun Nie, wim-IQzOog9fTRqzQB+pC5nmwQ, Guenter Roeck, Rob Herring,
Mark Rutland, linux-arm Mailing List,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou,
chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A,
wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A
On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> wrote:
>
> > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > This patch adds watchdog controller driver for ZTE's zx2967 family.
> > >
> > > Signed-off-by: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > > ---
> > > drivers/watchdog/Kconfig | 10 ++
> > > drivers/watchdog/Makefile | 1 +
> > > drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++
> > ++++++++++++
> > > 3 files changed, 287 insertions(+)
> > > create mode 100644 drivers/watchdog/zx2967_wdt.c
> > >
> > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > > index acb00b5..05093a2 100644
> > > --- a/drivers/watchdog/Kconfig
> > > +++ b/drivers/watchdog/Kconfig
> > > @@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
> > > To compile this driver as a module, choose M here: the
> > > module will be called aspeed_wdt.
> > >
> > > +config ZX2967_WATCHDOG
> > > + tristate "ZTE zx2967 SoCs watchdog support"
> > > + depends on ARCH_ZX
> > > + select WATCHDOG_CORE
> > > + help
> > > + Say Y here to include support for the watchdog timer
> > > + in ZTE zx2967 SoCs.
> > > + To compile this driver as a module, choose M here: the
> > > + module will be called zx2967_wdt.
> > > +
> > > # AVR32 Architecture
> > >
> > > config AT32AP700X_WDT
> > > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > > index 0c3d35e..bf2d296 100644
> > > --- a/drivers/watchdog/Makefile
> > > +++ b/drivers/watchdog/Makefile
> > > @@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
> > > obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
> > > obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
> > > obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
> > > +obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
> > >
> > > # AVR32 Architecture
> > > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> > > diff --git a/drivers/watchdog/zx2967_wdt.c
> > b/drivers/watchdog/zx2967_wdt.c
> > > new file mode 100644
> > > index 0000000..8278471
> > > --- /dev/null
> > > +++ b/drivers/watchdog/zx2967_wdt.c
> > > @@ -0,0 +1,276 @@
> > > +/*
> > > + * watchdog driver for ZTE's zx2967 family
> > > + *
> > > + * Copyright (C) 2017 ZTE Ltd.
> > > + *
> > > + * Author: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > > + *
> > > + * License terms: GNU General Public License (GPL) version 2
> > > + */
> > > +
> > > +#include <linux/clk.h>
> > > +#include <linux/delay.h>
> > > +#include <linux/io.h>
> > > +#include <linux/mfd/syscon.h>
> > > +#include <linux/module.h>
> > > +#include <linux/of_address.h>
> > > +#include <linux/platform_device.h>
> > > +#include <linux/regmap.h>
> > > +#include <linux/reset.h>
> > > +#include <linux/watchdog.h>
> > > +
> > > +#define ZX2967_WDT_CFG_REG 0x4
> > > +#define ZX2967_WDT_LOAD_REG 0x8
> > > +#define ZX2967_WDT_REFRESH_REG 0x18
> > > +#define ZX2967_WDT_START_REG 0x1c
> > > +
> > > +#define ZX2967_WDT_REFRESH_MASK 0x3f
> > > +
> > > +#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) -
> > 1) << 8)
> > > +#define ZX2967_WDT_START_EN 0x1
> > > +
> > > +#define ZX2967_WDT_WRITEKEY 0x12340000
> > > +
> > > +#define ZX2967_WDT_DIV_DEFAULT 16
> > > +#define ZX2967_WDT_DEFAULT_TIMEOUT 32
> > > +#define ZX2967_WDT_MIN_TIMEOUT 1
> > > +#define ZX2967_WDT_MAX_TIMEOUT 524
> > > +#define ZX2967_WDT_MAX_COUNT 0xffff
> > > +
> > > +#define ZX2967_WDT_CLK_FREQ 0x8000
> > > +
> > > +#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
> > > +
> > > +struct zx2967_wdt {
> > > + struct watchdog_device wdt_device;
> > > + void __iomem *reg_base;
> > > + struct clk *clock;
> > > +};
> > > +
> > > +static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
> > > +{
> > > + return readl_relaxed(wdt->reg_base + reg);
> > > +}
> > > +
> > > +static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg,
> > u32 val)
> > > +{
> > > + writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
> > > +}
> > > +
> > > +static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
> > > + val ^= ZX2967_WDT_REFRESH_MASK;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
> > > +}
> > > +
> > > +static int
> > > +zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int
> > timeout)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > + unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
> > > + unsigned int count;
> > > +
> > > + count = timeout * ZX2967_WDT_CLK_FREQ;
> > > + if (count > divisor * ZX2967_WDT_MAX_COUNT)
> > > + divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
> > > + count = DIV_ROUND_UP(count, divisor);
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG,
> > ZX2967_WDT_CFG_DIV(divisor));
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
> > > + zx2967_wdt_refresh(wdt);
> > > + wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > + val |= ZX2967_WDT_START_EN;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > +}
> > > +
> > > +static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > + val &= ~ZX2967_WDT_START_EN;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > +}
> > > +
> > > +static int zx2967_wdt_start(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + zx2967_wdt_set_timeout(wdd, wdd->timeout);
> > > + __zx2967_wdt_start(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int zx2967_wdt_stop(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + __zx2967_wdt_stop(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + zx2967_wdt_refresh(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +#define ZX2967_WDT_OPTIONS \
> > > + (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
> > > +static const struct watchdog_info zx2967_wdt_ident = {
> > > + .options = ZX2967_WDT_OPTIONS,
> > > + .identity = "zx2967 watchdog",
> > > +};
> > > +
> > > +static struct watchdog_ops zx2967_wdt_ops = {
> > > + .owner = THIS_MODULE,
> > > + .start = zx2967_wdt_start,
> > > + .stop = zx2967_wdt_stop,
> > > + .ping = zx2967_wdt_keepalive,
> > > + .set_timeout = zx2967_wdt_set_timeout,
> > > +};
> > > +
> > > +static void zx2967_wdt_reset_sysctrl(struct device *dev)
> > > +{
> > > + int ret;
> > > + void __iomem *regmap;
> > > + unsigned int offset, mask, config;
> > > + struct of_phandle_args out_args;
> > > +
> > > + ret = of_parse_phandle_with_fixed_args(dev->of_node,
> > > + "zte,wdt-reset-sysctrl", 3, 0, &out_args);
> > > + if (ret)
> > > + return;
> > > +
> > > + offset = out_args.args[0];
> > > + config = out_args.args[1];
> > > + mask = out_args.args[2];
> > > +
> > > + regmap = syscon_node_to_regmap(out_args.np);
> > > + if (IS_ERR(regmap)) {
> > > + of_node_put(out_args.np);
> > > + return;
> > > + }
> > > +
> > > + regmap_update_bits(regmap, offset, mask, config);
> > > + of_node_put(out_args.np);
> > > +}
> > > +
> > > +static int zx2967_wdt_probe(struct platform_device *pdev)
> > > +{
> > > + struct device *dev = &pdev->dev;
> > > + struct zx2967_wdt *wdt;
> > > + struct resource *base;
> > > + int ret;
> > > + struct reset_control *rstc;
> > > +
> > > + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> > > + if (!wdt)
> > > + return -ENOMEM;
> > > +
> > > + platform_set_drvdata(pdev, wdt);
> > > +
> > > + wdt->wdt_device.info = &zx2967_wdt_ident;
> > > + wdt->wdt_device.ops = &zx2967_wdt_ops;
> > > + wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
> > > + wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
> > > + wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
> > > + wdt->wdt_device.parent = &pdev->dev;
> > > +
> > > + base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > > + wdt->reg_base = devm_ioremap_resource(dev, base);
> > > + if (IS_ERR(wdt->reg_base)) {
> > > + dev_err(dev, "ioremap failed\n");
> > > + return PTR_ERR(wdt->reg_base);
> > > + }
> > > +
> > > + zx2967_wdt_reset_sysctrl(dev);
> > > +
> > > + wdt->clock = devm_clk_get(dev, NULL);
> > > + if (IS_ERR(wdt->clock)) {
> > > + dev_err(dev, "failed to find watchdog clock source\n");
> > > + return PTR_ERR(wdt->clock);
> > > + }
> > > +
> > > + ret = clk_prepare_enable(wdt->clock);
> > > + if (ret < 0) {
> > > + dev_err(dev, "failed to enable clock\n");
> > > + return ret;
> > > + }
> > > + clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
> > > +
> > > + rstc = devm_reset_control_get(dev, NULL);
> > > + if (IS_ERR(rstc)) {
> > > + dev_err(dev, "failed to get rstc");
> > > + ret = PTR_ERR(rstc);
> > > + goto err;
> > > + }
> > > +
> > > + reset_control_assert(rstc);
> > > + usleep_range(500, 20000);
> >
> > Alright, I'm officially confused.
> >
> > First and foremost you still haven't provided an explanation as to why
> > this is
> > required. Second, in your previous submission you had:
> >
> > mdelay(10);
> >
> > That is a busy loop of 10ms. In this post using usleep_range() is a step
> > in the
> > right direction but the min and max values to wait for don't make sense.
> > Here
> > you have 500 and 20000, which is 0.5ms and 20ms.
> >
> > In fact, sleeping for 0.5ms is enough.
> we extended the sleeping time to 20ms, the purpose is merging the timer
> interrupts. of course, it's happy to replace it with usleep_range(500,
> 1000).
"merging the timer interrupts" - you mean trying to get the WD tick to be closer
to other timers? If so I really don't see why. Timers are asynchronous by
nature and there can be dozens of them enabled at any given time.
Unless there is a H/W constraint requiring a delay between the assert/deassert
of the WD, I don't think adding a wait operation (of any kind) make sense.
>
>
>
> > > + reset_control_deassert(rstc);
> > > +
> > > + watchdog_set_drvdata(&wdt->wdt_device, wdt);
> > > + watchdog_init_timeout(&wdt->wdt_device,
> > > + ZX2967_WDT_DEFAULT_TIMEOUT, dev);
> > > + watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
> > > +
> > > + ret = watchdog_register_device(&wdt->wdt_device);
> > > + if (ret)
> > > + goto err;
> > > +
> > > + dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
> > > + wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
> > > +
> > > + return 0;
> > > +
> > > +err:
> > > + clk_disable_unprepare(wdt->clock);
> > > + return ret;
> > > +}
> > > +
> > > +static int zx2967_wdt_remove(struct platform_device *pdev)
> > > +{
> > > + struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
> > > +
> > > + watchdog_unregister_device(&wdt->wdt_device);
> > > + clk_disable_unprepare(wdt->clock);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static const struct of_device_id zx2967_wdt_match[] = {
> > > + { .compatible = "zte,zx296718-wdt", },
> > > + {}
> > > +};
> > > +MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
> > > +
> > > +static struct platform_driver zx2967_wdt_driver = {
> > > + .probe = zx2967_wdt_probe,
> > > + .remove = zx2967_wdt_remove,
> > > + .driver = {
> > > + .name = "zx2967-wdt",
> > > + .of_match_table = of_match_ptr(zx2967_wdt_match),
> > > + },
> > > +};
> > > +module_platform_driver(zx2967_wdt_driver);
> > > +
> > > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>");
> > > +MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
> > > +MODULE_LICENSE("GPL v2");
> > > --
> > > 2.7.4
> > >
> >
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-26 16:17 ` Mathieu Poirier
0 siblings, 0 replies; 19+ messages in thread
From: Mathieu Poirier @ 2017-01-26 16:17 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier@linaro.org>
> wrote:
>
> > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > This patch adds watchdog controller driver for ZTE's zx2967 family.
> > >
> > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > > ---
> > > drivers/watchdog/Kconfig | 10 ++
> > > drivers/watchdog/Makefile | 1 +
> > > drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++
> > ++++++++++++
> > > 3 files changed, 287 insertions(+)
> > > create mode 100644 drivers/watchdog/zx2967_wdt.c
> > >
> > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > > index acb00b5..05093a2 100644
> > > --- a/drivers/watchdog/Kconfig
> > > +++ b/drivers/watchdog/Kconfig
> > > @@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
> > > To compile this driver as a module, choose M here: the
> > > module will be called aspeed_wdt.
> > >
> > > +config ZX2967_WATCHDOG
> > > + tristate "ZTE zx2967 SoCs watchdog support"
> > > + depends on ARCH_ZX
> > > + select WATCHDOG_CORE
> > > + help
> > > + Say Y here to include support for the watchdog timer
> > > + in ZTE zx2967 SoCs.
> > > + To compile this driver as a module, choose M here: the
> > > + module will be called zx2967_wdt.
> > > +
> > > # AVR32 Architecture
> > >
> > > config AT32AP700X_WDT
> > > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > > index 0c3d35e..bf2d296 100644
> > > --- a/drivers/watchdog/Makefile
> > > +++ b/drivers/watchdog/Makefile
> > > @@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
> > > obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
> > > obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
> > > obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
> > > +obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
> > >
> > > # AVR32 Architecture
> > > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> > > diff --git a/drivers/watchdog/zx2967_wdt.c
> > b/drivers/watchdog/zx2967_wdt.c
> > > new file mode 100644
> > > index 0000000..8278471
> > > --- /dev/null
> > > +++ b/drivers/watchdog/zx2967_wdt.c
> > > @@ -0,0 +1,276 @@
> > > +/*
> > > + * watchdog driver for ZTE's zx2967 family
> > > + *
> > > + * Copyright (C) 2017 ZTE Ltd.
> > > + *
> > > + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> > > + *
> > > + * License terms: GNU General Public License (GPL) version 2
> > > + */
> > > +
> > > +#include <linux/clk.h>
> > > +#include <linux/delay.h>
> > > +#include <linux/io.h>
> > > +#include <linux/mfd/syscon.h>
> > > +#include <linux/module.h>
> > > +#include <linux/of_address.h>
> > > +#include <linux/platform_device.h>
> > > +#include <linux/regmap.h>
> > > +#include <linux/reset.h>
> > > +#include <linux/watchdog.h>
> > > +
> > > +#define ZX2967_WDT_CFG_REG 0x4
> > > +#define ZX2967_WDT_LOAD_REG 0x8
> > > +#define ZX2967_WDT_REFRESH_REG 0x18
> > > +#define ZX2967_WDT_START_REG 0x1c
> > > +
> > > +#define ZX2967_WDT_REFRESH_MASK 0x3f
> > > +
> > > +#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff) -
> > 1) << 8)
> > > +#define ZX2967_WDT_START_EN 0x1
> > > +
> > > +#define ZX2967_WDT_WRITEKEY 0x12340000
> > > +
> > > +#define ZX2967_WDT_DIV_DEFAULT 16
> > > +#define ZX2967_WDT_DEFAULT_TIMEOUT 32
> > > +#define ZX2967_WDT_MIN_TIMEOUT 1
> > > +#define ZX2967_WDT_MAX_TIMEOUT 524
> > > +#define ZX2967_WDT_MAX_COUNT 0xffff
> > > +
> > > +#define ZX2967_WDT_CLK_FREQ 0x8000
> > > +
> > > +#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
> > > +
> > > +struct zx2967_wdt {
> > > + struct watchdog_device wdt_device;
> > > + void __iomem *reg_base;
> > > + struct clk *clock;
> > > +};
> > > +
> > > +static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
> > > +{
> > > + return readl_relaxed(wdt->reg_base + reg);
> > > +}
> > > +
> > > +static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16 reg,
> > u32 val)
> > > +{
> > > + writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
> > > +}
> > > +
> > > +static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
> > > + val ^= ZX2967_WDT_REFRESH_MASK;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
> > > +}
> > > +
> > > +static int
> > > +zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int
> > timeout)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > + unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
> > > + unsigned int count;
> > > +
> > > + count = timeout * ZX2967_WDT_CLK_FREQ;
> > > + if (count > divisor * ZX2967_WDT_MAX_COUNT)
> > > + divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
> > > + count = DIV_ROUND_UP(count, divisor);
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG,
> > ZX2967_WDT_CFG_DIV(divisor));
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
> > > + zx2967_wdt_refresh(wdt);
> > > + wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > + val |= ZX2967_WDT_START_EN;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > +}
> > > +
> > > +static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
> > > +{
> > > + u32 val;
> > > +
> > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > + val &= ~ZX2967_WDT_START_EN;
> > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > +}
> > > +
> > > +static int zx2967_wdt_start(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + zx2967_wdt_set_timeout(wdd, wdd->timeout);
> > > + __zx2967_wdt_start(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int zx2967_wdt_stop(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + __zx2967_wdt_stop(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
> > > +{
> > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > +
> > > + zx2967_wdt_refresh(wdt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +#define ZX2967_WDT_OPTIONS \
> > > + (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
> > > +static const struct watchdog_info zx2967_wdt_ident = {
> > > + .options = ZX2967_WDT_OPTIONS,
> > > + .identity = "zx2967 watchdog",
> > > +};
> > > +
> > > +static struct watchdog_ops zx2967_wdt_ops = {
> > > + .owner = THIS_MODULE,
> > > + .start = zx2967_wdt_start,
> > > + .stop = zx2967_wdt_stop,
> > > + .ping = zx2967_wdt_keepalive,
> > > + .set_timeout = zx2967_wdt_set_timeout,
> > > +};
> > > +
> > > +static void zx2967_wdt_reset_sysctrl(struct device *dev)
> > > +{
> > > + int ret;
> > > + void __iomem *regmap;
> > > + unsigned int offset, mask, config;
> > > + struct of_phandle_args out_args;
> > > +
> > > + ret = of_parse_phandle_with_fixed_args(dev->of_node,
> > > + "zte,wdt-reset-sysctrl", 3, 0, &out_args);
> > > + if (ret)
> > > + return;
> > > +
> > > + offset = out_args.args[0];
> > > + config = out_args.args[1];
> > > + mask = out_args.args[2];
> > > +
> > > + regmap = syscon_node_to_regmap(out_args.np);
> > > + if (IS_ERR(regmap)) {
> > > + of_node_put(out_args.np);
> > > + return;
> > > + }
> > > +
> > > + regmap_update_bits(regmap, offset, mask, config);
> > > + of_node_put(out_args.np);
> > > +}
> > > +
> > > +static int zx2967_wdt_probe(struct platform_device *pdev)
> > > +{
> > > + struct device *dev = &pdev->dev;
> > > + struct zx2967_wdt *wdt;
> > > + struct resource *base;
> > > + int ret;
> > > + struct reset_control *rstc;
> > > +
> > > + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> > > + if (!wdt)
> > > + return -ENOMEM;
> > > +
> > > + platform_set_drvdata(pdev, wdt);
> > > +
> > > + wdt->wdt_device.info = &zx2967_wdt_ident;
> > > + wdt->wdt_device.ops = &zx2967_wdt_ops;
> > > + wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
> > > + wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
> > > + wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
> > > + wdt->wdt_device.parent = &pdev->dev;
> > > +
> > > + base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > > + wdt->reg_base = devm_ioremap_resource(dev, base);
> > > + if (IS_ERR(wdt->reg_base)) {
> > > + dev_err(dev, "ioremap failed\n");
> > > + return PTR_ERR(wdt->reg_base);
> > > + }
> > > +
> > > + zx2967_wdt_reset_sysctrl(dev);
> > > +
> > > + wdt->clock = devm_clk_get(dev, NULL);
> > > + if (IS_ERR(wdt->clock)) {
> > > + dev_err(dev, "failed to find watchdog clock source\n");
> > > + return PTR_ERR(wdt->clock);
> > > + }
> > > +
> > > + ret = clk_prepare_enable(wdt->clock);
> > > + if (ret < 0) {
> > > + dev_err(dev, "failed to enable clock\n");
> > > + return ret;
> > > + }
> > > + clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
> > > +
> > > + rstc = devm_reset_control_get(dev, NULL);
> > > + if (IS_ERR(rstc)) {
> > > + dev_err(dev, "failed to get rstc");
> > > + ret = PTR_ERR(rstc);
> > > + goto err;
> > > + }
> > > +
> > > + reset_control_assert(rstc);
> > > + usleep_range(500, 20000);
> >
> > Alright, I'm officially confused.
> >
> > First and foremost you still haven't provided an explanation as to why
> > this is
> > required. Second, in your previous submission you had:
> >
> > mdelay(10);
> >
> > That is a busy loop of 10ms. In this post using usleep_range() is a step
> > in the
> > right direction but the min and max values to wait for don't make sense.
> > Here
> > you have 500 and 20000, which is 0.5ms and 20ms.
> >
> > In fact, sleeping for 0.5ms is enough.
> we extended the sleeping time to 20ms, the purpose is merging the timer
> interrupts. of course, it's happy to replace it with usleep_range(500,
> 1000).
"merging the timer interrupts" - you mean trying to get the WD tick to be closer
to other timers? If so I really don't see why. Timers are asynchronous by
nature and there can be dozens of them enabled at any given time.
Unless there is a H/W constraint requiring a delay between the assert/deassert
of the WD, I don't think adding a wait operation (of any kind) make sense.
>
>
>
> > > + reset_control_deassert(rstc);
> > > +
> > > + watchdog_set_drvdata(&wdt->wdt_device, wdt);
> > > + watchdog_init_timeout(&wdt->wdt_device,
> > > + ZX2967_WDT_DEFAULT_TIMEOUT, dev);
> > > + watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
> > > +
> > > + ret = watchdog_register_device(&wdt->wdt_device);
> > > + if (ret)
> > > + goto err;
> > > +
> > > + dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
> > > + wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
> > > +
> > > + return 0;
> > > +
> > > +err:
> > > + clk_disable_unprepare(wdt->clock);
> > > + return ret;
> > > +}
> > > +
> > > +static int zx2967_wdt_remove(struct platform_device *pdev)
> > > +{
> > > + struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
> > > +
> > > + watchdog_unregister_device(&wdt->wdt_device);
> > > + clk_disable_unprepare(wdt->clock);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static const struct of_device_id zx2967_wdt_match[] = {
> > > + { .compatible = "zte,zx296718-wdt", },
> > > + {}
> > > +};
> > > +MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
> > > +
> > > +static struct platform_driver zx2967_wdt_driver = {
> > > + .probe = zx2967_wdt_probe,
> > > + .remove = zx2967_wdt_remove,
> > > + .driver = {
> > > + .name = "zx2967-wdt",
> > > + .of_match_table = of_match_ptr(zx2967_wdt_match),
> > > + },
> > > +};
> > > +module_platform_driver(zx2967_wdt_driver);
> > > +
> > > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> > > +MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
> > > +MODULE_LICENSE("GPL v2");
> > > --
> > > 2.7.4
> > >
> >
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
2017-01-26 16:17 ` Mathieu Poirier
(?)
(?)
@ 2017-01-27 2:40 ` Baoyou Xie
2017-01-30 16:53 ` Guenter Roeck
-1 siblings, 1 reply; 19+ messages in thread
From: Baoyou Xie @ 2017-01-27 2:40 UTC (permalink / raw)
To: Mathieu Poirier
Cc: Jun Nie, wim, Guenter Roeck, Rob Herring, Mark Rutland,
linux-arm Mailing List, linux-watchdog, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou, chen.chaokai,
wang.qiang01
[-- Attachment #1: Type: text/plain, Size: 14476 bytes --]
On 27 January 2017 at 00:17, Mathieu Poirier <mathieu.poirier@linaro.org>
wrote:
> On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> > On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier@linaro.org
> >
> > wrote:
> >
> > > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > > This patch adds watchdog controller driver for ZTE's zx2967 family.
> > > >
> > > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > > > ---
> > > > drivers/watchdog/Kconfig | 10 ++
> > > > drivers/watchdog/Makefile | 1 +
> > > > drivers/watchdog/zx2967_wdt.c | 276 ++++++++++++++++++++++++++++++
> > > ++++++++++++
> > > > 3 files changed, 287 insertions(+)
> > > > create mode 100644 drivers/watchdog/zx2967_wdt.c
> > > >
> > > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > > > index acb00b5..05093a2 100644
> > > > --- a/drivers/watchdog/Kconfig
> > > > +++ b/drivers/watchdog/Kconfig
> > > > @@ -714,6 +714,16 @@ config ASPEED_WATCHDOG
> > > > To compile this driver as a module, choose M here: the
> > > > module will be called aspeed_wdt.
> > > >
> > > > +config ZX2967_WATCHDOG
> > > > + tristate "ZTE zx2967 SoCs watchdog support"
> > > > + depends on ARCH_ZX
> > > > + select WATCHDOG_CORE
> > > > + help
> > > > + Say Y here to include support for the watchdog timer
> > > > + in ZTE zx2967 SoCs.
> > > > + To compile this driver as a module, choose M here: the
> > > > + module will be called zx2967_wdt.
> > > > +
> > > > # AVR32 Architecture
> > > >
> > > > config AT32AP700X_WDT
> > > > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > > > index 0c3d35e..bf2d296 100644
> > > > --- a/drivers/watchdog/Makefile
> > > > +++ b/drivers/watchdog/Makefile
> > > > @@ -82,6 +82,7 @@ obj-$(CONFIG_BCM7038_WDT) += bcm7038_wdt.o
> > > > obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o
> > > > obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o
> > > > obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o
> > > > +obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o
> > > >
> > > > # AVR32 Architecture
> > > > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
> > > > diff --git a/drivers/watchdog/zx2967_wdt.c
> > > b/drivers/watchdog/zx2967_wdt.c
> > > > new file mode 100644
> > > > index 0000000..8278471
> > > > --- /dev/null
> > > > +++ b/drivers/watchdog/zx2967_wdt.c
> > > > @@ -0,0 +1,276 @@
> > > > +/*
> > > > + * watchdog driver for ZTE's zx2967 family
> > > > + *
> > > > + * Copyright (C) 2017 ZTE Ltd.
> > > > + *
> > > > + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> > > > + *
> > > > + * License terms: GNU General Public License (GPL) version 2
> > > > + */
> > > > +
> > > > +#include <linux/clk.h>
> > > > +#include <linux/delay.h>
> > > > +#include <linux/io.h>
> > > > +#include <linux/mfd/syscon.h>
> > > > +#include <linux/module.h>
> > > > +#include <linux/of_address.h>
> > > > +#include <linux/platform_device.h>
> > > > +#include <linux/regmap.h>
> > > > +#include <linux/reset.h>
> > > > +#include <linux/watchdog.h>
> > > > +
> > > > +#define ZX2967_WDT_CFG_REG 0x4
> > > > +#define ZX2967_WDT_LOAD_REG 0x8
> > > > +#define ZX2967_WDT_REFRESH_REG 0x18
> > > > +#define ZX2967_WDT_START_REG 0x1c
> > > > +
> > > > +#define ZX2967_WDT_REFRESH_MASK 0x3f
> > > > +
> > > > +#define ZX2967_WDT_CFG_DIV(n) ((((n) & 0xff)
> -
> > > 1) << 8)
> > > > +#define ZX2967_WDT_START_EN 0x1
> > > > +
> > > > +#define ZX2967_WDT_WRITEKEY 0x12340000
> > > > +
> > > > +#define ZX2967_WDT_DIV_DEFAULT 16
> > > > +#define ZX2967_WDT_DEFAULT_TIMEOUT 32
> > > > +#define ZX2967_WDT_MIN_TIMEOUT 1
> > > > +#define ZX2967_WDT_MAX_TIMEOUT 524
> > > > +#define ZX2967_WDT_MAX_COUNT 0xffff
> > > > +
> > > > +#define ZX2967_WDT_CLK_FREQ 0x8000
> > > > +
> > > > +#define ZX2967_WDT_FLAG_REBOOT_MON BIT(0)
> > > > +
> > > > +struct zx2967_wdt {
> > > > + struct watchdog_device wdt_device;
> > > > + void __iomem *reg_base;
> > > > + struct clk *clock;
> > > > +};
> > > > +
> > > > +static inline u32 zx2967_wdt_readl(struct zx2967_wdt *wdt, u16 reg)
> > > > +{
> > > > + return readl_relaxed(wdt->reg_base + reg);
> > > > +}
> > > > +
> > > > +static inline void zx2967_wdt_writel(struct zx2967_wdt *wdt, u16
> reg,
> > > u32 val)
> > > > +{
> > > > + writel_relaxed(val | ZX2967_WDT_WRITEKEY, wdt->reg_base + reg);
> > > > +}
> > > > +
> > > > +static void zx2967_wdt_refresh(struct zx2967_wdt *wdt)
> > > > +{
> > > > + u32 val;
> > > > +
> > > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_REFRESH_REG);
> > > > + val ^= ZX2967_WDT_REFRESH_MASK;
> > > > + zx2967_wdt_writel(wdt, ZX2967_WDT_REFRESH_REG, val);
> > > > +}
> > > > +
> > > > +static int
> > > > +zx2967_wdt_set_timeout(struct watchdog_device *wdd, unsigned int
> > > timeout)
> > > > +{
> > > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > > + unsigned int divisor = ZX2967_WDT_DIV_DEFAULT;
> > > > + unsigned int count;
> > > > +
> > > > + count = timeout * ZX2967_WDT_CLK_FREQ;
> > > > + if (count > divisor * ZX2967_WDT_MAX_COUNT)
> > > > + divisor = DIV_ROUND_UP(count, ZX2967_WDT_MAX_COUNT);
> > > > + count = DIV_ROUND_UP(count, divisor);
> > > > + zx2967_wdt_writel(wdt, ZX2967_WDT_CFG_REG,
> > > ZX2967_WDT_CFG_DIV(divisor));
> > > > + zx2967_wdt_writel(wdt, ZX2967_WDT_LOAD_REG, count);
> > > > + zx2967_wdt_refresh(wdt);
> > > > + wdd->timeout = (count * divisor) / ZX2967_WDT_CLK_FREQ;
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +static void __zx2967_wdt_start(struct zx2967_wdt *wdt)
> > > > +{
> > > > + u32 val;
> > > > +
> > > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > > + val |= ZX2967_WDT_START_EN;
> > > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > > +}
> > > > +
> > > > +static void __zx2967_wdt_stop(struct zx2967_wdt *wdt)
> > > > +{
> > > > + u32 val;
> > > > +
> > > > + val = zx2967_wdt_readl(wdt, ZX2967_WDT_START_REG);
> > > > + val &= ~ZX2967_WDT_START_EN;
> > > > + zx2967_wdt_writel(wdt, ZX2967_WDT_START_REG, val);
> > > > +}
> > > > +
> > > > +static int zx2967_wdt_start(struct watchdog_device *wdd)
> > > > +{
> > > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > > +
> > > > + zx2967_wdt_set_timeout(wdd, wdd->timeout);
> > > > + __zx2967_wdt_start(wdt);
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +static int zx2967_wdt_stop(struct watchdog_device *wdd)
> > > > +{
> > > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > > +
> > > > + __zx2967_wdt_stop(wdt);
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +static int zx2967_wdt_keepalive(struct watchdog_device *wdd)
> > > > +{
> > > > + struct zx2967_wdt *wdt = watchdog_get_drvdata(wdd);
> > > > +
> > > > + zx2967_wdt_refresh(wdt);
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +#define ZX2967_WDT_OPTIONS \
> > > > + (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
> > > > +static const struct watchdog_info zx2967_wdt_ident = {
> > > > + .options = ZX2967_WDT_OPTIONS,
> > > > + .identity = "zx2967 watchdog",
> > > > +};
> > > > +
> > > > +static struct watchdog_ops zx2967_wdt_ops = {
> > > > + .owner = THIS_MODULE,
> > > > + .start = zx2967_wdt_start,
> > > > + .stop = zx2967_wdt_stop,
> > > > + .ping = zx2967_wdt_keepalive,
> > > > + .set_timeout = zx2967_wdt_set_timeout,
> > > > +};
> > > > +
> > > > +static void zx2967_wdt_reset_sysctrl(struct device *dev)
> > > > +{
> > > > + int ret;
> > > > + void __iomem *regmap;
> > > > + unsigned int offset, mask, config;
> > > > + struct of_phandle_args out_args;
> > > > +
> > > > + ret = of_parse_phandle_with_fixed_args(dev->of_node,
> > > > + "zte,wdt-reset-sysctrl", 3, 0, &out_args);
> > > > + if (ret)
> > > > + return;
> > > > +
> > > > + offset = out_args.args[0];
> > > > + config = out_args.args[1];
> > > > + mask = out_args.args[2];
> > > > +
> > > > + regmap = syscon_node_to_regmap(out_args.np);
> > > > + if (IS_ERR(regmap)) {
> > > > + of_node_put(out_args.np);
> > > > + return;
> > > > + }
> > > > +
> > > > + regmap_update_bits(regmap, offset, mask, config);
> > > > + of_node_put(out_args.np);
> > > > +}
> > > > +
> > > > +static int zx2967_wdt_probe(struct platform_device *pdev)
> > > > +{
> > > > + struct device *dev = &pdev->dev;
> > > > + struct zx2967_wdt *wdt;
> > > > + struct resource *base;
> > > > + int ret;
> > > > + struct reset_control *rstc;
> > > > +
> > > > + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> > > > + if (!wdt)
> > > > + return -ENOMEM;
> > > > +
> > > > + platform_set_drvdata(pdev, wdt);
> > > > +
> > > > + wdt->wdt_device.info = &zx2967_wdt_ident;
> > > > + wdt->wdt_device.ops = &zx2967_wdt_ops;
> > > > + wdt->wdt_device.timeout = ZX2967_WDT_DEFAULT_TIMEOUT;
> > > > + wdt->wdt_device.max_timeout = ZX2967_WDT_MAX_TIMEOUT;
> > > > + wdt->wdt_device.min_timeout = ZX2967_WDT_MIN_TIMEOUT;
> > > > + wdt->wdt_device.parent = &pdev->dev;
> > > > +
> > > > + base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > > > + wdt->reg_base = devm_ioremap_resource(dev, base);
> > > > + if (IS_ERR(wdt->reg_base)) {
> > > > + dev_err(dev, "ioremap failed\n");
> > > > + return PTR_ERR(wdt->reg_base);
> > > > + }
> > > > +
> > > > + zx2967_wdt_reset_sysctrl(dev);
> > > > +
> > > > + wdt->clock = devm_clk_get(dev, NULL);
> > > > + if (IS_ERR(wdt->clock)) {
> > > > + dev_err(dev, "failed to find watchdog clock source\n");
> > > > + return PTR_ERR(wdt->clock);
> > > > + }
> > > > +
> > > > + ret = clk_prepare_enable(wdt->clock);
> > > > + if (ret < 0) {
> > > > + dev_err(dev, "failed to enable clock\n");
> > > > + return ret;
> > > > + }
> > > > + clk_set_rate(wdt->clock, ZX2967_WDT_CLK_FREQ);
> > > > +
> > > > + rstc = devm_reset_control_get(dev, NULL);
> > > > + if (IS_ERR(rstc)) {
> > > > + dev_err(dev, "failed to get rstc");
> > > > + ret = PTR_ERR(rstc);
> > > > + goto err;
> > > > + }
> > > > +
> > > > + reset_control_assert(rstc);
> > > > + usleep_range(500, 20000);
> > >
> > > Alright, I'm officially confused.
> > >
> > > First and foremost you still haven't provided an explanation as to why
> > > this is
> > > required. Second, in your previous submission you had:
> > >
> > > mdelay(10);
> > >
> > > That is a busy loop of 10ms. In this post using usleep_range() is a
> step
> > > in the
> > > right direction but the min and max values to wait for don't make
> sense.
> > > Here
> > > you have 500 and 20000, which is 0.5ms and 20ms.
> > >
> > > In fact, sleeping for 0.5ms is enough.
> > we extended the sleeping time to 20ms, the purpose is merging the timer
> > interrupts. of course, it's happy to replace it with usleep_range(500,
> > 1000).
>
> "merging the timer interrupts" - you mean trying to get the WD tick to be
> closer
> to other timers? If so I really don't see why. Timers are asynchronous by
> nature and there can be dozens of them enabled at any given time.
>
> Really?
Even if the system runs asynchronously, early process may trigger delayed
process, for example delayed work queue or timers, we can merge our
watchdog timer and those delayed work's timers.
Furthermore, what happen if we build this driver as module?
But, as i said early, it's a trial optimization but can be instead with
usleep_range(500, 1000).
In some case, such optimization is helpful. I'd like to talk a story here,
about before ten years, I pressed a return key in console, you know, in
this case, a process be created and exited, so the cpu core that process
run at sent an IPI to other CPU, IPI interrupt resulted in the performance
decreased by 20%, so sad:)
Unless there is a H/W constraint requiring a delay between the
> assert/deassert
> of the WD, I don't think adding a wait operation (of any kind) make sense.
>
> >
> >
> >
> > > > + reset_control_deassert(rstc);
> > > > +
> > > > + watchdog_set_drvdata(&wdt->wdt_device, wdt);
> > > > + watchdog_init_timeout(&wdt->wdt_device,
> > > > + ZX2967_WDT_DEFAULT_TIMEOUT, dev);
> > > > + watchdog_set_nowayout(&wdt->wdt_device, WATCHDOG_NOWAYOUT);
> > > > +
> > > > + ret = watchdog_register_device(&wdt->wdt_device);
> > > > + if (ret)
> > > > + goto err;
> > > > +
> > > > + dev_info(dev, "watchdog enabled (timeout=%d sec, nowayout=%d)",
> > > > + wdt->wdt_device.timeout, WATCHDOG_NOWAYOUT);
> > > > +
> > > > + return 0;
> > > > +
> > > > +err:
> > > > + clk_disable_unprepare(wdt->clock);
> > > > + return ret;
> > > > +}
> > > > +
> > > > +static int zx2967_wdt_remove(struct platform_device *pdev)
> > > > +{
> > > > + struct zx2967_wdt *wdt = platform_get_drvdata(pdev);
> > > > +
> > > > + watchdog_unregister_device(&wdt->wdt_device);
> > > > + clk_disable_unprepare(wdt->clock);
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +static const struct of_device_id zx2967_wdt_match[] = {
> > > > + { .compatible = "zte,zx296718-wdt", },
> > > > + {}
> > > > +};
> > > > +MODULE_DEVICE_TABLE(of, zx2967_wdt_match);
> > > > +
> > > > +static struct platform_driver zx2967_wdt_driver = {
> > > > + .probe = zx2967_wdt_probe,
> > > > + .remove = zx2967_wdt_remove,
> > > > + .driver = {
> > > > + .name = "zx2967-wdt",
> > > > + .of_match_table = of_match_ptr(zx2967_wdt_match),
> > > > + },
> > > > +};
> > > > +module_platform_driver(zx2967_wdt_driver);
> > > > +
> > > > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> > > > +MODULE_DESCRIPTION("ZTE zx2967 Watchdog Device Driver");
> > > > +MODULE_LICENSE("GPL v2");
> > > > --
> > > > 2.7.4
> > > >
> > >
>
[-- Attachment #2: Type: text/html, Size: 21137 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-30 16:53 ` Guenter Roeck
0 siblings, 0 replies; 19+ messages in thread
From: Guenter Roeck @ 2017-01-30 16:53 UTC (permalink / raw)
To: Baoyou Xie
Cc: Mathieu Poirier, Jun Nie, wim, Rob Herring, Mark Rutland,
linux-arm Mailing List, linux-watchdog, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou, chen.chaokai,
wang.qiang01
On Fri, Jan 27, 2017 at 10:40:09AM +0800, Baoyou Xie wrote:
> On 27 January 2017 at 00:17, Mathieu Poirier <mathieu.poirier@linaro.org>
> wrote:
>
> > On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> > > On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier@linaro.org
> > >
> > > wrote:
> > >
> > > > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > > > This patch adds watchdog controller driver for ZTE's zx2967 family.
> > > > >
> > > > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > > > > ---
[ ... ]
> > > > > + reset_control_assert(rstc);
> > > > > + usleep_range(500, 20000);
> > > >
> > > > Alright, I'm officially confused.
> > > >
> > > > First and foremost you still haven't provided an explanation as to why
> > > > this is
> > > > required. Second, in your previous submission you had:
> > > >
> > > > mdelay(10);
> > > >
> > > > That is a busy loop of 10ms. In this post using usleep_range() is a
> > step
> > > > in the
> > > > right direction but the min and max values to wait for don't make
> > sense.
> > > > Here
> > > > you have 500 and 20000, which is 0.5ms and 20ms.
> > > >
> > > > In fact, sleeping for 0.5ms is enough.
> > > we extended the sleeping time to 20ms, the purpose is merging the timer
> > > interrupts. of course, it's happy to replace it with usleep_range(500,
> > > 1000).
> >
> > "merging the timer interrupts" - you mean trying to get the WD tick to be
> > closer
> > to other timers? If so I really don't see why. Timers are asynchronous by
> > nature and there can be dozens of them enabled at any given time.
> >
> > Really?
> Even if the system runs asynchronously, early process may trigger delayed
> process, for example delayed work queue or timers, we can merge our
> watchdog timer and those delayed work's timers.
>
In the probe function ?
> Furthermore, what happen if we build this driver as module?
>
If every driver writer would use that line of argument, booting would
take much longer than necessary, with every process sitting on unnecessary
wait or sleep calls for perceived "optimization" purposes. Probe functions
run exactly once, and should be time optimized. You should have an idea
what the minimum reset hold time is, and follow it.
> But, as i said early, it's a trial optimization but can be instead with
> usleep_range(500, 1000).
>
> In some case, such optimization is helpful. I'd like to talk a story here,
> about before ten years, I pressed a return key in console, you know, in
> this case, a process be created and exited, so the cpu core that process
> run at sent an IPI to other CPU, IPI interrupt resulted in the performance
> decreased by 20%, so sad:)
>
It appears to be somewhat unlikely that each keypress resulted in a driver
being instantiated. If it did, a sleep in its probe function was the least
of your problems.
> Unless there is a H/W constraint requiring a delay between the
> > assert/deassert
> > of the WD, I don't think adding a wait operation (of any kind) make sense.
Correct.
Guenter
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-30 16:53 ` Guenter Roeck
0 siblings, 0 replies; 19+ messages in thread
From: Guenter Roeck @ 2017-01-30 16:53 UTC (permalink / raw)
To: Baoyou Xie
Cc: Mathieu Poirier, Jun Nie, wim-IQzOog9fTRqzQB+pC5nmwQ,
Rob Herring, Mark Rutland, linux-arm Mailing List,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou,
chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A,
wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A
On Fri, Jan 27, 2017 at 10:40:09AM +0800, Baoyou Xie wrote:
> On 27 January 2017 at 00:17, Mathieu Poirier <mathieu.poirier-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> wrote:
>
> > On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> > > On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
> > >
> > > wrote:
> > >
> > > > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > > > This patch adds watchdog controller driver for ZTE's zx2967 family.
> > > > >
> > > > > Signed-off-by: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > > > > ---
[ ... ]
> > > > > + reset_control_assert(rstc);
> > > > > + usleep_range(500, 20000);
> > > >
> > > > Alright, I'm officially confused.
> > > >
> > > > First and foremost you still haven't provided an explanation as to why
> > > > this is
> > > > required. Second, in your previous submission you had:
> > > >
> > > > mdelay(10);
> > > >
> > > > That is a busy loop of 10ms. In this post using usleep_range() is a
> > step
> > > > in the
> > > > right direction but the min and max values to wait for don't make
> > sense.
> > > > Here
> > > > you have 500 and 20000, which is 0.5ms and 20ms.
> > > >
> > > > In fact, sleeping for 0.5ms is enough.
> > > we extended the sleeping time to 20ms, the purpose is merging the timer
> > > interrupts. of course, it's happy to replace it with usleep_range(500,
> > > 1000).
> >
> > "merging the timer interrupts" - you mean trying to get the WD tick to be
> > closer
> > to other timers? If so I really don't see why. Timers are asynchronous by
> > nature and there can be dozens of them enabled at any given time.
> >
> > Really?
> Even if the system runs asynchronously, early process may trigger delayed
> process, for example delayed work queue or timers, we can merge our
> watchdog timer and those delayed work's timers.
>
In the probe function ?
> Furthermore, what happen if we build this driver as module?
>
If every driver writer would use that line of argument, booting would
take much longer than necessary, with every process sitting on unnecessary
wait or sleep calls for perceived "optimization" purposes. Probe functions
run exactly once, and should be time optimized. You should have an idea
what the minimum reset hold time is, and follow it.
> But, as i said early, it's a trial optimization but can be instead with
> usleep_range(500, 1000).
>
> In some case, such optimization is helpful. I'd like to talk a story here,
> about before ten years, I pressed a return key in console, you know, in
> this case, a process be created and exited, so the cpu core that process
> run at sent an IPI to other CPU, IPI interrupt resulted in the performance
> decreased by 20%, so sad:)
>
It appears to be somewhat unlikely that each keypress resulted in a driver
being instantiated. If it did, a sleep in its probe function was the least
of your problems.
> Unless there is a H/W constraint requiring a delay between the
> > assert/deassert
> > of the WD, I don't think adding a wait operation (of any kind) make sense.
Correct.
Guenter
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
@ 2017-01-30 16:53 ` Guenter Roeck
0 siblings, 0 replies; 19+ messages in thread
From: Guenter Roeck @ 2017-01-30 16:53 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 27, 2017 at 10:40:09AM +0800, Baoyou Xie wrote:
> On 27 January 2017 at 00:17, Mathieu Poirier <mathieu.poirier@linaro.org>
> wrote:
>
> > On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> > > On 26 January 2017 at 00:23, Mathieu Poirier <mathieu.poirier@linaro.org
> > >
> > > wrote:
> > >
> > > > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > > > This patch adds watchdog controller driver for ZTE's zx2967 family.
> > > > >
> > > > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > > > > ---
[ ... ]
> > > > > + reset_control_assert(rstc);
> > > > > + usleep_range(500, 20000);
> > > >
> > > > Alright, I'm officially confused.
> > > >
> > > > First and foremost you still haven't provided an explanation as to why
> > > > this is
> > > > required. Second, in your previous submission you had:
> > > >
> > > > mdelay(10);
> > > >
> > > > That is a busy loop of 10ms. In this post using usleep_range() is a
> > step
> > > > in the
> > > > right direction but the min and max values to wait for don't make
> > sense.
> > > > Here
> > > > you have 500 and 20000, which is 0.5ms and 20ms.
> > > >
> > > > In fact, sleeping for 0.5ms is enough.
> > > we extended the sleeping time to 20ms, the purpose is merging the timer
> > > interrupts. of course, it's happy to replace it with usleep_range(500,
> > > 1000).
> >
> > "merging the timer interrupts" - you mean trying to get the WD tick to be
> > closer
> > to other timers? If so I really don't see why. Timers are asynchronous by
> > nature and there can be dozens of them enabled at any given time.
> >
> > Really?
> Even if the system runs asynchronously, early process may trigger delayed
> process, for example delayed work queue or timers, we can merge our
> watchdog timer and those delayed work's timers.
>
In the probe function ?
> Furthermore, what happen if we build this driver as module?
>
If every driver writer would use that line of argument, booting would
take much longer than necessary, with every process sitting on unnecessary
wait or sleep calls for perceived "optimization" purposes. Probe functions
run exactly once, and should be time optimized. You should have an idea
what the minimum reset hold time is, and follow it.
> But, as i said early, it's a trial optimization but can be instead with
> usleep_range(500, 1000).
>
> In some case, such optimization is helpful. I'd like to talk a story here,
> about before ten years, I pressed a return key in console, you know, in
> this case, a process be created and exited, so the cpu core that process
> run at sent an IPI to other CPU, IPI interrupt resulted in the performance
> decreased by 20%, so sad:)
>
It appears to be somewhat unlikely that each keypress resulted in a driver
being instantiated. If it did, a sleep in its probe function was the least
of your problems.
> Unless there is a H/W constraint requiring a delay between the
> > assert/deassert
> > of the WD, I don't think adding a wait operation (of any kind) make sense.
Correct.
Guenter
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
2017-01-30 16:53 ` Guenter Roeck
(?)
(?)
@ 2017-02-01 3:29 ` Baoyou Xie
-1 siblings, 0 replies; 19+ messages in thread
From: Baoyou Xie @ 2017-02-01 3:29 UTC (permalink / raw)
To: Guenter Roeck
Cc: Mathieu Poirier, Jun Nie, wim, Rob Herring, Mark Rutland,
linux-arm Mailing List, linux-watchdog, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou, chen.chaokai,
wang.qiang01
[-- Attachment #1: Type: text/plain, Size: 3522 bytes --]
On 31 January 2017 at 00:53, Guenter Roeck <linux@roeck-us.net> wrote:
> On Fri, Jan 27, 2017 at 10:40:09AM +0800, Baoyou Xie wrote:
> > On 27 January 2017 at 00:17, Mathieu Poirier <mathieu.poirier@linaro.org
> >
> > wrote:
> >
> > > On Thu, Jan 26, 2017 at 09:32:56AM +0800, Baoyou Xie wrote:
> > > > On 26 January 2017 at 00:23, Mathieu Poirier <
> mathieu.poirier@linaro.org
> > > >
> > > > wrote:
> > > >
> > > > > On Wed, Jan 25, 2017 at 10:44:49AM +0800, Baoyou Xie wrote:
> > > > > > This patch adds watchdog controller driver for ZTE's zx2967
> family.
> > > > > >
> > > > > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > > > > > ---
> [ ... ]
> > > > > > + reset_control_assert(rstc);
> > > > > > + usleep_range(500, 20000);
> > > > >
> > > > > Alright, I'm officially confused.
> > > > >
> > > > > First and foremost you still haven't provided an explanation as to
> why
> > > > > this is
> > > > > required. Second, in your previous submission you had:
> > > > >
> > > > > mdelay(10);
> > > > >
> > > > > That is a busy loop of 10ms. In this post using usleep_range() is
> a
> > > step
> > > > > in the
> > > > > right direction but the min and max values to wait for don't make
> > > sense.
> > > > > Here
> > > > > you have 500 and 20000, which is 0.5ms and 20ms.
> > > > >
> > > > > In fact, sleeping for 0.5ms is enough.
> > > > we extended the sleeping time to 20ms, the purpose is merging the
> timer
> > > > interrupts. of course, it's happy to replace it with
> usleep_range(500,
> > > > 1000).
> > >
> > > "merging the timer interrupts" - you mean trying to get the WD tick to
> be
> > > closer
> > > to other timers? If so I really don't see why. Timers are
> asynchronous by
> > > nature and there can be dozens of them enabled at any given time.
> > >
> > > Really?
> > Even if the system runs asynchronously, early process may trigger delayed
> > process, for example delayed work queue or timers, we can merge our
> > watchdog timer and those delayed work's timers.
> >
> In the probe function ?
>
> > Furthermore, what happen if we build this driver as module?
> >
> If every driver writer would use that line of argument, booting would
> take much longer than necessary, with every process sitting on unnecessary
> wait or sleep calls for perceived "optimization" purposes. Probe functions
> run exactly once, and should be time optimized. You should have an idea
> what the minimum reset hold time is, and follow it.
>
> > But, as i said early, it's a trial optimization but can be instead with
> > usleep_range(500, 1000).
> >
> > In some case, such optimization is helpful. I'd like to talk a story
> here,
> > about before ten years, I pressed a return key in console, you know, in
> > this case, a process be created and exited, so the cpu core that process
> > run at sent an IPI to other CPU, IPI interrupt resulted in the
> performance
> > decreased by 20%, so sad:)
> >
> It appears to be somewhat unlikely that each keypress resulted in a driver
> being instantiated. If it did, a sleep in its probe function was the least
> of your problems.
>
> > Unless there is a H/W constraint requiring a delay between the
> > > assert/deassert
> > > of the WD, I don't think adding a wait operation (of any kind) make
> sense.
>
> Correct.
>
>
I have discussed with hardware and reset driver engineers, It's better to
place usleep_range call into reset driver, so we're happy to remove
usleep_range
here.
So, I will send a new patch that remove it.
> Guenter
>
[-- Attachment #2: Type: text/html, Size: 5287 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2017-02-01 3:29 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-25 2:44 [PATCH v6 1/3] dt: bindings: add documentation for zx2967 family watchdog controller Baoyou Xie
2017-01-25 2:44 ` Baoyou Xie
2017-01-25 2:44 ` [PATCH v6 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture Baoyou Xie
2017-01-25 2:44 ` Baoyou Xie
2017-01-25 2:44 ` Baoyou Xie
2017-01-25 2:44 ` [PATCH v6 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family Baoyou Xie
2017-01-25 2:44 ` Baoyou Xie
2017-01-25 2:44 ` Baoyou Xie
2017-01-25 16:23 ` Mathieu Poirier
2017-01-25 16:23 ` Mathieu Poirier
2017-01-26 1:32 ` Baoyou Xie
2017-01-26 16:17 ` Mathieu Poirier
2017-01-26 16:17 ` Mathieu Poirier
2017-01-26 16:17 ` Mathieu Poirier
2017-01-27 2:40 ` Baoyou Xie
2017-01-30 16:53 ` Guenter Roeck
2017-01-30 16:53 ` Guenter Roeck
2017-01-30 16:53 ` Guenter Roeck
2017-02-01 3:29 ` Baoyou Xie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.