From patchwork Tue Dec 10 22:02:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13902173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78420E77192 for ; Tue, 10 Dec 2024 22:02:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 587886B009A; Tue, 10 Dec 2024 17:02:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E4A56B00A0; Tue, 10 Dec 2024 17:02:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E71D6B00A2; Tue, 10 Dec 2024 17:02:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F1B716B00A1 for ; Tue, 10 Dec 2024 17:02:43 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AD96AAEDEB for ; Tue, 10 Dec 2024 22:02:43 +0000 (UTC) X-FDA: 82880423934.10.2BA7DF3 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf06.hostedemail.com (Postfix) with ESMTP id 4232318000E for ; Tue, 10 Dec 2024 22:02:26 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=k1q7WXOx; spf=pass (imf06.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733868151; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WjXR/e+Bt5J36pfaIEwWXUE8wYei/ElgtSssYeLrLS0=; b=DNugCAQnmuHaxgdpY65k8tBTnRW+1uxRS9YOY2NJLSTfzu1cSngciQTf1RRrpkbVfbOrw8 u6V/UJu5t26mkGY9btwv/3ed7NjPVZmDAMi2tTmnQZCYxNQxnQdkY9h2AhSTxKc0vQ55ml ms9boVgWIIo/sTeHiyFWk0cHtTjgqCI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733868151; a=rsa-sha256; cv=none; b=jiYKh1EhXngoKwnhTkXLs3rQrrQSTgvjtbQEJbu/wv1mFnBPq3tJkz0jlrEHmdwq7ppuyB kbfMaiUW5G6kLUa7R3/uIjk5dTTESR2MGMrGXhi1LkHWmr01wCCSv2LbAlGfJwGTG1w07S 0tQAsE/J9joZAnfKhRNr5CWejQzZ3Xs= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=k1q7WXOx; spf=pass (imf06.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id A7DE320BCAEA; Tue, 10 Dec 2024 14:02:37 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A7DE320BCAEA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733868157; bh=WjXR/e+Bt5J36pfaIEwWXUE8wYei/ElgtSssYeLrLS0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=k1q7WXOxk1qYLVn196G3sb8s3XVjdPiH9giyU/vMWpK4NQiBox8ErAeTFxnenHayv 1NLSp5g4CPg/qfYp440BlKTVCcToWDafQQXFfUYhXGaNJP4LCGPckmvvkPFrzQ2ykv 8WoFkMMhJxjwt/2RQ+Oo6g69AunqDN5xYmAoTPZY= From: Easwar Hariharan Date: Tue, 10 Dec 2024 22:02:38 +0000 Subject: [PATCH v3 07/19] accel/habanalabs: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241210-converge-secs-to-jiffies-v3-7-ddfefd7e9f2a@linux.microsoft.com> References: <20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com> In-Reply-To: <20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com> To: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Julia Lawall , Nicolas Palix , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ofir Bitton , Oded Gabbay , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6?= =?utf-8?q?m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jeroen de Borst , Praveen Kaligineedi , Shailend Chand , Andrew Lunn , James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , =?utf-8?q?Roger_Pau_Mon?= =?utf-8?q?n=C3=A9?= , Jens Axboe , Kalle Valo , Jeff Johnson , Catalin Marinas , Andrew Morton , Jack Wang , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Xiubo Li , Ilya Dryomov , Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence , Jaroslav Kysela , Takashi Iwai , Louis Peens , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cocci@inria.fr, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-scsi@vger.kernel.org, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-mm@kvack.org, linux-bluetooth@vger.kernel.org, linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org, live-patching@vger.kernel.org, linux-sound@vger.kernel.org, oss-drivers@corigine.com, linuxppc-dev@lists.ozlabs.org, Anna-Maria Behnsen , Easwar Hariharan X-Mailer: b4 0.14.2 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4232318000E X-Stat-Signature: kxq465ndf1tih6hrenuihjzn3jesnefk X-Rspam-User: X-HE-Tag: 1733868146-895348 X-HE-Meta: U2FsdGVkX18gi0HNdyIrJP4sDJtv6WPCUCtsEjGnd3SmKPuGHqZ+D2Cpr/4WUx8jjSN+uFjvmUY/24qo3IjMhUoCunVlyAF7+RelZABqCyKXq6Y3xWJbuGzdRyX5UREOmZLXIOi71OAvkmxb8l1JgzaOyKF2u4xEWlnCL6OED4pw1vY2B4/UJBg8g6GfqhGUiqZCusBIHhO7cbXoGidi/XAfZ46MfTekKGrzBWj5ZC6VdFyk5W7AxD9ptxuFYkopu0hj80FsfMlcjgAGnOjnv/QgsqIFIJFNGLbG6GrHThryThTTHa4kJEbRHuG/evjsj2kGk6/GnKYsFz/rB8SEbuIFG4swbJZDNco6zsEW7yiI7j+0pkC7m9o5ETbeUJGj0nXYukEXtK6WtxlVRYWJbYOwpR2HR5Gbts7G2nkiihU0Nnj8hJ+SQAU+dEoHcIpF6+IfB9ZCtRfEwdf8R+A60wGtvKnIwQ/escE3G+89LMda4PyLj8KwInVDbkDq7q3WJ7kD/QgvWqagy85PEeBOr+Aqfgetu2tgFxjZSdyBS4aNO8ABN7REI6k7RfGqPAV3HMxYk+8fk7QVJctzeysnZxerkYMhQuzeJTqPJlntNq8EcwOkCDaaYj8o07iqmu8WvX4pQOtQ78IbMulEpOCjmxiPZ9IqJ8gn8v3ytu5c20b/4Xxr+xQOLS9hwLYWvjnEt9R7GytER05voz5pZag7qBeWnl94Prc8zR+pvQsMBcC4qcfSCFCwWdGOUKBkF2lVMX0rMj5OSQBzYRnz0OS0UOjczzg4gLuVVvBWA8pjHY+NoDHNCHNZLByVt19YB9aNOxa5be0pjEzLYEZKOvN2Pej8l7jsnFIAv+UKaPB1E/CtdYAppwCtS22PQia5EvzITvoRnl6svt6HV5gMrqcvhLOC+GDqqeZ/Rf4wmDzm71CkYPej4vU4TZttN9iQ8zfVj1z4V+pX9suFBMRv2Si U0D1ZzWo +RntD1kDBb58rdZITTV/QzBItx2nbXsUePqie8tAS83wrPtxObiIy29Hfgcs4wuXuBrb2lIUYSxHRDCqGJGlZmiNm01B9iklc7miV23mUkKq7n78ADzsnzed+V4gybuwfqxlM1VBjJKx8Q5bAdWAFK9JNR+KlNlRCDnaj45Ke/wSDtTzSsz0fVbqJgslqr52zpr97n7iy5Za/y17PqEwP8mq91CVmrv4tBW09HreVbb+qUVYL8I9qvHuLnG1lQr1/s5md9XusKppWEL49jjzGrCemRjh9Lebku5VXKOPFAVVZRgEf6wbvbkkliUmrBNK/zfEyCFSP+M/aL1o5HnQapqiBs0XgjwR74H6M53+gKmpz+cipIuA8U7PIPg6V0/2Vo8QC/c4ogWTto5xkxFXe3DtQjEEI3rZ5CbNuzZuGiNSkZ8w= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced secs_to_jiffies(). As the value here is a multiple of 1000, use secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication. This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with the following Coccinelle rules: @@ constant C; @@ - msecs_to_jiffies(C * 1000) + secs_to_jiffies(C) @@ constant C; @@ - msecs_to_jiffies(C * MSEC_PER_SEC) + secs_to_jiffies(C) Signed-off-by: Easwar Hariharan --- drivers/accel/habanalabs/common/device.c | 2 +- drivers/accel/habanalabs/common/habanalabs_drv.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c index e0cf3b4343bb081638430f2552ed27431b488ff9..30277ae410d4b742ffb7bddc35498564ff96fe62 100644 --- a/drivers/accel/habanalabs/common/device.c +++ b/drivers/accel/habanalabs/common/device.c @@ -817,7 +817,7 @@ static void device_hard_reset_pending(struct work_struct *work) } queue_delayed_work(hdev->reset_wq, &device_reset_work->reset_work, - msecs_to_jiffies(HL_PENDING_RESET_PER_SEC * 1000)); + secs_to_jiffies(HL_PENDING_RESET_PER_SEC)); } } diff --git a/drivers/accel/habanalabs/common/habanalabs_drv.c b/drivers/accel/habanalabs/common/habanalabs_drv.c index 5409b2c656c803f6d172dd882711357061f30022..596c52e8aa266bf48e2be45e719adb202604577b 100644 --- a/drivers/accel/habanalabs/common/habanalabs_drv.c +++ b/drivers/accel/habanalabs/common/habanalabs_drv.c @@ -361,8 +361,7 @@ static void fixup_device_params_per_asic(struct hl_device *hdev, int timeout) * a different default timeout for Gaudi */ if (timeout == HL_DEFAULT_TIMEOUT_LOCKED) - hdev->timeout_jiffies = msecs_to_jiffies(GAUDI_DEFAULT_TIMEOUT_LOCKED * - MSEC_PER_SEC); + hdev->timeout_jiffies = secs_to_jiffies(GAUDI_DEFAULT_TIMEOUT_LOCKED); hdev->reset_upon_device_release = 0; break;