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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1CE6CAC5A9 for ; Thu, 18 Sep 2025 10:40:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vnFjASWdN09Z2pxgJ/BkA4FP4+u11UAWeYt+tGr5voQ=; b=mdj1my+i7oYHQJHKSB0Y8OhJ9j A8bpHNK/4gyp3nmANb6y+zxDN3T1B2zEXMBFNXEfLQxKxtXEfdbtfH5xAOndcf48eI2AaVh0KMv54 hK2IG2b9Nt878l0R7yDOkGVSlZfLCmt0GoMhLP6mYu6DLtZKl0cnjv5MOr7kuc4l/lx4YJRv+jSyB El0Fiep7acvqttwiPo/g4I/Zvj35LPX1aRvFvEbYufPi8fp1cmejhWWY/WjUuXurS07QrPeN9Zpqy paUiuvnqfcVP8HqLeNeJaEaDEIfb5lYJI0QEdN4GRa/xzNXAjkQKtmhLj8nS0liARJ8Xh9Ux41G3v 8MycswzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uzC3k-0000000H78S-45II; Thu, 18 Sep 2025 10:40:16 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uzC3g-0000000H72I-28N1 for linux-mediatek@lists.infradead.org; Thu, 18 Sep 2025 10:40:13 +0000 X-UUID: d71f6966947b11f09f706fa2197c6ceb-20250918 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=vnFjASWdN09Z2pxgJ/BkA4FP4+u11UAWeYt+tGr5voQ=; b=t9Tr/VQ8juk+D1Vs0DKD7Xr/g+BYlNTcuoHcBGQU+V717anU0F4qABqFSsgvX0v9cr6Es+9EAPEknitIgvrR1VbE9Tzk3K/NTJjiFoMkweHK+GMnGcuVt9duEizoeaGJZEOSVbVa5/0bHVeLOxJhaCCVwdxO/7W8Qwvi4ICk29o=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.4,REQID:0456a993-8b39-45e7-9d2f-61c2907dd470,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:1ca6b93,CLOUDID:acfded84-5317-4626-9d82-238d715c253f,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|836|888|898,TC:-5,Content: 0|15|50,EDM:-3,IP:nil,URL:0,File:nil,RT: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,ARC:0 X-CID-BVR: 3,DMD|SSN|SDN X-CID-BAS: 3,DMD|SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: d71f6966947b11f09f706fa2197c6ceb-20250918 Received: from mtkmbs09n2.mediatek.inc [(172.21.101.94)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 558858205; Thu, 18 Sep 2025 03:40:05 -0700 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS09N1.mediatek.inc (172.21.101.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Thu, 18 Sep 2025 18:40:02 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Thu, 18 Sep 2025 18:40:02 +0800 From: To: , CC: , , , , , , , , , , , , , , , Subject: [PATCH v1 01/10] ufs: host: mediatek: Fix runtime suspend error deadlock Date: Thu, 18 Sep 2025 18:36:11 +0800 Message-ID: <20250918104000.208856-2-peter.wang@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250918104000.208856-1-peter.wang@mediatek.com> References: <20250918104000.208856-1-peter.wang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250918_034012_696404_B6FD479B X-CRM114-Status: GOOD ( 14.84 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Peter Wang Fix the deadlock issue during runtime suspend by checking the error handler's progress. If the error handler is active, break the runtime suspend process by returning -EAGAIN. This approach prevents potential deadlocks when acquiring runtime PM and enhances system stability. Signed-off-by: Peter Wang --- drivers/ufs/core/ufshcd.c | 12 ------------ drivers/ufs/host/ufs-mediatek.c | 12 +++++++++--- include/ufs/ufshcd.h | 12 ++++++++++++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index c9eb89dccd1e..c7a12748e479 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -214,11 +214,6 @@ static const char *const ufshcd_state_name[] = { [UFSHCD_STATE_EH_SCHEDULED_NON_FATAL] = "eh_non_fatal", }; -/* UFSHCD error handling flags */ -enum { - UFSHCD_EH_IN_PROGRESS = (1 << 0), -}; - /* UFSHCD UIC layer error flags */ enum { UFSHCD_UIC_DL_PA_INIT_ERROR = (1 << 0), /* Data link layer error */ @@ -230,13 +225,6 @@ enum { UFSHCD_UIC_PA_GENERIC_ERROR = (1 << 6), /* Generic PA error */ }; -#define ufshcd_set_eh_in_progress(h) \ - ((h)->eh_flags |= UFSHCD_EH_IN_PROGRESS) -#define ufshcd_eh_in_progress(h) \ - ((h)->eh_flags & UFSHCD_EH_IN_PROGRESS) -#define ufshcd_clear_eh_in_progress(h) \ - ((h)->eh_flags &= ~UFSHCD_EH_IN_PROGRESS) - const struct ufs_pm_lvl_states ufs_pm_lvl_states[] = { [UFS_PM_LVL_0] = {UFS_ACTIVE_PWR_MODE, UIC_LINK_ACTIVE_STATE}, [UFS_PM_LVL_1] = {UFS_ACTIVE_PWR_MODE, UIC_LINK_HIBERN8_STATE}, diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index 758a393a9de1..b1797386668c 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -1746,9 +1746,15 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op, struct arm_smccc_res res; if (status == PRE_CHANGE) { - if (ufshcd_is_auto_hibern8_supported(hba)) - return ufs_mtk_auto_hibern8_disable(hba); - return 0; + if (!ufshcd_is_auto_hibern8_supported(hba)) + return 0; + err = ufs_mtk_auto_hibern8_disable(hba); + + /* May trigger EH work without exiting hibern8 error */ + if (ufshcd_eh_in_progress(hba)) + return -EAGAIN; + else + return err; } if (ufshcd_is_link_hibern8(hba)) { diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index ea0021f067c9..45e2ca65de90 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -97,6 +97,11 @@ enum uic_link_state { UIC_LINK_BROKEN_STATE = 3, /* Link is in broken state */ }; +/* UFSHCD error handling flags */ +enum { + UFSHCD_EH_IN_PROGRESS = (1 << 0), +}; + #define ufshcd_is_link_off(hba) ((hba)->uic_link_state == UIC_LINK_OFF_STATE) #define ufshcd_is_link_active(hba) ((hba)->uic_link_state == \ UIC_LINK_ACTIVE_STATE) @@ -129,6 +134,13 @@ enum uic_link_state { #define ufshcd_is_ufs_dev_deepsleep(h) \ ((h)->curr_dev_pwr_mode == UFS_DEEPSLEEP_PWR_MODE) +#define ufshcd_set_eh_in_progress(h) \ + ((h)->eh_flags |= UFSHCD_EH_IN_PROGRESS) +#define ufshcd_eh_in_progress(h) \ + ((h)->eh_flags & UFSHCD_EH_IN_PROGRESS) +#define ufshcd_clear_eh_in_progress(h) \ + ((h)->eh_flags &= ~UFSHCD_EH_IN_PROGRESS) + /* * UFS Power management levels. * Each level is in increasing order of power savings, except DeepSleep -- 2.45.2