2006-03-27 09:16:37 +00:00
|
|
|
/*
|
|
|
|
* RTC subsystem, base class
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005 Tower Technologies
|
|
|
|
* Author: Alessandro Zummo <a.zummo@towertech.it>
|
|
|
|
*
|
|
|
|
* class skeleton from drivers/hwmon/hwmon.c
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/rtc.h>
|
|
|
|
#include <linux/kdev_t.h>
|
|
|
|
#include <linux/idr.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
RTC: Rework RTC code to use timerqueue for events
This patch reworks a large portion of the generic RTC code
to in-effect virtualize the rtc interrupt code.
The current RTC interface is very much a raw hardware interface.
Via the proc, /dev/, or sysfs interfaces, applciations can set
the hardware to trigger interrupts in one of three modes:
AIE: Alarm interrupt
UIE: Update interrupt (ie: once per second)
PIE: Periodic interrupt (sub-second irqs)
The problem with this interface is that it limits the RTC hardware
so it can only be used by one application at a time.
The purpose of this patch is to extend the RTC code so that we can
multiplex multiple applications event needs onto a single RTC device.
This is done by utilizing the timerqueue infrastructure to manage
a list of events, which cause the RTC hardware to be programmed
to fire an interrupt for the next event in the list.
In order to preserve the functionality of the exsting proc,/dev/ and
sysfs interfaces, we emulate the different interrupt modes as follows:
AIE: We create a rtc_timer dedicated to AIE mode interrupts. There is
only one per device, so we don't change existing interface semantics.
UIE: Again, a dedicated rtc_timer, set for periodic mode, is used
to emulate UIE interrupts. Again, only one per device.
PIE: Since PIE mode interrupts fire faster then the RTC's clock read
granularity, we emulate PIE mode interrupts using a hrtimer. Again,
one per device.
With this patch, the rtctest.c application in Documentation/rtc.txt
passes fine on x86 hardware. However, there may very well still be
bugs, so greatly I'd appreciate any feedback or testing!
Signed-off-by: John Stultz <john.stultz@linaro.org>
LKML Reference: <1290136329-18291-4-git-send-email-john.stultz@linaro.org>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Richard Cochran <richardcochran@gmail.com>
2010-09-23 22:07:34 +00:00
|
|
|
#include <linux/workqueue.h>
|
2006-03-27 09:16:37 +00:00
|
|
|
|
2007-05-08 07:33:27 +00:00
|
|
|
#include "rtc-core.h"
|
|
|
|
|
|
|
|
|
2011-11-02 20:37:49 +00:00
|
|
|
static DEFINE_IDA(rtc_ida);
|
2006-03-27 09:16:37 +00:00
|
|
|
struct class *rtc_class;
|
|
|
|
|
2007-05-08 07:33:40 +00:00
|
|
|
static void rtc_device_release(struct device *dev)
|
2006-03-27 09:16:37 +00:00
|
|
|
{
|
2007-05-08 07:33:40 +00:00
|
|
|
struct rtc_device *rtc = to_rtc_device(dev);
|
2011-11-02 20:37:49 +00:00
|
|
|
ida_simple_remove(&rtc_ida, rtc->id);
|
2006-03-27 09:16:37 +00:00
|
|
|
kfree(rtc);
|
|
|
|
}
|
|
|
|
|
2012-10-05 00:14:12 +00:00
|
|
|
#ifdef CONFIG_RTC_HCTOSYS_DEVICE
|
|
|
|
/* Result of the last RTC to system clock attempt. */
|
|
|
|
int rtc_hctosys_ret = -ENODEV;
|
|
|
|
#endif
|
2007-05-08 07:33:42 +00:00
|
|
|
|
2012-10-05 00:14:12 +00:00
|
|
|
#if defined(CONFIG_PM) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
|
2007-05-08 07:33:42 +00:00
|
|
|
/*
|
|
|
|
* On suspend(), measure the delta between one RTC and the
|
|
|
|
* system's wall clock; restore it on resume().
|
|
|
|
*/
|
|
|
|
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
static struct timespec old_rtc, old_system, old_delta;
|
|
|
|
|
2007-05-08 07:33:42 +00:00
|
|
|
|
|
|
|
static int rtc_suspend(struct device *dev, pm_message_t mesg)
|
|
|
|
{
|
|
|
|
struct rtc_device *rtc = to_rtc_device(dev);
|
|
|
|
struct rtc_time tm;
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
struct timespec delta, delta_delta;
|
2009-01-06 22:42:11 +00:00
|
|
|
if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
|
2007-05-08 07:33:42 +00:00
|
|
|
return 0;
|
|
|
|
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
/* snapshot the current RTC and system time at suspend*/
|
2007-05-08 07:33:42 +00:00
|
|
|
rtc_read_time(rtc, &tm);
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
getnstimeofday(&old_system);
|
|
|
|
rtc_tm_to_time(&tm, &old_rtc.tv_sec);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To avoid drift caused by repeated suspend/resumes,
|
|
|
|
* which each can add ~1 second drift error,
|
|
|
|
* try to compensate so the difference in system time
|
|
|
|
* and rtc time stays close to constant.
|
|
|
|
*/
|
|
|
|
delta = timespec_sub(old_system, old_rtc);
|
|
|
|
delta_delta = timespec_sub(delta, old_delta);
|
2011-11-23 02:24:51 +00:00
|
|
|
if (delta_delta.tv_sec < -2 || delta_delta.tv_sec >= 2) {
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
/*
|
|
|
|
* if delta_delta is too large, assume time correction
|
|
|
|
* has occured and set old_delta to the current delta.
|
|
|
|
*/
|
|
|
|
old_delta = delta;
|
|
|
|
} else {
|
|
|
|
/* Otherwise try to adjust old_system to compensate */
|
|
|
|
old_system = timespec_sub(old_system, delta_delta);
|
|
|
|
}
|
2007-05-08 07:33:42 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rtc_resume(struct device *dev)
|
|
|
|
{
|
|
|
|
struct rtc_device *rtc = to_rtc_device(dev);
|
|
|
|
struct rtc_time tm;
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
struct timespec new_system, new_rtc;
|
|
|
|
struct timespec sleep_time;
|
2007-05-08 07:33:42 +00:00
|
|
|
|
2012-10-05 00:14:12 +00:00
|
|
|
rtc_hctosys_ret = -ENODEV;
|
2009-01-06 22:42:11 +00:00
|
|
|
if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
|
2007-05-08 07:33:42 +00:00
|
|
|
return 0;
|
|
|
|
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
/* snapshot the current rtc and system time at resume */
|
|
|
|
getnstimeofday(&new_system);
|
2007-05-08 07:33:42 +00:00
|
|
|
rtc_read_time(rtc, &tm);
|
|
|
|
if (rtc_valid_tm(&tm) != 0) {
|
2009-01-06 22:42:11 +00:00
|
|
|
pr_debug("%s: bogus resume time\n", dev_name(&rtc->dev));
|
2007-05-08 07:33:42 +00:00
|
|
|
return 0;
|
|
|
|
}
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
rtc_tm_to_time(&tm, &new_rtc.tv_sec);
|
|
|
|
new_rtc.tv_nsec = 0;
|
|
|
|
|
2011-11-23 02:24:51 +00:00
|
|
|
if (new_rtc.tv_sec < old_rtc.tv_sec) {
|
|
|
|
pr_debug("%s: time travel!\n", dev_name(&rtc->dev));
|
2007-05-08 07:33:42 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-05-27 18:33:18 +00:00
|
|
|
/* calculate the RTC time delta (sleep time)*/
|
|
|
|
sleep_time = timespec_sub(new_rtc, old_rtc);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Since these RTC suspend/resume handlers are not called
|
|
|
|
* at the very end of suspend or the start of resume,
|
|
|
|
* some run-time may pass on either sides of the sleep time
|
|
|
|
* so subtract kernel run-time between rtc_suspend to rtc_resume
|
|
|
|
* to keep things accurate.
|
|
|
|
*/
|
|
|
|
sleep_time = timespec_sub(sleep_time,
|
|
|
|
timespec_sub(new_system, old_system));
|
2007-05-08 07:33:42 +00:00
|
|
|
|
2011-11-23 02:24:51 +00:00
|
|
|
if (sleep_time.tv_sec >= 0)
|
|
|
|
timekeeping_inject_sleeptime(&sleep_time);
|
2012-10-05 00:14:12 +00:00
|
|
|
rtc_hctosys_ret = 0;
|
2007-05-08 07:33:42 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
#define rtc_suspend NULL
|
|
|
|
#define rtc_resume NULL
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2006-03-27 09:16:37 +00:00
|
|
|
/**
|
|
|
|
* rtc_device_register - register w/ RTC class
|
|
|
|
* @dev: the device to register
|
|
|
|
*
|
|
|
|
* rtc_device_unregister() must be called when the class device is no
|
|
|
|
* longer needed.
|
|
|
|
*
|
|
|
|
* Returns the pointer to the new struct class device.
|
|
|
|
*/
|
|
|
|
struct rtc_device *rtc_device_register(const char *name, struct device *dev,
|
2006-10-01 06:28:17 +00:00
|
|
|
const struct rtc_class_ops *ops,
|
2006-03-27 09:16:37 +00:00
|
|
|
struct module *owner)
|
|
|
|
{
|
|
|
|
struct rtc_device *rtc;
|
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>
2011-02-22 06:58:51 +00:00
|
|
|
struct rtc_wkalrm alrm;
|
2006-03-27 09:16:37 +00:00
|
|
|
int id, err;
|
|
|
|
|
2011-11-02 20:37:49 +00:00
|
|
|
id = ida_simple_get(&rtc_ida, 0, 0, GFP_KERNEL);
|
|
|
|
if (id < 0) {
|
|
|
|
err = id;
|
2006-03-27 09:16:37 +00:00
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
rtc = kzalloc(sizeof(struct rtc_device), GFP_KERNEL);
|
|
|
|
if (rtc == NULL) {
|
|
|
|
err = -ENOMEM;
|
2011-11-02 20:37:49 +00:00
|
|
|
goto exit_ida;
|
2006-03-27 09:16:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
rtc->id = id;
|
|
|
|
rtc->ops = ops;
|
|
|
|
rtc->owner = owner;
|
2011-02-02 18:04:02 +00:00
|
|
|
rtc->irq_freq = 1;
|
2006-06-25 12:48:20 +00:00
|
|
|
rtc->max_user_freq = 64;
|
2007-05-08 07:33:40 +00:00
|
|
|
rtc->dev.parent = dev;
|
|
|
|
rtc->dev.class = rtc_class;
|
|
|
|
rtc->dev.release = rtc_device_release;
|
2006-03-27 09:16:37 +00:00
|
|
|
|
|
|
|
mutex_init(&rtc->ops_lock);
|
|
|
|
spin_lock_init(&rtc->irq_lock);
|
|
|
|
spin_lock_init(&rtc->irq_task_lock);
|
2007-10-16 08:28:15 +00:00
|
|
|
init_waitqueue_head(&rtc->irq_queue);
|
2006-03-27 09:16:37 +00:00
|
|
|
|
RTC: Rework RTC code to use timerqueue for events
This patch reworks a large portion of the generic RTC code
to in-effect virtualize the rtc interrupt code.
The current RTC interface is very much a raw hardware interface.
Via the proc, /dev/, or sysfs interfaces, applciations can set
the hardware to trigger interrupts in one of three modes:
AIE: Alarm interrupt
UIE: Update interrupt (ie: once per second)
PIE: Periodic interrupt (sub-second irqs)
The problem with this interface is that it limits the RTC hardware
so it can only be used by one application at a time.
The purpose of this patch is to extend the RTC code so that we can
multiplex multiple applications event needs onto a single RTC device.
This is done by utilizing the timerqueue infrastructure to manage
a list of events, which cause the RTC hardware to be programmed
to fire an interrupt for the next event in the list.
In order to preserve the functionality of the exsting proc,/dev/ and
sysfs interfaces, we emulate the different interrupt modes as follows:
AIE: We create a rtc_timer dedicated to AIE mode interrupts. There is
only one per device, so we don't change existing interface semantics.
UIE: Again, a dedicated rtc_timer, set for periodic mode, is used
to emulate UIE interrupts. Again, only one per device.
PIE: Since PIE mode interrupts fire faster then the RTC's clock read
granularity, we emulate PIE mode interrupts using a hrtimer. Again,
one per device.
With this patch, the rtctest.c application in Documentation/rtc.txt
passes fine on x86 hardware. However, there may very well still be
bugs, so greatly I'd appreciate any feedback or testing!
Signed-off-by: John Stultz <john.stultz@linaro.org>
LKML Reference: <1290136329-18291-4-git-send-email-john.stultz@linaro.org>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Richard Cochran <richardcochran@gmail.com>
2010-09-23 22:07:34 +00:00
|
|
|
/* Init timerqueue */
|
|
|
|
timerqueue_init_head(&rtc->timerqueue);
|
2010-12-13 21:45:48 +00:00
|
|
|
INIT_WORK(&rtc->irqwork, rtc_timer_do_work);
|
RTC: Rework RTC code to use timerqueue for events
This patch reworks a large portion of the generic RTC code
to in-effect virtualize the rtc interrupt code.
The current RTC interface is very much a raw hardware interface.
Via the proc, /dev/, or sysfs interfaces, applciations can set
the hardware to trigger interrupts in one of three modes:
AIE: Alarm interrupt
UIE: Update interrupt (ie: once per second)
PIE: Periodic interrupt (sub-second irqs)
The problem with this interface is that it limits the RTC hardware
so it can only be used by one application at a time.
The purpose of this patch is to extend the RTC code so that we can
multiplex multiple applications event needs onto a single RTC device.
This is done by utilizing the timerqueue infrastructure to manage
a list of events, which cause the RTC hardware to be programmed
to fire an interrupt for the next event in the list.
In order to preserve the functionality of the exsting proc,/dev/ and
sysfs interfaces, we emulate the different interrupt modes as follows:
AIE: We create a rtc_timer dedicated to AIE mode interrupts. There is
only one per device, so we don't change existing interface semantics.
UIE: Again, a dedicated rtc_timer, set for periodic mode, is used
to emulate UIE interrupts. Again, only one per device.
PIE: Since PIE mode interrupts fire faster then the RTC's clock read
granularity, we emulate PIE mode interrupts using a hrtimer. Again,
one per device.
With this patch, the rtctest.c application in Documentation/rtc.txt
passes fine on x86 hardware. However, there may very well still be
bugs, so greatly I'd appreciate any feedback or testing!
Signed-off-by: John Stultz <john.stultz@linaro.org>
LKML Reference: <1290136329-18291-4-git-send-email-john.stultz@linaro.org>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Richard Cochran <richardcochran@gmail.com>
2010-09-23 22:07:34 +00:00
|
|
|
/* Init aie timer */
|
2010-12-13 21:45:48 +00:00
|
|
|
rtc_timer_init(&rtc->aie_timer, rtc_aie_update_irq, (void *)rtc);
|
RTC: Rework RTC code to use timerqueue for events
This patch reworks a large portion of the generic RTC code
to in-effect virtualize the rtc interrupt code.
The current RTC interface is very much a raw hardware interface.
Via the proc, /dev/, or sysfs interfaces, applciations can set
the hardware to trigger interrupts in one of three modes:
AIE: Alarm interrupt
UIE: Update interrupt (ie: once per second)
PIE: Periodic interrupt (sub-second irqs)
The problem with this interface is that it limits the RTC hardware
so it can only be used by one application at a time.
The purpose of this patch is to extend the RTC code so that we can
multiplex multiple applications event needs onto a single RTC device.
This is done by utilizing the timerqueue infrastructure to manage
a list of events, which cause the RTC hardware to be programmed
to fire an interrupt for the next event in the list.
In order to preserve the functionality of the exsting proc,/dev/ and
sysfs interfaces, we emulate the different interrupt modes as follows:
AIE: We create a rtc_timer dedicated to AIE mode interrupts. There is
only one per device, so we don't change existing interface semantics.
UIE: Again, a dedicated rtc_timer, set for periodic mode, is used
to emulate UIE interrupts. Again, only one per device.
PIE: Since PIE mode interrupts fire faster then the RTC's clock read
granularity, we emulate PIE mode interrupts using a hrtimer. Again,
one per device.
With this patch, the rtctest.c application in Documentation/rtc.txt
passes fine on x86 hardware. However, there may very well still be
bugs, so greatly I'd appreciate any feedback or testing!
Signed-off-by: John Stultz <john.stultz@linaro.org>
LKML Reference: <1290136329-18291-4-git-send-email-john.stultz@linaro.org>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Richard Cochran <richardcochran@gmail.com>
2010-09-23 22:07:34 +00:00
|
|
|
/* Init uie timer */
|
2010-12-13 21:45:48 +00:00
|
|
|
rtc_timer_init(&rtc->uie_rtctimer, rtc_uie_update_irq, (void *)rtc);
|
RTC: Rework RTC code to use timerqueue for events
This patch reworks a large portion of the generic RTC code
to in-effect virtualize the rtc interrupt code.
The current RTC interface is very much a raw hardware interface.
Via the proc, /dev/, or sysfs interfaces, applciations can set
the hardware to trigger interrupts in one of three modes:
AIE: Alarm interrupt
UIE: Update interrupt (ie: once per second)
PIE: Periodic interrupt (sub-second irqs)
The problem with this interface is that it limits the RTC hardware
so it can only be used by one application at a time.
The purpose of this patch is to extend the RTC code so that we can
multiplex multiple applications event needs onto a single RTC device.
This is done by utilizing the timerqueue infrastructure to manage
a list of events, which cause the RTC hardware to be programmed
to fire an interrupt for the next event in the list.
In order to preserve the functionality of the exsting proc,/dev/ and
sysfs interfaces, we emulate the different interrupt modes as follows:
AIE: We create a rtc_timer dedicated to AIE mode interrupts. There is
only one per device, so we don't change existing interface semantics.
UIE: Again, a dedicated rtc_timer, set for periodic mode, is used
to emulate UIE interrupts. Again, only one per device.
PIE: Since PIE mode interrupts fire faster then the RTC's clock read
granularity, we emulate PIE mode interrupts using a hrtimer. Again,
one per device.
With this patch, the rtctest.c application in Documentation/rtc.txt
passes fine on x86 hardware. However, there may very well still be
bugs, so greatly I'd appreciate any feedback or testing!
Signed-off-by: John Stultz <john.stultz@linaro.org>
LKML Reference: <1290136329-18291-4-git-send-email-john.stultz@linaro.org>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Richard Cochran <richardcochran@gmail.com>
2010-09-23 22:07:34 +00:00
|
|
|
/* Init pie timer */
|
|
|
|
hrtimer_init(&rtc->pie_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
|
|
|
rtc->pie_timer.function = rtc_pie_update_irq;
|
|
|
|
rtc->pie_enabled = 0;
|
|
|
|
|
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>
2011-02-22 06:58:51 +00:00
|
|
|
/* Check to see if there is an ALARM already set in hw */
|
|
|
|
err = __rtc_read_alarm(rtc, &alrm);
|
|
|
|
|
|
|
|
if (!err && !rtc_valid_tm(&alrm.time))
|
2011-03-30 01:00:27 +00:00
|
|
|
rtc_initialize_alarm(rtc, &alrm);
|
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>
2011-02-22 06:58:51 +00:00
|
|
|
|
2006-03-27 09:16:37 +00:00
|
|
|
strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
|
2009-01-06 22:42:11 +00:00
|
|
|
dev_set_name(&rtc->dev, "rtc%d", id);
|
2006-03-27 09:16:37 +00:00
|
|
|
|
2007-05-08 07:33:46 +00:00
|
|
|
rtc_dev_prepare(rtc);
|
|
|
|
|
2007-05-08 07:33:40 +00:00
|
|
|
err = device_register(&rtc->dev);
|
2010-10-27 22:33:04 +00:00
|
|
|
if (err) {
|
|
|
|
put_device(&rtc->dev);
|
2006-03-27 09:16:37 +00:00
|
|
|
goto exit_kfree;
|
2010-10-27 22:33:04 +00:00
|
|
|
}
|
2006-03-27 09:16:37 +00:00
|
|
|
|
2007-05-08 07:33:27 +00:00
|
|
|
rtc_dev_add_device(rtc);
|
2007-05-08 07:33:33 +00:00
|
|
|
rtc_sysfs_add_device(rtc);
|
2007-05-08 07:33:38 +00:00
|
|
|
rtc_proc_add_device(rtc);
|
2007-05-08 07:33:27 +00:00
|
|
|
|
2006-03-27 09:16:37 +00:00
|
|
|
dev_info(dev, "rtc core: registered %s as %s\n",
|
2009-01-06 22:42:11 +00:00
|
|
|
rtc->name, dev_name(&rtc->dev));
|
2006-03-27 09:16:37 +00:00
|
|
|
|
|
|
|
return rtc;
|
|
|
|
|
|
|
|
exit_kfree:
|
|
|
|
kfree(rtc);
|
|
|
|
|
2011-11-02 20:37:49 +00:00
|
|
|
exit_ida:
|
|
|
|
ida_simple_remove(&rtc_ida, id);
|
2006-03-27 09:16:37 +00:00
|
|
|
|
|
|
|
exit:
|
2006-04-11 05:54:45 +00:00
|
|
|
dev_err(dev, "rtc core: unable to register %s, err = %d\n",
|
|
|
|
name, err);
|
2006-03-27 09:16:37 +00:00
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rtc_device_register);
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* rtc_device_unregister - removes the previously registered RTC class device
|
|
|
|
*
|
|
|
|
* @rtc: the RTC class device to destroy
|
|
|
|
*/
|
|
|
|
void rtc_device_unregister(struct rtc_device *rtc)
|
|
|
|
{
|
2007-05-08 07:33:40 +00:00
|
|
|
if (get_device(&rtc->dev) != NULL) {
|
2007-03-01 04:12:40 +00:00
|
|
|
mutex_lock(&rtc->ops_lock);
|
|
|
|
/* remove innards of this RTC, then disable it, before
|
|
|
|
* letting any rtc_class_open() users access it again
|
|
|
|
*/
|
2007-05-08 07:33:33 +00:00
|
|
|
rtc_sysfs_del_device(rtc);
|
2007-05-08 07:33:27 +00:00
|
|
|
rtc_dev_del_device(rtc);
|
2007-05-08 07:33:38 +00:00
|
|
|
rtc_proc_del_device(rtc);
|
2007-05-08 07:33:40 +00:00
|
|
|
device_unregister(&rtc->dev);
|
2007-03-01 04:12:40 +00:00
|
|
|
rtc->ops = NULL;
|
|
|
|
mutex_unlock(&rtc->ops_lock);
|
2007-05-08 07:33:40 +00:00
|
|
|
put_device(&rtc->dev);
|
2007-03-01 04:12:40 +00:00
|
|
|
}
|
2006-03-27 09:16:37 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rtc_device_unregister);
|
|
|
|
|
|
|
|
static int __init rtc_init(void)
|
|
|
|
{
|
|
|
|
rtc_class = class_create(THIS_MODULE, "rtc");
|
|
|
|
if (IS_ERR(rtc_class)) {
|
|
|
|
printk(KERN_ERR "%s: couldn't create class\n", __FILE__);
|
|
|
|
return PTR_ERR(rtc_class);
|
|
|
|
}
|
2007-05-08 07:33:42 +00:00
|
|
|
rtc_class->suspend = rtc_suspend;
|
|
|
|
rtc_class->resume = rtc_resume;
|
2007-05-08 07:33:27 +00:00
|
|
|
rtc_dev_init();
|
2007-05-08 07:33:33 +00:00
|
|
|
rtc_sysfs_init(rtc_class);
|
2006-03-27 09:16:37 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit rtc_exit(void)
|
|
|
|
{
|
2007-05-08 07:33:27 +00:00
|
|
|
rtc_dev_exit();
|
2006-03-27 09:16:37 +00:00
|
|
|
class_destroy(rtc_class);
|
2011-11-02 20:37:49 +00:00
|
|
|
ida_destroy(&rtc_ida);
|
2006-03-27 09:16:37 +00:00
|
|
|
}
|
|
|
|
|
2006-10-01 06:28:15 +00:00
|
|
|
subsys_initcall(rtc_init);
|
2006-03-27 09:16:37 +00:00
|
|
|
module_exit(rtc_exit);
|
|
|
|
|
2006-10-01 06:28:15 +00:00
|
|
|
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
|
2006-03-27 09:16:37 +00:00
|
|
|
MODULE_DESCRIPTION("RTC class support");
|
|
|
|
MODULE_LICENSE("GPL");
|