Merge "Revert "rtc: alarm: Change wake-up source"" (38a7992e) · Commits · e / devices / android_kernel_fairphone_FP3

include/linux/alarmtimer.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -60,8 +60,5 @@ ktime_t alarm_expires_remaining(const struct alarm *alarm);

		/* Provide way to access the rtc device being used by alarmtimers */
		struct rtc_device *alarmtimer_get_rtcdev(void);
		#ifdef CONFIG_RTC_DRV_QPNP
		extern bool poweron_alarm;
		#endif

		#endif

kernel/time/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -11,5 +11,3 @@ obj-$(CONFIG_GENERIC_SCHED_CLOCK) += sched_clock.o
		obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o
		obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o
		obj-$(CONFIG_TEST_UDELAY) += test_udelay.o

		ccflags-y += -Idrivers/cpuidle

kernel/time/alarmtimer.c

+1 −69

Original line number	Diff line number	Diff line
		@@ -25,10 +25,6 @@
		#include <linux/posix-timers.h>
		#include <linux/workqueue.h>
		#include <linux/freezer.h>

		#ifdef CONFIG_MSM_PM
		#include "lpm-levels.h"
		#endif
		#include <linux/workqueue.h>

		/**
		@@ -362,70 +358,6 @@ EXPORT_SYMBOL_GPL(alarm_expires_remaining);
		* set an rtc timer to fire that far into the future, which
		* will wake us from suspend.
		*/
		#if defined(CONFIG_RTC_DRV_QPNP) && defined(CONFIG_MSM_PM)
		static int alarmtimer_suspend(struct device *dev)
		{
		struct rtc_time tm;
		ktime_t min, now;
		unsigned long flags;
		struct rtc_device *rtc;
		int i;
		int ret = 0;

		spin_lock_irqsave(&freezer_delta_lock, flags);
		min = freezer_delta;
		freezer_delta = ktime_set(0, 0);
		spin_unlock_irqrestore(&freezer_delta_lock, flags);

		rtc = alarmtimer_get_rtcdev();
		/* If we have no rtcdev, just return */
		if (!rtc)
		return 0;

		/* Find the soonest timer to expire*/
		for (i = 0; i < ALARM_NUMTYPE; i++) {
		struct alarm_base *base = &alarm_bases[i];
		struct timerqueue_node *next;
		ktime_t delta;

		spin_lock_irqsave(&base->lock, flags);
		next = timerqueue_getnext(&base->timerqueue);
		spin_unlock_irqrestore(&base->lock, flags);
		if (!next)
		continue;
		delta = ktime_sub(next->expires, base->gettime());
		if (!min.tv64 \|\| (delta.tv64 < min.tv64))
		min = delta;
		}
		if (min.tv64 == 0)
		return 0;

		if (ktime_to_ns(min) < 2 * NSEC_PER_SEC) {
		__pm_wakeup_event(ws, 2 * MSEC_PER_SEC);
		return -EBUSY;
		}

		/* Setup a timer to fire that far in the future */
		rtc_timer_cancel(rtc, &rtctimer);
		rtc_read_time(rtc, &tm);
		now = rtc_tm_to_ktime(tm);
		now = ktime_add(now, min);
		if (poweron_alarm) {
		struct rtc_time tm_val;
		unsigned long secs;

		tm_val = rtc_ktime_to_tm(min);
		rtc_tm_to_time(&tm_val, &secs);
		lpm_suspend_wake_time(secs);
		} else {
		/* Set alarm, if in the past reject suspend briefly to handle */
		ret = rtc_timer_start(rtc, &rtctimer, now, ktime_set(0, 0));
		if (ret < 0)
		__pm_wakeup_event(ws, MSEC_PER_SEC);
		}
		return ret;
		}
		#else
		static int alarmtimer_suspend(struct device *dev)
		{
		struct rtc_time tm;
		@@ -482,7 +414,7 @@ static int alarmtimer_suspend(struct device *dev)
		__pm_wakeup_event(ws, MSEC_PER_SEC);
		return ret;
		}
		#endif

		static int alarmtimer_resume(struct device *dev)
		{
		struct rtc_device *rtc;