Skip to contentSkip to conversation

scsi: ufs: remove ufshcd_hold asynchronously

PATCH New Jaegeuk Kim 1 participant 1 message Apr 15, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ufs: remove ufshcd_hold asynchronously

If ufshcd_hold() returns EAGAIN during queuecommand, scsi will get an error and resubmit the request along with other commands. This can increase the chance of reording write IOs, even it's sequential.

---
 drivers/ufs/core/ufs-sysfs.c     |  2 +-
 drivers/ufs/core/ufshcd-crypto.c |  2 +-
 drivers/ufs/core/ufshcd-priv.h   |  2 +-
 drivers/ufs/core/ufshcd.c        | 63 +++++++++++---------------------
 include/ufs/ufshcd.h             |  2 +-
 5 files changed, 26 insertions(+), 45 deletions(-)
drivers/ufs/core/ufs-sysfs.c +1 -1
index 883f0e44b54e..cdf3d5f2b77b 100644
@@ -168,7 +168,7 @@ static ssize_t auto_hibern8_show(struct device *dev,
 	}
 
 	pm_runtime_get_sync(hba->dev);
-	ufshcd_hold(hba, false);
+	ufshcd_hold(hba);
 	ahit = ufshcd_readl(hba, REG_AUTO_HIBERNATE_IDLE_TIMER);
 	ufshcd_release(hba);
 	pm_runtime_put_sync(hba->dev);
drivers/ufs/core/ufshcd-crypto.c +1 -1
index 198360fe5e8e..f2c4422cab86 100644
@@ -24,7 +24,7 @@ static int ufshcd_program_key(struct ufs_hba *hba,
 	u32 slot_offset = hba->crypto_cfg_register + slot * sizeof(*cfg);
 	int err = 0;
 
-	ufshcd_hold(hba, false);
+	ufshcd_hold(hba);
 
 	if (hba->vops && hba->vops->program_key) {
 		err = hba->vops->program_key(hba, cfg, slot);
drivers/ufs/core/ufshcd-priv.h +1 -1
index 529f8507a5e4..73c5d98f4387 100644
@@ -84,7 +84,7 @@ unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,
 int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
 			    u8 **buf, bool ascii);
 
-int ufshcd_hold(struct ufs_hba *hba, bool async);
+void ufshcd_hold(struct ufs_hba *hba);
 void ufshcd_release(struct ufs_hba *hba);
 
 int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd);
drivers/ufs/core/ufshcd.c +22 -41

211 lines not on this page · raw message

include/ufs/ufshcd.h +1 -1
index 25aab8ec4f86..673729cf5697 100644
@@ -1364,7 +1364,7 @@ void ufshcd_fixup_dev_quirks(struct ufs_hba *hba,
 int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
 			    u8 **buf, bool ascii);
 
-int ufshcd_hold(struct ufs_hba *hba, bool async);
+void ufshcd_hold(struct ufs_hba *hba);
 void ufshcd_release(struct ufs_hba *hba);
 
 void ufshcd_clkgate_delay_set(struct device *dev, unsigned long value);
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog