UFS driver general fixes bundle 4
Subsystems (2)
v4 cover UFS driver general fixes bundle 4
This bundle includes 8 general fixes for UFS driver.
Changes since v3:
- Fixed patch #8
Changes since v2:
- Move the ref clk gating wait delay to ufs-qcom.c
- Added one more change to select INITIAL adapt for HS G4
Changes since v1:
- Fixed minor typo
Asutosh Das (1):
scsi: ufs: set load before setting voltage in regulators
Can Guo (6):
scsi: ufs: Remove the check before call setup clock notify vops
scsi: ufs-qcom: Adjust bus bandwidth voting and unvoting
scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
scsi: ufs: Add dev ref clock gating wait time support
scsi: ufs-qcom: Delay specific time before gate ref clk
scsi: ufs: Select INITIAL adapt for HS Gear4
Sayali Lokhande (1):
scsi: ufs: Flush exception event before suspend
drivers/scsi/ufs/ufs-qcom.c | 70 ++++++++++++++++++-------- drivers/scsi/ufs/ufs.h | 3 ++ drivers/scsi/ufs/ufshcd.c | 117 +++++++++++++++++++++++++++++++++----------- drivers/scsi/ufs/ufshci.h | 1 + drivers/scsi/ufs/unipro.h | 7 +++ 5 files changed, 148 insertions(+), 50 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 1/8 scsi: ufs: Flush exception event before suspend
From: Sayali Lokhande <[email protected]>
Exception event can be raised by the device when system suspend is in progress. This will result in unclocked register access in exception event handler as clocks will be turned off during suspend. This change makes sure to flush exception event handler work in suspend before disabling clocks to avoid unclocked register access issue.
--- drivers/scsi/ufs/ufshcd.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +18 -3
@@ -4760,8 +4760,15 @@ static void ufshcd_slave_destroy(struct scsi_device *sdev)* UFS device needs urgent BKOPs. */ if (!hba->pm_op_in_progress && -ufshcd_is_exception_event (lrbp->ucd_rsp_ptr)) -schedule_work (&hba->eeh_work); +ufshcd_is_exception_event (lrbp->ucd_rsp_ptr)) { +/* +* Prevent suspend once eeh_work is scheduled +* to avoid deadlock between ufshcd_suspend +* and exception event handler. +*/ +if (schedule_work (&hba->eeh_work)) +pm_runtime_get_noresume (hba->dev); + }break ;case UPIU_TRANSACTION_REJECT_UPIU :/* TODO: handle Reject UPIU Response */
@@ -5215,7 +5222,14 @@ static void ufshcd_exception_event_handler(struct work_struct *work) out:scsi_unblock_requests (hba->host); -pm_runtime_put_sync (hba->dev); +/* +* pm_runtime_get_noresume is called while scheduling +* eeh_work to avoid suspend racing with exception work. +* Hence decrement usage counter using pm_runtime_put_noidle +* to allow suspend on completion of exception event handler. +*/ +pm_runtime_put_noidle (hba->dev); +pm_runtime_put (hba->dev);return ; }
@@ -7901,6 +7915,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) goto enable_gating; } +flush_work (&hba->eeh_work); ret =ufshcd_link_state_transition (hba, req_link_state,1 );if (ret) goto set_dev_active;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
RE: [EXT] [PATCH v4 1/8] scsi: ufs: Flush exception event before suspend
Hi, Can
Quoted 8 lines
/* TODO: handle Reject UPIU Response */ @@ -5215,7
+5222,14 @@ static voidufshcd_exception_event_handler(struct work_struct *work)out:
drivers/scsi/ufs/ufshcd.c +0
-1scsi_unblock_requests (hba->host); -pm_runtime_put_sync (hba->dev);
drivers/scsi/ufs/ufshcd.c static void ufshcd_exception_event_handler(struct work_struct *work) · line 5234
Quoted 10 lines
drivers/scsi/ufs/ufshcd.c +8
-0+/* +* pm_runtime_get_noresume is called while scheduling +* eeh_work to avoid suspend racing with exception work. +* Hence decrement usage counter using pm_runtime_put_noidle +* to allow suspend on completion of exception event handler. +*/ +pm_runtime_put_noidle (hba->dev); +pm_runtime_put (hba->dev);return ; }
Rebased this patch.
Thanks,
//Bean
Re: [PATCH v4 1/8] scsi: ufs: Flush exception event before suspend
In reply to Can GuoQuoted 9 lines · Can Guo
drivers/scsi/ufs/ufshcd.c +0
-1@@ -4760,8 +4760,15 @@ static void ufshcd_slave_destroy(struct scsi_device *sdev)* UFS device needs urgent BKOPs. */ if (!hba->pm_op_in_progress && -ufshcd_is_exception_event (lrbp->ucd_rsp_ptr))
drivers/scsi/ufs/ufshcd.c static void ufshcd_slave_destroy(struct scsi_device *sdev) · line 4771
Quoted 10 lines
drivers/scsi/ufs/ufshcd.c +9
-1-schedule_work (&hba->eeh_work); + ufshcd_is_exception_event(lrbp->ucd_rsp_ptr)) { +/* +* Prevent suspend once eeh_work is scheduled +* to avoid deadlock between ufshcd_suspend +* and exception event handler. +*/ +if (schedule_work (&hba->eeh_work)) +pm_runtime_get_noresume (hba->dev); + }
Please combine the two logical tests with "&&" instead of nesting two if-statements inside each other.
Quoted 20 lines
drivers/scsi/ufs/ufshcd.c +8
-1break ;case UPIU_TRANSACTION_REJECT_UPIU :/* TODO: handle Reject UPIU Response */ @@ -5215,7 +5222,14 @@ static void ufshcd_exception_event_handler(struct work_struct *work) out:scsi_unblock_requests (hba->host); -pm_runtime_put_sync (hba->dev); +/* +* pm_runtime_get_noresume is called while scheduling +* eeh_work to avoid suspend racing with exception work. +* Hence decrement usage counter using pm_runtime_put_noidle +* to allow suspend on completion of exception event handler. +*/ +pm_runtime_put_noidle (hba->dev); +pm_runtime_put (hba->dev);return ; }
drivers/scsi/ufs/ufshcd.c static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) · line 7921
Quoted 7 lines
drivers/scsi/ufs/ufshcd.c +1
-0@@ -7901,6 +7915,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) goto enable_gating; } +flush_work (&hba->eeh_work); ret =ufshcd_link_state_transition (hba, req_link_state,1 );if (ret) goto set_dev_active;
I think this patch introduces a new race condition, namely the following:
- ufshcd_slave_destroy() tests pm_op_in_progress and reads the value zero from that variable.
- ufshcd_suspend() sets hba->pm_op_in_progress to one.
- ufshcd_slave_destroy() calls schedule_work().
How about fixing this race condition by calling pm_runtime_get_noresume() before checking pm_op_in_progress and by reallowing resume if no work is scheduled?
Thanks,
Bart.
Re: [PATCH v4 1/8] scsi: ufs: Flush exception event before suspend
Quoted 61 lines · Bart Van Assche
Quoted 10 lines · Can Guo
drivers/scsi/ufs/ufshcd.c +0
-1@@ -4760,8 +4760,15 @@ static void ufshcd_slave_destroy(structscsi_device *sdev) * UFS device needs urgent BKOPs. */ if (!hba->pm_op_in_progress && -ufshcd_is_exception_event (lrbp->ucd_rsp_ptr))drivers/scsi/ufs/ufshcd.c static void ufshcd_slave_destroy(struct · line 4772
Quoted 10 lines
drivers/scsi/ufs/ufshcd.c +9
-1-schedule_work (&hba->eeh_work); + ufshcd_is_exception_event(lrbp->ucd_rsp_ptr)) { +/* +* Prevent suspend once eeh_work is scheduled +* to avoid deadlock between ufshcd_suspend +* and exception event handler. +*/ +if (schedule_work (&hba->eeh_work)) +pm_runtime_get_noresume (hba->dev); + }Please combine the two logical tests with "&&" instead of nesting two if-statements inside each other.
Quoted 28 lines
drivers/scsi/ufs/ufshcd.c +0
-0break ;case UPIU_TRANSACTION_REJECT_UPIU :drivers/scsi/ufs/ufshcd.c +9
-1/* TODO: handle Reject UPIU Response */ @@ -5215,7 +5222,14 @@ static void ufshcd_exception_event_handler(struct work_struct *work) out: scsi_unblock_requests(hba->host); -pm_runtime_put_sync (hba->dev); +/* +* pm_runtime_get_noresume is called while scheduling +* eeh_work to avoid suspend racing with exception work. +* Hence decrement usage counter using pm_runtime_put_noidle +* to allow suspend on completion of exception event handler. +*/ +pm_runtime_put_noidle (hba->dev); +pm_runtime_put (hba->dev);return ; }@@ -7901,6 +7915,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) goto enable_gating; } +flush_work (&hba->eeh_work); ret =ufshcd_link_state_transition (hba, req_link_state,1 );if (ret)Quoted 1 line
goto
set_dev_active;I think this patch introduces a new race condition, namely the following:
-ufshcd_slave_destroy()testspm_op_in_progressand reads the value zero from that variable.
-ufshcd_suspend()setshba->pm_op_in_progressto one.
-ufshcd_slave_destroy()callsschedule_work().
Quoted 7 lines
How about fixing this race condition by calling
pm_runtime_get_noresume()before checkingpm_op_in_progressand by reallowing resume if no work is scheduled?Thanks,
Bart.
Hi Bart,
If you apply this patch, you will find the change is not in ufshcd_slave_destroy(), but in ufshcd_transfer_rsp_status(). So the racing you mentioned above does not exist.
Thanks,
Can Guo.
Re: [PATCH v4 1/8] scsi: ufs: Flush exception event before suspend
Quoted 38 lines · Can Guo
Quoted 37 lines · Bart Van Assche
Quoted 28 lines · Can Guo
break;
caseUPIU_TRANSACTION_REJECT_UPIU:
/* TODO: handle Reject UPIU Response */(quoted diff) +0
-0@@ -5215,7 +5222,14 @@ static void ufshcd_exception_event_handler(struct work_struct *work)out:
scsi_unblock_requests(hba->host);
-pm_runtime_put_sync(hba->dev);
+ /*
+ *pm_runtime_get_noresumeis called while scheduling + *eeh_workto avoid suspend racing with exception work. + * Hence decrement usage counter usingpm_runtime_put_noidle+ * to allow suspend on completion of exception event handler. + */
+pm_runtime_put_noidle(hba->dev);
+pm_runtime_put(hba->dev);
return;
}drivers/scsi/ufs/ufshcd.c +1
-0@@ -7901,6 +7915,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) goto enable_gating; } + flush_work(&hba->eeh_work); ret = ufshcd_link_state_transition(hba, req_link_state, 1); if (ret)Quoted 1 line
goto
set_dev_active;I think this patch introduces a new race condition, namely the following:
-ufshcd_slave_destroy()testspm_op_in_progressand reads the value zero from that variable.
-ufshcd_suspend()setshba->pm_op_in_progressto one.
-ufshcd_slave_destroy()callsschedule_work().
Quoted 7 lines
Quoted 3 lines
How about fixing this race condition by calling
pm_runtime_get_noresume()before checkingpm_op_in_progressand by reallowing resume if no work is scheduled?If you apply this patch, you will find the change is not in
ufshcd_slave_destroy(), but inufshcd_transfer_rsp_status(). So the racing you mentioned above does not exist.
Hi Can,
Apparently I got a function name wrong. Can the following race condition happen:
- ufshcd_transfer_rsp_status() tests pm_op_in_progress and reads the value zero from that variable.
- ufshcd_suspend() sets hba->pm_op_in_progress to one.
- ufshcd_suspend() calls flush_work(&hba->eeh_work).
- ufshcd_transfer_rsp_status() calls schedule_work(&hba->eeh_work).
Thanks,
Bart.
Re: [PATCH v4 1/8] scsi: ufs: Flush exception event before suspend
Quoted 57 lines · Bart Van Assche
Quoted 38 lines · Can Guo
Quoted 37 lines · Bart Van Assche
Quoted 28 lines · Can Guo
break;
caseUPIU_TRANSACTION_REJECT_UPIU:
/* TODO: handle Reject UPIU Response */(quoted diff) +0
-0@@ -5215,7 +5222,14 @@ static void ufshcd_exception_event_handler(struct work_struct *work)out:
scsi_unblock_requests(hba->host);
-pm_runtime_put_sync(hba->dev);
+ /*
+ *pm_runtime_get_noresumeis called while scheduling + *eeh_workto avoid suspend racing with exception work. + * Hence decrement usage counter usingpm_runtime_put_noidle+ * to allow suspend on completion of exception event handler. + */
+pm_runtime_put_noidle(hba->dev);
+pm_runtime_put(hba->dev);
return;
}drivers/scsi/ufs/ufshcd.c +1
-0@@ -7901,6 +7915,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) goto enable_gating; } + flush_work(&hba->eeh_work); ret = ufshcd_link_state_transition(hba, req_link_state, 1); if (ret)Quoted 1 line
goto
set_dev_active;I think this patch introduces a new race condition, namely the following:
-ufshcd_slave_destroy()testspm_op_in_progressand reads the value zero from that variable.
-ufshcd_suspend()setshba->pm_op_in_progressto one.
-ufshcd_slave_destroy()callsschedule_work().Quoted 7 lines
Quoted 3 lines
How about fixing this race condition by calling
pm_runtime_get_noresume()before checkingpm_op_in_progressand by reallowing resume if no work is scheduled?If you apply this patch, you will find the change is not in
ufshcd_slave_destroy(), but inufshcd_transfer_rsp_status(). So the racing you mentioned above does not exist.Hi Can,
Apparently I got a function name wrong. Can the following race condition happen:
-ufshcd_transfer_rsp_status()testspm_op_in_progressand reads the value zero from that variable.
-ufshcd_suspend()setshba->pm_op_in_progressto one.
-ufshcd_suspend()callsflush_work(&hba->eeh_work).
-ufshcd_transfer_rsp_status()callsschedule_work(&hba->eeh_work).
Quoted 3 lines
Thanks,
Bart.
Hi Bart,
The sequence you mentioned is not possible.
In normal cases, before ufshcd_transfer_rsp_status() returns, ufshcd_suspend() would not be called (unless you intentionally call ufshcd_suspend() to screw it). Because ufshcd_transfer_rsp_status() is called from __ufshcd_transfer_req_compl(), which is being used by either UFS IRQ handler or err handler. Meanwhile, in __ufshcd_transfer_req_compl(), scsi_done() is called only after ufshcd_transfer_rsp_status() returns. When we are here, it means UFS driver is still handling requests/tasks, so suspend would not kick start at this moment, either runtime suspend or system suspend.
And this is why below lines work, calling pm_runtime_get_noresume() within ufshcd_transfer_rsp_status() can prevent runtime suspend from happening after we leave ufshcd_transfer_rsp_status().
+ if (schedule_work(&hba->eeh_work))
+ pm_runtime_get_noresume(hba->dev);
Thanks,
Can Guo.
PATCH v4 2/8 scsi: ufs: set load before setting voltage in regulators
In reply to Can GuoFrom: Asutosh Das <[email protected]>
This sequence change is required to avoid dips in voltage during boot-up.
Apparently, this dip is caused because in the original sequence, the regulators are initialized in lpm mode. And then when the load is set to high, and more current is drawn, than is allowed in lpm, the dip is seen.
--- drivers/scsi/ufs/ufshcd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/ufs/ufshcd.c +5 -5
@@ -7225,6 +7225,11 @@ static int ufshcd_config_vreg(struct device *dev, name = vreg->name;if (regulator_count_voltages (reg) >0 ) { + uA_load = on ? vreg->max_uA :0 ; + ret =ufshcd_config_vreg_load (dev, vreg, uA_load); +if (ret) + goto out; +if (vreg->min_uV && vreg->max_uV) { min_uV = on ? vreg->min_uV :0 ; ret =regulator_set_voltage (reg, min_uV, vreg->max_uV);
@@ -7235,11 +7240,6 @@ static int ufshcd_config_vreg(struct device *dev, goto out; } } - - uA_load = on ? vreg->max_uA :0 ; - ret =ufshcd_config_vreg_load (dev, vreg, uA_load); -if (ret) - goto out; } out:return ret;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v4 2/8] scsi: ufs: set load before setting voltage in regulators
Hi Can,
It makes sense that set the load before enable regulator or set
voltage. Just avoid voltage drop.
Quoted 45 lines · Can Guo
From: Asutosh Das <[email protected]>
This sequence change is required to avoid dips in voltage during boot-up.
Apparently, this dip is caused because in the original sequence, the regulators are initialized in lpm mode. And then when the load is set to high, and more current is drawn, than is allowed in lpm, the dip is seen.
Signed-off-by Asutosh Das <[email protected]>Signed-off-by Can Guo <[email protected]>--- drivers/scsi/ufs/ufshcd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/scsi/ufs/ufshcd.c +5
-0@@ -7225,6 +7225,11 @@ static int ufshcd_config_vreg(struct device *dev, name = vreg->name;if (regulator_count_voltages (reg) >0 ) { + uA_load = on ? vreg->max_uA :0 ; + ret =ufshcd_config_vreg_load (dev, vreg, uA_load); +if (ret) + goto out; +if (vreg->min_uV && vreg->max_uV) { min_uV = on ? vreg->min_uV :0 ;drivers/scsi/ufs/ufshcd.c +0
-5ret =regulator_set_voltage (reg, min_uV, vreg->max_uV);@@ -7235,11 +7240,6 @@ static int ufshcd_config_vreg(struct device *dev, goto out; } } - - uA_load = on ? vreg->max_uA :0 ; - ret =ufshcd_config_vreg_load (dev, vreg, uA_load); -if (ret) - goto out; } out:
Quoted 1 line
return ret;
PATCH v4 3/8 scsi: ufs: Remove the check before call setup clock notify vops
In reply to Can GuoThe functionality of vendor specific ops should be handled properly in platform specific driver, but should not count on the UFS driver.
--- drivers/scsi/ufs/ufshcd.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-)
drivers/scsi/ufs/ufshcd.c +6 -20
@@ -7379,16 +7379,9 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,if (list_empty (head)) goto out; -/* -* vendor specific setup_clocks ops may depend on clocks managed by -* this standard driver hence call the vendor specific setup_clocks -* before disabling the clocks managed here. -*/ -if (!on) { - ret =ufshcd_vops_setup_clocks (hba, on,PRE_CHANGE ); -if (ret) -return ret; - } + ret =ufshcd_vops_setup_clocks (hba, on,PRE_CHANGE ); +if (ret) +return ret;list_for_each_entry (clki, head, list) {if (!IS_ERR_OR_NULL (clki->clk)) {
@@ -7412,16 +7405,9 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, } } -/* -* vendor specific setup_clocks ops may depend on clocks managed by -* this standard driver hence call the vendor specific setup_clocks -* after enabling the clocks managed here. -*/ -if (on) { - ret =ufshcd_vops_setup_clocks (hba, on,POST_CHANGE ); -if (ret) -return ret; - } + ret =ufshcd_vops_setup_clocks (hba, on,POST_CHANGE ); +if (ret) +return ret; out:if (ret) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 4/8 scsi: ufs-qcom: Adjust bus bandwidth voting and unvoting
In reply to Can GuoThe bus bandwidth voting is required to be done before the bus clocks are enabled, and the unvoting is required to be done only after the bus clocks are disabled.
--- drivers/scsi/ufs/ufs-qcom.c | 57 +++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 18 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +39 -18
@@ -38,7 +38,6 @@ enum {static struct ufs_qcom_host *ufs_qcom_hosts[MAX_UFS_QCOM_HOSTS ]; -static int ufs_qcom_set_bus_vote (struct ufs_qcom_host *host,int vote);static void ufs_qcom_get_default_testbus_cfg (struct ufs_qcom_host *host);static int ufs_qcom_set_dme_vs_core_clk_ctrl_clear_div (struct ufs_hba *hba,u32 clk_cycles);
@@ -674,7 +673,7 @@ static void ufs_qcom_get_speed_mode(struct ufs_pa_layer_attr *p, char *result) } } -static int ufs_qcom_set_bus_vote (struct ufs_qcom_host *host,int vote) +static int __ufs_qcom_set_bus_vote (struct ufs_qcom_host *host,int vote) {int err =0 ;
@@ -705,7 +704,7 @@ static int ufs_qcom_update_bus_bw_vote(struct ufs_qcom_host *host) vote =ufs_qcom_get_bus_vote (host, mode);if (vote >=0 ) - err =ufs_qcom_set_bus_vote (host, vote); + err =__ufs_qcom_set_bus_vote (host, vote);else err = vote;
@@ -716,6 +715,35 @@ static int ufs_qcom_update_bus_bw_vote(struct ufs_qcom_host *host)return err; } +static int ufs_qcom_set_bus_vote (struct ufs_hba *hba,bool on) +{ +struct ufs_qcom_host *host =ufshcd_get_variant (hba); +int vote, err; + +/* +* In case ufs_qcom_init() is not yet done, simply ignore. +* This ufs_qcom_set_bus_vote() shall be called from +* ufs_qcom_init() after init is done. +*/ +if (!host) +return 0 ; + +if (on) { + vote = host->bus_vote.saved_vote; +if (vote == host->bus_vote.min_bw_vote) +ufs_qcom_update_bus_bw_vote (host); + }else { + vote = host->bus_vote.min_bw_vote; + } + + err =__ufs_qcom_set_bus_vote (host, vote); +if (err) +dev_err (hba->dev,"%s: set bus vote failed %d\n" , + __func__, err); + +return err; +} +static ssize_t show_ufs_to_mem_max_bus_bw (struct device *dev,struct device_attribute *attr,char *buf)
@@ -792,7 +820,7 @@ static int ufs_qcom_update_bus_bw_vote(struct ufs_qcom_host *host)return 0 ; } -static int ufs_qcom_set_bus_vote (struct ufs_qcom_host *host,int vote) +static int ufs_qcom_set_bus_vote (struct ufs_hba *host,bool on) {return 0 ; }
@@ -1030,8 +1058,7 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on, enum ufs_notify_change_status status) {struct ufs_qcom_host *host =ufshcd_get_variant (hba); -int err; -int vote =0 ; +int err =0 ;/* * In case ufs_qcom_init() is not yet done, simply ignore.
@@ -1041,28 +1068,21 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,if (!host)return 0 ; -if (on && (status ==POST_CHANGE )) { +if (on && (status ==PRE_CHANGE )) { + err =ufs_qcom_set_bus_vote (hba, true); + }else if (on && (status ==POST_CHANGE )) {/* enable the device ref clock for HS mode*/ if (ufshcd_is_hs_mode (&hba->pwr_info))ufs_qcom_dev_ref_clk_ctrl (host, true); - vote = host->bus_vote.saved_vote; -if (vote == host->bus_vote.min_bw_vote) -ufs_qcom_update_bus_bw_vote (host); - }else if (!on && (status ==PRE_CHANGE )) {if (!ufs_qcom_is_link_active (hba)) {/* disable device ref_clk */ ufs_qcom_dev_ref_clk_ctrl (host, false); } - - vote = host->bus_vote.min_bw_vote; + }else if (!on && (status ==POST_CHANGE )) { + err =ufs_qcom_set_bus_vote (hba, false); } - err =ufs_qcom_set_bus_vote (host, vote); -if (err) -dev_err (hba->dev,"%s: set bus vote failed %d\n" , - __func__, err); -return err; }
@@ -1238,6 +1258,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)ufs_qcom_set_caps (hba);ufs_qcom_advertise_quirks (hba); +ufs_qcom_set_bus_vote (hba, true);ufs_qcom_setup_clocks (hba, true,POST_CHANGE );if (hba->dev->id <MAX_UFS_QCOM_HOSTS )
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 5/8 scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
In reply to Can GuoThe async version of ufshcd_hold(async == true), which is only called in queuecommand path as for now, is expected to work in atomic context, thus it should not sleep or schedule out. When it runs into the condition that clocks are ON but link is still in hibern8 state, it should bail out without flushing the clock ungate work.
--- drivers/scsi/ufs/ufshcd.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/ufs/ufshcd.c +5 -0
@@ -1542,6 +1542,11 @@ int ufshcd_hold(struct ufs_hba *hba, bool async)*/ if (ufshcd_can_hibern8_during_gating (hba) &&ufshcd_is_link_hibern8 (hba)) { +if (async) { + rc = -EAGAIN ; + hba->clk_gating.active_reqs--; +break ; + }spin_unlock_irqrestore (hba->host->host_lock, flags);flush_work (&hba->clk_gating.ungate_work);spin_lock_irqsave (hba->host->host_lock, flags);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v4 5/8] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
Quoted 9 lines · Can Guo
The async version of
ufshcd_hold(async == true), which is only called in queuecommand path as for now, is expected to work in atomic context, thus it should not sleep or schedule out. When it runs into the condition that clocks are ON but link is still in hibern8 state, it should bail out without flushing the clock ungate work.Signed-off-by Can Guo <[email protected]>Reviewed-by Hongwu Su <[email protected]>---
Quoted 20 lines
drivers/scsi/ufs/ufshcd.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/scsi/ufs/ufshcd.c +5
-0@@ -1542,6 +1542,11 @@ int ufshcd_hold(struct ufs_hba *hba, bool async)*/ if (ufshcd_can_hibern8_during_gating (hba) &&ufshcd_is_link_hibern8 (hba)) { +if (async) { + rc = -EAGAIN ; + hba->clk_gating.active_reqs--; +break ; + }spin_unlock_irqrestore (hba->host->host_lock, flags);flush_work (&hba->clk_gating.ungate_work);spin_lock_irqsave (hba->host->host_lock, flags);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project
PATCH v4 6/8 scsi: ufs: Add dev ref clock gating wait time support
In reply to Can GuoIn UFS version 3.0, a newly added attribute bRefClkGatingWaitTime defines the minimum time for which the reference clock is required by device during transition to LS-MODE or HIBERN8 state. Make this change to reflect the new requirement by adding delays before turning off the clock.
--- drivers/scsi/ufs/ufs.h | 3 +++ drivers/scsi/ufs/ufshcd.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+)
drivers/scsi/ufs/ufs.h +3 -0
@@ -168,6 +168,7 @@ enum attr_idn {QUERY_ATTR_IDN_FFU_STATUS =0x14 ,QUERY_ATTR_IDN_PSA_STATE =0x15 ,QUERY_ATTR_IDN_PSA_DATA_SIZE =0x16 , + QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17, };/* Descriptor idn for Query requests */
@@ -530,6 +531,8 @@ struct ufs_dev_info {bool f_power_on_wp_en;/* Keeps information if any of the LU is power on write protected */ bool is_lu_power_on_wp; +u16 spec_version; +u32 clk_gating_wait_us; };#define MAX_MODEL_LEN 16
drivers/scsi/ufs/ufshcd.c +41 -0
65 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
RE: [EXT] [PATCH v4 6/8] scsi: ufs: Add dev ref clock gating wait time support
Hi, Can
Quoted 27 lines
In UFS version 3.0, a newly added attribute bRefClkGatingWaitTime defines the minimum time for which the reference clock is required by device during transition to LS-MODE or HIBERN8 state. Make this change to reflect the new requirement by adding delays before turning off the clock.
Signed-off-by Can Guo <[email protected]>--- drivers/scsi/ufs/ufs.h | 3 +++ drivers/scsi/ufs/ufshcd.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+)drivers/scsi/ufs/ufs.h index renamed from drivers/scsi/ufs/ufs.h +0
-03327981..385bac8 100644
drivers/scsi/ufs/ufs.h +1
-0@@ -168,6 +168,7 @@ enum attr_idn {QUERY_ATTR_IDN_FFU_STATUS =0x14 ,QUERY_ATTR_IDN_PSA_STATE =0x15 ,QUERY_ATTR_IDN_PSA_DATA_SIZE =0x16 , +QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME =0x17 , }; /* Descriptor idn for Query requests */ @@ -530,6 +531,8 @@ struct
ufs_dev_info{
drivers/scsi/ufs/ufs.h struct ufs_dev_info { · line 536
Quoted 6 lines
drivers/scsi/ufs/ufs.h +2
-0bool f_power_on_wp_en;/* Keeps information if any of the LU is power on write protected */ bool is_lu_power_on_wp; +u16 spec_version; +u32 clk_gating_wait_us; };
This one also need rebase
Thanks,
//Bean
Re: [EXT] [PATCH v4 6/8] scsi: ufs: Add dev ref clock gating wait time support
Quoted 37 lines · Bean Huo (beanhuo)
Hi, Can
Quoted 27 lines
In UFS version 3.0, a newly added attribute bRefClkGatingWaitTime defines the minimum time for which the reference clock is required by device during transition to LS-MODE or HIBERN8 state. Make this change to reflect the new requirement by adding delays before turning off the clock.
Signed-off-by Can Guo <[email protected]>--- drivers/scsi/ufs/ufs.h | 3 +++ drivers/scsi/ufs/ufshcd.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+)drivers/scsi/ufs/ufs.h index renamed from drivers/scsi/ufs/ufs.h +0
-03327981..385bac8 100644
drivers/scsi/ufs/ufs.h +1
-0@@ -168,6 +168,7 @@ enum attr_idn {QUERY_ATTR_IDN_FFU_STATUS =0x14 ,QUERY_ATTR_IDN_PSA_STATE =0x15 ,QUERY_ATTR_IDN_PSA_DATA_SIZE =0x16 , +QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME =0x17 , }; /* Descriptor idn for Query requests */ @@ -530,6 +531,8 @@ struct
ufs_dev_info{drivers/scsi/ufs/ufs.h struct ufs_dev_info { · line 536
Quoted 6 lines
drivers/scsi/ufs/ufs.h +2
-0bool f_power_on_wp_en;/* Keeps information if any of the LU is power on write protected */ bool is_lu_power_on_wp; +u16 spec_version; +u32 clk_gating_wait_us; };This one also need rebase
Quoted 3 lines
Thanks,
//Bean
Shall rebase this series.
Thanks,
Can Guo
Re: [PATCH v4 6/8] scsi: ufs: Add dev ref clock gating wait time support
In reply to Can GuoQuoted 7 lines · Can Guo
In UFS version 3.0, a newly added attribute bRefClkGatingWaitTime defines the minimum time for which the reference clock is required by device during transition to LS-MODE or HIBERN8 state. Make this change to reflect the new requirement by adding delays before turning off the clock.
Signed-off-by Can Guo <[email protected]>---
Quoted 99 lines
drivers/scsi/ufs/ufs.h | 3 +++ drivers/scsi/ufs/ufshcd.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+)drivers/scsi/ufs/ufs.h +3
-0@@ -168,6 +168,7 @@ enum attr_idn {QUERY_ATTR_IDN_FFU_STATUS =0x14 ,QUERY_ATTR_IDN_PSA_STATE =0x15 ,QUERY_ATTR_IDN_PSA_DATA_SIZE =0x16 , + QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17, };/* Descriptor idn for Query requests */ @@ -530,6 +531,8 @@ struct ufs_dev_info {bool f_power_on_wp_en;/* Keeps information if any of the LU is power on write protected */ bool is_lu_power_on_wp; +u16 spec_version; +u32 clk_gating_wait_us; };#define MAX_MODEL_LEN 16drivers/scsi/ufs/ufshcd.c +41
-0@@ -91,6 +91,9 @@/* default delay of autosuspend: 2000 ms */ #define RPM_AUTOSUSPEND_DELAY_MS 2000 +/* Default value of wait time before gating device ref clock */ +#define UFSHCD_REF_CLK_GATING_WAIT_US 0xFF/* microsecs */ +#define ufshcd_toggle_vreg (_dev, _vreg, _on) \ ({ \ int _ret; \@@ -3357,6 +3360,37 @@ static inline int ufshcd_read_unit_desc_param(struct ufs_hba *hba, param_offset, param_read_buf, param_size); } +static int ufshcd_get_ref_clk_gating_wait (struct ufs_hba *hba) +{ +int err =0 ; +u32 gating_wait =UFSHCD_REF_CLK_GATING_WAIT_US ; + +if (hba->dev_info.spec_version >=0x300 ) { + err =ufshcd_query_attr_retry (hba,UPIU_QUERY_OPCODE_READ_ATTR , +QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME ,0 ,0 , + &gating_wait); +if (err) +dev_err (hba->dev,"Failed reading bRefClkGatingWait. err = %d, use default %uus\n" , + err, gating_wait); + +if (gating_wait ==0 ) { + gating_wait =UFSHCD_REF_CLK_GATING_WAIT_US ; +dev_err (hba->dev,"Undefined ref clk gating wait time, use default %uus\n" , + gating_wait); + } + +/* +* bRefClkGatingWaitTime defines the minimum time for which the +* reference clock is required by device during transition from +* HS-MODE to LS-MODE or HIBERN8 state. Give it more time to be +* on the safe side. +*/ + hba->dev_info.clk_gating_wait_us = gating_wait +50 ; + } + +return err; +} +/** * ufshcd_memory_alloc - allocate memory for host memory space data structures * @hba: per adapter instance @@ -6628,6 +6662,10 @@ static int ufs_get_device_desc(struct ufs_hba *hba, dev_desc->wmanufacturerid = desc_buf[DEVICE_DESC_PARAM_MANF_ID ] <<8 | desc_buf[DEVICE_DESC_PARAM_MANF_ID +1 ]; +/* getting Specification Version in big endian format */ + hba->dev_info.spec_version = desc_buf[DEVICE_DESC_PARAM_SPEC_VER ] <<8 | + desc_buf[DEVICE_DESC_PARAM_SPEC_VER +1 ]; + model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME ]; err =ufshcd_read_string_desc (hba, model_index, &dev_desc->model,SD_ASCII_STD );@@ -7046,6 +7084,9 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)/* clear any previous UFS device information */ memset (&hba->dev_info,0 ,sizeof (hba->dev_info)); + +ufshcd_get_ref_clk_gating_wait (hba); +if (!ufshcd_query_flag_retry (hba,UPIU_QUERY_OPCODE_READ_FLAG ,QUERY_FLAG_IDN_PWR_ON_WPE , &flag)) hba->dev_info.f_power_on_wp_en = flag;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project
Re: [PATCH v4 6/8] scsi: ufs: Add dev ref clock gating wait time support
In reply to Can Guodrivers/scsi/ufs/ufshcd.c static int ufs_get_device_desc(struct ufs_hba *hba, · line 6667
Quoted 3 lines · Can Guo
drivers/scsi/ufs/ufshcd.c +3
-0+/* getting Specification Version in big endian format */ + hba->dev_info.spec_version = desc_buf[DEVICE_DESC_PARAM_SPEC_VER ] <<8 | + desc_buf[DEVICE_DESC_PARAM_SPEC_VER +1 ];
Please use get_unaligned_be16() instead of open-coding it.
Thanks,
Bart.
Re: [PATCH v4 6/8] scsi: ufs: Add dev ref clock gating wait time support
Quoted 11 lines · Bart Van Assche
drivers/scsi/ufs/ufshcd.c static int ufs_get_device_desc(struct ufs_hba *hba, · line 6667
Quoted 4 lines · Can Guo
(quoted diff) +2
-0+ /* getting Specification Version in big endian format */ + hba->dev_info.spec_version = desc_buf[DEVICE_DESC_PARAM_SPEC_VER] <<8 |
drivers/scsi/ufs/ufshcd.c +1
-0+ desc_buf[DEVICE_DESC_PARAM_SPEC_VER +1 ];Please use
get_unaligned_be16()instead of open-coding it.Thanks,
Bart.
I am just keeping symmetry with the other device descriptors, for example w_manufacturer_id.
Thanks,
Can Guo.
Re: [PATCH v4 6/8] scsi: ufs: Add dev ref clock gating wait time support
Quoted 11 lines · Can Guo
Quoted 7 lines · Bart Van Assche
Quoted 4 lines · Can Guo
+ /* getting Specification Version in big endian format */ +
hba->dev_info.spec_version= desc_buf[DEVICE_DESC_PARAM_SPEC_VER] << 8 |
+ desc_buf[DEVICE_DESC_PARAM_SPEC_VER + 1];Please use
get_unaligned_be16()instead of open-coding it.I am just keeping symmetry with the other device descriptors, for example
w_manufacturer_id.
Hi Can,
How about adding an additional patch that refactors the existing code?
Please use get_unaligned_be16() in new code. That makes code easier to read compared to open-coding get_unaligned_be16().
Thanks,
Bart.
PATCH v4 7/8 scsi: ufs-qcom: Delay specific time before gate ref clk
In reply to Can GuoAfter enter hibern8, as UFS JEDEC ver 3.0 requires, a specific gating wait time is required before disable the device reference clock. If it is not specified, use the old delay.
--- drivers/scsi/ufs/ufs-qcom.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +10 -3
@@ -833,6 +833,8 @@ static int ufs_qcom_bus_register(struct ufs_qcom_host *host)static void ufs_qcom_dev_ref_clk_ctrl (struct ufs_qcom_host *host,bool enable) { +unsigned long gating_wait; +if (host->dev_ref_clk_ctrl_mmio && (enable ^ host->is_dev_ref_clk_enabled)) {u32 temp =readl_relaxed (host->dev_ref_clk_ctrl_mmio);
@@ -845,11 +847,16 @@ static void ufs_qcom_dev_ref_clk_ctrl(struct ufs_qcom_host *host, bool enable)/* * If we are here to disable this clock it might be immediately * after entering into hibern8 in which case we need to make -* sure that device ref_clk is active at least 1us after the +* sure that device ref_clk is active for specific time after * hibern8 enter. */ -if (!enable) -udelay (1 ); +if (!enable) { + gating_wait = host->hba->dev_info.clk_gating_wait_us; +if (!gating_wait) +udelay (1 ); +else +usleep_range (gating_wait, gating_wait +10 ); + }writel_relaxed (temp, host->dev_ref_clk_ctrl_mmio);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v4 7/8] scsi: ufs-qcom: Delay specific time before gate ref clk
Quoted 6 lines · Can Guo
After enter hibern8, as UFS JEDEC ver 3.0 requires, a specific gating wait time is required before disable the device reference clock. If it is not specified, use the old delay.
Signed-off-by Can Guo <[email protected]>---
Quoted 37 lines
drivers/scsi/ufs/ufs-qcom.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)drivers/scsi/ufs/ufs-qcom.c +10
-3@@ -833,6 +833,8 @@ static int ufs_qcom_bus_register(struct ufs_qcom_host *host)static void ufs_qcom_dev_ref_clk_ctrl (struct ufs_qcom_host *host,bool enable) { +unsigned long gating_wait; +if (host->dev_ref_clk_ctrl_mmio && (enable ^ host->is_dev_ref_clk_enabled)) {u32 temp =readl_relaxed (host->dev_ref_clk_ctrl_mmio);@@ -845,11 +847,16 @@ static void ufs_qcom_dev_ref_clk_ctrl(struct ufs_qcom_host *host, bool enable)/* * If we are here to disable this clock it might be immediately * after entering into hibern8 in which case we need to make -* sure that device ref_clk is active at least 1us after the +* sure that device ref_clk is active for specific time after * hibern8 enter. */ -if (!enable) -udelay (1 ); +if (!enable) { + gating_wait = host->hba->dev_info.clk_gating_wait_us; +if (!gating_wait) +udelay (1 ); +else +usleep_range (gating_wait, gating_wait +10 ); + }writel_relaxed (temp, host->dev_ref_clk_ctrl_mmio);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project
PATCH v4 8/8 scsi: ufs: Select INITIAL adapt for HS Gear4
In reply to Can GuoADAPT is added specifically for HS Gear4 mode only, select INITIAL adapt before do power mode change to G4 and select no adapt before switch to non-G4 modes.
--- drivers/scsi/ufs/ufshcd.c | 14 +++++++++++++- drivers/scsi/ufs/ufshci.h | 1 + drivers/scsi/ufs/unipro.h | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +13 -1
@@ -4134,6 +4134,17 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HSSERIES ), pwr_mode->hs_rate); +if (hba->ufs_version >=UFSHCI_VERSION_30 ) { +if (pwr_mode->gear_tx ==UFS_HS_G4 ) +/* INITIAL ADAPT */ +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TXHSADAPTTYPE ), +PA_INITIAL_ADAPT ); +else +/* NO ADAPT */ +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TXHSADAPTTYPE ), +PA_NO_ADAPT ); + } + ret =ufshcd_uic_change_pwr_mode (hba, pwr_mode->pwr_rx <<4 | pwr_mode->pwr_tx);
@@ -8422,7 +8433,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)if ((hba->ufs_version !=UFSHCI_VERSION_10 ) && (hba->ufs_version !=UFSHCI_VERSION_11 ) && (hba->ufs_version !=UFSHCI_VERSION_20 ) && - (hba->ufs_version !=UFSHCI_VERSION_21 )) + (hba->ufs_version !=UFSHCI_VERSION_21 ) && + (hba->ufs_version !=UFSHCI_VERSION_30 ))dev_err (hba->dev,"invalid UFS version 0x%x\n" , hba->ufs_version);
drivers/scsi/ufs/ufshci.h +1 -0
@@ -104,6 +104,7 @@ enum {UFSHCI_VERSION_11 =0x00010100 ,/* 1.1 */ UFSHCI_VERSION_20 =0x00000200 ,/* 2.0 */ UFSHCI_VERSION_21 =0x00000210 ,/* 2.1 */ + UFSHCI_VERSION_30 = 0x00000300, /* 3.0 */ };/*
drivers/scsi/ufs/unipro.h +7 -0
@@ -146,6 +146,12 @@#define PA_SLEEPNOCONFIGTIME 0x15A2#define PA_STALLNOCONFIGTIME 0x15A3#define PA_SAVECONFIGTIME 0x15A4 +#define PA_TXHSADAPTTYPE 0x15D4 + +/* Adpat type for PA_TXHSADAPTTYPE attribute */ +#define PA_REFRESH_ADAPT 0x00 +#define PA_INITIAL_ADAPT 0x01 +#define PA_NO_ADAPT 0x03#define PA_TACTIVATE_TIME_UNIT_US 10#define PA_HIBERN8_TIME_UNIT_US 100
@@ -192,6 +198,7 @@ enum ufs_hs_gear_tag {UFS_HS_G1 ,/* HS Gear 1 (default for reset) */ UFS_HS_G2 ,/* HS Gear 2 */ UFS_HS_G3 ,/* HS Gear 3 */ + UFS_HS_G4, /* HS Gear 4 */ }; enum ufs_unipro_ver {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v4 8/8] scsi: ufs: Select INITIAL adapt for HS Gear4
Quoted 6 lines · Can Guo
ADAPT is added specifically for HS Gear4 mode only, select INITIAL adapt before do power mode change to G4 and select no adapt before switch to non-G4 modes.
Signed-off-by Can Guo <[email protected]>---
LGTM.
Quoted 75 lines
drivers/scsi/ufs/ufshcd.c | 14 +++++++++++++- drivers/scsi/ufs/ufshci.h | 1 + drivers/scsi/ufs/unipro.h | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-)drivers/scsi/ufs/ufshcd.c +13
-1@@ -4134,6 +4134,17 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HSSERIES ), pwr_mode->hs_rate); +if (hba->ufs_version >=UFSHCI_VERSION_30 ) { +if (pwr_mode->gear_tx ==UFS_HS_G4 ) +/* INITIAL ADAPT */ +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TXHSADAPTTYPE ), +PA_INITIAL_ADAPT ); +else +/* NO ADAPT */ +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TXHSADAPTTYPE ), +PA_NO_ADAPT ); + } + ret =ufshcd_uic_change_pwr_mode (hba, pwr_mode->pwr_rx <<4 | pwr_mode->pwr_tx);@@ -8422,7 +8433,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)if ((hba->ufs_version !=UFSHCI_VERSION_10 ) && (hba->ufs_version !=UFSHCI_VERSION_11 ) && (hba->ufs_version !=UFSHCI_VERSION_20 ) && - (hba->ufs_version !=UFSHCI_VERSION_21 )) + (hba->ufs_version !=UFSHCI_VERSION_21 ) && + (hba->ufs_version !=UFSHCI_VERSION_30 ))dev_err (hba->dev,"invalid UFS version 0x%x\n" , hba->ufs_version);drivers/scsi/ufs/ufshci.h +1
-0@@ -104,6 +104,7 @@ enum {UFSHCI_VERSION_11 =0x00010100 ,/* 1.1 */ UFSHCI_VERSION_20 =0x00000200 ,/* 2.0 */ UFSHCI_VERSION_21 =0x00000210 ,/* 2.1 */ + UFSHCI_VERSION_30 = 0x00000300, /* 3.0 */ };/* drivers/scsi/ufs/unipro.h +7
-0@@ -146,6 +146,12 @@#define PA_SLEEPNOCONFIGTIME 0x15A2#define PA_STALLNOCONFIGTIME 0x15A3#define PA_SAVECONFIGTIME 0x15A4 +#define PA_TXHSADAPTTYPE 0x15D4 + +/* Adpat type for PA_TXHSADAPTTYPE attribute */ +#define PA_REFRESH_ADAPT 0x00 +#define PA_INITIAL_ADAPT 0x01 +#define PA_NO_ADAPT 0x03#define PA_TACTIVATE_TIME_UNIT_US 10#define PA_HIBERN8_TIME_UNIT_US 100@@ -192,6 +198,7 @@ enum ufs_hs_gear_tag {UFS_HS_G1 ,/* HS Gear 1 (default for reset) */ UFS_HS_G2 ,/* HS Gear 2 */ UFS_HS_G3 ,/* HS Gear 3 */ + UFS_HS_G4, /* HS Gear 4 */ }; enum ufs_unipro_ver {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project
Re: [PATCH v4 8/8] scsi: ufs: Select INITIAL adapt for HS Gear4
In reply to Can Guodrivers/scsi/ufs/ufshcd.c int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) · line 8439
Quoted 9 lines · Can Guo
drivers/scsi/ufs/ufshcd.c +2
-1@@ -8422,7 +8433,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)if ((hba->ufs_version !=UFSHCI_VERSION_10 ) && (hba->ufs_version !=UFSHCI_VERSION_11 ) && (hba->ufs_version !=UFSHCI_VERSION_20 ) && - (hba->ufs_version !=UFSHCI_VERSION_21 )) + (hba->ufs_version !=UFSHCI_VERSION_21 ) && + (hba->ufs_version !=UFSHCI_VERSION_30 ))dev_err (hba->dev,"invalid UFS version 0x%x\n" , hba->ufs_version);
Is the UFS specification backwards compatible? Or in other words, does the existing driver work fine for devices with a controller that supports a newer version of the spec? I'm asking this because in Linux kernel driver a version check that excludes newer controller versions is very unusual. Can the above version check be removed in its entirety?
Thanks,
Bart.