From patchwork Thu May 3 02:53:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 134878 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1396513lji; Wed, 2 May 2018 19:55:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoRHLPx+ooeDlIwcupt2Wz0NoGN+8Xh0W6KxLozfELKXwu6jvFneHMOs2WO47PzjJbFtvjI X-Received: by 2002:a63:7b55:: with SMTP id k21-v6mr18272210pgn.364.1525316100318; Wed, 02 May 2018 19:55:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525316100; cv=none; d=google.com; s=arc-20160816; b=QLxTirspgChS+ujSgeqz1RPzqz/TGelLuFIB+EPAa9Wl3cU5leZeFfbz44WSmFcInQ O0pxVJo2ktrEBa6DylsGlOG+hXG8NiXrL3zrW2Dz79ZejSnCjaaYJ3a/+MBKhobszLxr /o4oCFEcVGUfxJdjYq7rWFIA5/GiwmeTJiEJHwC1/CWf2+UL1bKkrtE9+LLt+Td90mwQ YlAQtiGicXxcqzD8fZPHqcaNd8KWlNhq2+skRmRjS55kb8URXgdpY2Ddb2jF2GUwHz7F O3Yf/wbIvlIIgQjX6UTByQF5fWgEgYDDe7cVb4yPsPUTJTK86J5Z9u2BbYFujfGtZ776 kNqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=cQ+5/kQaK3QLhGVNWvUfqX3223qL2I21JjAReG4Mla4=; b=0qjTdYAUKsd9cAoWGrniqNRRRi6i7W2V0S5P8+z7KbywgFoNphyDkk8W8lmIqc3jOA JOk3AHXWvTNz9AZmLHPbs0AgJ3lDtQLp3/noanpGFtSMVzR0AKaaZ83XEOAXpi5SuL+H 6nXU7ehYXrAUyJHnfXjQCbWGCvL0R1LtZHE2GX3HAEBTsZPgD+5PJuQj8l7m6a0X3MOZ IVY2F5Ev+pEdiNxBhK5419J+Pe/1w70XIVgFldbL/093b8XGt8IDJytXhe9dpjSpTyPZ 9ZE3oJEG1lVZpLAN6LWvNGn5ZFjck/mR8EkffWO5XZ86VpBZK03avgTv/DXpmQWa7pTK jMgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CVsErqug; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c9-v6si10993047pgw.657.2018.05.02.19.55.00; Wed, 02 May 2018 19:55:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CVsErqug; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081AbeECCyx (ORCPT + 29 others); Wed, 2 May 2018 22:54:53 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:43174 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751929AbeECCyt (ORCPT ); Wed, 2 May 2018 22:54:49 -0400 Received: by mail-pg0-f67.google.com with SMTP id k11-v6so10932126pgo.10 for ; Wed, 02 May 2018 19:54:49 -0700 (PDT) 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 :in-reply-to:references; bh=cQ+5/kQaK3QLhGVNWvUfqX3223qL2I21JjAReG4Mla4=; b=CVsErqug8+kFr7l9LLXwmmBLKfqJSoMHVPNxWsw7U3N9PJxfnG0Hepx8GBOmNtGrS4 co6o8DSuTYk+2XPp1Zf53misJIo1C7xPiU2zYuRNCD171U8z++G+hPweQuKl4YgVfmAx 9MecpES//iABv+o5zvl8/E5nC1vYLbyCpDTQA= 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:in-reply-to:references; bh=cQ+5/kQaK3QLhGVNWvUfqX3223qL2I21JjAReG4Mla4=; b=BKr4XE+LR9YFq/+Zldxxxd+1PDpLi75Bi+TAwbwc9Z3C+N/+zjoGB0/K2DWPBrJjaW 1xUxRHR3zx+Rwi92iBRyv5yH/vw1SdEIkubnelsGHPU93CG1Gh5n5mxFrbWWjhXZgqGC SQsSFSD4PBNtn6P2s/iOd9bDIbEmCL6XJXDL7crCVFYUkGi5gS8WGdvIBOqO+CpTwwhn 3IMLnMZj43o6zLvEr353wLHCLfXCuI1S9N29AmrzLv+d39iJe+qqQp4lxDofPUPMvStC Qsvpr2Z2JXhd9BMSj++7oUHbga6y+rr++MPDVXz0UKpr1RGTZInoDEkEinSXVfUw+Lin OfQQ== X-Gm-Message-State: ALQs6tACr8aJKrCCnbG5KVvQBUxwT31n6/YPVvCeOTPDA+QHRK2RmcT9 Zg3jw+81N5Tne7XRmFkQtK/fbQ== X-Received: by 2002:a17:902:6b04:: with SMTP id o4-v6mr3351603plk.101.1525316088625; Wed, 02 May 2018 19:54:48 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id s189-v6sm21236971pgc.39.2018.05.02.19.54.44 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 May 2018 19:54:48 -0700 (PDT) From: Baolin Wang To: macro@linux-mips.org, ralf@linux-mips.org, jhogan@kernel.org, chenhc@lemote.com Cc: kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, tglx@linutronix.de, pombredanne@nexb.com, arnd@arndb.de, broonie@kernel.org, paul.burton@mips.com, heiko@sntech.de, daniel.lezcano@linaro.org, viresh.kumar@linaro.org, baolin.wang@linaro.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] MIPS: Convert update_persistent_clock() to update_persistent_clock64() Date: Thu, 3 May 2018 10:53:18 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since struct timespec is not y2038 safe on 32bit machines, this patch converts update_persistent_clock() to update_persistent_clock64() using struct timespec64. This patch also changes rtc_mips_set_time()/rtc_mips_set_mmss() interfaces to use time64_t, which is y2038 safe. Signed-off-by: Baolin Wang --- arch/mips/dec/time.c | 2 +- arch/mips/include/asm/time.h | 4 ++-- arch/mips/kernel/time.c | 6 +++--- arch/mips/lasat/ds1603.c | 4 ++-- arch/mips/lasat/sysctl.c | 6 +++--- arch/mips/sibyte/swarm/rtc_m41t81.c | 4 ++-- arch/mips/sibyte/swarm/rtc_xicor1241.c | 4 ++-- arch/mips/sibyte/swarm/setup.c | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) -- 1.7.9.5 diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 9e992cf..c2d6ec8 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -65,7 +65,7 @@ void read_persistent_clock64(struct timespec64 *ts) * jump to the next second precisely 500 ms later. Check the Dallas * DS1287 data sheet for details. */ -int rtc_mips_set_mmss(unsigned long nowtime) +int rtc_mips_set_mmss(time64_t nowtime) { int retval = 0; int real_seconds, real_minutes, cmos_minutes; diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index 17d4cd2..c4e2a1a 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h @@ -27,8 +27,8 @@ * rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need * to be set. Used by RTC sync-up. */ -extern int rtc_mips_set_time(unsigned long); -extern int rtc_mips_set_mmss(unsigned long); +extern int rtc_mips_set_time(time64_t); +extern int rtc_mips_set_mmss(time64_t); /* * board specific routines required by time_init(). diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index a6ebc81..01ba5ab 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -34,17 +34,17 @@ DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); -int __weak rtc_mips_set_time(unsigned long sec) +int __weak rtc_mips_set_time(time64_t sec) { return -ENODEV; } -int __weak rtc_mips_set_mmss(unsigned long nowtime) +int __weak rtc_mips_set_mmss(time64_t nowtime) { return rtc_mips_set_time(nowtime); } -int update_persistent_clock(struct timespec now) +int update_persistent_clock64(struct timespec64 now) { return rtc_mips_set_mmss(now.tv_sec); } diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c index d75c887..580cf3a 100644 --- a/arch/mips/lasat/ds1603.c +++ b/arch/mips/lasat/ds1603.c @@ -98,7 +98,7 @@ static void rtc_write_byte(unsigned int byte) } } -static void rtc_write_word(unsigned long word) +static void rtc_write_word(time64_t word) { int i; @@ -152,7 +152,7 @@ void read_persistent_clock64(struct timespec64 *ts) ts->tv_nsec = 0; } -int rtc_mips_set_mmss(unsigned long time) +int rtc_mips_set_mmss(time64_t time) { unsigned long flags; diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 6f74224..4264107 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c @@ -53,7 +53,7 @@ int proc_dolasatstring(struct ctl_table *table, int write, } #ifdef CONFIG_DS1603 -static int rtctmp; +static time64_t rtctmp; /* proc function to read/write RealTime Clock */ int proc_dolasatrtc(struct ctl_table *table, int write, @@ -69,7 +69,7 @@ int proc_dolasatrtc(struct ctl_table *table, int write, if (rtctmp < 0) rtctmp = 0; } - r = proc_dointvec(table, write, buffer, lenp, ppos); + r = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); if (r) return r; @@ -224,7 +224,7 @@ int proc_lasat_prid(struct ctl_table *table, int write, { .procname = "rtc", .data = &rtctmp, - .maxlen = sizeof(int), + .maxlen = sizeof(time64_t), .mode = 0644, .proc_handler = proc_dolasatrtc, }, diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c index aa27a22..4ac8ccd 100644 --- a/arch/mips/sibyte/swarm/rtc_m41t81.c +++ b/arch/mips/sibyte/swarm/rtc_m41t81.c @@ -141,13 +141,13 @@ static int m41t81_write(uint8_t addr, int b) return 0; } -int m41t81_set_time(unsigned long t) +int m41t81_set_time(time64_t t) { struct rtc_time tm; unsigned long flags; /* Note we don't care about the century */ - rtc_time_to_tm(t, &tm); + rtc_time64_to_tm(t, &tm); /* * Note the write order matters as it ensures the correctness. diff --git a/arch/mips/sibyte/swarm/rtc_xicor1241.c b/arch/mips/sibyte/swarm/rtc_xicor1241.c index a2121c1..2dcaaa7 100644 --- a/arch/mips/sibyte/swarm/rtc_xicor1241.c +++ b/arch/mips/sibyte/swarm/rtc_xicor1241.c @@ -109,13 +109,13 @@ static int xicor_write(uint8_t addr, int b) } } -int xicor_set_time(unsigned long t) +int xicor_set_time(time64_t t) { struct rtc_time tm; int tmp; unsigned long flags; - rtc_time_to_tm(t, &tm); + rtc_time64_to_tm(t, &tm); tm.tm_year += 1900; spin_lock_irqsave(&rtc_lock, flags); diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 7073940..f356ecd 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c @@ -57,11 +57,11 @@ #endif extern int xicor_probe(void); -extern int xicor_set_time(unsigned long); +extern int xicor_set_time(time64_t); extern time64_t xicor_get_time(void); extern int m41t81_probe(void); -extern int m41t81_set_time(unsigned long); +extern int m41t81_set_time(time64_t); extern time64_t m41t81_get_time(void); const char *get_system_type(void) @@ -109,7 +109,7 @@ void read_persistent_clock64(struct timespec64 *ts) ts->tv_nsec = 0; } -int rtc_mips_set_time(unsigned long sec) +int rtc_mips_set_time(time64_t sec) { switch (swarm_rtc_type) { case RTC_XICOR: