From patchwork Mon Nov 6 14:04:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118057 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2802288qgn; Mon, 6 Nov 2017 06:05:02 -0800 (PST) X-Google-Smtp-Source: ABhQp+QdHt4ESbPyBdWdDrlCDmgEO9lUKxWH/OIGAetFBB7MpoIp86vvEy55MiizvObSO3hXXu8P X-Received: by 10.101.92.68 with SMTP id v4mr15306552pgr.45.1509977102299; Mon, 06 Nov 2017 06:05:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509977102; cv=none; d=google.com; s=arc-20160816; b=Rx7t+nyq/9NP/GYTlPoj3oKxLo+FEAVmPRuoUm+ZiSjXdcugjQXBq9h0EwKB3UG2hZ MC2rFZkqIyjddlNcAmVJLBGxyDIkNDq55mEd1xEXtgGcdIG09eVmlN9zD12rM8xWT2Iq Cs3oWuVHYxA/9jN9zdUd/O1EegmKhE/QP7hjt2PbHBzSunX8Sj7xq8Qv89neqhgJOgL2 aJsiz4pEV5G478puTUzyVt7dgtTRAWekgNDG455L8EDdjczGhs4TKj7Colrof7jaH8Qa Ihg5V/cRcl2Y1a43AY+IZS+PkUm6M02SFvJ99fvuC9h7of4PwcGr9ivaQQcPQMNTXAs7 eV3Q== 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=gw4encW/WUrbNivN6Z185052O2jslqRLR+N40WvQ1aY=; b=YX/v/rZXkPZCdDfAIvjB0WBdtKyRVRIcV90ooPDb1xJbrzpTFFxKVzkn2amWusnUnV 4+5i18dtgU6A1zmU1FYGedLh+k3KEnSuU1nncnMwmLTKrg8h1Uk/KRWPMvmRQZsSCNDM 8sCmYWcWRaT5p2WCcg2baZSzT6iwmaHkIdluljGpaGvYEPJstqovEEOCRxq2ql0bAkIU RJCe184304XPyASdywV9h6SJ/gfV9riwztH/AecEpwOlqzLIpxFlJCWiLzUxZfk8kiLG ZVbqpyRc503rxEAtreGA9wqryHcm7xeVOGKzzEklh7vW+0SSWmXpzceoQpiWpnYQeE1J 83tw== 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 p19si11161838pgn.270.2017.11.06.06.05.02; Mon, 06 Nov 2017 06:05:02 -0800 (PST) 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 S932187AbdKFOFA (ORCPT + 26 others); Mon, 6 Nov 2017 09:05:00 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:53821 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752886AbdKFOE6 (ORCPT ); Mon, 6 Nov 2017 09:04:58 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LwZNH-1fJs9U2cYx-018OHa; Mon, 06 Nov 2017 15:04:51 +0100 From: Arnd Bergmann To: Michael Chan Cc: Arnd Bergmann , "David S. Miller" , Jiri Pirko , Sathya Perla , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] bnxt: fix bnxt_hwrm_fw_set_time for y2038 Date: Mon, 6 Nov 2017 15:04:39 +0100 Message-Id: <20171106140448.1551781-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:BbpUl1NqTjgeKBwe6/jwEHqw9YU6Vm62/j61QyPAwwABpNMbqbY 5t3PlD9c2wQZz9s/8KgA5UlREJBWpNE22k7+3S+E0rIAyTFIbTQ7d1+mQwO6FeAE+S4Cxpr VAk8ukTfSQ/JNZ5u+jAsvy+zsNt9zuoVUsZ54Hra6z/J8VTldW+CCE+O5lP3YuDn1pU+GAv F6hAS8XpsRlG0KUZ2BiQw== X-UI-Out-Filterresults: notjunk:1; V01:K0:SAbU048S6W4=:ZA0Q4OcATUEI29rEifvxu6 jwaHx+UYcs+bBzDwXpEI3QE9cfOz0A14zRmpfXGOd26o3ddB1FCzH244VzEF2alf3o1o6Wn8B 7iyHL8VFvO+pj/5TkVuzm+dQ+qSsvG2/r2bFK7HcvVow9TcyPZC5cCaa7zRsSPuF8dMuesAOe P/6HtyHtil+2cr3c0AqimvXwAOupgMNrvATKHoP5CpfpaWl9dqvJekV+CCsFh8rgPziGIxT8Y sEwmD4WGtEEW7hn3PGOx+NVpouFkd6saIJDJUVO7E77PIfncXkRgtypIt6i9d++N7Hy8h53H1 d4e1y3tg7y2N3hkcgTke61jljhYYKVYNtvccfKd63RVaMyI9QhJBNXBNhYhp/QPL2HO9fWh6m zJ9X+g/LyX0i2+5k6oXhL0DNo+7/lMHcsTcyHN3Q/kAaP2Kp/bSTb+edrwkBeYDRZWt6XPAgN WJyusB2ddvijrTJvwh7tY9czitxUGhhoQ6Zd3iZRyRBf21SY0aiFB/noz16EO+gXcU9VQZep7 eklz0K1ls+qLr1W1wK5xIZAGfRjr82ZnCnMxV5LBmBCUUrT0xqk4HV1+LgmQV2yhlziczYaep 2U+6PuYzQvBdb/oFptWcDDSMbb43bwYFLW8MAhKGwD7jv6MCFrJ6i+QcbXtWIwFScXkkjGZJ5 SLfCBmqZFq5sbPP91pz9pSnAiRsocJzPiOhn+nmAD2sa/4HYYaILxmOuFN6ckJOgEyFE/3pXl rOPKaQ5di3MOI1FIHH50MhffdeR16srG/KXytw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 32-bit architectures, rtc_time_to_tm() returns incorrect results in 2038 or later, and do_gettimeofday() is broken for the same reason. This changes the code to use ktime_get_real_seconds() and time64_to_tm() instead, both of them are 2038-safe, and we can also get rid of the CONFIG_RTC_LIB dependency that way. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 96416f5d97f3..5c963a8c2b0e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4915,16 +4915,14 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) int bnxt_hwrm_fw_set_time(struct bnxt *bp) { -#if IS_ENABLED(CONFIG_RTC_LIB) struct hwrm_fw_set_time_input req = {0}; - struct rtc_time tm; - struct timeval tv; + struct tm tm; + time64_t now = ktime_get_real_seconds(); if (bp->hwrm_spec_code < 0x10400) return -EOPNOTSUPP; - do_gettimeofday(&tv); - rtc_time_to_tm(tv.tv_sec, &tm); + time64_to_tm(now, 0, &tm); bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FW_SET_TIME, -1, -1); req.year = cpu_to_le16(1900 + tm.tm_year); req.month = 1 + tm.tm_mon; @@ -4933,9 +4931,6 @@ int bnxt_hwrm_fw_set_time(struct bnxt *bp) req.minute = tm.tm_min; req.second = tm.tm_sec; return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT); -#else - return -EOPNOTSUPP; -#endif } static int bnxt_hwrm_port_qstats(struct bnxt *bp)