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

Commit dfa82329 authored by Can Guo's avatar Can Guo Committed by Todd Kjos
Browse files

FROMGIT: scsi: ufs: Select INITIAL ADAPT type for HS Gear4 

ADAPT is added specifically for HS Gear4 mode only. Select INITIAL ADAPT
before power mode change to G4 and select NO ADAPT before switch to non-G4
modes.

[mkp: fixed typo in header file]

Link: https://lore.kernel.org/r/1581485910-8307-3-git-send-email-cang@codeaurora.org


Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Bug: 150731199
Change-Id: I6226b91826e139f9b8e99523da4861b01254fea8
(cherry picked from commit 518b32f1ddf5830698f270272d2ca465e788a273
https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git

 5.7/scsi-queue)
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
parent 1bd769d7

drivers/scsi/ufs/ufs-qcom.c

+14 −0
Original line number Diff line number Diff line
@@ -882,6 +882,20 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba, 
		if (!ufshcd_is_hs_mode(&hba->pwr_info) &&

			ufshcd_is_hs_mode(dev_req_params))

			ufs_qcom_dev_ref_clk_ctrl(host, true);



		if (host->hw_ver.major >= 0x4) {

			if (dev_req_params->gear_tx == UFS_HS_G4) {

				/* INITIAL ADAPT */

				ufshcd_dme_set(hba,

					       UIC_ARG_MIB(PA_TXHSADAPTTYPE),

					       PA_INITIAL_ADAPT);

			} else {

				/* NO ADAPT */

				ufshcd_dme_set(hba,

					       UIC_ARG_MIB(PA_TXHSADAPTTYPE),

					       PA_NO_ADAPT);

			}

		}

		break;

	case POST_CHANGE:

		if (ufs_qcom_cfg_timers(hba, dev_req_params->gear_rx,

drivers/scsi/ufs/unipro.h

+7 −0
Original line number Diff line number Diff line
@@ -146,6 +146,12 @@ 
#define PA_SLEEPNOCONFIGTIME	0x15A2

#define PA_STALLNOCONFIGTIME	0x15A3

#define PA_SAVECONFIGTIME	0x15A4

#define PA_TXHSADAPTTYPE       0x15D4



/* Adpat type for PA_TXHSADAPTTYPE attribute */

#define PA_REFRESH_ADAPT       0x00

#define PA_INITIAL_ADAPT       0x01

#define PA_NO_ADAPT            0x03



#define PA_TACTIVATE_TIME_UNIT_US	10

#define PA_HIBERN8_TIME_UNIT_US		100
@@ -203,6 +209,7 @@ enum ufs_hs_gear_tag { 
	UFS_HS_G1,		/* HS Gear 1 (default for reset) */

	UFS_HS_G2,		/* HS Gear 2 */

	UFS_HS_G3,		/* HS Gear 3 */

	UFS_HS_G4,		/* HS Gear 4 */

};



enum ufs_unipro_ver {