Commit bdf5c0bb authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: core: 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.

Suggested-by: default avatarBao D. Nguyen <quic_nguyenb@quicinc.com>
Reviewed-by: default avatarBao D. Nguyen <quic_nguyenb@quicinc.com>
Reviewed-by: default avatarCan Guo <quic_cang@quicinc.com>
Cc: Avri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20231214192416.3638077-2-bvanassche@acm.org


Reviewed-by: default avatarPeter Wang <peter.wang@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 26cdd694

drivers/ufs/core/ufshcd.c

+11 −13
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);