Commit 26cdd694 authored by Manivannan Sadhasivam's avatar Manivannan Sadhasivam Committed by Martin K. Petersen
Browse files

scsi: ufs: qcom: Fix ESI vector mask 



While cleaning up the code to use ufshcd_rmwl() helper, the ESI vector mask
was changed incorrectly. Fix it and also define a proper macro for the
value together with FIELD_PREP().

Reported-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Fixes: 0e9f4375 ("scsi: ufs: qcom: Use ufshcd_rmwl() where applicable")
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20231214125532.55109-1-manivannan.sadhasivam@linaro.org


Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 24db9626

drivers/ufs/host/ufs-qcom.c

+3 −1
Original line number Diff line number Diff line
@@ -1744,7 +1744,9 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba) 
	} else {

		if (host->hw_ver.major == 6 && host->hw_ver.minor == 0 &&

		    host->hw_ver.step == 0)

			ufshcd_rmwl(hba, ESI_VEC_MASK, 0x1f00, REG_UFS_CFG3);

			ufshcd_rmwl(hba, ESI_VEC_MASK,

				    FIELD_PREP(ESI_VEC_MASK, MAX_ESI_VEC - 1),

				    REG_UFS_CFG3);

		ufshcd_mcq_enable_esi(hba);

	}

drivers/ufs/host/ufs-qcom.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#define HBRN8_POLL_TOUT_MS      100

#define DEFAULT_CLK_RATE_HZ     1000000

#define MAX_SUPP_MAC		64

#define MAX_ESI_VEC		32



#define UFS_HW_VER_MAJOR_MASK	GENMASK(31, 28)

#define UFS_HW_VER_MINOR_MASK	GENMASK(27, 16)