| Message ID | 20240910215139.3352387-6-bvanassche@acm.org |
|---|---|
| State | New |
| Headers | show |
| Series | Combine the UFS driver scsi_add_host() calls | expand |
On 9/10/2024 2:50 PM, Bart Van Assche wrote: > Move the ufshcd_device_init() and ufshcd_process_device_init_result() calls > to the ufshcd_probe_hba() callers. 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@acm.org> > --- > drivers/ufs/core/ufshcd.c | 31 ++++++++++++++++++------------- > 1 file changed, 18 insertions(+), 13 deletions(-) > > diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c > index 1094c1ba2212..f62d257a92da 100644 > --- a/drivers/ufs/core/ufshcd.c > +++ b/drivers/ufs/core/ufshcd.c > @@ -298,6 +298,7 @@ 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_device_init(struct ufs_hba *hba, bool init_dev_params); > static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params); > static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on); > static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba); > @@ -7716,8 +7717,14 @@ 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); > + if (!err) { > + ktime_t device_init_start = ktime_get(); > + > + err = ufshcd_device_init(hba, /*init_dev_params=*/false); > + if (!err) > + err = ufshcd_probe_hba(hba, false); > + ufshcd_process_device_init_result(hba, device_init_start, err); Hi Bart, IMO the function name ufshcd_process_device_init_result() is not correctly describing the original code. As you can see, the "ret" passed into the function here is from the result of the ufshcd_probe_hba(), not the result of the ufshcd_device_init(). Same comment for the name device_init_start. Originally, it is the time spent in the ufshcd_probe_hba(). > + } > > if (err) > dev_err(hba->dev, "%s: Host init failed %d\n", __func__, err); > @@ -8849,13 +8856,8 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) > */ > static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) > { > - ktime_t start = ktime_get(); > int ret; > > - ret = ufshcd_device_init(hba, init_dev_params); > - if (ret) > - goto out; > - > if (!hba->pm_op_in_progress && > (hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH)) { > /* Reset the device and controller before doing reinit */ > @@ -8868,13 +8870,13 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) > dev_err(hba->dev, "Host controller enable failed\n"); > ufshcd_print_evt_hist(hba); > ufshcd_print_host_state(hba); > - goto out; > + return ret; > } > > /* Reinit the device */ > ret = ufshcd_device_init(hba, init_dev_params); > if (ret) > - goto out; > + return ret; > } > > ufshcd_print_pwr_info(hba); > @@ -8894,9 +8896,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) > ufshcd_write_ee_control(hba); > ufshcd_configure_auto_hibern8(hba); > > -out: > - ufshcd_process_device_init_result(hba, start, ret); > - return ret; > + return 0; > } > > /** > @@ -8907,11 +8907,16 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) > static void ufshcd_async_scan(void *data, async_cookie_t cookie) > { > struct ufs_hba *hba = (struct ufs_hba *)data; > + ktime_t device_init_start; > int ret; > > down(&hba->host_sem); > /* Initialize hba, detect and initialize UFS device */ > - ret = ufshcd_probe_hba(hba, true); > + device_init_start = ktime_get(); > + ret = ufshcd_device_init(hba, /*init_dev_params=*/true); > + if (ret == 0) > + ret = ufshcd_probe_hba(hba, true); > + ufshcd_process_device_init_result(hba, device_init_start, ret); Same comment about the function name. The "ret" here is the result of ufshcd_probe_hba(). > up(&hba->host_sem); > if (ret) > goto out; >
On 9/12/24 9:38 PM, Bao D. Nguyen wrote: > Hi Bart, IMO the function name ufshcd_process_device_init_result() is > not correctly describing the original code. As you can see, the "ret" > passed into the function here is from the result of the > ufshcd_probe_hba(), not the result of the ufshcd_device_init(). I will rename that function into ufshcd_process_probe_result(). Thanks, Bart.
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 1094c1ba2212..f62d257a92da 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -298,6 +298,7 @@ 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_device_init(struct ufs_hba *hba, bool init_dev_params); static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params); static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on); static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba); @@ -7716,8 +7717,14 @@ 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); + if (!err) { + ktime_t device_init_start = ktime_get(); + + err = ufshcd_device_init(hba, /*init_dev_params=*/false); + if (!err) + err = ufshcd_probe_hba(hba, false); + ufshcd_process_device_init_result(hba, device_init_start, err); + } if (err) dev_err(hba->dev, "%s: Host init failed %d\n", __func__, err); @@ -8849,13 +8856,8 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) */ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) { - ktime_t start = ktime_get(); int ret; - ret = ufshcd_device_init(hba, init_dev_params); - if (ret) - goto out; - if (!hba->pm_op_in_progress && (hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH)) { /* Reset the device and controller before doing reinit */ @@ -8868,13 +8870,13 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) dev_err(hba->dev, "Host controller enable failed\n"); ufshcd_print_evt_hist(hba); ufshcd_print_host_state(hba); - goto out; + return ret; } /* Reinit the device */ ret = ufshcd_device_init(hba, init_dev_params); if (ret) - goto out; + return ret; } ufshcd_print_pwr_info(hba); @@ -8894,9 +8896,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) ufshcd_write_ee_control(hba); ufshcd_configure_auto_hibern8(hba); -out: - ufshcd_process_device_init_result(hba, start, ret); - return ret; + return 0; } /** @@ -8907,11 +8907,16 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) static void ufshcd_async_scan(void *data, async_cookie_t cookie) { struct ufs_hba *hba = (struct ufs_hba *)data; + ktime_t device_init_start; int ret; down(&hba->host_sem); /* Initialize hba, detect and initialize UFS device */ - ret = ufshcd_probe_hba(hba, true); + device_init_start = ktime_get(); + ret = ufshcd_device_init(hba, /*init_dev_params=*/true); + if (ret == 0) + ret = ufshcd_probe_hba(hba, true); + ufshcd_process_device_init_result(hba, device_init_start, ret); up(&hba->host_sem); if (ret) goto out;
Move the ufshcd_device_init() and ufshcd_process_device_init_result() calls to the ufshcd_probe_hba() callers. 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@acm.org> --- drivers/ufs/core/ufshcd.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)