Skip to contentSkip to conversation

scsi: ufs: Fix possible unclocked access to auto hibern8 timer register

PATCH Applied Can Guo 3 participants 3 messages Mar 5, 2020 – Mar 10, 2020 SCSI

lore
Share & tools
lore

Can Guo

author
#0 lore raw

PATCH 1/1 scsi: ufs: Fix possible unclocked access to auto hibern8 timer register

Before access auto hibner8 timer register, make sure power and clock are properly configured to avoid unclocked register access.

Fixes ba7af5ec5126 ("scsi: ufs: export ufshcd_auto_hibern8_update for vendor usage")
---
 drivers/scsi/ufs/ufshcd.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufshcd.c +14 -7
index e987fa3a..5698f11 100644
@@ -3914,18 +3914,25 @@ int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
 void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit)
 {
 	unsigned long flags;
+	bool update = false;
 
-	if (!(hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT))
+	if (!ufshcd_is_auto_hibern8_supported(hba))
 		return;
 
 	spin_lock_irqsave(hba->host->host_lock, flags);
-	if (hba->ahit == ahit)
-		goto out_unlock;
-	hba->ahit = ahit;
-	if (!pm_runtime_suspended(hba->dev))
-		ufshcd_writel(hba, hba->ahit, REG_AUTO_HIBERNATE_IDLE_TIMER);
-out_unlock:
+	if (hba->ahit != ahit) {
+		hba->ahit = ahit;
+		update = true;
+	}
 	spin_unlock_irqrestore(hba->host->host_lock, flags);
+
+	if (update && !pm_runtime_suspended(hba->dev)) {
+		pm_runtime_get_sync(hba->dev);
+		ufshcd_hold(hba, false);
+		ufshcd_auto_hibern8_enable(hba);
+		ufshcd_release(hba);
+		pm_runtime_put(hba->dev);
+	}
 }
 EXPORT_SYMBOL_GPL(ufshcd_auto_hibern8_update);
 
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
#2 lore raw

Can,

Quoted 2 lines

Before access auto hibner8 timer register, make sure power and clock are properly configured to avoid unclocked register access.

Applied to 5.6/scsi-fixes, thank you!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering