From patchwork Mon Mar 4 14:05:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Trumtrar X-Patchwork-Id: 2212941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id CBFD73FCF2 for ; Mon, 4 Mar 2013 14:09:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UCW25-0000p6-R5; Mon, 04 Mar 2013 14:06:25 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UCW20-0000mg-FB for linux-arm-kernel@lists.infradead.org; Mon, 04 Mar 2013 14:06:21 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1UCW1j-0004Yi-Ar; Mon, 04 Mar 2013 15:06:03 +0100 Received: from str by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1UCW1h-0002Jr-BE; Mon, 04 Mar 2013 15:06:01 +0100 From: Steffen Trumtrar To: rtc-linux@googlegroups.com, devicetree-discuss@lists.ozlabs.org Subject: [PATCH 7/9] rtc: stmp3xxx: Re-enable active alarm Date: Mon, 4 Mar 2013 15:05:46 +0100 Message-Id: <1362405948-12992-8-git-send-email-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362405948-12992-1-git-send-email-s.trumtrar@pengutronix.de> References: <1362405948-12992-1-git-send-email-s.trumtrar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: str@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130304_090620_881467_85860D7C X-CRM114-Status: GOOD ( 16.42 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Alessandro Zummo , Shawn Guo , Steffen Trumtrar , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 --- 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; }