2018-09-21 20:51:40

by Jerry Hoemann

Subject: [PATCH] watchdog/hpwdt: Disable PreTimeout when Timeout is smaller

During module install, disable pretimeout if the requested timeout
value is not greater than the minimal pretimeout value that is
supported by hardware.

This makes the module load handling of pretimeout consistent
with the ioctl handling of pretimeout.

Signed-off-by: Jerry Hoemann <[email protected]>
---
drivers/watchdog/hpwdt.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 7af358b3e278..93562304f7aa 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -311,6 +311,10 @@ static int hpwdt_init_one(struct pci_dev *dev,
if (watchdog_init_timeout(&hpwdt_dev, soft_margin, NULL))
dev_warn(&dev->dev, "Invalid soft_margin: %d.\n", soft_margin);

+ if (pretimeout && hpwdt_dev.timeout <= PRETIMEOUT_SEC) {
+ dev_warn(&dev->dev, "timeout <= pretimeout. Setting pretimeout to zero\n");
+ pretimeout = 0;
+ }
hpwdt_dev.pretimeout = pretimeout ? PRETIMEOUT_SEC : 0;

hpwdt_dev.parent = &dev->dev;
--
2.13.6

2018-09-22 00:23:30

by Guenter Roeck

Subject: Re: [PATCH] watchdog/hpwdt: Disable PreTimeout when Timeout is smaller

On 09/21/2018 01:50 PM, Jerry Hoemann wrote:
> During module install, disable pretimeout if the requested timeout
> value is not greater than the minimal pretimeout value that is
> supported by hardware.
>
> This makes the module load handling of pretimeout consistent
> with the ioctl handling of pretimeout.
>
> Signed-off-by: Jerry Hoemann <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>