| Message ID | 20200620174907.20229-6-minyard@acm.org (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | Convert the IPMI watchdog to use the watchdog | expand |
On Sat, Jun 20, 2020 at 12:49:02PM -0500, minyard@acm.org wrote: > From: Corey Minyard <cminyard@mvista.com> > > This way a watchdog driver can start itself. The watchdog driver can start itself prior to registration if it wants to, like many other watchdog drivers already do. All the driver needs to do is to call its own start function. I do not see the need for this API. Guenter > > Signed-off-by: Corey Minyard <cminyard@mvista.com> > --- > drivers/watchdog/watchdog_dev.c | 30 ++++++++++++++++++++++++++---- > include/linux/watchdog.h | 3 +++ > 2 files changed, 29 insertions(+), 4 deletions(-) > > diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c > index 6c423aed3f3c..752358df1606 100644 > --- a/drivers/watchdog/watchdog_dev.c > +++ b/drivers/watchdog/watchdog_dev.c > @@ -253,7 +253,7 @@ static enum hrtimer_restart watchdog_timer_expired(struct hrtimer *timer) > } > > /* > - * watchdog_start: wrapper to start the watchdog. > + * _watchdog_start: wrapper to start the watchdog. > * @wdd: the watchdog device to start > * > * The caller must hold wd_data->lock. > @@ -263,7 +263,7 @@ static enum hrtimer_restart watchdog_timer_expired(struct hrtimer *timer) > * failure. > */ > > -static int watchdog_start(struct watchdog_device *wdd) > +static int _watchdog_start(struct watchdog_device *wdd) > { > struct watchdog_core_data *wd_data = wdd->wd_data; > ktime_t started_at; > @@ -289,6 +289,28 @@ static int watchdog_start(struct watchdog_device *wdd) > return err; > } > > +/* > + * watchdog_start: External interface to start the watchdog. > + * @wdd: the watchdog device to start > + * > + * Start the watchdog if it is not active and mark it active. > + * This function returns zero on success or a negative errno code for > + * failure. > + */ > + > +int watchdog_start(struct watchdog_device *wdd) > +{ > + struct watchdog_core_data *wd_data = wdd->wd_data; > + int err; > + > + mutex_lock(&wd_data->lock); > + err = _watchdog_start(wdd); > + mutex_unlock(&wd_data->lock); > + > + return err; > +} > +EXPORT_SYMBOL_GPL(watchdog_start); > + > /* > * watchdog_stop: wrapper to stop the watchdog. > * @wdd: the watchdog device to stop > @@ -837,7 +859,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, > break; > } > if (val & WDIOS_ENABLECARD) > - err = watchdog_start(wdd); > + err = _watchdog_start(wdd); > break; > case WDIOC_KEEPALIVE: > if (!(wdd->info->options & WDIOF_KEEPALIVEPING)) { > @@ -935,7 +957,7 @@ static int watchdog_open(struct inode *inode, struct file *file) > goto out_clear; > } > > - err = watchdog_start(wdd); > + err = _watchdog_start(wdd); > if (err < 0) > goto out_mod; > > diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h > index 95396b644a9b..1eefae61215d 100644 > --- a/include/linux/watchdog.h > +++ b/include/linux/watchdog.h > @@ -205,6 +205,9 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd) > int watchdog_set_timeout(struct watchdog_device *wdd, unsigned int timeout); > int watchdog_set_pretimeout(struct watchdog_device *wdd, unsigned int timeout); > > +/* Allow the driver to start the watchdog. */ > +int watchdog_start(struct watchdog_device *wdd); > + > /* Use the following functions to report watchdog pretimeout event */ > #if IS_ENABLED(CONFIG_WATCHDOG_PRETIMEOUT_GOV) > void watchdog_notify_pretimeout(struct watchdog_device *wdd); > -- > 2.17.1 >
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 6c423aed3f3c..752358df1606 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -253,7 +253,7 @@ static enum hrtimer_restart watchdog_timer_expired(struct hrtimer *timer) } /* - * watchdog_start: wrapper to start the watchdog. + * _watchdog_start: wrapper to start the watchdog. * @wdd: the watchdog device to start * * The caller must hold wd_data->lock. @@ -263,7 +263,7 @@ static enum hrtimer_restart watchdog_timer_expired(struct hrtimer *timer) * failure. */ -static int watchdog_start(struct watchdog_device *wdd) +static int _watchdog_start(struct watchdog_device *wdd) { struct watchdog_core_data *wd_data = wdd->wd_data; ktime_t started_at; @@ -289,6 +289,28 @@ static int watchdog_start(struct watchdog_device *wdd) return err; } +/* + * watchdog_start: External interface to start the watchdog. + * @wdd: the watchdog device to start + * + * Start the watchdog if it is not active and mark it active. + * This function returns zero on success or a negative errno code for + * failure. + */ + +int watchdog_start(struct watchdog_device *wdd) +{ + struct watchdog_core_data *wd_data = wdd->wd_data; + int err; + + mutex_lock(&wd_data->lock); + err = _watchdog_start(wdd); + mutex_unlock(&wd_data->lock); + + return err; +} +EXPORT_SYMBOL_GPL(watchdog_start); + /* * watchdog_stop: wrapper to stop the watchdog. * @wdd: the watchdog device to stop @@ -837,7 +859,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, break; } if (val & WDIOS_ENABLECARD) - err = watchdog_start(wdd); + err = _watchdog_start(wdd); break; case WDIOC_KEEPALIVE: if (!(wdd->info->options & WDIOF_KEEPALIVEPING)) { @@ -935,7 +957,7 @@ static int watchdog_open(struct inode *inode, struct file *file) goto out_clear; } - err = watchdog_start(wdd); + err = _watchdog_start(wdd); if (err < 0) goto out_mod; diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 95396b644a9b..1eefae61215d 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h @@ -205,6 +205,9 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd) int watchdog_set_timeout(struct watchdog_device *wdd, unsigned int timeout); int watchdog_set_pretimeout(struct watchdog_device *wdd, unsigned int timeout); +/* Allow the driver to start the watchdog. */ +int watchdog_start(struct watchdog_device *wdd); + /* Use the following functions to report watchdog pretimeout event */ #if IS_ENABLED(CONFIG_WATCHDOG_PRETIMEOUT_GOV) void watchdog_notify_pretimeout(struct watchdog_device *wdd);