[PATCH v3 2/2] scsi: ufs-mediatek: restore the M-PHY power state when va09 disable fails
From: Xiangwu Lai
Date: Thu Nov 19 2026 - 02:16:23 EST
In ufs_mtk_mphy_power_on(), the power-off path tears the M-PHY down in
two steps before regulator_disable() is called: phy_power_off() puts
the PHY PLL and its clocks down, and ufs_mtk_va09_pwr_ctrl() asks the
firmware to drop the VA09 supply. If regulator_disable() then fails,
the M-PHY stays physically off while host->mphy_powered_on is left
set, so the next power-on attempt bails out through the
!(on ^ host->mphy_powered_on) check and never powers the M-PHY back
up, leaving the UFS host with an unpowered PHY (I/O timeouts,
controller lockups).
Simply forcing mphy_powered_on to false would trade this for two more
problems. First, the regulator core drops the consumer enable count
only after a successful disable, so the count stays at 1, the next
power-on raises it to 2 and it never returns to zero: va09 is then
never physically disabled and the devm-acquired regulator would hit
WARN_ON(enable_count) again on release. Second, when the power-off
fails during ufs_mtk_suspend(), the error recovery in
__ufshcd_wl_suspend() runs ufshcd_host_reset_and_restore() without
powering the M-PHY back on, which would run against an unpowered PHY.
(Both points were raised by the Sashiko AI review of v2.)
Since the va09 regulator stays enabled when its disable fails, restore
the M-PHY power state instead: power the PHY back on through
ufs_mtk_va09_pwr_ctrl() and phy_power_on() and leave mphy_powered_on
set. The next power-off attempt then retries the full sequence and
the enable count stays balanced.
Found by code inspection while reviewing the va09 error paths of the
driver; the failure has not been observed on real hardware.
Suggested-by: Peter Wang <peter.wang@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/sashiko-outbox-220026@xxxxxxxxxx
Fixes: cf137b3ea49a ("scsi: ufs-mediatek: Support VA09 regulator operations")
Signed-off-by: Xiangwu Lai <laixiangwu@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ufs/host/ufs-mediatek.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Changes in v3:
- restore the M-PHY power state when regulator_disable() fails
(phy_power_on() plus the va09 SMC call) instead of forcing
mphy_powered_on to false, as suggested by Peter Wang. This also
keeps the va09 enable count balanced and leaves the suspend error
recovery running with the M-PHY powered, resolving both findings of
the Sashiko AI review of v2
(https://lore.kernel.org/all/sashiko-outbox-220026@xxxxxxxxxx/).
Link: https://lore.kernel.org/r/20261118032015.974-3-laixiangwu@xxxxxxxxxxxxxxxxxxxx/
diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index ebbc017d0..caf186966 100644
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c
@@ -541,6 +541,16 @@ static int ufs_mtk_mphy_power_on(struct ufs_hba *hba, bool on)
if (ufs_mtk_is_va09_supported(hba)) {
ufs_mtk_va09_pwr_ctrl(res, 0);
ret = regulator_disable(host->reg_va09);
+ if (ret) {
+ /*
+ * The va09 regulator stays enabled, so
+ * bring the M-PHY back up to keep the
+ * software state in sync with the
+ * hardware.
+ */
+ ufs_mtk_va09_pwr_ctrl(res, 1);
+ phy_power_on(mphy);
+ }
}
}
out:
--
2.50.1.windows.1