[v2,11/22] rtc: gemini: stop using rtc deprecated functions

Message ID 1499846682-14093-12-git-send-email-benjamin.gaignard@linaro.org
State New
Headers show
Series
  • [v2,01/22] x86: rtc: stop using rtc deprecated functions
Related show

Commit Message

Benjamin Gaignard July 12, 2017, 8:04 a.m.
rtc_time_to_tm() and rtc_tm_to_time() are deprecated because they
rely on 32bits variables and that will make rtc break in y2038/2016.
Stop using those two functions to safer 64bits ones.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

CC: Hans Ulli Kroll <ulli.kroll@googlemail.com>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Alexandre Belloni <alexandre.belloni@free-electrons.com>
CC: rtc-linux@googlegroups.com
CC: linux-kernel@vger.kernel.org
CC: linux-arm-kernel@lists.infradead.org
---
 drivers/rtc/rtc-ftrtc010.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
1.9.1

Comments

Hans Ulli Kroll July 12, 2017, 5:20 p.m. | #1
Hi Benjamin,

On Wed, 12 Jul 2017, Benjamin Gaignard wrote:

> @@ -93,12 +93,12 @@ static int ftrtc010_rtc_set_time(struct device *dev, struct rtc_time *tm)

>  {

>  	struct ftrtc010_rtc *rtc = dev_get_drvdata(dev);

>  	unsigned int sec, min, hour, day;

> -	unsigned long offset, time;

> +	unsigned long long offset, time;

>  

>  	if (tm->tm_year >= 2148)	/* EPOCH Year + 179 */

>  		return -EINVAL;

>  

> -	rtc_tm_to_time(tm, &time);

> +	time = rtc_tm_to_time64(tm);

>  

>  	sec = readl(rtc->rtc_base + FTRTC010_RTC_SECOND);

>  	min = readl(rtc->rtc_base + FTRTC010_RTC_MINUTE);


later on this will do

	writel(offset, rtc->rtc_base + FTRTC010_RTC_RECORD);

you are writing some 64bit value in a 32bit register ...

NACK here

Greetings from Cologne
Hans Ulli Kroll

> 1.9.1

> 

>

Patch

diff --git a/drivers/rtc/rtc-ftrtc010.c b/drivers/rtc/rtc-ftrtc010.c
index af8d6be..6328913 100644
--- a/drivers/rtc/rtc-ftrtc010.c
+++ b/drivers/rtc/rtc-ftrtc010.c
@@ -74,7 +74,7 @@  static int ftrtc010_rtc_read_time(struct device *dev, struct rtc_time *tm)
 	struct ftrtc010_rtc *rtc = dev_get_drvdata(dev);
 
 	unsigned int  days, hour, min, sec;
-	unsigned long offset, time;
+	unsigned long long offset, time;
 
 	sec  = readl(rtc->rtc_base + FTRTC010_RTC_SECOND);
 	min  = readl(rtc->rtc_base + FTRTC010_RTC_MINUTE);
@@ -84,7 +84,7 @@  static int ftrtc010_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
 	time = offset + days * 86400 + hour * 3600 + min * 60 + sec;
 
-	rtc_time_to_tm(time, tm);
+	rtc_time64_to_tm(time, tm);
 
 	return 0;
 }
@@ -93,12 +93,12 @@  static int ftrtc010_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
 	struct ftrtc010_rtc *rtc = dev_get_drvdata(dev);
 	unsigned int sec, min, hour, day;
-	unsigned long offset, time;
+	unsigned long long offset, time;
 
 	if (tm->tm_year >= 2148)	/* EPOCH Year + 179 */
 		return -EINVAL;
 
-	rtc_tm_to_time(tm, &time);
+	time = rtc_tm_to_time64(tm);
 
 	sec = readl(rtc->rtc_base + FTRTC010_RTC_SECOND);
 	min = readl(rtc->rtc_base + FTRTC010_RTC_MINUTE);