Commit 21f04fb4 authored by Nitin Rawat's avatar Nitin Rawat Committed by Martin K. Petersen
Browse files

scsi: ufs: ufs-qcom: Check host controller state 



Commit 52a51801 ("scsi: ufs: core: Fix missing clk change notification
on host reset") added UFS clock scaling notification to
ufshcd_host_reset_and_restore(). This invokes hibern8 enter and exit on
Qualcomm platform which fails because controller is in reset state.

Fix this by checking the Host controller state before sending hibern8
command.

__ufshcd_wl_resume()
ufshcd_reset_and_restore()
ufshcd_host_reset_and_restore()
ufshcd_scale_clks()
ufshcd_vops_clk_scale_notify()
ufs_qcom_clk_scale_notify()
ufshcd_uic_hibern8_enter()

Fixes: 52a51801 ("scsi: ufs: core: Fix missing clk change notification on host reset")
Co-developed-by: default avatarManish Pandey <quic_mapa@quicinc.com>
Signed-off-by: default avatarManish Pandey <quic_mapa@quicinc.com>
Signed-off-by: default avatarNitin Rawat <quic_nitirawa@quicinc.com>
Link: https://lore.kernel.org/r/20230726134140.7180-3-quic_nitirawa@quicinc.com


Acked-by: default avatarManivannan Sadhasivam <mani@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 548fdf77

drivers/ufs/host/ufs-qcom.c

+4 −0
Original line number Diff line number Diff line
@@ -1382,6 +1382,10 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, 
	struct ufs_pa_layer_attr *dev_req_params = &host->dev_req_params;

	int err = 0;



	/* check the host controller state before sending hibern8 cmd */

	if (!ufshcd_is_hba_active(hba))

		return 0;



	if (status == PRE_CHANGE) {

		err = ufshcd_uic_hibern8_enter(hba);

		if (err)