Skip to content

Commit

Permalink
Revert "scsi: ufs: Make clock scaling path PM Safe"
Browse files Browse the repository at this point in the history
This reverts commit 4d21c0e4e401b4eae406f656b57d8257a22e2f01 as
it may cause mutex lockup issue as per below stack.

  schedule_preempt_disabled+0x18/0x28
  __mutex_lock_common+0x5f8/0x1068
  mutex_lock_nested+0x40/0x50
  devfreq_monitor_suspend+0x24/0x68
  devfreq_simple_ondemand_handler+0x74/0x98
  devfreq_suspend_device+0x78/0x90
  ufshcd_suspend+0x138/0x870
  ufshcd_runtime_suspend+0x44/0x1f0
  ufshcd_pltfrm_runtime_suspend+0x1c/0x28
  pm_generic_runtime_suspend+0x34/0x48
  __rpm_callback+0x164/0x278
  rpm_suspend+0x4e4/0x828
  rpm_idle+0x5bc/0x600
  __pm_runtime_idle+0x84/0xa8
  ufshcd_devfreq_target+0x144/0x330
  update_devfreq+0xec/0x1c0
  devfreq_monitor+0x34/0x90

Hence Reverting this.

Change-Id: I189c2724acebafc60a5d8103039342751d9b4b1e
Signed-off-by: Nitin Rawat <[email protected]>
Signed-off-by: engstk <[email protected]>
  • Loading branch information
Nitin Rawat authored and engstk committed Sep 16, 2020
1 parent 3c1b864 commit a322797
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/scsi/ufs/ufshcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1927,9 +1927,7 @@ static int ufshcd_devfreq_target(struct device *dev,
spin_unlock_irqrestore(hba->host->host_lock, irq_flags);

start = ktime_get();
pm_runtime_get_sync(hba->dev);
ret = ufshcd_devfreq_scale(hba, scale_up);
pm_runtime_put_sync(hba->dev);
trace_ufshcd_profile_clk_scaling(dev_name(hba->dev),
(scale_up ? "up" : "down"),
ktime_to_us(ktime_sub(ktime_get(), start)), ret);
Expand Down

0 comments on commit a322797

Please sign in to comment.