]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
phy: qcom-qmp: fix pipe-clock imbalance on power-on failure
authorJohan Hovold <johan+linaro@kernel.org>
Mon, 2 May 2022 13:31:29 +0000 (15:31 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 16:32:32 +0000 (18:32 +0200)
[ Upstream commit 5e73b2d9867998278479ccc065a8a8227a5513ef ]

Make sure to disable the pipe clock also if ufs-reset deassertion fails
during power on.

Note that the ufs-reset is asserted in qcom_qmp_phy_com_exit().

Fixes: c9b589791fc1 ("phy: qcom: Utilize UFS reset controller")
Cc: Evan Green <evgreen@chromium.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220502133130.4125-2-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/phy/qualcomm/phy-qcom-qmp.c

index ea46950c5d2a95e233ef02c92b582256bad9210e..afcc82ab320227b497f819c14eae3661500b8ead 100644 (file)
@@ -3141,7 +3141,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 
        ret = reset_control_deassert(qmp->ufs_reset);
        if (ret)
-               goto err_lane_rst;
+               goto err_pcs_ready;
 
        qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
                               cfg->pcs_misc_tbl_num);