Skip to content

Commit

Permalink
rtc-bfin: fix state restoration when resuming
Browse files Browse the repository at this point in the history
Much (but not all) of the RTC state is kept in the RTC peripheral which
has its own power domain.  Periodically (1 HZ), that state is synced from
one power domain to the other (peripheral->core).  When we are resuming,
we need to wait for the sync to occur so that we don't get a mismatch of
reading undefined state in the rest of the driver.

Further, once the externally maintained bits have been synced back into
the core, we then need to restore the bits maintained in the core.  In our
particular case, that is just the write completion interrupt bit.

If we don't do any of this, working with the RTC causes ~5 second delays
from time to time after waking up due to the write completion interrupt
never firing.

Reported-by: Michael Dean <mdean@aeronix.com>
Reported-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Mike Frysinger authored and Linus Torvalds committed Sep 10, 2010
1 parent 110b7e9 commit b6de860
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions drivers/rtc/rtc-bfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,17 @@ static int bfin_rtc_resume(struct platform_device *pdev)
{
if (device_may_wakeup(&pdev->dev))
disable_irq_wake(IRQ_RTC);
else
bfin_write_RTC_ISTAT(-1);

/*
* Since only some of the RTC bits are maintained externally in the
* Vbat domain, we need to wait for the RTC MMRs to be synced into
* the core after waking up. This happens every RTC 1HZ. Once that
* has happened, we can go ahead and re-enable the important write
* complete interrupt event.
*/
while (!(bfin_read_RTC_ISTAT() & RTC_ISTAT_SEC))
continue;
bfin_rtc_int_set(RTC_ISTAT_WRITE_COMPLETE);

return 0;
}
Expand Down

0 comments on commit b6de860

Please sign in to comment.