Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3000730pxb; Mon, 18 Oct 2021 06:22:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1TLcGhMz+j24KvX95fXiK1iQSXTinEyeqLK3WqKi66R5Pbv9kmmfHMyzEUe5NgtGr5MwH X-Received: by 2002:a17:90a:8a0a:: with SMTP id w10mr25341983pjn.60.1634563362363; Mon, 18 Oct 2021 06:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634563362; cv=none; d=google.com; s=arc-20160816; b=dSKFYEnI8cn/hkkcJ8CyOwQGTV7DXnxenp2A0G5WfQ+jV1mHA7JwLdUo2vQtlOSjF+ ixneIW2i2xU0QBXjBZsE8XuTjEwhqXa6mNb8vFe0EZpVdqwIm9a4ec9ohrsl1330Jj7Y faaHgRG87Q6hSde77cEXZa2/Xfwy6qELGwxF2YsmcEo3Fl6gIuJimyEiYN3KMRcPE/Sc eJ9Zu/xGS/Kyylsl2L8cMum2y8VKwJK/OTLtsXqR8RdFxn1Tzij0XFomOGgtT0Zwgrle tChagw2rT2d34lLVDvZ/mFm1RLcOt/KjgPiC8fyhD82R4vOKKat6WMHOAGW/AnvA/wLP JTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=se+TKo1ENsFlgxcsiDAagi6yQQDQkGibgnRs81UnOfw=; b=hfCXeeH81M/Vz5SUvHUGnHMjbrnSP405iYCJIsa93tDvVszWNW8U9phEEeEpVXMNUX WHJqzbw7fB+5qgu5zaNGVj+umBnqlumKW2918MhkGLAeHN4XmG58n7AIlfR7sckUH4N+ cabYgmVRMut3qmFZE6mcKSnKRREQCrljJy0te9stRzTtI9vYz4CFG6vRGnHzTpbDKdaq JvZRzEx+AkOcV7VY1LDUCMojfu0qSJJvyH3DzoTF4JB9fOL9lloYSm8mVqmOrsJ2rDZS p+4Jgj1ev8sZanULPceMm10jrEh8V7RYCdY1wLE0v1Co7yCHAQamjCTx/q1SosSXsEe/ Cldg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BoSIof50; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d7si222134plg.250.2021.10.18.06.22.29; Mon, 18 Oct 2021 06:22:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BoSIof50; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231814AbhJRNWn (ORCPT + 99 others); Mon, 18 Oct 2021 09:22:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:36050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbhJRNWj (ORCPT ); Mon, 18 Oct 2021 09:22:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7220A6103D; Mon, 18 Oct 2021 13:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634563227; bh=FEQkeCeHNlf9/VijMNNnZDKsvPpnX5/75zjmn6URwyU=; h=From:To:Cc:Subject:Date:From; b=BoSIof50bn3wOeWzmaLZ4H/xm3Ln7k/OHudTuwRDOYoKEbY0TiKF08ygtybXKrtvD Jo1kINXlULGjZ7RZPlTqtktTRubzrH5MP0gwITlEA9B9N8SJuxs0ZWLt7mCBiUb9qm wCSK4cjqZ9W9kySai7o4bJ8wdfNucFUYIzH/8AqHVhS0xMV+IOdvRPqIWOtAb+QRQG BSIaQipWRQKf58E5vqkTbyl9z5188irS3KV3LBawg9IdwBCtWb7pVFH7m3HnVcqq2O TH6my8wf1F9wMn/lwpih5lSHLNuDjjOBLUrReyFWDU0cOctyehzvchKdKN+GpBTww6 T29x00OADloDg== From: Arnd Bergmann To: Stanley Chu , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Alim Akhtar , Avri Altman , Matthias Brugger , Bean Huo , Peter Wang , Bart Van Assche , linux-scsi@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] scsi: ufs: mediatek: avoid sched_clock() misuse Date: Mon, 18 Oct 2021 15:20:01 +0200 Message-Id: <20211018132022.2281589-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann sched_clock() is not meant to be used in portable driver code, and assuming a particular clock frequency is not how this is meant to be used. It also causes a build failure because of a missing header inclusion: drivers/scsi/ufs/ufs-mediatek.c:321:12: error: implicit declaration of function 'sched_clock' [-Werror,-Wimplicit-function-declaration] timeout = sched_clock() + retry_ms * 1000000UL; A better interface to use here ktime_get_mono_fast_ns(), which works mostly like ktime_get() but is safe to use inside of a suspend callback. Fixes: 9561f58442e4 ("scsi: ufs: mediatek: Support vops pre suspend to disable auto-hibern8") Signed-off-by: Arnd Bergmann --- drivers/scsi/ufs/ufs-mediatek.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c index d1696db70ce8..a47241ed0a57 100644 --- a/drivers/scsi/ufs/ufs-mediatek.c +++ b/drivers/scsi/ufs/ufs-mediatek.c @@ -318,15 +318,15 @@ static void ufs_mtk_wait_idle_state(struct ufs_hba *hba, u32 val, sm; bool wait_idle; - timeout = sched_clock() + retry_ms * 1000000UL; - + /* cannot use plain ktime_get() in suspend */ + timeout = ktime_get_mono_fast_ns() + retry_ms * 1000000UL; /* wait a specific time after check base */ udelay(10); wait_idle = false; do { - time_checked = sched_clock(); + time_checked = ktime_get_mono_fast_ns(); ufs_mtk_dbg_sel(hba); val = ufshcd_readl(hba, REG_UFS_PROBE); -- 2.29.2