1 files changed, 144 insertions, 195 deletions

diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index bc0e91e78e86..b4021a2b459b 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2008 Aleksandar Radovanovic <biblbroks@sezampro.rs>
  *  Copyright (C) 2009 Matthieu CASTET <castet.matthieu@free.fr>
+ *  Copyright (C) 2012-2013 Hauke Mehrtens <hauke@hauke-m.de>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -12,165 +13,143 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/bcm47xx_wdt.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
-#include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/types.h>
-#include <linux/uaccess.h>
 #include <linux/watchdog.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
-#include <linux/ssb/ssb_embedded.h>
-#include <asm/mach-bcm47xx/bcm47xx.h>
 
 #define DRV_NAME                "bcm47xx_wdt"
 
 #define WDT_DEFAULT_TIME        30      /* seconds */
-#define WDT_MAX_TIME            255     /* seconds */
+#define WDT_SOFTTIMER_MAX       255     /* seconds */
+#define WDT_SOFTTIMER_THRESHOLD 60      /* seconds */
 
-static int wdt_time = WDT_DEFAULT_TIME;
+static int timeout = WDT_DEFAULT_TIME;
 static bool nowayout = WATCHDOG_NOWAYOUT;
 
-module_param(wdt_time, int, 0);
-MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
+module_param(timeout, int, 0);
+MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default="
                                 __MODULE_STRING(WDT_DEFAULT_TIME) ")");
 
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
                 "Watchdog cannot be stopped once started (default="
                                 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-#endif
 
-static unsigned long bcm47xx_wdt_busy;
-static char expect_release;
-static struct timer_list wdt_timer;
-static atomic_t ticks;
-
-static inline void bcm47xx_wdt_hw_start(void)
+static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd)
 {
-        /* this is 2,5s on 100Mhz clock  and 2s on 133 Mhz */
-        switch (bcm47xx_bus_type) {
-#ifdef CONFIG_BCM47XX_SSB
-        case BCM47XX_BUS_TYPE_SSB:
-                ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff);
-                break;
-#endif
-#ifdef CONFIG_BCM47XX_BCMA
-        case BCM47XX_BUS_TYPE_BCMA:
-                bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc,
-                                               0xfffffff);
-                break;
-#endif
-        }
+        return container_of(wdd, struct bcm47xx_wdt, wdd);
 }
 
-static inline int bcm47xx_wdt_hw_stop(void)
+static int bcm47xx_wdt_hard_keepalive(struct watchdog_device *wdd)
 {
-        switch (bcm47xx_bus_type) {
-#ifdef CONFIG_BCM47XX_SSB
-        case BCM47XX_BUS_TYPE_SSB:
-                return ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0);
-#endif
-#ifdef CONFIG_BCM47XX_BCMA
-        case BCM47XX_BUS_TYPE_BCMA:
-                bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc, 0);
-                return 0;
-#endif
-        }
-        return -EINVAL;
-}
+        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
 
-static void bcm47xx_timer_tick(unsigned long unused)
-{
-        if (!atomic_dec_and_test(&ticks)) {
-                bcm47xx_wdt_hw_start();
-                mod_timer(&wdt_timer, jiffies + HZ);
-        } else {
-                pr_crit("Watchdog will fire soon!!!\n");
-        }
+        wdt->timer_set_ms(wdt, wdd->timeout * 1000);
+
+        return 0;
 }
 
-static inline void bcm47xx_wdt_pet(void)
+static int bcm47xx_wdt_hard_start(struct watchdog_device *wdd)
 {
-        atomic_set(&ticks, wdt_time);
+        return 0;
 }
 
-static void bcm47xx_wdt_start(void)
+static int bcm47xx_wdt_hard_stop(struct watchdog_device *wdd)
 {
-        bcm47xx_wdt_pet();
-        bcm47xx_timer_tick(0);
+        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
+
+        wdt->timer_set(wdt, 0);
+
+        return 0;
 }
 
-static void bcm47xx_wdt_pause(void)
+static int bcm47xx_wdt_hard_set_timeout(struct watchdog_device *wdd,
+                                        unsigned int new_time)
 {
-        del_timer_sync(&wdt_timer);
-        bcm47xx_wdt_hw_stop();
+        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
+        u32 max_timer = wdt->max_timer_ms;
+
+        if (new_time < 1 || new_time > max_timer / 1000) {
+                pr_warn("timeout value must be 1<=x<=%d, using %d\n",
+                        max_timer / 1000, new_time);
+                return -EINVAL;
+        }
+
+        wdd->timeout = new_time;
+        return 0;
 }
 
-static void bcm47xx_wdt_stop(void)
+static struct watchdog_ops bcm47xx_wdt_hard_ops = {
+        .owner          = THIS_MODULE,
+        .start          = bcm47xx_wdt_hard_start,
+        .stop           = bcm47xx_wdt_hard_stop,
+        .ping           = bcm47xx_wdt_hard_keepalive,
+        .set_timeout    = bcm47xx_wdt_hard_set_timeout,
+};
+
+static void bcm47xx_wdt_soft_timer_tick(unsigned long data)
 {
-        bcm47xx_wdt_pause();
+        struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data;
+        u32 next_tick = min(wdt->wdd.timeout * 1000, wdt->max_timer_ms);
+
+        if (!atomic_dec_and_test(&wdt->soft_ticks)) {
+                wdt->timer_set_ms(wdt, next_tick);
+                mod_timer(&wdt->soft_timer, jiffies + HZ);
+        } else {
+                pr_crit("Watchdog will fire soon!!!\n");
+        }
 }
 
-static int bcm47xx_wdt_settimeout(int new_time)
+static int bcm47xx_wdt_soft_keepalive(struct watchdog_device *wdd)
 {
-        if ((new_time <= 0) || (new_time > WDT_MAX_TIME))
-                return -EINVAL;
+        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
+
+        atomic_set(&wdt->soft_ticks, wdd->timeout);
 
-        wdt_time = new_time;
         return 0;
 }
 
-static int bcm47xx_wdt_open(struct inode *inode, struct file *file)
+static int bcm47xx_wdt_soft_start(struct watchdog_device *wdd)
 {
-        if (test_and_set_bit(0, &bcm47xx_wdt_busy))
-                return -EBUSY;
+        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
+
+        bcm47xx_wdt_soft_keepalive(wdd);
+        bcm47xx_wdt_soft_timer_tick((unsigned long)wdt);
 
-        bcm47xx_wdt_start();
-        return nonseekable_open(inode, file);
+        return 0;
 }
 
-static int bcm47xx_wdt_release(struct inode *inode, struct file *file)
+static int bcm47xx_wdt_soft_stop(struct watchdog_device *wdd)
 {
-        if (expect_release == 42) {
-                bcm47xx_wdt_stop();
-        } else {
-                pr_crit("Unexpected close, not stopping watchdog!\n");
-                bcm47xx_wdt_start();
-        }
+        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
+
+        del_timer_sync(&wdt->soft_timer);
+        wdt->timer_set(wdt, 0);
 
-        clear_bit(0, &bcm47xx_wdt_busy);
-        expect_release = 0;
         return 0;
 }
 
-static ssize_t bcm47xx_wdt_write(struct file *file, const char __user *data,
-                                size_t len, loff_t *ppos)
+static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd,
+                                        unsigned int new_time)
 {
-        if (len) {
-                if (!nowayout) {
-                        size_t i;
-
-                        expect_release = 0;
-
-                        for (i = 0; i != len; i++) {
-                                char c;
-                                if (get_user(c, data + i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        expect_release = 42;
-                        }
-                }
-                bcm47xx_wdt_pet();
+        if (new_time < 1 || new_time > WDT_SOFTTIMER_MAX) {
+                pr_warn("timeout value must be 1<=x<=%d, using %d\n",
+                        WDT_SOFTTIMER_MAX, new_time);
+                return -EINVAL;
         }
-        return len;
+
+        wdd->timeout = new_time;
+        return 0;
 }
 
 static const struct watchdog_info bcm47xx_wdt_info = {
@@ -180,130 +159,100 @@ static const struct watchdog_info bcm47xx_wdt_info = {
                                 WDIOF_MAGICCLOSE,
 };
 
-static long bcm47xx_wdt_ioctl(struct file *file,
-                                        unsigned int cmd, unsigned long arg)
-{
-        void __user *argp = (void __user *)arg;
-        int __user *p = argp;
-        int new_value, retval = -EINVAL;
-
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                return copy_to_user(argp, &bcm47xx_wdt_info,
-                                sizeof(bcm47xx_wdt_info)) ? -EFAULT : 0;
-
-        case WDIOC_GETSTATUS:
-        case WDIOC_GETBOOTSTATUS:
-                return put_user(0, p);
-
-        case WDIOC_SETOPTIONS:
-                if (get_user(new_value, p))
-                        return -EFAULT;
-
-                if (new_value & WDIOS_DISABLECARD) {
-                        bcm47xx_wdt_stop();
-                        retval = 0;
-                }
-
-                if (new_value & WDIOS_ENABLECARD) {
-                        bcm47xx_wdt_start();
-                        retval = 0;
-                }
-
-                return retval;
-
-        case WDIOC_KEEPALIVE:
-                bcm47xx_wdt_pet();
-                return 0;
-
-        case WDIOC_SETTIMEOUT:
-                if (get_user(new_value, p))
-                        return -EFAULT;
-
-                if (bcm47xx_wdt_settimeout(new_value))
-                        return -EINVAL;
-
-                bcm47xx_wdt_pet();
-
-        case WDIOC_GETTIMEOUT:
-                return put_user(wdt_time, p);
-
-        default:
-                return -ENOTTY;
-        }
-}
-
 static int bcm47xx_wdt_notify_sys(struct notifier_block *this,
-        unsigned long code, void *unused)
+                                  unsigned long code, void *unused)
 {
+        struct bcm47xx_wdt *wdt;
+
+        wdt = container_of(this, struct bcm47xx_wdt, notifier);
         if (code == SYS_DOWN || code == SYS_HALT)
-                bcm47xx_wdt_stop();
+                wdt->wdd.ops->stop(&wdt->wdd);
         return NOTIFY_DONE;
 }
 
-static const struct file_operations bcm47xx_wdt_fops = {
+static struct watchdog_ops bcm47xx_wdt_soft_ops = {
         .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .unlocked_ioctl = bcm47xx_wdt_ioctl,
-        .open           = bcm47xx_wdt_open,
-        .release        = bcm47xx_wdt_release,
-        .write          = bcm47xx_wdt_write,
-};
-
-static struct miscdevice bcm47xx_wdt_miscdev = {
-        .minor          = WATCHDOG_MINOR,
-        .name           = "watchdog",
-        .fops           = &bcm47xx_wdt_fops,
-};
-
-static struct notifier_block bcm47xx_wdt_notifier = {
-        .notifier_call = bcm47xx_wdt_notify_sys,
+        .start          = bcm47xx_wdt_soft_start,
+        .stop           = bcm47xx_wdt_soft_stop,
+        .ping           = bcm47xx_wdt_soft_keepalive,
+        .set_timeout    = bcm47xx_wdt_soft_set_timeout,
 };
 
-static int __init bcm47xx_wdt_init(void)
+static int bcm47xx_wdt_probe(struct platform_device *pdev)
 {
         int ret;
+        bool soft;
+        struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev);
 
-        if (bcm47xx_wdt_hw_stop() < 0)
-                return -ENODEV;
+        if (!wdt)
+                return -ENXIO;
 
-        setup_timer(&wdt_timer, bcm47xx_timer_tick, 0L);
+        soft = wdt->max_timer_ms < WDT_SOFTTIMER_THRESHOLD * 1000;
 
-        if (bcm47xx_wdt_settimeout(wdt_time)) {
-                bcm47xx_wdt_settimeout(WDT_DEFAULT_TIME);
-                pr_info("wdt_time value must be 0 < wdt_time < %d, using %d\n",
-                        (WDT_MAX_TIME + 1), wdt_time);
+        if (soft) {
+                wdt->wdd.ops = &bcm47xx_wdt_soft_ops;
+                setup_timer(&wdt->soft_timer, bcm47xx_wdt_soft_timer_tick,
+                            (long unsigned int)wdt);
+        } else {
+                wdt->wdd.ops = &bcm47xx_wdt_hard_ops;
         }
 
-        ret = register_reboot_notifier(&bcm47xx_wdt_notifier);
+        wdt->wdd.info = &bcm47xx_wdt_info;
+        wdt->wdd.timeout = WDT_DEFAULT_TIME;
+        ret = wdt->wdd.ops->set_timeout(&wdt->wdd, timeout);
         if (ret)
-                return ret;
+                goto err_timer;
+        watchdog_set_nowayout(&wdt->wdd, nowayout);
 
-        ret = misc_register(&bcm47xx_wdt_miscdev);
-        if (ret) {
-                unregister_reboot_notifier(&bcm47xx_wdt_notifier);
-                return ret;
-        }
+        wdt->notifier.notifier_call = &bcm47xx_wdt_notify_sys;
+
+        ret = register_reboot_notifier(&wdt->notifier);
+        if (ret)
+                goto err_timer;
 
-        pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n",
-                wdt_time, nowayout ? ", nowayout" : "");
+        ret = watchdog_register_device(&wdt->wdd);
+        if (ret)
+                goto err_notifier;
+
+        dev_info(&pdev->dev, "BCM47xx Watchdog Timer enabled (%d seconds%s%s)\n",
+                timeout, nowayout ? ", nowayout" : "",
+                soft ? ", Software Timer" : "");
         return 0;
+
+err_notifier:
+        unregister_reboot_notifier(&wdt->notifier);
+err_timer:
+        if (soft)
+                del_timer_sync(&wdt->soft_timer);
+
+        return ret;
 }
 
-static void __exit bcm47xx_wdt_exit(void)
+static int bcm47xx_wdt_remove(struct platform_device *pdev)
 {
-        if (!nowayout)
-                bcm47xx_wdt_stop();
+        struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev);
 
-        misc_deregister(&bcm47xx_wdt_miscdev);
+        if (!wdt)
+                return -ENXIO;
 
-        unregister_reboot_notifier(&bcm47xx_wdt_notifier);
+        watchdog_unregister_device(&wdt->wdd);
+        unregister_reboot_notifier(&wdt->notifier);
+
+        return 0;
 }
 
-module_init(bcm47xx_wdt_init);
-module_exit(bcm47xx_wdt_exit);
+static struct platform_driver bcm47xx_wdt_driver = {
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "bcm47xx-wdt",
+        },
+        .probe          = bcm47xx_wdt_probe,
+        .remove         = bcm47xx_wdt_remove,
+};
+
+module_platform_driver(bcm47xx_wdt_driver);
 
 MODULE_AUTHOR("Aleksandar Radovanovic");
+MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>");
 MODULE_DESCRIPTION("Watchdog driver for Broadcom BCM47xx");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);