Subject: + rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2.patch added to -mm tree
To: boris.brezillon@xxxxxxxxxxxxxxxxxx,a.zummo@xxxxxxxxxxxx,bevenson@xxxxxxxxxxxxxx,linux@xxxxxxxxxxxx,nicolas.ferre@xxxxxxxxx,plagnioj@xxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 29 May 2014 16:04:41 -0700
The patch titled
Subject: rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2
has been added to the -mm tree. Its filename is
rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Boris BREZILLON <boris.brezillon@xxxxxxxxxxxxxxxxxx>
Subject: rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2
Changes since v1:
- disable SECEV interrupt when the RTC is ready to accept new time updates
Signed-off-by: Boris BREZILLON <boris.brezillon@xxxxxxxxxxxxxxxxxx>
Cc: Bryan Evenson <bevenson@xxxxxxxxxxxxxx>
Cc: Andrew Victor <linux@xxxxxxxxxxxx>
Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@xxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-at91rm9200.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff -puN drivers/rtc/rtc-at91rm9200.c~rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2 drivers/rtc/rtc-at91rm9200.c
--- a/drivers/rtc/rtc-at91rm9200.c~rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2
+++ a/drivers/rtc/rtc-at91rm9200.c
@@ -48,13 +48,12 @@ struct at91_rtc_config {
static const struct at91_rtc_config *at91_rtc_config;
static DECLARE_COMPLETION(at91_rtc_updated);
-static DECLARE_COMPLETION(at91_rtc_wait_upd_rdy);
+static DECLARE_COMPLETION(at91_rtc_upd_rdy);
static unsigned int at91_alarm_year = AT91_RTC_EPOCH;
static void __iomem *at91_rtc_regs;
static int irq;
static DEFINE_SPINLOCK(at91_rtc_lock);
static u32 at91_rtc_shadow_imr;
-static bool at91_rtc_upd_rdy;
static void at91_rtc_write_ier(u32 mask)
{
@@ -163,7 +162,7 @@ static int at91_rtc_settime(struct devic
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
- wait_for_completion(&at91_rtc_wait_upd_rdy);
+ wait_for_completion(&at91_rtc_upd_rdy);
/* Stop Time/Calendar from counting */
cr = at91_rtc_read(AT91_RTC_CR);
@@ -187,8 +186,9 @@ static int at91_rtc_settime(struct devic
/* Restart Time/Calendar */
cr = at91_rtc_read(AT91_RTC_CR);
- at91_rtc_upd_rdy = 0;
+ at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_SECEV);
at91_rtc_write(AT91_RTC_CR, cr & ~(AT91_RTC_UPDCAL | AT91_RTC_UPDTIM));
+ at91_rtc_write_ier(AT91_RTC_SECEV);
return 0;
}
@@ -296,11 +296,8 @@ static irqreturn_t at91_rtc_interrupt(in
if (rtsr & AT91_RTC_ALARM)
events |= (RTC_AF | RTC_IRQF);
if (rtsr & AT91_RTC_SECEV) {
- events |= (RTC_UF | RTC_IRQF);
- if (!at91_rtc_upd_rdy) {
- at91_rtc_upd_rdy = 1;
- complete(&at91_rtc_wait_upd_rdy);
- }
+ complete(&at91_rtc_upd_rdy);
+ at91_rtc_write_idr(AT91_RTC_SECEV);
}
if (rtsr & AT91_RTC_ACKUPD)
complete(&at91_rtc_updated);
@@ -423,8 +420,11 @@ static int __init at91_rtc_probe(struct
return PTR_ERR(rtc);
platform_set_drvdata(pdev, rtc);
- /* Enable 1Hz events */
+ /* enable SECEV interrupt in order to initialize at91_rtc_upd_rdy
+ * completion.
+ */
at91_rtc_write_ier(AT91_RTC_SECEV);
+
dev_info(&pdev->dev, "AT91 Real Time Clock driver.\n");
return 0;
}
_
Patches currently in -mm which might be from boris.brezillon@xxxxxxxxxxxxxxxxxx are
rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq.patch
rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq-v2.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
