* [PATCH v2 0/2] watchdog: Add Nuvoton NPCM (Poleg) driver @ 2018-03-05 11:45 Joel Stanley 2018-03-05 11:45 ` [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description Joel Stanley 2018-03-05 11:45 ` [PATCH v2 2/2] watchdog: Add Nuvoton NPCM watchdog driver Joel Stanley 0 siblings, 2 replies; 6+ messages in thread From: Joel Stanley @ 2018-03-05 11:45 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Mark Rutland, Marcus Folkesson Cc: linux-watchdog, devicetree, linux-kernel, Tomer Maimon, Avi Fishman, Brendan Higgins v2: Address comments from Guenter and Marcus This is a driver for the Poleg board that is in the process of being upstreamed. I have tested it on an evaluation board. The watchdog is a single register inside of the timer IP. This made me think about how to describe the device tree bindings for a while, but after some discussion I settled on describing the watchdog separately, and giving it's own compatible string, and it's own driver. The timer is being reviewed over here: https://lkml.org/lkml/2018/2/26/492 Joel Stanley (2): dt-bindings: watchdog: Add Nuvoton NPCM description watchdog: Add Nuvoton NPCM watchdog driver .../bindings/watchdog/nuvoton,npcm-wdt.txt | 28 +++ drivers/watchdog/Kconfig | 11 + drivers/watchdog/Makefile | 1 + drivers/watchdog/npcm_wdt.c | 230 +++++++++++++++++++++ 4 files changed, 270 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt create mode 100644 drivers/watchdog/npcm_wdt.c -- 2.15.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description 2018-03-05 11:45 [PATCH v2 0/2] watchdog: Add Nuvoton NPCM (Poleg) driver Joel Stanley @ 2018-03-05 11:45 ` Joel Stanley 2018-03-07 22:29 ` Rob Herring 2018-03-08 7:46 ` Tomer Maimon 2018-03-05 11:45 ` [PATCH v2 2/2] watchdog: Add Nuvoton NPCM watchdog driver Joel Stanley 1 sibling, 2 replies; 6+ messages in thread From: Joel Stanley @ 2018-03-05 11:45 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Mark Rutland, Marcus Folkesson Cc: linux-watchdog, devicetree, linux-kernel, Tomer Maimon, Avi Fishman, Brendan Higgins These bindings describe the watchdog IP as used by the Nuvoton NPCM750 (Poleg) BMC SoC. Signed-off-by: Joel Stanley <joel@jms.id.au> --- V2: Add optional timeout property --- .../bindings/watchdog/nuvoton,npcm-wdt.txt | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt diff --git a/Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt b/Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt new file mode 100644 index 000000000000..615eacd0b9d6 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt @@ -0,0 +1,28 @@ +Nuvoton NPCM Watchdog + +Nuvoton NPCM timer module provides five 24-bit timer counters, and a watchdog. +The watchdog supports a pre-timeout interrupt that fires 10ms before the +expiry. + +Required properties: +- compatible : "nuvoton,npcm750-wdt" for NPCM750 (Poleg). +- reg : Offset and length of the register set for the device. +- interrupts : Contain the timer interrupt with flags for + falling edge. + +Required clocking property, have to be one of: +- clocks : phandle of timer reference clock. +- clock-frequency : The frequency in Hz of the clock that drives the NPCM7xx + timer (usually 25000000). + +Optional properties: +- timeout-sec : Contains the watchdog timeout in seconds + +Example: + +timer@f00080c1 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; + reg = <0xf00080c1 0x4>; + clocks = <&clk NPCM7XX_CLK_TIMER>; +}; -- 2.15.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description 2018-03-05 11:45 ` [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description Joel Stanley @ 2018-03-07 22:29 ` Rob Herring 2018-03-08 7:46 ` Tomer Maimon 1 sibling, 0 replies; 6+ messages in thread From: Rob Herring @ 2018-03-07 22:29 UTC (permalink / raw) To: Joel Stanley Cc: Wim Van Sebroeck, Guenter Roeck, Mark Rutland, Marcus Folkesson, linux-watchdog, devicetree, linux-kernel, Tomer Maimon, Avi Fishman, Brendan Higgins On Mon, Mar 05, 2018 at 10:15:40PM +1030, Joel Stanley wrote: > These bindings describe the watchdog IP as used by the Nuvoton NPCM750 > (Poleg) BMC SoC. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > V2: Add optional timeout property > --- > .../bindings/watchdog/nuvoton,npcm-wdt.txt | 28 ++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > create mode 100644 Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description 2018-03-05 11:45 ` [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description Joel Stanley 2018-03-07 22:29 ` Rob Herring @ 2018-03-08 7:46 ` Tomer Maimon 1 sibling, 0 replies; 6+ messages in thread From: Tomer Maimon @ 2018-03-08 7:46 UTC (permalink / raw) To: Joel Stanley Cc: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Mark Rutland, Marcus Folkesson, linux-watchdog, devicetree, Linux Kernel Mailing List, Avi Fishman, Brendan Higgins On 5 March 2018 at 13:45, Joel Stanley <joel@jms.id.au> wrote: > These bindings describe the watchdog IP as used by the Nuvoton NPCM750 > (Poleg) BMC SoC. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > V2: Add optional timeout property > --- > .../bindings/watchdog/nuvoton,npcm-wdt.txt | 28 ++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > create mode 100644 Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt b/Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt > new file mode 100644 > index 000000000000..615eacd0b9d6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt > @@ -0,0 +1,28 @@ > +Nuvoton NPCM Watchdog > + > +Nuvoton NPCM timer module provides five 24-bit timer counters, and a watchdog. > +The watchdog supports a pre-timeout interrupt that fires 10ms before the > +expiry. > + > +Required properties: > +- compatible : "nuvoton,npcm750-wdt" for NPCM750 (Poleg). > +- reg : Offset and length of the register set for the device. > +- interrupts : Contain the timer interrupt with flags for > + falling edge. > + > +Required clocking property, have to be one of: > +- clocks : phandle of timer reference clock. > +- clock-frequency : The frequency in Hz of the clock that drives the NPCM7xx > + timer (usually 25000000). > + > +Optional properties: > +- timeout-sec : Contains the watchdog timeout in seconds > + > +Example: > + > +timer@f00080c1 { Little address mistake, suppose to be f000801c > + compatible = "nuvoton,npcm750-wdt"; > + interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; > + reg = <0xf00080c1 0x4>; Little address mistake, suppose to be 0xf000801c > + clocks = <&clk NPCM7XX_CLK_TIMER>; > +}; > -- > 2.15.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] watchdog: Add Nuvoton NPCM watchdog driver 2018-03-05 11:45 [PATCH v2 0/2] watchdog: Add Nuvoton NPCM (Poleg) driver Joel Stanley 2018-03-05 11:45 ` [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description Joel Stanley @ 2018-03-05 11:45 ` Joel Stanley 2018-03-05 14:29 ` Guenter Roeck 1 sibling, 1 reply; 6+ messages in thread From: Joel Stanley @ 2018-03-05 11:45 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Mark Rutland, Marcus Folkesson Cc: linux-watchdog, devicetree, linux-kernel, Tomer Maimon, Avi Fishman, Brendan Higgins The Nuvoton NPCM750 has a watchdog implemented as a single register inside the timer peripheral. This driver exposes that watchdog as a standard watchdog device with coarse timeout intervals, limited by the combination of prescaler and counter that is provided by the hardware. The calculation is taken from the Nuvoton vendor tree. There is a pre-timeout IRQ that is wired up. This timeout always occurs 1024 clocks before the timeout. Signed-off-by: Joel Stanley <joel@jms.id.au> --- v2: - Make MODULE_LICENCE gpl v2 to match SPDX - Remove unused struct device pointer - Remove unused setting of drvdata - Add linux/bitops.h - Sort includes - Remove unused fiq include - Update timeout with achieved value --- drivers/watchdog/Kconfig | 11 +++ drivers/watchdog/Makefile | 1 + drivers/watchdog/npcm_wdt.c | 230 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 242 insertions(+) create mode 100644 drivers/watchdog/npcm_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index aff773bcebdb..0c1cc68894e6 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -513,6 +513,17 @@ config COH901327_WATCHDOG This watchdog is used to reset the system and thus cannot be compiled as a module. +config NPCM7XX_WATCHDOG + bool "NPCM750 watchdog" + depends on ARCH_NPCM || COMPILE_TEST + default y if ARCH_NPCM750 + select WATCHDOG_CORE + help + Say Y here to include Watchdog timer support for the + watchdog embedded into the NPCM7xx. + This watchdog is used to reset the system and thus cannot be + compiled as a module. + config TWL4030_WATCHDOG tristate "TWL4030 Watchdog" depends on TWL4030_CORE diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 0474d38aa854..97a5afb5cad2 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o obj-$(CONFIG_SUNXI_WATCHDOG) += sunxi_wdt.o obj-$(CONFIG_RN5T618_WATCHDOG) += rn5t618_wdt.o obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o +obj-$(CONFIG_NPCM7XX_WATCHDOG) += npcm_wdt.o obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += stmp3xxx_rtc_wdt.o obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS4800_WATCHDOG) += ts4800_wdt.o diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c new file mode 100644 index 000000000000..2cfc58714d8d --- /dev/null +++ b/drivers/watchdog/npcm_wdt.c @@ -0,0 +1,230 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2018 Nuvoton Technology corporation. +// Copyright (c) 2018 IBM Corp. + +#include <linux/bitops.h> +#include <linux/delay.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_irq.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/watchdog.h> + +#define NPCM_WTCR 0x1C + +#define NPCM_WTCLK (BIT(10) | BIT(11)) /* Clock divider */ +#define NPCM_WTE BIT(7) /* Enable */ +#define NPCM_WTIE BIT(6) /* Enable irq */ +#define NPCM_WTIS (BIT(4) | BIT(5)) /* Interval selection */ +#define NPCM_WTIF BIT(3) /* Interrupt flag*/ +#define NPCM_WTRF BIT(2) /* Reset flag */ +#define NPCM_WTRE BIT(1) /* Reset enable */ +#define NPCM_WTR BIT(0) /* Reset counter */ + +/* + * Watchdog timeouts + * + * 170 msec: WTCLK=01 WTIS=00 VAL= 0x400 + * 670 msec: WTCLK=01 WTIS=01 VAL= 0x410 + * 1360 msec: WTCLK=10 WTIS=00 VAL= 0x800 + * 2700 msec: WTCLK=01 WTIS=10 VAL= 0x420 + * 5360 msec: WTCLK=10 WTIS=01 VAL= 0x810 + * 10700 msec: WTCLK=01 WTIS=11 VAL= 0x430 + * 21600 msec: WTCLK=10 WTIS=10 VAL= 0x820 + * 43000 msec: WTCLK=11 WTIS=00 VAL= 0xC00 + * 85600 msec: WTCLK=10 WTIS=11 VAL= 0x830 + * 172000 msec: WTCLK=11 WTIS=01 VAL= 0xC10 + * 687000 msec: WTCLK=11 WTIS=10 VAL= 0xC20 + * 2750000 msec: WTCLK=11 WTIS=11 VAL= 0xC30 + */ + +struct npcm_wdt { + struct watchdog_device wdd; + void __iomem *reg; +}; + +static inline struct npcm_wdt *to_npcm_wdt(struct watchdog_device *wdd) +{ + return container_of(wdd, struct npcm_wdt, wdd); +} + +static int npcm_wdt_ping(struct watchdog_device *wdd) +{ + struct npcm_wdt *wdt = to_npcm_wdt(wdd); + u32 val; + + val = readl(wdt->reg); + writel(val | NPCM_WTR, wdt->reg); + + return 0; +} + +static int npcm_wdt_start(struct watchdog_device *wdd) +{ + struct npcm_wdt *wdt = to_npcm_wdt(wdd); + u32 val; + + val = NPCM_WTRE | NPCM_WTE | NPCM_WTR | NPCM_WTIE; + + if (wdd->timeout < 2) { + val |= 0x800; + wdd->timeout = 1; + } else if (wdd->timeout < 3) { + val |= 0x420; + wdd->timeout = 2; + } else if (wdd->timeout < 6) { + val |= 0x810; + wdd->timeout = 5; + } else if (wdd->timeout < 11) { + val |= 0x430; + wdd->timeout = 10; + } else if (wdd->timeout < 22) { + val |= 0x820; + wdd->timeout = 21; + } else if (wdd->timeout < 44) { + val |= 0xC00; + wdd->timeout = 43; + } else if (wdd->timeout < 87) { + val |= 0x830; + wdd->timeout = 86; + } else if (wdd->timeout < 173) { + val |= 0xC10; + wdd->timeout = 172; + } else if (wdd->timeout < 688) { + val |= 0xC20; + wdd->timeout = 687; + } else { + val |= 0xC30; + wdd->timeout = 2750; + } + + writel(val, wdt->reg); + + return 0; +} + +static int npcm_wdt_stop(struct watchdog_device *wdd) +{ + struct npcm_wdt *wdt = to_npcm_wdt(wdd); + + writel(0, wdt->reg); + + return 0; +} + + +static int npcm_wdt_set_timeout(struct watchdog_device *wdd, + unsigned int timeout) +{ + /* timeout is updated with the achieved value in npcm_wdt_start */ + wdd->timeout = timeout; + if (watchdog_active(wdd)) + npcm_wdt_start(wdd); + + return 0; +} + +static irqreturn_t npcm_wdt_interrupt(int irq, void *data) +{ + struct npcm_wdt *wdt = data; + + watchdog_notify_pretimeout(&wdt->wdd); + + return IRQ_HANDLED; +} + +static int npcm_wdt_restart(struct watchdog_device *wdd, + unsigned long action, void *data) +{ + struct npcm_wdt *wdt = to_npcm_wdt(wdd); + + writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, wdt->reg); + udelay(1000); + + return 0; +} + +static const struct watchdog_info npcm_wdt_info = { + .identity = KBUILD_MODNAME, + .options = WDIOF_SETTIMEOUT + | WDIOF_KEEPALIVEPING + | WDIOF_MAGICCLOSE, +}; + +static const struct watchdog_ops npcm_wdt_ops = { + .owner = THIS_MODULE, + .start = npcm_wdt_start, + .stop = npcm_wdt_stop, + .ping = npcm_wdt_ping, + .set_timeout = npcm_wdt_set_timeout, + .restart = npcm_wdt_restart, +}; + +static int npcm_wdt_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct npcm_wdt *wdt; + struct resource *res; + int irq; + int ret; + + wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); + if (!wdt) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + wdt->reg = devm_ioremap_resource(dev, res); + if (IS_ERR(wdt->reg)) + return PTR_ERR(wdt->reg); + + irq = platform_get_irq(pdev, 0); + if (!irq) + return -EINVAL; + + wdt->wdd.info = &npcm_wdt_info; + wdt->wdd.ops = &npcm_wdt_ops; + wdt->wdd.min_timeout = 1; + wdt->wdd.max_timeout = 2750; + wdt->wdd.parent = dev; + + wdt->wdd.timeout = 86; + watchdog_init_timeout(&wdt->wdd, 0, dev); + + ret = devm_request_irq(dev, irq, npcm_wdt_interrupt, 0, + "watchdog", wdt); + if (ret) + return ret; + + ret = devm_watchdog_register_device(dev, &wdt->wdd); + if (ret) { + dev_err(dev, "failed to register watchdog\n"); + return ret; + } + + dev_info(dev, "NPCM watchdog driver enabled\n"); + + return 0; +} + +#ifdef CONFIG_OF +static const struct of_device_id npcm_wdt_match[] = { + {.compatible = "nuvoton,npcm750-wdt"}, + {}, +}; +MODULE_DEVICE_TABLE(of, npcm_wdt_match); +#endif + +static struct platform_driver npcm_wdt_driver = { + .probe = npcm_wdt_probe, + .driver = { + .name = "npcm-wdt", + .of_match_table = of_match_ptr(npcm_wdt_match), + }, +}; +module_platform_driver(npcm_wdt_driver); + +MODULE_AUTHOR("Joel Stanley"); +MODULE_DESCRIPTION("Watchdog driver for NPCM"); +MODULE_LICENSE("GPL v2"); -- 2.15.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] watchdog: Add Nuvoton NPCM watchdog driver 2018-03-05 11:45 ` [PATCH v2 2/2] watchdog: Add Nuvoton NPCM watchdog driver Joel Stanley @ 2018-03-05 14:29 ` Guenter Roeck 0 siblings, 0 replies; 6+ messages in thread From: Guenter Roeck @ 2018-03-05 14:29 UTC (permalink / raw) To: Joel Stanley, Wim Van Sebroeck, Rob Herring, Mark Rutland, Marcus Folkesson Cc: linux-watchdog, devicetree, linux-kernel, Tomer Maimon, Avi Fishman, Brendan Higgins Hi Joel, On 03/05/2018 03:45 AM, Joel Stanley wrote: > The Nuvoton NPCM750 has a watchdog implemented as a single register > inside the timer peripheral. > > This driver exposes that watchdog as a standard watchdog device with > coarse timeout intervals, limited by the combination of prescaler and > counter that is provided by the hardware. The calculation is taken from > the Nuvoton vendor tree. > > There is a pre-timeout IRQ that is wired up. This timeout always occurs > 1024 clocks before the timeout. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > v2: > - Make MODULE_LICENCE gpl v2 to match SPDX > - Remove unused struct device pointer > - Remove unused setting of drvdata > - Add linux/bitops.h > - Sort includes > - Remove unused fiq include > - Update timeout with achieved value > --- > drivers/watchdog/Kconfig | 11 +++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/npcm_wdt.c | 230 ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 242 insertions(+) > create mode 100644 drivers/watchdog/npcm_wdt.c > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index aff773bcebdb..0c1cc68894e6 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -513,6 +513,17 @@ config COH901327_WATCHDOG > This watchdog is used to reset the system and thus cannot be > compiled as a module. > > +config NPCM7XX_WATCHDOG > + bool "NPCM750 watchdog" > + depends on ARCH_NPCM || COMPILE_TEST > + default y if ARCH_NPCM750 > + select WATCHDOG_CORE > + help > + Say Y here to include Watchdog timer support for the > + watchdog embedded into the NPCM7xx. > + This watchdog is used to reset the system and thus cannot be > + compiled as a module. > + > config TWL4030_WATCHDOG > tristate "TWL4030 Watchdog" > depends on TWL4030_CORE > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 0474d38aa854..97a5afb5cad2 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -61,6 +61,7 @@ obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o > obj-$(CONFIG_SUNXI_WATCHDOG) += sunxi_wdt.o > obj-$(CONFIG_RN5T618_WATCHDOG) += rn5t618_wdt.o > obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o > +obj-$(CONFIG_NPCM7XX_WATCHDOG) += npcm_wdt.o > obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += stmp3xxx_rtc_wdt.o > obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o > obj-$(CONFIG_TS4800_WATCHDOG) += ts4800_wdt.o > diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c > new file mode 100644 > index 000000000000..2cfc58714d8d > --- /dev/null > +++ b/drivers/watchdog/npcm_wdt.c > @@ -0,0 +1,230 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// Copyright (c) 2018 Nuvoton Technology corporation. > +// Copyright (c) 2018 IBM Corp. > + > +#include <linux/bitops.h> > +#include <linux/delay.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of_irq.h> > +#include <linux/platform_device.h> > +#include <linux/slab.h> > +#include <linux/watchdog.h> > + > +#define NPCM_WTCR 0x1C > + > +#define NPCM_WTCLK (BIT(10) | BIT(11)) /* Clock divider */ > +#define NPCM_WTE BIT(7) /* Enable */ > +#define NPCM_WTIE BIT(6) /* Enable irq */ > +#define NPCM_WTIS (BIT(4) | BIT(5)) /* Interval selection */ > +#define NPCM_WTIF BIT(3) /* Interrupt flag*/ > +#define NPCM_WTRF BIT(2) /* Reset flag */ > +#define NPCM_WTRE BIT(1) /* Reset enable */ > +#define NPCM_WTR BIT(0) /* Reset counter */ > + > +/* > + * Watchdog timeouts > + * > + * 170 msec: WTCLK=01 WTIS=00 VAL= 0x400 > + * 670 msec: WTCLK=01 WTIS=01 VAL= 0x410 > + * 1360 msec: WTCLK=10 WTIS=00 VAL= 0x800 > + * 2700 msec: WTCLK=01 WTIS=10 VAL= 0x420 > + * 5360 msec: WTCLK=10 WTIS=01 VAL= 0x810 > + * 10700 msec: WTCLK=01 WTIS=11 VAL= 0x430 > + * 21600 msec: WTCLK=10 WTIS=10 VAL= 0x820 > + * 43000 msec: WTCLK=11 WTIS=00 VAL= 0xC00 > + * 85600 msec: WTCLK=10 WTIS=11 VAL= 0x830 > + * 172000 msec: WTCLK=11 WTIS=01 VAL= 0xC10 > + * 687000 msec: WTCLK=11 WTIS=10 VAL= 0xC20 > + * 2750000 msec: WTCLK=11 WTIS=11 VAL= 0xC30 > + */ > + > +struct npcm_wdt { > + struct watchdog_device wdd; > + void __iomem *reg; > +}; > + > +static inline struct npcm_wdt *to_npcm_wdt(struct watchdog_device *wdd) > +{ > + return container_of(wdd, struct npcm_wdt, wdd); > +} > + > +static int npcm_wdt_ping(struct watchdog_device *wdd) > +{ > + struct npcm_wdt *wdt = to_npcm_wdt(wdd); > + u32 val; > + > + val = readl(wdt->reg); > + writel(val | NPCM_WTR, wdt->reg); > + > + return 0; > +} > + > +static int npcm_wdt_start(struct watchdog_device *wdd) > +{ > + struct npcm_wdt *wdt = to_npcm_wdt(wdd); > + u32 val; > + > + val = NPCM_WTRE | NPCM_WTE | NPCM_WTR | NPCM_WTIE; > + > + if (wdd->timeout < 2) { > + val |= 0x800; > + wdd->timeout = 1; > + } else if (wdd->timeout < 3) { > + val |= 0x420; > + wdd->timeout = 2; > + } else if (wdd->timeout < 6) { > + val |= 0x810; > + wdd->timeout = 5; > + } else if (wdd->timeout < 11) { > + val |= 0x430; > + wdd->timeout = 10; > + } else if (wdd->timeout < 22) { > + val |= 0x820; > + wdd->timeout = 21; > + } else if (wdd->timeout < 44) { > + val |= 0xC00; > + wdd->timeout = 43; > + } else if (wdd->timeout < 87) { > + val |= 0x830; > + wdd->timeout = 86; > + } else if (wdd->timeout < 173) { > + val |= 0xC10; > + wdd->timeout = 172; > + } else if (wdd->timeout < 688) { > + val |= 0xC20; > + wdd->timeout = 687; > + } else { > + val |= 0xC30; > + wdd->timeout = 2750; > + } > + > + writel(val, wdt->reg); > + > + return 0; > +} > + > +static int npcm_wdt_stop(struct watchdog_device *wdd) > +{ > + struct npcm_wdt *wdt = to_npcm_wdt(wdd); > + > + writel(0, wdt->reg); > + > + return 0; > +} > + > + > +static int npcm_wdt_set_timeout(struct watchdog_device *wdd, > + unsigned int timeout) > +{ > + /* timeout is updated with the achieved value in npcm_wdt_start */ Yes, but only if the watchdog is running. If it is not running, userspace would end up being confused. While it is extra effort, you'll have to set ->timeout to the correct value here, not in the start function. > + wdd->timeout = timeout; > + if (watchdog_active(wdd)) > + npcm_wdt_start(wdd); > + > + return 0; > +} > + > +static irqreturn_t npcm_wdt_interrupt(int irq, void *data) > +{ > + struct npcm_wdt *wdt = data; > + > + watchdog_notify_pretimeout(&wdt->wdd); > + > + return IRQ_HANDLED; > +} > + > +static int npcm_wdt_restart(struct watchdog_device *wdd, > + unsigned long action, void *data) > +{ > + struct npcm_wdt *wdt = to_npcm_wdt(wdd); > + > + writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, wdt->reg); > + udelay(1000); > + > + return 0; > +} > + > +static const struct watchdog_info npcm_wdt_info = { > + .identity = KBUILD_MODNAME, > + .options = WDIOF_SETTIMEOUT > + | WDIOF_KEEPALIVEPING > + | WDIOF_MAGICCLOSE, > +}; > + > +static const struct watchdog_ops npcm_wdt_ops = { > + .owner = THIS_MODULE, > + .start = npcm_wdt_start, > + .stop = npcm_wdt_stop, > + .ping = npcm_wdt_ping, > + .set_timeout = npcm_wdt_set_timeout, > + .restart = npcm_wdt_restart, > +}; > + > +static int npcm_wdt_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct npcm_wdt *wdt; > + struct resource *res; > + int irq; > + int ret; > + > + wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); > + if (!wdt) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + wdt->reg = devm_ioremap_resource(dev, res); > + if (IS_ERR(wdt->reg)) > + return PTR_ERR(wdt->reg); > + > + irq = platform_get_irq(pdev, 0); > + if (!irq) > + return -EINVAL; > + > + wdt->wdd.info = &npcm_wdt_info; > + wdt->wdd.ops = &npcm_wdt_ops; > + wdt->wdd.min_timeout = 1; > + wdt->wdd.max_timeout = 2750; > + wdt->wdd.parent = dev; > + > + wdt->wdd.timeout = 86; > + watchdog_init_timeout(&wdt->wdd, 0, dev); > + One thought ... The rest of the code suggests that it is possible to detect if the watchdog is already running, and its selected timeout. While not mandatory, it might make sense to detect that situation, tell the watchdog core, and keep it running. Otherwise, it might make sense to call the stop function before registering the watchdog to ensure that it isn't running. > + ret = devm_request_irq(dev, irq, npcm_wdt_interrupt, 0, > + "watchdog", wdt); > + if (ret) > + return ret; > + > + ret = devm_watchdog_register_device(dev, &wdt->wdd); > + if (ret) { > + dev_err(dev, "failed to register watchdog\n"); > + return ret; > + } > + > + dev_info(dev, "NPCM watchdog driver enabled\n"); > + > + return 0; > +} > + > +#ifdef CONFIG_OF > +static const struct of_device_id npcm_wdt_match[] = { > + {.compatible = "nuvoton,npcm750-wdt"}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, npcm_wdt_match); > +#endif > + > +static struct platform_driver npcm_wdt_driver = { > + .probe = npcm_wdt_probe, > + .driver = { > + .name = "npcm-wdt", > + .of_match_table = of_match_ptr(npcm_wdt_match), > + }, > +}; > +module_platform_driver(npcm_wdt_driver); > + > +MODULE_AUTHOR("Joel Stanley"); > +MODULE_DESCRIPTION("Watchdog driver for NPCM"); > +MODULE_LICENSE("GPL v2"); > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-03-08 7:47 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-03-05 11:45 [PATCH v2 0/2] watchdog: Add Nuvoton NPCM (Poleg) driver Joel Stanley 2018-03-05 11:45 ` [PATCH v2 1/2] dt-bindings: watchdog: Add Nuvoton NPCM description Joel Stanley 2018-03-07 22:29 ` Rob Herring 2018-03-08 7:46 ` Tomer Maimon 2018-03-05 11:45 ` [PATCH v2 2/2] watchdog: Add Nuvoton NPCM watchdog driver Joel Stanley 2018-03-05 14:29 ` Guenter Roeck
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.