Hello Andrew, I think you've taken the wrong version of this patch (this is entirely my fault, because I forgot to add you in the Cc list of the v2). Anyway, could you take this one version instead: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/253851.html or should I send a new patch on top of the applied version ? Best Regards, Boris On 07/05/2014 23:58, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > Subject: + rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq.patch added to -mm tree > To: boris.brezillon@xxxxxxxxxxxxxxxxxx,a.zummo@xxxxxxxxxxxx,bevenson@xxxxxxxxxxxxxx,linux@xxxxxxxxxxxx,nicolas.ferre@xxxxxxxxx,plagnioj@xxxxxxxxxxxx,stable@xxxxxxxxxxxxxxx > From: akpm@xxxxxxxxxxxxxxxxxxxx > Date: Wed, 07 May 2014 14:58:29 -0700 > > > The patch titled > Subject: rtc: rtc-at91rm9200: fix infinite wait for ACKUPD irq > has been added to the -mm tree. Its filename is > rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq.patch > > This patch should soon appear at > http://ozlabs.org/~akpm/mmots/broken-out/rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq.patch > and later at > http://ozlabs.org/~akpm/mmotm/broken-out/rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq.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 > > The rtc user must wait at least 1 sec between each time/calandar update > (see atmel's datasheet chapter "Updating Time/Calendar"). > > Use the 1Hz interrupt to update the at91_rtc_upd_rdy flag and wait for the > at91_rtc_wait_upd_rdy event if the rtc is not ready. > > Signed-off-by: Boris BREZILLON <boris.brezillon@xxxxxxxxxxxxxxxxxx> > Reported-by: Bryan Evenson <bevenson@xxxxxxxxxxxxxx> > Tested-by: 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> > Cc: <stable@xxxxxxxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > drivers/rtc/rtc-at91rm9200.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff -puN drivers/rtc/rtc-at91rm9200.c~rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq drivers/rtc/rtc-at91rm9200.c > --- a/drivers/rtc/rtc-at91rm9200.c~rtc-rtc-at91rm9200-fix-infinite-wait-for-ackupd-irq > +++ a/drivers/rtc/rtc-at91rm9200.c > @@ -48,11 +48,13 @@ 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 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) > { > @@ -161,6 +163,8 @@ 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); > + > /* Stop Time/Calendar from counting */ > cr = at91_rtc_read(AT91_RTC_CR); > at91_rtc_write(AT91_RTC_CR, cr | AT91_RTC_UPDCAL | AT91_RTC_UPDTIM); > @@ -183,6 +187,7 @@ 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_CR, cr & ~(AT91_RTC_UPDCAL | AT91_RTC_UPDTIM)); > > return 0; > @@ -290,8 +295,13 @@ static irqreturn_t at91_rtc_interrupt(in > if (rtsr) { /* this interrupt is shared! Is it ours? */ > if (rtsr & AT91_RTC_ALARM) > events |= (RTC_AF | RTC_IRQF); > - if (rtsr & AT91_RTC_SECEV) > + 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); > + } > + } > if (rtsr & AT91_RTC_ACKUPD) > complete(&at91_rtc_updated); > > @@ -413,6 +423,8 @@ static int __init at91_rtc_probe(struct > return PTR_ERR(rtc); > platform_set_drvdata(pdev, rtc); > > + /* Enable 1Hz events */ > + 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 > linux-next.patch > -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html