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

scsi: ufs: core: Prepare to introduce a new clock_gating lock 



Remove hba->clk_gating.active_reqs check from ufshcd_is_ufs_dev_busy()
function to separate clock gating logic from general device busy checks.

Signed-off-by: default avatarAvri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20241124070808.194860-3-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 e738ba45

drivers/ufs/core/ufshcd.c

+7 −4
Original line number Diff line number Diff line
@@ -266,8 +266,7 @@ static bool ufshcd_has_pending_tasks(struct ufs_hba *hba) 


static bool ufshcd_is_ufs_dev_busy(struct ufs_hba *hba)

{

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

	       ufshcd_has_pending_tasks(hba);

	return hba->outstanding_reqs || ufshcd_has_pending_tasks(hba);

}



static const struct ufs_dev_quirk ufs_fixups[] = {
@@ -1949,7 +1948,9 @@ static void ufshcd_gate_work(struct work_struct *work) 
		goto rel_lock;

	}



	if (ufshcd_is_ufs_dev_busy(hba) || hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL)

	if (ufshcd_is_ufs_dev_busy(hba) ||

	    hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL ||

	    hba->clk_gating.active_reqs)

		goto rel_lock;



	spin_unlock_irqrestore(hba->host->host_lock, flags);
@@ -8226,7 +8227,9 @@ static void ufshcd_rtc_work(struct work_struct *work) 
	hba = container_of(to_delayed_work(work), struct ufs_hba, ufs_rtc_update_work);



	 /* Update RTC only when there are no requests in progress and UFSHCI is operational */

	if (!ufshcd_is_ufs_dev_busy(hba) && hba->ufshcd_state == UFSHCD_STATE_OPERATIONAL)

	if (!ufshcd_is_ufs_dev_busy(hba) &&

	    hba->ufshcd_state == UFSHCD_STATE_OPERATIONAL &&

	    !hba->clk_gating.active_reqs)

		ufshcd_update_rtc(hba);



	if (ufshcd_is_ufs_dev_active(hba) && hba->dev_info.rtc_update_period)