staging: android-alarm: Rework alarm-dev.c to use upstreamed alarmtimers

This reworks the alarm-dev.c to use the upstreamed alarmtimers
interface.

CC: Colin Cross <ccross@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 3840ca22d835cf551703ca02f79d2b6343f3a7f0..04075b309b8797b6ec79ac8df5d8558e395063ed 100644 (file)
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -22,6 +22,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/uaccess.h>
+#include <linux/alarmtimer.h>
 #include "android_alarm.h"
 
 /* XXX - Hack out wakelocks, while they are out of tree */
@@ -66,7 +67,53 @@ static uint32_t alarm_pending;
 static uint32_t alarm_enabled;
 static uint32_t wait_pending;
 
-static struct android_alarm alarms[ANDROID_ALARM_TYPE_COUNT];
+struct devalarm {
+       union {
+               struct hrtimer hrt;
+               struct alarm alrm;
+       } u;
+       enum android_alarm_type type;
+};
+
+static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT];
+
+
+static int is_wakeup(enum android_alarm_type type)
+{
+       if (type == ANDROID_ALARM_RTC_WAKEUP ||
+                       type == ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP)
+               return 1;
+       return 0;
+}
+
+
+static void devalarm_start(struct devalarm *alrm, ktime_t exp)
+{
+       if (is_wakeup(alrm->type))
+               alarm_start(&alrm->u.alrm, exp);
+       else
+               hrtimer_start(&alrm->u.hrt, exp, HRTIMER_MODE_ABS);
+}
+
+
+static int devalarm_try_to_cancel(struct devalarm *alrm)
+{
+       int ret;
+       if (is_wakeup(alrm->type))
+               ret = alarm_try_to_cancel(&alrm->u.alrm);
+       else
+               ret = hrtimer_try_to_cancel(&alrm->u.hrt);
+       return ret;
+}
+
+static void devalarm_cancel(struct devalarm *alrm)
+{
+       if (is_wakeup(alrm->type))
+               alarm_cancel(&alrm->u.alrm);
+       else
+               hrtimer_cancel(&alrm->u.hrt);
+}
+
 
 static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
@@ -75,6 +122,8 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        struct timespec new_alarm_time;
        struct timespec new_rtc_time;
        struct timespec tmp_time;
+       struct rtc_time new_rtc_tm;
+       struct rtc_device *rtc_dev;
        enum android_alarm_type alarm_type = ANDROID_ALARM_IOCTL_TO_TYPE(cmd);
        uint32_t alarm_type_mask = 1U << alarm_type;
 
@@ -101,7 +150,7 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case ANDROID_ALARM_CLEAR(0):
                spin_lock_irqsave(&alarm_slock, flags);
                pr_alarm(IO, "alarm %d clear\n", alarm_type);
-               android_alarm_try_to_cancel(&alarms[alarm_type]);
+               devalarm_try_to_cancel(&alarms[alarm_type]);
                if (alarm_pending) {
                        alarm_pending &= ~alarm_type_mask;
                        if (!alarm_pending && !wait_pending)
@@ -132,8 +181,7 @@ from_old_alarm_set:
                pr_alarm(IO, "alarm %d set %ld.%09ld\n", alarm_type,
                        new_alarm_time.tv_sec, new_alarm_time.tv_nsec);
                alarm_enabled |= alarm_type_mask;
-               android_alarm_start_range(&alarms[alarm_type],
-                       timespec_to_ktime(new_alarm_time),
+               devalarm_start(&alarms[alarm_type],
                        timespec_to_ktime(new_alarm_time));
                spin_unlock_irqrestore(&alarm_slock, flags);
                if (ANDROID_ALARM_BASE_CMD(cmd) != ANDROID_ALARM_SET_AND_WAIT(0)
@@ -163,7 +211,13 @@ from_old_alarm_set:
                        rv = -EFAULT;
                        goto err1;
                }
-               rv = android_alarm_set_rtc(new_rtc_time);
+               rtc_time_to_tm(new_rtc_time.tv_sec, &new_rtc_tm);
+               rtc_dev = alarmtimer_get_rtcdev();
+               rv = do_settimeofday(&new_rtc_time);
+               if (rv < 0)
+                       goto err1;
+               if (rtc_dev)
+                       rv = rtc_set_time(rtc_dev, &new_rtc_tm);
                spin_lock_irqsave(&alarm_slock, flags);
                alarm_pending |= ANDROID_ALARM_TIME_CHANGE_MASK;
                wake_up(&alarm_wait_queue);
@@ -223,7 +277,7 @@ static int alarm_release(struct inode *inode, struct file *file)
                                alarm_enabled &= ~alarm_type_mask;
                        }
                        spin_unlock_irqrestore(&alarm_slock, flags);
-                       android_alarm_cancel(&alarms[i]);
+                       devalarm_cancel(&alarms[i]);
                        spin_lock_irqsave(&alarm_slock, flags);
                }
                if (alarm_pending | wait_pending) {
@@ -240,12 +294,12 @@ static int alarm_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static void alarm_triggered(struct android_alarm *alarm)
+static void devalarm_triggered(struct devalarm *alarm)
 {
        unsigned long flags;
        uint32_t alarm_type_mask = 1U << alarm->type;
 
-       pr_alarm(INT, "alarm_triggered type %d\n", alarm->type);
+       pr_alarm(INT, "devalarm_triggered type %d\n", alarm->type);
        spin_lock_irqsave(&alarm_slock, flags);
        if (alarm_enabled & alarm_type_mask) {
                wake_lock_timeout(&alarm_wake_lock, 5 * HZ);
@@ -256,6 +310,25 @@ static void alarm_triggered(struct android_alarm *alarm)
        spin_unlock_irqrestore(&alarm_slock, flags);
 }
 
+
+static enum hrtimer_restart devalarm_hrthandler(struct hrtimer *hrt)
+{
+       struct devalarm *devalrm = container_of(hrt, struct devalarm, u.hrt);
+
+       devalarm_triggered(devalrm);
+       return HRTIMER_NORESTART;
+}
+
+static enum alarmtimer_restart devalarm_alarmhandler(struct alarm *alrm,
+                                                       ktime_t now)
+{
+       struct devalarm *devalrm = container_of(alrm, struct devalarm, u.alrm);
+
+       devalarm_triggered(devalrm);
+       return ALARMTIMER_NORESTART;
+}
+
+
 static const struct file_operations alarm_fops = {
        .owner = THIS_MODULE,
        .unlocked_ioctl = alarm_ioctl,
@@ -278,8 +351,23 @@ static int __init alarm_dev_init(void)
        if (err)
                return err;
 
-       for (i = 0; i < ANDROID_ALARM_TYPE_COUNT; i++)
-               android_alarm_init(&alarms[i], i, alarm_triggered);
+       alarm_init(&alarms[ANDROID_ALARM_RTC_WAKEUP].u.alrm,
+                       ALARM_REALTIME, devalarm_alarmhandler);
+       hrtimer_init(&alarms[ANDROID_ALARM_RTC].u.hrt,
+                       CLOCK_REALTIME, HRTIMER_MODE_ABS);
+       alarm_init(&alarms[ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP].u.alrm,
+                       ALARM_BOOTTIME, devalarm_alarmhandler);
+       hrtimer_init(&alarms[ANDROID_ALARM_ELAPSED_REALTIME].u.hrt,
+                       CLOCK_BOOTTIME, HRTIMER_MODE_ABS);
+       hrtimer_init(&alarms[ANDROID_ALARM_SYSTEMTIME].u.hrt,
+                       CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
+
+       for (i = 0; i < ANDROID_ALARM_TYPE_COUNT; i++) {
+               alarms[i].type = i;
+               if (!is_wakeup(i))
+                       alarms[i].u.hrt.function = devalarm_hrthandler;
+       }
+
        wake_lock_init(&alarm_wake_lock, WAKE_LOCK_SUSPEND, "alarm");
 
        return 0;