Re: [PATCH 1/3] watchdog: remove wrong uses of timeout_cur
Hello Oleksij, On 10/24/19 6:30 PM, Oleksij Rempel wrote: > Hi, > > How about using this variable to start watchdog(s) on kernel boot? I originally thought that that is what the parameter is doing. I think it'd be a good idea to add these semantic. Then it can be made a generic parameter again. Cheers > > > Am 24.10.19 um 17:24 schrieb Ahmad Fatoum: >> The barebox watchdog poller uses the struct watchdog.timeout_cur as >> the timeout value to configure the watchdog with. >> >> There's no need for the device driver to set this. I didn't know that >> when I wrote the drivers, but I do now, hence this commit. >> >> Signed-off-by: Ahmad Fatoum >> --- >> drivers/watchdog/stm32_iwdg.c | 1 - >> drivers/watchdog/stpmic1_wdt.c | 1 - >> 2 files changed, 2 deletions(-) >> >> diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c >> index 20536cb4ab2d..4d252e558c32 100644 >> --- a/drivers/watchdog/stm32_iwdg.c >> +++ b/drivers/watchdog/stm32_iwdg.c >> @@ -256,7 +256,6 @@ static int stm32_iwdg_probe(struct device_d *dev) >> wdd->set_timeout = stm32_iwdg_set_timeout; >> wdd->timeout_max = (RLR_MAX + 1) * data->max_prescaler * 1000; >> wdd->timeout_max /= wd->rate * 1000; >> -wdd->timeout_cur = wdd->timeout_max; >> >> ret = watchdog_register(wdd); >> if (ret) { >> diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c >> index eb8c43f716a8..f79b7e8c2768 100644 >> --- a/drivers/watchdog/stpmic1_wdt.c >> +++ b/drivers/watchdog/stpmic1_wdt.c >> @@ -175,7 +175,6 @@ static int stpmic1_wdt_probe(struct device_d *dev) >> wdd->hwdev = dev; >> wdd->set_timeout = stpmic1_wdt_set_timeout; >> wdd->timeout_max = PMIC_WDT_MAX_TIMEOUT; >> -wdd->timeout_cur = PMIC_WDT_DEFAULT_TIMEOUT; >> >> /* have the watchdog reset, not power-off the system */ >> regmap_write_bits(wdt->regmap, MAIN_CR, RREQ_EN, RREQ_EN); >> > > > -- > Regards, > Oleksij > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/3] watchdog: remove wrong uses of timeout_cur
On Thu, Oct 24, 2019 at 05:24:26PM +0200, Ahmad Fatoum wrote: > The barebox watchdog poller uses the struct watchdog.timeout_cur as > the timeout value to configure the watchdog with. > > There's no need for the device driver to set this. I didn't know that > when I wrote the drivers, but I do now, hence this commit. > > Signed-off-by: Ahmad Fatoum > --- > drivers/watchdog/stm32_iwdg.c | 1 - > drivers/watchdog/stpmic1_wdt.c | 1 - > 2 files changed, 2 deletions(-) Applied, thanks Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/3] watchdog: remove wrong uses of timeout_cur
Hi, How about using this variable to start watchdog(s) on kernel boot? Am 24.10.19 um 17:24 schrieb Ahmad Fatoum: > The barebox watchdog poller uses the struct watchdog.timeout_cur as > the timeout value to configure the watchdog with. > > There's no need for the device driver to set this. I didn't know that > when I wrote the drivers, but I do now, hence this commit. > > Signed-off-by: Ahmad Fatoum > --- > drivers/watchdog/stm32_iwdg.c | 1 - > drivers/watchdog/stpmic1_wdt.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c > index 20536cb4ab2d..4d252e558c32 100644 > --- a/drivers/watchdog/stm32_iwdg.c > +++ b/drivers/watchdog/stm32_iwdg.c > @@ -256,7 +256,6 @@ static int stm32_iwdg_probe(struct device_d *dev) > wdd->set_timeout = stm32_iwdg_set_timeout; > wdd->timeout_max = (RLR_MAX + 1) * data->max_prescaler * 1000; > wdd->timeout_max /= wd->rate * 1000; > - wdd->timeout_cur = wdd->timeout_max; > > ret = watchdog_register(wdd); > if (ret) { > diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c > index eb8c43f716a8..f79b7e8c2768 100644 > --- a/drivers/watchdog/stpmic1_wdt.c > +++ b/drivers/watchdog/stpmic1_wdt.c > @@ -175,7 +175,6 @@ static int stpmic1_wdt_probe(struct device_d *dev) > wdd->hwdev = dev; > wdd->set_timeout = stpmic1_wdt_set_timeout; > wdd->timeout_max = PMIC_WDT_MAX_TIMEOUT; > - wdd->timeout_cur = PMIC_WDT_DEFAULT_TIMEOUT; > > /* have the watchdog reset, not power-off the system */ > regmap_write_bits(wdt->regmap, MAIN_CR, RREQ_EN, RREQ_EN); > -- Regards, Oleksij ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox