Skip to contentSkip to conversation

scsi: ufs: pass device information to apply_dev_quirks

PATCH Superseded Stanley Chu 5 participants 9 messages Jan 6, 2020 – Jan 10, 2020

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover scsi: ufs: pass device information to apply_dev_quirks

Currently UFS driver has "global" device quirk scheme to allow driver applying special handling for certain UFS devive models.

However some special device handlings are required for specific UFS hosts only so it is better to make it happen in vendor's callbacks only to not "pollute" common driver and common device quirks.

We already have apply_dev_quirks variant callback for vendors but lack of device information for handling specific UFS device models. This series provides such information to apply_dev_quirks callbacks, and applies related modifications.

Stanley Chu (2):
scsi: ufs: pass device information to apply_dev_quirks
scsi: ufs-mediatek: add apply_dev_quirks variant operation

 drivers/scsi/ufs/ufs-mediatek.c | 11 +++++++++++
 drivers/scsi/ufs/ufs-qcom.c     |  3 ++-
 drivers/scsi/ufs/ufshcd.c       |  5 +++--
 drivers/scsi/ufs/ufshcd.h       |  7 ++++---
 4 files changed, 20 insertions(+), 6 deletions(-)
Signature · 1 line
2.18.0
#1 lore raw

PATCH v2 1/2 scsi: ufs: pass device information to apply_dev_quirks

Pass UFS device information to vendor-specific variant callback "apply_dev_quirks" because some platform vendors need to know such information to apply special handlings or quirks in specific devices.

In the same time, modify existed vendor implementation according to the new interface.

Cc Alim Akhtar <[email protected]>
Cc Asutosh Das <[email protected]>
Cc Avri Altman <[email protected]>
Cc Bart Van Assche <[email protected]>
Cc Bean Huo <[email protected]>
Cc Can Guo <[email protected]>
Cc Matthias Brugger <[email protected]>
---
 drivers/scsi/ufs/ufs-qcom.c | 3 ++-
 drivers/scsi/ufs/ufshcd.c   | 5 +++--
 drivers/scsi/ufs/ufshcd.h   | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +2 -1
index c69c29a1ceb9..ebb5c66e069f 100644
@@ -949,7 +949,8 @@ static int ufs_qcom_quirk_host_pa_saveconfigtime(struct ufs_hba *hba)
 	return err;
 }
 
-static int ufs_qcom_apply_dev_quirks(struct ufs_hba *hba)
+static int ufs_qcom_apply_dev_quirks(struct ufs_hba *hba,
+				     struct ufs_dev_desc *card)
 {
 	int err = 0;
 
drivers/scsi/ufs/ufshcd.c +3 -2
index 1b97f2dc0b63..9abf0ea8c308 100644
@@ -6803,7 +6803,8 @@ static int ufshcd_quirk_tune_host_pa_tactivate(struct ufs_hba *hba)
 	return ret;
 }
 
-static void ufshcd_tune_unipro_params(struct ufs_hba *hba)
+static void ufshcd_tune_unipro_params(struct ufs_hba *hba,
+				      struct ufs_dev_desc *card)
 {
 	if (ufshcd_is_unipro_pa_params_tuning_req(hba)) {
 		ufshcd_tune_pa_tactivate(hba);
@@ -6817,7 +6818,7 @@ static void ufshcd_tune_unipro_params(struct ufs_hba *hba)
 	if (hba->dev_quirks & UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE)
 		ufshcd_quirk_tune_host_pa_tactivate(hba);
 
-	ufshcd_vops_apply_dev_quirks(hba);
+	ufshcd_vops_apply_dev_quirks(hba, card);
 }
 
 static void ufshcd_clear_dbg_ufs_stats(struct ufs_hba *hba)
drivers/scsi/ufs/ufshcd.h +4 -3
index e05cafddc87b..4f3fa71303da 100644
@@ -320,7 +320,7 @@ struct ufs_hba_variant_ops {
 	void	(*setup_task_mgmt)(struct ufs_hba *, int, u8);
 	void    (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,
 					enum ufs_notify_change_status);
-	int	(*apply_dev_quirks)(struct ufs_hba *);
+	int	(*apply_dev_quirks)(struct ufs_hba *, struct ufs_dev_desc *);
 	int     (*suspend)(struct ufs_hba *, enum ufs_pm_op);
 	int     (*resume)(struct ufs_hba *, enum ufs_pm_op);
 	void	(*dbg_register_dump)(struct ufs_hba *hba);
@@ -1052,10 +1052,11 @@ static inline void ufshcd_vops_hibern8_notify(struct ufs_hba *hba,
 		return hba->vops->hibern8_notify(hba, cmd, status);
 }
 
-static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba)
+static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba,
+					       struct ufs_dev_desc *card)
 {
 	if (hba->vops && hba->vops->apply_dev_quirks)
-		return hba->vops->apply_dev_quirks(hba);
+		return hba->vops->apply_dev_quirks(hba, card);
 	return 0;
 }
 
Signature · 1 line
2.18.0
#2 lore raw
Quoted 79 lines · Stanley Chu

Pass UFS device information to vendor-specific variant callback "apply_dev_quirks" because some platform vendors need to know such information to apply special handlings or quirks in specific devices.

In the same time, modify existed vendor implementation according to the new interface.

Cc Alim Akhtar <[email protected]>
Cc Asutosh Das <[email protected]>
Cc Avri Altman <[email protected]>
Cc Bart Van Assche <[email protected]>
Cc Bean Huo <[email protected]>
Cc Can Guo <[email protected]>
Cc Matthias Brugger <[email protected]>
---
 drivers/scsi/ufs/ufs-qcom.c | 3 ++-
 drivers/scsi/ufs/ufshcd.c   | 5 +++--
 drivers/scsi/ufs/ufshcd.h   | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +2 -1
index c69c29a1ceb9..ebb5c66e069f 100644
@@ -949,7 +949,8 @@ static int
 ufs_qcom_quirk_host_pa_saveconfigtime(struct ufs_hba *hba)
 	return err;
 }
 
-static int ufs_qcom_apply_dev_quirks(struct ufs_hba *hba)
+static int ufs_qcom_apply_dev_quirks(struct ufs_hba *hba,
+				     struct ufs_dev_desc *card)
 {
 	int err = 0;
drivers/scsi/ufs/ufshcd.c +2 -1
index 1b97f2dc0b63..9abf0ea8c308 100644
@@ -6803,7 +6803,8 @@ static int
 ufshcd_quirk_tune_host_pa_tactivate(struct ufs_hba *hba)
 	return ret;
 }
 
-static void ufshcd_tune_unipro_params(struct ufs_hba *hba)
+static void ufshcd_tune_unipro_params(struct ufs_hba *hba,
+				      struct ufs_dev_desc *card)
 {
 	if (ufshcd_is_unipro_pa_params_tuning_req(hba)) {
drivers/scsi/ufs/ufshcd.c +1 -1
 		ufshcd_tune_pa_tactivate(hba);
@@ -6817,7 +6818,7 @@ static void ufshcd_tune_unipro_params(struct 
 ufs_hba *hba)
 	if (hba->dev_quirks & UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE)
 		ufshcd_quirk_tune_host_pa_tactivate(hba);
 
-	ufshcd_vops_apply_dev_quirks(hba);
+	ufshcd_vops_apply_dev_quirks(hba, card);
 }
 

static void ufshcd_clear_dbg_ufs_stats(struct ufs_hba *hba)

drivers/scsi/ufs/ufshcd.h +1 -1
index e05cafddc87b..4f3fa71303da 100644
@@ -320,7 +320,7 @@ struct ufs_hba_variant_ops {
 	void	(*setup_task_mgmt)(struct ufs_hba *, int, u8);
 	void    (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,
 					enum ufs_notify_change_status);
-	int	(*apply_dev_quirks)(struct ufs_hba *);
+	int	(*apply_dev_quirks)(struct ufs_hba *, struct ufs_dev_desc *);
 	int     (*suspend)(struct ufs_hba *, enum ufs_pm_op);
 	int     (*resume)(struct ufs_hba *, enum ufs_pm_op);
 	void	(*dbg_register_dump)(struct ufs_hba *hba);
@@ -1052,10 +1052,11 @@ static inline void
 ufshcd_vops_hibern8_notify(struct ufs_hba *hba,
 		return hba->vops->hibern8_notify(hba, cmd, status);
 }

drivers/scsi/ufs/ufshcd.h static inline void · line 1062

Quoted 10 lines
drivers/scsi/ufs/ufshcd.h +3 -2
 
-static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba)
+static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba,
+					       struct ufs_dev_desc *card)
 {
 	if (hba->vops && hba->vops->apply_dev_quirks)
-		return hba->vops->apply_dev_quirks(hba);
+		return hba->vops->apply_dev_quirks(hba, card);
 	return 0;
 }

Please separate the vendor code (ufs-qcom, in this case) to a separate patch.

-asd

#3 lore raw
Quoted 2 lines

Please separate the vendor code (ufs-qcom, in this case) to a separate patch.

He can't - this patch won't compile if he does.

Thanks,
Avri

Quoted 2 lines

-asd

#5 lore raw
In reply to Stanley Chu

Stanley,

Quoted 3 lines

Pass UFS device information to vendor-specific variant callback "apply_dev_quirks" because some platform vendors need to know such information to apply special handlings or quirks in specific devices.

This doesn't compile. You missed adding the additional argument to one caller of ufshcd_tune_unipro_params().

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
#6 lore raw

Hi Martin,

Quoted 9 lines · Martin K. Petersen

Stanley,

Quoted 3 lines

Pass UFS device information to vendor-specific variant callback "apply_dev_quirks" because some platform vendors need to know such information to apply special handlings or quirks in specific devices.

This doesn't compile. You missed adding the additional argument to one caller of ufshcd_tune_unipro_params().

Sorry for this. I'll fix it in next version and try to separate vendor's implementation and common driver to different commits if this is the root cause of compile issue.

Thanks.
Stanley

#7 lore raw

PATCH v2 2/2 scsi: ufs-mediatek: add apply_dev_quirks variant operation

In reply to Stanley Chu

Add vendor-specific variant callback "apply_dev_quirks" in MediaTek UFS driver.

Cc Alim Akhtar <[email protected]>
Cc Asutosh Das <[email protected]>
Cc Avri Altman <[email protected]>
Cc Bart Van Assche <[email protected]>
Cc Bean Huo <[email protected]>
Cc Can Guo <[email protected]>
Cc Matthias Brugger <[email protected]>
---
 drivers/scsi/ufs/ufs-mediatek.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/scsi/ufs/ufs-mediatek.c +11 -0
index 41f80eeada46..8d999c0e60fe 100644
@@ -16,6 +16,7 @@
 
 #include "ufshcd.h"
 #include "ufshcd-pltfrm.h"
+#include "ufs_quirks.h"
 #include "unipro.h"
 #include "ufs-mediatek.h"
 
@@ -405,6 +406,15 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 	return 0;
 }
 
+static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba,
+				    struct ufs_dev_desc *card)
+{
+	if (card->wmanufacturerid == UFS_VENDOR_SAMSUNG)
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TACTIVATE), 6);
+
+	return 0;
+}
+
 /**
  * struct ufs_hba_mtk_vops - UFS MTK specific variant operations
  *
@@ -417,6 +427,7 @@ static struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
 	.setup_clocks        = ufs_mtk_setup_clocks,
 	.link_startup_notify = ufs_mtk_link_startup_notify,
 	.pwr_change_notify   = ufs_mtk_pwr_change_notify,
+	.apply_dev_quirks    = ufs_mtk_apply_dev_quirks,
 	.suspend             = ufs_mtk_suspend,
 	.resume              = ufs_mtk_resume,
 	.device_reset        = ufs_mtk_device_reset,
Signature · 1 line
2.18.0