scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init()

[ Upstream commit 3d101165e72316775947d71321d97194f03dfef3 ]

Ensure clocks are enabled before configuring unipro. Additionally move
the pre_link() hook before the exynos_ufs_phy_init() calls. This means
the register write sequence more closely resembles the ordering of the
downstream driver.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Link: https://lore.kernel.org/r/20250319-exynos-ufs-stability-fixes-v2-1-96722cc2ba1b@linaro.org
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c
index d138b66d5e350bb9a4af94a3968f004cd55c67e4..f61126189876e9c8950b058fab60523636149a28 100644 (file)
--- a/drivers/ufs/host/ufs-exynos.c
+++ b/drivers/ufs/host/ufs-exynos.c
@@ -990,9 +990,14 @@ static int exynos_ufs_pre_link(struct ufs_hba *hba)
        exynos_ufs_config_intr(ufs, DFES_DEF_L4_ERRS, UNIPRO_L4);
        exynos_ufs_set_unipro_pclk_div(ufs);
 
+       exynos_ufs_setup_clocks(hba, true, PRE_CHANGE);
+
        /* unipro */
        exynos_ufs_config_unipro(ufs);
 
+       if (ufs->drv_data->pre_link)
+               ufs->drv_data->pre_link(ufs);
+
        /* m-phy */
        exynos_ufs_phy_init(ufs);
        if (!(ufs->opts & EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR)) {
@@ -1000,11 +1005,6 @@ static int exynos_ufs_pre_link(struct ufs_hba *hba)
                exynos_ufs_config_phy_cap_attr(ufs);
        }
 
-       exynos_ufs_setup_clocks(hba, true, PRE_CHANGE);
-
-       if (ufs->drv_data->pre_link)
-               ufs->drv_data->pre_link(ufs);
-
        return 0;
 }