Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

watchdog: rti_wdt: Add 10% safety margin to clock frequency

Browse source 
When running against RC_OSC_32k, the watchdog may suffer from running
faster than expected, expiring earlier. The Linux kernel adds a 10%
margin to the timeout calculation by slowing down the read clock rate
accordingly. Do the same here, also to have comparable preset values
for both drivers.

Along this, fix the name of the local var holding to frequency - in Hz,
not kHz.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Jan Kiszka 2022-03-08 07:25:50 +01:00 committed by Stefan Roese
parent 65066773a3
commit 817e153fe5
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/watchdog/rti_wdt.c
View file

@ -41,7 +41,7 @@
struct rti_wdt_priv { struct rti_wdt_priv {
phys_addr_t regs; phys_addr_t regs;
unsigned int clk_khz; unsigned int clk_hz;
}; };
#ifdef CONFIG_WDT_K3_RTI_LOAD_FW #ifdef CONFIG_WDT_K3_RTI_LOAD_FW
@ -139,7 +139,7 @@ static int rti_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags)
if (ret < 0) if (ret < 0)
return ret; return ret;
timer_margin = timeout_ms * priv->clk_khz / 1000; timer_margin = timeout_ms * priv->clk_hz / 1000;
timer_margin >>= WDT_PRELOAD_SHIFT; timer_margin >>= WDT_PRELOAD_SHIFT;
if (timer_margin > WDT_PRELOAD_MAX) if (timer_margin > WDT_PRELOAD_MAX)
timer_margin = WDT_PRELOAD_MAX; timer_margin = WDT_PRELOAD_MAX;
@ -185,7 +185,15 @@ static int rti_wdt_probe(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
priv->clk_khz = clk_get_rate(&clk); priv->clk_hz = clk_get_rate(&clk);
/*
* If watchdog is running at 32k clock, it is not accurate.
* Adjust frequency down in this case so that it does not expire
* earlier than expected.
*/
if (priv->clk_hz < 32768)
priv->clk_hz = priv->clk_hz * 9 / 10;
return 0; return 0;
} }