Skip to contentSkip to conversation

Select ADAPT type when do gear scaling

PATCH Applied Can Guo 5 participants 10 messages Feb 12, 2020 – Feb 13, 2020

Subsystems (2)
lore
Share & tools
lore

Can Guo

author
#0 lore raw

cover Select ADAPT type when do gear scaling

Call ufshcd_config_pwr_mode() in ufshcd_scale_gear() to utilize vops_pwr_change_notify() to allow selecting ADAPT type before change the power mode.

Can Guo (2):
scsi: ufs: Use ufshcd_config_pwr_mode() when scale gear
scsi: ufs: Select INITIAL ADAPT type for HS Gear4

 drivers/scsi/ufs/ufs-qcom.c | 14 ++++++++++++++
 drivers/scsi/ufs/ufshcd.c   |  6 ++----
 drivers/scsi/ufs/unipro.h   |  7 +++++++
 3 files changed, 23 insertions(+), 4 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
author
#1 lore raw

PATCH 1/2 scsi: ufs: Use ufshcd_config_pwr_mode() when scale gear

When scale gear, use ufshcd_config_pwr_mode() instead of ufshcd_change_power_mode() so that vops_pwr_change_notify(PRE_CHANGE) can be utilized to allow vendors use customized settings before change the power mode.

---
 drivers/scsi/ufs/ufshcd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/ufs/ufshcd.c +2 -4
index adcce41..67bd4f2 100644
@@ -1059,8 +1059,7 @@ static int ufshcd_scale_gear(struct ufs_hba *hba, bool scale_up)
 	}
 
 	/* check if the power mode needs to be changed or not? */
-	ret = ufshcd_change_power_mode(hba, &new_pwr_info);
-
+	ret = ufshcd_config_pwr_mode(hba, &new_pwr_info);
 	if (ret)
 		dev_err(hba->dev, "%s: failed err %d, old gear: (tx %d rx %d), new gear: (tx %d rx %d)",
 			__func__, ret,
@@ -4126,8 +4125,6 @@ int ufshcd_config_pwr_mode(struct ufs_hba *hba,
 		memcpy(&final_params, desired_pwr_mode, sizeof(final_params));
 
 	ret = ufshcd_change_power_mode(hba, &final_params);
-	if (!ret)
-		ufshcd_print_pwr_info(hba);
 
 	return ret;
 }
@@ -7157,6 +7154,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool async)
 					__func__, ret);
 			goto out;
 		}
+		ufshcd_print_pwr_info(hba);
 	}
 
 	/* set the state as operational after switching to desired gear */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#2 lore raw

RE: [PATCH v1 1/2] scsi: ufs: Use ufshcd_config_pwr_mode() when scale gear

Hi,

Quoted 17 lines

When scale gear, use ufshcd_config_pwr_mode() instead of ufshcd_change_power_mode() so that vops_pwr_change_notify(PRE_CHANGE)
can be utilized to allow vendors use customized settings before change the power mode.

---
 drivers/scsi/ufs/ufshcd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -0
index adcce41..67bd4f2 100644

drivers/scsi/ufs/ufshcd.c static int ufshcd_scale_gear(struct ufs_hba *hba, · line 1063

Quoted 7 lines
drivers/scsi/ufs/ufshcd.c +1 -2
@@ -1059,8 +1059,7 @@ static int ufshcd_scale_gear(struct ufs_hba *hba,
 bool scale_up)
        }
 
        /* check if the power mode needs to be changed or not? */
-       ret = ufshcd_change_power_mode(hba, &new_pwr_info);
-
+       ret = ufshcd_config_pwr_mode(hba, &new_pwr_info);

You might want to inform ufshcd_config_pwr_mode() of the caller, As now it will be called much more frequently, and you want/don't want To call your vops on probe but not on scale_gear?

Also, Alim exported ufshcd_config_pwr_mode a while ago,
In commit 0d846e703dc8 "scsi: ufs: make ufshcd_config_pwr_mode of non-static func"), But nobody uses it outside ufshcd - so maybe revert this commit as part of this series?

Quoted 26 lines
drivers/scsi/ufs/ufshcd.c +0 -0
        if (ret)
                dev_err(hba->dev, "%s: failed err %d, old gear: (tx %d rx %d), new

gear: (tx %d rx %d)",

                        __func__, ret,
drivers/scsi/ufs/ufshcd.c +1 -2
@@ -4126,8 +4125,6 @@ int ufshcd_config_pwr_mode(struct ufs_hba *hba,
                memcpy(&final_params, desired_pwr_mode, sizeof(final_params));
 
        ret = ufshcd_change_power_mode(hba, &final_params);
-       if (!ret)
-               ufshcd_print_pwr_info(hba);
 
        return ret;
 }
@@ -7157,6 +7154,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba,
 bool async)
                                        __func__, ret);
                        goto out;
                }
+               ufshcd_print_pwr_info(hba);
        }
 
        /* set the state as operational after switching to desired gear */

--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

author
#3 lore raw

Re: [PATCH v1 1/2] scsi: ufs: Use ufshcd_config_pwr_mode() when scale gear

Quoted 32 lines · Avri Altman

Hi,

Quoted 17 lines

When scale gear, use ufshcd_config_pwr_mode() instead of ufshcd_change_power_mode() so that vops_pwr_change_notify(PRE_CHANGE)
can be utilized to allow vendors use customized settings before change the power mode.

---
 drivers/scsi/ufs/ufshcd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -0
index adcce41..67bd4f2 100644

drivers/scsi/ufs/ufshcd.c static int ufshcd_scale_gear(struct ufs_hba · line 1064

Quoted 8 lines
drivers/scsi/ufs/ufshcd.c +1 -2
@@ -1059,8 +1059,7 @@ static int ufshcd_scale_gear(struct ufs_hba 
 *hba,
 bool scale_up)
        }
 
        /* check if the power mode needs to be changed or not? */
-       ret = ufshcd_change_power_mode(hba, &new_pwr_info);
-
+       ret = ufshcd_config_pwr_mode(hba, &new_pwr_info);

You might want to inform ufshcd_config_pwr_mode() of the caller, As now it will be called much more frequently, and you want/don't want To call your vops on probe but not on scale_gear?

Quoted 8 lines

Also, Alim exported ufshcd_config_pwr_mode a while ago, In commit 0d846e703dc8 "scsi: ufs: make ufshcd_config_pwr_mode of non-static func"),
But nobody uses it outside ufshcd - so maybe revert this commit as part of this series?

Hi Avri,

Thanks for your review and suggestion.

What I get from your suggestion is that add one more parameter to ufshcd_config_pwr_mode(say: bool from_probe), and pass the param to ufshcd_vops_pwr_change_notify() so that vendor drivers know where is the call comes from? If I get it correctly, then yes, we can do that.

However, in ufs-qcom.c, ufs_qcom_pwr_change_notify(PRE_CHANGE) is fine being called every time whenever there is a power mode change, we have no problem with that. And as we are the only user of clock scaling in the latest code base, so this change does not impact any other vendors. If later other vendors need to use clock scaling, they can do this change as you suggested above.

As for the commit from Alim, I think I should leave it to Alim's call on it, maybe he has changes that use this func outside ufshcd.c but not uploaded yet.

Thanks,
Can Guo.

Quoted 29 lines
Quoted 29 lines
drivers/scsi/ufs/ufshcd.c +0 -0
        if (ret)
                dev_err(hba->dev, "%s: failed err %d, old gear: (tx %d 
rx %d), new
gear: (tx %d rx %d)",
                        __func__, ret,
drivers/scsi/ufs/ufshcd.c +0 -2
@@ -4126,8 +4125,6 @@ int ufshcd_config_pwr_mode(struct ufs_hba *hba,
                memcpy(&final_params, desired_pwr_mode, 
 sizeof(final_params));
 
        ret = ufshcd_change_power_mode(hba, &final_params);
-       if (!ret)
-               ufshcd_print_pwr_info(hba);
 
        return ret;

}

drivers/scsi/ufs/ufshcd.c +1 -0
@@ -7157,6 +7154,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba,
 bool async)
                                        __func__, ret);
                        goto out;
                }
+               ufshcd_print_pwr_info(hba);
        }
 
        /* set the state as operational after switching to desired 

gear */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Reviewed-by
#4 lore raw

RE: [PATCH v1 1/2] scsi: ufs: Use ufshcd_config_pwr_mode() when scale gear

Quoted 12 lines · Avri Altman
Quoted 10 lines

Hi,

Quoted 8 lines

When scale gear, use ufshcd_config_pwr_mode() instead of ufshcd_change_power_mode() so that vops_pwr_change_notify(PRE_CHANGE)
can be utilized to allow vendors use customized settings before change the power mode.

author
#6 lore raw

PATCH 2/2 scsi: ufs: Select INITIAL ADAPT type for HS Gear4

In reply to 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.

---
 drivers/scsi/ufs/ufs-qcom.c | 14 ++++++++++++++
 drivers/scsi/ufs/unipro.h   |  7 +++++++
 2 files changed, 21 insertions(+)
drivers/scsi/ufs/ufs-qcom.c +14 -0
index d593523..6a905bb 100644
@@ -942,6 +942,20 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
 		if (!ufshcd_is_hs_mode(&hba->pwr_info) &&
 			ufshcd_is_hs_mode(dev_req_params))
 			ufs_qcom_dev_ref_clk_ctrl(host, true);
+
+		if (host->hw_ver.major >= 0x4) {
+			if (dev_req_params->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);
+			}
+		}
 		break;
 	case POST_CHANGE:
 		if (ufs_qcom_cfg_timers(hba, dev_req_params->gear_rx,
drivers/scsi/ufs/unipro.h +7 -0
index 3dc4d8b..766d551 100644
@@ -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
@@ -203,6 +209,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
Reviewed-by on v1 2/2
#7 lore raw

RE: [PATCH v1 2/2] scsi: ufs: Select INITIAL ADAPT type for HS Gear4

Quoted 6 lines

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.

Thanks,
Avri

Reviewed-by on v1 2/2
#8 lore raw

Re: [PATCH v1 2/2] scsi: ufs: Select INITIAL ADAPT type for HS Gear4

In reply to Can Guo
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.

---

Quoted 55 lines
 drivers/scsi/ufs/ufs-qcom.c | 14 ++++++++++++++
 drivers/scsi/ufs/unipro.h   |  7 +++++++
 2 files changed, 21 insertions(+)
drivers/scsi/ufs/ufs-qcom.c +14 -0
index d593523..6a905bb 100644
@@ -942,6 +942,20 @@ static int ufs_qcom_pwr_change_notify(struct 
 ufs_hba *hba,
 		if (!ufshcd_is_hs_mode(&hba->pwr_info) &&
 			ufshcd_is_hs_mode(dev_req_params))
 			ufs_qcom_dev_ref_clk_ctrl(host, true);
+
+		if (host->hw_ver.major >= 0x4) {
+			if (dev_req_params->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);
+			}
+		}
 		break;
 	case POST_CHANGE:
drivers/scsi/ufs/ufs-qcom.c +0 -0
 		if (ufs_qcom_cfg_timers(hba, dev_req_params->gear_rx,
drivers/scsi/ufs/unipro.h +7 -0
index 3dc4d8b..766d551 100644
@@ -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
@@ -203,6 +209,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 {
#9 lore raw

Re: [PATCH v1 2/2] scsi: ufs: Select INITIAL ADAPT type for HS Gear4

In reply to Can Guo

Can,

Quoted 3 lines

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.

Applied to 5.7/scsi-queue, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering