| Message ID | 20190304225152.26831-3-chris.packham@alliedtelesis.co.nz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] watchdog: orion_wdt: remove orion_wdt_set_timeout | expand |
On Tue, Mar 05, 2019 at 11:51:52AM +1300, Chris Packham wrote: > The orion watchdog can either reset the CPU or generate an interrupt. > The interrupt would be useful for debugging as it provides panic() > output about the watchdog expiry, however if the interrupt is used the > watchdog can't reset the CPU in the event of being stuck in a loop with > interrupts disabled or if the CPU is prevented from accessing memory > (e.g. an unterminated DMA). > > All of the orion based CPU cores (at least back as far as Kirkwood) have > spare timers that aren't currently used by the Linux kernel. We can use > timer1 to provide a pre-timeout ahead of the watchdog timer and provide > the possibility of gathering debug before the reset triggers. Hi Chris I had a quick look at other drivers implementing pre-timeout. They seem to call watchdog_notify_pretimeout(). I don't see that here? What happens when timer1 fires? > @@ -169,38 +174,46 @@ static int armadaxp_wdt_clock_init(struct platform_device *pdev, > } > > /* Enable the fixed watchdog clock input */ > - atomic_io_modify(dev->reg + TIMER_CTRL, > - WDT_AXP_FIXED_ENABLE_BIT, > - WDT_AXP_FIXED_ENABLE_BIT); > + val = WDT_AXP_FIXED_ENABLE_BIT | TIMER1_FIXED_ENABLE_BIT; > + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); > > dev->clk_rate = clk_get_rate(dev->clk); > + > + One blank line is sufficient, > return 0; > } Andrew
On 5/03/19 1:57 PM, Andrew Lunn wrote: > On Tue, Mar 05, 2019 at 11:51:52AM +1300, Chris Packham wrote: >> The orion watchdog can either reset the CPU or generate an interrupt. >> The interrupt would be useful for debugging as it provides panic() >> output about the watchdog expiry, however if the interrupt is used the >> watchdog can't reset the CPU in the event of being stuck in a loop with >> interrupts disabled or if the CPU is prevented from accessing memory >> (e.g. an unterminated DMA). >> >> All of the orion based CPU cores (at least back as far as Kirkwood) have >> spare timers that aren't currently used by the Linux kernel. Actually this appears to be incorrect Kirkwood does configure timer1 as a clockevent timer. So I can't just grab timer1 for all platforms. >> We can use >> timer1 to provide a pre-timeout ahead of the watchdog timer and provide >> the possibility of gathering debug before the reset triggers. > > Hi Chris > > I had a quick look at other drivers implementing pre-timeout. They > seem to call watchdog_notify_pretimeout(). I don't see that here? What > happens when timer1 fires? > It invokes the regular orion_wdt_irq(). On Armada-385 prior to this change the irq was not specified because the reset always kicked in so there was no point. For correctness I could make the devicetree binding specify 2 interrupts. One for the regular watchdog interrupt (which would never usually get hit because the reset would kick in) and one for the pretimeout/timer1. >> @@ -169,38 +174,46 @@ static int armadaxp_wdt_clock_init(struct platform_device *pdev, >> } >> >> /* Enable the fixed watchdog clock input */ >> - atomic_io_modify(dev->reg + TIMER_CTRL, >> - WDT_AXP_FIXED_ENABLE_BIT, >> - WDT_AXP_FIXED_ENABLE_BIT); >> + val = WDT_AXP_FIXED_ENABLE_BIT | TIMER1_FIXED_ENABLE_BIT; >> + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); >> >> dev->clk_rate = clk_get_rate(dev->clk); >> + >> + > > One blank line is sufficient, > > >> return 0; >> } > > Andrew >
> > Hi Chris > > > > I had a quick look at other drivers implementing pre-timeout. They > > seem to call watchdog_notify_pretimeout(). I don't see that here? What > > happens when timer1 fires? > > > > It invokes the regular orion_wdt_irq(). On Armada-385 prior to this > change the irq was not specified because the reset always kicked in so > there was no point. > > For correctness I could make the devicetree binding specify 2 > interrupts. One for the regular watchdog interrupt (which would never > usually get hit because the reset would kick in) and one for the > pretimeout/timer1. Hi Chris If the regular watchdog interrupt would never actually fire because the SoC gets reset, maybe make the IRQ handler call watchdog_notify_pretimeout()? Andrew
On Tue, Mar 05, 2019 at 01:26:08AM +0000, Chris Packham wrote: > On 5/03/19 1:57 PM, Andrew Lunn wrote: > > On Tue, Mar 05, 2019 at 11:51:52AM +1300, Chris Packham wrote: > >> The orion watchdog can either reset the CPU or generate an interrupt. > >> The interrupt would be useful for debugging as it provides panic() > >> output about the watchdog expiry, however if the interrupt is used the > >> watchdog can't reset the CPU in the event of being stuck in a loop with > >> interrupts disabled or if the CPU is prevented from accessing memory > >> (e.g. an unterminated DMA). > >> > >> All of the orion based CPU cores (at least back as far as Kirkwood) have > >> spare timers that aren't currently used by the Linux kernel. > > Actually this appears to be incorrect Kirkwood does configure timer1 as > a clockevent timer. So I can't just grab timer1 for all platforms. > If you can't use it unconditionally, can you specify it (and use it) as clock ? > >> We can use > >> timer1 to provide a pre-timeout ahead of the watchdog timer and provide > >> the possibility of gathering debug before the reset triggers. > > > > Hi Chris > > > > I had a quick look at other drivers implementing pre-timeout. They > > seem to call watchdog_notify_pretimeout(). I don't see that here? What > > happens when timer1 fires? > > > > It invokes the regular orion_wdt_irq(). On Armada-385 prior to this > change the irq was not specified because the reset always kicked in so > there was no point. > I would suggest to update that function to actually call watchdog_notify_pretimeout() if a pretimeout is configured configured. After all, we do want to support the infrastructure, and that includes support for the various pretimeout governors (if enabled). > For correctness I could make the devicetree binding specify 2 > interrupts. One for the regular watchdog interrupt (which would never > usually get hit because the reset would kick in) and one for the > pretimeout/timer1. > Yes, if they are different interrupts and orion_wdt_irq() is only supposed to handle the real timeout. Thanks, Guenter > >> @@ -169,38 +174,46 @@ static int armadaxp_wdt_clock_init(struct platform_device *pdev, > >> } > >> > >> /* Enable the fixed watchdog clock input */ > >> - atomic_io_modify(dev->reg + TIMER_CTRL, > >> - WDT_AXP_FIXED_ENABLE_BIT, > >> - WDT_AXP_FIXED_ENABLE_BIT); > >> + val = WDT_AXP_FIXED_ENABLE_BIT | TIMER1_FIXED_ENABLE_BIT; > >> + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); > >> > >> dev->clk_rate = clk_get_rate(dev->clk); > >> + > >> + > > > > One blank line is sufficient, > > > > > >> return 0; > >> } > > > > Andrew > > >
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 929459c42760..fd0caa9714f2 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -376,6 +376,7 @@ reg = <0x20300 0x34>, <0x20704 0x4>, <0x18260 0x4>; clocks = <&coreclk 2>, <&refclk>; clock-names = "nbclk", "fixed"; + interrupts-extended = <&gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; }; cpurst: cpurst@20800 { diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 8b259c712c52..bf1dc75c2045 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -46,6 +46,10 @@ #define WDT_AXP_FIXED_ENABLE_BIT BIT(10) #define WDT_A370_EXPIRED BIT(31) +#define TIMER1_VAL_OFF 0x001c +#define TIMER1_ENABLE_BIT BIT(2) +#define TIMER1_FIXED_ENABLE_BIT BIT(12) + static bool nowayout = WATCHDOG_NOWAYOUT; static int heartbeat = -1; /* module parameter (seconds) */ @@ -118,6 +122,7 @@ static int armada375_wdt_clock_init(struct platform_device *pdev, struct orion_watchdog *dev) { int ret; + u32 val; dev->clk = of_clk_get_by_name(pdev->dev.of_node, "fixed"); if (!IS_ERR(dev->clk)) { @@ -127,9 +132,8 @@ static int armada375_wdt_clock_init(struct platform_device *pdev, return ret; } - atomic_io_modify(dev->reg + TIMER_CTRL, - WDT_AXP_FIXED_ENABLE_BIT, - WDT_AXP_FIXED_ENABLE_BIT); + val = WDT_AXP_FIXED_ENABLE_BIT | TIMER1_FIXED_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); dev->clk_rate = clk_get_rate(dev->clk); return 0; @@ -158,6 +162,7 @@ static int armadaxp_wdt_clock_init(struct platform_device *pdev, struct orion_watchdog *dev) { int ret; + u32 val; dev->clk = of_clk_get_by_name(pdev->dev.of_node, "fixed"); if (IS_ERR(dev->clk)) @@ -169,38 +174,46 @@ static int armadaxp_wdt_clock_init(struct platform_device *pdev, } /* Enable the fixed watchdog clock input */ - atomic_io_modify(dev->reg + TIMER_CTRL, - WDT_AXP_FIXED_ENABLE_BIT, - WDT_AXP_FIXED_ENABLE_BIT); + val = WDT_AXP_FIXED_ENABLE_BIT | TIMER1_FIXED_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); dev->clk_rate = clk_get_rate(dev->clk); + + return 0; } static int orion_wdt_ping(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); + /* Reload watchdog duration */ writel(dev->clk_rate * wdt_dev->timeout, dev->reg + dev->data->wdt_counter_offset); + writel(dev->clk_rate * (wdt_dev->timeout - wdt_dev->pretimeout), + dev->reg + TIMER1_VAL_OFF); + return 0; } static int armada375_start(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); - u32 reg; + u32 reg, val; /* Set watchdog duration */ writel(dev->clk_rate * wdt_dev->timeout, dev->reg + dev->data->wdt_counter_offset); + if (wdt_dev->pretimeout) + writel(dev->clk_rate * (wdt_dev->timeout - wdt_dev->pretimeout), + dev->reg + TIMER1_VAL_OFF); /* Clear the watchdog expiration bit */ atomic_io_modify(dev->reg + TIMER_A370_STATUS, WDT_A370_EXPIRED, 0); /* Enable watchdog timer */ - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, - dev->data->wdt_enable_bit); + val = dev->data->wdt_enable_bit | TIMER1_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); /* Enable reset on watchdog */ reg = readl(dev->rstout); @@ -214,7 +227,7 @@ static int armada375_start(struct watchdog_device *wdt_dev) static int armada370_start(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); - u32 reg; + u32 reg, val; /* Set watchdog duration */ writel(dev->clk_rate * wdt_dev->timeout, @@ -224,8 +237,8 @@ static int armada370_start(struct watchdog_device *wdt_dev) atomic_io_modify(dev->reg + TIMER_A370_STATUS, WDT_A370_EXPIRED, 0); /* Enable watchdog timer */ - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, - dev->data->wdt_enable_bit); + val = dev->data->wdt_enable_bit | TIMER1_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); /* Enable reset on watchdog */ reg = readl(dev->rstout); @@ -237,14 +250,15 @@ static int armada370_start(struct watchdog_device *wdt_dev) static int orion_start(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); + u32 val; /* Set watchdog duration */ writel(dev->clk_rate * wdt_dev->timeout, dev->reg + dev->data->wdt_counter_offset); /* Enable watchdog timer */ - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, - dev->data->wdt_enable_bit); + val = dev->data->wdt_enable_bit | TIMER1_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, val, val); /* Enable reset on watchdog */ atomic_io_modify(dev->rstout, dev->data->rstout_enable_bit, @@ -264,12 +278,14 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) static int orion_stop(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); + u32 mask; /* Disable reset on watchdog */ atomic_io_modify(dev->rstout, dev->data->rstout_enable_bit, 0); /* Disable watchdog timer */ - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, 0); + mask = dev->data->wdt_enable_bit | TIMER1_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, mask, 0); return 0; } @@ -277,7 +293,7 @@ static int orion_stop(struct watchdog_device *wdt_dev) static int armada375_stop(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); - u32 reg; + u32 reg, mask; /* Disable reset on watchdog */ atomic_io_modify(dev->rstout_mask, dev->data->rstout_mask_bit, @@ -287,7 +303,8 @@ static int armada375_stop(struct watchdog_device *wdt_dev) writel(reg, dev->rstout); /* Disable watchdog timer */ - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, 0); + mask = dev->data->wdt_enable_bit | TIMER1_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, mask, 0); return 0; } @@ -295,7 +312,7 @@ static int armada375_stop(struct watchdog_device *wdt_dev) static int armada370_stop(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); - u32 reg; + u32 reg, mask; /* Disable reset on watchdog */ reg = readl(dev->rstout); @@ -303,7 +320,8 @@ static int armada370_stop(struct watchdog_device *wdt_dev) writel(reg, dev->rstout); /* Disable watchdog timer */ - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, 0); + mask = dev->data->wdt_enable_bit | TIMER1_ENABLE_BIT; + atomic_io_modify(dev->reg + TIMER_CTRL, mask, 0); return 0; } @@ -350,7 +368,7 @@ static unsigned int orion_wdt_get_timeleft(struct watchdog_device *wdt_dev) } static const struct watchdog_info orion_wdt_info = { - .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | WDIOF_PRETIMEOUT, .identity = "Orion Watchdog", };
The orion watchdog can either reset the CPU or generate an interrupt. The interrupt would be useful for debugging as it provides panic() output about the watchdog expiry, however if the interrupt is used the watchdog can't reset the CPU in the event of being stuck in a loop with interrupts disabled or if the CPU is prevented from accessing memory (e.g. an unterminated DMA). All of the orion based CPU cores (at least back as far as Kirkwood) have spare timers that aren't currently used by the Linux kernel. We can use timer1 to provide a pre-timeout ahead of the watchdog timer and provide the possibility of gathering debug before the reset triggers. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- arch/arm/boot/dts/armada-38x.dtsi | 1 + drivers/watchdog/orion_wdt.c | 58 ++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 20 deletions(-)