diff options
author | John Stultz <john.stultz@linaro.org> | 2011-02-22 01:58:51 -0500 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-03-09 14:22:50 -0500 |
commit | f44f7f96a20af16f6f12e1c995576d6becf5f57b (patch) | |
tree | bbe0b8bec5defed39fade13c79a1cb19b74fb6e3 /drivers/rtc/class.c | |
parent | a5abba989deceb731047425812d268daf7536575 (diff) |
RTC: Initialize kernel state from RTC
Mark Brown pointed out a corner case: that RTC alarms should
be allowed to be persistent across reboots if the hardware
supported it.
The rework of the generic layer to virtualize the RTC alarm
virtualized much of the alarm handling, and removed the
code used to read the alarm time from the hardware.
Mark noted if we want the alarm to be persistent across
reboots, we need to re-read the alarm value into the
virtualized generic layer at boot up, so that the generic
layer properly exposes that value.
This patch restores much of the earlier removed
rtc_read_alarm code and wires it in so that we
set the kernel's alarm value to what we find in the
hardware at boot time.
NOTE: Not all hardware supports persistent RTC alarm state across
system reset. rtc-cmos for example will keep the alarm time, but
disables the AIE mode irq. Applications should not expect the RTC
alarm to be valid after a system reset. We will preserve what
we can, to represent the hardware state at boot, but its not
guarenteed.
Further, in the future, with multiplexed RTC alarms, the
soonest alarm to fire may not be the one set via the /dev/rt
ioctls. So an application may set the alarm with RTC_ALM_SET,
but after a reset find that RTC_ALM_READ returns an earlier
time. Again, we preserve what we can, but applications should
not expect the RTC alarm state to persist across a system reset.
Big thanks to Mark for pointing out the issue!
Thanks also to Marcelo for helping think through the solution.
CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: rtc-linux@googlegroups.com
Reported-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/rtc/class.c')
-rw-r--r-- | drivers/rtc/class.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index c404b61386bf..09b4437b3e61 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
@@ -117,6 +117,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, | |||
117 | struct module *owner) | 117 | struct module *owner) |
118 | { | 118 | { |
119 | struct rtc_device *rtc; | 119 | struct rtc_device *rtc; |
120 | struct rtc_wkalrm alrm; | ||
120 | int id, err; | 121 | int id, err; |
121 | 122 | ||
122 | if (idr_pre_get(&rtc_idr, GFP_KERNEL) == 0) { | 123 | if (idr_pre_get(&rtc_idr, GFP_KERNEL) == 0) { |
@@ -166,6 +167,12 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, | |||
166 | rtc->pie_timer.function = rtc_pie_update_irq; | 167 | rtc->pie_timer.function = rtc_pie_update_irq; |
167 | rtc->pie_enabled = 0; | 168 | rtc->pie_enabled = 0; |
168 | 169 | ||
170 | /* Check to see if there is an ALARM already set in hw */ | ||
171 | err = __rtc_read_alarm(rtc, &alrm); | ||
172 | |||
173 | if (!err && !rtc_valid_tm(&alrm.time)) | ||
174 | rtc_set_alarm(rtc, &alrm); | ||
175 | |||
169 | strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE); | 176 | strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE); |
170 | dev_set_name(&rtc->dev, "rtc%d", id); | 177 | dev_set_name(&rtc->dev, "rtc%d", id); |
171 | 178 | ||