]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init()
authorPeter Griffin <peter.griffin@linaro.org>
Wed, 19 Mar 2025 15:30:18 +0000 (15:30 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 3 Apr 2025 13:53:50 +0000 (09:53 -0400)
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>
drivers/ufs/host/ufs-exynos.c

index 13dd5dfc03eb38411e29cde17bba92f0a5c681ff..cd750786187cdebeeb453cab43edc6f86d55e583 100644 (file)
@@ -1049,9 +1049,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)) {
@@ -1059,11 +1064,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;
 }