@@ -46,12 +46,17 @@ static struct alarm_base {
static ktime_t freezer_delta;
static DEFINE_SPINLOCK(freezer_delta_lock);
+
#ifdef CONFIG_RTC_CLASS
/* rtc timer and device for setting alarm wakeups at suspend */
static struct rtc_timer rtctimer;
static struct rtc_device *rtcdev;
static DEFINE_SPINLOCK(rtcdev_lock);
+static struct wakeup_source *alarmtimer_wakelock;
+static int stay_awake;
+static DEFINE_SPINLOCK(stay_awake_lock);
+
/**
* has_wakealarm - check rtc device has wakealarm ability
* @dev: current device
@@ -73,6 +78,20 @@ static int has_wakealarm(struct device *dev, void *name_ptr)
return 1;
}
+/* rtctimer function called by first rtc interrupt after suspend */
+void alarmtimer_resume_call(void* p)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&stay_awake_lock, flags);
+ if (stay_awake == 1) {
+ printk("alarmtimer_resume: Calling stayawake!\n");
+ stay_awake = 2;
+ __pm_stay_awake(alarmtimer_wakelock);
+ }
+ spin_unlock_irqrestore(&stay_awake_lock, flags);
+}
+
/**
* alarmtimer_get_rtcdev - Return selected rtcdevice
*
@@ -99,7 +118,7 @@ static struct rtc_device *alarmtimer_get_rtcdev(void)
* rtc_open takes its own.
*/
put_device(dev);
- rtc_timer_init(&rtctimer, NULL, NULL);
+ rtc_timer_init(&rtctimer, alarmtimer_resume_call, NULL);
}
}
ret = rtcdev;
@@ -158,6 +177,8 @@ static void alarmtimer_remove(struct alarm_base *base, struct alarm *alarm)
}
+
+
/**
* alarmtimer_fired - Handles alarm hrtimer being fired.
* @timer: pointer to hrtimer being run
@@ -206,6 +227,12 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
}
spin_unlock_irqrestore(&base->lock, flags);
+ spin_lock_irqsave(&stay_awake_lock, flags);
+ if (stay_awake == 2)
+ __pm_relax(alarmtimer_wakelock);
+ stay_awake = 0;
+ spin_unlock_irqrestore(&stay_awake_lock, flags);
+
return ret;
}
@@ -225,12 +252,14 @@ static int alarmtimer_suspend(struct device *dev)
{
struct rtc_time tm;
ktime_t min, now;
+ int min_base;
unsigned long flags;
struct rtc_device *rtc;
int i;
spin_lock_irqsave(&freezer_delta_lock, flags);
min = freezer_delta;
+ min_base = 0;
freezer_delta = ktime_set(0, 0);
spin_unlock_irqrestore(&freezer_delta_lock, flags);
@@ -251,8 +280,10 @@ static int alarmtimer_suspend(struct device *dev)
if (!next)
continue;
delta = ktime_sub(next->expires, base->gettime());
- if (!min.tv64 || (delta.tv64 < min.tv64))
+ if (!min.tv64 || (delta.tv64 < min.tv64)) {
min = delta;
+ min_base = i;
+ }
}
if (min.tv64 == 0)
return 0;
@@ -266,6 +297,10 @@ static int alarmtimer_suspend(struct device *dev)
now = rtc_tm_to_ktime(tm);
now = ktime_add(now, min);
+ spin_lock_irqsave(&stay_awake_lock, flags);
+ stay_awake=1;
+ spin_unlock_irqrestore(&stay_awake_lock, flags);
+
rtc_timer_start(rtc, &rtctimer, now, ktime_set(0, 0));
return 0;
@@ -703,6 +738,9 @@ static int __init alarmtimer_init(void)
.nsleep = alarm_timer_nsleep,
};
+ alarmtimer_wakelock = wakeup_source_register("alarmtimer");
+ stay_awake=0;
+
posix_timers_register_clock(CLOCK_REALTIME_ALARM, &alarm_clock);
posix_timers_register_clock(CLOCK_BOOTTIME_ALARM, &alarm_clock);
This provides wakelock like chaining to protects the RTC wakeup path to the hrtimer firing of the alarmtimer. NOTE: This doesn't handle the fact that normal hrtimer interrupts that would trigger alarm timers don't cause wakeups. That path still needs to be protected. Signed-off-by: John Stultz <john.stultz@linaro.org> --- kernel/time/alarmtimer.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-)