| Message ID | 1497951359-13334-13-git-send-email-benjamin.gaignard@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jun 20, 2017 at 11:35 AM, Benjamin Gaignard <benjamin.gaignard@linaro.org> wrote: > 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: Linus Walleij <linus.walleij@linaro.org> > 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 Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Tue, Jun 20, 2017 at 11:35:20AM +0200, Benjamin Gaignard wrote: > 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: Linus Walleij <linus.walleij@linaro.org> > 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-coh901331.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c > index cfc4141..5645011 100644 > --- a/drivers/rtc/rtc-coh901331.c > +++ b/drivers/rtc/rtc-coh901331.c > @@ -80,7 +80,8 @@ static int coh901331_read_time(struct device *dev, struct rtc_time *tm) > clk_enable(rtap->clk); > /* Check if the time is valid */ > if (readl(rtap->virtbase + COH901331_VALID)) { > - rtc_time_to_tm(readl(rtap->virtbase + COH901331_CUR_TIME), tm); > + rtc_time64_to_tm( > + (u64)readl(rtap->virtbase + COH901331_CUR_TIME), tm); > clk_disable(rtap->clk); > return rtc_valid_tm(tm); > } > @@ -88,7 +89,7 @@ static int coh901331_read_time(struct device *dev, struct rtc_time *tm) > return -EINVAL; > } > > -static int coh901331_set_mmss(struct device *dev, unsigned long secs) > +static int coh901331_set_mmss64(struct device *dev, time64_t secs) Do you realise how stupid this is? Here, you're implicitly truncating the 64-bit time value to 32-bit when you write it into the register. So, when your clock wraps past 7 February 2106 (*not* 2038), when you next read it, you read a date in 1970. Exactly the same happens with the existing implementation, so this fixes nothing at all. As I've said in my other mail, these changes make it harder to fix the problem, because you're stuck with that truncation - you can never do anything but truncate it. Keeping the 32-bit conversion functions allows us to wind the date progressively forward if we so choose. Sure, if we don't want to maintain two conversion functions, then we can define the 32-bit conversion functions in terms of the 64-bit versions, but do _not_ get rid of them.
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index cfc4141..5645011 100644 --- a/drivers/rtc/rtc-coh901331.c +++ b/drivers/rtc/rtc-coh901331.c @@ -80,7 +80,8 @@ static int coh901331_read_time(struct device *dev, struct rtc_time *tm) clk_enable(rtap->clk); /* Check if the time is valid */ if (readl(rtap->virtbase + COH901331_VALID)) { - rtc_time_to_tm(readl(rtap->virtbase + COH901331_CUR_TIME), tm); + rtc_time64_to_tm( + (u64)readl(rtap->virtbase + COH901331_CUR_TIME), tm); clk_disable(rtap->clk); return rtc_valid_tm(tm); } @@ -88,7 +89,7 @@ static int coh901331_read_time(struct device *dev, struct rtc_time *tm) return -EINVAL; } -static int coh901331_set_mmss(struct device *dev, unsigned long secs) +static int coh901331_set_mmss64(struct device *dev, time64_t secs) { struct coh901331_port *rtap = dev_get_drvdata(dev); @@ -104,7 +105,8 @@ static int coh901331_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) struct coh901331_port *rtap = dev_get_drvdata(dev); clk_enable(rtap->clk); - rtc_time_to_tm(readl(rtap->virtbase + COH901331_ALARM), &alarm->time); + rtc_time64_to_tm( + (u64)readl(rtap->virtbase + COH901331_ALARM), &alarm->time); alarm->pending = readl(rtap->virtbase + COH901331_IRQ_EVENT) & 1U; alarm->enabled = readl(rtap->virtbase + COH901331_IRQ_MASK) & 1U; clk_disable(rtap->clk); @@ -115,9 +117,9 @@ static int coh901331_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) static int coh901331_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct coh901331_port *rtap = dev_get_drvdata(dev); - unsigned long time; + unsigned long long time; - rtc_tm_to_time(&alarm->time, &time); + time = rtc_tm_to_time64(&alarm->time); clk_enable(rtap->clk); writel(time, rtap->virtbase + COH901331_ALARM); writel(alarm->enabled, rtap->virtbase + COH901331_IRQ_MASK); @@ -142,7 +144,7 @@ static int coh901331_alarm_irq_enable(struct device *dev, unsigned int enabled) static const struct rtc_class_ops coh901331_ops = { .read_time = coh901331_read_time, - .set_mmss = coh901331_set_mmss, + .set_mmss64 = coh901331_set_mmss64, .read_alarm = coh901331_read_alarm, .set_alarm = coh901331_set_alarm, .alarm_irq_enable = coh901331_alarm_irq_enable,
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: Linus Walleij <linus.walleij@linaro.org> 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-coh901331.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)