From patchwork Wed Aug 30 13:14:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UGV0ZXIgV2FuZyAo546L5L+h5Y+LKQ==?= X-Patchwork-Id: 718925 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 AA4B3C83F18 for ; Wed, 30 Aug 2023 18:38:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237666AbjH3SiT (ORCPT ); Wed, 30 Aug 2023 14:38:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244484AbjH3NOW (ORCPT ); Wed, 30 Aug 2023 09:14:22 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F9DA137 for ; Wed, 30 Aug 2023 06:14:11 -0700 (PDT) X-UUID: 18d4833a473711eeb20a276fd37b9834-20230830 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=wFdRmdpCsZ45j7y1oLGMF8enjtWZ4nVcCl66VJ08MF4=; b=AcgEO7r5wXlwCKO2F9LEocZMAxRs65127Z2ZIJXp+hdpymBzh2LtgMNxwenMyDnfyrIa3PPAJEuQj18DprI+gWLcinmh2Q4myKUs1JiEunaAQ47fUmFvTiNb2AT8PL9wKQjzLVfpre4PIMYonMCuHGg9Ho/qb51Yci/xA02Smk4=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.31, REQID:e4236f58-8831-4ad0-86c3-526a705c2c53, IP:0, U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:0ad78a4, CLOUDID:6d1e1fef-9a6e-4c39-b73e-f2bc08ca3dc5, B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR: NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: 18d4833a473711eeb20a276fd37b9834-20230830 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1139075060; Wed, 30 Aug 2023 21:14:06 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 30 Aug 2023 21:14:04 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Wed, 30 Aug 2023 21:14:04 +0800 From: To: , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v1] ufs: core: fix runtime pm with uic error(NON_FATAL) hang Date: Wed, 30 Aug 2023 21:14:03 +0800 Message-ID: <20230830131403.14193-1-peter.wang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Peter Wang When uic error (NON_FATAL) happen in runtime pm flow, ufshcd_err_handler stuck in ufshcd_rpm_get_sync, but runtime pm(suspend or resume) stuck in send SSU(sleep or active) which always get SCSI_MLQUEUE_HOST_BUSY. This patch try to solve this deadlock: 1. Return error to break runtime suspend let err handler going, same as UFSHCD_STATE_EH_SCHEDULED_FATAL do. 2. Try do recovery if SSU(active) fail when resume, prevent resume return fail which casue IO hang. Signed-off-by: Peter Wang --- drivers/ufs/core/ufshcd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 129446775796..bc30a0842277 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -2863,6 +2863,14 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) * being issued in that case. */ if (ufshcd_eh_in_progress(hba)) { + /* Same as UFSHCD_STATE_EH_SCHEDULED_FATAL */ + if (hba->pm_op_in_progress) { + hba->force_reset = true; + set_host_byte(cmd, DID_BAD_TARGET); + scsi_done(cmd); + goto out; + } + err = SCSI_MLQUEUE_HOST_BUSY; goto out; } @@ -9784,6 +9792,9 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) if (!ufshcd_is_ufs_dev_active(hba)) { ret = ufshcd_set_dev_pwr_mode(hba, UFS_ACTIVE_PWR_MODE); + /* Try prevent return error, else IO hang */ + if (ret) + ret = ufshcd_link_recovery(hba); if (ret) goto set_old_link_state; ufshcd_set_timestamp_attr(hba);