From patchwork Wed Dec 28 06:01:57 2022 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: 638333 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 E9E41C4167B for ; Wed, 28 Dec 2022 06:02:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229549AbiL1GCO (ORCPT ); Wed, 28 Dec 2022 01:02:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbiL1GCN (ORCPT ); Wed, 28 Dec 2022 01:02:13 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29B05DE8E for ; Tue, 27 Dec 2022 22:02:07 -0800 (PST) X-UUID: 297fa804a4884dfcb8bcc1fe266ecf21-20221228 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=wiYFVfxNlNI/ohkpHnj9j4/4wiWx5D1lBRjT+uCIufQ=; b=V3MU+Cp/7WOg2Bm2eE0KzpLNIOCglwQdV1lXpJVEdakxe3d/3aozNgIrBZcA04XNJP2k9sbu/kFsqYh3dgqY6Fkc8y0nuwamrjRrCiaPvgBh8YW92dDS2MzCXDsrj0NhNKSKgCj6ti2lohlkMDcSPxLOnOBX8CVB41AZl8rcvEo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.14, REQID:cc57b839-f974-486e-b6e1-5ed5317fd7f1, IP:0, U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:dcaaed0, CLOUDID:cb5b29f4-ff42-4fb0-b929-626456a83c14, 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 X-UUID: 297fa804a4884dfcb8bcc1fe266ecf21-20221228 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1734289878; Wed, 28 Dec 2022 14:02:00 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.186) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Wed, 28 Dec 2022 14:01:59 +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.792.15 via Frontend Transport; Wed, 28 Dec 2022 14:01:59 +0800 From: To: , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v3] ufs: core: wlun resume SSU(Acitve) fail recovery Date: Wed, 28 Dec 2022 14:01:57 +0800 Message-ID: <20221228060157.24852-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 wlun resume SSU(Active) timeout, scsi try eh_host_reset_handler. But ufshcd_eh_host_reset_handler hang at wait flush_work(&hba->eh_work). And ufshcd_err_handler hang at wait rpm resume. Do link recovery only in this case. Below is IO hang stack dump. schedule+0x110/0x204 schedule_timeout+0x98/0x138 wait_for_common_io+0x130/0x2d0 blk_execute_rq+0x10c/0x16c __scsi_execute+0xfc/0x278 ufshcd_set_dev_pwr_mode+0x1c8/0x40c __ufshcd_wl_resume+0xf0/0x5cc ufshcd_wl_runtime_resume+0x40/0x18c scsi_runtime_resume+0x88/0x104 __rpm_callback+0x1a0/0xaec rpm_resume+0x7e0/0xcd0 __rpm_callback+0x430/0xaec rpm_resume+0x800/0xcd0 pm_runtime_work+0x148/0x198 schedule+0x110/0x204 schedule_timeout+0x48/0x138 wait_for_common+0x144/0x2dc __flush_work+0x3d0/0x508 ufshcd_eh_host_reset_handler+0x134/0x3a8 scsi_try_host_reset+0x54/0x204 scsi_eh_ready_devs+0xb30/0xd48 scsi_error_handler+0x260/0x874 schedule+0x110/0x204 rpm_resume+0x120/0xcd0 __pm_runtime_resume+0xa0/0x17c ufshcd_err_handling_prepare+0x40/0x430 ufshcd_err_handler+0x1c4/0xd4c Signed-off-by: Peter Wang --- drivers/ufs/core/ufshcd.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index e18c9f4463ec..0dfb9a35bf66 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -7366,6 +7366,23 @@ static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd) hba = shost_priv(cmd->device->host); + /* + * If pm op resume fail and wait err recovery, do link recovery only. + * Because schedule eh work will get dead lock in ufshcd_rpm_get_sync + * and wait wlun resume, but wlun resume error wait eh work finish. + */ + if (hba->pm_op_in_progress && + hba->curr_dev_pwr_mode != UFS_ACTIVE_PWR_MODE) { + err = ufshcd_link_recovery(hba); + if (err) { + dev_err(hba->dev, "%s: power state %d pm_progress %d", + __func__, + hba->curr_dev_pwr_mode, + hba->pm_op_in_progress); + } + return err; + } + spin_lock_irqsave(hba->host->host_lock, flags); hba->force_reset = true; ufshcd_schedule_eh_work(hba);