Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: ufs: qcom: Perform read back after writing reset bit

Currently, the reset bit for the UFS provided reset controller (used by its
phy) is written to, and then a mb() happens to try and ensure that hit the
device. Immediately afterwards a usleep_range() occurs.

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. By doing so and
guaranteeing the ordering against the immediately following usleep_range(),
the mb() can safely be removed.

Fixes: 81c0fc51b7a7 ("ufs-qcom: add support for Qualcomm Technologies Inc platforms")
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
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-1-181252004586@redhat.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Andrew Halaney and committed by
Martin K. Petersen
c4d28e06 4cece764

+6 -6
+6 -6
drivers/ufs/host/ufs-qcom.h
··· 151 151 ufshcd_rmwl(hba, UFS_PHY_SOFT_RESET, UFS_PHY_SOFT_RESET, REG_UFS_CFG1); 152 152 153 153 /* 154 - * Make sure assertion of ufs phy reset is written to 155 - * register before returning 154 + * Dummy read to ensure the write takes effect before doing any sort 155 + * of delay 156 156 */ 157 - mb(); 157 + ufshcd_readl(hba, REG_UFS_CFG1); 158 158 } 159 159 160 160 static inline void ufs_qcom_deassert_reset(struct ufs_hba *hba) ··· 162 162 ufshcd_rmwl(hba, UFS_PHY_SOFT_RESET, 0, REG_UFS_CFG1); 163 163 164 164 /* 165 - * Make sure de-assertion of ufs phy reset is written to 166 - * register before returning 165 + * Dummy read to ensure the write takes effect before doing any sort 166 + * of delay 167 167 */ 168 - mb(); 168 + ufshcd_readl(hba, REG_UFS_CFG1); 169 169 } 170 170 171 171 /* Host controller hardware version: major.minor.step */