github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

scsi: ufs: mediatek: Handle mPHY power-on failures

Browse Source 
The MediaTek helper enables VA09 before powering on the mPHY, but ignores
the PHY result. A failure can leave VA09 enabled and publish
mphy_powered_on as true, so a later power-on attempt is skipped.

Check phy_power_on(), attempt to unwind VA09 on failure, and leave the
state flag unchanged. Propagate the helper result from host initialization
as well as its existing resume caller. Keep the original PHY error if the
supply rollback also fails, and report that rollback separately.

The issue was found by our static-analysis tool.

Fixes: 561e3a8726 ("scsi: ufs-mediatek: Fix unbalanced clock on/off")
Fixes: cf137b3ea4 ("scsi: ufs-mediatek: Support VA09 regulator operations")
Assisted-by: gpt 5
Signed-off-by: Pengpeng Hou <hppiscas@163.com>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Reviewed-by: Stanley Jhu <stanleyjhu@google.com>
Link: https://patch.msgid.link/20260920034953.19535-1-hppiscas@163.com
Signed-off-by: Martin K. Petersen (Oracle) <mkp@kernel.org>
This commit is contained in:
Pengpeng Hou 2026-09-20 11:49:53 +08:00 committed by Martin K. Petersen (Oracle)
parent 85de8b3a5e
commit 78e0481054
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/ufs/host/ufs-mediatek.c
View File

@ -509,6 +509,7 @@ static int ufs_mtk_mphy_power_on(struct ufs_hba *hba, bool on)
struct ufs_mtk_host *host = ufshcd_get_variant(hba);
struct phy *mphy = host->mphy;
struct arm_smccc_res res;
int err;
int ret = 0;
if (!mphy || !(on ^ host->mphy_powered_on))
@ -523,7 +524,18 @@ static int ufs_mtk_mphy_power_on(struct ufs_hba *hba, bool on)
usleep_range(200, 210);
ufs_mtk_va09_pwr_ctrl(res, 1);
}
phy_power_on(mphy);
ret = phy_power_on(mphy);
if (ret) {
if (ufs_mtk_is_va09_supported(hba)) {
ufs_mtk_va09_pwr_ctrl(res, 0);
err = regulator_disable(host->reg_va09);
if (err)
dev_err(hba->dev,
"failed to unwind va09: %d\n", err);
}
dev_err(hba->dev, "failed to enable mphy: %d\n", ret);
return ret;
}
} else {
phy_power_off(mphy);
if (ufs_mtk_is_va09_supported(hba)) {
@ -1295,7 +1307,9 @@ static int ufs_mtk_init(struct ufs_hba *hba)
*
* Enable phy clocks specifically here.
*/
ufs_mtk_mphy_power_on(hba, true);
err = ufs_mtk_mphy_power_on(hba, true);
if (err)
goto out_variant_clear;
if (ufs_mtk_is_rtff_mtcmos(hba)) {
/* First Restore here, to avoid backup unexpected value */