Commit <52a518019ca1> (Fix missing clk change notification) 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: 52a518019ca1 ("scsi: ufs: core: Fix missing clk change notification on host reset")

Co-developed-by: Manish Pandey <quic_mapa@quicinc.com>
Signed-off-by: Manish Pandey <quic_mapa@quicinc.com>
Signed-off-by: Nitin Rawat <quic_nitirawa@quicinc.com>
---
 drivers/ufs/host/ufs-qcom.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 8d6fd4c3324f..95412e98a598 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1254,6 +1254,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)
--
2.17.1

On Wed, Jul 26, 2023 at 07:11:40PM +0530, Nitin Rawat wrote:
> Commit <52a518019ca1> (Fix missing clk change notification) 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: 52a518019ca1 ("scsi: ufs: core: Fix missing clk change notification on host reset")
> 

Nit: No need of a newline here.

> Co-developed-by: Manish Pandey <quic_mapa@quicinc.com>
> Signed-off-by: Manish Pandey <quic_mapa@quicinc.com>
> Signed-off-by: Nitin Rawat <quic_nitirawa@quicinc.com>

Acked-by: Manivannan Sadhasivam <mani@kernel.org>

- Mani

> ---
>  drivers/ufs/host/ufs-qcom.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
> index 8d6fd4c3324f..95412e98a598 100644
> --- a/drivers/ufs/host/ufs-qcom.c
> +++ b/drivers/ufs/host/ufs-qcom.c
> @@ -1254,6 +1254,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)
> --
> 2.17.1
> 

-- 
மணிவண்ணன் சதாசிவம்