watchdog: w83627hf_wdt: Add early_disable module parameter

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

diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index b1da0c18fd1ac4b9d02cdb9bf9245699a83d3e3c..7165704a3e33e2e4fdd034562492122baf990ff2 100644 (file)
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -64,6 +64,10 @@ MODULE_PARM_DESC(nowayout,
                "Watchdog cannot be stopped once started (default="
                                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
+static int early_disable;
+module_param(early_disable, int, 0);
+MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
+
 /*
  *     Kernel methods.
  */
@@ -208,9 +212,14 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
 
        t = superio_inb(cr_wdt_timeout);
        if (t != 0) {
-               pr_info("Watchdog already running. Resetting timeout to %d sec\n",
-                       wdog->timeout);
-               superio_outb(cr_wdt_timeout, wdog->timeout);
+               if (early_disable) {
+                       pr_warn("Stopping previously enabled watchdog until userland kicks in\n");
+                       superio_outb(cr_wdt_timeout, 0);
+               } else {
+                       pr_info("Watchdog already running. Resetting timeout to %d sec\n",
+                               wdog->timeout);
+                       superio_outb(cr_wdt_timeout, wdog->timeout);
+               }
        }
 
        /* set second mode & disable keyboard turning off watchdog */