UFS host controller driver patches
Subsystems (9)
Bart Van Assche
reviewerv3 cover UFS host controller driver patches
Hi Martin,
Please consider these four UFS host controller driver patches for the next merge window.
Thanks,
Bart.
Changes compared to v2:
- Changed a WARN_ON(lrbp->cmd) statement into lrbp->cmd = NULL in patch 2/4.
Changes compared to v1:
- Added a comment in patch 4/4 as requested by Adrian Hunter.
Bart Van Assche (4):
scsi: ufs: Increase the START STOP UNIT timeout from one to ten
seconds
scsi: ufs: Fix handling of lrbp->cmd
scsi: ufs: Move ufshcd_wl_shutdown()
scsi: ufs: Simplify driver shutdown
drivers/ufs/core/ufshcd.c | 67 ++++++++++----------------- drivers/ufs/host/cdns-pltfrm.c | 1 - drivers/ufs/host/tc-dwc-g210-pci.c | 10 ---- drivers/ufs/host/tc-dwc-g210-pltfrm.c | 1 - drivers/ufs/host/ufs-exynos.c | 1 - drivers/ufs/host/ufs-hisi.c | 1 - drivers/ufs/host/ufs-mediatek.c | 1 - drivers/ufs/host/ufs-qcom.c | 1 - drivers/ufs/host/ufs-sprd.c | 1 - drivers/ufs/host/ufshcd-pci.c | 10 ---- drivers/ufs/host/ufshcd-pltfrm.c | 6 --- drivers/ufs/host/ufshcd-pltfrm.h | 1 - include/ufs/ufshcd.h | 1 - 13 files changed, 25 insertions(+), 77 deletions(-)
Bart Van Assche
reviewerPATCH v3 1/4 scsi: ufs: Increase the START STOP UNIT timeout from one to ten seconds
One UFS vendor asked to increase the UFS timeout from 1 s to 3 s. Another UFS vendor asked to increase the UFS timeout from 1 s to 10 s. Hence this patch that increases the UFS timeout to 10 s. This patch can cause the total timeout to exceed 20 s, the Android shutdown timeout. This is fine since the loop around ufshcd_execute_start_stop() exists to deal with unit attentions and because unit attentions are reported quickly.
--- drivers/ufs/core/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +2 -1
@@ -9170,7 +9170,8 @@ static int ufshcd_execute_start_stop(struct scsi_device *sdev, };return scsi_execute_cmd (sdev, cdb,REQ_OP_DRV_IN ,/*buffer=*/ NULL , -/*bufflen=*/ 0 ,/*timeout=*/ HZ ,/*retries=*/ 0 , &args); +/*bufflen=*/ 0 ,/*timeout=*/ 10 *HZ ,/*retries=*/ 0 , + &args); }/**
Bart Van Assche
reviewerPATCH v3 2/4 scsi: ufs: Fix handling of lrbp->cmd
In reply to Bart Van Asscheufshcd_queuecommand() may be called two times in a row for a SCSI command before it is completed. Hence make the following changes:
- In the functions that submit a command, do not check the old value of lrbp->cmd nor clear lrbp->cmd in error paths.
- In ufshcd_release_scsi_cmd(), do not clear lrbp->cmd.
See also scsi_send_eh_cmnd().
This patch prevents that the following appears if a command times out:
WARNING: at drivers/ufs/core/ufshcd.c:2965 ufshcd_queuecommand+0x6f8/0x9a8 Call trace: ufshcd_queuecommand+0x6f8/0x9a8 scsi_send_eh_cmnd+0x2c0/0x960 scsi_eh_test_devices+0x100/0x314 scsi_eh_ready_devs+0xd90/0x114c scsi_error_handler+0x2b4/0xb70 kthread+0x16c/0x1e0
--- drivers/ufs/core/ufshcd.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/ufs/core/ufshcd.c +1 -6
@@ -2931,7 +2931,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) (hba->clk_gating.state != CLKS_ON)); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd = cmd; lrbp->task_tag = tag; lrbp->lun =ufshcd_scsi_to_upiu_lun (cmd->device->lun);
@@ -2947,7 +2946,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) err =ufshcd_map_sg (hba, lrbp);if (err) { - lrbp->cmd =NULL ;ufshcd_release (hba); goto out; }
@@ -3166,7 +3164,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,down_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); + lrbp->cmd =NULL ; err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);if (unlikely (err)) goto out;
@@ -5408,7 +5406,6 @@ static void ufshcd_release_scsi_cmd(struct ufs_hba *hba,struct scsi_cmnd *cmd = lrbp->cmd;scsi_dma_unmap (cmd); - lrbp->cmd =NULL ;/* Mark the command as completed. */ ufshcd_release (hba);ufshcd_clk_scaling_update_busy (hba); }
@@ -7023,7 +7020,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,down_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd =NULL ; lrbp->task_tag = tag; lrbp->lun =0 ;
@@ -7195,7 +7191,6 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *rdown_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd =NULL ; lrbp->task_tag = tag; lrbp->lun =UFS_UPIU_RPMB_WLUN ;
Re: [PATCH v3 2/4] scsi: ufs: Fix handling of lrbp->cmd
Quoted 19 lines · Bart Van Assche
ufshcd_queuecommand()may be called two times in a row for a SCSI command before it is completed. Hence make the following changes:
- In the functions that submit a command, do not check the old value oflrbp->cmdnor clearlrbp->cmdin error paths.
- Inufshcd_release_scsi_cmd(), do not clearlrbp->cmd.See also
scsi_send_eh_cmnd().This patch prevents that the following appears if a command times out:
WARNING: at drivers/ufs/core/ufshcd.c:2965 ufshcd_queuecommand+0x6f8/0x9a8 Call trace: ufshcd_queuecommand+0x6f8/0x9a8 scsi_send_eh_cmnd+0x2c0/0x960 scsi_eh_test_devices+0x100/0x314 scsi_eh_ready_devs+0xd90/0x114c scsi_error_handler+0x2b4/0xb70 kthread+0x16c/0x1e0
Quoted 2 lines
Fixes 5a0b0cb9bee7 ("[SCSI] ufs: Add support for sending NOP OUT UPIU")Signed-off-by Bart Van Assche <[email protected]>
Quoted 57 lines
--- drivers/ufs/core/ufshcd.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/ufs/core/ufshcd.c +1
-6@@ -2931,7 +2931,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) (hba->clk_gating.state != CLKS_ON)); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd = cmd; lrbp->task_tag = tag; lrbp->lun =ufshcd_scsi_to_upiu_lun (cmd->device->lun);@@ -2947,7 +2946,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) err =ufshcd_map_sg (hba, lrbp);if (err) { - lrbp->cmd =NULL ;ufshcd_release (hba); goto out; }@@ -3166,7 +3164,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,down_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); + lrbp->cmd =NULL ; err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);if (unlikely (err)) goto out;@@ -5408,7 +5406,6 @@ static void ufshcd_release_scsi_cmd(struct ufs_hba *hba,struct scsi_cmnd *cmd = lrbp->cmd;scsi_dma_unmap (cmd); - lrbp->cmd =NULL ;/* Mark the command as completed. */ ufshcd_release (hba);ufshcd_clk_scaling_update_busy (hba); }@@ -7023,7 +7020,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,down_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd =NULL ; lrbp->task_tag = tag; lrbp->lun =0 ;@@ -7195,7 +7191,6 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *rdown_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd =NULL ; lrbp->task_tag = tag; lrbp->lun =UFS_UPIU_RPMB_WLUN ;
Bart Van Assche
reviewerPATCH v3 3/4 scsi: ufs: Move ufshcd_wl_shutdown()
In reply to Bart Van AsscheMove the definition of ufshcd_wl_shutdown() to make the next patch in this series easier to review.
--- drivers/ufs/core/ufshcd.c | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/ufs/core/ufshcd.c +22 -22
@@ -9749,28 +9749,6 @@ static int ufshcd_wl_resume(struct device *dev) }#endif -static void ufshcd_wl_shutdown (struct device *dev) -{ -struct scsi_device *sdev =to_scsi_device (dev); -struct ufs_hba *hba; - - hba =shost_priv (sdev->host); - -down (&hba->host_sem); - hba->shutting_down = true; -up (&hba->host_sem); - -/* Turn on everything while shutting down */ -ufshcd_rpm_get_sync (hba); -scsi_device_quiesce (sdev); -shost_for_each_device (sdev, hba->host) { -if (sdev == hba->ufs_device_wlun) -continue ; -scsi_device_quiesce (sdev); - } -__ufshcd_wl_suspend (hba,UFS_SHUTDOWN_PM ); -} -/** * ufshcd_suspend - helper function for suspend operations * @hba: per adapter instance
@@ -9955,6 +9933,28 @@ int ufshcd_runtime_resume(struct device *dev)EXPORT_SYMBOL (ufshcd_runtime_resume);#endif /* CONFIG_PM */ +static void ufshcd_wl_shutdown (struct device *dev) +{ +struct scsi_device *sdev =to_scsi_device (dev); +struct ufs_hba *hba; + + hba =shost_priv (sdev->host); + +down (&hba->host_sem); + hba->shutting_down = true; +up (&hba->host_sem); + +/* Turn on everything while shutting down */ +ufshcd_rpm_get_sync (hba); +scsi_device_quiesce (sdev); +shost_for_each_device (sdev, hba->host) { +if (sdev == hba->ufs_device_wlun) +continue ; +scsi_device_quiesce (sdev); + } +__ufshcd_wl_suspend (hba,UFS_SHUTDOWN_PM ); +} +/** * ufshcd_shutdown - shutdown routine * @hba: per adapter instance
Bart Van Assche
reviewerPATCH v3 4/4 scsi: ufs: Simplify driver shutdown
In reply to Bart Van AsscheAll UFS host drivers call ufshcd_shutdown(). Hence, instead of calling ufshcd_shutdown() from the host driver .shutdown() callback, inline that function into ufshcd_wl_shutdown().
--- drivers/ufs/core/ufshcd.c | 23 +++++------------------ drivers/ufs/host/cdns-pltfrm.c | 1 - drivers/ufs/host/tc-dwc-g210-pci.c | 10 ---------- drivers/ufs/host/tc-dwc-g210-pltfrm.c | 1 - drivers/ufs/host/ufs-exynos.c | 1 - drivers/ufs/host/ufs-hisi.c | 1 - drivers/ufs/host/ufs-mediatek.c | 1 - drivers/ufs/host/ufs-qcom.c | 1 - drivers/ufs/host/ufs-sprd.c | 1 - drivers/ufs/host/ufshcd-pci.c | 10 ---------- drivers/ufs/host/ufshcd-pltfrm.c | 6 ------ drivers/ufs/host/ufshcd-pltfrm.h | 1 - include/ufs/ufshcd.h | 1 - 13 files changed, 5 insertions(+), 53 deletions(-)
drivers/ufs/core/ufshcd.c +5 -18
@@ -9936,9 +9936,7 @@ EXPORT_SYMBOL(ufshcd_runtime_resume);static void ufshcd_wl_shutdown (struct device *dev) {struct scsi_device *sdev =to_scsi_device (dev); -struct ufs_hba *hba; - - hba =shost_priv (sdev->host); +struct ufs_hba *hba =shost_priv (sdev->host);down (&hba->host_sem); hba->shutting_down = true;
@@ -9953,27 +9951,16 @@ static void ufshcd_wl_shutdown(struct device *dev)scsi_device_quiesce (sdev); }__ufshcd_wl_suspend (hba,UFS_SHUTDOWN_PM ); -} -/** -* ufshcd_shutdown - shutdown routine -* @hba: per adapter instance -* -* This function would turn off both UFS device and UFS hba -* regulators. It would also disable clocks. -* -* Returns 0 always to allow force shutdown even in case of errors. -*/ -int ufshcd_shutdown (struct ufs_hba *hba) -{ +/* +* Next, turn off the UFS controller and the UFS regulators. Disable +* clocks. +*/ if (ufshcd_is_ufs_dev_poweroff (hba) &&ufshcd_is_link_off (hba))ufshcd_suspend (hba); hba->is_powered = false; -/* allow force shutdown even in case of errors */ -return 0 ; } -EXPORT_SYMBOL (ufshcd_shutdown);/** * ufshcd_remove - de-allocate SCSI host and host memory space
drivers/ufs/host/cdns-pltfrm.c +0 -1
@@ -328,7 +328,6 @@ static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {static struct platform_driver cdns_ufs_pltfrm_driver = { .probe = cdns_ufs_pltfrm_probe, .remove = cdns_ufs_pltfrm_remove, - .shutdown = ufshcd_pltfrm_shutdown, .driver = { .name ="cdns-ufshcd" , .pm = &cdns_ufs_dev_pm_ops,
drivers/ufs/host/tc-dwc-g210-pci.c +0 -10
@@ -32,15 +32,6 @@ static struct ufs_hba_variant_ops tc_dwc_g210_pci_hba_vops = { .link_startup_notify = ufshcd_dwc_link_startup_notify, }; -/** -* tc_dwc_g210_pci_shutdown - main function to put the controller in reset state -* @pdev: pointer to PCI device handle -*/ -static void tc_dwc_g210_pci_shutdown (struct pci_dev *pdev) -{ -ufshcd_shutdown ((struct ufs_hba *)pci_get_drvdata (pdev)); -} -/** * tc_dwc_g210_pci_remove - de-allocate PCI/SCSI host and host memory space * data structure memory
@@ -137,7 +128,6 @@ static struct pci_driver tc_dwc_g210_pci_driver = { .id_table = tc_dwc_g210_pci_tbl, .probe = tc_dwc_g210_pci_probe, .remove = tc_dwc_g210_pci_remove, - .shutdown = tc_dwc_g210_pci_shutdown, .driver = { .pm = &tc_dwc_g210_pci_pm_ops },
drivers/ufs/host/tc-dwc-g210-pltfrm.c +0 -1
@@ -92,7 +92,6 @@ static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {static struct platform_driver tc_dwc_g210_pltfm_driver = { .probe = tc_dwc_g210_pltfm_probe, .remove = tc_dwc_g210_pltfm_remove, - .shutdown = ufshcd_pltfrm_shutdown, .driver = { .name ="tc-dwc-g210-pltfm" , .pm = &tc_dwc_g210_pltfm_pm_ops,
drivers/ufs/host/ufs-exynos.c +0 -1
@@ -1757,7 +1757,6 @@ static const struct dev_pm_ops exynos_ufs_pm_ops = {static struct platform_driver exynos_ufs_pltform = { .probe = exynos_ufs_probe, .remove = exynos_ufs_remove, - .shutdown = ufshcd_pltfrm_shutdown, .driver = { .name ="exynos-ufshc" , .pm = &exynos_ufs_pm_ops,
drivers/ufs/host/ufs-hisi.c +0 -1
@@ -593,7 +593,6 @@ static const struct dev_pm_ops ufs_hisi_pm_ops = {static struct platform_driver ufs_hisi_pltform = { .probe = ufs_hisi_probe, .remove = ufs_hisi_remove, - .shutdown = ufshcd_pltfrm_shutdown, .driver = { .name ="ufshcd-hisi" , .pm = &ufs_hisi_pm_ops,
drivers/ufs/host/ufs-mediatek.c +0 -1
@@ -1647,7 +1647,6 @@ static const struct dev_pm_ops ufs_mtk_pm_ops = {static struct platform_driver ufs_mtk_pltform = { .probe = ufs_mtk_probe, .remove = ufs_mtk_remove, - .shutdown = ufshcd_pltfrm_shutdown, .driver = { .name ="ufshcd-mtk" , .pm = &ufs_mtk_pm_ops,
drivers/ufs/host/ufs-qcom.c +0 -1
@@ -1723,7 +1723,6 @@ static const struct dev_pm_ops ufs_qcom_pm_ops = {static struct platform_driver ufs_qcom_pltform = { .probe = ufs_qcom_probe, .remove = ufs_qcom_remove, - .shutdown = ufshcd_pltfrm_shutdown, .driver = { .name ="ufshcd-qcom" , .pm = &ufs_qcom_pm_ops,
drivers/ufs/host/ufs-sprd.c +0 -1
@@ -444,7 +444,6 @@ static const struct dev_pm_ops ufs_sprd_pm_ops = {static struct platform_driver ufs_sprd_pltform = { .probe = ufs_sprd_probe, .remove = ufs_sprd_remove, - .shutdown = ufshcd_pltfrm_shutdown, .driver = { .name ="ufshcd-sprd" , .pm = &ufs_sprd_pm_ops,
drivers/ufs/host/ufshcd-pci.c +0 -10
@@ -504,15 +504,6 @@ static int ufshcd_pci_restore(struct device *dev) }#endif -/** -* ufshcd_pci_shutdown - main function to put the controller in reset state -* @pdev: pointer to PCI device handle -*/ -static void ufshcd_pci_shutdown (struct pci_dev *pdev) -{ -ufshcd_shutdown ((struct ufs_hba *)pci_get_drvdata (pdev)); -} -/** * ufshcd_pci_remove - de-allocate PCI/SCSI host and host memory space * data structure memory
@@ -618,7 +609,6 @@ static struct pci_driver ufshcd_pci_driver = { .id_table = ufshcd_pci_tbl, .probe = ufshcd_pci_probe, .remove = ufshcd_pci_remove, - .shutdown = ufshcd_pci_shutdown, .driver = { .pm = &ufshcd_pci_pm_ops },
drivers/ufs/host/ufshcd-pltfrm.c +0 -6
@@ -190,12 +190,6 @@ static int ufshcd_parse_regulator_info(struct ufs_hba *hba)return err; } -void ufshcd_pltfrm_shutdown (struct platform_device *pdev) -{ -ufshcd_shutdown ((struct ufs_hba *)platform_get_drvdata (pdev)); -} -EXPORT_SYMBOL_GPL (ufshcd_pltfrm_shutdown); -static void ufshcd_init_lanes_per_dir (struct ufs_hba *hba) {struct device *dev = hba->dev;
drivers/ufs/host/ufshcd-pltfrm.h +0 -1
@@ -31,7 +31,6 @@ int ufshcd_get_pwr_dev_param(const struct ufs_dev_params *dev_param,void ufshcd_init_pwr_dev_param (struct ufs_dev_params *dev_param);int ufshcd_pltfrm_init (struct platform_device *pdev,const struct ufs_hba_variant_ops *vops); -void ufshcd_pltfrm_shutdown (struct platform_device *pdev);int ufshcd_populate_vreg (struct device *dev,const char *name,struct ufs_vreg **out_vreg);
include/ufs/ufshcd.h +0 -1
@@ -1277,7 +1277,6 @@ extern int ufshcd_system_freeze(struct device *dev);extern int ufshcd_system_thaw (struct device *dev);extern int ufshcd_system_restore (struct device *dev);#endif -extern int ufshcd_shutdown (struct ufs_hba *hba); extern int ufshcd_dme_configure_adapt(struct ufs_hba *hba, int agreed_gear,
Martin K. Petersen
AppliedBart,
Quoted 2 lines
Please consider these four UFS host controller driver patches for the next merge window.
Applied to 6.5/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 8 lines · Bart Van Assche
Please consider these four UFS host controller driver patches for the next merge window.
Thanks,
Bart.
[...]
Applied to 6.5/scsi-queue, thanks!
[1/4] scsi: ufs: Increase the START STOP UNIT timeout from one to ten seconds
https://git.kernel.org/mkp/scsi/c/fe8637f7708c [2/4] scsi: ufs: Fix handling of lrbp->cmd https://git.kernel.org/mkp/scsi/c/549e91a9bbaa [3/4] scsi: ufs: Move ufshcd_wl_shutdown() https://git.kernel.org/mkp/scsi/c/b251f6c5fe3b [4/4] scsi: ufs: Simplify driver shutdown https://git.kernel.org/mkp/scsi/c/0818a6903c80
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering