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 C6933C4332F for ; Tue, 20 Dec 2022 01:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232931AbiLTBV0 (ORCPT ); Mon, 19 Dec 2022 20:21:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232532AbiLTBVH (ORCPT ); Mon, 19 Dec 2022 20:21:07 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4199C658C; Mon, 19 Dec 2022 17:21:06 -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 ams.source.kernel.org (Postfix) with ESMTPS id E9B33B80FA6; Tue, 20 Dec 2022 01:21:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9209DC433EF; Tue, 20 Dec 2022 01:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671499263; bh=lHZsqiEbP+pPwp+3p7Q67f989/+cmYxndfu5Owgyd3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XOAp3YeLTz2GgmCmKYdmIWUk7Ke3k7LSNRAexFg697mMNlV6GGsWv3gokHzINKRgB /Y9lgEBpkCtA+DGzGJZdYVSNL0Zrzth4xZtOSNbt4YFxgg3lBYIYt75wifUMQ/luwg NVyeV25sv3mX8WgZK//qv7bHFDndGpZJOXCr3NFoZLuYeTHG6XEysZ4a3P7Y6QwiXA H3e9RddphoI5qNZOY7PEkSzXYItAZUYJqhL15UGKqjWM0EcqmI7I4o0kEwtbbu4sbf 8YRtKpQ6kAqNUOn0CMTe8dp2vHRL37Ybi+uY8h6Psrmp14NuJItrkSMqAsktyRBm1f 71A5f8VQlic5w== 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, avri.altman@wdc.com, beanhuo@micron.com, stanley.chu@mediatek.com, j-young.choi@samsung.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 03/16] scsi: ufs: Reduce the START STOP UNIT timeout Date: Mon, 19 Dec 2022 20:20:40 -0500 Message-Id: <20221220012053.1222101-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221220012053.1222101-1-sashal@kernel.org> References: <20221220012053.1222101-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/ufs/core/ufshcd.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index b1f59a5fe632..bcc4b8a3c3bc 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8747,8 +8747,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->ufs_device_wlun; @@ -8781,14 +8779,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