| Message ID | 35b474fa750fa11781509e94675fc90e28b2d514.1618310618.git-series.a.fatoum@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | watchdog: f71808e_wdt: migrate to new kernel API | expand |
On 4/13/21 3:46 AM, Ahmad Fatoum wrote: > Migrating the driver lets us drop the watchdog misc device boilerplate > and reduces size by 285 lines. It also brings us support for new > functionality like CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED. > > This incurs a slight backwards-compatibility break, because the new > kernel watchdog API doesn't support unloading modules for drivers > whose watchdog hardware is reported to be running. > > This means following scenario will be no longer supported: > - BIOS has enabled watchdog > - Module is loaded and unloaded without opening watchdog > - module_exit is expected to succeed and disable watchdog HW > Couple of quick comments below. > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > --- > drivers/watchdog/Kconfig | 1 +- > drivers/watchdog/f71808e_wdt.c | 390 ++++------------------------------ > 2 files changed, 53 insertions(+), 338 deletions(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 7ff941e71b79..cbce0c176a7e 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -1081,6 +1081,7 @@ config EBC_C384_WDT > config F71808E_WDT > tristate "Fintek F718xx, F818xx Super I/O Watchdog" > depends on X86 > + select WATCHDOG_CORE > help > This is the driver for the hardware watchdog on the Fintek F71808E, > F71862FG, F71868, F71869, F71882FG, F71889FG, F81803, F81865, and > diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c > index 665bef272a33..5496d2bb0089 100644 > --- a/drivers/watchdog/f71808e_wdt.c > +++ b/drivers/watchdog/f71808e_wdt.c > @@ -9,16 +9,10 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include <linux/err.h> > -#include <linux/fs.h> > #include <linux/init.h> > #include <linux/io.h> > #include <linux/ioport.h> > -#include <linux/miscdevice.h> > #include <linux/module.h> > -#include <linux/mutex.h> > -#include <linux/notifier.h> > -#include <linux/reboot.h> > -#include <linux/uaccess.h> > #include <linux/watchdog.h> > > #define DRVNAME "f71808e_wdt" > @@ -137,24 +131,18 @@ static inline void superio_select(int base, int ld); > static inline void superio_exit(int base); > > struct fintek_wdt { > + struct watchdog_device wdd; > unsigned short sioaddr; > enum chips type; > - unsigned long opened; > - struct mutex lock; > - char expect_close; > struct watchdog_info ident; > > - unsigned short timeout; > u8 timer_val; /* content for the wd_time register */ > char minutes_mode; > u8 pulse_val; /* pulse width flag */ > char pulse_mode; /* enable pulse output mode? */ > - char caused_reboot; /* last reboot was by the watchdog */ > }; > > -static struct fintek_wdt watchdog = { > - .lock = __MUTEX_INITIALIZER(watchdog.lock), > -}; > +static struct fintek_wdt watchdog; This should really be allocated, and "watchdog" is a terrible variable name even if static, especially given the previous patch. > > /* Super I/O functions */ > static inline int superio_inb(int base, int reg) > @@ -218,17 +206,9 @@ static inline void superio_exit(int base) > release_region(base, 2); > } > > -static int fintek_wdt_set_timeout(int timeout) > +static int fintek_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout) > { > - if (timeout <= 0 > - || timeout > max_timeout) { > - pr_err("watchdog timeout out of range\n"); > - return -EINVAL; > - } > - > - mutex_lock(&watchdog.lock); > - > - watchdog.timeout = timeout; > + wdd->timeout = timeout; This needs to save the actual timeout, which differs from the configured one if larger than 255. > if (timeout > 0xff) { > watchdog.timer_val = DIV_ROUND_UP(timeout, 60); > watchdog.minutes_mode = true; > @@ -237,14 +217,11 @@ static int fintek_wdt_set_timeout(int timeout) > watchdog.minutes_mode = false; > } > > - mutex_unlock(&watchdog.lock); > - > return 0; > } > > static int fintek_wdt_set_pulse_width(unsigned int pw) > { > - int err = 0; > unsigned int t1 = 25, t2 = 125, t3 = 5000; > > if (watchdog.type == f71868) { > @@ -253,8 +230,6 @@ static int fintek_wdt_set_pulse_width(unsigned int pw) > t3 = 6000; > } > > - mutex_lock(&watchdog.lock); > - > if (pw <= 1) { > watchdog.pulse_val = 0; > } else if (pw <= t1) { > @@ -265,25 +240,21 @@ static int fintek_wdt_set_pulse_width(unsigned int pw) > watchdog.pulse_val = 3; > } else { > pr_err("pulse width out of range\n"); > - err = -EINVAL; > - goto exit_unlock; > + return -EINVAL; > } > > watchdog.pulse_mode = pw; > > -exit_unlock: > - mutex_unlock(&watchdog.lock); > - return err; > + return 0; > } > > -static int fintek_wdt_keepalive(void) > +static int fintek_wdt_keepalive(struct watchdog_device *wdd) > { > - int err = 0; > + int err; > > - mutex_lock(&watchdog.lock); > err = superio_enter(watchdog.sioaddr); > if (err) > - goto exit_unlock; > + return err; > superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); > > if (watchdog.minutes_mode) > @@ -301,25 +272,22 @@ static int fintek_wdt_keepalive(void) > > superio_exit(watchdog.sioaddr); > > -exit_unlock: > - mutex_unlock(&watchdog.lock); > - return err; > + return 0; > } > > -static int fintek_wdt_start(void) > +static int fintek_wdt_start(struct watchdog_device *wdd) > { > int err; > u8 tmp; > > /* Make sure we don't die as soon as the watchdog is enabled below */ > - err = fintek_wdt_keepalive(); > + err = fintek_wdt_keepalive(wdd); > if (err) > return err; > > - mutex_lock(&watchdog.lock); > err = superio_enter(watchdog.sioaddr); > if (err) > - goto exit_unlock; > + return err; > superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); > > /* Watchdog pin configuration */ > @@ -407,6 +375,8 @@ static int fintek_wdt_start(void) > superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDT_CONF, > F71808FG_FLAG_WD_EN); > > + set_bit(WDOG_HW_RUNNING, &wdd->status); > + This is wrong unless the watchdog can not be stopped. With the bit set, the core will continue pinging the satchdog even after it was stopped. The bit should be set only if the watchdog can not be stopped once started, which I think is not the case here. > if (watchdog.pulse_mode) { > /* Select "pulse" output mode with given duration */ > u8 wdt_conf = superio_inb(watchdog.sioaddr, > @@ -427,20 +397,17 @@ static int fintek_wdt_start(void) > > exit_superio: > superio_exit(watchdog.sioaddr); > -exit_unlock: > - mutex_unlock(&watchdog.lock); > > return err; > } > > -static int fintek_wdt_stop(void) > +static int fintek_wdt_stop(struct watchdog_device *wdd) > { > - int err = 0; > + int err; > > - mutex_lock(&watchdog.lock); > err = superio_enter(watchdog.sioaddr); > if (err) > - goto exit_unlock; > + return err; > superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); > > superio_clear_bit(watchdog.sioaddr, F71808FG_REG_WDT_CONF, > @@ -448,232 +415,31 @@ static int fintek_wdt_stop(void) > > superio_exit(watchdog.sioaddr); > > -exit_unlock: > - mutex_unlock(&watchdog.lock); > - > - return err; > -} > - > -static int watchdog_get_status(void) > -{ > - int status = 0; > - > - mutex_lock(&watchdog.lock); > - status = (watchdog.caused_reboot) ? WDIOF_CARDRESET : 0; > - mutex_unlock(&watchdog.lock); > - > - return status; > -} > - > -static bool fintek_wdt_is_running(void) > -{ > - /* > - * if we fail to determine the watchdog's status assume it to be > - * running to be on the safe side > - */ > - bool is_running = true; > - > - mutex_lock(&watchdog.lock); > - if (superio_enter(watchdog.sioaddr)) > - goto exit_unlock; > - superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); > - > - is_running = (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0)) > - && (superio_inb(watchdog.sioaddr, F71808FG_REG_WDT_CONF) > - & BIT(F71808FG_FLAG_WD_EN)); > - > - superio_exit(watchdog.sioaddr); > - > -exit_unlock: > - mutex_unlock(&watchdog.lock); > - return is_running; > -} > - > -/* /dev/watchdog api */ > - > -static int watchdog_open(struct inode *inode, struct file *file) > -{ > - int err; > - > - /* If the watchdog is alive we don't need to start it again */ > - if (test_and_set_bit(0, &watchdog.opened)) > - return -EBUSY; > - > - err = fintek_wdt_start(); > - if (err) { > - clear_bit(0, &watchdog.opened); > - return err; > - } > - > - if (nowayout) > - __module_get(THIS_MODULE); > - > - watchdog.expect_close = 0; > - return stream_open(inode, file); > -} > - > -static int watchdog_release(struct inode *inode, struct file *file) > -{ > - clear_bit(0, &watchdog.opened); > - > - if (!watchdog.expect_close) { > - fintek_wdt_keepalive(); > - pr_crit("Unexpected close, not stopping watchdog!\n"); > - } else if (!nowayout) { > - fintek_wdt_stop(); > - } > return 0; > } > > -/* > - * watchdog_write: > - * @file: file handle to the watchdog > - * @buf: buffer to write > - * @count: count of bytes > - * @ppos: pointer to the position to write. No seeks allowed > - * > - * A write to a watchdog device is defined as a keepalive signal. Any > - * write of data will do, as we we don't define content meaning. > - */ > - > -static ssize_t watchdog_write(struct file *file, const char __user *buf, > - size_t count, loff_t *ppos) > +static bool fintek_wdt_is_running(u8 wdt_conf) > { > - if (count) { > - if (!nowayout) { > - size_t i; > - > - /* In case it was set long ago */ > - bool expect_close = false; > - > - for (i = 0; i != count; i++) { > - char c; > - if (get_user(c, buf + i)) > - return -EFAULT; > - if (c == 'V') > - expect_close = true; > - } > - > - /* Properly order writes across fork()ed processes */ > - mutex_lock(&watchdog.lock); > - watchdog.expect_close = expect_close; > - mutex_unlock(&watchdog.lock); > - } > - > - /* someone wrote to us, we should restart timer */ > - fintek_wdt_keepalive(); > - } > - return count; > + return (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0)) > + && (wdt_conf & BIT(F71808FG_FLAG_WD_EN)); > } > > -/* > - * watchdog_ioctl: > - * @inode: inode of the device > - * @file: file handle to the device > - * @cmd: watchdog command > - * @arg: argument pointer > - * > - * The watchdog API defines a common set of functions for all watchdogs > - * according to their available features. > - */ > -static long watchdog_ioctl(struct file *file, unsigned int cmd, > - unsigned long arg) > -{ > - int status; > - int new_options; > - int new_timeout; > - union { > - struct watchdog_info __user *ident; > - int __user *i; > - } uarg; > - > - uarg.i = (int __user *)arg; > - > - switch (cmd) { > - case WDIOC_GETSUPPORT: > - return copy_to_user(uarg.ident, &watchdog.ident, > - sizeof(watchdog.ident)) ? -EFAULT : 0; > - > - case WDIOC_GETSTATUS: > - status = watchdog_get_status(); > - if (status < 0) > - return status; > - return put_user(status, uarg.i); > - > - case WDIOC_GETBOOTSTATUS: > - return put_user(0, uarg.i); > - > - case WDIOC_SETOPTIONS: > - if (get_user(new_options, uarg.i)) > - return -EFAULT; > - > - if (new_options & WDIOS_DISABLECARD) > - fintek_wdt_stop(); > - > - if (new_options & WDIOS_ENABLECARD) > - return fintek_wdt_start(); > - fallthrough; > - > - case WDIOC_KEEPALIVE: > - fintek_wdt_keepalive(); > - return 0; > - > - case WDIOC_SETTIMEOUT: > - if (get_user(new_timeout, uarg.i)) > - return -EFAULT; > - > - if (fintek_wdt_set_timeout(new_timeout)) > - return -EINVAL; > - > - fintek_wdt_keepalive(); > - fallthrough; > - > - case WDIOC_GETTIMEOUT: > - return put_user(watchdog.timeout, uarg.i); > - > - default: > - return -ENOTTY; > - > - } > -} > - > -static int watchdog_notify_sys(struct notifier_block *this, unsigned long code, > - void *unused) > -{ > - if (code == SYS_DOWN || code == SYS_HALT) > - fintek_wdt_stop(); > - return NOTIFY_DONE; > -} > - > -static const struct file_operations watchdog_fops = { > - .owner = THIS_MODULE, > - .llseek = no_llseek, > - .open = watchdog_open, > - .release = watchdog_release, > - .write = watchdog_write, > - .unlocked_ioctl = watchdog_ioctl, > - .compat_ioctl = compat_ptr_ioctl, > -}; > - > -static struct miscdevice watchdog_miscdev = { > - .minor = WATCHDOG_MINOR, > - .name = "watchdog", > - .fops = &watchdog_fops, > -}; > - > -static struct notifier_block watchdog_notifier = { > - .notifier_call = watchdog_notify_sys, > +static const struct watchdog_ops fintek_wdt_ops = { > + .owner = THIS_MODULE, > + .start = fintek_wdt_start, > + .stop = fintek_wdt_stop, > + .ping = fintek_wdt_keepalive, > + .set_timeout = fintek_wdt_set_timeout, > }; > > static int __init watchdog_init(int sioaddr) > { > + struct watchdog_device *wdd; > int wdt_conf, err = 0; > > - /* No need to lock watchdog.lock here because no entry points > - * into the module have been registered yet. > - */ > watchdog.sioaddr = sioaddr; > - watchdog.ident.options = WDIOF_MAGICCLOSE > + watchdog.ident.options = WDIOF_SETTIMEOUT > + | WDIOF_MAGICCLOSE > | WDIOF_KEEPALIVEPING > | WDIOF_CARDRESET; > > @@ -687,7 +453,6 @@ static int __init watchdog_init(int sioaddr) > superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); > > wdt_conf = superio_inb(sioaddr, F71808FG_REG_WDT_CONF); > - watchdog.caused_reboot = wdt_conf & BIT(F71808FG_FLAG_WDTMOUT_STS); > > /* > * We don't want WDTMOUT_STS to stick around till regular reboot. > @@ -696,80 +461,34 @@ static int __init watchdog_init(int sioaddr) > superio_outb(sioaddr, F71808FG_REG_WDT_CONF, > wdt_conf | BIT(F71808FG_FLAG_WDTMOUT_STS)); > > - superio_exit(sioaddr); > - > - err = fintek_wdt_set_timeout(timeout); > - if (err) > - return err; > - err = fintek_wdt_set_pulse_width(pulse_width); > - if (err) > - return err; > - > - err = register_reboot_notifier(&watchdog_notifier); > - if (err) > - return err; > + wdd = &watchdog.wdd; > > - err = misc_register(&watchdog_miscdev); > - if (err) { > - pr_err("cannot register miscdev on minor=%d\n", > - watchdog_miscdev.minor); > - goto exit_reboot; > - } > + if (fintek_wdt_is_running(wdt_conf)) > + set_bit(WDOG_HW_RUNNING, &wdd->status); > > - if (start_withtimeout) { > - if (start_withtimeout <= 0 > - || start_withtimeout > max_timeout) { > - pr_err("starting timeout out of range\n"); > - err = -EINVAL; > - goto exit_miscdev; > - } > - > - err = fintek_wdt_start(); > - if (err) { > - pr_err("cannot start watchdog timer\n"); > - goto exit_miscdev; > - } > - > - mutex_lock(&watchdog.lock); > - err = superio_enter(sioaddr); > - if (err) > - goto exit_unlock; > - superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); > - > - if (start_withtimeout > 0xff) { > - /* select minutes for timer units */ > - superio_set_bit(sioaddr, F71808FG_REG_WDT_CONF, > - F71808FG_FLAG_WD_UNIT); > - superio_outb(sioaddr, F71808FG_REG_WD_TIME, > - DIV_ROUND_UP(start_withtimeout, 60)); > - } else { > - /* select seconds for timer units */ > - superio_clear_bit(sioaddr, F71808FG_REG_WDT_CONF, > - F71808FG_FLAG_WD_UNIT); > - superio_outb(sioaddr, F71808FG_REG_WD_TIME, > - start_withtimeout); > - } > + superio_exit(sioaddr); > > - superio_exit(sioaddr); > - mutex_unlock(&watchdog.lock); > + wdd->info = &watchdog.ident; > + wdd->ops = &fintek_wdt_ops; > + wdd->min_timeout = 1; > + wdd->max_timeout = max_timeout; > > - if (nowayout) > - __module_get(THIS_MODULE); > + watchdog_set_nowayout(wdd, nowayout); > + watchdog_stop_on_unregister(wdd); > + watchdog_stop_on_reboot(wdd); > + watchdog_init_timeout(wdd, start_withtimeout, NULL); > > - pr_info("watchdog started with initial timeout of %u sec\n", > - start_withtimeout); > - } > + if (wdt_conf & BIT(F71808FG_FLAG_WDTMOUT_STS)) > + wdd->bootstatus = WDIOF_CARDRESET; > > - return 0; > - > -exit_unlock: > - mutex_unlock(&watchdog.lock); > -exit_miscdev: > - misc_deregister(&watchdog_miscdev); > -exit_reboot: > - unregister_reboot_notifier(&watchdog_notifier); > + /* > + * WATCHDOG_HANDLE_BOOT_ENABLED can result in keepalive being directly > + * called without a set_timeout before, so it needs to be done here once > + */ > + fintek_wdt_set_timeout(wdd, timeout); > + fintek_wdt_set_pulse_width(pulse_width); > > - return err; > + return watchdog_register_device(wdd); > } > > static int __init fintek_wdt_find(int sioaddr) > @@ -859,12 +578,7 @@ static int __init fintek_wdt_init(void) > > static void __exit fintek_wdt_exit(void) > { > - if (fintek_wdt_is_running()) { > - pr_warn("Watchdog timer still running, stopping it\n"); > - fintek_wdt_stop(); > - } > - misc_deregister(&watchdog_miscdev); > - unregister_reboot_notifier(&watchdog_notifier); > + watchdog_unregister_device(&watchdog.wdd); > } > > MODULE_DESCRIPTION("F71808E Watchdog Driver"); >
Hello Guenter, On 03.05.21 16:31, Guenter Roeck wrote: >> -static struct fintek_wdt watchdog = { >> - .lock = __MUTEX_INITIALIZER(watchdog.lock), >> -}; >> +static struct fintek_wdt watchdog; > > This should really be allocated, and "watchdog" is a terrible variable name > even if static, especially given the previous patch. I can add a follow up patch to change this. I maintained the old state of things here to make review easier. > >> >> /* Super I/O functions */ >> static inline int superio_inb(int base, int reg) >> @@ -218,17 +206,9 @@ static inline void superio_exit(int base) >> release_region(base, 2); >> } >> >> -static int fintek_wdt_set_timeout(int timeout) >> +static int fintek_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout) >> { >> - if (timeout <= 0 >> - || timeout > max_timeout) { >> - pr_err("watchdog timeout out of range\n"); >> - return -EINVAL; >> - } >> - >> - mutex_lock(&watchdog.lock); >> - >> - watchdog.timeout = timeout; >> + wdd->timeout = timeout; > > This needs to save the actual timeout, which differs from the > configured one if larger than 255. Oh, makes sense. Will changes with v4. Thanks, Ahmad
On Mon, May 03, 2021 at 04:39:25PM +0200, Ahmad Fatoum wrote: > Hello Guenter, > > On 03.05.21 16:31, Guenter Roeck wrote: > >> -static struct fintek_wdt watchdog = { > >> - .lock = __MUTEX_INITIALIZER(watchdog.lock), > >> -}; > >> +static struct fintek_wdt watchdog; > > > > This should really be allocated, and "watchdog" is a terrible variable name > > even if static, especially given the previous patch. > > I can add a follow up patch to change this. I maintained the old > state of things here to make review easier. > Odd argument. You changed all the function names (unnecessarily, if you ask me) in the first patch of the series because they were too generic in your opinion. That by itself added a lot of unnecessary complexity to the review. And pretty much everything else changed in this patch anyway. Guenter
Hello Guenter, On 03.05.21 17:28, Guenter Roeck wrote: > On Mon, May 03, 2021 at 04:39:25PM +0200, Ahmad Fatoum wrote: >> Hello Guenter, >> >> On 03.05.21 16:31, Guenter Roeck wrote: >>>> -static struct fintek_wdt watchdog = { >>>> - .lock = __MUTEX_INITIALIZER(watchdog.lock), >>>> -}; >>>> +static struct fintek_wdt watchdog; >>> >>> This should really be allocated, and "watchdog" is a terrible variable name >>> even if static, especially given the previous patch. >> >> I can add a follow up patch to change this. I maintained the old >> state of things here to make review easier. >> > Odd argument. You changed all the function names (unnecessarily, > if you ask me) in the first patch of the series because they were > too generic in your opinion. I find it surprising to have a function called watchdog_set_timeout defined locally in a driver. But yes, the first patch was more useful in v2, where new functions were added for pinmuxing each variant. Having f71808e_ for generic code and f8186fg_ for a variant would not help code comprehension. > That by itself added a lot of unnecessary complexity to the review. This was not my intention. I figured having a separate patch that just does the rename should make review of follow-up commits easier, not harder... > And pretty much everything else changed > in this patch anyway. Feedback on v2 was that I change too much and that this made review harder. I thus left name changes in a separate patch and limited changes in follow-up commit to signatures where appropriate. Thanks, Ahmad > > Guenter >
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 7ff941e71b79..cbce0c176a7e 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1081,6 +1081,7 @@ config EBC_C384_WDT config F71808E_WDT tristate "Fintek F718xx, F818xx Super I/O Watchdog" depends on X86 + select WATCHDOG_CORE help This is the driver for the hardware watchdog on the Fintek F71808E, F71862FG, F71868, F71869, F71882FG, F71889FG, F81803, F81865, and diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c index 665bef272a33..5496d2bb0089 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -9,16 +9,10 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/err.h> -#include <linux/fs.h> #include <linux/init.h> #include <linux/io.h> #include <linux/ioport.h> -#include <linux/miscdevice.h> #include <linux/module.h> -#include <linux/mutex.h> -#include <linux/notifier.h> -#include <linux/reboot.h> -#include <linux/uaccess.h> #include <linux/watchdog.h> #define DRVNAME "f71808e_wdt" @@ -137,24 +131,18 @@ static inline void superio_select(int base, int ld); static inline void superio_exit(int base); struct fintek_wdt { + struct watchdog_device wdd; unsigned short sioaddr; enum chips type; - unsigned long opened; - struct mutex lock; - char expect_close; struct watchdog_info ident; - unsigned short timeout; u8 timer_val; /* content for the wd_time register */ char minutes_mode; u8 pulse_val; /* pulse width flag */ char pulse_mode; /* enable pulse output mode? */ - char caused_reboot; /* last reboot was by the watchdog */ }; -static struct fintek_wdt watchdog = { - .lock = __MUTEX_INITIALIZER(watchdog.lock), -}; +static struct fintek_wdt watchdog; /* Super I/O functions */ static inline int superio_inb(int base, int reg) @@ -218,17 +206,9 @@ static inline void superio_exit(int base) release_region(base, 2); } -static int fintek_wdt_set_timeout(int timeout) +static int fintek_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout) { - if (timeout <= 0 - || timeout > max_timeout) { - pr_err("watchdog timeout out of range\n"); - return -EINVAL; - } - - mutex_lock(&watchdog.lock); - - watchdog.timeout = timeout; + wdd->timeout = timeout; if (timeout > 0xff) { watchdog.timer_val = DIV_ROUND_UP(timeout, 60); watchdog.minutes_mode = true; @@ -237,14 +217,11 @@ static int fintek_wdt_set_timeout(int timeout) watchdog.minutes_mode = false; } - mutex_unlock(&watchdog.lock); - return 0; } static int fintek_wdt_set_pulse_width(unsigned int pw) { - int err = 0; unsigned int t1 = 25, t2 = 125, t3 = 5000; if (watchdog.type == f71868) { @@ -253,8 +230,6 @@ static int fintek_wdt_set_pulse_width(unsigned int pw) t3 = 6000; } - mutex_lock(&watchdog.lock); - if (pw <= 1) { watchdog.pulse_val = 0; } else if (pw <= t1) { @@ -265,25 +240,21 @@ static int fintek_wdt_set_pulse_width(unsigned int pw) watchdog.pulse_val = 3; } else { pr_err("pulse width out of range\n"); - err = -EINVAL; - goto exit_unlock; + return -EINVAL; } watchdog.pulse_mode = pw; -exit_unlock: - mutex_unlock(&watchdog.lock); - return err; + return 0; } -static int fintek_wdt_keepalive(void) +static int fintek_wdt_keepalive(struct watchdog_device *wdd) { - int err = 0; + int err; - mutex_lock(&watchdog.lock); err = superio_enter(watchdog.sioaddr); if (err) - goto exit_unlock; + return err; superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); if (watchdog.minutes_mode) @@ -301,25 +272,22 @@ static int fintek_wdt_keepalive(void) superio_exit(watchdog.sioaddr); -exit_unlock: - mutex_unlock(&watchdog.lock); - return err; + return 0; } -static int fintek_wdt_start(void) +static int fintek_wdt_start(struct watchdog_device *wdd) { int err; u8 tmp; /* Make sure we don't die as soon as the watchdog is enabled below */ - err = fintek_wdt_keepalive(); + err = fintek_wdt_keepalive(wdd); if (err) return err; - mutex_lock(&watchdog.lock); err = superio_enter(watchdog.sioaddr); if (err) - goto exit_unlock; + return err; superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); /* Watchdog pin configuration */ @@ -407,6 +375,8 @@ static int fintek_wdt_start(void) superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDT_CONF, F71808FG_FLAG_WD_EN); + set_bit(WDOG_HW_RUNNING, &wdd->status); + if (watchdog.pulse_mode) { /* Select "pulse" output mode with given duration */ u8 wdt_conf = superio_inb(watchdog.sioaddr, @@ -427,20 +397,17 @@ static int fintek_wdt_start(void) exit_superio: superio_exit(watchdog.sioaddr); -exit_unlock: - mutex_unlock(&watchdog.lock); return err; } -static int fintek_wdt_stop(void) +static int fintek_wdt_stop(struct watchdog_device *wdd) { - int err = 0; + int err; - mutex_lock(&watchdog.lock); err = superio_enter(watchdog.sioaddr); if (err) - goto exit_unlock; + return err; superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); superio_clear_bit(watchdog.sioaddr, F71808FG_REG_WDT_CONF, @@ -448,232 +415,31 @@ static int fintek_wdt_stop(void) superio_exit(watchdog.sioaddr); -exit_unlock: - mutex_unlock(&watchdog.lock); - - return err; -} - -static int watchdog_get_status(void) -{ - int status = 0; - - mutex_lock(&watchdog.lock); - status = (watchdog.caused_reboot) ? WDIOF_CARDRESET : 0; - mutex_unlock(&watchdog.lock); - - return status; -} - -static bool fintek_wdt_is_running(void) -{ - /* - * if we fail to determine the watchdog's status assume it to be - * running to be on the safe side - */ - bool is_running = true; - - mutex_lock(&watchdog.lock); - if (superio_enter(watchdog.sioaddr)) - goto exit_unlock; - superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); - - is_running = (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0)) - && (superio_inb(watchdog.sioaddr, F71808FG_REG_WDT_CONF) - & BIT(F71808FG_FLAG_WD_EN)); - - superio_exit(watchdog.sioaddr); - -exit_unlock: - mutex_unlock(&watchdog.lock); - return is_running; -} - -/* /dev/watchdog api */ - -static int watchdog_open(struct inode *inode, struct file *file) -{ - int err; - - /* If the watchdog is alive we don't need to start it again */ - if (test_and_set_bit(0, &watchdog.opened)) - return -EBUSY; - - err = fintek_wdt_start(); - if (err) { - clear_bit(0, &watchdog.opened); - return err; - } - - if (nowayout) - __module_get(THIS_MODULE); - - watchdog.expect_close = 0; - return stream_open(inode, file); -} - -static int watchdog_release(struct inode *inode, struct file *file) -{ - clear_bit(0, &watchdog.opened); - - if (!watchdog.expect_close) { - fintek_wdt_keepalive(); - pr_crit("Unexpected close, not stopping watchdog!\n"); - } else if (!nowayout) { - fintek_wdt_stop(); - } return 0; } -/* - * watchdog_write: - * @file: file handle to the watchdog - * @buf: buffer to write - * @count: count of bytes - * @ppos: pointer to the position to write. No seeks allowed - * - * A write to a watchdog device is defined as a keepalive signal. Any - * write of data will do, as we we don't define content meaning. - */ - -static ssize_t watchdog_write(struct file *file, const char __user *buf, - size_t count, loff_t *ppos) +static bool fintek_wdt_is_running(u8 wdt_conf) { - if (count) { - if (!nowayout) { - size_t i; - - /* In case it was set long ago */ - bool expect_close = false; - - for (i = 0; i != count; i++) { - char c; - if (get_user(c, buf + i)) - return -EFAULT; - if (c == 'V') - expect_close = true; - } - - /* Properly order writes across fork()ed processes */ - mutex_lock(&watchdog.lock); - watchdog.expect_close = expect_close; - mutex_unlock(&watchdog.lock); - } - - /* someone wrote to us, we should restart timer */ - fintek_wdt_keepalive(); - } - return count; + return (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0)) + && (wdt_conf & BIT(F71808FG_FLAG_WD_EN)); } -/* - * watchdog_ioctl: - * @inode: inode of the device - * @file: file handle to the device - * @cmd: watchdog command - * @arg: argument pointer - * - * The watchdog API defines a common set of functions for all watchdogs - * according to their available features. - */ -static long watchdog_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - int status; - int new_options; - int new_timeout; - union { - struct watchdog_info __user *ident; - int __user *i; - } uarg; - - uarg.i = (int __user *)arg; - - switch (cmd) { - case WDIOC_GETSUPPORT: - return copy_to_user(uarg.ident, &watchdog.ident, - sizeof(watchdog.ident)) ? -EFAULT : 0; - - case WDIOC_GETSTATUS: - status = watchdog_get_status(); - if (status < 0) - return status; - return put_user(status, uarg.i); - - case WDIOC_GETBOOTSTATUS: - return put_user(0, uarg.i); - - case WDIOC_SETOPTIONS: - if (get_user(new_options, uarg.i)) - return -EFAULT; - - if (new_options & WDIOS_DISABLECARD) - fintek_wdt_stop(); - - if (new_options & WDIOS_ENABLECARD) - return fintek_wdt_start(); - fallthrough; - - case WDIOC_KEEPALIVE: - fintek_wdt_keepalive(); - return 0; - - case WDIOC_SETTIMEOUT: - if (get_user(new_timeout, uarg.i)) - return -EFAULT; - - if (fintek_wdt_set_timeout(new_timeout)) - return -EINVAL; - - fintek_wdt_keepalive(); - fallthrough; - - case WDIOC_GETTIMEOUT: - return put_user(watchdog.timeout, uarg.i); - - default: - return -ENOTTY; - - } -} - -static int watchdog_notify_sys(struct notifier_block *this, unsigned long code, - void *unused) -{ - if (code == SYS_DOWN || code == SYS_HALT) - fintek_wdt_stop(); - return NOTIFY_DONE; -} - -static const struct file_operations watchdog_fops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .open = watchdog_open, - .release = watchdog_release, - .write = watchdog_write, - .unlocked_ioctl = watchdog_ioctl, - .compat_ioctl = compat_ptr_ioctl, -}; - -static struct miscdevice watchdog_miscdev = { - .minor = WATCHDOG_MINOR, - .name = "watchdog", - .fops = &watchdog_fops, -}; - -static struct notifier_block watchdog_notifier = { - .notifier_call = watchdog_notify_sys, +static const struct watchdog_ops fintek_wdt_ops = { + .owner = THIS_MODULE, + .start = fintek_wdt_start, + .stop = fintek_wdt_stop, + .ping = fintek_wdt_keepalive, + .set_timeout = fintek_wdt_set_timeout, }; static int __init watchdog_init(int sioaddr) { + struct watchdog_device *wdd; int wdt_conf, err = 0; - /* No need to lock watchdog.lock here because no entry points - * into the module have been registered yet. - */ watchdog.sioaddr = sioaddr; - watchdog.ident.options = WDIOF_MAGICCLOSE + watchdog.ident.options = WDIOF_SETTIMEOUT + | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING | WDIOF_CARDRESET; @@ -687,7 +453,6 @@ static int __init watchdog_init(int sioaddr) superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); wdt_conf = superio_inb(sioaddr, F71808FG_REG_WDT_CONF); - watchdog.caused_reboot = wdt_conf & BIT(F71808FG_FLAG_WDTMOUT_STS); /* * We don't want WDTMOUT_STS to stick around till regular reboot. @@ -696,80 +461,34 @@ static int __init watchdog_init(int sioaddr) superio_outb(sioaddr, F71808FG_REG_WDT_CONF, wdt_conf | BIT(F71808FG_FLAG_WDTMOUT_STS)); - superio_exit(sioaddr); - - err = fintek_wdt_set_timeout(timeout); - if (err) - return err; - err = fintek_wdt_set_pulse_width(pulse_width); - if (err) - return err; - - err = register_reboot_notifier(&watchdog_notifier); - if (err) - return err; + wdd = &watchdog.wdd; - err = misc_register(&watchdog_miscdev); - if (err) { - pr_err("cannot register miscdev on minor=%d\n", - watchdog_miscdev.minor); - goto exit_reboot; - } + if (fintek_wdt_is_running(wdt_conf)) + set_bit(WDOG_HW_RUNNING, &wdd->status); - if (start_withtimeout) { - if (start_withtimeout <= 0 - || start_withtimeout > max_timeout) { - pr_err("starting timeout out of range\n"); - err = -EINVAL; - goto exit_miscdev; - } - - err = fintek_wdt_start(); - if (err) { - pr_err("cannot start watchdog timer\n"); - goto exit_miscdev; - } - - mutex_lock(&watchdog.lock); - err = superio_enter(sioaddr); - if (err) - goto exit_unlock; - superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); - - if (start_withtimeout > 0xff) { - /* select minutes for timer units */ - superio_set_bit(sioaddr, F71808FG_REG_WDT_CONF, - F71808FG_FLAG_WD_UNIT); - superio_outb(sioaddr, F71808FG_REG_WD_TIME, - DIV_ROUND_UP(start_withtimeout, 60)); - } else { - /* select seconds for timer units */ - superio_clear_bit(sioaddr, F71808FG_REG_WDT_CONF, - F71808FG_FLAG_WD_UNIT); - superio_outb(sioaddr, F71808FG_REG_WD_TIME, - start_withtimeout); - } + superio_exit(sioaddr); - superio_exit(sioaddr); - mutex_unlock(&watchdog.lock); + wdd->info = &watchdog.ident; + wdd->ops = &fintek_wdt_ops; + wdd->min_timeout = 1; + wdd->max_timeout = max_timeout; - if (nowayout) - __module_get(THIS_MODULE); + watchdog_set_nowayout(wdd, nowayout); + watchdog_stop_on_unregister(wdd); + watchdog_stop_on_reboot(wdd); + watchdog_init_timeout(wdd, start_withtimeout, NULL); - pr_info("watchdog started with initial timeout of %u sec\n", - start_withtimeout); - } + if (wdt_conf & BIT(F71808FG_FLAG_WDTMOUT_STS)) + wdd->bootstatus = WDIOF_CARDRESET; - return 0; - -exit_unlock: - mutex_unlock(&watchdog.lock); -exit_miscdev: - misc_deregister(&watchdog_miscdev); -exit_reboot: - unregister_reboot_notifier(&watchdog_notifier); + /* + * WATCHDOG_HANDLE_BOOT_ENABLED can result in keepalive being directly + * called without a set_timeout before, so it needs to be done here once + */ + fintek_wdt_set_timeout(wdd, timeout); + fintek_wdt_set_pulse_width(pulse_width); - return err; + return watchdog_register_device(wdd); } static int __init fintek_wdt_find(int sioaddr) @@ -859,12 +578,7 @@ static int __init fintek_wdt_init(void) static void __exit fintek_wdt_exit(void) { - if (fintek_wdt_is_running()) { - pr_warn("Watchdog timer still running, stopping it\n"); - fintek_wdt_stop(); - } - misc_deregister(&watchdog_miscdev); - unregister_reboot_notifier(&watchdog_notifier); + watchdog_unregister_device(&watchdog.wdd); } MODULE_DESCRIPTION("F71808E Watchdog Driver");
Migrating the driver lets us drop the watchdog misc device boilerplate and reduces size by 285 lines. It also brings us support for new functionality like CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED. This incurs a slight backwards-compatibility break, because the new kernel watchdog API doesn't support unloading modules for drivers whose watchdog hardware is reported to be running. This means following scenario will be no longer supported: - BIOS has enabled watchdog - Module is loaded and unloaded without opening watchdog - module_exit is expected to succeed and disable watchdog HW Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- drivers/watchdog/Kconfig | 1 +- drivers/watchdog/f71808e_wdt.c | 390 ++++------------------------------ 2 files changed, 53 insertions(+), 338 deletions(-)