From patchwork Mon Jun 18 15:33:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 139022 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4092211lji; Mon, 18 Jun 2018 08:33:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJdpyJ+cuU3/w+TdAJunXUW/pZGKwRM77kxNfrBt5LGp+ejU0Q41o4kVr/vgfmrn4I/VsPA X-Received: by 2002:a17:902:7685:: with SMTP id m5-v6mr14731538pll.76.1529336036847; Mon, 18 Jun 2018 08:33:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529336036; cv=none; d=google.com; s=arc-20160816; b=qjhdbGN1oTlLc31YypjbcZfeBt5HSdxxRrKxtSQbY9NW8sNuqn1s4hnWjH0ka8jtH/ ym8x9K0CFiyT9e3Olprn18DZkS5xlupC7sjYEVtBNuHHcXeWzHUOzl9aOT3zWvOM/tea Nl5/YYSKvykUEWHGiskzr7GCm/eyiBBbAnm2wWJcYxqRB0vr4h9O1Ud3+7CCC/ahe6wY c0/uVBjXI9Hs0tdLnYEHyJmj5xRWd9JP+jkftntHtgUppv7wiFsjC8+BPlawtXLFCMos RG0dzs30D33g7Qj358wzAHFCEvAwduiCT0eoZNzCTU+n4SIJ5QHoX/qs8b4Tm8CYSpc4 /B5g== 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 :arc-authentication-results; bh=Poga20TcddJvyN0G5d8nRyjvHs9WGGY5uZ2wREr1Cvc=; b=IuTvSJB9RI8vrnJYL+iO5E1iqNHarVzpktY2vK3/1JMrwIb8fyZtpMcZ2+AyQuw+CV 1WCzlUgYt/5S1S0qKsFCQIknWg9rme1mge0alVScFXCGMdRwsJXSej1DaFTszddt4rBZ gIxlLKQDf0gQvDhKeeTG8w8s0LQyQ9XY09GzJ/eCI0dud0ITCqST36ujAgSV4p5unQxG uzez12Ve8ElgvNCpUEFfSYnWwgdN1uoBVf5NQTLMZOn8hBHYx86XN/lk8WDHCJ7c37Jx 2aR92YJTe9PWfHuTNvrRlTZXN8+SqtCJuzSkal6kM0mhIwMtbdwG6tFUJGqKey1KDOje FPyg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q19-v6si15237242pls.139.2018.06.18.08.33.56; Mon, 18 Jun 2018 08:33:56 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933157AbeFRPdy (ORCPT + 30 others); Mon, 18 Jun 2018 11:33:54 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:39505 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753570AbeFRPdx (ORCPT ); Mon, 18 Jun 2018 11:33:53 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0LnX10-1g8wbp2nKI-00hhoK; Mon, 18 Jun 2018 17:33:35 +0200 From: Arnd Bergmann To: Stefan Richter Cc: y2038@lists.linaro.org, Arnd Bergmann , linux1394-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] firewire: use 64-bit time_t based interfaces Date: Mon, 18 Jun 2018 17:33:26 +0200 Message-Id: <20180618153334.1963539-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:F2BG6/qS0Xhk/JqdSuWgaTWQaPAebwM/o92SgAJLn9V7E9crRxz NkDOQhI4CPGfB6eBPUJBlFK7ar8OHjTMuOgw3/lB39d4P5qddeuHqGCNpT+RSvUqa4hXnCz 7xZhnYml+U0eesR9qPaV1z1EiB5J1i2FB52ImYa7v/RejXJvfIFGaWj5UnO9jB7qUPz58nh 1V5hjm08gDDjTSBaHWlmA== X-UI-Out-Filterresults: notjunk:1; V01:K0:KET7D8SOg5M=:eGq2tTNX7Ujr9yrflJhaHf Tpb6vjALwrgcc8xFm4XYWjzjVn90qoUHxEoAj7LArZ9xK0Jr/LnIN7H7roNAnhedxnRDr+JcU Ewp+jwAjxyXbEZ4XOA7yRkktrJcAGRcHE9zdyLUjZoMQsBMT0ooqKPvm/M896bS1471pyBNhe niox0bEwbmMM9V9ifKSUs6yKB7F/E+SqoTk0QpoZka5NhSD5tBopPFTpinfVY1gmDb8HjcmFL mMVNpih2HYeVF3Tzp5dJGaF/wteRsuk/V4D0WiaZWYe35XDD3MRwHzYmjdLPDPHyCjVT4rGVJ cJ0NtHMictDt4yTQV4W6vzT3eYb5EK7LF7kWwpHs9rpc43RmMqQ6SURqEDFIVLpGylZcnAujQ x65tqojwEzjHeD7xWfTHlzOuhWgh26CDkM3JZ4TofONT8WZaXaHSFgyRDP5AC04ACEb80po99 FiaNCwx2efxtJvd9MQ//X8ykGrhy4De1AOU3CCjHO1sBemT4xEoJvCk+XnucHALa7hUJ4O2Fy lYEHRj1CIRuQUFqWusSOe7zWthBHCUZwux+brGK2pvtVTaory+Flk5bd11WGGAI+ZpjQk0uuO qFc50M8flWh5rfTa0TbhP+FY8hkB/BE0/YV1SDyUH/UPiLwgKJ86sCIC5EPy6yjG3pkupOFkY FmVhx0Odf5UgZZ/FFc+zuFH78OQ1568dFqcbuaIkY9hjOTuzLmRSO7ILP0EPPUn6RNn4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 32-bit CLOCK_REALTIME timestamps overflow in year 2038, so all such interfaces are deprecated now. For the FW_CDEV_IOC_GET_CYCLE_TIMER2 ioctl, we already support 64-bit timestamps, but the implementation still uses timespec. This changes the code to use timespec64 instead with the appropriate accessor functions. Signed-off-by: Arnd Bergmann --- drivers/firewire/core-cdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index f0587273940e..d8e185582642 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1205,7 +1205,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg) { struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2; struct fw_card *card = client->device->card; - struct timespec ts = {0, 0}; + struct timespec64 ts = {0, 0}; u32 cycle_time; int ret = 0; @@ -1214,9 +1214,9 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg) cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME); switch (a->clk_id) { - case CLOCK_REALTIME: getnstimeofday(&ts); break; - case CLOCK_MONOTONIC: ktime_get_ts(&ts); break; - case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break; + case CLOCK_REALTIME: ktime_get_real_ts64(&ts); break; + case CLOCK_MONOTONIC: ktime_get_ts64(&ts); break; + case CLOCK_MONOTONIC_RAW: ktime_get_raw_ts64(&ts); break; default: ret = -EINVAL; }