Commit 41c7f742 authored by Rabin Vincent's avatar Rabin Vincent Committed by John Stultz
Browse files

rtc: Disable the alarm in the hardware (v2) 



Currently, the RTC code does not disable the alarm in the hardware.

This means that after a sequence such as the one below (the files are in the
RTC sysfs), the box will boot up after 2 minutes even though we've
asked for the alarm to be turned off.

	# echo $((`cat since_epoch`)+120) > wakealarm
	# echo 0 > wakealarm
	# poweroff

Fix this by disabling the alarm when there are no timers to run.

The original version of this patch was reverted. This version
disables the irq directly instead of setting a disabled timer
in the future.

Cc: stable@kernel.org
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
[Merged in the second revision from Rabin]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 5f9679d2

drivers/rtc/interface.c

+13 −2
Original line number Diff line number Diff line
@@ -776,6 +776,14 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer) 
	return 0;

}



static void rtc_alarm_disable(struct rtc_device *rtc)

{

	if (!rtc->ops || !rtc->ops->alarm_irq_enable)

		return;



	rtc->ops->alarm_irq_enable(rtc->dev.parent, false);

}



/**

 * rtc_timer_remove - Removes a rtc_timer from the rtc_device timerqueue

 * @rtc rtc device
@@ -797,8 +805,10 @@ static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer) 
		struct rtc_wkalrm alarm;

		int err;

		next = timerqueue_getnext(&rtc->timerqueue);

		if (!next)

		if (!next) {

			rtc_alarm_disable(rtc);

			return;

		}

		alarm.time = rtc_ktime_to_tm(next->expires);

		alarm.enabled = 1;

		err = __rtc_set_alarm(rtc, &alarm);
@@ -860,7 +870,8 @@ again: 
		err = __rtc_set_alarm(rtc, &alarm);

		if (err == -ETIME)

			goto again;

	}

	} else

		rtc_alarm_disable(rtc);



	mutex_unlock(&rtc->ops_lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE