From patchwork Thu Oct 30 11:15:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 39819 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A2594202FE for ; Thu, 30 Oct 2014 11:17:35 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e51sf3018185eek.10 for ; Thu, 30 Oct 2014 04:17:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=K3DSyHF5dLd8T61HQZKsSUQ/OGI1+NL1tab+wAjrlqI=; b=FNZ22Oc1oxdOz8t3C3CmGLApihbMEEAWHPyKrrFJGxZtEdo4+iWtNSreBy2Zjau4DI sItlzgP2lFIpR7ko/81Kw+gaMmbw9k3eOpEhgCcW6u3h1xkZ6sGqRt68KuWnkTY16xTT uHtnr5SUPgIz8qUPtpLtl3C4VkNo6meQnlZAuEYZv2dg0P0DEacn2aZizorJF+KJyiik 56gabIxRJcPAewoL86XzVdRGusju5V/AXQbOD5H8bhtXfBfyBHfPikrKWVU841uIuRxa ph5eGUwVy0/yUbU1Q8fpzWevnnUJ6gi+1RvwnW8GuG8KqXOJ1M8xvYadVplggRLjHhxd 5/kw== X-Gm-Message-State: ALoCoQlCc1QR3atThdodqTdamu69ulPn2+hpZpHhVvnLIZ7D/WwFlliENzbNP9SbqbIoIBDFjrwc X-Received: by 10.152.88.4 with SMTP id bc4mr281203lab.1.1414667854758; Thu, 30 Oct 2014 04:17:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.199 with SMTP id u7ls332158lau.10.gmail; Thu, 30 Oct 2014 04:17:34 -0700 (PDT) X-Received: by 10.152.45.2 with SMTP id i2mr18175137lam.7.1414667854521; Thu, 30 Oct 2014 04:17:34 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id dd4si11479535lad.100.2014.10.30.04.17.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Oct 2014 04:17:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id 10so4129881lbg.15 for ; Thu, 30 Oct 2014 04:17:34 -0700 (PDT) X-Received: by 10.112.140.5 with SMTP id rc5mr17969371lbb.32.1414667854164; Thu, 30 Oct 2014 04:17:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp22375lbz; Thu, 30 Oct 2014 04:17:32 -0700 (PDT) X-Received: by 10.70.10.33 with SMTP id f1mr16747227pdb.1.1414667852124; Thu, 30 Oct 2014 04:17:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wg5si6275496pab.219.2014.10.30.04.17.31 for ; Thu, 30 Oct 2014 04:17:32 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759365AbaJ3LRP (ORCPT + 26 others); Thu, 30 Oct 2014 07:17:15 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:39485 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759340AbaJ3LRK (ORCPT ); Thu, 30 Oct 2014 07:17:10 -0400 Received: by mail-pa0-f53.google.com with SMTP id kx10so5274624pab.12 for ; Thu, 30 Oct 2014 04:17:10 -0700 (PDT) X-Received: by 10.68.162.65 with SMTP id xy1mr16488460pbb.144.1414667830003; Thu, 30 Oct 2014 04:17:10 -0700 (PDT) Received: from wangdeqiang.com ([210.21.227.66]) by mx.google.com with ESMTPSA id i10sm6874826pdr.21.2014.10.30.04.17.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Oct 2014 04:17:09 -0700 (PDT) From: "pang.xunlei" To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, xen-devel@lists.xenproject.org, John Stultz , Thomas Gleixner , Alessandro Zummo , Stefano Stabellini , "pang.xunlei" Subject: [RFC PATCH v2 04/11] time: Add rtc_time_to_tm64() safe version(using time64_t) Date: Thu, 30 Oct 2014 19:15:38 +0800 Message-Id: <1414667745-7703-5-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414667745-7703-1-git-send-email-pang.xunlei@linaro.org> References: <1414667745-7703-1-git-send-email-pang.xunlei@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pang.xunlei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , As part of addressing 2038 saftey for in-kernel uses, this patch adds safe rtc_time_to_tm64() using time64_t. After this patch, rtc_time_to_tm() should be replaced by rtc_time_to_tm64() one by one. Eventually, rtc_time_to_tm() will be removed from the kernel when it has no users. Signed-off-by: pang.xunlei --- drivers/rtc/rtc-lib.c | 20 ++++++++++++++++---- include/linux/rtc.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c index 6948cbd..e84e3a0 100644 --- a/drivers/rtc/rtc-lib.c +++ b/drivers/rtc/rtc-lib.c @@ -45,15 +45,17 @@ int rtc_year_days(unsigned int day, unsigned int month, unsigned int year) } EXPORT_SYMBOL(rtc_year_days); + /* * Convert seconds since 01-01-1970 00:00:00 to Gregorian date. + * Safe version for 2038 safety. */ -void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) +void rtc_time_to_tm64(time64_t time, struct rtc_time *tm) { unsigned int month, year; int days; - days = time / 86400; + days = div_s64(time, 86400); time -= (unsigned int) days * 86400; /* day of the week, 1970-01-01 was a Thursday */ @@ -81,13 +83,23 @@ void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) tm->tm_mon = month; tm->tm_mday = days + 1; - tm->tm_hour = time / 3600; + tm->tm_hour = div_s64(time, 3600); time -= tm->tm_hour * 3600; - tm->tm_min = time / 60; + tm->tm_min = div_s64(time, 60); tm->tm_sec = time - tm->tm_min * 60; tm->tm_isdst = 0; } +EXPORT_SYMBOL(rtc_time_to_tm64); + +/* TODO: [2038 safety] should be replaced by rtc_time_to_tm64() */ +void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) +{ + time64_t time64; + + time64 = (time64_t)time; + rtc_time_to_tm64(time64, tm); +} EXPORT_SYMBOL(rtc_time_to_tm); /* diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 2a6a9ce..12bacba 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -21,6 +21,7 @@ extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year extern int rtc_valid_tm(struct rtc_time *tm); extern int rtc_tm_to_time64(struct rtc_time *tm, time64_t *time); extern int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time); +extern void rtc_time_to_tm64(time64_t time, struct rtc_time *tm); extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm); ktime_t rtc_tm_to_ktime(struct rtc_time tm); struct rtc_time rtc_ktime_to_tm(ktime_t kt);