Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd729d72 authored by John Stultz's avatar John Stultz
Browse files

rtc: Avoid setting alarm to a time in the past 



In some cases at boot up, the RTC alarm may be set in the past,
but still have the enabled flag on. This was causing problems,
because we would then enqueue the alarm into the timerqueue,
but it would never fire. This would clog up the timerqueue
and keep other alarms from working.

The fix is to check the alarm against the current rtc time at
boot and avoid enqueueing the alarm if it is in the past.

Reported-by: default avatarNeilBrown <neilb@suse.de>
Tested-by: default avatarNeilBrown <neilb@suse.de>
Tested-by: default avatarSander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent a99cbf6b

drivers/rtc/interface.c

+10 −1
Original line number Diff line number Diff line
@@ -380,18 +380,27 @@ EXPORT_SYMBOL_GPL(rtc_set_alarm); 
int rtc_initialize_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)

{

	int err;

	struct rtc_time now;



	err = rtc_valid_tm(&alarm->time);

	if (err != 0)

		return err;



	err = rtc_read_time(rtc, &now);

	if (err)

		return err;



	err = mutex_lock_interruptible(&rtc->ops_lock);

	if (err)

		return err;



	rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time);

	rtc->aie_timer.period = ktime_set(0, 0);

	if (alarm->enabled) {



	/* Alarm has to be enabled & in the futrure for us to enqueue it */

	if (alarm->enabled && (rtc_tm_to_ktime(now).tv64 <

			 rtc->aie_timer.node.expires.tv64)) {



		rtc->aie_timer.enabled = 1;

		timerqueue_add(&rtc->timerqueue, &rtc->aie_timer.node);

	}