From: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> To: rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Cc: Alessandro Zummo <a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org>, Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Subject: [PATCH 7/9] rtc: stmp3xxx: Re-enable active alarm Date: Mon, 4 Mar 2013 15:05:46 +0100 [thread overview] Message-ID: <1362405948-12992-8-git-send-email-s.trumtrar@pengutronix.de> (raw) In-Reply-To: <1362405948-12992-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> If an alarm is set and the system rebooted, the alarm does not get re-enabled, although it may still be valid (i.e. in the future). The sysfs representation of wakealarms prevents overwriting active alarms. One needs to instead write a 0 first and then the new value. Therefore an alarm is considered active if wakealarm != 0 && wakealarm > now To preserve this information over a reboot, the alarm needs to be re-written on startup, if it is still valid. This leads to all flags being reactivated and interrupts reenabled. Signed-off-by: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> --- drivers/rtc/rtc-stmp3xxx.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 16b45c8..f31ac76 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@ -242,27 +242,39 @@ static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled) rtc_data->io + STMP3XXX_RTC_PERSISTENT0_CLR); writel(STMP3XXX_RTC_CTRL_ALARM_IRQ_EN, rtc_data->io + STMP3XXX_RTC_CTRL_CLR); + writel(0, rtc_data->io + STMP3XXX_RTC_ALARM); } return 0; } -static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) +static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { + unsigned long t; struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); - rtc_time_to_tm(readl(rtc_data->io + STMP3XXX_RTC_ALARM), &alm->time); + rtc_tm_to_time(&alm->time, &t); + writel(t, rtc_data->io + STMP3XXX_RTC_ALARM); + + stmp3xxx_alarm_irq_enable(dev, alm->enabled); + return 0; } -static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) +static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) { - unsigned long t; struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); + struct rtc_time now; + u32 alarm = readl(rtc_data->io + STMP3XXX_RTC_ALARM); - rtc_tm_to_time(&alm->time, &t); - writel(t, rtc_data->io + STMP3XXX_RTC_ALARM); + rtc_time_to_tm(alarm, &alm->time); - stmp3xxx_alarm_irq_enable(dev, alm->enabled); + stmp3xxx_rtc_gettime(dev, &now); + if (rtc_tm_to_ktime(now).tv64 < rtc_tm_to_ktime(alm->time).tv64) { + alm->enabled = 1; + stmp3xxx_rtc_set_alarm(dev, alm); + } else { + alm->enabled = 0; + } return 0; } -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: s.trumtrar@pengutronix.de (Steffen Trumtrar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 7/9] rtc: stmp3xxx: Re-enable active alarm Date: Mon, 4 Mar 2013 15:05:46 +0100 [thread overview] Message-ID: <1362405948-12992-8-git-send-email-s.trumtrar@pengutronix.de> (raw) In-Reply-To: <1362405948-12992-1-git-send-email-s.trumtrar@pengutronix.de> If an alarm is set and the system rebooted, the alarm does not get re-enabled, although it may still be valid (i.e. in the future). The sysfs representation of wakealarms prevents overwriting active alarms. One needs to instead write a 0 first and then the new value. Therefore an alarm is considered active if wakealarm != 0 && wakealarm > now To preserve this information over a reboot, the alarm needs to be re-written on startup, if it is still valid. This leads to all flags being reactivated and interrupts reenabled. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> --- drivers/rtc/rtc-stmp3xxx.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 16b45c8..f31ac76 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@ -242,27 +242,39 @@ static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled) rtc_data->io + STMP3XXX_RTC_PERSISTENT0_CLR); writel(STMP3XXX_RTC_CTRL_ALARM_IRQ_EN, rtc_data->io + STMP3XXX_RTC_CTRL_CLR); + writel(0, rtc_data->io + STMP3XXX_RTC_ALARM); } return 0; } -static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) +static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { + unsigned long t; struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); - rtc_time_to_tm(readl(rtc_data->io + STMP3XXX_RTC_ALARM), &alm->time); + rtc_tm_to_time(&alm->time, &t); + writel(t, rtc_data->io + STMP3XXX_RTC_ALARM); + + stmp3xxx_alarm_irq_enable(dev, alm->enabled); + return 0; } -static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) +static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) { - unsigned long t; struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); + struct rtc_time now; + u32 alarm = readl(rtc_data->io + STMP3XXX_RTC_ALARM); - rtc_tm_to_time(&alm->time, &t); - writel(t, rtc_data->io + STMP3XXX_RTC_ALARM); + rtc_time_to_tm(alarm, &alm->time); - stmp3xxx_alarm_irq_enable(dev, alm->enabled); + stmp3xxx_rtc_gettime(dev, &now); + if (rtc_tm_to_ktime(now).tv64 < rtc_tm_to_ktime(alm->time).tv64) { + alm->enabled = 1; + stmp3xxx_rtc_set_alarm(dev, alm); + } else { + alm->enabled = 0; + } return 0; } -- 1.7.10.4
next prev parent reply other threads:[~2013-03-04 14:05 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-04 14:05 [PATCH 0/9] rtc: stmp3xxx: DT bindings and wakealarm Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar [not found] ` <1362405948-12992-1-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-03-04 14:05 ` [PATCH 1/9] MXS/i.MX28: add the possibility to define the used crystals via device tree Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar [not found] ` <1362405948-12992-2-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-03-07 6:17 ` Shawn Guo 2013-03-07 6:17 ` Shawn Guo 2013-03-04 14:05 ` [PATCH 2/9] MXS/i.MX28: add the possibility to define the external RTC crystal Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar [not found] ` <1362405948-12992-3-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-03-07 6:33 ` Shawn Guo 2013-03-07 6:33 ` Shawn Guo 2013-03-04 14:05 ` [PATCH 3/9] MXS/i.MX28: prepare different clocking of the built-in RTC Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar [not found] ` <1362405948-12992-4-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-03-07 6:40 ` Shawn Guo 2013-03-07 6:40 ` Shawn Guo 2013-03-04 14:05 ` [PATCH 4/9] MXS/i.MX28: there is more than one way to clock the RTC Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar [not found] ` <1362405948-12992-5-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-03-07 6:48 ` Shawn Guo 2013-03-07 6:48 ` Shawn Guo [not found] ` <20130307064824.GD5372-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org> 2013-03-07 8:19 ` Steffen Trumtrar 2013-03-07 8:19 ` Steffen Trumtrar 2013-03-04 14:05 ` [PATCH 5/9] MXS/i.MX28: enable RTC to wakeup the system Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar 2013-03-04 14:05 ` [PATCH 6/9] rtc: stmp3xxx: add sysfs entries for persistent regs Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar [not found] ` <1362405948-12992-7-git-send-email-s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-03-04 15:14 ` Grant Likely 2013-03-04 15:14 ` Grant Likely [not found] ` <CACxGe6swW-UDH1cUw1D8P+gyhDC8nDZur-A_m_NBfeRUxcg9Jw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2013-03-05 8:02 ` Steffen Trumtrar 2013-03-05 8:02 ` Steffen Trumtrar [not found] ` <20130305080252.GA7042-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-03-06 13:27 ` Steffen Trumtrar 2013-03-06 13:27 ` Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar [this message] 2013-03-04 14:05 ` [PATCH 7/9] rtc: stmp3xxx: Re-enable active alarm Steffen Trumtrar 2013-03-04 14:05 ` [PATCH 8/9] rtc: stmp3xxx: Check copy controller state Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar 2013-03-04 14:05 ` [PATCH 9/9] rtc: stmp3xxx: Replace wait_time function Steffen Trumtrar 2013-03-04 14:05 ` Steffen Trumtrar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1362405948-12992-8-git-send-email-s.trumtrar@pengutronix.de \ --to=s.trumtrar-bicnvbalz9megne8c9+irq@public.gmane.org \ --cc=a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org \ --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.