From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: zyw@rock-chips.com, briannorris@google.com, dianders@google.com,
jwerner@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>,
linux-rtc@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Alessandro Zummo <a.zummo@towertech.it>
Subject: [PATCH] rtc: cros-ec: return -ETIME when refused to set alarms in the past
Date: Sun, 25 Feb 2018 16:18:02 +0800 [thread overview]
Message-ID: <20180225081802.8965-1-jeffy.chen@rock-chips.com> (raw)
We have a check in __rtc_set_alarm() to return -ETIME when the alarm
is in the past.
Since accessing a Chrome OS EC based rtc is a slow operation, we should
do that check again inside of the EC rtc driver's .set_alarm() callback.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/rtc/rtc-cros-ec.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c
index f0ea6899c731..ee0062e2d222 100644
--- a/drivers/rtc/rtc-cros-ec.c
+++ b/drivers/rtc/rtc-cros-ec.c
@@ -188,6 +188,10 @@ static int cros_ec_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
if (alarm_time < 0 || alarm_time > U32_MAX)
return -EINVAL;
+ /* Don't set an alarm in the past. */
+ if ((u32)alarm_time <= current_time)
+ return -ETIME;
+
if (!alrm->enabled) {
/*
* If the alarm is being disabled, send an alarm
@@ -196,11 +200,7 @@ static int cros_ec_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
alarm_offset = EC_RTC_ALARM_CLEAR;
cros_ec_rtc->saved_alarm = (u32)alarm_time;
} else {
- /* Don't set an alarm in the past. */
- if ((u32)alarm_time < current_time)
- alarm_offset = EC_RTC_ALARM_CLEAR;
- else
- alarm_offset = (u32)alarm_time - current_time;
+ alarm_offset = (u32)alarm_time - current_time;
}
ret = cros_ec_rtc_set(cros_ec, EC_CMD_RTC_SET_ALARM, alarm_offset);
--
2.11.0
next reply other threads:[~2018-02-25 8:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-25 8:18 Jeffy Chen [this message]
2018-02-26 18:01 ` [PATCH] rtc: cros-ec: return -ETIME when refused to set alarms in the past Brian Norris
2018-02-26 18:24 ` Brian Norris
2018-02-26 18:37 ` Brian Norris
2018-02-27 2:54 ` JeffyChen
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=20180225081802.8965-1-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=briannorris@google.com \
--cc=dianders@google.com \
--cc=jwerner@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=zyw@rock-chips.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).