From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3646C677F0 for ; Tue, 20 Dec 2022 01:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233395AbiLTBZi (ORCPT ); Mon, 19 Dec 2022 20:25:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232743AbiLTBXU (ORCPT ); Mon, 19 Dec 2022 20:23:20 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DF99A1B3; Mon, 19 Dec 2022 17:22:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BA65661171; Tue, 20 Dec 2022 01:22:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 009ECC433EF; Tue, 20 Dec 2022 01:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671499327; bh=FKtCj8p/pFb9w5475+Qx7EIJbbFLYrGQLnNpQwnJEmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WqbuFFB+abKUvW65bo3Pp1s/UHxJNgR51NxXtpJ7oUgdhvW/NosZ0q19L0wIn+mxW zH5ijWR00zAqY9ZUBmFM+tN87uhOq/OhrIbWlwxlE6ecAiiW2sivmbY3udQxjv9nPA b/g7CcF/HQ3lnaamCYc3OftE0aHEm7X3xYLcXrswx0PdSPZeoJeVGKoyT6grvL/TWZ MggAhDhMP2SAnpgyUz+hU//piDCbOl+ytC0ZyBzsum6AIk5sp6oRZl9Eeswze3NBtf gOxmpSuuTrun2tJWQXPxbbgt0GruvzDTUOgf4ZOJO/UbzmCrDaYGI+3hzPLeCId7k4 mhiElu3jbNhug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bart Van Assche , "Martin K . Petersen" , Sasha Levin , jejb@linux.ibm.com, beanhuo@micron.com, avri.altman@wdc.com, keosung.park@samsung.com, kwmad.kim@samsung.com, j-young.choi@samsung.com, adrian.hunter@intel.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 3/9] scsi: ufs: Reduce the START STOP UNIT timeout Date: Mon, 19 Dec 2022 20:21:53 -0500 Message-Id: <20221220012159.1222517-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221220012159.1222517-1-sashal@kernel.org> References: <20221220012159.1222517-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bart Van Assche [ Upstream commit dcd5b7637c6d442d957f73780a03047413ed3a10 ] Reduce the START STOP UNIT command timeout to one second since on Android devices a kernel panic is triggered if an attempt to suspend the system takes more than 20 seconds. One second should be enough for the START STOP UNIT command since this command completes in less than a millisecond for the UFS devices I have access to. Signed-off-by: Bart Van Assche Link: https://lore.kernel.org/r/20221018202958.1902564-7-bvanassche@acm.org Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index dae1a85f1512..a428b8145dcc 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8476,8 +8476,6 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, struct scsi_device *sdp; unsigned long flags; int ret, retries; - unsigned long deadline; - int32_t remaining; spin_lock_irqsave(hba->host->host_lock, flags); sdp = hba->sdev_ufs_device; @@ -8510,14 +8508,9 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, * callbacks hence set the RQF_PM flag so that it doesn't resume the * already suspended childs. */ - deadline = jiffies + 10 * HZ; for (retries = 3; retries > 0; --retries) { - ret = -ETIMEDOUT; - remaining = deadline - jiffies; - if (remaining <= 0) - break; ret = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, - remaining / HZ, 0, 0, RQF_PM, NULL); + HZ, 0, 0, RQF_PM, NULL); if (!scsi_status_is_check_condition(ret) || !scsi_sense_valid(&sshdr) || sshdr.sense_key != UNIT_ATTENTION) -- 2.35.1