Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 882951A239D for ; Tue, 26 Aug 2025 06:23:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756189406; cv=none; b=tPCI6sgzLFAfcq8OKGGes5SZtj6qVheIhAYEBrr3gU2QdyrrkEW/1ABojFtOdDD418SKviwapnK3TAXnllqarhstKG113I5nKVOqXkyKUMS0Mn0Qnck+fOIlPE5isUAJn6XN0n0HvLSB4okh2l7usy+9yJs9TkENhdyvQdWyuHM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756189406; c=relaxed/simple; bh=cGVzUcaRb/iGEc1nf7y25e46PIGRTBjOg7z+5KXFLIs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZtNfNjGWjpP1fUVWlAN/c2kS7hMpOwHw1amHPpdMt+anIJ5NXuC368dBOAtTTGQsHDaNdeDByOaW2gT8J+LkEJkjoX+X4yGUtUK1vHA9D0gsEhQwoHB8xHZBxQ9HTBXFy/NV76gSrYGmH7ewH2b4TVYX0+OOhkrBOP7qduuRMrE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=lU0BmBa0; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="lU0BmBa0" X-UUID: 28768766824511f0b33aeb1e7f16c2b6-20250826 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=0RCtfehLhlmij/RAVdGh4EpyvxeTRg1BsAYyTWYP8k0=; b=lU0BmBa0s304VXD/N9NAM+Pv0pXZFaifby/KfRKgWTnuJiLyUjn68vmClvJG0zsUkB9TCjPUlnHwkoxsb6V7WdaODfYz014eyWlx8bGAlI10i7mrfxTdeLHScYzTiSZMMrodtl4qJ/BegT82eRIjsG8cr6YL/DN0umZ67Tgb0D4=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.3,REQID:dee5cee9-263d-4b07-9e11-5d7766ca92fb,IP:0,UR L: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:f1326cf,CLOUDID:3a5a8320-786d-4870-a017-e7b4f3839b3f,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,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: 28768766824511f0b33aeb1e7f16c2b6-20250826 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 587069866; Tue, 26 Aug 2025 14:23:19 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS09N2.mediatek.inc (172.21.101.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Tue, 26 Aug 2025 14:23:16 +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; Tue, 26 Aug 2025 14:23:16 +0800 From: To: , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v2 02/10] ufs: host: mediatek: Enhance recovery on resume failure Date: Tue, 26 Aug 2025 14:22:16 +0800 Message-ID: <20250826062314.3070425-3-peter.wang@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250826062314.3070425-1-peter.wang@mediatek.com> References: <20250826062314.3070425-1-peter.wang@mediatek.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-MTK: N From: Peter Wang This patch improves the recovery process when a resume operation fails. If both the resume and recovery fail, it logs the device's power status and returns 0 to prevent I/O hang.. Signed-off-by: Peter Wang --- drivers/ufs/host/ufs-mediatek.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index 1aa14a8dc161..6d25110c8cb8 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -1775,8 +1775,21 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) } return 0; + fail: - return ufshcd_link_recovery(hba); + /* + * Check if the platform (parent) device has resumed, and ensure that + * power, clock, and MTCMOS are all turned on. + */ + err = ufshcd_link_recovery(hba); + if (err) { + dev_err(hba->dev, "Device PM: req=%d, status:%d, err:%d\n", + hba->dev->power.request, + hba->dev->power.runtime_status, + hba->dev->power.runtime_error); + } + + return 0; /* Cannot return a failure, otherwise, the I/O will hang. */ } static void ufs_mtk_dbg_register_dump(struct ufs_hba *hba) -- 2.45.2