From patchwork Fri May 4 07:07:47 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: 134963 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp494068lji; Fri, 4 May 2018 00:08:57 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr6pBU4FI8tGwfEznI0JUIw76T35p9y3otFJnZ/Dob095lbn9kFiyR7BAlizPVN9PpzDnpc X-Received: by 10.98.25.15 with SMTP id 15mr24586240pfz.42.1525417737540; Fri, 04 May 2018 00:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525417737; cv=none; d=google.com; s=arc-20160816; b=tEXZwEsLOe1OzssOartXy2Tq7Ap1CnO/b894foPFQ0duKXvrvtEGtvx0APQ2Ov+zcP 4gnNLDtYKSu/BWr1yVpBSN7crZpp5hP+lXVl2L6mh7ZptmEV7/YODGz12hMdXgCAtgZV l+AqNaoa9UlTpZdffzMHfMkTQlb3E++KJOkq7x39SPCkOPN9upPGsnJ1+iYjrNCrmvoZ Jb4tSl2L+iFlYoNDvpF2EhwuCZAD6qmhGDR41WPrQZ7B2WQqMPEDADwsXZmGv9MOLhvS D1ps3945C/qFBr+D4+quutOcntxk0uQQ9wnMyHnLgBxNvjn8n//tmWyTU0TiJXYb5Gwg /3IQ== 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=3aiI3kiE6HByxIoW7A57wa5Bds4Ky7Z3/xIJUax8Rdk=; b=AriTNqCc/H4+HdxSpinprEBGBOzOZ1BT/jEPKXQZWKce1S0hhGZafIm/FqmRAEXhfs T/ZPRkKPJn9WUKRidFwZICsI/yktira5CWr59LVSUTGc0uWKvIZa/BmN4xz+i9Ljcpju B8nUSiwhsYesNQVALe6aZbOclDf8DwyEOS3PNYAXBluuB67GUY7bH+TBcGwlQ+rt+etJ taHxUF3O1gFSkz+1kdqByXAbQ9JXwPso9SIOufB4NujDe6J6SyRRZucrz/VWmuYM2BPf aGVbRQme+mWpu5ODrTPj1achjHTGUXhoC1wyuhFIfmZkc9kP+1zdtGIfrWA45eJfLICA QZQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GwLK/2F4; 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 p15-v6si10162659pgc.463.2018.05.04.00.08.57; Fri, 04 May 2018 00:08:57 -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=GwLK/2F4; 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 S1751412AbeEDHIz (ORCPT + 29 others); Fri, 4 May 2018 03:08:55 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:42342 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbeEDHIx (ORCPT ); Fri, 4 May 2018 03:08:53 -0400 Received: by mail-pf0-f194.google.com with SMTP id p14so5352941pfh.9 for ; Fri, 04 May 2018 00:08:53 -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=3aiI3kiE6HByxIoW7A57wa5Bds4Ky7Z3/xIJUax8Rdk=; b=GwLK/2F4O0Wk9YSlLxUTfk9gTskEk9t6ueGIG/HN4Zclv04W9DWfBJz7gjoJOEwZEZ IgDvpsPguqGqSTIaPS1qhkLsTr0pyyvDsvgLWKm8+NhZcD52iXxWr8VMgeojyYXgdW50 B2lefU8L7Le8VOFHcH6Q/KkXw+vHQvVOybmgo= 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=3aiI3kiE6HByxIoW7A57wa5Bds4Ky7Z3/xIJUax8Rdk=; b=E/tM4YBshIU2B5krQrehfzMm+uyuhZJfbFkb+MM6KDHBf7opVIbtyPQt12ahIUfij8 rufQR6P5L2I9cAnw78IWLTDO4K2Y3lLAKYMFJ02PbEOZ1nX5VlWlVF2rdC5E8ctkWU34 i4Tys2zuRhFed4uFHSTrC6CR+cdBG3N63SY6/caR1vr7f1aGkdc/fFg0XbO1ZxZv6Tb5 MyAvH9/5FkIuxrnUwj4kV6QqRplvEcucFXrLhUHlLisLNzgnaTk5tINoFNdRUWHUz3gu u7Rxxou5A1R+EZVlzDkMNMnVSIllXzEYicFMKN96+AXYEkkcVfTEbBpCaiS63gqHTkyy 8FBA== X-Gm-Message-State: ALQs6tAvbWXJTwbzhSmxTSLXegLAZ9fh3iU1LBBNO3oJl3syNnaZt1Yu FEaRLUUy5ac/I0FC6KfXx+y0ow== X-Received: by 10.98.86.16 with SMTP id k16mr25714784pfb.19.1525417732943; Fri, 04 May 2018 00:08:52 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id u188sm25718148pfb.84.2018.05.04.00.08.47 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 May 2018 00:08:52 -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 v2 1/2] MIPS: Convert read_persistent_clock() to read_persistent_clock64() Date: Fri, 4 May 2018 15:07:47 +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 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 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; From patchwork Fri May 4 07:07:48 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: 134964 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp494177lji; Fri, 4 May 2018 00:09:04 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpMuqvxMV+AaKPOBWGfzz2X1tOgx9AmnZbIgSFzmy0vhAhZbL69ajE/viUOLX8J6+G+9wgk X-Received: by 2002:a63:345:: with SMTP id 66-v6mr21469934pgd.98.1525417744500; Fri, 04 May 2018 00:09:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525417744; cv=none; d=google.com; s=arc-20160816; b=js6e+7Jl9uFZgbicGHWsk3nKuCw6Cf0q/uIvHaZkBA+XUN5n46A853TpHXGhE4hDbJ sneEptOWFvwZK53MsJ86TPgRjGuXSvVbV9VGWPRzpGQvfaeyePHRxcBr+0hVLIHszISN ErRfnOi8KBOOO5FSW3rpOCSdejlUyxQWJpFI/IokbqeN4zM7j5G7CK50AVV03PmLZ1Wj 7EP7lujzg2T+qAiDow1eJ9E2LX4cPRYsT27rkaqAPS255ssZQnR+w7BFxHhOe1kO6yFn 7/DNp+PY3HBHdZEhck3qXvC7LESJR0ogmsoZLUGV7QdI6143hFsbqpalv/62YUzBK1ss nDqw== 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=e981n/FGMj7TdTdC/R2AWYgYOllNRbvv1lrXRNvnQG0=; b=DHC1k0rA7pbEGCfqsaWJFk5IsKshwtenulSWIpPKU4Ih0uWddlbPqhffDvnsl/hLcL jsEt8z/HV/DfbacdouAbQhVGCv18l8kx/Ghb9hvzIGqiT2as9fI/rPaWn6+enWgIcTRX rEQ7a9GiE3IQZSw+rQh1bg1jlSptMubzKX7uGurnNGkL9cCiI7nnu3Bv9sQvnWoCjbwR ctndCiyOTqqwmxqeqnLAEYLUZcSjv1RpS8KGTN1s3F/g/aCU4neFHzd44Zc3qCu9Igdh nOYzqCWgExGc8LXJoiMRXw8k7QcCB0wl5lqS2FYA4ij8JTSUUuQK1TzvokgAAcTuQ2gU 5X3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dy5r82i4; 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 b66-v6si16029582plb.107.2018.05.04.00.09.04; Fri, 04 May 2018 00:09:04 -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=dy5r82i4; 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 S1751445AbeEDHJC (ORCPT + 29 others); Fri, 4 May 2018 03:09:02 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:40496 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751261AbeEDHI6 (ORCPT ); Fri, 4 May 2018 03:08:58 -0400 Received: by mail-pf0-f196.google.com with SMTP id f189so16729084pfa.7 for ; Fri, 04 May 2018 00:08:58 -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=e981n/FGMj7TdTdC/R2AWYgYOllNRbvv1lrXRNvnQG0=; b=dy5r82i4ND4RIJimH/Ma5mGyznMZnwcNZgrg6ly/vaC+GXQhLtYyqAvoUUqod2+oqi oRQPfjEmmELAPqVTsaAFgNIgBk3vE/7g8gQ5sp4ZctMnu/xtxG1u6QyZSI5G9WS2Mu0Q 262jm78rCU8f8oldmrj8gBBTHhwW6rImQpfp0= 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=e981n/FGMj7TdTdC/R2AWYgYOllNRbvv1lrXRNvnQG0=; b=cHFyhH38me0CdpGLUpbjfjuLjYLw4PJUME7c271jQAED+se5sF6K++BIomtmiLRjSP bMYReKN1ZgSUhFEaHJG8P9h0vrIA+s88+7glBB869V6uZjCh5VHZt82J8c/jBV05MJTJ TAKqg19NXl5cfptL6edcTquGRBAszB3o8vMMNRe9ih3/RcWILWpZC9tr0nQY9y8vFEbD 73zqOxlCuy+2bM6wk4RaQDucDigYgZhFHvwu3s24LQsplY94lyDM1mC9Gj380CQH+fk+ SlV7I1oO6qflPEcqERm6a8wZdrTq7Lso9XqASQtcey+Dm0vjQf8JiiPCxuQqL4vgkg08 E+fA== X-Gm-Message-State: ALQs6tBcHNxtfB/7hKO2KQUUUouzmvN002cQvpLBxcB+he0VQfQNpuNh 9XlEm0pRMYJnPOGaEVboE8MQAw== X-Received: by 2002:a17:902:b788:: with SMTP id e8-v6mr27016005pls.263.1525417738266; Fri, 04 May 2018 00:08:58 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id u188sm25718148pfb.84.2018.05.04.00.08.53 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 May 2018 00:08:57 -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 v2 2/2] MIPS: Convert update_persistent_clock() to update_persistent_clock64() Date: Fri, 4 May 2018 15:07:48 +0800 Message-Id: <2d0bcca30f61036e413ba01c686ce6506f187462.1525417306.git.baolin.wang@linaro.org> 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. The rtc_mips_set_time() and rtc_mips_set_mmss() interfaces were using 'unsigned long' type that is not y2038 safe on 32bit machines, moreover there is only one platform implementing rtc_mips_set_time() and two platforms implementing rtc_mips_set_mmss(), so we can just make them each implement update_persistent_clock64() directly, to get that helper out of the common mips code by removing rtc_mips_set_time() and rtc_mips_set_mmss() interfaces. Signed-off-by: Baolin Wang --- Changes since v1: - Remove rtc_mips_set_time() and rtc_mips_set_mmss() interfaces. --- arch/mips/dec/time.c | 5 +++-- arch/mips/include/asm/time.h | 9 --------- arch/mips/kernel/time.c | 15 --------------- arch/mips/lasat/ds1603.c | 5 +++-- arch/mips/lasat/sysctl.c | 8 ++++++-- arch/mips/sibyte/swarm/rtc_m41t81.c | 4 ++-- arch/mips/sibyte/swarm/rtc_xicor1241.c | 4 ++-- arch/mips/sibyte/swarm/setup.c | 8 +++++--- 8 files changed, 21 insertions(+), 37 deletions(-) -- 1.7.9.5 Acked-by: Arnd Bergmann diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 9e992cf..934db6f 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -59,14 +59,15 @@ void read_persistent_clock64(struct timespec64 *ts) } /* - * In order to set the CMOS clock precisely, rtc_mips_set_mmss has to + * In order to set the CMOS clock precisely, update_persistent_clock64 has to * be called 500 ms after the second nowtime has started, because when * nowtime is written into the registers of the CMOS clock, it will * 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 update_persistent_clock64(struct timespec64 now) { + time64_t nowtime = now.tv_sec; int retval = 0; int real_seconds, real_minutes, cmos_minutes; unsigned char save_control, save_freq_select; diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index 17d4cd2..b85ec64 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h @@ -22,15 +22,6 @@ extern spinlock_t rtc_lock; /* - * RTC ops. By default, they point to weak no-op RTC functions. - * rtc_mips_set_time - reverse the above translation and set time to RTC. - * 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); - -/* * board specific routines required by time_init(). */ extern void plat_time_init(void); diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index a6ebc81..bfe02de 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -34,21 +34,6 @@ DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); -int __weak rtc_mips_set_time(unsigned long sec) -{ - return -ENODEV; -} - -int __weak rtc_mips_set_mmss(unsigned long nowtime) -{ - return rtc_mips_set_time(nowtime); -} - -int update_persistent_clock(struct timespec now) -{ - return rtc_mips_set_mmss(now.tv_sec); -} - static int null_perf_irq(void) { return 0; diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c index d75c887..061815e 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,8 +152,9 @@ void read_persistent_clock64(struct timespec64 *ts) ts->tv_nsec = 0; } -int rtc_mips_set_mmss(unsigned long time) +int update_persistent_clock64(struct timespec64 now) { + time64_t time = now.tv_sec; unsigned long flags; spin_lock_irqsave(&rtc_lock, flags); diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 6f74224..76f7b62 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c @@ -73,8 +73,12 @@ int proc_dolasatrtc(struct ctl_table *table, int write, if (r) return r; - if (write) - rtc_mips_set_mmss(rtctmp); + if (write) { + ts.tv_sec = rtctmp; + ts.tv_nsec = 0; + + update_persistent_clock64(ts); + } return 0; } 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..152ca71 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,8 +109,10 @@ void read_persistent_clock64(struct timespec64 *ts) ts->tv_nsec = 0; } -int rtc_mips_set_time(unsigned long sec) +int update_persistent_clock64(struct timespec64 now) { + time64_t sec = now.tv_sec; + switch (swarm_rtc_type) { case RTC_XICOR: return xicor_set_time(sec);