colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: wdt-uclass.c: introduce struct wdt_priv

Browse Source 
As preparation for having the wdt-uclass provided watchdog_reset()
function handle all DM watchdog devices, and not just the first such,
introduce a uclass-owned struct to hold the reset_period and
next_reset, so these become per-device instead of being static
variables.

No functional change intended.

Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
This commit is contained in:
Rasmus Villemoes
2021-08-19 11:56:56 +02:00
committed by Stefan Roese
parent 8967ebb653
commit 6d24dc89f0
1 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/watchdog/wdt-uclass.c
View File

@@ -20,15 +20,24 @@ DECLARE_GLOBAL_DATA_PTR;
#define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) #define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000)
/* struct wdt_priv {
* Reset every 1000ms, or however often is required as indicated by a /* Timeout, in seconds, to configure this device to. */
* hw_margin_ms property. u32 timeout;
*/ /*
static ulong reset_period = 1000; * Time, in milliseconds, between calling the device's ->reset()
* method from watchdog_reset().
*/
ulong reset_period;
/*
* Next time (as returned by get_timer(0)) to call
* ->reset().
*/
ulong next_reset;
};
int initr_watchdog(void) int initr_watchdog(void)
{ {
u32 timeout = WATCHDOG_TIMEOUT_SECS; struct wdt_priv *priv;
int ret; int ret;
/* /*
@@ -44,28 +53,21 @@ int initr_watchdog(void)
return 0; return 0;
} }
} }
priv = dev_get_uclass_priv(gd->watchdog_dev);
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
timeout = dev_read_u32_default(gd->watchdog_dev, "timeout-sec",
WATCHDOG_TIMEOUT_SECS);
reset_period = dev_read_u32_default(gd->watchdog_dev,
"hw_margin_ms",
4 * reset_period) / 4;
}
if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) { if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) {
printf("WDT: Not starting\n"); printf("WDT: Not starting\n");
return 0; return 0;
} }
ret = wdt_start(gd->watchdog_dev, timeout * 1000, 0); ret = wdt_start(gd->watchdog_dev, priv->timeout * 1000, 0);
if (ret != 0) { if (ret != 0) {
printf("WDT: Failed to start\n"); printf("WDT: Failed to start\n");
return 0; return 0;
} }
printf("WDT: Started with%s servicing (%ds timeout)\n", printf("WDT: Started with%s servicing (%ds timeout)\n",
IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", timeout); IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", priv->timeout);
return 0; return 0;
} }
@@ -139,18 +141,21 @@ int wdt_expire_now(struct udevice *dev, ulong flags)
*/ */
void watchdog_reset(void) void watchdog_reset(void)
{ {
static ulong next_reset; struct wdt_priv *priv;
struct udevice *dev;
ulong now; ulong now;
/* Exit if GD is not ready or watchdog is not initialized yet */ /* Exit if GD is not ready or watchdog is not initialized yet */
if (!gd || !(gd->flags & GD_FLG_WDT_READY)) if (!gd || !(gd->flags & GD_FLG_WDT_READY))
return; return;
dev = gd->watchdog_dev;
priv = dev_get_uclass_priv(dev);
/* Do not reset the watchdog too often */ /* Do not reset the watchdog too often */
now = get_timer(0); now = get_timer(0);
if (time_after_eq(now, next_reset)) { if (time_after_eq(now, priv->next_reset)) {
next_reset = now + reset_period; priv->next_reset = now + priv->reset_period;
wdt_reset(gd->watchdog_dev); wdt_reset(dev);
} }
} }
#endif #endif
@@ -177,9 +182,38 @@ static int wdt_post_bind(struct udevice *dev)
return 0; return 0;
} }
static int wdt_pre_probe(struct udevice *dev)
{
u32 timeout = WATCHDOG_TIMEOUT_SECS;
/*
* Reset every 1000ms, or however often is required as
* indicated by a hw_margin_ms property.
*/
ulong reset_period = 1000;
struct wdt_priv *priv;
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
timeout = dev_read_u32_default(dev, "timeout-sec", timeout);
reset_period = dev_read_u32_default(dev, "hw_margin_ms",
4 * reset_period) / 4;
}
priv = dev_get_uclass_priv(dev);
priv->timeout = timeout;
priv->reset_period = reset_period;
/*
* Pretend this device was last reset "long" ago so the first
* watchdog_reset will actually call its ->reset method.
*/
priv->next_reset = get_timer(0);
return 0;
}
UCLASS_DRIVER(wdt) = { UCLASS_DRIVER(wdt) = {
.id = UCLASS_WDT, .id = UCLASS_WDT,
.name = "watchdog", .name = "watchdog",
.flags = DM_UC_FLAG_SEQ_ALIAS, .flags = DM_UC_FLAG_SEQ_ALIAS,
.post_bind = wdt_post_bind, .post_bind = wdt_post_bind,
.pre_probe = wdt_pre_probe,
.per_device_auto = sizeof(struct wdt_priv),
}; };