hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtc: tps6586x: remove mktime usage 

The tps6586x use a 64-bit 'epoch_start' value, but then computes that
value using an 'mktime()', which has a smaller range and overflows
in 2106 at the latest. As both the hardware and the subsystem interface
support wider than 32-bit ranges for rtc times here, let's change all
the operations on 'seconds' to time64_t.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Arnd Bergmann 2018-04-20 18:14:26 +02:00 committed by Alexandre Belloni
parent 337fa19cc3
commit 7982df8671
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/rtc/rtc-tps6586x.c
View File

@ -58,7 +58,7 @@ struct tps6586x_rtc {
struct rtc_device *rtc; struct rtc_device *rtc;
int irq; int irq;
bool irq_en; bool irq_en;
unsigned long long epoch_start; time64_t epoch_start;
}; };
static inline struct device *to_tps6586x_dev(struct device *dev) static inline struct device *to_tps6586x_dev(struct device *dev)
@ -71,7 +71,7 @@ static int tps6586x_rtc_read_time(struct device *dev, struct rtc_time *tm)
struct tps6586x_rtc *rtc = dev_get_drvdata(dev); struct tps6586x_rtc *rtc = dev_get_drvdata(dev);
struct device *tps_dev = to_tps6586x_dev(dev); struct device *tps_dev = to_tps6586x_dev(dev);
unsigned long long ticks = 0; unsigned long long ticks = 0;
unsigned long seconds; time64_t seconds;
u8 buff[6]; u8 buff[6];
int ret; int ret;
int i; int i;
@ -98,11 +98,11 @@ static int tps6586x_rtc_set_time(struct device *dev, struct rtc_time *tm)
struct tps6586x_rtc *rtc = dev_get_drvdata(dev); struct tps6586x_rtc *rtc = dev_get_drvdata(dev);
struct device *tps_dev = to_tps6586x_dev(dev); struct device *tps_dev = to_tps6586x_dev(dev);
unsigned long long ticks; unsigned long long ticks;
unsigned long seconds; time64_t seconds;
u8 buff[5]; u8 buff[5];
int ret; int ret;
rtc_tm_to_time(tm, &seconds); seconds = rtc_tm_to_time64(tm);
if (seconds < rtc->epoch_start) { if (seconds < rtc->epoch_start) {
dev_err(dev, "requested time unsupported\n"); dev_err(dev, "requested time unsupported\n");
return -EINVAL; return -EINVAL;
@ -157,7 +157,7 @@ static int tps6586x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
{ {
struct tps6586x_rtc *rtc = dev_get_drvdata(dev); struct tps6586x_rtc *rtc = dev_get_drvdata(dev);
struct device *tps_dev = to_tps6586x_dev(dev); struct device *tps_dev = to_tps6586x_dev(dev);
unsigned long seconds; time64_t seconds;
unsigned long ticks; unsigned long ticks;
unsigned long rtc_current_time; unsigned long rtc_current_time;
unsigned long long rticks = 0; unsigned long long rticks = 0;
@ -166,7 +166,7 @@ static int tps6586x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
int ret; int ret;
int i; int i;
rtc_tm_to_time(&alrm->time, &seconds); seconds = rtc_tm_to_time64(&alrm->time);
if (alrm->enabled && (seconds < rtc->epoch_start)) { if (alrm->enabled && (seconds < rtc->epoch_start)) {
dev_err(dev, "can't set alarm to requested time\n"); dev_err(dev, "can't set alarm to requested time\n");
@ -213,7 +213,7 @@ static int tps6586x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
struct tps6586x_rtc *rtc = dev_get_drvdata(dev); struct tps6586x_rtc *rtc = dev_get_drvdata(dev);
struct device *tps_dev = to_tps6586x_dev(dev); struct device *tps_dev = to_tps6586x_dev(dev);
unsigned long ticks; unsigned long ticks;
unsigned long seconds; time64_t seconds;
u8 buff[3]; u8 buff[3];
int ret; int ret;
@ -227,7 +227,7 @@ static int tps6586x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
seconds = ticks >> 10; seconds = ticks >> 10;
seconds += rtc->epoch_start; seconds += rtc->epoch_start;
rtc_time_to_tm(seconds, &alrm->time); rtc_time64_to_tm(seconds, &alrm->time);
return 0; return 0;
} }
@ -261,7 +261,7 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
rtc->irq = platform_get_irq(pdev, 0); rtc->irq = platform_get_irq(pdev, 0);
/* Set epoch start as 00:00:00:01:01:2009 */ /* Set epoch start as 00:00:00:01:01:2009 */
rtc->epoch_start = mktime(2009, 1, 1, 0, 0, 0); rtc->epoch_start = mktime64(2009, 1, 1, 0, 0, 0);
/* 1 kHz tick mode, enable tick counting */ /* 1 kHz tick mode, enable tick counting */
ret = tps6586x_update(tps_dev, RTC_CTRL, ret = tps6586x_update(tps_dev, RTC_CTRL,