scsi: ufs: some cleanups and make the delay for host enabling customizable
Subsystems (2)
PATCH v7 4/7 scsi: ufs-mediatek: use common delay function for required places
In reply to Stanley ChuA common delay function is introduced in UFS core driver, thus ufs-mediatek can use it instead of the private delay function for required places.
--- drivers/scsi/ufs/ufs-mediatek.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +2 -13
@@ -100,17 +100,6 @@ static int ufs_mtk_bind_mphy(struct ufs_hba *hba)return err; } -static void ufs_mtk_udelay (unsigned long us) -{ -if (!us) -return ; - -if (us <10 ) -udelay (us); -else -usleep_range (us, us +10 ); -} -static int ufs_mtk_setup_ref_clk (struct ufs_hba *hba,bool on) {struct ufs_mtk_host *host =ufshcd_get_variant (hba);
@@ -123,7 +112,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)if (on) {ufs_mtk_ref_clk_notify (on, res); -ufs_mtk_udelay (host->ref_clk_ungating_wait_us); +ufshcd_delay_us (host->ref_clk_ungating_wait_us,10 );ufshcd_writel (hba,REFCLK_REQUEST ,REG_UFS_REFCLK_CTRL ); }else {ufshcd_writel (hba,REFCLK_RELEASE ,REG_UFS_REFCLK_CTRL );
@@ -150,7 +139,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on) out: host->ref_clk_enabled = on;if (!on) { -ufs_mtk_udelay (host->ref_clk_gating_wait_us); +ufshcd_delay_us (host->ref_clk_gating_wait_us,10 );ufs_mtk_ref_clk_notify (on, res); }
Signature · 1 line
2.18.0
PATCH v7 1/7 scsi: ufs: fix uninitialized tx_lanes in ufshcd_disable_tx_lcc()
In reply to Stanley ChuIn ufshcd_disable_tx_lcc(), if ufshcd_dme_get() or ufshcd_dme_peer_get() get fail, uninitialized variable "tx_lanes" may be used as unexpected lane ID for DME configuration.
Fix this issue by initializing "tx_lanes".
--- drivers/scsi/ufs/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +1 -1
@@ -4315,7 +4315,7 @@ EXPORT_SYMBOL_GPL(ufshcd_hba_enable);static int ufshcd_disable_tx_lcc (struct ufs_hba *hba,bool peer) { -int tx_lanes, i, err =0 ; +int tx_lanes =0 , i, err =0 ;if (!peer) ufshcd_dme_get(hba, UIC_ARG_MIB(PA_CONNECTEDTXDATALANES),
Signature · 5 lines
2.18.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v7 2/7 scsi: ufs: use an enum for host capabilities
In reply to Stanley ChuUse an enum to specify the host capabilities instead of #defines inside the structure definition.
--- drivers/scsi/ufs/ufshcd.h | 65 ++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 28 deletions(-)
drivers/scsi/ufs/ufshcd.h +37 -28
@@ -510,6 +510,43 @@ enum ufshcd_quirks { UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION = 1 << 5, }; +enum ufshcd_caps { +/* Allow dynamic clk gating */ +UFSHCD_CAP_CLK_GATING =1 <<0 , + +/* Allow hiberb8 with clk gating */ +UFSHCD_CAP_HIBERN8_WITH_CLK_GATING =1 <<1 , + +/* Allow dynamic clk scaling */ +UFSHCD_CAP_CLK_SCALING =1 <<2 , + +/* Allow auto bkops to enabled during runtime suspend */ +UFSHCD_CAP_AUTO_BKOPS_SUSPEND =1 <<3 , + +/* +* This capability allows host controller driver to use the UFS HCI's +* interrupt aggregation capability. +* CAUTION: Enabling this might reduce overall UFS throughput. +*/ +UFSHCD_CAP_INTR_AGGR =1 <<4 , + +/* +* This capability allows the device auto-bkops to be always enabled +* except during suspend (both runtime and suspend). +* Enabling this capability means that device will always be allowed +* to do background operation when it's active but it might degrade +* the performance of ongoing read/write operations. +*/ +UFSHCD_CAP_KEEP_AUTO_BKOPS_ENABLED_EXCEPT_SUSPEND =1 <<5 , + +/* +* This capability allows host controller driver to automatically +* enable runtime power management by itself instead of waiting +* for userspace to control the power management. +*/ +UFSHCD_CAP_RPM_AUTOSUSPEND =1 <<6 , +}; +/** * struct ufs_hba - per adapter private structure * @mmio_base: UFSHCI base register address
@@ -664,34 +701,6 @@ struct ufs_hba {struct ufs_clk_gating clk_gating;/* Control to enable/disable host capabilities */ u32 caps; -/* Allow dynamic clk gating */ -#define UFSHCD_CAP_CLK_GATING (1 << 0) -/* Allow hiberb8 with clk gating */ -#define UFSHCD_CAP_HIBERN8_WITH_CLK_GATING (1 << 1) -/* Allow dynamic clk scaling */ -#define UFSHCD_CAP_CLK_SCALING (1 << 2) -/* Allow auto bkops to enabled during runtime suspend */ -#define UFSHCD_CAP_AUTO_BKOPS_SUSPEND (1 << 3) -/* -* This capability allows host controller driver to use the UFS HCI's -* interrupt aggregation capability. -* CAUTION: Enabling this might reduce overall UFS throughput. -*/ -#define UFSHCD_CAP_INTR_AGGR (1 << 4) -/* -* This capability allows the device auto-bkops to be always enabled -* except during suspend (both runtime and suspend). -* Enabling this capability means that device will always be allowed -* to do background operation when it's active but it might degrade -* the performance of ongoing read/write operations. -*/ -#define UFSHCD_CAP_KEEP_AUTO_BKOPS_ENABLED_EXCEPT_SUSPEND (1 << 5) -/* -* This capability allows host controller driver to automatically -* enable runtime power management by itself instead of waiting -* for userspace to control the power management. -*/ -#define UFSHCD_CAP_RPM_AUTOSUSPEND (1 << 6)struct devfreq *devfreq;struct ufs_clk_scaling clk_scaling;
Signature · 1 line
2.18.0
PATCH v7 7/7 scsi: ufs-mediatek: customize the delay for host enabling
In reply to Stanley ChuMediaTek platform and UFS controller can dynamically customize the delay for host enabling according to different scenarios.
For example, if UniPro enters lower-power mode, such delay can be minimized, otherwise longer delay shall be expected.
--- drivers/scsi/ufs/ufs-mediatek.c | 43 ++++++++++++++++++++++++++------- drivers/scsi/ufs/ufs-mediatek.h | 1 + 2 files changed, 35 insertions(+), 9 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +34 -9
@@ -30,11 +30,6 @@#define ufs_mtk_device_reset_ctrl (high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res) -#define ufs_mtk_unipro_powerdown (hba, powerdown) \ - ufshcd_dme_set(hba, \ - UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), \ - powerdown) -static void ufs_mtk_cfg_unipro_cg (struct ufs_hba *hba,bool enable) {u32 tmp;
@@ -71,6 +66,21 @@ static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable) } } +static int ufs_mtk_hce_enable_notify (struct ufs_hba *hba, +enum ufs_notify_change_status status) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +if (status ==PRE_CHANGE ) { +if (host->unipro_lpm) + hba->hba_enable_delay_us =0 ; +else + hba->hba_enable_delay_us =600 ; + } + +return 0 ; +} +static int ufs_mtk_bind_mphy (struct ufs_hba *hba) {struct ufs_mtk_host *host =ufshcd_get_variant (hba);
@@ -324,12 +334,26 @@ static int ufs_mtk_pwr_change_notify(struct ufs_hba *hba,return ret; } +static int ufs_mtk_unipro_set_pm (struct ufs_hba *hba,u32 lpm) +{ +int ret; +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + + ret =ufshcd_dme_set (hba, +UIC_ARG_MIB_SEL (VS_UNIPROPOWERDOWNCONTROL ,0 ), + lpm); +if (!ret) + host->unipro_lpm = lpm; + +return ret; +} +static int ufs_mtk_pre_link (struct ufs_hba *hba) {int ret;u32 tmp; -ufs_mtk_unipro_powerdown (hba,0 ); +ufs_mtk_unipro_set_pm (hba,0 );/* * Setting PA_Local_TX_LCC_Enable to 0 before link startup
@@ -437,7 +461,7 @@ static int ufs_mtk_link_set_hpm(struct ufs_hba *hba)if (err)return err; - err =ufs_mtk_unipro_powerdown (hba,0 ); + err =ufs_mtk_unipro_set_pm (hba,0 );if (err)return err;
@@ -458,10 +482,10 @@ static int ufs_mtk_link_set_lpm(struct ufs_hba *hba) {int err; - err =ufs_mtk_unipro_powerdown (hba,1 ); + err =ufs_mtk_unipro_set_pm (hba,1 );if (err) {/* Resume UniPro state for following error recovery */ -ufs_mtk_unipro_powerdown (hba,0 ); +ufs_mtk_unipro_set_pm (hba,0 );return err; }
@@ -552,6 +576,7 @@ static struct ufs_hba_variant_ops ufs_hba_mtk_vops = { .name = "mediatek.ufshci", .init = ufs_mtk_init, .setup_clocks = ufs_mtk_setup_clocks, + .hce_enable_notify = ufs_mtk_hce_enable_notify, .link_startup_notify = ufs_mtk_link_startup_notify, .pwr_change_notify = ufs_mtk_pwr_change_notify, .apply_dev_quirks = ufs_mtk_apply_dev_quirks,
drivers/scsi/ufs/ufs-mediatek.h +1 -0
@@ -91,6 +91,7 @@ enum {struct ufs_mtk_host {struct ufs_hba *hba;struct phy *mphy; +bool unipro_lpm;bool ref_clk_enabled;u16 ref_clk_ungating_wait_us;u16 ref_clk_gating_wait_us;
Signature · 1 line
2.18.0
PATCH v7 6/7 scsi: ufs: make HCE polling more compact to improve initialization latency
In reply to Stanley ChuReduce the waiting period between each HCE (Host Controller Enable) polling from 5 ms to 1 ms. In the same time, increase the maximum polling times to make "total polling time" unchanged approximately.
This change could make HCE initializatoin faster to improve latency of ufshcd initialization, error recovery, and resume behaviors.
--- drivers/scsi/ufs/ufshcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +2 -2
@@ -4304,7 +4304,7 @@ int ufshcd_hba_enable(struct ufs_hba *hba)ufshcd_delay_us (hba->hba_enable_delay_us,100 );/* wait for the host controller to complete initialization */ - retry =10 ; + retry =50 ;while (ufshcd_is_hba_active (hba)) {if (retry) { retry--;
@@ -4313,7 +4313,7 @@ int ufshcd_hba_enable(struct ufs_hba *hba) "Controller enable failed\n");return -EIO ; } -usleep_range (5000 ,5100 ); +usleep_range (1000 ,1100 ); }/* enable UIC related interrupts */
Signature · 1 line
2.18.0
PATCH v7 3/7 scsi: ufs: introduce common and flexible delay function
In reply to Stanley ChuIntroduce a common delay function to provide flexible way for users to take choices of udelay and usleep_range into consideration according to the required delay time.
--- drivers/scsi/ufs/ufshcd.c | 12 ++++++++++++ drivers/scsi/ufs/ufshcd.h | 1 + 2 files changed, 13 insertions(+)
drivers/scsi/ufs/ufshcd.c +12 -0
@@ -597,6 +597,18 @@ static void ufshcd_print_pwr_info(struct ufs_hba *hba) hba->pwr_info.hs_rate); } +void ufshcd_delay_us (unsigned long us,unsigned long tolerance) +{ +if (!us) +return ; + +if (us <10 ) +udelay (us); +else +usleep_range (us, us + tolerance); +} +EXPORT_SYMBOL_GPL (ufshcd_delay_us); +/* * ufshcd_wait_for_register - wait for register value to change * @hba - per-adapter interface
drivers/scsi/ufs/ufshcd.h +1 -0
@@ -792,6 +792,7 @@ int ufshcd_init(struct ufs_hba * , void __iomem * , unsigned int);int ufshcd_make_hba_operational (struct ufs_hba *hba);void ufshcd_remove (struct ufs_hba *);int ufshcd_uic_hibern8_exit (struct ufs_hba *hba); +void ufshcd_delay_us (unsigned long us,unsigned long tolerance);int ufshcd_wait_for_register (struct ufs_hba *hba,u32 reg,u32 mask,u32 val,unsigned long interval_us,unsigned long timeout_ms,bool can_sleep);
Signature · 1 line
2.18.0
v7 cover scsi: ufs: some cleanups and make the delay for host enabling customizable
v6 -> v7
- Fix patch #3 "scsi: ufs: introduce common delay function" (Bart Van Assche)
- Remove "can_sleep" related changes.
- Limit the usage of common delay function, for example, if delay time is fixed and larger than 10 us, using introduced common delay function is not required.
- Other related changes according to patch #3 changes
v5 -> v6
- Drop patch #2 "scsi: ufs: remove init_prefetch_data in struct ufs_hba" in v5 because Can Guo has similar cleanup earlier in patch "scsi: ufs: Do not rely on prefetched data"
v4 -> v5
- Fix patch #7: Fix typo "initializatoin" in title
v3 -> v4
- In patch #8, fix incorrect condition of customized delay for host enabling
v2 -> v3
- Remove /arch/arm64/configs/defconfig chnage because it is for local test only
v1 -> v2
- Add patch #1 "scsi: ufs: fix uninitialized tx_lanes in ufshcd_disable_tx_lcc"
- Remove struct ufs_init_prefetch in patch #2 "scsi: ufs: remove init_prefetch_data in struct ufs_hba"
- Introduce common delay function in patch #4
- Replace all delay places by common delay function in ufs-mediatek in patch #5
- Use common delay function instead for host enabling delay in patch #6
- Add patch #7 "scsi: ufs: make HCE polling more compact to improve initializatoin latency"
- In patch #8, customize the delay in ufs_mtk_hce_enable_notify callback instead of ufs_mtk_init (Avri Altman)
Stanley Chu (7):
scsi: ufs: fix uninitialized tx_lanes in ufshcd_disable_tx_lcc()
scsi: ufs: use an enum for host capabilities
scsi: ufs: introduce common and flexible delay function
scsi: ufs-mediatek: use common delay function for required places
scsi: ufs: allow customized delay for host enabling
scsi: ufs: make HCE polling more compact to improve initialization
latency
scsi: ufs-mediatek: customize the delay for host enabling
drivers/scsi/ufs/ufs-mediatek.c | 58 +++++++++++++++++----------- drivers/scsi/ufs/ufs-mediatek.h | 1 + drivers/scsi/ufs/ufshcd.c | 21 +++++++++-- drivers/scsi/ufs/ufshcd.h | 67 +++++++++++++++++++-------------- 4 files changed, 93 insertions(+), 54 deletions(-)
Signature · 1 line
2.18.0
PATCH v7 5/7 scsi: ufs: allow customized delay for host enabling
Currently a 1 ms delay is applied before polling CONTROLLER_ENABLE bit. This delay may not be required or can be changed in different controllers. Make the delay as a changeable value in struct ufs_hba to allow it customized by vendors.
--- drivers/scsi/ufs/ufshcd.c | 3 ++- drivers/scsi/ufs/ufshcd.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +2 -1
@@ -4301,7 +4301,7 @@ int ufshcd_hba_enable(struct ufs_hba *hba)* instruction might be read back. * This delay can be changed based on the controller. */ -usleep_range (1000 ,1100 ); +ufshcd_delay_us (hba->hba_enable_delay_us,100 );/* wait for the host controller to complete initialization */ retry =10 ;
@@ -8424,6 +8424,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) hba->mmio_base = mmio_base; hba->irq = irq; + hba->hba_enable_delay_us =1000 ; err =ufshcd_hba_init (hba);if (err)
drivers/scsi/ufs/ufshcd.h +1 -0
@@ -663,6 +663,7 @@ struct ufs_hba {u32 eh_flags;u32 intr_mask;u16 ee_ctrl_mask; +u16 hba_enable_delay_us;bool is_powered;struct ufs_init_prefetch init_prefetch_data;
Signature · 1 line
2.18.0
RE: [EXT] [PATCH v7 3/7] scsi: ufs: introduce common and flexible delay function
In reply to Stanley ChuHi, Stanley
Quoted 10 lines
drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0
-0
314e808b0d4e..a42a84164dec100644drivers/scsi/ufs/ufshcd.c +1
-0@@ -597,6 +597,18 @@ static void ufshcd_print_pwr_info(struct ufs_hba *hba) hba->pwr_info.hs_rate); } +void ufshcd_delay_us (unsigned long us,unsigned long tolerance) {
drivers/scsi/ufs/ufshcd.c static void ufshcd_print_pwr_info(struct ufs_hba *hba) · line 610
Quoted 10 lines
drivers/scsi/ufs/ufshcd.c +10
-0+if (!us) +return ; + +if (us <10 ) +udelay (us); +else +usleep_range (us, us + tolerance); +} +EXPORT_SYMBOL_GPL (ufshcd_delay_us); +
In this way, the callers of ufshcd_delay_us(), can directly call udelay() or usleep_range(), what is exist meaning of ufshcd_delay_us()?
//Bean
RE: [EXT] [PATCH v7 2/7] scsi: ufs: use an enum for host capabilities
In reply to Stanley ChuQuoted 5 lines
Signed-off-by Stanley Chu <[email protected]>Reviewed-by Asutosh Das <[email protected]>Reviewed-by Avri Altman <[email protected]>Reviewed-by Can Guo <[email protected]>
RE: [EXT] [PATCH v7 3/7] scsi: ufs: introduce common and flexible delay function
In reply to Bean Huo (beanhuo)Hi Bean,
Quoted 10 lines · Bean Huo (beanhuo)
Hi, Stanley
Quoted 9 lines
drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0
-0
314e808b0d4e..a42a84164dec100644drivers/scsi/ufs/ufshcd.c +0
-0@@ -597,6 +597,18 @@ static void ufshcd_print_pwr_info(struct ufs_hba *hba) hba->pwr_info.hs_rate); }
Quoted 12 lines
drivers/scsi/ufs/ufshcd.c static void ufshcd_print_pwr_info(struct ufs_hba *hba) · line 611
Quoted 11 lines
drivers/scsi/ufs/ufshcd.c +11
-0+void ufshcd_delay_us (unsigned long us,unsigned long tolerance) { +if (!us) +return ; + +if (us <10 ) +udelay (us); +else +usleep_range (us, us + tolerance); +} +EXPORT_SYMBOL_GPL (ufshcd_delay_us); +In this way, the callers of
ufshcd_delay_us(), can directly calludelay()orusleep_range(), what is exist meaning ofufshcd_delay_us()?
Sure, the callers always can directly call udelay() or usleep_range().
The customizable delay (either by hosts or devices) value in UFS driver is becoming more and more, like "reference clock gating delay" and introduced "hce_enable_delay". The customized delay time could be 0, < 10 us, or >= 10 us in real cases. Hence this function can help driver simplify the driver and user's decision of "just passed without any delay" or "choosing a suitable delay function according to the delay time".
Thanks,
Stanley Chu
Martin K. Petersen
AppliedStanley,
Quoted 8 lines
Stanley Chu (7):
scsi: ufs: fix uninitializedtx_lanesinufshcd_disable_tx_lcc()
scsi: ufs: use an enum for host capabilities
scsi: ufs: introduce common and flexible delay function
scsi: ufs-mediatek: use common delay function for required places
scsi: ufs: allow customized delay for host enabling
scsi: ufs: make HCE polling more compact to improve initialization latency
scsi: ufs-mediatek: customize the delay for host enabling
Applied to 5.7/scsi-queue. Thanks!
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel