| Message ID | 1558126783-4877-3-git-send-email-jerry.hoemann@hpe.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog/hpwdt: cleanups and kdump accommodations | expand |
On Fri, May 17, 2019 at 02:59:39PM -0600, Jerry Hoemann wrote: > Set max_hw_heartbeat_ms instead of max_timeout so that user client can > set timeout range in excess of what the underlying hardware supports. > > Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/hpwdt.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c > index 8c49f13..9f7a370 100644 > --- a/drivers/watchdog/hpwdt.c > +++ b/drivers/watchdog/hpwdt.c > @@ -62,9 +62,9 @@ > static int hpwdt_start(struct watchdog_device *wdd) > { > int control = 0x81 | (pretimeout ? 0x4 : 0); > - int reload = SECS_TO_TICKS(wdd->timeout); > + int reload = SECS_TO_TICKS(min(wdd->timeout, wdd->max_hw_heartbeat_ms/1000)); > > - dev_dbg(wdd->parent, "start watchdog 0x%08x:0x%02x\n", reload, control); > + dev_dbg(wdd->parent, "start watchdog 0x%08x:0x%08x:0x%02x\n", wdd->timeout, reload, control); > iowrite16(reload, hpwdt_timer_reg); > iowrite8(control, hpwdt_timer_con); > > @@ -91,9 +91,9 @@ static int hpwdt_stop_core(struct watchdog_device *wdd) > > static int hpwdt_ping(struct watchdog_device *wdd) > { > - int reload = SECS_TO_TICKS(wdd->timeout); > + int reload = SECS_TO_TICKS(min(wdd->timeout, wdd->max_hw_heartbeat_ms/1000)); > > - dev_dbg(wdd->parent, "ping watchdog 0x%08x\n", reload); > + dev_dbg(wdd->parent, "ping watchdog 0x%08x:0x%08x\n", wdd->timeout, reload); > iowrite16(reload, hpwdt_timer_reg); > > return 0; > @@ -208,9 +208,9 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) > .info = &ident, > .ops = &hpwdt_ops, > .min_timeout = 1, > - .max_timeout = HPWDT_MAX_TIMER, > .timeout = DEFAULT_MARGIN, > .pretimeout = PRETIMEOUT_SEC, > + .max_hw_heartbeat_ms = HPWDT_MAX_TIMER * 1000, > }; > >
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 8c49f13..9f7a370 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -62,9 +62,9 @@ static int hpwdt_start(struct watchdog_device *wdd) { int control = 0x81 | (pretimeout ? 0x4 : 0); - int reload = SECS_TO_TICKS(wdd->timeout); + int reload = SECS_TO_TICKS(min(wdd->timeout, wdd->max_hw_heartbeat_ms/1000)); - dev_dbg(wdd->parent, "start watchdog 0x%08x:0x%02x\n", reload, control); + dev_dbg(wdd->parent, "start watchdog 0x%08x:0x%08x:0x%02x\n", wdd->timeout, reload, control); iowrite16(reload, hpwdt_timer_reg); iowrite8(control, hpwdt_timer_con); @@ -91,9 +91,9 @@ static int hpwdt_stop_core(struct watchdog_device *wdd) static int hpwdt_ping(struct watchdog_device *wdd) { - int reload = SECS_TO_TICKS(wdd->timeout); + int reload = SECS_TO_TICKS(min(wdd->timeout, wdd->max_hw_heartbeat_ms/1000)); - dev_dbg(wdd->parent, "ping watchdog 0x%08x\n", reload); + dev_dbg(wdd->parent, "ping watchdog 0x%08x:0x%08x\n", wdd->timeout, reload); iowrite16(reload, hpwdt_timer_reg); return 0; @@ -208,9 +208,9 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) .info = &ident, .ops = &hpwdt_ops, .min_timeout = 1, - .max_timeout = HPWDT_MAX_TIMER, .timeout = DEFAULT_MARGIN, .pretimeout = PRETIMEOUT_SEC, + .max_hw_heartbeat_ms = HPWDT_MAX_TIMER * 1000, };
Set max_hw_heartbeat_ms instead of max_timeout so that user client can set timeout range in excess of what the underlying hardware supports. Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> --- drivers/watchdog/hpwdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)