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

Commit 854afed7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: do not clear the DL layer timers"

parents 3f779d50 bb5ec76d

drivers/scsi/ufs/ufshcd.c

+14 −0
Original line number Diff line number Diff line
@@ -4104,6 +4104,20 @@ int ufshcd_change_power_mode(struct ufs_hba *hba, 
		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_HSSERIES),

						pwr_mode->hs_rate);



	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA0),

			DL_FC0ProtectionTimeOutVal_Default);

	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA1),

			DL_TC0ReplayTimeOutVal_Default);

	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA2),

			DL_AFC0ReqTimeOutVal_Default);



	ufshcd_dme_set(hba, UIC_ARG_MIB(DME_LocalFC0ProtectionTimeOutVal),

			DL_FC0ProtectionTimeOutVal_Default);

	ufshcd_dme_set(hba, UIC_ARG_MIB(DME_LocalTC0ReplayTimeOutVal),

			DL_TC0ReplayTimeOutVal_Default);

	ufshcd_dme_set(hba, UIC_ARG_MIB(DME_LocalAFC0ReqTimeOutVal),

			DL_AFC0ReqTimeOutVal_Default);



	ret = ufshcd_uic_change_pwr_mode(hba, pwr_mode->pwr_rx << 4

			| pwr_mode->pwr_tx);

drivers/scsi/ufs/unipro.h

+8 −0
Original line number Diff line number Diff line
@@ -120,6 +120,14 @@ 
/* PHY Adapter Protocol Constants */

#define PA_MAXDATALANES	4



#define DL_FC0ProtectionTimeOutVal_Default	8191

#define DL_TC0ReplayTimeOutVal_Default		65535

#define DL_AFC0ReqTimeOutVal_Default		32767



#define DME_LocalFC0ProtectionTimeOutVal	0xD041

#define DME_LocalTC0ReplayTimeOutVal		0xD042

#define DME_LocalAFC0ReqTimeOutVal		0xD043



/* PA power modes */

enum {

	FAST_MODE	= 1,