Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 456d66ec authored by John Stultz's avatar John Stultz
Browse files

RTC: Re-enable UIE timer/polling emulation 



This patch re-enables UIE timer/polling emulation for rtc devices
that do not support alarm irqs.

CC: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
CC: Thomas Gleixner <tglx@linutronix.de>
Reported-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tested-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 6e57b1d6

drivers/rtc/interface.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -228,6 +228,12 @@ int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled) 
	if (err)

	if (err)

		return err;

		return err;





#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL

	if (enabled == 0 && rtc->uie_irq_active) {

		mutex_unlock(&rtc->ops_lock);

		return rtc_dev_update_irq_enable_emul(rtc, 0);

	}

#endif

	/* make sure we're changing state */

	/* make sure we're changing state */

	if (rtc->uie_rtctimer.enabled == enabled)

	if (rtc->uie_rtctimer.enabled == enabled)

		goto out;

		goto out;
@@ -247,6 +253,16 @@ int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled) 




out:

out:

	mutex_unlock(&rtc->ops_lock);

	mutex_unlock(&rtc->ops_lock);

#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL

	/*

	 * Enable emulation if the driver did not provide

	 * the update_irq_enable function pointer or if returned

	 * -EINVAL to signal that it has been configured without

	 * interrupts or that are not available at the moment.

	 */

	if (err == -EINVAL)

		err = rtc_dev_update_irq_enable_emul(rtc, enabled);

#endif

	return err;

	return err;





}

}
@@ -262,7 +278,7 @@ EXPORT_SYMBOL_GPL(rtc_update_irq_enable); 
 *

 *

 * Triggers the registered irq_task function callback.

 * Triggers the registered irq_task function callback.

 */

 */

static void rtc_handle_legacy_irq(struct rtc_device *rtc, int num, int mode)

void rtc_handle_legacy_irq(struct rtc_device *rtc, int num, int mode)

{

{

	unsigned long flags;

	unsigned long flags;

drivers/rtc/rtc-dev.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ static void rtc_uie_task(struct work_struct *work) 
	}

	}

	spin_unlock_irq(&rtc->irq_lock);

	spin_unlock_irq(&rtc->irq_lock);

	if (num)

	if (num)

		rtc_update_irq(rtc, num, RTC_UF | RTC_IRQF);

		rtc_handle_legacy_irq(rtc, num, RTC_UF);

}

}

static void rtc_uie_timer(unsigned long data)

static void rtc_uie_timer(unsigned long data)

{

{

include/linux/rtc.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -250,6 +250,7 @@ extern int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled); 
extern int rtc_dev_update_irq_enable_emul(struct rtc_device *rtc,

extern int rtc_dev_update_irq_enable_emul(struct rtc_device *rtc,

						unsigned int enabled);

						unsigned int enabled);





void rtc_handle_legacy_irq(struct rtc_device *rtc, int num, int mode);

void rtc_aie_update_irq(void *private);

void rtc_aie_update_irq(void *private);

void rtc_uie_update_irq(void *private);

void rtc_uie_update_irq(void *private);

enum hrtimer_restart rtc_pie_update_irq(struct hrtimer *timer);

enum hrtimer_restart rtc_pie_update_irq(struct hrtimer *timer);