Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1668943
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Benjamin Gaignard <benjamin.gaignard@linaro.org> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 3/3] rtc: st-lpc: make it robust against y2038/2106 bug |
| Date | Mon, 19 Jun 2017 11:40:02 +0200 |
| Message-ID | <tU1k6-S2-13@gated-at.bofh.it> (permalink) |
| References | <tU1k6-S2-9@gated-at.bofh.it> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F/N9eNsJZr2+7DPpKTbXLtBvEtQ7sHqQMh9idFnIQbQ=; b=Ngm4UyNcUo3CerdtKtpWTMmFHkCrcc03iQitey690RPW7OyKZazYrnzYl7muCA4wSo gbeOGKVZ7r4knPjJhUxSX5McYF36EUaLklaXV7KdU2xnCEeHAzbonvMq497XA8imr0g0 3aFlHU3BOrsBRtqXlRyj7q5JmxaJxMptnx6p8= |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F/N9eNsJZr2+7DPpKTbXLtBvEtQ7sHqQMh9idFnIQbQ=; b=JPyKW7RSvzjAmlUT1mqGK8fe58y7/fsC5per94L28EaACriaozr8E+4uSluphV+rht UNQdGmJsMwJUvKdTtu49AZF52oldvZhvEjRDEPJgvmtwXxynVmpmPcbBrgUtFSwL5sO0 zwtDXsHIyW8kz7vHRVxc07uvlLAnJ/btEMeMyFFmEXzfvUFMQmuBPE7TkLxjQhYseiRE 4FAVAzAGfypOFWQkGhuLJIbjnI6/MU6a5ETtwSJyOom2eZT0uVGZacqJqLvWcnmH1LKW AOSDV/+20mA9VzsyXbNjkB4pOiABToOqvyeRmVIgeLd+sHnKVaLNY2nwNHz+0o2v/ICF AU/A== |
| X-Gm-Message-State | AKS2vOw2nyiZaYhsX1/O2pyIzxb6IDI0j3oAde/W37glwbmB2p8jKGA/ numB676+nNvX2D0o |
| X-Received | by 10.28.126.67 with SMTP id z64mr4340008wmc.65.1497865019445; Mon, 19 Jun 2017 02:36:59 -0700 (PDT) |
| X-Mailer | git-send-email 1.9.1 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 59 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linaro-kernel@lists.linaro.org, Benjamin Gaignard <benjamin.gaignard@linaro.org> |
| X-Original-Date | Mon, 19 Jun 2017 11:36:22 +0200 |
| X-Original-Message-ID | <1497864982-29284-4-git-send-email-benjamin.gaignard@linaro.org> |
| X-Original-References | <1497864982-29284-1-git-send-email-benjamin.gaignard@linaro.org> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1668943 |
Show key headers only | View raw
Make driver use u64 variables and functions to be sure that
it will support dates after year 2038.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
---
drivers/rtc/rtc-st-lpc.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/rtc/rtc-st-lpc.c b/drivers/rtc/rtc-st-lpc.c
index 74c0a33..82b0af1 100644
--- a/drivers/rtc/rtc-st-lpc.c
+++ b/drivers/rtc/rtc-st-lpc.c
@@ -99,7 +99,7 @@ static int st_rtc_read_time(struct device *dev, struct rtc_time *tm)
lpt = ((unsigned long long)lpt_msb << 32) | lpt_lsb;
do_div(lpt, rtc->clkrate);
- rtc_time_to_tm(lpt, tm);
+ rtc_time64_to_tm(lpt, tm);
return 0;
}
@@ -107,13 +107,10 @@ static int st_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int st_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
struct st_rtc *rtc = dev_get_drvdata(dev);
- unsigned long long lpt;
- unsigned long secs, flags;
- int ret;
+ unsigned long long lpt, secs;
+ unsigned long flags;
- ret = rtc_tm_to_time(tm, &secs);
- if (ret)
- return ret;
+ secs = rtc_tm_to_time64(tm);
lpt = (unsigned long long)secs * rtc->clkrate;
@@ -161,13 +158,13 @@ static int st_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *t)
{
struct st_rtc *rtc = dev_get_drvdata(dev);
struct rtc_time now;
- unsigned long now_secs;
- unsigned long alarm_secs;
+ unsigned long long now_secs;
+ unsigned long long alarm_secs;
unsigned long long lpa;
st_rtc_read_time(dev, &now);
- rtc_tm_to_time(&now, &now_secs);
- rtc_tm_to_time(&t->time, &alarm_secs);
+ now_secs = rtc_tm_to_time64(&now);
+ alarm_secs = rtc_tm_to_time64(&t->time);
/* Invalid alarm time */
if (now_secs > alarm_secs)
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/3] rtc: make st-lpc robust against y2038/2106 bug Benjamin Gaignard <benjamin.gaignard@linaro.org> - 2017-06-19 11:40 +0200 [PATCH v2 3/3] rtc: st-lpc: make it robust against y2038/2106 bug Benjamin Gaignard <benjamin.gaignard@linaro.org> - 2017-06-19 11:40 +0200 [PATCH v2 2/3] tool: timer: rtctest add check for problematic dates Benjamin Gaignard <benjamin.gaignard@linaro.org> - 2017-06-19 11:40 +0200
csiph-web