Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee32c909 authored by Kiwoong Kim's avatar Kiwoong Kim Committed by Martin K. Petersen
Browse files

scsi: ufs: introduce hibern8_notify callback 



Some UFS host controller may need to configure some things around
hibern8 enter/exit

Signed-off-by: default avatarKiwoong Kim <kwmad.kim@samsung.com>
Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d2877be4

drivers/scsi/ufs/ufshcd.c

+10 −2
Original line number Diff line number Diff line
@@ -2697,6 +2697,8 @@ static int __ufshcd_uic_hibern8_enter(struct ufs_hba *hba) 
	int ret;

	struct uic_command uic_cmd = {0};



	ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_ENTER, PRE_CHANGE);



	uic_cmd.command = UIC_CMD_DME_HIBER_ENTER;

	ret = ufshcd_uic_pwr_ctrl(hba, &uic_cmd);
@@ -2710,7 +2712,9 @@ static int __ufshcd_uic_hibern8_enter(struct ufs_hba *hba) 
		 */

		if (ufshcd_link_recovery(hba))

			ret = -ENOLINK;

	}

	} else

		ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_ENTER,

								POST_CHANGE);



	return ret;

}
@@ -2733,13 +2737,17 @@ static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba) 
	struct uic_command uic_cmd = {0};

	int ret;



	ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_EXIT, PRE_CHANGE);



	uic_cmd.command = UIC_CMD_DME_HIBER_EXIT;

	ret = ufshcd_uic_pwr_ctrl(hba, &uic_cmd);

	if (ret) {

		dev_err(hba->dev, "%s: hibern8 exit failed. ret = %d\n",

			__func__, ret);

		ret = ufshcd_link_recovery(hba);

	}

	} else

		ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_EXIT,

								POST_CHANGE);



	return ret;

}

drivers/scsi/ufs/ufshcd.h

+12 −0
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ struct ufs_pwr_mode_info { 
 *                  to set some things

 * @setup_task_mgmt: called before any task management request is issued

 *                  to set some things

 * @hibern8_notify: called around hibern8 enter/exit

 *		    to configure some things

 * @suspend: called during host controller PM callback

 * @resume: called during host controller PM callback

 * @dbg_register_dump: used to dump controller debug information
@@ -290,6 +292,8 @@ struct ufs_hba_variant_ops { 
					struct ufs_pa_layer_attr *);

	void	(*setup_xfer_req)(struct ufs_hba *, int, bool);

	void	(*setup_task_mgmt)(struct ufs_hba *, int, u8);

	void    (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,

				       enum ufs_notify_change_status);

	int     (*suspend)(struct ufs_hba *, enum ufs_pm_op);

	int     (*resume)(struct ufs_hba *, enum ufs_pm_op);

	void	(*dbg_register_dump)(struct ufs_hba *hba);
@@ -821,6 +825,14 @@ static inline void ufshcd_vops_setup_task_mgmt(struct ufs_hba *hba, 
		return hba->vops->setup_task_mgmt(hba, tag, tm_function);

}



static inline void ufshcd_vops_hibern8_notify(struct ufs_hba *hba,

					enum uic_cmd_dme cmd,

					enum ufs_notify_change_status status)

{

	if (hba->vops && hba->vops->hibern8_notify)

		return hba->vops->hibern8_notify(hba, cmd, status);

}



static inline int ufshcd_vops_suspend(struct ufs_hba *hba, enum ufs_pm_op op)

{

	if (hba->vops && hba->vops->suspend)