2018-02-27 02:49:18

by Jeffy Chen

Subject: [PATCH v3] rtc: cros-ec: return -ETIME when refused to set alarms in the past

Since accessing a Chrome OS EC based rtc is a slow operation, there is a
race window where if the alarm is set for the next second and the second
ticks over right before calculating the alarm offset.

In this case the current driver is setting a 0-second alarm, which would
be considered as disabling alarms by the EC(EC_RTC_ALARM_CLEAR).

This breaks, e.g., hwclock which relies on RTC_UIE_ON ->
rtc_update_irq_enable(), which sets a 1-second alarm and expects it to
fire an interrupt.

So return -ETIME when the alarm is in the past, follow __rtc_set_alarm().

Signed-off-by: Jeffy Chen <[email protected]>
---

Changes in v3:
Fix alarm time comparing.

Changes in v2:
Rewrite commit message as Brian suggested.
Check alarm time only when that alarm is enabled.

drivers/rtc/rtc-cros-ec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c
index f0ea6899c731..510a4ced2edf 100644
--- a/drivers/rtc/rtc-cros-ec.c
+++ b/drivers/rtc/rtc-cros-ec.c
@@ -198,9 +198,9 @@ static int cros_ec_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
} 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;
+ return -ETIME;
+
+ alarm_offset = (u32)alarm_time - current_time;
}

ret = cros_ec_rtc_set(cros_ec, EC_CMD_RTC_SET_ALARM, alarm_offset);
--
2.11.0

2018-02-27 03:05:13

by Jeffy Chen

Subject: Re: [PATCH v3] rtc: cros-ec: return -ETIME when refused to set alarms in the past

Hi guys,

On 02/27/2018 10:47 AM, Jeffy Chen wrote:
> /* Don't set an alarm in the past. */
> if ((u32)alarm_time < current_time)
Oops, i'm a idiot, forgot to use '<='... will resend it.
> - alarm_offset = EC_RTC_ALARM_CLEAR;
> - else
> - alarm_offset = (u32)alarm_time - current_time;
> + return -ETIME;
> +
> + alarm_offset = (u32)alarm_time - current_time;
> }