On Mon, Jul 09, 2018 at 10:30:41AM +0200, Uwe Kleine-König wrote:
> Hello,
>
> On Sat, Jun 09, 2018 at 08:43:13AM +0200, Uwe Kleine-König wrote:
> > As pointed out in the added comment resetting the rtc also stops the
> > included watchdog. This is bad if the bootloader started the watchdog to
> > secure the boot process. So don't reset if the watchdog is running.
>
> I didn't get any feedback for this patch yet. Assuming my patch is
> considered ok, my expectation would be that the watchdog people ack it
> and that then it goes in via the rtc tree.
>
Guess there was a good reason for not passing an accessor via regmap ?
Either case, stmp_reset_block() is also called from resume, meaning the
watchdog, if running, will likely be disabled by a suspend/resume cycle.
I have no idea why the rtc block is reset in the first place;
one would assume that there was a reason for that.
The associated watchdog driver does not support telling the watchdog
core that the watchdog is running. As such, a watchdog running at boot
will only be handled if the watchdog daemon is started before the
watchdog times out. I assume this is understood and acceptable.
Given all that, and taking no responsibility for the actual impact
of the changes, I can only confirm that the patch looks syntactically
correct.
Acked-by: Guenter Roeck <linux@xxxxxxxxxxxx>
I would suggest, however, that it might make more sense to have someone
who knows the chip and the systems using it confirm that the change
is appropriate and will not cause any problems.
Thanks,
Guenter
> Best regards
> Uwe
>
> > diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
> > index d578e40d5a50..b76318fd5bb0 100644
> > --- a/drivers/rtc/rtc-stmp3xxx.c
> > +++ b/drivers/rtc/rtc-stmp3xxx.c
> > @@ -288,10 +288,22 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
> >
> > platform_set_drvdata(pdev, rtc_data);
> >
> > - err = stmp_reset_block(rtc_data->io);
> > - if (err) {
> > - dev_err(&pdev->dev, "stmp_reset_block failed: %d\n", err);
> > - return err;
> > + /*
> > + * Resetting the rtc stops the watchdog timer that is potentially
> > + * running. So (assuming it is running on purpose) don't reset if the
> > + * watchdog is enabled.
> > + */
> > + if (readl(rtc_data->io + STMP3XXX_RTC_CTRL) &
> > + STMP3XXX_RTC_CTRL_WATCHDOGEN) {
> > + dev_info(&pdev->dev,
> > + "Watchdog is running, skip resetting rtc\n");
> > + } else {
> > + err = stmp_reset_block(rtc_data->io);
> > + if (err) {
> > + dev_err(&pdev->dev, "stmp_reset_block failed: %d\n",
> > + err);
> > + return err;
> > + }
> > }
> >
> > /*
>
> --
> Pengutronix e.K. | Uwe Kleine-König |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
