From patchwork Thu May 18 20:21:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100134 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp8368qge; Thu, 18 May 2017 13:23:48 -0700 (PDT) X-Received: by 10.84.228.207 with SMTP id y15mr6978622pli.172.1495139028142; Thu, 18 May 2017 13:23:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495139028; cv=none; d=google.com; s=arc-20160816; b=b6DVPRfXqgX9nZJcd5R4zXVV+u7C0Tzbsw/35jgjPlV5WjrK4eQP4sfz6fVHBehg8R Sk864scU1ZBKEI0yXi54RzCLwYDk2/4YYC4Q5oce3mDAGVJ4Cmqw8vP4td34ciNn3y1c 1sfH6ErKBOrhQDpB2wf3f4UXrdDngwoKSEjbn4jg8TFqPtfoygjooZj4R1QQKQXfSn/h 3JoAw5qwYkfWqdYULWY1x6EBdNsdyicGiast3m+OhyD01OGu9VA4zb+A/SKnLeb5hM5U dTmUgRGjjoDcnN59sN4O9kNlfwOfa5FuUXQ4wDA0Wkab44osSTEFYGOyLfwQlQjZCCU9 gAxA== 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:message-id:date :subject:cc:to:from:arc-authentication-results; bh=tMNNnpdKkaZGuVzPNT3rZQ3eGb9BNsjgJia2VfFapfE=; b=Hgs61D7LiVZzFShPewyh/0N/z9aZA0U286JJjmWxCSYpBlpsMvnbhs3tpCpT7sjwBH kdZFHjEuI+pFev0ESzrezpnBhtBZ2REfgs+l7VEv+n4t596ILt/RkKBYE+71jP1ivkrF +x4/0IHbb4i7PVf+ciiKIvemntpIUAqWphYhOa+UkgHyLD21gtf2mrRWOpN0tQYMxv5f aMWtKtx7OcsuYoEEV+On2kMB8u6Tn8V5sP6zUIo3UT8KwfhN3yN9TPEse2atnYvNSYkJ tTDduCEq23+/sMO8/CKs9+pexFZD88Y/f3PCJR3Llg91lGsEto0UoaKeqaMuit/2gPxi VgvQ== 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 g13si6211045plk.247.2017.05.18.13.23.47; Thu, 18 May 2017 13:23:48 -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 S1755996AbdERUXe (ORCPT + 25 others); Thu, 18 May 2017 16:23:34 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:62911 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753775AbdERUWi (ORCPT ); Thu, 18 May 2017 16:22:38 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MMKEv-1d43YW3OSD-0083fP; Thu, 18 May 2017 22:22:29 +0200 From: Arnd Bergmann To: Srinivas Pandruvada , Jiri Kosina Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de Subject: [PATCH v2 3/5] HID: intel_ish-hid: convert timespec to ktime_t Date: Thu, 18 May 2017 22:21:42 +0200 Message-Id: <20170518202144.3482304-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170518202144.3482304-1-arnd@arndb.de> References: <20170518202144.3482304-1-arnd@arndb.de> X-Provags-ID: V03:K0:FbmzLzkNVz3oaBIdccuVvOA8zsKqvtlLrTNpTGYQ2XX2gyukhcY cPd4We5FU9fMdmh4I+SzF5L1CO2uAoJAk0qRUcGCJpHZ4YsEDQoUUUKrr0PsBU00/f4MUp/ boFI7Ax37XBOb/Wh7NigUivr1BRNXYf5qXJZC8FGdiwANJn3dLNkEtVt3PuZm67CAD142i4 X/nmi0rFoH8kCB/zR7yMA== X-UI-Out-Filterresults: notjunk:1; V01:K0:lOipyh3ELA8=:mkkCtVM1gOn0joq+ADkknv r7O7eO17og5L5ybaaYF+bIGAEJ5FUZ3iJXuWC2apIuKKduGeESzc4QSrEIeanf37CCR/pkEAb 3bDDnFjcOgq4hAWIYHeURsdrzLka+Cq8wa67VsGpBKjmemsBDaygtwz+029BR7K1cU5K+VGvo xmvrEEJi3u1tj5ZammB7zlHS8xyd8zhHOAaCGjQspN1UTU/WpoNSZyiITxDCV2jJNczA4Z+JI xHG+A2vDppeS8H8ZQ3VHm2WzWY4OZeDotU/llnAn0eS20/tT9cVKWiSc1GdR5lXwWXpgjIkvU GNq/gqTe/iNGAutevolra3wfMwjbm/g5dHExk7WPsfjG3ZOzEjz0Meo2vgfnI3ZbSK7Dh/ZlE /ptvkgij2TYPlF0WndnXwkaKH3GphHRIjxqApBmInSX9Fucbc4R/EPZOTIO4+MckkkVp+3SQJ YEMU3u1xAEQ7yzwDFsOpaBZahxcn16gsKeYGFfwb3gu1AlZvhB8ai5gduDSw0bikvMq+iNK7k J4vkZw8JVhSSvQ31JyULFZvGg8E6OJ2TEhahrXXmgRsMYuW39eqvp+NIp02sf5vk6xnIwEPxt vUvN2vhHFdGEGt5sBH1434BaTwMFWfT1wyG7vm0wPP2tyqYcrNxvUX463GGv3g+rOdXdDlNg/ 8uNZAgTgd0A52u90iW4OyceeoD8vId5cAM2NC+mJcev9HknjTmBTpLAZ8tpdvC20wR/w= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The internal accounting uses 'timespec' based time stamps, which is slightly inefficient and also problematic once we get to the time_t overflow in 2038. When communicating to the firmware, we even get an open-coded 64-bit division that prevents the code from being build-tested on 32-bit architectures and is inefficient due to the double conversion from 64-bit nanoseconds to seconds+nanoseconds and then microseconds. This changes the code to use ktime_t instead. Signed-off-by: Arnd Bergmann --- drivers/hid/intel-ish-hid/ipc/ipc.c | 15 ++++----------- drivers/hid/intel-ish-hid/ishtp/client.c | 4 ++-- drivers/hid/intel-ish-hid/ishtp/client.h | 6 +++--- drivers/hid/intel-ish-hid/ishtp/hbm.c | 11 ++++------- 4 files changed, 13 insertions(+), 23 deletions(-) -- 2.9.0 diff --git a/drivers/hid/intel-ish-hid/ipc/ipc.c b/drivers/hid/intel-ish-hid/ipc/ipc.c index 842d8416a7a6..9a60ec13cb10 100644 --- a/drivers/hid/intel-ish-hid/ipc/ipc.c +++ b/drivers/hid/intel-ish-hid/ipc/ipc.c @@ -296,17 +296,12 @@ static int write_ipc_from_queue(struct ishtp_device *dev) /* If sending MNG_SYNC_FW_CLOCK, update clock again */ if (IPC_HEADER_GET_PROTOCOL(doorbell_val) == IPC_PROTOCOL_MNG && IPC_HEADER_GET_MNG_CMD(doorbell_val) == MNG_SYNC_FW_CLOCK) { - struct timespec ts_system; - struct timeval tv_utc; - uint64_t usec_system, usec_utc; + uint64_t usec_system, usec_utc; struct ipc_time_update_msg time_update; struct time_sync_format ts_format; - get_monotonic_boottime(&ts_system); - do_gettimeofday(&tv_utc); - usec_system = (timespec_to_ns(&ts_system)) / NSEC_PER_USEC; - usec_utc = (uint64_t)tv_utc.tv_sec * 1000000 + - ((uint32_t)tv_utc.tv_usec); + usec_system = ktime_to_us(ktime_get_boottime()); + usec_utc = ktime_to_us(ktime_get_real()); ts_format.ts1_source = HOST_SYSTEM_TIME_USEC; ts_format.ts2_source = HOST_UTC_TIME_USEC; ts_format.reserved = 0; @@ -575,15 +570,13 @@ static void fw_reset_work_fn(struct work_struct *unused) static void _ish_sync_fw_clock(struct ishtp_device *dev) { static unsigned long prev_sync; - struct timespec ts; uint64_t usec; if (prev_sync && jiffies - prev_sync < 20 * HZ) return; prev_sync = jiffies; - get_monotonic_boottime(&ts); - usec = (timespec_to_ns(&ts)) / NSEC_PER_USEC; + usec = ktime_to_us(ktime_get_boottime()); ipc_send_mng_msg(dev, MNG_SYNC_FW_CLOCK, &usec, sizeof(uint64_t)); } diff --git a/drivers/hid/intel-ish-hid/ishtp/client.c b/drivers/hid/intel-ish-hid/ishtp/client.c index f54689ee67e1..007443ef5fca 100644 --- a/drivers/hid/intel-ish-hid/ishtp/client.c +++ b/drivers/hid/intel-ish-hid/ishtp/client.c @@ -921,7 +921,7 @@ void recv_ishtp_cl_msg(struct ishtp_device *dev, if (complete_rb) { cl = complete_rb->cl; - getnstimeofday(&cl->ts_rx); + cl->ts_rx = ktime_get(); ++cl->recv_msg_cnt_ipc; ishtp_cl_read_complete(complete_rb); } @@ -1038,7 +1038,7 @@ void recv_ishtp_cl_msg_dma(struct ishtp_device *dev, void *msg, if (complete_rb) { cl = complete_rb->cl; - getnstimeofday(&cl->ts_rx); + cl->ts_rx = ktime_get(); ++cl->recv_msg_cnt_dma; ishtp_cl_read_complete(complete_rb); } diff --git a/drivers/hid/intel-ish-hid/ishtp/client.h b/drivers/hid/intel-ish-hid/ishtp/client.h index 444d069c2ed4..79eade547f5d 100644 --- a/drivers/hid/intel-ish-hid/ishtp/client.h +++ b/drivers/hid/intel-ish-hid/ishtp/client.h @@ -118,9 +118,9 @@ struct ishtp_cl { unsigned int out_flow_ctrl_cnt; /* Rx msg ... out FC timing */ - struct timespec ts_rx; - struct timespec ts_out_fc; - struct timespec ts_max_fc_delay; + ktime_t ts_rx; + ktime_t ts_out_fc; + ktime_t ts_max_fc_delay; void *client_data; }; diff --git a/drivers/hid/intel-ish-hid/ishtp/hbm.c b/drivers/hid/intel-ish-hid/ishtp/hbm.c index b7213608ce43..ae4a69f7f2f4 100644 --- a/drivers/hid/intel-ish-hid/ishtp/hbm.c +++ b/drivers/hid/intel-ish-hid/ishtp/hbm.c @@ -321,13 +321,10 @@ int ishtp_hbm_cl_flow_control_req(struct ishtp_device *dev, if (!rv) { ++cl->out_flow_ctrl_creds; ++cl->out_flow_ctrl_cnt; - getnstimeofday(&cl->ts_out_fc); - if (cl->ts_rx.tv_sec && cl->ts_rx.tv_nsec) { - struct timespec ts_diff; - - ts_diff = timespec_sub(cl->ts_out_fc, cl->ts_rx); - if (timespec_compare(&ts_diff, &cl->ts_max_fc_delay) - > 0) + cl->ts_out_fc = ktime_get(); + if (cl->ts_rx) { + ktime_t ts_diff = ktime_sub(cl->ts_out_fc, cl->ts_rx); + if (ktime_after(ts_diff, cl->ts_max_fc_delay)) cl->ts_max_fc_delay = ts_diff; } } else {