scsi: ufs: exynos: Add check inside exynos_ufs_config_smu()

commit c662cedea14efdcf373d8d886ec18019d50e0772 upstream.

Move the EXYNOS_UFS_OPT_UFSPR_SECURE check inside
exynos_ufs_config_smu().

This way all call sites will benefit from the check. This fixes a bug
currently in the exynos_ufs_resume() path on gs101 as it calls
exynos_ufs_config_smu() and we end up accessing registers that can only
be accessed from secure world which results in a serror.

Fixes: d11e0a318df8 ("scsi: ufs: exynos: Add support for Tensor gs101 SoC")
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Link: https://lore.kernel.org/r/20241031150033.3440894-5-peter.griffin@linaro.org
Cc: stable@vger.kernel.org
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c
index 5867e6338562333e57b5c555f9ef265988931ce5..d198e8aad7c8d539a66298cc8369c1945b682913 100644 (file)
--- a/drivers/ufs/host/ufs-exynos.c
+++ b/drivers/ufs/host/ufs-exynos.c
@@ -724,6 +724,9 @@ static void exynos_ufs_config_smu(struct exynos_ufs *ufs)
 {
        u32 reg, val;
 
+       if (ufs->opts & EXYNOS_UFS_OPT_UFSPR_SECURE)
+               return;
+
        exynos_ufs_disable_auto_ctrl_hcc_save(ufs, &val);
 
        /* make encryption disabled by default */
@@ -1440,8 +1443,8 @@ static int exynos_ufs_init(struct ufs_hba *hba)
        if (ret)
                goto out;
        exynos_ufs_specify_phy_time_attr(ufs);
-       if (!(ufs->opts & EXYNOS_UFS_OPT_UFSPR_SECURE))
-               exynos_ufs_config_smu(ufs);
+
+       exynos_ufs_config_smu(ufs);
 
        hba->host->dma_alignment = DATA_UNIT_SIZE - 1;
        return 0;