scsi: ufs: create a hook for unipro dme control
Subsystems (2)
PATCH 1/1 scsi: ufs: create a hook for unipro dme control
Based on ufshci spec, it defines that "Offset C0h to FFh" belong to vendor specific. If cpu vendor doesn't support these commands, it makes the dme errors:
ufs: dme-set: attr-id 0xd041 val 0x1fff failed 0 retries
ufs: dme-set: attr-id 0xd042 val 0xffff failed 0 retries
ufs: dme-set: attr-id 0xd043 val 0x7fff failed 0 retries
Create a hook for unipro vendor-specific commands.
--- drivers/scsi/ufs/ufs-qcom.c | 11 +++++++++++ drivers/scsi/ufs/ufs-qcom.h | 5 +++++ drivers/scsi/ufs/ufshcd.c | 7 +------ drivers/scsi/ufs/ufshcd.h | 8 ++++++++ drivers/scsi/ufs/unipro.h | 4 ---- 5 files changed, 25 insertions(+), 10 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +11 -0
@@ -759,6 +759,16 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,return ret; } +static void ufs_qcom_unipro_dme_set (struct ufs_hba *hba) +{ +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalFC0ProtectionTimeOutVal), + DL_FC0ProtectionTimeOutVal_Default); +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalTC0ReplayTimeOutVal), + DL_TC0ReplayTimeOutVal_Default); +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalAFC0ReqTimeOutVal), + DL_AFC0ReqTimeOutVal_Default); +} +static int ufs_qcom_quirk_host_pa_saveconfigtime (struct ufs_hba *hba) {int err;
@@ -1469,6 +1479,7 @@ static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = { .hce_enable_notify = ufs_qcom_hce_enable_notify, .link_startup_notify = ufs_qcom_link_startup_notify, .pwr_change_notify = ufs_qcom_pwr_change_notify, + .unipro_dme_set = ufs_qcom_unipro_dme_set, .apply_dev_quirks = ufs_qcom_apply_dev_quirks, .suspend = ufs_qcom_suspend, .resume = ufs_qcom_resume,
drivers/scsi/ufs/ufs-qcom.h +5 -0
@@ -124,6 +124,11 @@ enum {/* QUniPro Vendor specific attributes */ #define PA_VS_CONFIG_REG1 0x9000#define DME_VS_CORE_CLK_CTRL 0xD002 + +#define DME_LocalFC0ProtectionTimeOutVal 0xD041 +#define DME_LocalTC0ReplayTimeOutVal 0xD042 +#define DME_LocalAFC0ReqTimeOutVal 0xD043 +/* bit and mask definitions for DME_VS_CORE_CLK_CTRL attribute */ #define DME_VS_CORE_CLK_CTRL_CORE_CLK_DIV_EN_BIT BIT(8)#define DME_VS_CORE_CLK_CTRL_MAX_CORE_CLK_1US_CYCLES_MASK 0xFF
drivers/scsi/ufs/ufshcd.c +1 -6
@@ -4231,12 +4231,7 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,ufshcd_dme_set (hba,UIC_ARG_MIB (PA_PWRMODEUSERDATA5 ), DL_AFC1ReqTimeOutVal_Default); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalFC0ProtectionTimeOutVal), - DL_FC0ProtectionTimeOutVal_Default); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalTC0ReplayTimeOutVal), - DL_TC0ReplayTimeOutVal_Default); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalAFC0ReqTimeOutVal), - DL_AFC0ReqTimeOutVal_Default); +ufshcd_vops_unipro_dme_set (hba); ret =ufshcd_uic_change_pwr_mode (hba, pwr_mode->pwr_rx <<4 | pwr_mode->pwr_tx);
drivers/scsi/ufs/ufshcd.h +8 -0
@@ -311,6 +311,7 @@ struct ufs_pwr_mode_info {* @pwr_change_notify: called before and after a power mode change * is carried out to allow vendor spesific capabilities * to be set. +* @unipro_dme_set: called when vendor speicific control is needed * @setup_xfer_req: called before any transfer request is issued * to set some things * @setup_task_mgmt: called before any task management request is issued
@@ -342,6 +343,7 @@ struct ufs_hba_variant_ops {enum ufs_notify_change_status status, struct ufs_pa_layer_attr *, struct ufs_pa_layer_attr *); +void (*unipro_dme_set)(struct ufs_hba *hba);void (*setup_xfer_req)(struct ufs_hba *,int ,bool );void (*setup_task_mgmt)(struct ufs_hba *,int ,u8 ); void (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,
@@ -1161,6 +1163,12 @@ static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba,return -ENOTSUPP ; } +static inline void ufshcd_vops_unipro_dme_set (struct ufs_hba *hba) +{ +if (hba->vops && hba->vops->unipro_dme_set) +return hba->vops->unipro_dme_set (hba); +} +static inline void ufshcd_vops_setup_xfer_req (struct ufs_hba *hba,int tag,bool is_scsi_cmd) {
drivers/scsi/ufs/unipro.h +0 -4
@@ -192,10 +192,6 @@#define DL_TC1ReplayTimeOutVal_Default 65535#define DL_AFC1ReqTimeOutVal_Default 32767 -#define DME_LocalFC0ProtectionTimeOutVal 0xD041 -#define DME_LocalTC0ReplayTimeOutVal 0xD042 -#define DME_LocalAFC0ReqTimeOutVal 0xD043 -/* PA power modes */ enum {FAST_MODE =1 ,
Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Quoted 8 lines · Leo Liou
Based on ufshci spec, it defines that "Offset C0h to FFh" belong to vendor specific. If cpu vendor doesn't support these commands, it makes the dme errors:
ufs: dme-set: attr-id
0xd041val0x1ffffailed 0 retries
ufs: dme-set: attr-id0xd042val0xfffffailed 0 retries
ufs: dme-set: attr-id0xd043val0x7ffffailed 0 retries
Hi Leo
"Offset C0h to FFh" registers belong to the UFSHCI, but the attribtes you moved belong to "DME Attributes for DME_SET-based High Level Power Mode Control" defined in Unipro and doesen't say they are vendor- defined attributes. How these two are associated?
Kind regards,
Bean
Quoted 135 lines
Create a hook for unipro vendor-specific commands.
Signed-off-by Leo Liou <[email protected]>--- drivers/scsi/ufs/ufs-qcom.c | 11 +++++++++++ drivers/scsi/ufs/ufs-qcom.h | 5 +++++ drivers/scsi/ufs/ufshcd.c | 7 +------ drivers/scsi/ufs/ufshcd.h | 8 ++++++++ drivers/scsi/ufs/unipro.h | 4 ---- 5 files changed, 25 insertions(+), 10 deletions(-)drivers/scsi/ufs/ufs- renamed from drivers/scsi/ufs/ufs-qcom.c +0
-0
qcom.c
index2206b1e4b774..f2a925587029100644drivers/scsi/ufs/ufs-qcom.c +10
-0@@ -759,6 +759,16 @@ static int ufs_qcom_pwr_change_notify(structufs_hba *hba, return ret; } +static void ufs_qcom_unipro_dme_set (struct ufs_hba *hba) +{ +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalFC0ProtectionTimeOutVal), + DL_FC0ProtectionTimeOutVal_Default); +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalTC0ReplayTimeOutVal), + DL_TC0ReplayTimeOutVal_Default); +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalAFC0ReqTimeOutVal), + DL_AFC0ReqTimeOutVal_Default); +} + static int ufs_qcom_quirk_host_pa_saveconfigtime(struct ufs_hba*hba)
{drivers/scsi/ufs/ufs-qcom.c +1
-0int err;@@ -1469,6 +1479,7 @@ static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = { .hce_enable_notify = ufs_qcom_hce_enable_notify, .link_startup_notify = ufs_qcom_link_startup_notify, .pwr_change_notify = ufs_qcom_pwr_change_notify, + .unipro_dme_set = ufs_qcom_unipro_dme_set, .apply_dev_quirks = ufs_qcom_apply_dev_quirks, .suspend = ufs_qcom_suspend,drivers/scsi/ufs/ufs-qcom.c +0
-0.resume = ufs_qcom_resume,drivers/scsi/ufs/ufs- renamed from drivers/scsi/ufs/ufs-qcom.h +0
-0
qcom.h
index8208e3a3ef59..83db97caaa1b100644drivers/scsi/ufs/ufs-qcom.h +5
-0@@ -124,6 +124,11 @@ enum {/* QUniPro Vendor specific attributes */ #define PA_VS_CONFIG_REG1 0x9000#define DME_VS_CORE_CLK_CTRL 0xD002 + +#define DME_LocalFC0ProtectionTimeOutVal 0xD041 +#define DME_LocalTC0ReplayTimeOutVal 0xD042 +#define DME_LocalAFC0ReqTimeOutVal 0xD043 +/* bit and mask definitions for DME_VS_CORE_CLK_CTRL attribute */ #define DME_VS_CORE_CLK_CTRL_CORE_CLK_DIV_EN_BIT BIT(8)#define DME_VS_CORE_CLK_CTRL_MAX_CORE_CLK_1US_CYCLES_MASK 0xFFdrivers/scsi/ufs/ufshcd.c +1
-6@@ -4231,12 +4231,7 @@ static int ufshcd_change_power_mode(structufs_hba *hba,ufshcd_dme_set (hba ,UIC_ARG_MIB (PA_PWRMODEUSERDATA5 ),DL_AFC1ReqTimeOutVal_Default ); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalFC0ProtectionTimeOutVal), - DL_FC0ProtectionTimeOutVal_Default); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalTC0ReplayTimeOutVal), - DL_TC0ReplayTimeOutVal_Default); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalAFC0ReqTimeOutVal), - DL_AFC0ReqTimeOutVal_Default); +ufshcd_vops_unipro_dme_set (hba);drivers/scsi/ufs/ufshcd.c +0
-0ret =ufshcd_uic_change_pwr_mode (hba, pwr_mode->pwr_rx <<4 | pwr_mode->pwr_tx);drivers/scsi/ufs/ufshcd.h +0
-0@@ -311,6 +311,7 @@ struct ufs_pwr_mode_info {* @pwr_change_notify: called before and after a power mode change * is carried out to allow vendor spesific capabilities
* to be set.
+ * @unipro_dme_set: called when vendor speicific control is needed
* @setup_xfer_req: called before any transfer request is issued
* to set some things
* @setup_task_mgmt: called before any task management request is
issueddrivers/scsi/ufs/ufshcd.h +1
-0@@ -342,6 +343,7 @@ struct ufs_hba_variant_ops {enum ufs_notify_change_status status, struct ufs_pa_layer_attr *, struct ufs_pa_layer_attr *); +void (*unipro_dme_set)(struct ufs_hba *hba);void (*setup_xfer_req)(struct ufs_hba *,int ,bool );void (*setup_task_mgmt)(struct ufs_hba *,int ,u8 );drivers/scsi/ufs/ufshcd.h +6
-0void (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,@@ -1161,6 +1163,12 @@ static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba, return -ENOTSUPP; } +static inline void ufshcd_vops_unipro_dme_set (struct ufs_hba *hba) +{ +if (hba->vops && hba->vops->unipro_dme_set) +return hba->vops->unipro_dme_set (hba); +} + static inline void ufshcd_vops_setup_xfer_req(struct ufs_hba *hba, int tag,drivers/scsi/ufs/ufshcd.h +0
-0bool is_scsi_cmd) {drivers/scsi/ufs/unipro.h +0
-4@@ -192,10 +192,6 @@#define DL_TC1ReplayTimeOutVal_Default 65535#define DL_AFC1ReqTimeOutVal_Default 32767 -#define DME_LocalFC0ProtectionTimeOutVal 0xD041 -#define DME_LocalTC0ReplayTimeOutVal 0xD042 -#define DME_LocalAFC0ReqTimeOutVal 0xD043 -/* PA power modes */ enum {FAST_MODE =1 ,
Quoted 10 lines · Bean Huo
Quoted 8 lines · Leo Liou
Based on ufshci spec, it defines that "Offset C0h to FFh" belong to vendor specific. If cpu vendor doesn't support these commands, it makes the dme errors:
ufs: dme-set: attr-id
0xd041val0x1ffffailed 0 retries
ufs: dme-set: attr-id0xd042val0xfffffailed 0 retries
ufs: dme-set: attr-id0xd043val0x7ffffailed 0 retries
Quoted 9 lines
Hi Leo
"Offset C0h to FFh" registers belong to the UFSHCI, but the attribtes you moved belong to "DME Attributes for DME_SET-based High Level Power Mode Control" defined in Unipro and doesen't say they are vendor- defined attributes. How these two are associated?Kind regards,
Bean
Hi Bean,
Thanks for your remind:)
I thought the vendor means cpu-related, and it's incorrect. Actually it doesn't make sense.
I'll check the error with unipro layer.
Best Regards,
Leo
Quoted 136 lines
Quoted 135 lines
Create a hook for unipro vendor-specific commands.
Signed-off-by Leo Liou <[email protected]>--- drivers/scsi/ufs/ufs-qcom.c | 11 +++++++++++ drivers/scsi/ufs/ufs-qcom.h | 5 +++++ drivers/scsi/ufs/ufshcd.c | 7 +------ drivers/scsi/ufs/ufshcd.h | 8 ++++++++ drivers/scsi/ufs/unipro.h | 4 ---- 5 files changed, 25 insertions(+), 10 deletions(-)drivers/scsi/ufs/ufs- renamed from drivers/scsi/ufs/ufs-qcom.c +0
-0
qcom.c
index2206b1e4b774..f2a925587029100644drivers/scsi/ufs/ufs-qcom.c +10
-0@@ -759,6 +759,16 @@ static int ufs_qcom_pwr_change_notify(structufs_hba *hba, return ret; } +static void ufs_qcom_unipro_dme_set (struct ufs_hba *hba) +{ +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalFC0ProtectionTimeOutVal), + DL_FC0ProtectionTimeOutVal_Default); +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalTC0ReplayTimeOutVal), + DL_TC0ReplayTimeOutVal_Default); +ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalAFC0ReqTimeOutVal), + DL_AFC0ReqTimeOutVal_Default); +} + static int ufs_qcom_quirk_host_pa_saveconfigtime(struct ufs_hba*hba)
{drivers/scsi/ufs/ufs-qcom.c +1
-0int err;@@ -1469,6 +1479,7 @@ static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = { .hce_enable_notify = ufs_qcom_hce_enable_notify, .link_startup_notify = ufs_qcom_link_startup_notify, .pwr_change_notify = ufs_qcom_pwr_change_notify, + .unipro_dme_set = ufs_qcom_unipro_dme_set, .apply_dev_quirks = ufs_qcom_apply_dev_quirks, .suspend = ufs_qcom_suspend,drivers/scsi/ufs/ufs-qcom.c +0
-0.resume = ufs_qcom_resume,drivers/scsi/ufs/ufs- renamed from drivers/scsi/ufs/ufs-qcom.h +0
-0
qcom.h
index8208e3a3ef59..83db97caaa1b100644drivers/scsi/ufs/ufs-qcom.h +5
-0@@ -124,6 +124,11 @@ enum {/* QUniPro Vendor specific attributes */ #define PA_VS_CONFIG_REG1 0x9000#define DME_VS_CORE_CLK_CTRL 0xD002 + +#define DME_LocalFC0ProtectionTimeOutVal 0xD041 +#define DME_LocalTC0ReplayTimeOutVal 0xD042 +#define DME_LocalAFC0ReqTimeOutVal 0xD043 +/* bit and mask definitions for DME_VS_CORE_CLK_CTRL attribute */ #define DME_VS_CORE_CLK_CTRL_CORE_CLK_DIV_EN_BIT BIT(8)#define DME_VS_CORE_CLK_CTRL_MAX_CORE_CLK_1US_CYCLES_MASK 0xFFdrivers/scsi/ufs/ufshcd.c +1
-6@@ -4231,12 +4231,7 @@ static int ufshcd_change_power_mode(structufs_hba *hba,ufshcd_dme_set (hba ,UIC_ARG_MIB (PA_PWRMODEUSERDATA5 ),DL_AFC1ReqTimeOutVal_Default ); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalFC0ProtectionTimeOutVal), - DL_FC0ProtectionTimeOutVal_Default); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalTC0ReplayTimeOutVal), - DL_TC0ReplayTimeOutVal_Default); -ufshcd_dme_set (hba,UIC_ARG_MIB (DME_LocalAFC0ReqTimeOutVal), - DL_AFC0ReqTimeOutVal_Default); +ufshcd_vops_unipro_dme_set (hba);drivers/scsi/ufs/ufshcd.c +0
-0ret =ufshcd_uic_change_pwr_mode (hba, pwr_mode->pwr_rx <<4 | pwr_mode->pwr_tx);drivers/scsi/ufs/ufshcd.h +0
-0@@ -311,6 +311,7 @@ struct ufs_pwr_mode_info {* @pwr_change_notify: called before and after a power mode change * is carried out to allow vendor spesific capabilities
* to be set.
+ * @unipro_dme_set: called when vendor speicific control is needed
* @setup_xfer_req: called before any transfer request is issued
* to set some things
* @setup_task_mgmt: called before any task management request is
issueddrivers/scsi/ufs/ufshcd.h +1
-0@@ -342,6 +343,7 @@ struct ufs_hba_variant_ops {enum ufs_notify_change_status status, struct ufs_pa_layer_attr *, struct ufs_pa_layer_attr *); +void (*unipro_dme_set)(struct ufs_hba *hba);void (*setup_xfer_req)(struct ufs_hba *,int ,bool );void (*setup_task_mgmt)(struct ufs_hba *,int ,u8 );drivers/scsi/ufs/ufshcd.h +6
-0void (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,@@ -1161,6 +1163,12 @@ static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba, return -ENOTSUPP; } +static inline void ufshcd_vops_unipro_dme_set (struct ufs_hba *hba) +{ +if (hba->vops && hba->vops->unipro_dme_set) +return hba->vops->unipro_dme_set (hba); +} + static inline void ufshcd_vops_setup_xfer_req(struct ufs_hba *hba, int tag,drivers/scsi/ufs/ufshcd.h +0
-0bool is_scsi_cmd) {drivers/scsi/ufs/unipro.h +0
-4@@ -192,10 +192,6 @@#define DL_TC1ReplayTimeOutVal_Default 65535#define DL_AFC1ReqTimeOutVal_Default 32767 -#define DME_LocalFC0ProtectionTimeOutVal 0xD041 -#define DME_LocalTC0ReplayTimeOutVal 0xD042 -#define DME_LocalAFC0ReqTimeOutVal 0xD043 -/* PA power modes */ enum {FAST_MODE =1 ,