Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / gpio_wdt.c

diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index bbdb19b4533268cea43775f7507d6ec354d4e2eb..cbc313d37c59f1f67b0bd99fc5835d2d35a14b85 100644 (file)
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -31,6 +31,8 @@ struct gpio_wdt_priv {
        int                     gpio;
        bool                    active_low;
        bool                    state;
+       bool                    always_running;
+       bool                    armed;
        unsigned int            hw_algo;
        unsigned int            hw_margin;
        unsigned long           last_jiffies;
@@ -48,14 +50,20 @@ static void gpio_wdt_disable(struct gpio_wdt_priv *priv)
                gpio_direction_input(priv->gpio);
 }
 
-static int gpio_wdt_start(struct watchdog_device *wdd)
+static void gpio_wdt_start_impl(struct gpio_wdt_priv *priv)
 {
-       struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
-
        priv->state = priv->active_low;
        gpio_direction_output(priv->gpio, priv->state);
        priv->last_jiffies = jiffies;
        mod_timer(&priv->timer, priv->last_jiffies + priv->hw_margin);
+}
+
+static int gpio_wdt_start(struct watchdog_device *wdd)
+{
+       struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
+
+       gpio_wdt_start_impl(priv);
+       priv->armed = true;
 
        return 0;
 }
@@ -64,8 +72,11 @@ static int gpio_wdt_stop(struct watchdog_device *wdd)
 {
        struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
 
-       mod_timer(&priv->timer, 0);
-       gpio_wdt_disable(priv);
+       priv->armed = false;
+       if (!priv->always_running) {
+               mod_timer(&priv->timer, 0);
+               gpio_wdt_disable(priv);
+       }
 
        return 0;
 }
@@ -91,8 +102,8 @@ static void gpio_wdt_hwping(unsigned long data)
        struct watchdog_device *wdd = (struct watchdog_device *)data;
        struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
 
-       if (time_after(jiffies, priv->last_jiffies +
-                      msecs_to_jiffies(wdd->timeout * 1000))) {
+       if (priv->armed && time_after(jiffies, priv->last_jiffies +
+                                     msecs_to_jiffies(wdd->timeout * 1000))) {
                dev_crit(wdd->dev, "Timer expired. System will reboot soon!\n");
                return;
        }
@@ -197,6 +208,9 @@ static int gpio_wdt_probe(struct platform_device *pdev)
        /* Use safe value (1/2 of real timeout) */
        priv->hw_margin = msecs_to_jiffies(hw_margin / 2);
 
+       priv->always_running = of_property_read_bool(pdev->dev.of_node,
+                                                    "always-running");
+
        watchdog_set_drvdata(&priv->wdd, priv);
 
        priv->wdd.info          = &gpio_wdt_ident;
@@ -216,8 +230,15 @@ static int gpio_wdt_probe(struct platform_device *pdev)
        priv->notifier.notifier_call = gpio_wdt_notify_sys;
        ret = register_reboot_notifier(&priv->notifier);
        if (ret)
-               watchdog_unregister_device(&priv->wdd);
+               goto error_unregister;
 
+       if (priv->always_running)
+               gpio_wdt_start_impl(priv);
+
+       return 0;
+
+error_unregister:
+       watchdog_unregister_device(&priv->wdd);
        return ret;
 }