]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
watchdog: gpio_wdt: use __udelay() to avoid recursion
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Tue, 27 Sep 2022 07:45:44 +0000 (09:45 +0200)
committerStefan Roese <sr@denx.de>
Tue, 27 Sep 2022 10:25:40 +0000 (12:25 +0200)
The udelay() function in lib/time.c contains a WATCHDOG_RESET()
call. The only reason this doesn't lead to a catastrophic infinite
recursion is due to the rate-limiting in wdt-uclass.c:

if (time_after_eq(now, priv->next_reset)) {
priv->next_reset = now + priv->reset_period;
wdt_reset(dev);
}

But this would fall apart if ->next_reset was updated after calling the
device's reset method.

This is needlessly fragile, and it's easy enough to avoid that
recursion in the first place by just using __udelay() directly.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Stefan Roese <sr@denx.de>
drivers/watchdog/gpio_wdt.c

index fe06ec8cc90bec7eed1a22d0a11b6e2df4603352..2920c2c751f6a58d33b40264625dd8dfeca85afb 100644 (file)
@@ -31,7 +31,7 @@ static int gpio_wdt_reset(struct udevice *dev)
        case HW_ALGO_LEVEL:
                /* Pulse */
                dm_gpio_set_value(&priv->gpio, 1);
-               udelay(1);
+               __udelay(1);
                dm_gpio_set_value(&priv->gpio, 0);
                break;
        }