rtc: pl031: remove useless invalid alarm handling
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/3 rtc: pl031: remove useless invalid alarm handling
The core will never pass an invalid alarm to .set_alarm, it is not necessary to check for its validity.
--- drivers/rtc/rtc-pl031.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/rtc/rtc-pl031.c +8 -16
@@ -210,17 +210,13 @@ static int pl031_stv2_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)unsigned long bcd_year;int ret; -/* At the moment, we can only deal with non-wildcarded alarm times. */ - ret =rtc_valid_tm (&alarm->time); + ret =pl031_stv2_tm_to_time (dev, &alarm->time, + &time, &bcd_year);if (ret ==0 ) { - ret =pl031_stv2_tm_to_time (dev, &alarm->time, - &time, &bcd_year); -if (ret ==0 ) { -writel (bcd_year, ldata->base +RTC_YMR ); -writel (time, ldata->base +RTC_MR ); +writel (bcd_year, ldata->base +RTC_YMR ); +writel (time, ldata->base +RTC_MR ); -pl031_alarm_irq_enable (dev, alarm->enabled); - } +pl031_alarm_irq_enable (dev, alarm->enabled); }return ret;
@@ -285,14 +281,10 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)unsigned long time;int ret; -/* At the moment, we can only deal with non-wildcarded alarm times. */ - ret =rtc_valid_tm (&alarm->time); + ret =rtc_tm_to_time (&alarm->time, &time);if (ret ==0 ) { - ret =rtc_tm_to_time (&alarm->time, &time); -if (ret ==0 ) { -writel (time, ldata->base +RTC_MR ); -pl031_alarm_irq_enable (dev, alarm->enabled); - } +writel (time, ldata->base +RTC_MR ); +pl031_alarm_irq_enable (dev, alarm->enabled); }return ret;
Signature · 1 line
2.24.1
Alexandre Belloni
maintainerPATCH 2/3 rtc: pl031: set range
The PL031 and ST v1 RTC are 32bit seconds counters. STv2 is a BCD RTC apparently going from 0000 to 9999, hopefully handling the leap days properly until then.
--- drivers/rtc/rtc-pl031.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/rtc/rtc-pl031.c +8 -0
@@ -80,6 +80,8 @@ struct pl031_vendor_data {bool clockwatch;bool st_weekday;unsigned long irqflags; +time64_t range_min; +timeu64_t range_max; };struct pl031_local {
@@ -375,6 +377,8 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)return PTR_ERR (ldata->rtc); ldata->rtc->ops = ops; + ldata->rtc->range_min = vendor->range_min; + ldata->rtc->range_max = vendor->range_max; ret =rtc_register_device (ldata->rtc);if (ret)
@@ -405,6 +409,7 @@ static struct pl031_vendor_data arm_pl031 = { .set_alarm = pl031_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, }, + .range_max = U32_MAX, };/* The First ST derivative */
@@ -418,6 +423,7 @@ static struct pl031_vendor_data stv1_pl031 = { }, .clockwatch = true, .st_weekday = true, + .range_max = U32_MAX, };/* And the second ST derivative */
@@ -438,6 +444,8 @@ static struct pl031_vendor_data stv2_pl031 = {* remove IRQF_COND_SUSPEND */ .irqflags = IRQF_SHARED | IRQF_COND_SUSPEND, + .range_min = RTC_TIMESTAMP_BEGIN_0000, + .range_max = RTC_TIMESTAMP_END_9999, };static const struct amba_id pl031_ids[] = {
Signature · 1 line
2.24.1
Re: [PATCH 2/3] rtc: pl031: set range
Quoted 5 lines · Alexandre Belloni
The PL031 and ST v1 RTC are 32bit seconds counters. STv2 is a BCD RTC apparently going from 0000 to 9999, hopefully handling the leap days properly until then.
Signed-off-by Alexandre Belloni <[email protected]>
Yours,
Linus Walleij
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Alexandre Belloni
maintainerPATCH 3/3 rtc: pl031: switch to rtc_time64_to_tm/rtc_tm_to_time64
In reply to Alexandre BelloniCall the 64bit versions of rtc_tm time conversion to allow extending support after 2106 and properly supporting the STv2 range.
--- drivers/rtc/rtc-pl031.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-)
drivers/rtc/rtc-pl031.c +7 -20
@@ -125,11 +125,9 @@ static int pl031_stv2_tm_to_time(struct device *dev,return -EINVAL ; }else if (wday ==-1 ) {/* wday is not provided, calculate it here */ -unsigned long time;struct rtc_time calc_tm; -rtc_tm_to_time (tm, &time); -rtc_time_to_tm (time, &calc_tm); +rtc_time64_to_tm (rtc_tm_to_time64 (tm), &calc_tm); wday = calc_tm.tm_wday; }
@@ -246,30 +244,25 @@ static int pl031_read_time(struct device *dev, struct rtc_time *tm) {struct pl031_local *ldata =dev_get_drvdata (dev); -rtc_time_to_tm (readl (ldata->base +RTC_DR ), tm); +rtc_time64_to_tm (readl (ldata->base +RTC_DR ), tm);return 0 ; }static int pl031_set_time (struct device *dev,struct rtc_time *tm) { -unsigned long time;struct pl031_local *ldata =dev_get_drvdata (dev); -int ret; - ret =rtc_tm_to_time (tm, &time); - -if (ret ==0 ) -writel (time, ldata->base +RTC_LR ); +writel (rtc_tm_to_time64 (tm), ldata->base +RTC_LR ); -return ret; +return 0 ; }static int pl031_read_alarm (struct device *dev,struct rtc_wkalrm *alarm) {struct pl031_local *ldata =dev_get_drvdata (dev); -rtc_time_to_tm (readl (ldata->base +RTC_MR ), &alarm->time); +rtc_time64_to_tm (readl (ldata->base +RTC_MR ), &alarm->time); alarm->pending =readl (ldata->base +RTC_RIS ) &RTC_BIT_AI ; alarm->enabled =readl (ldata->base +RTC_IMSC ) &RTC_BIT_AI ;
@@ -280,16 +273,10 @@ static int pl031_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)static int pl031_set_alarm (struct device *dev,struct rtc_wkalrm *alarm) {struct pl031_local *ldata =dev_get_drvdata (dev); -unsigned long time; -int ret; - ret =rtc_tm_to_time (&alarm->time, &time); -if (ret ==0 ) { -writel (time, ldata->base +RTC_MR ); -pl031_alarm_irq_enable (dev, alarm->enabled); - } +writel (rtc_tm_to_time64 (&alarm->time), ldata->base +RTC_MR ); -return ret; +return 0 ; }static int pl031_remove (struct amba_device *adev)
Signature · 1 line
2.24.1
Re: [PATCH 3/3] rtc: pl031: switch to rtc_time64_to_tm/rtc_tm_to_time64
Quoted 4 lines · Alexandre Belloni
Call the 64bit versions of
rtc_tmtime conversion to allow extending support after 2106 and properly supporting the STv2 range.Signed-off-by Alexandre Belloni <[email protected]>
Yours,
Linus Walleij
Quoted 4 lines · Alexandre Belloni
The core will never pass an invalid alarm to .set_alarm, it is not necessary to check for its validity.
Signed-off-by Alexandre Belloni <[email protected]>
Yours,
Linus Walleij