Simplify the auto-hibernation configuration code
Subsystems (2)
Bart Van Assche
reviewercover Simplify the auto-hibernation configuration code
Hi Martin,
The two patches in this series simplify the code for configuring auto-hibernation. Please consider these two patches for the next merge window.
Thanks,
Bart.
Bart Van Assche (2):
scsi: ufs: Rename ufshcd_auto_hibern8_enable() and make it static
scsi: ufs: Simplify ufshcd_auto_hibern8_update()
drivers/ufs/core/ufshcd.c | 40 +++++++++++++++------------------------ include/ufs/ufshcd.h | 1 - 2 files changed, 15 insertions(+), 26 deletions(-)
Bart Van Assche
reviewerPATCH 1/2 scsi: ufs: Rename ufshcd_auto_hibern8_enable() and make it static
Rename ufshcd_auto_hibern8_enable() into ufshcd_configure_auto_hibern8() since this function can enable or disable auto-hibernation. Since ufshcd_auto_hibern8_enable() is only used inside the UFSHCI driver core, declare it static. Additionally, move the definition of this function to just before its first caller.
--- drivers/ufs/core/ufshcd.c | 24 +++++++++++------------- include/ufs/ufshcd.h | 1 - 2 files changed, 11 insertions(+), 14 deletions(-)
drivers/ufs/core/ufshcd.c +11 -13
@@ -4413,6 +4413,14 @@ int ufshcd_uic_hibern8_exit(struct ufs_hba *hba) }EXPORT_SYMBOL_GPL (ufshcd_uic_hibern8_exit); +static void ufshcd_configure_auto_hibern8 (struct ufs_hba *hba) +{ +if (!ufshcd_is_auto_hibern8_supported (hba)) +return ; + +ufshcd_writel (hba, hba->ahit,REG_AUTO_HIBERNATE_IDLE_TIMER ); +} +void ufshcd_auto_hibern8_update (struct ufs_hba *hba,u32 ahit) {unsigned long flags;
@@ -4432,21 +4440,13 @@ void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit) !pm_runtime_suspended(&hba->ufs_device_wlun->sdev_gendev)) {ufshcd_rpm_get_sync (hba);ufshcd_hold (hba); -ufshcd_auto_hibern8_enable (hba); +ufshcd_configure_auto_hibern8 (hba);ufshcd_release (hba);ufshcd_rpm_put_sync (hba); } }EXPORT_SYMBOL_GPL (ufshcd_auto_hibern8_update); -void ufshcd_auto_hibern8_enable (struct ufs_hba *hba) -{ -if (!ufshcd_is_auto_hibern8_supported (hba)) -return ; - -ufshcd_writel (hba, hba->ahit,REG_AUTO_HIBERNATE_IDLE_TIMER ); -} -/** * ufshcd_init_pwr_info - setting the POR (power on reset) * values in hba power info
@@ -8953,8 +8953,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params)if (hba->ee_usr_mask)ufshcd_write_ee_control (hba); -/* Enable Auto-Hibernate if configured */ -ufshcd_auto_hibern8_enable (hba); +ufshcd_configure_auto_hibern8 (hba); out:spin_lock_irqsave (hba->host->host_lock, flags);
@@ -9956,8 +9955,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)cancel_delayed_work (&hba->rpm_dev_flush_recheck_work); } -/* Enable Auto-Hibernate if configured */ -ufshcd_auto_hibern8_enable (hba); +ufshcd_configure_auto_hibern8 (hba); goto out;
include/ufs/ufshcd.h +0 -1
@@ -1371,7 +1371,6 @@ static inline int ufshcd_disable_host_tx_lcc(struct ufs_hba *hba)return ufshcd_dme_set (hba,UIC_ARG_MIB (PA_LOCAL_TX_LCC_ENABLE ),0 ); } -void ufshcd_auto_hibern8_enable (struct ufs_hba *hba);void ufshcd_auto_hibern8_update (struct ufs_hba *hba,u32 ahit);void ufshcd_fixup_dev_quirks (struct ufs_hba *hba,const struct ufs_dev_quirk *fixups);
Re: [PATCH 1/2] scsi: ufs: Rename ufshcd_auto_hibern8_enable() and make it static
Quoted 11 lines · Bart Van Assche
External email : Please do not click links or open attachments until you have verified the sender or the content.
Renameufshcd_auto_hibern8_enable()intoufshcd_configure_auto_hibern8()
since this function can enable or disable auto-hibernation. Sinceufshcd_auto_hibern8_enable()is only used inside the UFSHCI driver core,
declare it static. Additionally, move the definition of this function to
just before its first caller.
Bart Van Assche
reviewerPATCH 2/2 scsi: ufs: Simplify ufshcd_auto_hibern8_update()
In reply to Bart Van AsscheCalls to ufshcd_auto_hibern8_update() are already serialized: this function is either called if user space software is not running (preparing to suspend) or from a single sysfs store callback function. Kernfs serializes sysfs .store() callbacks. No functionality is changed.
--- drivers/ufs/core/ufshcd.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/ufs/core/ufshcd.c +4 -12
@@ -4423,21 +4423,13 @@ static void ufshcd_configure_auto_hibern8(struct ufs_hba *hba)void ufshcd_auto_hibern8_update (struct ufs_hba *hba,u32 ahit) { -unsigned long flags; -bool update = false; +const u32 cur_ahit =READ_ONCE (hba->ahit); -if (!ufshcd_is_auto_hibern8_supported (hba)) +if (!ufshcd_is_auto_hibern8_supported (hba) || cur_ahit == ahit)return ; -spin_lock_irqsave (hba->host->host_lock, flags); -if (hba->ahit != ahit) { - hba->ahit = ahit; - update = true; - } -spin_unlock_irqrestore (hba->host->host_lock, flags); - -if (update && - !pm_runtime_suspended (&hba->ufs_device_wlun->sdev_gendev)) { +WRITE_ONCE (hba->ahit, ahit); +if (!pm_runtime_suspended (&hba->ufs_device_wlun->sdev_gendev)) {ufshcd_rpm_get_sync (hba);ufshcd_hold (hba);ufshcd_configure_auto_hibern8 (hba);
Martin K. Petersen
AppliedBart,
Quoted 3 lines
The two patches in this series simplify the code for configuring auto-hibernation. Please consider these two patches for the next merge window.
Applied to 6.8/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering