Commit e738ba45 authored by Avri Altman's avatar Avri Altman Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Introduce ufshcd_has_pending_tasks() 



Prepare to remove hba->clk_gating.active_reqs check from
ufshcd_is_ufs_dev_busy().

Signed-off-by: default avatarAvri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20241124070808.194860-2-avri.altman@wdc.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 40384c84

drivers/ufs/core/ufshcd.c

+9 −4
Original line number Diff line number Diff line
@@ -258,10 +258,16 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state, 
	return UFS_PM_LVL_0;

}



static bool ufshcd_has_pending_tasks(struct ufs_hba *hba)

{

	return hba->outstanding_tasks || hba->active_uic_cmd ||

	       hba->uic_async_done;

}



static bool ufshcd_is_ufs_dev_busy(struct ufs_hba *hba)

{

	return (hba->clk_gating.active_reqs || hba->outstanding_reqs || hba->outstanding_tasks ||

		hba->active_uic_cmd || hba->uic_async_done);

	return hba->clk_gating.active_reqs || hba->outstanding_reqs ||

	       ufshcd_has_pending_tasks(hba);

}



static const struct ufs_dev_quirk ufs_fixups[] = {
@@ -1999,8 +2005,7 @@ static void __ufshcd_release(struct ufs_hba *hba) 


	if (hba->clk_gating.active_reqs || hba->clk_gating.is_suspended ||

	    hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL ||

	    hba->outstanding_tasks || !hba->clk_gating.is_initialized ||

	    hba->active_uic_cmd || hba->uic_async_done ||

	    ufshcd_has_pending_tasks(hba) || !hba->clk_gating.is_initialized ||

	    hba->clk_gating.state == CLKS_OFF)

		return;