diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2023-03-31 21:45:14 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2023-03-31 21:45:14 -0400 |
commit | f467b865cf5b25aac3feee3fb5e25b90f5df35c4 (patch) | |
tree | ee99dbe821c841c979152486537420f13286d3f4 /drivers/ufs/core | |
parent | 882f4adac9a8411ba9993810132add18896b82c1 (diff) | |
parent | d684a7a26f7d2c7122a4581ac966ed64e88fb29c (diff) | |
download | linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.tar.gz linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.tar.bz2 linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.zip |
Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging
Pull in the fixes branch to resolve an mpi3mr conflict reported by
sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/ufs/core')
-rw-r--r-- | drivers/ufs/core/ufshcd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 35a3bd95c5e4..acae4e194ec4 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -1527,7 +1527,7 @@ start_window: scaling->window_start_t = curr_t; scaling->tot_busy_t = 0; - if (hba->outstanding_reqs) { + if (scaling->active_reqs) { scaling->busy_start_t = curr_t; scaling->is_busy_started = true; } else { @@ -2145,7 +2145,7 @@ static void ufshcd_clk_scaling_update_busy(struct ufs_hba *hba) spin_lock_irqsave(hba->host->host_lock, flags); hba->clk_scaling.active_reqs--; - if (!hba->outstanding_reqs && scaling->is_busy_started) { + if (!scaling->active_reqs && scaling->is_busy_started) { scaling->tot_busy_t += ktime_to_us(ktime_sub(ktime_get(), scaling->busy_start_t)); scaling->busy_start_t = 0; @@ -10543,4 +10543,5 @@ module_exit(ufshcd_core_exit); MODULE_AUTHOR("Santosh Yaragnavi <santosh.sy@samsung.com>"); MODULE_AUTHOR("Vinayak Holikatti <h.vinayak@samsung.com>"); MODULE_DESCRIPTION("Generic UFS host controller driver Core"); +MODULE_SOFTDEP("pre: governor_simpleondemand"); MODULE_LICENSE("GPL"); |