From patchwork Thu May 3 02:53:17 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: 134877 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1396460lji; Wed, 2 May 2018 19:54:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrMRRNRm1rvEFsC9qfMNMoVz/r6nJTLs8XuhjzdGcpKqNVfNyI+zCzbmQVxiO60ur7KSijr X-Received: by 2002:a17:902:524:: with SMTP id 33-v6mr22605657plf.25.1525316093332; Wed, 02 May 2018 19:54:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525316093; cv=none; d=google.com; s=arc-20160816; b=ZHzs07deBk0jFF+vRmMuGAsf78cdUv3nz6XqCq6vtVfz88Q/G3GCLE0i64eC+jsMUm 14g6qIi4doQLi8Lkt1nntFsuL5zflqw6/AV98ICyuv0hItVcdIMNONClr0dPFA0umtr8 nOWgFKQqfM2UlaKs9NoT8/cKpHRXXRwZBRblqGAFSB8PK45qmFFDcJrkDWBLaGJboapZ tqgBMqnKdzwjs1yta6Z9F0Hecajeqp+ZOUoBatvDxMwLIk9NhmM+tk/82ajjkDPz9bv9 Ob1+p6lRXwH7NhmrapbzaHstN+5Lf+b5/4QZ2tlNc8G2qfnOWM2KNuY6HUNw6PLfQTkQ NK3w== 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=XSoftft/olyeIJpXhLFzsucFm9+9I0bsHekgZW7hQoU=; b=QR5Wc2DZSIjHq0j1paKQcVGxgnsOdSyB4greDfXlFlKlJLZBzHOasZeetxFNrQK5E/ CDr6odw/R2n6i618PdQsCULP40iCxaPnMpFHNQGad8l5awhqZUv9sWVRzW0Auf9K65X6 sBJ4d0GCIPZ9oCdboZuhrd93MDC+xefB878IpNFVhEdylhCPj0paBPu0ZkHDX5GW/Ezo LE/Xky6mafDrAz04VhFOMdpbARPssiH3CAF5G7BSdFStGEePUMLEO8DCWBJARh+uJxXy IRd7Yst8RHwgwo2hh8cNzqQIszvXchDxmJ8QJkbJSMJGt88UZSfzMynXpU+TW19jLx/o /Ofw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EkC6HcdU; 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 y8-v6si12737874pli.242.2018.05.02.19.54.52; Wed, 02 May 2018 19:54:53 -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=EkC6HcdU; 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 S1752052AbeECCyq (ORCPT + 29 others); Wed, 2 May 2018 22:54:46 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:41422 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751929AbeECCyo (ORCPT ); Wed, 2 May 2018 22:54:44 -0400 Received: by mail-pg0-f65.google.com with SMTP id m21-v6so12047071pgv.8 for ; Wed, 02 May 2018 19:54:44 -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=XSoftft/olyeIJpXhLFzsucFm9+9I0bsHekgZW7hQoU=; b=EkC6HcdUBqrYiFFW7B0/IYxaUFr39Yz7ngjsmXISWMQdS/fuir/8G/tSXKGL1DmnI9 1ZjI2BqnA4WAo8uqNmsKQ2lJvUpFhZlANgKlhEdX5pBHdzVUq1fZuDu1c806AOxI8e65 dYIEUFlg8lfGXvlh8PblcE3qkLT6Ghrp11Jo4= 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=XSoftft/olyeIJpXhLFzsucFm9+9I0bsHekgZW7hQoU=; b=opNjkCaf3l54Tsi5xUMH43MGQIb5BJHwL7bk0A3NPq9xTlVYnYFZEQX2IpqiqBd83i dPEyZncvQzAgj0mUotanyN76aR86bERTJz2RkdPBYh8HfAfGRzmmH2cfnQ9wV2Vv5Baf 4P5hqmNnZZNypDR+dpZuLuHnDjyw2t5X6B7DfiUWx5/5ViB3cYi5Sv+Gxg9PvVwWlgS5 pp3hHu0/ks1kfif9Fj7ZV0xUc0KpX4U3kycn5Aa0t/NYwfn9Rnj3Dh9+JQxBpLTEGtyE k/UXP2wOCXbs5rkW+QUMrg3mYrxM8/OOBsKRkVcJAabQ7C5+5PZ5FdAZ37Ptyczg3hra vGVA== X-Gm-Message-State: ALQs6tC9P3jBdRM0dYvyOX5pHeboptzlej/z6MlME5dK0pjBRAj7hhIc Rsuwvcc0FKtwsfOOuntGuR7aUrXb0jQ= X-Received: by 2002:a63:7114:: with SMTP id m20-v6mr18002388pgc.144.1525316083952; Wed, 02 May 2018 19:54:43 -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.35 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 May 2018 19:54:42 -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 1/2] MIPS: Convert read_persistent_clock() to read_persistent_clock64() Date: Thu, 3 May 2018 10:53:17 +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 --- 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 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;