Commit 1764fa2a authored by Stanley Chu's avatar Stanley Chu Committed by Martin K. Petersen
Browse files

scsi: ufs: set device as active power mode after resetting device 

Currently ufshcd driver assumes that bInitPowerMode parameter is not
changed by any vendors thus device power mode can be set as "Active" during
initialization.

According to UFS JEDEC specification, device power mode shall be "Active"
after HW Reset is triggered if the bInitPowerMode parameter in Device
Descriptor is default value.

By above description, we can set device power mode as "Active" after device
reset is triggered by vendor's callback. With this change, the link startup
performance can be improved in some cases by not setting link_startup_again
as true in ufshcd_link_startup().

Link: https://lore.kernel.org/r/20200327095835.10293-1-stanley.chu@mediatek.com


Reviewed-by: default avatarCan Guo <cang@codeaurora.org>
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 13e60d3b

drivers/scsi/ufs/ufshcd.c

+0 −13
Original line number Diff line number Diff line
@@ -172,19 +172,6 @@ enum { 
#define ufshcd_clear_eh_in_progress(h) \

	((h)->eh_flags &= ~UFSHCD_EH_IN_PROGRESS)



#define ufshcd_set_ufs_dev_active(h) \

	((h)->curr_dev_pwr_mode = UFS_ACTIVE_PWR_MODE)

#define ufshcd_set_ufs_dev_sleep(h) \

	((h)->curr_dev_pwr_mode = UFS_SLEEP_PWR_MODE)

#define ufshcd_set_ufs_dev_poweroff(h) \

	((h)->curr_dev_pwr_mode = UFS_POWERDOWN_PWR_MODE)

#define ufshcd_is_ufs_dev_active(h) \

	((h)->curr_dev_pwr_mode == UFS_ACTIVE_PWR_MODE)

#define ufshcd_is_ufs_dev_sleep(h) \

	((h)->curr_dev_pwr_mode == UFS_SLEEP_PWR_MODE)

#define ufshcd_is_ufs_dev_poweroff(h) \

	((h)->curr_dev_pwr_mode == UFS_POWERDOWN_PWR_MODE)



struct ufs_pm_lvl_states ufs_pm_lvl_states[] = {

	{UFS_ACTIVE_PWR_MODE, UIC_LINK_ACTIVE_STATE},

	{UFS_ACTIVE_PWR_MODE, UIC_LINK_HIBERN8_STATE},

drivers/scsi/ufs/ufshcd.h

+14 −0
Original line number Diff line number Diff line
@@ -130,6 +130,19 @@ enum uic_link_state { 
#define ufshcd_set_link_hibern8(hba) ((hba)->uic_link_state = \

				    UIC_LINK_HIBERN8_STATE)



#define ufshcd_set_ufs_dev_active(h) \

	((h)->curr_dev_pwr_mode = UFS_ACTIVE_PWR_MODE)

#define ufshcd_set_ufs_dev_sleep(h) \

	((h)->curr_dev_pwr_mode = UFS_SLEEP_PWR_MODE)

#define ufshcd_set_ufs_dev_poweroff(h) \

	((h)->curr_dev_pwr_mode = UFS_POWERDOWN_PWR_MODE)

#define ufshcd_is_ufs_dev_active(h) \

	((h)->curr_dev_pwr_mode == UFS_ACTIVE_PWR_MODE)

#define ufshcd_is_ufs_dev_sleep(h) \

	((h)->curr_dev_pwr_mode == UFS_SLEEP_PWR_MODE)

#define ufshcd_is_ufs_dev_poweroff(h) \

	((h)->curr_dev_pwr_mode == UFS_POWERDOWN_PWR_MODE)



/*

 * UFS Power management levels.

 * Each level is in increasing order of power savings.
@@ -1084,6 +1097,7 @@ static inline void ufshcd_vops_device_reset(struct ufs_hba *hba) 
{

	if (hba->vops && hba->vops->device_reset) {

		hba->vops->device_reset(hba);

		ufshcd_set_ufs_dev_active(hba);

		ufshcd_update_reg_hist(&hba->ufs_stats.dev_reset, 0);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE