Commit 1c5e7221 authored by Peter Wang's avatar Peter Wang Committed by Martin K. Petersen
Browse files

scsi: ufs: mediatek: Fix vsx/vccqx control logic 



VSX (the upper layer of VCCQ/VCCQ2) should:

 1. Always set to hpm mode if ufs device is active.

 2. Enter lpm mode only if ufs device is not active.

VCCQX should:

 1. Keep hpm mode if vccq and vccq2 not set in dts.

 2. Keep hpm mode if vcc not set in dts keep vcc always on.

 3. Keep hpm if broken vcc keep vcc always on and not allow vccq lpm.

 4. Except upper case, can enter lpm mode if ufs device is not active.

Acked-by: default avatarChun-Hung Wu <Chun-Hung.Wu@mediatek.com>
Signed-off-by: default avatarPeter Wang <peter.wang@mediatek.com>
Link: https://lore.kernel.org/r/20240315083448.7185-2-peter.wang@mediatek.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4cece764

drivers/ufs/host/ufs-mediatek.c

+29 −12
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba) 
	return !!(host->caps & UFS_MTK_CAP_PMC_VIA_FASTAUTO);

}



static bool ufs_mtk_is_allow_vccqx_lpm(struct ufs_hba *hba)

{

	struct ufs_mtk_host *host = ufshcd_get_variant(hba);



	return (host->caps & UFS_MTK_CAP_ALLOW_VCCQX_LPM);

}



static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable)

{

	u32 tmp;
@@ -1303,26 +1310,36 @@ static void ufs_mtk_vsx_set_lpm(struct ufs_hba *hba, bool lpm) 


static void ufs_mtk_dev_vreg_set_lpm(struct ufs_hba *hba, bool lpm)

{

	if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2)

		return;



	/* Skip if VCC is assumed always-on */

	if (!hba->vreg_info.vcc)

		return;

	bool skip_vccqx = false;



	/* Bypass LPM when device is still active */

	/* Prevent entering LPM when device is still active */

	if (lpm && ufshcd_is_ufs_dev_active(hba))

		return;



	/* Bypass LPM if VCC is enabled */

	if (lpm && hba->vreg_info.vcc->enabled)

		return;

	/* Skip vccqx lpm control and control vsx only */

	if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2)

		skip_vccqx = true;



	/* VCC is always-on, control vsx only */

	if (!hba->vreg_info.vcc)

		skip_vccqx = true;



	/* Broken vcc keep vcc always on, most case control vsx only */

	if (lpm && hba->vreg_info.vcc && hba->vreg_info.vcc->enabled) {

		/* Some device vccqx/vsx can enter lpm */

		if (ufs_mtk_is_allow_vccqx_lpm(hba))

			skip_vccqx = false;

		else /* control vsx only */

			skip_vccqx = true;

	}



	if (lpm) {

		if (!skip_vccqx)

			ufs_mtk_vccqx_set_lpm(hba, lpm);

		ufs_mtk_vsx_set_lpm(hba, lpm);

	} else {

		ufs_mtk_vsx_set_lpm(hba, lpm);

		if (!skip_vccqx)

			ufs_mtk_vccqx_set_lpm(hba, lpm);

	}

}

drivers/ufs/host/ufs-mediatek.h

+6 −0
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ enum ufs_mtk_host_caps { 
	UFS_MTK_CAP_VA09_PWR_CTRL              = 1 << 1,

	UFS_MTK_CAP_DISABLE_AH8                = 1 << 2,

	UFS_MTK_CAP_BROKEN_VCC                 = 1 << 3,



	/*

	 * Override UFS_MTK_CAP_BROKEN_VCC's behavior to

	 * allow vccqx upstream to enter LPM

	 */

	UFS_MTK_CAP_ALLOW_VCCQX_LPM            = 1 << 5,

	UFS_MTK_CAP_PMC_VIA_FASTAUTO           = 1 << 6,

};