Commit 9561f584 authored by Peter Wang's avatar Peter Wang Committed by Martin K. Petersen
Browse files

scsi: ufs: mediatek: Support vops pre suspend to disable auto-hibern8 

Mediatek UFS needs auto-hibern8 disabled before suspend. Introduce a
solution to do pre-suspend before SSU (sleep).

Link: https://lore.kernel.org/r/20211006054705.21885-1-peter.wang@mediatek.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarPeter Wang <peter.wang@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f4875d50

drivers/scsi/ufs/ufs-exynos.c

+5 −1
Original line number Diff line number Diff line
@@ -1176,10 +1176,14 @@ static void exynos_ufs_hibern8_notify(struct ufs_hba *hba, 
	}

}



static int exynos_ufs_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)

static int exynos_ufs_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,

	enum ufs_notify_change_status status)

{

	struct exynos_ufs *ufs = ufshcd_get_variant(hba);



	if (status == PRE_CHANGE)

		return 0;



	if (!ufshcd_is_link_active(hba))

		phy_power_off(ufs->phy);

drivers/scsi/ufs/ufs-hisi.c

+5 −1
Original line number Diff line number Diff line
@@ -396,10 +396,14 @@ static int ufs_hisi_pwr_change_notify(struct ufs_hba *hba, 
	return ret;

}



static int ufs_hisi_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)

static int ufs_hisi_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,

	enum ufs_notify_change_status status)

{

	struct ufs_hisi_host *host = ufshcd_get_variant(hba);



	if (status == PRE_CHANGE)

		return 0;



	if (pm_op == UFS_RUNTIME_PM)

		return 0;

drivers/scsi/ufs/ufs-mediatek.c

+67 −1
Original line number Diff line number Diff line
@@ -311,6 +311,46 @@ static void ufs_mtk_dbg_sel(struct ufs_hba *hba) 
	}

}



static void ufs_mtk_wait_idle_state(struct ufs_hba *hba,

			    unsigned long retry_ms)

{

	u64 timeout, time_checked;

	u32 val, sm;

	bool wait_idle;



	timeout = sched_clock() + retry_ms * 1000000UL;





	/* wait a specific time after check base */

	udelay(10);

	wait_idle = false;



	do {

		time_checked = sched_clock();

		ufs_mtk_dbg_sel(hba);

		val = ufshcd_readl(hba, REG_UFS_PROBE);



		sm = val & 0x1f;



		/*

		 * if state is in H8 enter and H8 enter confirm

		 * wait until return to idle state.

		 */

		if ((sm >= VS_HIB_ENTER) && (sm <= VS_HIB_EXIT)) {

			wait_idle = true;

			udelay(50);

			continue;

		} else if (!wait_idle)

			break;



		if (wait_idle && (sm == VS_HCE_BASE))

			break;

	} while (time_checked < timeout);



	if (wait_idle && sm != VS_HCE_BASE)

		dev_info(hba->dev, "wait idle tmo: 0x%x\n", val);

}



static int ufs_mtk_wait_link_state(struct ufs_hba *hba, u32 state,

				   unsigned long max_wait_ms)

{
@@ -949,11 +989,37 @@ static void ufs_mtk_vreg_set_lpm(struct ufs_hba *hba, bool lpm) 
				   REGULATOR_MODE_NORMAL);

}



static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)

static void ufs_mtk_auto_hibern8_disable(struct ufs_hba *hba)

{

	unsigned long flags;

	int ret;



	/* disable auto-hibern8 */

	spin_lock_irqsave(hba->host->host_lock, flags);

	ufshcd_writel(hba, 0, REG_AUTO_HIBERNATE_IDLE_TIMER);

	spin_unlock_irqrestore(hba->host->host_lock, flags);



	/* wait host return to idle state when auto-hibern8 off */

	ufs_mtk_wait_idle_state(hba, 5);



	ret = ufs_mtk_wait_link_state(hba, VS_LINK_UP, 100);

	if (ret)

		dev_warn(hba->dev, "exit h8 state fail, ret=%d\n", ret);

}



static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,

	enum ufs_notify_change_status status)

{

	int err;

	struct arm_smccc_res res;



	if (status == PRE_CHANGE) {

		if (!ufshcd_is_auto_hibern8_supported(hba))

			return 0;

		ufs_mtk_auto_hibern8_disable(hba);

		return 0;

	}



	if (ufshcd_is_link_hibern8(hba)) {

		err = ufs_mtk_link_set_lpm(hba);

		if (err)

drivers/scsi/ufs/ufs-mediatek.h

+20 −0
Original line number Diff line number Diff line
@@ -54,6 +54,26 @@ enum { 
	VS_LINK_CFG                 = 5,

};



/*

 * Vendor specific host controller state

 */

enum {

	VS_HCE_RESET                = 0,

	VS_HCE_BASE                 = 1,

	VS_HCE_OOCPR_WAIT           = 2,

	VS_HCE_DME_RESET            = 3,

	VS_HCE_MIDDLE               = 4,

	VS_HCE_DME_ENABLE           = 5,

	VS_HCE_DEFAULTS             = 6,

	VS_HIB_IDLEEN               = 7,

	VS_HIB_ENTER                = 8,

	VS_HIB_ENTER_CONF           = 9,

	VS_HIB_MIDDLE               = 10,

	VS_HIB_WAITTIMER            = 11,

	VS_HIB_EXIT_CONF            = 12,

	VS_HIB_EXIT                 = 13,

};



/*

 * SiP commands

 */

drivers/scsi/ufs/ufs-qcom.c

+5 −1
Original line number Diff line number Diff line
@@ -589,11 +589,15 @@ static void ufs_qcom_device_reset_ctrl(struct ufs_hba *hba, bool asserted) 
	gpiod_set_value_cansleep(host->device_reset, asserted);

}



static int ufs_qcom_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)

static int ufs_qcom_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,

	enum ufs_notify_change_status status)

{

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);

	struct phy *phy = host->generic_phy;



	if (status == PRE_CHANGE)

		return 0;



	if (ufs_qcom_is_link_off(hba)) {

		/*

		 * Disable the tx/rx lane symbol clocks before PHY is