rtc: sun6i: let the core handle rtc range
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/2 rtc: sun6i: let the core handle rtc range
Let the rtc core check the date/time against the RTC range.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-sun6i.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/rtc/rtc-sun6i.c +10 -15
@@ -108,7 +108,6 @@* driver, even though it is somewhat limited. */ #define SUN6I_YEAR_MIN 1970 -#define SUN6I_YEAR_MAX 2033#define SUN6I_YEAR_OFF (SUN6I_YEAR_MIN - 1900)/*
@@ -569,14 +568,6 @@ static int sun6i_rtc_settime(struct device *dev, struct rtc_time *rtc_tm)struct sun6i_rtc_dev *chip =dev_get_drvdata (dev);u32 date =0 ;u32 time =0 ; -int year; - - year = rtc_tm->tm_year +1900 ; -if (year <SUN6I_YEAR_MIN || year >SUN6I_YEAR_MAX ) { -dev_err (dev,"rtc only supports year in range %d - %d\n" , -SUN6I_YEAR_MIN ,SUN6I_YEAR_MAX ); -return -EINVAL ; - } rtc_tm->tm_year -=SUN6I_YEAR_OFF ; rtc_tm->tm_mon +=1 ;
@@ -585,7 +576,7 @@ static int sun6i_rtc_settime(struct device *dev, struct rtc_time *rtc_tm)SUN6I_DATE_SET_MON_VALUE (rtc_tm->tm_mon) |SUN6I_DATE_SET_YEAR_VALUE (rtc_tm->tm_year); -if (is_leap_year (year)) +if (is_leap_year (rtc_tm->tm_year +SUN6I_YEAR_MIN )) date |=SUN6I_LEAP_SET_VALUE (1 ); time = SUN6I_TIME_SET_SEC_VALUE(rtc_tm->tm_sec) |
@@ -726,12 +717,16 @@ static int sun6i_rtc_probe(struct platform_device *pdev)device_init_wakeup (&pdev->dev,1 ); - chip->rtc =devm_rtc_device_register (&pdev->dev,"rtc-sun6i" , - &sun6i_rtc_ops,THIS_MODULE ); -if (IS_ERR (chip->rtc)) { -dev_err (&pdev->dev,"unable to register device\n" ); + chip->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (chip->rtc))return PTR_ERR (chip->rtc); - } + + chip->rtc->ops = &sun6i_rtc_ops; + chip->rtc->range_max =2019686399LL ;/* 2033-12-31 23:59:59 */ + + ret =rtc_register_device (chip->rtc); +if (ret) +return ret;dev_info (&pdev->dev,"RTC enabled\n" );
Signature · 1 line
2.25.1
Alexandre Belloni
maintainerPATCH 2/2 rtc: sun6i: switch to rtc_time64_to_tm/rtc_tm_to_time64
Call the 64bit versions of rtc_tm time conversion.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-sun6i.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/rtc/rtc-sun6i.c +3 -3
@@ -498,7 +498,7 @@ static int sun6i_rtc_getalarm(struct device *dev, struct rtc_wkalrm *wkalrm) wkalrm->enabled = !!(alrm_en &SUN6I_ALRM_EN_CNT_EN ); wkalrm->pending = !!(alrm_st &SUN6I_ALRM_EN_CNT_EN ); -rtc_time_to_tm (chip->alarm, &wkalrm->time); +rtc_time64_to_tm (chip->alarm, &wkalrm->time);return 0 ; }
@@ -519,8 +519,8 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm)return -EINVAL ; } -rtc_tm_to_time (alrm_tm, &time_set); -rtc_tm_to_time (&tm_now, &time_now); + time_set =rtc_tm_to_time64 (alrm_tm); + time_now =rtc_tm_to_time64 (&tm_now);if (time_set <= time_now) {dev_err (dev,"Date to set in the past\n" );return -EINVAL ;
Signature · 1 line
2.25.1
Hi,
Quoted 3 lines · Alexandre Belloni
Let the rtc core check the date/time against the RTC range.
Signed-off-by Alexandre Belloni <[email protected]>
This was successfully:
Tested-by Paul Kocialkowski <[email protected]>
Cheers,
Paul
Quoted 70 lines
--- drivers/rtc/rtc-sun6i.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)drivers/rtc/rtc-sun6i.c +10
-15@@ -108,7 +108,6 @@* driver, even though it is somewhat limited. */ #define SUN6I_YEAR_MIN 1970 -#define SUN6I_YEAR_MAX 2033#define SUN6I_YEAR_OFF (SUN6I_YEAR_MIN - 1900)/* @@ -569,14 +568,6 @@ static int sun6i_rtc_settime(struct device *dev, struct rtc_time *rtc_tm)struct sun6i_rtc_dev *chip =dev_get_drvdata (dev);u32 date =0 ;u32 time =0 ; -int year; - - year = rtc_tm->tm_year +1900 ; -if (year <SUN6I_YEAR_MIN || year >SUN6I_YEAR_MAX ) { -dev_err (dev,"rtc only supports year in range %d - %d\n" , -SUN6I_YEAR_MIN ,SUN6I_YEAR_MAX ); -return -EINVAL ; - } rtc_tm->tm_year -=SUN6I_YEAR_OFF ; rtc_tm->tm_mon +=1 ;@@ -585,7 +576,7 @@ static int sun6i_rtc_settime(struct device *dev, struct rtc_time *rtc_tm)SUN6I_DATE_SET_MON_VALUE (rtc_tm->tm_mon) |SUN6I_DATE_SET_YEAR_VALUE (rtc_tm->tm_year); -if (is_leap_year (year)) +if (is_leap_year (rtc_tm->tm_year +SUN6I_YEAR_MIN )) date |=SUN6I_LEAP_SET_VALUE (1 ); time = SUN6I_TIME_SET_SEC_VALUE(rtc_tm->tm_sec) |@@ -726,12 +717,16 @@ static int sun6i_rtc_probe(struct platform_device *pdev)device_init_wakeup (&pdev->dev,1 ); - chip->rtc =devm_rtc_device_register (&pdev->dev,"rtc-sun6i" , - &sun6i_rtc_ops,THIS_MODULE ); -if (IS_ERR (chip->rtc)) { -dev_err (&pdev->dev,"unable to register device\n" ); + chip->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (chip->rtc))return PTR_ERR (chip->rtc); - } + + chip->rtc->ops = &sun6i_rtc_ops; + chip->rtc->range_max =2019686399LL ;/* 2033-12-31 23:59:59 */ + + ret =rtc_register_device (chip->rtc); +if (ret) +return ret;dev_info (&pdev->dev,"RTC enabled\n" );Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com