From patchwork Mon May 7 09:28:27 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: 135090 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2944394lji; Mon, 7 May 2018 02:29:46 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo5iFbmPa8boXs2vyXfXJ1ebbwrSq5Pd2pTaXQz7xBkhnJB05Itrrp7NcnUTdZ9jjiS90QM X-Received: by 10.98.91.2 with SMTP id p2mr27895484pfb.96.1525685386497; Mon, 07 May 2018 02:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525685386; cv=none; d=google.com; s=arc-20160816; b=rRHtf9vpr+JWifyR4gLXQ37JhFZHEVOomEvZnQpowe7p+4IUTuZHttnrIbuAuq5fzX vwBHBjug0KvEi8o2cAWAlhyzSOB5EIIQmSJSeu7C03rRMwYImlBtroFh2w1gxTe6GaJC JxnjEFAJ23Ap7VYM4J+ruEpw0w0XASn1Dypu+syckRX2eZQHhfH9gyf1H2TWl0NZgHiH z7q/Hj5Jqr3XqbP02/6p1TahhdMaxVw9ALtn37xbFtxGicbJ3EkzOXH2l33QOPXjry1a rSDyb1v5DJ8x6NX0qVYjIP7t5spXfMNvCennKjK0bp8PjIUJzhOqsVYanJBp4JhFOd24 HtTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=2rJNs4E1e+dE9mJC2hUBQACnIonHWogaCNotKEm3Mog=; b=ugDYuGhyGlKT/62vncYrEGfpq4LM7lXXloyHWFJufz6i+Dk0UE0K/mm0JxdFoW6HoV J9PhnU/Cz5x9km5q7vhvq+XLzkmB2MynmFmdGlq+Kxn2+pVtdnMKCdXGAlUujjqSAktz YI7VEd7vk/UohNXPorKURIUHguiqtMsr2ZxnhY3hDfzL/haOIAuCjKW0RT3Z9bs8PkHP UV1DEgqzbgG6CFn5nh4TM3gThOpaEWEXJIvjEYXfC5pycZI4R71yI8gzt5PlSdpVepFA FFxbw/DIV7jjMPQjj+fEW58Y0d3t6M0x6yl4htqhLI/d8fUIPioE+EW3DF8SPjGbzeFJ KVrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=daou/Fxq; 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 c4-v6si17677904pgt.264.2018.05.07.02.29.45; Mon, 07 May 2018 02:29:46 -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=daou/Fxq; 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 S1752090AbeEGJ3n (ORCPT + 29 others); Mon, 7 May 2018 05:29:43 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:42568 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbeEGJ3k (ORCPT ); Mon, 7 May 2018 05:29:40 -0400 Received: by mail-pf0-f194.google.com with SMTP id p14so11020458pfh.9 for ; Mon, 07 May 2018 02:29:40 -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; bh=2rJNs4E1e+dE9mJC2hUBQACnIonHWogaCNotKEm3Mog=; b=daou/FxqPYu8R0jdtVoCW3nSKFUiFbUhkC85XnCWSBLxmF8fZD+RcH7Wh6NiFzxyk8 lzLlQ4ambunG52UZTKuWDl2eCeZlmZRvk+vQ4XCWNMPZvXKolhOuLCEiic1S4abYTx+c DO1ZQLaNCrMVpvpb8cqD7wFL7WO9iggKv554Y= 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; bh=2rJNs4E1e+dE9mJC2hUBQACnIonHWogaCNotKEm3Mog=; b=t0RFP0APiEc2shf9inCdBBzD/hY8q7exYNoqleizw+wblRacwqQYsvWbvmnXdl62Og PIc797MMIKgThkU7O2nUEiSo9eRDSS2tz2pqyCUaDSMs5ETOLE9oT8P+EGcgUM92p6k+ QHX65zuFBvpYzaYHpuV/pQ+R9Ddh11zr5H1ZoDUBMxqPoJ06Mg84qN3M5riuPpJFFtKs S6QgU142aU2Kcm+slxQBDIRBY5vQJU/pWANbutPvyafFF8U1zfISo7i4zjz0Cgi4/3BT Pg8x1UKgYrTw1UuVZOeWZ74FSBEHG2st5N4OxfHjeoeRqaxwDxSN8tbmhQWUPl/Btu9q jNhQ== X-Gm-Message-State: ALQs6tBQd+TOClhy+bxDnLZzKXGWeHPzVZQIAavSvvS8GmwCOqbygsaV G5Ib5botphjPxZDdyUdhCgcrug== X-Received: by 2002:a65:6592:: with SMTP id u18-v6mr21638955pgv.366.1525685379861; Mon, 07 May 2018 02:29:39 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id n10sm48047539pfj.68.2018.05.07.02.29.32 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 May 2018 02:29:38 -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 v3 1/2] MIPS: Convert read_persistent_clock() to read_persistent_clock64() Date: Mon, 7 May 2018 17:28:27 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 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 read_persistent_clock() to read_persistent_clock64() using struct timespec64, as well as converting mktime() to mktime64(). Signed-off-by: Baolin Wang --- Changes since v2; - No updates. Changes since v1: - No updates. --- arch/mips/dec/time.c | 4 ++-- arch/mips/include/asm/mc146818-time.h | 4 ++-- arch/mips/lasat/ds1603.c | 2 +- arch/mips/loongson64/common/time.c | 2 +- arch/mips/mti-malta/malta-time.c | 2 +- arch/mips/sibyte/swarm/rtc_m41t81.c | 4 ++-- arch/mips/sibyte/swarm/rtc_xicor1241.c | 4 ++-- arch/mips/sibyte/swarm/setup.c | 10 +++++----- 8 files changed, 16 insertions(+), 16 deletions(-) -- 1.7.9.5 Acked-by: Arnd Bergmann diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index a2a150e..9e992cf 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -19,7 +19,7 @@ #include #include -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { unsigned int year, mon, day, hour, min, sec, real_year; unsigned long flags; @@ -54,7 +54,7 @@ void read_persistent_clock(struct timespec *ts) year += real_year - 72 + 2000; - ts->tv_sec = mktime(year, mon, day, hour, min, sec); + ts->tv_sec = mktime64(year, mon, day, hour, min, sec); ts->tv_nsec = 0; } diff --git a/arch/mips/include/asm/mc146818-time.h b/arch/mips/include/asm/mc146818-time.h index 9e1ad26..cbf5cec 100644 --- a/arch/mips/include/asm/mc146818-time.h +++ b/arch/mips/include/asm/mc146818-time.h @@ -86,7 +86,7 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime) return retval; } -static inline unsigned long mc146818_get_cmos_time(void) +static inline time64_t mc146818_get_cmos_time(void) { unsigned int year, mon, day, hour, min, sec; unsigned long flags; @@ -113,7 +113,7 @@ static inline unsigned long mc146818_get_cmos_time(void) spin_unlock_irqrestore(&rtc_lock, flags); year = mc146818_decode_year(year); - return mktime(year, mon, day, hour, min, sec); + return mktime64(year, mon, day, hour, min, sec); } #endif /* __ASM_MC146818_TIME_H */ diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c index 8bd5cf8..d75c887 100644 --- a/arch/mips/lasat/ds1603.c +++ b/arch/mips/lasat/ds1603.c @@ -136,7 +136,7 @@ static void rtc_end_op(void) lasat_ndelay(1000); } -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { unsigned long word; unsigned long flags; diff --git a/arch/mips/loongson64/common/time.c b/arch/mips/loongson64/common/time.c index e1a5382a..0ba53c5 100644 --- a/arch/mips/loongson64/common/time.c +++ b/arch/mips/loongson64/common/time.c @@ -29,7 +29,7 @@ void __init plat_time_init(void) #endif } -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { ts->tv_sec = mc146818_get_cmos_time(); ts->tv_nsec = 0; diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c index 66c8667..d22b7ed 100644 --- a/arch/mips/mti-malta/malta-time.c +++ b/arch/mips/mti-malta/malta-time.c @@ -134,7 +134,7 @@ static void __init estimate_frequencies(void) } } -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { ts->tv_sec = mc146818_get_cmos_time(); ts->tv_nsec = 0; diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c index e624664..aa27a22 100644 --- a/arch/mips/sibyte/swarm/rtc_m41t81.c +++ b/arch/mips/sibyte/swarm/rtc_m41t81.c @@ -188,7 +188,7 @@ int m41t81_set_time(unsigned long t) return 0; } -unsigned long m41t81_get_time(void) +time64_t m41t81_get_time(void) { unsigned int year, mon, day, hour, min, sec; unsigned long flags; @@ -218,7 +218,7 @@ unsigned long m41t81_get_time(void) year += 2000; - return mktime(year, mon, day, hour, min, sec); + return mktime64(year, mon, day, hour, min, sec); } int m41t81_probe(void) diff --git a/arch/mips/sibyte/swarm/rtc_xicor1241.c b/arch/mips/sibyte/swarm/rtc_xicor1241.c index 50a82c4..a2121c1 100644 --- a/arch/mips/sibyte/swarm/rtc_xicor1241.c +++ b/arch/mips/sibyte/swarm/rtc_xicor1241.c @@ -168,7 +168,7 @@ int xicor_set_time(unsigned long t) return 0; } -unsigned long xicor_get_time(void) +time64_t xicor_get_time(void) { unsigned int year, mon, day, hour, min, sec, y2k; unsigned long flags; @@ -201,7 +201,7 @@ unsigned long xicor_get_time(void) year += (y2k * 100); - return mktime(year, mon, day, hour, min, sec); + return mktime64(year, mon, day, hour, min, sec); } int xicor_probe(void) diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 494fb0a..7073940 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c @@ -58,11 +58,11 @@ extern int xicor_probe(void); extern int xicor_set_time(unsigned long); -extern unsigned long xicor_get_time(void); +extern time64_t xicor_get_time(void); extern int m41t81_probe(void); extern int m41t81_set_time(unsigned long); -extern unsigned long m41t81_get_time(void); +extern time64_t m41t81_get_time(void); const char *get_system_type(void) { @@ -87,9 +87,9 @@ enum swarm_rtc_type { enum swarm_rtc_type swarm_rtc_type; -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { - unsigned long sec; + time64_t sec; switch (swarm_rtc_type) { case RTC_XICOR: @@ -102,7 +102,7 @@ void read_persistent_clock(struct timespec *ts) case RTC_NONE: default: - sec = mktime(2000, 1, 1, 0, 0, 0); + sec = mktime64(2000, 1, 1, 0, 0, 0); break; } ts->tv_sec = sec;