From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932186AbdKFOFA (ORCPT ); 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 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 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(-) 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) -- 2.9.0