From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Matthew Garrett <matthew.garrett@nebula.com>
Cc: a.zummo@towertech.it, rtc-linux@googlegroups.com,
linux-kernel@vger.kernel.org
Subject: [rtc-linux] Re: RTC: Restore alarm after resume
Date: Fri, 27 Mar 2015 14:22:22 +0100 [thread overview]
Message-ID: <20150327132222.GC3568@piout.net> (raw)
In-Reply-To: <1419275979-24307-1-git-send-email-matthew.garrett@nebula.com>
Hi Matthew,
On 22/12/2014 at 19:19:39 +0000, Matthew Garrett wrote :
> Some platform firmware may interfere with the RTC alarm over suspend,
> resulting in the kernel and hardware having different ideas about system state
> but also potentially causing problems with firmware that assumes the OS will
> clean this case up. This patch saves the RTC alarm state on suspend and will
> restore it on resume if the alarm has not yet fired - if it has, it will clear
> the RTC alarm.
>
> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
> Tested-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
> ---
> drivers/rtc/class.c | 24 ++++++++++++++++++++++++
> include/linux/rtc.h | 4 ++++
> 2 files changed, 28 insertions(+)
>
> diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
> index 472a5ad..c7e09e2 100644
> --- a/drivers/rtc/class.c
> +++ b/drivers/rtc/class.c
> @@ -55,6 +55,8 @@ static int rtc_suspend(struct device *dev)
> struct timespec64 delta, delta_delta;
> int err;
>
> + rtc->valid_alarm = !rtc_read_alarm(rtc, &rtc->alarm);
> +
> if (has_persistent_clock())
> return 0;
>
> @@ -102,6 +104,27 @@ static int rtc_resume(struct device *dev)
> struct timespec64 sleep_time;
> int err;
>
> + /*
> + * Ensure that the platform hasn't overwritten a pending alarm while
> + * suspended
> + */
> + if (rtc->valid_alarm) {
> + long now, scheduled;
> +
> + rtc_read_time(rtc, &tm);
> + rtc_tm_to_time(&rtc->alarm.time, &scheduled);
> + rtc_tm_to_time(&tm, &now);
> +
> + /* Clear the alarm registers if it went off during suspend */
> + if (scheduled <= now) {
> + rtc_time_to_tm(0, &rtc->alarm.time);
> + rtc->alarm.enabled = 0;
> + }
> +
> + if (rtc->ops && rtc->ops->set_alarm)
> + rtc->ops->set_alarm(rtc->dev.parent, &rtc->alarm);
> + }
> +
My main concern here is that reading the time and the alarm can be slow,
in particular with i2c RTC.
Isn't that issue pretty much specific to x86? I know you think otherwise
but I believe this would better be done from your driver. If more
platforms/RTCs are affected, it will still be time to try to solve it in
a more generic way.
Moreover, the class suspend/resume functions are only defined when
CONFIG_RTC_HCTOSYS is set so you may still have broken platforms with
some configurations.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
WARNING: multiple messages have this Message-ID (diff)
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Matthew Garrett <matthew.garrett@nebula.com>
Cc: a.zummo@towertech.it, rtc-linux@googlegroups.com,
linux-kernel@vger.kernel.org
Subject: Re: RTC: Restore alarm after resume
Date: Fri, 27 Mar 2015 14:22:22 +0100 [thread overview]
Message-ID: <20150327132222.GC3568@piout.net> (raw)
In-Reply-To: <1419275979-24307-1-git-send-email-matthew.garrett@nebula.com>
Hi Matthew,
On 22/12/2014 at 19:19:39 +0000, Matthew Garrett wrote :
> Some platform firmware may interfere with the RTC alarm over suspend,
> resulting in the kernel and hardware having different ideas about system state
> but also potentially causing problems with firmware that assumes the OS will
> clean this case up. This patch saves the RTC alarm state on suspend and will
> restore it on resume if the alarm has not yet fired - if it has, it will clear
> the RTC alarm.
>
> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
> Tested-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
> ---
> drivers/rtc/class.c | 24 ++++++++++++++++++++++++
> include/linux/rtc.h | 4 ++++
> 2 files changed, 28 insertions(+)
>
> diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
> index 472a5ad..c7e09e2 100644
> --- a/drivers/rtc/class.c
> +++ b/drivers/rtc/class.c
> @@ -55,6 +55,8 @@ static int rtc_suspend(struct device *dev)
> struct timespec64 delta, delta_delta;
> int err;
>
> + rtc->valid_alarm = !rtc_read_alarm(rtc, &rtc->alarm);
> +
> if (has_persistent_clock())
> return 0;
>
> @@ -102,6 +104,27 @@ static int rtc_resume(struct device *dev)
> struct timespec64 sleep_time;
> int err;
>
> + /*
> + * Ensure that the platform hasn't overwritten a pending alarm while
> + * suspended
> + */
> + if (rtc->valid_alarm) {
> + long now, scheduled;
> +
> + rtc_read_time(rtc, &tm);
> + rtc_tm_to_time(&rtc->alarm.time, &scheduled);
> + rtc_tm_to_time(&tm, &now);
> +
> + /* Clear the alarm registers if it went off during suspend */
> + if (scheduled <= now) {
> + rtc_time_to_tm(0, &rtc->alarm.time);
> + rtc->alarm.enabled = 0;
> + }
> +
> + if (rtc->ops && rtc->ops->set_alarm)
> + rtc->ops->set_alarm(rtc->dev.parent, &rtc->alarm);
> + }
> +
My main concern here is that reading the time and the alarm can be slow,
in particular with i2c RTC.
Isn't that issue pretty much specific to x86? I know you think otherwise
but I believe this would better be done from your driver. If more
platforms/RTCs are affected, it will still be time to try to solve it in
a more generic way.
Moreover, the class suspend/resume functions are only defined when
CONFIG_RTC_HCTOSYS is set so you may still have broken platforms with
some configurations.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2015-03-27 13:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-22 19:19 RTC: Restore alarm after resume Matthew Garrett
2014-12-22 19:19 ` [PATCH] " Matthew Garrett
2015-01-05 22:41 ` Andrew Morton
2015-01-05 22:50 ` Matthew Garrett
2015-03-27 13:22 ` Alexandre Belloni [this message]
2015-03-27 13:22 ` Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150327132222.GC3568@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=a.zummo@towertech.it \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=rtc-linux@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.