| Message ID | 20230208083736.1237256-1-george.cherian@marvell.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] watchdog: sbsa_wdog: Make sure the timeout programming is within the limits | expand |
On 2/8/23 00:37, George Cherian wrote: > Make sure to honour the max_hw_heartbeat_ms while programming the timeout > value to WOR. Clamp the timeout passed to sbsa_gwdt_set_timeout() to > make sure the programmed value is within the permissible range. > > Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version 1") > > Signed-off-by: George Cherian <george.cherian@marvell.com> > --- > drivers/watchdog/sbsa_gwdt.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c > index 9791c74aebd4..ee1039a652f1 100644 > --- a/drivers/watchdog/sbsa_gwdt.c > +++ b/drivers/watchdog/sbsa_gwdt.c > @@ -149,6 +149,7 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd, > { > struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); > > + timeout = clamp_t(unsigned int, timeout, 1, wdd->max_hw_heartbeat_ms / 1000); > wdd->timeout = timeout; > Wrong order. wdd->timeout should still contain the requested timeout. Guenter
> -----Original Message----- > From: Guenter Roeck <groeck7@gmail.com> On Behalf Of Guenter Roeck > Sent: Wednesday, February 8, 2023 8:41 PM > To: George Cherian <gcherian@marvell.com>; wim@linux-watchdog.org; > zhangshaokun@hisilicon.com > Cc: linux-watchdog@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v2] watchdog: sbsa_wdog: Make sure the timeout > programming is within the limits > > > ---------------------------------------------------------------------- > On 2/8/23 00:37, George Cherian wrote: > > Make sure to honour the max_hw_heartbeat_ms while programming the > > timeout value to WOR. Clamp the timeout passed to > > sbsa_gwdt_set_timeout() to make sure the programmed value is within > the permissible range. > > > > Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version 1") > > > > Signed-off-by: George Cherian <george.cherian@marvell.com> > > --- > > drivers/watchdog/sbsa_gwdt.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/watchdog/sbsa_gwdt.c > > b/drivers/watchdog/sbsa_gwdt.c index 9791c74aebd4..ee1039a652f1 > 100644 > > --- a/drivers/watchdog/sbsa_gwdt.c > > +++ b/drivers/watchdog/sbsa_gwdt.c > > @@ -149,6 +149,7 @@ static int sbsa_gwdt_set_timeout(struct > watchdog_device *wdd, > > { > > struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); > > > > + timeout = clamp_t(unsigned int, timeout, 1, wdd- > >max_hw_heartbeat_ms > > +/ 1000); > > wdd->timeout = timeout; > > > > Wrong order. wdd->timeout should still contain the requested timeout. But then the requested timeout is not being set in HW. Isn't that a disconnect? > > Guenter
On Wed, Feb 08, 2023 at 05:20:34PM +0000, George Cherian wrote: > > > > -----Original Message----- > > From: Guenter Roeck <groeck7@gmail.com> On Behalf Of Guenter Roeck > > Sent: Wednesday, February 8, 2023 8:41 PM > > To: George Cherian <gcherian@marvell.com>; wim@linux-watchdog.org; > > zhangshaokun@hisilicon.com > > Cc: linux-watchdog@vger.kernel.org; linux-kernel@vger.kernel.org > > Subject: Re: [PATCH v2] watchdog: sbsa_wdog: Make sure the timeout > > programming is within the limits > > > > > > ---------------------------------------------------------------------- > > On 2/8/23 00:37, George Cherian wrote: > > > Make sure to honour the max_hw_heartbeat_ms while programming the > > > timeout value to WOR. Clamp the timeout passed to > > > sbsa_gwdt_set_timeout() to make sure the programmed value is within > > the permissible range. > > > > > > Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version 1") > > > > > > Signed-off-by: George Cherian <george.cherian@marvell.com> > > > --- > > > drivers/watchdog/sbsa_gwdt.c | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/drivers/watchdog/sbsa_gwdt.c > > > b/drivers/watchdog/sbsa_gwdt.c index 9791c74aebd4..ee1039a652f1 > > 100644 > > > --- a/drivers/watchdog/sbsa_gwdt.c > > > +++ b/drivers/watchdog/sbsa_gwdt.c > > > @@ -149,6 +149,7 @@ static int sbsa_gwdt_set_timeout(struct > > watchdog_device *wdd, > > > { > > > struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); > > > > > > + timeout = clamp_t(unsigned int, timeout, 1, wdd- > > >max_hw_heartbeat_ms > > > +/ 1000); > > > wdd->timeout = timeout; > > > > > > > Wrong order. wdd->timeout should still contain the requested timeout. > But then the requested timeout is not being set in HW. > Isn't that a disconnect? No. The driver is supposed to set a timeout no larger than max_hw_heartbeat_ms. The watchdog core then takes care of differences between ->timeout (as seen by the user) and max_hw_heartbeat_ms and pings the watchdog as needed. Guenter
> -----Original Message----- > From: Guenter Roeck <groeck7@gmail.com> On Behalf Of Guenter Roeck > Sent: Wednesday, February 8, 2023 11:26 PM > To: George Cherian <gcherian@marvell.com> > Cc: wim@linux-watchdog.org; zhangshaokun@hisilicon.com; linux- > watchdog@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v2] watchdog: sbsa_wdog: Make sure the timeout > programming is within the limits > > ---------------------------------------------------------------------- > On Wed, Feb 08, 2023 at 05:20:34PM +0000, George Cherian wrote: > > > > > > > -----Original Message----- > > > From: Guenter Roeck <groeck7@gmail.com> On Behalf Of Guenter > Roeck > > > Sent: Wednesday, February 8, 2023 8:41 PM > > > To: George Cherian <gcherian@marvell.com>; wim@linux-watchdog.org; > > > zhangshaokun@hisilicon.com > > > Cc: linux-watchdog@vger.kernel.org; linux-kernel@vger.kernel.org > > > Subject: Re: [PATCH v2] watchdog: sbsa_wdog: Make sure the timeout > > > programming is within the limits > > > > > > > > > -------------------------------------------------------------------- > > > -- On 2/8/23 00:37, George Cherian wrote: > > > > Make sure to honour the max_hw_heartbeat_ms while programming > the > > > > timeout value to WOR. Clamp the timeout passed to > > > > sbsa_gwdt_set_timeout() to make sure the programmed value is > > > > within > > > the permissible range. > > > > > > > > Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version > > > > 1") > > > > > > > > Signed-off-by: George Cherian <george.cherian@marvell.com> > > > > --- > > > > drivers/watchdog/sbsa_gwdt.c | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > diff --git a/drivers/watchdog/sbsa_gwdt.c > > > > b/drivers/watchdog/sbsa_gwdt.c index 9791c74aebd4..ee1039a652f1 > > > 100644 > > > > --- a/drivers/watchdog/sbsa_gwdt.c > > > > +++ b/drivers/watchdog/sbsa_gwdt.c > > > > @@ -149,6 +149,7 @@ static int sbsa_gwdt_set_timeout(struct > > > watchdog_device *wdd, > > > > { > > > > struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); > > > > > > > > + timeout = clamp_t(unsigned int, timeout, 1, wdd- > > > >max_hw_heartbeat_ms > > > > +/ 1000); > > > > wdd->timeout = timeout; > > > > > > > > > > Wrong order. wdd->timeout should still contain the requested timeout. > > But then the requested timeout is not being set in HW. > > Isn't that a disconnect? > > No. The driver is supposed to set a timeout no larger than > max_hw_heartbeat_ms. The watchdog core then takes care of differences > between ->timeout (as seen by the user) and max_hw_heartbeat_ms and > pings the watchdog as needed. Thanks for the explanation. Will post v3. -George > > Guenter
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 9791c74aebd4..ee1039a652f1 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c @@ -149,6 +149,7 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd, { struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); + timeout = clamp_t(unsigned int, timeout, 1, wdd->max_hw_heartbeat_ms / 1000); wdd->timeout = timeout; if (action)
Make sure to honour the max_hw_heartbeat_ms while programming the timeout value to WOR. Clamp the timeout passed to sbsa_gwdt_set_timeout() to make sure the programmed value is within the permissible range. Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version 1") Signed-off-by: George Cherian <george.cherian@marvell.com> --- drivers/watchdog/sbsa_gwdt.c | 1 + 1 file changed, 1 insertion(+)