Skip to content

Commit 0e6255f

Browse files
xdarklightalexandrebelloni
authored andcommitted
rtc: meson-vrtc: Use ktime_get_real_ts64() to get the current time
The VRTC alarm register can be programmed with an amount of seconds after which the SoC will be woken up by the VRTC timer again. We are already converting the alarm time from meson_vrtc_set_alarm() to "seconds since 1970". This means we also need to use "seconds since 1970" for the current time. This fixes a problem where setting the alarm to one minute in the future results in the firmware (which handles wakeup) to output (on the serial console) that the system will be woken up in billions of seconds. ktime_get_raw_ts64() returns the time since boot, not since 1970. Switch to ktime_get_real_ts64() to fix the calculation of the alarm time and to make the SoC wake up at the specified date/time. Also the firmware (which manages suspend) now prints either 59 or 60 seconds until wakeup (depending on how long it takes for the system to enter suspend). Fixes: 6ef3539 ("rtc: Add Amlogic Virtual Wake RTC") Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Kevin Hilman <khilman@baylibre.com> Link: https://lore.kernel.org/r/20230320212142.2355062-1-martin.blumenstingl@googlemail.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent ab0fccc commit 0e6255f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/rtc/rtc-meson-vrtc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static int meson_vrtc_read_time(struct device *dev, struct rtc_time *tm)
2323
struct timespec64 time;
2424

2525
dev_dbg(dev, "%s\n", __func__);
26-
ktime_get_raw_ts64(&time);
26+
ktime_get_real_ts64(&time);
2727
rtc_time64_to_tm(time.tv_sec, tm);
2828

2929
return 0;
@@ -96,7 +96,7 @@ static int __maybe_unused meson_vrtc_suspend(struct device *dev)
9696
long alarm_secs;
9797
struct timespec64 time;
9898

99-
ktime_get_raw_ts64(&time);
99+
ktime_get_real_ts64(&time);
100100
local_time = time.tv_sec;
101101

102102
dev_dbg(dev, "alarm_time = %lus, local_time=%lus\n",

0 commit comments

Comments
 (0)