diff options
| -rw-r--r-- | drivers/rtc/hctosys.c | 3 | ||||
| -rw-r--r-- | include/linux/rtc.h | 1 | ||||
| -rw-r--r-- | kernel/time/alarmtimer.c | 27 |
3 files changed, 30 insertions, 1 deletions
diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c index 4aa60d74004e..4633637c8c80 100644 --- a/drivers/rtc/hctosys.c +++ b/drivers/rtc/hctosys.c @@ -22,7 +22,7 @@ * the best guess is to add 0.5s. */ -static int __init rtc_hctosys(void) +int rtc_hctosys(void) { int err = -ENODEV; struct rtc_time tm; @@ -72,5 +72,6 @@ err_open: return err; } +EXPORT_SYMBOL(rtc_hctosys); late_initcall(rtc_hctosys); diff --git a/include/linux/rtc.h b/include/linux/rtc.h index c2c28975293c..b608a6f392e1 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -193,6 +193,7 @@ static inline bool is_leap_year(unsigned int year) #ifdef CONFIG_RTC_HCTOSYS_DEVICE extern int rtc_hctosys_ret; +int rtc_hctosys(void); #else #define rtc_hctosys_ret -ENODEV #endif diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 0f69cecc93cd..62da1374fef6 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -268,11 +268,37 @@ static int alarmtimer_suspend(struct device *dev) } return ret; } + +static void sync_to_rtc_time(struct device *dev) +{ + struct timespec ts_old; + struct rtc_time tm; + + /* log old system time */ + getnstimeofday(&ts_old); + rtc_time_to_tm(ts_old.tv_sec, &tm); + pr_info("alarmtimer: old system time %d-%02d-%02d %02d:%02d:%02d.%09lu UTC\n", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, ts_old.tv_nsec); + +#ifdef CONFIG_RTC_HCTOSYS + rtc_hctosys(); +#else + pr_info("%s %s line=%d, missing function to sync system time to rtc time\n", + __FILE__, __func__, __LINE__); +#endif + return; +} #else static int alarmtimer_suspend(struct device *dev) { return 0; } + +static void sync_to_rtc_time(struct device *dev) +{ + return 0; +} #endif static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type) @@ -765,6 +791,7 @@ out: /* Suspend hook structures */ static const struct dev_pm_ops alarmtimer_pm_ops = { .suspend = alarmtimer_suspend, + .complete = sync_to_rtc_time, }; static struct platform_driver alarmtimer_driver = { |