* [PATCH v3 0/2] watchdog: Add support for ImgTec PowerDown Controller Watchdog Timer
@ 2014-11-18 12:07 Naidu.Tellapati
2014-11-18 12:07 ` [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver Naidu.Tellapati
2014-11-18 12:07 ` [PATCH v3 2/2] DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation Naidu.Tellapati
0 siblings, 2 replies; 8+ messages in thread
From: Naidu.Tellapati @ 2014-11-18 12:07 UTC (permalink / raw)
To: wim, linux, James.Hartley, abrestic, Ezequiel.Garcia
Cc: linux-watchdog, devicetree, Jude.Abraham, Naidu Tellapati
From: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
This patchset provides support for the PowerDown Controller (PDC) Watchdog Timer
found on Pistachio SOC from Imagination Technologies (ImgTec).
The series is based on 3.18-rc4.
Changes from v2:
* Removed interrupt.h header file.
* Removed clock rate-change notifier callback.
Changes from v1:
* Arranged all include files in alphabetical order.
* Arranged register field masks/shifts defines next to their
corresponding register
* Registered clock rate-change notifier callback.
* Removed all references to 32 kHz fixed clock rate.
Now the clock rate is read dynamically using clk_get_rate().
* Defined a macro PDC_WD_CONFIG_ENABLE.
* Added code for getting system clock.
* Moved module_param stuffs next to the corresponding variable defines.
* Added code in the function pdc_wdt_remove for stopping watchdog.
* Removed MODULE_ALIAS.
* Removed few unwanted spaces and unwanted blank lines.
Naidu Tellapati (2):
watchdog: ImgTec PDC Watchdog Timer Driver
DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation
.../devicetree/bindings/watchdog/imgpdc-wdt.txt | 18 ++
drivers/watchdog/Kconfig | 11 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/imgpdc_wdt.c | 311 ++++++++++++++++++++
4 files changed, 341 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt
create mode 100644 drivers/watchdog/imgpdc_wdt.c
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver
2014-11-18 12:07 [PATCH v3 0/2] watchdog: Add support for ImgTec PowerDown Controller Watchdog Timer Naidu.Tellapati
@ 2014-11-18 12:07 ` Naidu.Tellapati
2014-11-18 23:06 ` Andrew Bresticker
2014-11-18 23:12 ` Andrew Bresticker
2014-11-18 12:07 ` [PATCH v3 2/2] DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation Naidu.Tellapati
1 sibling, 2 replies; 8+ messages in thread
From: Naidu.Tellapati @ 2014-11-18 12:07 UTC (permalink / raw)
To: wim, linux, James.Hartley, abrestic, Ezequiel.Garcia
Cc: linux-watchdog, devicetree, Jude.Abraham, Naidu Tellapati
From: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
This commit adds support for ImgTec PowerDown Controller Watchdog Timer.
Signed-off-by: Jude Abraham <Jude.Abraham@imgtec.com>
Signed-off-by: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
---
drivers/watchdog/Kconfig | 11 ++
drivers/watchdog/Makefile | 1 +
drivers/watchdog/imgpdc_wdt.c | 311 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 323 insertions(+), 0 deletions(-)
create mode 100644 drivers/watchdog/imgpdc_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d0107d4..a184f23 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1235,6 +1235,17 @@ config BCM_KONA_WDT_DEBUG
If in doubt, say 'N'.
+config IMGPDC_WDT
+ tristate "Imagination Technologies PDC Watchdog Timer"
+ depends on HAS_IOMEM
+ depends on METAG || MIPS || COMPILE_TEST
+ help
+ Driver for Imagination Technologies PowerDown Controller
+ Watchdog Timer.
+
+ To compile this driver as a loadable module, choose M here.
+ The module will be called imgpdc_wdt.
+
config LANTIQ_WDT
tristate "Lantiq SoC watchdog"
depends on LANTIQ
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index c569ec8..d4dfbb4 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -142,6 +142,7 @@ obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
obj-$(CONFIG_RALINK_WDT) += rt2880_wdt.o
+obj-$(CONFIG_IMGPDC_WDT) += imgpdc_wdt.o
# PARISC Architecture
diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c
new file mode 100644
index 0000000..aeee05a
--- /dev/null
+++ b/drivers/watchdog/imgpdc_wdt.c
@@ -0,0 +1,311 @@
+/*
+ * Imagination Technologies PowerDown Controller Watchdog Timer.
+ *
+ * Copyright (c) 2014 Imagination Technologies Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * Based on drivers/watchdog/sunxi_wdt.c Copyright (c) 2013 Carlo Caione
+ * 2012 Henrik Nordstrom
+ */
+
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/watchdog.h>
+
+/* registers */
+#define PDC_WD_SW_RESET 0x000
+
+#define PDC_WD_CONFIG 0x004
+#define PDC_WD_MAX_DELAY 31 /* 4:0 bits */
+#define PDC_WD_CONFIG_ENABLE BIT(31)
+#define PDC_WD_CONFIG_DELAY_MASK 0x0000001f
+#define PDC_WD_CONFIG_DELAY_SHIFT 0
+
+#define PDC_WD_TICKLE1 0x008
+#define PDC_WD_TICKLE1_MAGIC 0xabcd1234
+
+#define PDC_WD_TICKLE2 0x00c
+#define PDC_WD_TICKLE2_MAGIC 0x4321dcba
+
+#define PDC_WD_TICKLE_STATUS_MASK 0x00000007
+#define PDC_WD_TICKLE_STATUS_SHIFT 0
+#define PDC_WD_TICKLE_STATUS_HRESET 0x0 /* Hard reset */
+#define PDC_WD_TICKLE_STATUS_TIMEOUT 0x1 /* Timeout */
+#define PDC_WD_TICKLE_STATUS_TICKLE 0x2 /* Tickled incorrectly */
+#define PDC_WD_TICKLE_STATUS_SRESET 0x3 /* Soft reset */
+#define PDC_WD_TICKLE_STATUS_USER 0x4 /* User reset */
+
+#define PDC_WD_MAX_CLK_RATE 50000000U
+
+/* timeout in seconds */
+#define PDC_WD_MIN_TIMEOUT 1
+#define PDC_WD_DEFAULT_TIMEOUT 64
+
+static int timeout = PDC_WD_DEFAULT_TIMEOUT;
+module_param(timeout, int, 0);
+MODULE_PARM_DESC(timeout, "PDC watchdog delay in seconds (default 64s)");
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
+
+struct pdc_wdt_dev {
+ struct device *dev;
+ struct watchdog_device wdt_dev;
+ struct clk *wdt_clk;
+ struct clk *sys_clk;
+ unsigned long clk_rate;
+ unsigned int min_delay;
+ void __iomem *base;
+ spinlock_t lock;
+};
+
+static int pdc_wdt_keepalive(struct watchdog_device *wdt_dev)
+{
+ struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+
+ spin_lock(&wdt->lock);
+ writel(PDC_WD_TICKLE1_MAGIC, wdt->base + PDC_WD_TICKLE1);
+ writel(PDC_WD_TICKLE2_MAGIC, wdt->base + PDC_WD_TICKLE2);
+ spin_unlock(&wdt->lock);
+
+ return 0;
+}
+
+static int pdc_wdt_stop(struct watchdog_device *wdt_dev)
+{
+ unsigned int val;
+ struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+
+ spin_lock(&wdt->lock);
+ val = readl(wdt->base + PDC_WD_CONFIG);
+ val &= ~PDC_WD_CONFIG_ENABLE;
+ writel(val, wdt->base + PDC_WD_CONFIG);
+ spin_unlock(&wdt->lock);
+
+ /* Must tickle to finish the stop */
+ pdc_wdt_keepalive(wdt_dev);
+
+ return 0;
+}
+
+static int pdc_wdt_set_timeout(struct watchdog_device *wdt_dev,
+ unsigned int new_timeout)
+{
+ unsigned int val;
+ struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+
+ if (new_timeout < wdt->wdt_dev.min_timeout ||
+ new_timeout > wdt->wdt_dev.max_timeout)
+ return -EINVAL;
+
+ spin_lock(&wdt->lock);
+ wdt->wdt_dev.timeout = new_timeout;
+ /* round up to the next power of 2 */
+ new_timeout = order_base_2(new_timeout);
+ val = readl(wdt->base + PDC_WD_CONFIG);
+ val &= ~(PDC_WD_CONFIG_DELAY_MASK << PDC_WD_CONFIG_DELAY_SHIFT);
+ val |= (new_timeout + wdt->min_delay);
+ writel(val, wdt->base + PDC_WD_CONFIG);
+ spin_unlock(&wdt->lock);
+
+ return 0;
+}
+
+/* Start the watchdog timer (delay should already be set */
+static int pdc_wdt_start(struct watchdog_device *wdt_dev)
+{
+ unsigned int val;
+ struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+
+ spin_lock(&wdt->lock);
+ val = readl(wdt->base + PDC_WD_CONFIG);
+ val |= PDC_WD_CONFIG_ENABLE;
+ writel(val, wdt->base + PDC_WD_CONFIG);
+ spin_unlock(&wdt->lock);
+
+ return 0;
+}
+
+static struct watchdog_info pdc_wdt_info = {
+ .options = WDIOF_SETTIMEOUT |
+ WDIOF_KEEPALIVEPING |
+ WDIOF_MAGICCLOSE,
+ .identity = "PDC Watchdog",
+};
+
+/* Kernel interface */
+static const struct watchdog_ops pdc_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = pdc_wdt_start,
+ .stop = pdc_wdt_stop,
+ .ping = pdc_wdt_keepalive,
+ .set_timeout = pdc_wdt_set_timeout,
+};
+
+static int pdc_wdt_probe(struct platform_device *pdev)
+{
+ int ret, val;
+ struct resource *res;
+ struct pdc_wdt_dev *pdc_wdt;
+
+ pdc_wdt = devm_kzalloc(&pdev->dev, sizeof(*pdc_wdt), GFP_KERNEL);
+ if (!pdc_wdt)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ pdc_wdt->base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(pdc_wdt->base))
+ return PTR_ERR(pdc_wdt->base);
+
+ pdc_wdt->sys_clk = devm_clk_get(&pdev->dev, "sys");
+ if (IS_ERR(pdc_wdt->sys_clk)) {
+ dev_err(&pdev->dev, "failed to get the sys clock.\n");
+ ret = PTR_ERR(pdc_wdt->wdt_clk);
+ goto out_wdt;
+ }
+
+ spin_lock_init(&pdc_wdt->lock);
+
+ pdc_wdt->wdt_clk = devm_clk_get(&pdev->dev, "wdt");
+ if (IS_ERR(pdc_wdt->wdt_clk)) {
+ dev_err(&pdev->dev, "failed to get the wdt clock.\n");
+ ret = PTR_ERR(pdc_wdt->wdt_clk);
+ goto out_wdt;
+ }
+
+ ret = clk_prepare_enable(pdc_wdt->sys_clk);
+ if (ret) {
+ dev_err(&pdev->dev, "could not prepare or enable sys clock.\n");
+ goto out_wdt;
+ }
+
+ ret = clk_prepare_enable(pdc_wdt->wdt_clk);
+ if (ret) {
+ dev_err(&pdev->dev, "could not prepare or enable wdt clock.\n");
+ goto disable_sys_clk;
+ }
+ /* We use the clock rate to calculate the max timeout */
+ pdc_wdt->clk_rate = clk_get_rate(pdc_wdt->wdt_clk);
+ if (pdc_wdt->clk_rate < 1 || pdc_wdt->clk_rate > PDC_WD_MAX_CLK_RATE) {
+ dev_err(&pdev->dev, "invalid clock rate\n");
+ ret = -EINVAL;
+ goto disable_wdt_clk;
+ }
+
+ if (order_base_2(pdc_wdt->clk_rate) == 0)
+ pdc_wdt->min_delay = 0;
+ else
+ pdc_wdt->min_delay = order_base_2(pdc_wdt->clk_rate) - 1;
+
+ pdc_wdt->wdt_dev.info = &pdc_wdt_info;
+ pdc_wdt->wdt_dev.ops = &pdc_wdt_ops;
+ pdc_wdt->wdt_dev.min_timeout = PDC_WD_MIN_TIMEOUT;
+ pdc_wdt->wdt_dev.max_timeout =
+ (1 << (PDC_WD_MAX_DELAY - pdc_wdt->min_delay));
+ pdc_wdt->wdt_dev.parent = &pdev->dev;
+ pdc_wdt->dev = &pdev->dev;
+
+ ret = watchdog_init_timeout(&pdc_wdt->wdt_dev, timeout, &pdev->dev);
+ if (ret < 0)
+ pdc_wdt->wdt_dev.timeout = pdc_wdt->wdt_dev.max_timeout;
+
+ pdc_wdt_stop(&pdc_wdt->wdt_dev);
+ /* Set timeouts before userland has a chance to start the timer */
+ pdc_wdt_set_timeout(&pdc_wdt->wdt_dev, pdc_wdt->wdt_dev.timeout);
+
+ /* Find what caused the last reset */
+ val = readl(pdc_wdt->base + PDC_WD_TICKLE1);
+ val = (val & PDC_WD_TICKLE_STATUS_MASK) >> PDC_WD_TICKLE_STATUS_SHIFT;
+ switch (val) {
+ case PDC_WD_TICKLE_STATUS_TICKLE:
+ case PDC_WD_TICKLE_STATUS_TIMEOUT:
+ pdc_wdt->wdt_dev.bootstatus |= WDIOF_CARDRESET;
+ dev_info(&pdev->dev,
+ "watchdog module last reset due to timeout\n");
+ break;
+ case PDC_WD_TICKLE_STATUS_HRESET:
+ dev_info(&pdev->dev,
+ "watchdog module last reset due to hard reset\n");
+ break;
+ case PDC_WD_TICKLE_STATUS_SRESET:
+ dev_info(&pdev->dev,
+ "watchdog module last reset due to soft reset\n");
+ break;
+ case PDC_WD_TICKLE_STATUS_USER:
+ dev_info(&pdev->dev,
+ "watchdog module last reset due to user reset\n");
+ break;
+ default:
+ dev_info(&pdev->dev,
+ "contains an illegal status code (%08x)\n", val);
+ break;
+ }
+
+ watchdog_set_nowayout(&pdc_wdt->wdt_dev, nowayout);
+
+ platform_set_drvdata(pdev, pdc_wdt);
+ watchdog_set_drvdata(&pdc_wdt->wdt_dev, pdc_wdt);
+
+ ret = watchdog_register_device(&pdc_wdt->wdt_dev);
+ if (ret)
+ goto disable_wdt_clk;
+
+ return 0;
+
+disable_wdt_clk:
+ clk_disable_unprepare(pdc_wdt->wdt_clk);
+disable_sys_clk:
+ clk_disable_unprepare(pdc_wdt->sys_clk);
+out_wdt:
+ return ret;
+}
+
+static void pdc_wdt_shutdown(struct platform_device *pdev)
+{
+ struct pdc_wdt_dev *pdc_wdt = platform_get_drvdata(pdev);
+
+ pdc_wdt_stop(&pdc_wdt->wdt_dev);
+}
+
+static int pdc_wdt_remove(struct platform_device *pdev)
+{
+ struct pdc_wdt_dev *pdc_wdt = platform_get_drvdata(pdev);
+
+ pdc_wdt_shutdown(pdev);
+ watchdog_unregister_device(&pdc_wdt->wdt_dev);
+ clk_disable_unprepare(pdc_wdt->wdt_clk);
+ clk_disable_unprepare(pdc_wdt->sys_clk);
+
+ return 0;
+}
+
+
+static const struct of_device_id pdc_wdt_match[] = {
+ { .compatible = "img,pdc-wdt" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, pdc_wdt_match);
+
+static struct platform_driver pdc_wdt_driver = {
+ .driver = {
+ .name = "imgpdc-wdt",
+ .of_match_table = pdc_wdt_match,
+ },
+ .probe = pdc_wdt_probe,
+ .remove = pdc_wdt_remove,
+ .shutdown = pdc_wdt_shutdown,
+};
+module_platform_driver(pdc_wdt_driver);
+
+MODULE_AUTHOR("Jude Abraham <Jude.Abraham@imgtec.com>");
+MODULE_AUTHOR("Naidu Tellapati <Naidu.Tellapati@imgtec.com>");
+MODULE_DESCRIPTION("Imagination Technologies PDC Watchdog Timer Driver");
+MODULE_LICENSE("GPL v2");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/2] DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation
2014-11-18 12:07 [PATCH v3 0/2] watchdog: Add support for ImgTec PowerDown Controller Watchdog Timer Naidu.Tellapati
2014-11-18 12:07 ` [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver Naidu.Tellapati
@ 2014-11-18 12:07 ` Naidu.Tellapati
1 sibling, 0 replies; 8+ messages in thread
From: Naidu.Tellapati @ 2014-11-18 12:07 UTC (permalink / raw)
To: wim, linux, James.Hartley, abrestic, Ezequiel.Garcia
Cc: linux-watchdog, devicetree, Jude.Abraham, Naidu Tellapati
From: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
Add the devicetree binding document for ImgTec PDC Watchdog Timer.
Signed-off-by: Jude Abraham <Jude.Abraham@imgtec.com>
Signed-off-by: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
Reviewed-by: Andrew Bresticker <abrestic@chromium.org>
---
No changes from v2.
---
.../devicetree/bindings/watchdog/imgpdc-wdt.txt | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt b/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt
new file mode 100644
index 0000000..2f9ba77
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt
@@ -0,0 +1,18 @@
+*ImgTec PowerDown Controller (PDC) Watchdog Timer (WDT)
+
+Required properties:
+- compatible : Should be "img,pdc-wdt"
+- reg : Should contain WDT registers location and length
+- clocks: Must contain an entry for each entry in clock-names.
+- clock-names: Should contain "wdt" and "sys"
+- interrupts : Should contain WDT interrupt
+
+Examples:
+
+wdt@18102100 {
+ compatible = "img,pdc-wdt";
+ reg = <0x18102100 0x100>;
+ clocks = <&pdc_wdt_clk>, <&sys_clk>;
+ clock-names = "wdt", "sys";
+ interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>;
+};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver
2014-11-18 12:07 ` [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver Naidu.Tellapati
@ 2014-11-18 23:06 ` Andrew Bresticker
2014-11-18 23:12 ` Andrew Bresticker
1 sibling, 0 replies; 8+ messages in thread
From: Andrew Bresticker @ 2014-11-18 23:06 UTC (permalink / raw)
To: Naidu Tellapati
Cc: wim@iguana.be, linux@roeck-us.net, James Hartley, Ezequiel Garcia,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
Jude Abraham
Naidu,
On Tue, Nov 18, 2014 at 4:07 AM, <Naidu.Tellapati@imgtec.com> wrote:
> From: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
>
> This commit adds support for ImgTec PowerDown Controller Watchdog Timer.
>
> Signed-off-by: Jude Abraham <Jude.Abraham@imgtec.com>
> Signed-off-by: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
Almost there, just a couple of comments:
> --- /dev/null
> +++ b/drivers/watchdog/imgpdc_wdt.c
> +#define PDC_WD_CONFIG 0x004
> +#define PDC_WD_MAX_DELAY 31 /* 4:0 bits */
> +#define PDC_WD_CONFIG_ENABLE BIT(31)
> +#define PDC_WD_CONFIG_DELAY_MASK 0x0000001f
PDC_WD_MAX_DELAY and PDC_WD_CONFIG_DELAY_MASK are the same thing -
just pick one (probably PDC_WD_CONFIG_DELAY_MASK).
> +struct pdc_wdt_dev {
> + struct device *dev;
> + struct watchdog_device wdt_dev;
> + struct clk *wdt_clk;
> + struct clk *sys_clk;
> + unsigned long clk_rate;
> + unsigned int min_delay;
> + void __iomem *base;
> + spinlock_t lock;
Now that there's no clock notifier, I don't think you need this
spinlock anymore.
> +static int pdc_wdt_set_timeout(struct watchdog_device *wdt_dev,
> + unsigned int new_timeout)
> +{
> + unsigned int val;
> + struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
> +
> + if (new_timeout < wdt->wdt_dev.min_timeout ||
> + new_timeout > wdt->wdt_dev.max_timeout)
> + return -EINVAL;
The watchdog core already does this check for us.
> + spin_lock(&wdt->lock);
> + wdt->wdt_dev.timeout = new_timeout;
> + /* round up to the next power of 2 */
> + new_timeout = order_base_2(new_timeout);
> + val = readl(wdt->base + PDC_WD_CONFIG);
> + val &= ~(PDC_WD_CONFIG_DELAY_MASK << PDC_WD_CONFIG_DELAY_SHIFT);
> + val |= (new_timeout + wdt->min_delay);
This should be shifted by PDC_WD_CONFIG_DELAY_SHIFT.
> +static struct watchdog_info pdc_wdt_info = {
> + .options = WDIOF_SETTIMEOUT |
> + WDIOF_KEEPALIVEPING |
> + WDIOF_MAGICCLOSE,
> + .identity = "PDC Watchdog",
Maybe "IMG PDC Watchdog"?
> +static int pdc_wdt_probe(struct platform_device *pdev)
> +{
> + int ret, val;
> + struct resource *res;
> + struct pdc_wdt_dev *pdc_wdt;
> +
> + pdc_wdt = devm_kzalloc(&pdev->dev, sizeof(*pdc_wdt), GFP_KERNEL);
> + if (!pdc_wdt)
> + return -ENOMEM;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + pdc_wdt->base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(pdc_wdt->base))
> + return PTR_ERR(pdc_wdt->base);
> +
> + pdc_wdt->sys_clk = devm_clk_get(&pdev->dev, "sys");
> + if (IS_ERR(pdc_wdt->sys_clk)) {
> + dev_err(&pdev->dev, "failed to get the sys clock.\n");
> + ret = PTR_ERR(pdc_wdt->wdt_clk);
> + goto out_wdt;
> + }
> +
> + spin_lock_init(&pdc_wdt->lock);
> +
> + pdc_wdt->wdt_clk = devm_clk_get(&pdev->dev, "wdt");
> + if (IS_ERR(pdc_wdt->wdt_clk)) {
> + dev_err(&pdev->dev, "failed to get the wdt clock.\n");
> + ret = PTR_ERR(pdc_wdt->wdt_clk);
> + goto out_wdt;
> + }
> +
> + ret = clk_prepare_enable(pdc_wdt->sys_clk);
> + if (ret) {
> + dev_err(&pdev->dev, "could not prepare or enable sys clock.\n");
> + goto out_wdt;
> + }
> +
> + ret = clk_prepare_enable(pdc_wdt->wdt_clk);
> + if (ret) {
> + dev_err(&pdev->dev, "could not prepare or enable wdt clock.\n");
> + goto disable_sys_clk;
> + }
> + /* We use the clock rate to calculate the max timeout */
> + pdc_wdt->clk_rate = clk_get_rate(pdc_wdt->wdt_clk);
> + if (pdc_wdt->clk_rate < 1 || pdc_wdt->clk_rate > PDC_WD_MAX_CLK_RATE) {
> + dev_err(&pdev->dev, "invalid clock rate\n");
> + ret = -EINVAL;
> + goto disable_wdt_clk;
> + }
Does a maximum rate really need to be enforced? I know rates greater
than 50Mhz aren't recommended, but I believe you can still configure
the clock controller to do so.
The check for a clock rate of 0 is fine - that would indicate that
clk_get_rate() failed to get the rate.
> + if (order_base_2(pdc_wdt->clk_rate) == 0)
> + pdc_wdt->min_delay = 0;
> + else
> + pdc_wdt->min_delay = order_base_2(pdc_wdt->clk_rate) - 1;
> +
> + pdc_wdt->wdt_dev.info = &pdc_wdt_info;
> + pdc_wdt->wdt_dev.ops = &pdc_wdt_ops;
> + pdc_wdt->wdt_dev.min_timeout = PDC_WD_MIN_TIMEOUT;
> + pdc_wdt->wdt_dev.max_timeout =
> + (1 << (PDC_WD_MAX_DELAY - pdc_wdt->min_delay));
> + pdc_wdt->wdt_dev.parent = &pdev->dev;
> + pdc_wdt->dev = &pdev->dev;
> +
> + ret = watchdog_init_timeout(&pdc_wdt->wdt_dev, timeout, &pdev->dev);
> + if (ret < 0)
> + pdc_wdt->wdt_dev.timeout = pdc_wdt->wdt_dev.max_timeout;
> +
> + pdc_wdt_stop(&pdc_wdt->wdt_dev);
> + /* Set timeouts before userland has a chance to start the timer */
> + pdc_wdt_set_timeout(&pdc_wdt->wdt_dev, pdc_wdt->wdt_dev.timeout);
The stop() is fine, but I don't think it's necessary to set the timeout.
> +static int pdc_wdt_remove(struct platform_device *pdev)
> +{
> + struct pdc_wdt_dev *pdc_wdt = platform_get_drvdata(pdev);
> +
> + pdc_wdt_shutdown(pdev);
Just call pdc_wdt_stop() directly.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver
2014-11-18 12:07 ` [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver Naidu.Tellapati
2014-11-18 23:06 ` Andrew Bresticker
@ 2014-11-18 23:12 ` Andrew Bresticker
2014-11-19 19:27 ` Ezequiel Garcia
1 sibling, 1 reply; 8+ messages in thread
From: Andrew Bresticker @ 2014-11-18 23:12 UTC (permalink / raw)
To: Naidu Tellapati
Cc: wim@iguana.be, linux@roeck-us.net, James Hartley, Ezequiel Garcia,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
Jude Abraham
Naidu,
On Tue, Nov 18, 2014 at 4:07 AM, <Naidu.Tellapati@imgtec.com> wrote:
> From: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
>
> This commit adds support for ImgTec PowerDown Controller Watchdog Timer.
>
> Signed-off-by: Jude Abraham <Jude.Abraham@imgtec.com>
> Signed-off-by: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
checkpatch reports that there's trailing whitespace and that you're
using DOS line endings. Please be sure to fix that with this and your
other patches.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver
2014-11-18 23:12 ` Andrew Bresticker
@ 2014-11-19 19:27 ` Ezequiel Garcia
2014-11-19 19:35 ` Andrew Bresticker
0 siblings, 1 reply; 8+ messages in thread
From: Ezequiel Garcia @ 2014-11-19 19:27 UTC (permalink / raw)
To: Andrew Bresticker, Naidu Tellapati
Cc: wim@iguana.be, linux@roeck-us.net, James Hartley,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
Jude Abraham
On 11/18/2014 08:12 PM, Andrew Bresticker wrote:
> Naidu,
>
> On Tue, Nov 18, 2014 at 4:07 AM, <Naidu.Tellapati@imgtec.com> wrote:
>> From: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
>>
>> This commit adds support for ImgTec PowerDown Controller Watchdog Timer.
>>
>> Signed-off-by: Jude Abraham <Jude.Abraham@imgtec.com>
>> Signed-off-by: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
>
> checkpatch reports that there's trailing whitespace and that you're
> using DOS line endings. Please be sure to fix that with this and your
> other patches.
>
Andrew,
Saving this patch with mutt as mbox and running checkpatch on it,
doesn't report any problems with it.
Maybe it's your client?
--
Ezequiel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver
2014-11-19 19:27 ` Ezequiel Garcia
@ 2014-11-19 19:35 ` Andrew Bresticker
2014-11-19 19:41 ` Naidu Tellapati
0 siblings, 1 reply; 8+ messages in thread
From: Andrew Bresticker @ 2014-11-19 19:35 UTC (permalink / raw)
To: Ezequiel Garcia
Cc: Naidu Tellapati, wim@iguana.be, linux@roeck-us.net, James Hartley,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
Jude Abraham
On Wed, Nov 19, 2014 at 11:27 AM, Ezequiel Garcia
<ezequiel.garcia@imgtec.com> wrote:
>
>
> On 11/18/2014 08:12 PM, Andrew Bresticker wrote:
>> Naidu,
>>
>> On Tue, Nov 18, 2014 at 4:07 AM, <Naidu.Tellapati@imgtec.com> wrote:
>>> From: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
>>>
>>> This commit adds support for ImgTec PowerDown Controller Watchdog Timer.
>>>
>>> Signed-off-by: Jude Abraham <Jude.Abraham@imgtec.com>
>>> Signed-off-by: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
>>
>> checkpatch reports that there's trailing whitespace and that you're
>> using DOS line endings. Please be sure to fix that with this and your
>> other patches.
>>
>
> Andrew,
>
> Saving this patch with mutt as mbox and running checkpatch on it,
> doesn't report any problems with it.
>
> Maybe it's your client?
Oops, yes, you're right - my gmail settings have gotten screwed up somehow...
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver
2014-11-19 19:35 ` Andrew Bresticker
@ 2014-11-19 19:41 ` Naidu Tellapati
0 siblings, 0 replies; 8+ messages in thread
From: Naidu Tellapati @ 2014-11-19 19:41 UTC (permalink / raw)
To: Andrew Bresticker, Ezequiel Garcia
Cc: wim@iguana.be, linux@roeck-us.net, James Hartley,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
Jude Abraham
Hi Andrew & Ezequiel,
>>>>
>>>> Signed-off-by: Jude Abraham <Jude.Abraham@imgtec.com>
>>>> Signed-off-by: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
>>>
>>> checkpatch reports that there's trailing whitespace and that you're
>>> using DOS line endings. Please be sure to fix that with this and your
>>> other patches.
>>>
>>
>> Andrew,
>>
>> Saving this patch with mutt as mbox and running checkpatch on it,
>> doesn't report any problems with it.
>>
>> Maybe it's your client?
> Oops, yes, you're right - my gmail settings have gotten screwed up somehow...
I am little relieved now. It was a day of experimentation with my mail clients today.
Thanks and regards,
Naidu.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-11-19 19:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-18 12:07 [PATCH v3 0/2] watchdog: Add support for ImgTec PowerDown Controller Watchdog Timer Naidu.Tellapati
2014-11-18 12:07 ` [PATCH v3 1/2] watchdog: ImgTec PDC Watchdog Timer Driver Naidu.Tellapati
2014-11-18 23:06 ` Andrew Bresticker
2014-11-18 23:12 ` Andrew Bresticker
2014-11-19 19:27 ` Ezequiel Garcia
2014-11-19 19:35 ` Andrew Bresticker
2014-11-19 19:41 ` Naidu Tellapati
2014-11-18 12:07 ` [PATCH v3 2/2] DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation Naidu.Tellapati
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox