scsi: ufs: qcom: Perform read back after writing REG_UFS_SYS1CLK_1US
authorAndrew Halaney <ahalaney@redhat.com>
Fri, 29 Mar 2024 20:46:44 +0000 (15:46 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 6 Apr 2024 01:06:28 +0000 (21:06 -0400)
Currently after writing to REG_UFS_SYS1CLK_1US a mb() is used to ensure
that write has gone through to the device.

mb() ensures that the write completes, but completion doesn't mean that it
isn't stored in a buffer somewhere. The recommendation for ensuring this
bit has taken effect on the device is to perform a read back to force it to
make it all the way to the device. This is documented in device-io.rst and
a talk by Will Deacon on this can be seen over here:

    https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678

Let's do that to ensure the bit hits the device. Because the mb()'s purpose
wasn't to add extra ordering (on top of the ordering guaranteed by
writel()/readl()), it can safely be removed.

Fixes: f06fcc7155dc ("scsi: ufs-qcom: add QUniPro hardware support and power optimizations")
Reviewed-by: Can Guo <quic_cang@quicinc.com>
Signed-off-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20240329-ufs-reset-ensure-effect-before-delay-v5-2-181252004586@redhat.com
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/host/ufs-qcom.c

index 8d68bd21ae7332409198b06d7c99d2f7e6faaafe..46f8a74e50372ec0925b29665e14e75db10dee86 100644 (file)
@@ -501,7 +501,7 @@ static int ufs_qcom_cfg_timers(struct ufs_hba *hba, u32 gear,
                 * make sure above write gets applied before we return from
                 * this function.
                 */
-               mb();
+               ufshcd_readl(hba, REG_UFS_SYS1CLK_1US);
        }
 
        return 0;