On 9/5/2024 3:01 PM, Bart Van Assche wrote:
Move the ufshcd_device_init() call to the ufshcd_probe_hba() callers and
remove the 'init_dev_params' argument of ufshcd_probe_hba(). This change
refactors the code without modifying the behavior of the UFSHCI driver.
This change prepares for moving one ufshcd_device_init() call into
ufshcd_init().
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
drivers/ufs/core/ufshcd.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index e2137bcf3de7..6e3cffcdf9a6 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -298,7 +298,8 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba);
static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd);
static int ufshcd_clear_tm_cmd(struct ufs_hba *hba, int tag);
static void ufshcd_hba_exit(struct ufs_hba *hba);
-static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params);
+static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params);
+static int ufshcd_probe_hba(struct ufs_hba *hba);
static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);
static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
@@ -7693,8 +7694,11 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba)
err = ufshcd_hba_enable(hba);
/* Establish the link again and restore the device */
- if (!err)
- err = ufshcd_probe_hba(hba, false);
In the original code, if ufshcd_probe_hba()->ufshcd_device_init() fails,
the hba->ufshcd_state is updated to UFSHCD_STATE_ERROR;
+ if (!err) {
+ err = ufshcd_device_init(hba, /*init_dev_params=*/false);
Calling ufshcd_device_init() here changes the behavior of the code
slightly. If the ufshcd_device_init() fails, it exits without updating
the hba->ufshcd_state to UFSHCD_STATE_ERROR.
+ if (!err)
+ err = ufshcd_probe_hba(hba);
+ }
if (err)
dev_err(hba->dev, "%s: Host init failed %d\n", __func__, err);
@@ -8830,21 +8834,16 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params)
/**
* ufshcd_probe_hba - probe hba to detect device and initialize it
* @hba: per-adapter instance
- * @init_dev_params: whether or not to call ufshcd_device_params_init().
*
* Execute link-startup and verify device initialization
*
* Return: 0 upon success; < 0 upon failure.
*/
-static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params)
+static int ufshcd_probe_hba(struct ufs_hba *hba)
{
ktime_t start = ktime_get();
unsigned long flags;
- int ret;
-
- ret = ufshcd_device_init(hba, init_dev_params);
- if (ret)
- goto out;
+ int ret = 0;
if (!hba->pm_op_in_progress &&
(hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH)) {
@@ -8862,7 +8861,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params)
}
/* Reinit the device */
- ret = ufshcd_device_init(hba, init_dev_params);
+ ret = ufshcd_device_init(hba, /*init_dev_params=*/false);
Originally, the ufshcd_async_scan()->ufshcd_probe_hba() has the
init_dev_params = true. However the init_dev_params is updated to false
here for the ufshcd_async_scan()->ufshcd_probe_hba() path.
if (ret)
goto out;
}
@@ -8910,7 +8909,9 @@ static void ufshcd_async_scan(void *data, async_cookie_t cookie)
down(&hba->host_sem);
/* Initialize hba, detect and initialize UFS device */
- ret = ufshcd_probe_hba(hba, true);
+ ret = ufshcd_device_init(hba, /*init_dev_params=*/true);
Same issue as mentioned earlier. If ufshcd_device_init() fails here, the
hba->ufshcd_state is not updated to UFSHCD_STATE_ERROR. Compared to the
original ufshcd_probe_hba()->ufshcd_device_init() failure would update
hba->ufshcd_state.
Thanks, Bao
+ if (ret == 0)
+ ret = ufshcd_probe_hba(hba);
up(&hba->host_sem);
if (ret)
goto out;
