ufs: host: mediatek: Provide features and fixes in MediaTek platforms
[email protected]
maintainercover ufs: host: mediatek: Provide features and fixes in MediaTek platforms
From: Peter Wang <[email protected]>
This series fixes some defects and provide features in MediaTek UFS drivers.
Peter Wang (3):
ufs: host: mediatek: fix vsx/vccqx control logic
ufs: host: mediatek: tx skew fix
ufs: host: mediatek: support mphy reset
Po-Wen Kao (3):
ufs: host: mediatek: Add UFS_MTK_CAP_DISABLE_MCQ
ufs: host: mediatek: ufs mtk sip command reconstruct
ufs: host: mediatek: rename host power control API
Alice Chao (1):
ufs: host: mediatek: support rtff in PM flow
drivers/ufs/host/ufs-mediatek-sip.h | 94 ++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.c | 130 ++++++++++++++++++++++++---- drivers/ufs/host/ufs-mediatek.h | 89 +++---------------- 3 files changed, 219 insertions(+), 94 deletions(-) create mode 100755 drivers/ufs/host/ufs-mediatek-sip.h
Signature · 1 line
2.18.0
[email protected]
maintainerPATCH 1/7 ufs: host: mediatek: fix vsx/vccqx control logic
From: Peter Wang <[email protected]>
VSX(the upper layer of VCCQ/VCCQ2) should
1. Always set to hpm mode if ufs device is active.
2. Enter lpm mode only if ufs device is not active.
VCCQX should
1. Keep hpm mode if vccq and vccq2 not set in dts.
2. Keep hpm mode if vcc not set in dts keep vcc always on.
3. Keep hpm if broken vcc keep vcc always on and not allow vccq lpm.
4. Except upper case, can enter lpm mode if ufs device is not active.
--- drivers/ufs/host/ufs-mediatek.c | 41 +++++++++++++++++++++++---------- drivers/ufs/host/ufs-mediatek.h | 5 ++++ 2 files changed, 34 insertions(+), 12 deletions(-)
drivers/ufs/host/ufs-mediatek.c +29 -12
@@ -119,6 +119,13 @@ static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_PMC_VIA_FASTAUTO ); } +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_ALLOW_VCCQX_LPM ); +} +static void ufs_mtk_cfg_unipro_cg (struct ufs_hba *hba,bool enable) {u32 tmp;
@@ -1271,27 +1278,37 @@ static void ufs_mtk_vsx_set_lpm(struct ufs_hba *hba, bool lpm)static void ufs_mtk_dev_vreg_set_lpm (struct ufs_hba *hba,bool lpm) { -if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2) -return ; +bool skip_vccqx = false; -/* Skip if VCC is assumed always-on */ -if (!hba->vreg_info.vcc) -return ; - -/* Bypass LPM when device is still active */ +/* Prevent entering LPM when device is still active */ if (lpm &&ufshcd_is_ufs_dev_active (hba))return ; -/* Bypass LPM if VCC is enabled */ -if (lpm && hba->vreg_info.vcc->enabled) -return ; +/* Skip vccqx lpm control and control vsx only */ +if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2) + skip_vccqx = true; + +/* VCC is always-on, control vsx only */ +if (!hba->vreg_info.vcc) + skip_vccqx = true; + +/* Broken vcc keep vcc always on, most case control vsx only */ +if (lpm && hba->vreg_info.vcc && hba->vreg_info.vcc->enabled) { +/* Some device vccqx/vsx can enter lpm */ +if (ufs_mtk_is_allow_vccqx_lpm (hba)) + skip_vccqx = false; +else /* control vsx only */ + skip_vccqx = true; + }if (lpm) { -ufs_mtk_vccqx_set_lpm (hba, lpm); +if (!skip_vccqx) +ufs_mtk_vccqx_set_lpm (hba, lpm);ufs_mtk_vsx_set_lpm (hba, lpm); }else {ufs_mtk_vsx_set_lpm (hba, lpm); -ufs_mtk_vccqx_set_lpm (hba, lpm); +if (!skip_vccqx) +ufs_mtk_vccqx_set_lpm (hba, lpm); } }
drivers/ufs/host/ufs-mediatek.h +5 -0
@@ -136,6 +136,11 @@ enum ufs_mtk_host_caps {UFS_MTK_CAP_VA09_PWR_CTRL =1 <<1 ,UFS_MTK_CAP_DISABLE_AH8 =1 <<2 ,UFS_MTK_CAP_BROKEN_VCC =1 <<3 , + +/* Override UFS_MTK_CAP_BROKEN_VCC's behavior to +* allow vccqx upstream to enter LPM +*/ +UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 , UFS_MTK_CAP_PMC_VIA_FASTAUTO = 1 << 6, };
Signature · 1 line
2.18.0
Re: [PATCH v1 1/7] ufs: host: mediatek: fix vsx/vccqx control logic
drivers/ufs/host/ufs-mediatek.c static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba) · line 127
Quoted 6 lines · On 3/7/24 23:02, [email protected] wrote:
drivers/ufs/host/ufs-mediatek.c +6
-0+static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_ALLOW_VCCQX_LPM ); +}
Please leave out the !!. The compiler does this for you when implicitly converting an int into a bool.
Thanks,
Bart.
Peter Wang (王信友)
maintainerRe: [PATCH v1 1/7] ufs: host: mediatek: fix vsx/vccqx control logic
Quoted 15 lines · Bart Van Assche
External email : Please do not click links or open attachments until you have verified the sender or the content.
drivers/ufs/host/ufs-mediatek.c static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba) · line 127
Quoted 6 lines · On 3/7/24 23:02, [email protected] wrote:
drivers/ufs/host/ufs-mediatek.c +6
-0+static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_ALLOW_VCCQX_LPM ); +}Please leave out the !!. The compiler does this for you when implicitly
converting an int into a bool.
Quoted 4 lines
Thanks,
Bart.
Hi Bart,
Will remove "!!" next version
Thanks.
Peter
Re: [PATCH v1 1/7] ufs: host: mediatek: fix vsx/vccqx control logic
In reply to [email protected]Quoted 97 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
VSX(the upper layer of VCCQ/VCCQ2) should
1. Always set to hpm mode if ufs device is active.
2. Enter lpm mode only if ufs device is not active.VCCQX should
1. Keep hpm mode if vccq and vccq2 not set in dts.
2. Keep hpm mode if vcc not set in dts keep vcc always on.
3. Keep hpm if broken vcc keep vcc always on and not allow vccq lpm.
4. Except upper case, can enter lpm mode if ufs device is not active.Signed-off-by Peter Wang <[email protected]>--- drivers/ufs/host/ufs-mediatek.c | 41 +++++++++++++++++++++++------ ---- drivers/ufs/host/ufs-mediatek.h | 5 ++++ 2 files changed, 34 insertions(+), 12 deletions(-)drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.c +0
-0
mediatek.c
index776bca4f70c8..6fc6fa2ea5bd100644drivers/ufs/host/ufs-mediatek.c +7
-0@@ -119,6 +119,13 @@ static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_PMC_VIA_FASTAUTO ); } +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_ALLOW_VCCQX_LPM ); +} +static void ufs_mtk_cfg_unipro_cg (struct ufs_hba *hba,bool enable) {drivers/ufs/host/ufs-mediatek.c +22
-12u32 tmp;@@ -1271,27 +1278,37 @@ static void ufs_mtk_vsx_set_lpm(struct ufs_hba *hba, bool lpm)static void ufs_mtk_dev_vreg_set_lpm (struct ufs_hba *hba,bool lpm) { -if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2) -return ; +bool skip_vccqx = false; -/* Skip if VCC is assumed always-on */ -if (!hba->vreg_info.vcc) -return ; - -/* Bypass LPM when device is still active */ +/* Prevent entering LPM when device is still active */ if (lpm &&ufshcd_is_ufs_dev_active (hba))return ; -/* Bypass LPM if VCC is enabled */ -if (lpm && hba->vreg_info.vcc->enabled) -return ; +/* Skip vccqx lpm control and control vsx only */ +if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2) + skip_vccqx = true; + +/* VCC is always-on, control vsx only */ +if (!hba->vreg_info.vcc) + skip_vccqx = true; + +/* Broken vcc keep vcc always on, most case control vsx only */ +if (lpm && hba->vreg_info.vcc && hba->vreg_info.vcc->enabled) { +/* Some device vccqx/vsx can enter lpm */ +if (ufs_mtk_is_allow_vccqx_lpm (hba)) + skip_vccqx = false; +else /* control vsx only */ + skip_vccqx = true; + }if (lpm) { -ufs_mtk_vccqx_set_lpm (hba, lpm); +if (!skip_vccqx) +ufs_mtk_vccqx_set_lpm (hba, lpm);ufs_mtk_vsx_set_lpm (hba, lpm); }else {ufs_mtk_vsx_set_lpm (hba, lpm); -ufs_mtk_vccqx_set_lpm (hba, lpm); +if (!skip_vccqx) +ufs_mtk_vccqx_set_lpm (hba, lpm); } }drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.h +0
-0
mediatek.h
indexf76e80d91729..0720da2f1402100644drivers/ufs/host/ufs-mediatek.h +0
-0@@ -136,6 +136,11 @@ enum ufs_mtk_host_caps { UFS_MTK_CAP_VA09_PWR_CTRL = 1 << 1,
drivers/ufs/host/ufs-mediatek.h enum ufs_mtk_host_caps { · line 146
Quoted 10 lines
drivers/ufs/host/ufs-mediatek.h +5
-0UFS_MTK_CAP_DISABLE_AH8 =1 <<2 ,UFS_MTK_CAP_BROKEN_VCC =1 <<3 , + +/* Override UFS_MTK_CAP_BROKEN_VCC's behavior to +* allow vccqx upstream to enter LPM +*/ +UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 , UFS_MTK_CAP_PMC_VIA_FASTAUTO = 1 << 6, };
[email protected]
maintainerPATCH 2/7 ufs: host: mediatek: tx skew fix
In reply to [email protected]From: Peter Wang <[email protected]>
Mediatek tx skew issue fix by check dts setting and vendor/model. Then set PA_TACTIVATE set 8
--- drivers/ufs/host/ufs-mediatek.c | 21 +++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 22 insertions(+)
drivers/ufs/host/ufs-mediatek.c +21 -0
@@ -119,6 +119,13 @@ static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_PMC_VIA_FASTAUTO ); } +static bool ufs_mtk_is_tx_skew_fix (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_TX_SKEW_FIX ); +} +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) {struct ufs_mtk_host *host =ufshcd_get_variant (hba);
@@ -630,6 +637,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-pmc-via-fastauto" )) host->caps |=UFS_MTK_CAP_PMC_VIA_FASTAUTO ; +if (of_property_read_bool (np,"mediatek,ufs-tx-skew-fix" )) + host->caps |=UFS_MTK_CAP_TX_SKEW_FIX ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }
@@ -1423,6 +1433,17 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)if (mid ==UFS_VENDOR_SAMSUNG ) {ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),6 );ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HIBERN8TIME ),10 ); + }else if (mid ==UFS_VENDOR_MICRON ) { +/* Only for the host which have TX skew issue */ +if (ufs_mtk_is_tx_skew_fix (hba) && + (STR_PRFX_EQUAL ("MT128GBCAV2U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT256GBCAV4U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT512GBCAV8U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT256GBEAX4U40" , dev_info->model) || +STR_PRFX_EQUAL ("MT512GAYAX4U40" , dev_info->model) || +STR_PRFX_EQUAL ("MT001TAYAX8U40" , dev_info->model))) { +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),8 ); + } }/*
drivers/ufs/host/ufs-mediatek.h +1 -0
@@ -142,6 +142,7 @@ enum ufs_mtk_host_caps {*/ UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 ,UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 , + UFS_MTK_CAP_TX_SKEW_FIX = 1 << 7, }; struct ufs_mtk_crypt_cfg {
Signature · 1 line
2.18.0
RE: [PATCH v1 2/7] ufs: host: mediatek: tx skew fix
Quoted 37 lines
From: Peter Wang <[email protected]>
Mediatek tx skew issue fix by check dts setting and vendor/model. Then set
PA_TACTIVATEset 8Signed-off-by Peter Wang <[email protected]>--- drivers/ufs/host/ufs-mediatek.c | 21 +++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 22 insertions(+)drivers/ufs/host/ufs-mediatek.c +8
-0@@ -119,6 +119,13 @@ static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_PMC_VIA_FASTAUTO ); } +static bool ufs_mtk_is_tx_skew_fix (struct ufs_hba *hba) { +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_TX_SKEW_FIX ); } +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) { struct ufs_mtk_host *host = ufshcd_get_variant(hba); @@ -630,6 +637,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba) if (of_property_read_bool(np, "mediatek,ufs-pmc-via-fastauto")) host->caps |= UFS_MTK_CAP_PMC_VIA_FASTAUTO; +if (of_property_read_bool (np,"mediatek,ufs-tx-skew-fix" )) + host->caps |=UFS_MTK_CAP_TX_SKEW_FIX ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }
drivers/ufs/host/ufs-mediatek.c static int ufs_mtk_apply_dev_quirks(struct ufs_hba · line 1437
Quoted 5 lines
drivers/ufs/host/ufs-mediatek.c +1
-0@@ -1423,6 +1433,17 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)if (mid ==UFS_VENDOR_SAMSUNG ) {ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),6 );ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HIBERN8TIME ),10 ); + }else if (mid ==UFS_VENDOR_MICRON ) {
Is this a quirk for micron? Why not implemented as a quirk? And go for all this trouble setting it in the dt etc.
Thanks,
Avri
Quoted 27 lines
drivers/ufs/host/ufs-mediatek.c +10
-0+/* Only for the host which have TX skew issue */ +if (ufs_mtk_is_tx_skew_fix (hba) && + (STR_PRFX_EQUAL ("MT128GBCAV2U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT256GBCAV4U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT512GBCAV8U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT256GBEAX4U40" , dev_info->model) || +STR_PRFX_EQUAL ("MT512GAYAX4U40" , dev_info->model) || +STR_PRFX_EQUAL ("MT001TAYAX8U40" , dev_info->model))) { +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),8 ); + } }/*drivers/ufs/host/ufs-mediatek.h +1
-1@@ -142,6 +142,7 @@ enum ufs_mtk_host_caps {*/ UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 ,UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 , + UFS_MTK_CAP_TX_SKEW_FIX = 1 << 7, }; struct ufs_mtk_crypt_cfg { --2.18.0
Peter Wang (王信友)
maintainerRe: [PATCH v1 2/7] ufs: host: mediatek: tx skew fix
Quoted 7 lines · Avri Altman
Is this a quirk for micron? Why not implemented as a quirk? And go for all this trouble setting it in the dt etc.
Thanks,
Avri
Hi Arvi,
It is not for micron only. May have another device need this patch. But corrently we only find micron divcie need host change TACTIVATE value. And it is depend on host design, so we use dts to check if host need this patch for dedicated ufs device.
Thanks.
Peter
RE: [PATCH v1 2/7] ufs: host: mediatek: tx skew fix
In reply to [email protected]Quoted 6 lines
From: Peter Wang <[email protected]>
Mediatek tx skew issue fix by check dts setting and vendor/model. Then set
PA_TACTIVATEset 8Signed-off-by Peter Wang <[email protected]>
Quoted 62 lines
--- drivers/ufs/host/ufs-mediatek.c | 21 +++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 22 insertions(+)drivers/ufs/host/ufs-mediatek.c +19
-0@@ -119,6 +119,13 @@ static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_PMC_VIA_FASTAUTO ); } +static bool ufs_mtk_is_tx_skew_fix (struct ufs_hba *hba) { +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_TX_SKEW_FIX ); } +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) { struct ufs_mtk_host *host = ufshcd_get_variant(hba); @@ -630,6 +637,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba) if (of_property_read_bool(np, "mediatek,ufs-pmc-via-fastauto")) host->caps |= UFS_MTK_CAP_PMC_VIA_FASTAUTO; +if (of_property_read_bool (np,"mediatek,ufs-tx-skew-fix" )) + host->caps |=UFS_MTK_CAP_TX_SKEW_FIX ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }@@ -1423,6 +1433,17 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)if (mid ==UFS_VENDOR_SAMSUNG ) {ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),6 );ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HIBERN8TIME ),10 ); + }else if (mid ==UFS_VENDOR_MICRON ) { +/* Only for the host which have TX skew issue */ +if (ufs_mtk_is_tx_skew_fix (hba) && + (STR_PRFX_EQUAL ("MT128GBCAV2U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT256GBCAV4U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT512GBCAV8U31" , dev_info->model) || +STR_PRFX_EQUAL ("MT256GBEAX4U40" , dev_info->model) || +STR_PRFX_EQUAL ("MT512GAYAX4U40" , dev_info->model) || +STR_PRFX_EQUAL ("MT001TAYAX8U40" , dev_info->model))) { +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),8 ); + } }/*drivers/ufs/host/ufs-mediatek.h +1
-1@@ -142,6 +142,7 @@ enum ufs_mtk_host_caps {*/ UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 ,UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 , + UFS_MTK_CAP_TX_SKEW_FIX = 1 << 7, }; struct ufs_mtk_crypt_cfg { --2.18.0
Re: [PATCH v1 2/7] ufs: host: mediatek: tx skew fix
In reply to [email protected]drivers/ufs/host/ufs-mediatek.c static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba) · line 127
Quoted 6 lines · On 3/7/24 23:02, [email protected] wrote:
drivers/ufs/host/ufs-mediatek.c +6
-0+static bool ufs_mtk_is_tx_skew_fix (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_TX_SKEW_FIX ); +}
Same comment here - please leave out the !!
Thanks,
Bart.
Re: [PATCH v1 2/7] ufs: host: mediatek: tx skew fix
In reply to [email protected]Quoted 74 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
Mediatek tx skew issue fix by check dts setting and vendor/model. Then set
PA_TACTIVATEset 8Signed-off-by Peter Wang <[email protected]>--- drivers/ufs/host/ufs-mediatek.c | 21 +++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 22 insertions(+)drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.c +0
-0
mediatek.c
index6fc6fa2ea5bd..0262e8994236100644drivers/ufs/host/ufs-mediatek.c +7
-0@@ -119,6 +119,13 @@ static bool ufs_mtk_is_pmc_via_fastauto(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_PMC_VIA_FASTAUTO ); } +static bool ufs_mtk_is_tx_skew_fix (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_TX_SKEW_FIX ); +} +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) {drivers/ufs/host/ufs-mediatek.c +7
-0struct ufs_mtk_host *host =ufshcd_get_variant (hba);@@ -630,6 +637,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-pmc-via-fastauto" )) host->caps |=UFS_MTK_CAP_PMC_VIA_FASTAUTO ; +if (of_property_read_bool (np,"mediatek,ufs-tx-skew-fix" )) + host->caps |=UFS_MTK_CAP_TX_SKEW_FIX ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }@@ -1423,6 +1433,17 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)if (mid ==UFS_VENDOR_SAMSUNG ) {ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),6 );ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HIBERN8TIME ),10 ); + }else if (mid ==UFS_VENDOR_MICRON ) { +/* Only for the host which have TX skew issue */ + if (ufs_mtk_is_tx_skew_fix(hba) && + (STR_PRFX_EQUAL("MT128GBCAV2U31", dev_info-Quoted 1 line
model) ||
drivers/ufs/host/ufs-mediatek.c +1
-0+ STR_PRFX_EQUAL("MT256GBCAV4U31", dev_info-Quoted 1 line
model) ||
drivers/ufs/host/ufs-mediatek.c +1
-0+ STR_PRFX_EQUAL("MT512GBCAV8U31", dev_info-Quoted 1 line
model) ||
drivers/ufs/host/ufs-mediatek.c +1
-0+ STR_PRFX_EQUAL("MT256GBEAX4U40", dev_info-Quoted 1 line
model) ||
drivers/ufs/host/ufs-mediatek.c +1
-0+ STR_PRFX_EQUAL("MT512GAYAX4U40", dev_info-Quoted 1 line
model) ||
drivers/ufs/host/ufs-mediatek.c +1
-0+ STR_PRFX_EQUAL("MT001TAYAX8U40", dev_info-Quoted 1 line
model))) {
drivers/ufs/host/ufs-mediatek.c +1
-0+ ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TACTIVATE),8);
drivers/ufs/host/ufs-mediatek.c +1
-0+ } }/* drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.h +0
-0
mediatek.h
index0720da2f1402..146c25080599100644
drivers/ufs/host/ufs-mediatek.h enum ufs_mtk_host_caps { · line 148
Quoted 7 lines
drivers/ufs/host/ufs-mediatek.h +1
-0@@ -142,6 +142,7 @@ enum ufs_mtk_host_caps {*/ UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 ,UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 , + UFS_MTK_CAP_TX_SKEW_FIX = 1 << 7, }; struct ufs_mtk_crypt_cfg {
[email protected]
maintainerPATCH 3/7 ufs: host: mediatek: Add UFS_MTK_CAP_DISABLE_MCQ
In reply to [email protected]From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Add new mediatek host cap UFS_MTK_CAP_DISABLE_MCQ to allow disable MCQ feature by assigning dts boolean property "mediatek,ufs-disable-mcq""
--- drivers/ufs/host/ufs-mediatek.c | 12 ++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 13 insertions(+)
drivers/ufs/host/ufs-mediatek.c +12 -0
@@ -640,6 +640,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-tx-skew-fix" )) host->caps |=UFS_MTK_CAP_TX_SKEW_FIX ; +if (of_property_read_bool (np,"mediatek,ufs-disable-mcq" )) + host->caps |=UFS_MTK_CAP_DISABLE_MCQ ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }
@@ -874,6 +877,9 @@ static void ufs_mtk_init_mcq_irq(struct ufs_hba *hba) host->mcq_nr_intr =UFSHCD_MAX_Q_NR ; pdev = container_of(hba->dev, struct platform_device, dev); +if (host->caps &UFS_MTK_CAP_DISABLE_MCQ ) + goto failed; +for (i =0 ; i < host->mcq_nr_intr; i++) {/* irq index 0 is legacy irq, sq/cq irq start from index 1 */ irq =platform_get_irq (pdev, i +1 );
@@ -1585,6 +1591,12 @@ static int ufs_mtk_clk_scale_notify(struct ufs_hba *hba, bool scale_up,static int ufs_mtk_get_hba_mac (struct ufs_hba *hba) { +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +/* MCQ operation not permitted */ +if (host->caps &UFS_MTK_CAP_DISABLE_MCQ ) +return -EPERM ; +return MAX_SUPP_MAC ; }
drivers/ufs/host/ufs-mediatek.h +1 -0
@@ -143,6 +143,7 @@ enum ufs_mtk_host_caps {UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 ,UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 ,UFS_MTK_CAP_TX_SKEW_FIX =1 <<7 , + UFS_MTK_CAP_DISABLE_MCQ = 1 << 8, }; struct ufs_mtk_crypt_cfg {
Signature · 1 line
2.18.0
RE: [PATCH v1 3/7] ufs: host: mediatek: Add UFS_MTK_CAP_DISABLE_MCQ
Quoted 10 lines
From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Add new mediatek host cap
UFS_MTK_CAP_DISABLE_MCQto allow disable MCQ feature by assigning dts boolean property "mediatek,ufs-disable-mcq""Reviewed-by Peter Wang <[email protected]>Signed-off-by Peter Wang <[email protected]>Signed-off-by Po-Wen Kao <[email protected]>
Quoted 54 lines
---
drivers/ufs/host/ufs-mediatek.c| 12 ++++++++++++drivers/ufs/host/ufs-mediatek.h| 1 +2 files changed, 13 insertions(+)drivers/ufs/host/ufs-mediatek.c +6
-0@@ -640,6 +640,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-tx-skew-fix" )) host->caps |=UFS_MTK_CAP_TX_SKEW_FIX ; +if (of_property_read_bool (np,"mediatek,ufs-disable-mcq" )) + host->caps |=UFS_MTK_CAP_DISABLE_MCQ ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }@@ -874,6 +877,9 @@ static void ufs_mtk_init_mcq_irq(struct ufs_hba *hba) host->mcq_nr_intr =UFSHCD_MAX_Q_NR ; pdev = container_of(hba->dev, struct platform_device, dev); +if (host->caps &UFS_MTK_CAP_DISABLE_MCQ ) + goto failed; +for (i =0 ; i < host->mcq_nr_intr; i++) {/* irq index 0 is legacy irq, sq/cq irq start from index 1 */ irq = platform_get_irq(pdev, i + 1); @@ -1585,6 +1591,12 @@ staticint ufs_mtk_clk_scale_notify(struct
ufs_hba*hba, boolscale_up,static int
ufs_mtk_get_hba_mac(struct ufs_hba *hba){drivers/ufs/host/ufs-mediatek.c +6
-0+struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +/* MCQ operation not permitted */ +if (host->caps &UFS_MTK_CAP_DISABLE_MCQ ) +return -EPERM ; +return MAX_SUPP_MAC ; }drivers/ufs/host/ufs-mediatek.h +1
-1@@ -143,6 +143,7 @@ enum ufs_mtk_host_caps {UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 ,UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 ,UFS_MTK_CAP_TX_SKEW_FIX =1 <<7 , + UFS_MTK_CAP_DISABLE_MCQ = 1 << 8, }; struct ufs_mtk_crypt_cfg { --2.18.0
Re: [PATCH v1 3/7] ufs: host: mediatek: Add UFS_MTK_CAP_DISABLE_MCQ
In reply to [email protected]Quoted 64 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Add new mediatek host cap
UFS_MTK_CAP_DISABLE_MCQto allow disable MCQ feature by assigning dts boolean property "mediatek,ufs-disable-mcq""Reviewed-by Peter Wang <[email protected]>Signed-off-by Peter Wang <[email protected]>Signed-off-by Po-Wen Kao <[email protected]>--- drivers/ufs/host/ufs-mediatek.c | 12 ++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 13 insertions(+)drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.c +0
-0
mediatek.c
index0262e8994236..cdf29cfa490b100644drivers/ufs/host/ufs-mediatek.c +6
-0@@ -640,6 +640,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-tx-skew-fix" )) host->caps |=UFS_MTK_CAP_TX_SKEW_FIX ; +if (of_property_read_bool (np,"mediatek,ufs-disable-mcq" )) + host->caps |=UFS_MTK_CAP_DISABLE_MCQ ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }@@ -874,6 +877,9 @@ static void ufs_mtk_init_mcq_irq(struct ufs_hba *hba) host->mcq_nr_intr =UFSHCD_MAX_Q_NR ; pdev = container_of(hba->dev, struct platform_device, dev); +if (host->caps &UFS_MTK_CAP_DISABLE_MCQ ) + goto failed; +for (i =0 ; i < host->mcq_nr_intr; i++) {/* irq index 0 is legacy irq, sq/cq irq start from index 1 */
drivers/ufs/host/ufs-mediatek.c +6
-0irq =platform_get_irq (pdev, i +1 );@@ -1585,6 +1591,12 @@ static int ufs_mtk_clk_scale_notify(struct ufs_hba *hba, bool scale_up, static int ufs_mtk_get_hba_mac(struct ufs_hba *hba) { + struct ufs_mtk_host *host = ufshcd_get_variant(hba); + +/* MCQ operation not permitted */ +if (host->caps &UFS_MTK_CAP_DISABLE_MCQ ) +return -EPERM ; +return MAX_SUPP_MAC ; }drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.h +0
-0
mediatek.h
index146c25080599..79c64de25254100644
drivers/ufs/host/ufs-mediatek.h enum ufs_mtk_host_caps { · line 149
Quoted 7 lines
drivers/ufs/host/ufs-mediatek.h +1
-0@@ -143,6 +143,7 @@ enum ufs_mtk_host_caps {UFS_MTK_CAP_ALLOW_VCCQX_LPM =1 <<5 ,UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 ,UFS_MTK_CAP_TX_SKEW_FIX =1 <<7 , + UFS_MTK_CAP_DISABLE_MCQ = 1 << 8, }; struct ufs_mtk_crypt_cfg {
[email protected]
maintainerPATCH 4/7 ufs: host: mediatek: ufs mtk sip command reconstruct
In reply to [email protected]From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Move sip command and define to a new sip header file.
--- drivers/ufs/host/ufs-mediatek-sip.h | 90 +++++++++++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.c | 3 +- drivers/ufs/host/ufs-mediatek.h | 79 ------------------------- 3 files changed, 92 insertions(+), 80 deletions(-) create mode 100755 drivers/ufs/host/ufs-mediatek-sip.h
drivers/ufs/host/ufs-mediatek-sip.h new file +90 -0
@@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2022 MediaTek Inc. +*/ + +#ifndef _UFS_MEDIATEK_SIP_H +#define _UFS_MEDIATEK_SIP_H + +#include <linux/soc/mediatek/mtk_sip_svc.h> + +/* +* SiP commands +*/ +#define MTK_SIP_UFS_CONTROL MTK_SIP_SMC_CMD(0x276) +#define UFS_MTK_SIP_VA09_PWR_CTRL BIT(0) +#define UFS_MTK_SIP_DEVICE_RESET BIT(1) +#define UFS_MTK_SIP_CRYPTO_CTRL BIT(2) +#define UFS_MTK_SIP_REF_CLK_NOTIFICATION BIT(3) +#define UFS_MTK_SIP_HOST_PWR_CTRL BIT(5) +#define UFS_MTK_SIP_GET_VCC_NUM BIT(6) +#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7) + + +/* +* Multi-VCC by Numbering +*/ +enum ufs_mtk_vcc_num { +UFS_VCC_NONE =0 , +UFS_VCC_1 , +UFS_VCC_2 , +UFS_VCC_MAX +}; + +/* +* Host Power Control options +*/ +enum { +HOST_PWR_HCI =0 , +HOST_PWR_MPHY +}; + +/* +* SMC call wrapper function +*/ +struct ufs_mtk_smc_arg { +unsigned long cmd; +struct arm_smccc_res *res; +unsigned long v1; +unsigned long v2; +unsigned long v3; +unsigned long v4; +unsigned long v5; +unsigned long v6; +unsigned long v7; +}; + + +static inline void _ufs_mtk_smc (struct ufs_mtk_smc_arg s) +{ +arm_smccc_smc (MTK_SIP_UFS_CONTROL , + s.cmd, + s.v1, s.v2, s.v3, s.v4, s.v5, s.v6, s.res); +} + +#define ufs_mtk_smc (...) \ + _ufs_mtk_smc((struct ufs_mtk_smc_arg) {__VA_ARGS__}) + +/* Sip kernel interface */ +#define ufs_mtk_va09_pwr_ctrl (res, on) \ + ufs_mtk_smc(UFS_MTK_SIP_VA09_PWR_CTRL, &(res), on) + +#define ufs_mtk_crypto_ctrl (res, enable) \ + ufs_mtk_smc(UFS_MTK_SIP_CRYPTO_CTRL, &(res), enable) + +#define ufs_mtk_ref_clk_notify (on, stage, res) \ + ufs_mtk_smc(UFS_MTK_SIP_REF_CLK_NOTIFICATION, &(res), on, stage) + +#define ufs_mtk_device_reset_ctrl (high, res) \ + ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high) + +#define ufs_mtk_host_pwr_ctrl (opt, on, res) \ + ufs_mtk_smc(UFS_MTK_SIP_HOST_PWR_CTRL, &(res), opt, on) + +#define ufs_mtk_get_vcc_num (res) \ + ufs_mtk_smc(UFS_MTK_SIP_GET_VCC_NUM, &(res)) + +#define ufs_mtk_device_pwr_ctrl (on, ufs_version, res) \ + ufs_mtk_smc(UFS_MTK_SIP_DEVICE_PWR_CTRL, &(res), on, ufs_version) + +#endif /* !_UFS_MEDIATEK_SIP_H */
drivers/ufs/host/ufs-mediatek.c +2 -1
@@ -20,13 +20,14 @@#include <linux/pm_qos.h> #include <linux/regulator/consumer.h> #include <linux/reset.h> -#include <linux/soc/mediatek/mtk_sip_svc.h> #include <ufs/ufshcd.h> #include "ufshcd-pltfrm.h" #include <ufs/ufs_quirks.h> #include <ufs/unipro.h> +#include "ufs-mediatek.h" +#include "ufs-mediatek-sip.h" static int ufs_mtk_config_mcq (struct ufs_hba *hba,bool irq);
drivers/ufs/host/ufs-mediatek.h +0 -79
95 lines not on this page · raw message
Signature · 1 line
2.18.0
Re: [PATCH v1 4/7] ufs: host: mediatek: ufs mtk sip command reconstruct
Quoted 3 lines · On 3/7/24 23:02, [email protected] wrote:
+/*
+ * SiP commands
+ */
An additional comment that explains what "SiP" means would be welcome.
Thanks,
Bart.
Peter Wang (王信友)
maintainerRe: [PATCH v1 4/7] ufs: host: mediatek: ufs mtk sip command reconstruct
Quoted 8 lines · Bart Van Assche
External email : Please do not click links or open attachments until you have verified the sender or the content.
Quoted 3 lines · On 3/7/24 23:02, [email protected] wrote:
+/*
+ * SiP commands
+ */
Quoted 7 lines
An additional comment that explains what "SiP" means would be welcome.
Thanks,
Bart.
Hi Bart,
It means Silcon Partner.
Will add comment next version.
Thanks.
Peter
Re: [PATCH v1 4/7] ufs: host: mediatek: ufs mtk sip command reconstruct
In reply to [email protected]Quoted 232 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Move sip command and define to a new sip header file.
Reviewed-by Peter Wang <[email protected]>Signed-off-by Peter Wang <[email protected]>Signed-off-by Po-Wen Kao <[email protected]>--- drivers/ufs/host/ufs-mediatek-sip.h | 90 +++++++++++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.c | 3 +- drivers/ufs/host/ufs-mediatek.h | 79 ------------------------- 3 files changed, 92 insertions(+), 80 deletions(-) create mode 100755 drivers/ufs/host/ufs-mediatek-sip.hdrivers/ufs/host/ufs-mediatek-sip.h new file +76
-0@@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2022 MediaTek Inc. +*/ + +#ifndef _UFS_MEDIATEK_SIP_H +#define _UFS_MEDIATEK_SIP_H + +#include <linux/soc/mediatek/mtk_sip_svc.h> + +/* +* SiP commands +*/ +#define MTK_SIP_UFS_CONTROL MTK_SIP_SMC_CMD(0x276) +#define UFS_MTK_SIP_VA09_PWR_CTRL BIT(0) +#define UFS_MTK_SIP_DEVICE_RESET BIT(1) +#define UFS_MTK_SIP_CRYPTO_CTRL BIT(2) +#define UFS_MTK_SIP_REF_CLK_NOTIFICATION BIT(3) +#define UFS_MTK_SIP_HOST_PWR_CTRL BIT(5) +#define UFS_MTK_SIP_GET_VCC_NUM BIT(6) +#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7) + + +/* +* Multi-VCC by Numbering +*/ +enum ufs_mtk_vcc_num { +UFS_VCC_NONE =0 , +UFS_VCC_1 , +UFS_VCC_2 , +UFS_VCC_MAX +}; + +/* +* Host Power Control options +*/ +enum { +HOST_PWR_HCI =0 , +HOST_PWR_MPHY +}; + +/* +* SMC call wrapper function +*/ +struct ufs_mtk_smc_arg { +unsigned long cmd; +struct arm_smccc_res *res; +unsigned long v1; +unsigned long v2; +unsigned long v3; +unsigned long v4; +unsigned long v5; +unsigned long v6; +unsigned long v7; +}; + + +static inline void _ufs_mtk_smc (struct ufs_mtk_smc_arg s) +{ +arm_smccc_smc (MTK_SIP_UFS_CONTROL , + s.cmd, + s.v1, s.v2, s.v3, s.v4, s.v5, s.v6, s.res); +} + +#define ufs_mtk_smc (...) \ + _ufs_mtk_smc((struct ufs_mtk_smc_arg) {__VA_ARGS__}) + +/* Sip kernel interface */ +#define ufs_mtk_va09_pwr_ctrl (res, on) \ + ufs_mtk_smc(UFS_MTK_SIP_VA09_PWR_CTRL, &(res), on) + +#define ufs_mtk_crypto_ctrl (res, enable) \ + ufs_mtk_smc(UFS_MTK_SIP_CRYPTO_CTRL, &(res), enable) + +#define ufs_mtk_ref_clk_notify (on, stage, res) \ + ufs_mtk_smc(UFS_MTK_SIP_REF_CLK_NOTIFICATION, &(res), on,stage)
drivers/ufs/host/ufs-mediatek-sip.h new file +12
-0+ +#define ufs_mtk_device_reset_ctrl (high, res) \ + ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high) + +#define ufs_mtk_host_pwr_ctrl (opt, on, res) \ + ufs_mtk_smc(UFS_MTK_SIP_HOST_PWR_CTRL, &(res), opt, on) + +#define ufs_mtk_get_vcc_num (res) \ + ufs_mtk_smc(UFS_MTK_SIP_GET_VCC_NUM, &(res)) + +#define ufs_mtk_device_pwr_ctrl (on, ufs_version, res) \ + ufs_mtk_smc(UFS_MTK_SIP_DEVICE_PWR_CTRL, &(res), on,
ufs_version)drivers/ufs/host/ufs-mediatek-sip.h new file +2
-0+ +#endif /* !_UFS_MEDIATEK_SIP_H */ drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.c +0
-0
mediatek.c
indexcdf29cfa490b..ae184e4f90e6100644drivers/ufs/host/ufs-mediatek.c +2
-1@@ -20,13 +20,14 @@#include <linux/pm_qos.h> #include <linux/regulator/consumer.h> #include <linux/reset.h> -#include <linux/soc/mediatek/mtk_sip_svc.h> #include <ufs/ufshcd.h> #include "ufshcd-pltfrm.h" #include <ufs/ufs_quirks.h> #include <ufs/unipro.h> +#include "ufs-mediatek.h" +#include "ufs-mediatek-sip.h" static int ufs_mtk_config_mcq (struct ufs_hba *hba,bool irq);drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.h +0
-0
mediatek.h
index79c64de25254..17be3f748fa0100644drivers/ufs/host/ufs-mediatek.h +0
-66@@ -8,7 +8,6 @@#include <linux/bitops.h> #include <linux/pm_qos.h> -#include <linux/soc/mediatek/mtk_sip_svc.h> /* * MCQ define and struct @@ -100,18 +99,6 @@ enum { VS_HIB_EXIT = 13, }; -/* -* SiP commands -*/ -#define MTK_SIP_UFS_CONTROL MTK_SIP_SMC_CMD(0x276) -#define UFS_MTK_SIP_VA09_PWR_CTRL BIT(0) -#define UFS_MTK_SIP_DEVICE_RESET BIT(1) -#define UFS_MTK_SIP_CRYPTO_CTRL BIT(2) -#define UFS_MTK_SIP_REF_CLK_NOTIFICATION BIT(3) -#define UFS_MTK_SIP_HOST_PWR_CTRL BIT(5) -#define UFS_MTK_SIP_GET_VCC_NUM BIT(6) -#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7) -/* * VS_DEBUGCLOCKENABLE */ @@ -197,70 +184,4 @@ struct ufs_mtk_host {struct ufs_mtk_mcq_intr_info mcq_intr_info[UFSHCD_MAX_Q_NR ]; }; -/* -* Multi-VCC by Numbering -*/ -enum ufs_mtk_vcc_num { -UFS_VCC_NONE =0 , -UFS_VCC_1 , -UFS_VCC_2 , -UFS_VCC_MAX -}; - -/* -* Host Power Control options -*/ -enum { -HOST_PWR_HCI =0 , -HOST_PWR_MPHY -}; - -/* -* SMC call wrapper function -*/ -struct ufs_mtk_smc_arg { -unsigned long cmd; -struct arm_smccc_res *res; -unsigned long v1; -unsigned long v2; -unsigned long v3; -unsigned long v4; -unsigned long v5; -unsigned long v6; -unsigned long v7; -}; - -static void _ufs_mtk_smc (struct ufs_mtk_smc_arg s) -{ -arm_smccc_smc (MTK_SIP_UFS_CONTROL , - s.cmd, s.v1, s.v2, s.v3, s.v4, s.v5, s.v6, s.res); -} - -#define ufs_mtk_smc (...) \ - _ufs_mtk_smc((struct ufs_mtk_smc_arg) {__VA_ARGS__}) - -/* -* SMC call interface -*/ -#define ufs_mtk_va09_pwr_ctrl (res, on) \ - ufs_mtk_smc(UFS_MTK_SIP_VA09_PWR_CTRL, &(res), on) - -#define ufs_mtk_crypto_ctrl (res, enable) \ - ufs_mtk_smc(UFS_MTK_SIP_CRYPTO_CTRL, &(res), enable) - -#define ufs_mtk_ref_clk_notify (on, stage, res) \ - ufs_mtk_smc(UFS_MTK_SIP_REF_CLK_NOTIFICATION, &(res), on,stage)
drivers/ufs/host/ufs-mediatek.h +0
-4- -#define ufs_mtk_device_reset_ctrl (high, res) \ - ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high) -
drivers/ufs/host/ufs-mediatek.h struct ufs_mtk_host { · line 187
Quoted 10 lines
drivers/ufs/host/ufs-mediatek.h +0
-9-#define ufs_mtk_host_pwr_ctrl (opt, on, res) \ - ufs_mtk_smc(UFS_MTK_SIP_HOST_PWR_CTRL, &(res), opt, on) - -#define ufs_mtk_get_vcc_num (res) \ - ufs_mtk_smc(UFS_MTK_SIP_GET_VCC_NUM, &(res)) - -#define ufs_mtk_device_pwr_ctrl (on, ufs_ver, res) \ - ufs_mtk_smc(UFS_MTK_SIP_DEVICE_PWR_CTRL, &(res), on, ufs_ver) -#endif /* !_UFS_MEDIATEK_H */
[email protected]
maintainerPATCH 5/7 ufs: host: mediatek: rename host power control API
In reply to [email protected]From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Host power control is control crypto sram power. Rename it for easy maintain.
--- drivers/ufs/host/ufs-mediatek-sip.h | 13 +++---------- drivers/ufs/host/ufs-mediatek.c | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-)
drivers/ufs/host/ufs-mediatek-sip.h +3 -10
@@ -16,7 +16,7 @@#define UFS_MTK_SIP_DEVICE_RESET BIT(1)#define UFS_MTK_SIP_CRYPTO_CTRL BIT(2)#define UFS_MTK_SIP_REF_CLK_NOTIFICATION BIT(3) -#define UFS_MTK_SIP_HOST_PWR_CTRL BIT(5) +#define UFS_MTK_SIP_SRAM_PWR_CTRL BIT(5)#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7)
@@ -31,13 +31,6 @@ enum ufs_mtk_vcc_num { UFS_VCC_MAX }; -/* -* Host Power Control options -*/ -enum { -HOST_PWR_HCI =0 , -HOST_PWR_MPHY -};/* * SMC call wrapper function
@@ -78,8 +71,8 @@ static inline void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_device_reset_ctrl (high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high) -#define ufs_mtk_host_pwr_ctrl (opt, on, res) \ - ufs_mtk_smc(UFS_MTK_SIP_HOST_PWR_CTRL, &(res), opt, on) +#define ufs_mtk_sram_pwr_ctrl (on, res) \ + ufs_mtk_smc(UFS_MTK_SIP_SRAM_PWR_CTRL, &(res), on)#define ufs_mtk_get_vcc_num (res) \ ufs_mtk_smc(UFS_MTK_SIP_GET_VCC_NUM, &(res))
drivers/ufs/host/ufs-mediatek.c +2 -2
@@ -1376,7 +1376,7 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,if (ufshcd_is_link_off (hba))ufs_mtk_device_reset_ctrl (0 , res); -ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI , false, res); +ufs_mtk_sram_pwr_ctrl (false, res);return 0 ; fail:
@@ -1397,7 +1397,7 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)if (hba->ufshcd_state !=UFSHCD_STATE_OPERATIONAL )ufs_mtk_dev_vreg_set_lpm (hba, false); -ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI , true, res); +ufs_mtk_sram_pwr_ctrl (true, res); err =ufs_mtk_mphy_power_on (hba, true);if (err)
Signature · 1 line
2.18.0
RE: [PATCH v1 5/7] ufs: host: mediatek: rename host power control API
Quoted 10 lines
From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Host power control is control crypto sram power. Rename it for easy maintain.
Reviewed-by Peter Wang <[email protected]>Signed-off-by Peter Wang <[email protected]>Signed-off-by Po-Wen Kao <[email protected]>
Quoted 70 lines
--- drivers/ufs/host/ufs-mediatek-sip.h | 13 +++---------- drivers/ufs/host/ufs-mediatek.c | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-)drivers/ufs/host/ufs-mediatek- renamed from drivers/ufs/host/ufs-mediatek-sip.h +0
-0
sip.h
index30146bb1ccbe..fd640846910a100755drivers/ufs/host/ufs-mediatek-sip.h +3
-10@@ -16,7 +16,7 @@#define UFS_MTK_SIP_DEVICE_RESET BIT(1)#define UFS_MTK_SIP_CRYPTO_CTRL BIT(2)#define UFS_MTK_SIP_REF_CLK_NOTIFICATION BIT(3) -#define UFS_MTK_SIP_HOST_PWR_CTRL BIT(5) +#define UFS_MTK_SIP_SRAM_PWR_CTRL BIT(5)#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7)@@ -31,13 +31,6 @@ enum ufs_mtk_vcc_num { UFS_VCC_MAX }; -/* -* Host Power Control options -*/ -enum { -HOST_PWR_HCI =0 , -HOST_PWR_MPHY -};/* * SMC call wrapper function @@ -78,8 +71,8 @@ static inline void _ufs_mtk_smc(struct ufs_mtk_smc_arg s) #define ufs_mtk_device_reset_ctrl(high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high) -#define ufs_mtk_host_pwr_ctrl (opt, on, res) \ - ufs_mtk_smc(UFS_MTK_SIP_HOST_PWR_CTRL, &(res), opt, on) +#define ufs_mtk_sram_pwr_ctrl (on, res) \ + ufs_mtk_smc(UFS_MTK_SIP_SRAM_PWR_CTRL, &(res), on)#define ufs_mtk_get_vcc_num (res) \ ufs_mtk_smc(UFS_MTK_SIP_GET_VCC_NUM, &(res)) diff --git
a/drivers/ufs/host/ufs-mediatek.cb/drivers/ufs/host/ufs-mediatek.cindexae184e4f90e6..2caf0c1d4e17100644drivers/ufs/host/ufs-mediatek.c +1
-1@@ -1376,7 +1376,7 @@ static int ufs_mtk_suspend(struct ufs_hba *hba,enum ufs_pm_op pm_op, if (ufshcd_is_link_off(hba)) ufs_mtk_device_reset_ctrl(0, res); -ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI ,false ,res ); +ufs_mtk_sram_pwr_ctrl (false ,res );return 0 ;fail:
drivers/ufs/host/ufs-mediatek.c +1
-1@@ -1397,7 +1397,7 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)if (hba->ufshcd_state !=UFSHCD_STATE_OPERATIONAL )ufs_mtk_dev_vreg_set_lpm (hba, false); -ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI , true, res); +ufs_mtk_sram_pwr_ctrl (true, res); err =ufs_mtk_mphy_power_on (hba, true);if (err)
--
2.18.0
Re: [PATCH v1 5/7] ufs: host: mediatek: rename host power control API
In reply to [email protected]Quoted 79 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
From: Po-Wen Kao <[email protected]>
Host power control is control crypto sram power. Rename it for easy maintain.
Reviewed-by Peter Wang <[email protected]>Signed-off-by Peter Wang <[email protected]>Signed-off-by Po-Wen Kao <[email protected]>--- drivers/ufs/host/ufs-mediatek-sip.h | 13 +++---------- drivers/ufs/host/ufs-mediatek.c | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-)drivers/ufs/host/ufs-mediatek-sip.h +3
-10@@ -16,7 +16,7 @@#define UFS_MTK_SIP_DEVICE_RESET BIT(1)#define UFS_MTK_SIP_CRYPTO_CTRL BIT(2)#define UFS_MTK_SIP_REF_CLK_NOTIFICATION BIT(3) -#define UFS_MTK_SIP_HOST_PWR_CTRL BIT(5) +#define UFS_MTK_SIP_SRAM_PWR_CTRL BIT(5)#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7)@@ -31,13 +31,6 @@ enum ufs_mtk_vcc_num { UFS_VCC_MAX }; -/* -* Host Power Control options -*/ -enum { -HOST_PWR_HCI =0 , -HOST_PWR_MPHY -};/* * SMC call wrapper function @@ -78,8 +71,8 @@ static inline void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_device_reset_ctrl (high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high) -#define ufs_mtk_host_pwr_ctrl (opt, on, res) \ - ufs_mtk_smc(UFS_MTK_SIP_HOST_PWR_CTRL, &(res), opt, on) +#define ufs_mtk_sram_pwr_ctrl (on, res) \ + ufs_mtk_smc(UFS_MTK_SIP_SRAM_PWR_CTRL, &(res), on)#define ufs_mtk_get_vcc_num (res) \drivers/ufs/host/ufs-mediatek-sip.h +0
-0ufs_mtk_smc (UFS_MTK_SIP_GET_VCC_NUM , &(res))drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.c +0
-0
mediatek.c
indexae184e4f90e6..2caf0c1d4e17100644drivers/ufs/host/ufs-mediatek.c +1
-1@@ -1376,7 +1376,7 @@ static int ufs_mtk_suspend(struct ufs_hba *hba,enum ufs_pm_op pm_op, if (ufshcd_is_link_off(hba)) ufs_mtk_device_reset_ctrl(0, res); -ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI ,false ,res ); +ufs_mtk_sram_pwr_ctrl (false ,res );return 0 ;fail:
drivers/ufs/host/ufs-mediatek.c +1
-1@@ -1397,7 +1397,7 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)if (hba->ufshcd_state !=UFSHCD_STATE_OPERATIONAL )ufs_mtk_dev_vreg_set_lpm (hba, false); -ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI , true, res); +ufs_mtk_sram_pwr_ctrl (true, res); err =ufs_mtk_mphy_power_on (hba, true);
Quoted 1 line
if (err)
Re: [PATCH v1 5/7] ufs: host: mediatek: rename host power control API
In reply to [email protected]Quoted 1 line · On 3/7/24 23:02, [email protected] wrote:
Host power control is control crypto sram power.
The above sentence is incomprehensible to me.
Thanks,
Bart.
Peter Wang (王信友)
maintainerRe: [PATCH v1 5/7] ufs: host: mediatek: rename host power control API
Quoted 11 lines · Bart Van Assche
External email : Please do not click links or open attachments until you have verified the sender or the content.
Quoted 1 line · On 3/7/24 23:02, [email protected] wrote:
Host power control is control crypto sram power.
The above sentence is incomprehensible to me.
Thanks,
Bart.
Hi Bart,
It is medaitek host design.
Will add more description next version.
Thanks.
Peter
[email protected]
maintainerPATCH 6/7 ufs: host: mediatek: support mphy reset
In reply to [email protected]From: Peter Wang <[email protected]>
This patch will reset mphy when host reset.
Backup mphy setting after mphy reset control get.
Restore mphy setting after mphy reset.
--- drivers/ufs/host/ufs-mediatek-sip.h | 9 ++++++++- drivers/ufs/host/ufs-mediatek.c | 14 ++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 3 files changed, 23 insertions(+), 1 deletion(-)
drivers/ufs/host/ufs-mediatek-sip.h +8 -1
@@ -19,7 +19,7 @@#define UFS_MTK_SIP_SRAM_PWR_CTRL BIT(5)#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7) - +#define UFS_MTK_SIP_MPHY_CTRL BIT(8)/* * Multi-VCC by Numbering
@@ -31,6 +31,10 @@ enum ufs_mtk_vcc_num { UFS_VCC_MAX }; +enum ufs_mtk_mphy_op { +UFS_MPHY_BACKUP =0 , +UFS_MPHY_RESTORE +};/* * SMC call wrapper function
@@ -80,4 +84,7 @@ static inline void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_device_pwr_ctrl (on, ufs_version, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_PWR_CTRL, &(res), on, ufs_version) +#define ufs_mtk_mphy_ctrl (op, res) \ + ufs_mtk_smc(UFS_MTK_SIP_MPHY_CTRL, &(res), op) +#endif /* !_UFS_MEDIATEK_SIP_H */
drivers/ufs/host/ufs-mediatek.c +14 -0
@@ -185,16 +185,23 @@ static void ufs_mtk_crypto_enable(struct ufs_hba *hba)static void ufs_mtk_host_reset (struct ufs_hba *hba) {struct ufs_mtk_host *host =ufshcd_get_variant (hba); +struct arm_smccc_res res;reset_control_assert (host->hci_reset);reset_control_assert (host->crypto_reset);reset_control_assert (host->unipro_reset); +reset_control_assert (host->mphy_reset);usleep_range (100 ,110 );reset_control_deassert (host->unipro_reset);reset_control_deassert (host->crypto_reset);reset_control_deassert (host->hci_reset); +reset_control_deassert (host->mphy_reset); + +/* restore mphy setting aftre mphy reset */ +if (host->mphy_reset) +ufs_mtk_mphy_ctrl (UFS_MPHY_RESTORE , res); } static void ufs_mtk_init_reset_control(struct ufs_hba *hba,
@@ -219,6 +226,8 @@ static void ufs_mtk_init_reset(struct ufs_hba *hba) "unipro_rst");ufs_mtk_init_reset_control (hba, &host->crypto_reset,"crypto_rst" ); +ufs_mtk_init_reset_control (hba, &host->mphy_reset, +"mphy_rst" ); } static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba,
@@ -918,6 +927,7 @@ static int ufs_mtk_init(struct ufs_hba *hba)struct device *dev = hba->dev;struct ufs_mtk_host *host;int err =0 ; +struct arm_smccc_res res; host =devm_kzalloc (dev,sizeof (*host),GFP_KERNEL );if (!host) {
@@ -946,6 +956,10 @@ static int ufs_mtk_init(struct ufs_hba *hba)ufs_mtk_init_reset (hba); +/* backup mphy setting if mphy can reset */ +if (host->mphy_reset) +ufs_mtk_mphy_ctrl (UFS_MPHY_BACKUP , res); +/* Enable runtime autosuspend */ hba->caps |=UFSHCD_CAP_RPM_AUTOSUSPEND ;
drivers/ufs/host/ufs-mediatek.h +1 -0
@@ -166,6 +166,7 @@ struct ufs_mtk_host {struct reset_control *hci_reset;struct reset_control *unipro_reset;struct reset_control *crypto_reset; +struct reset_control *mphy_reset;struct ufs_hba *hba;struct ufs_mtk_crypt_cfg *crypt;struct ufs_mtk_clk mclk;
Signature · 1 line
2.18.0
Re: [PATCH v1 6/7] ufs: host: mediatek: support mphy reset
Quoted 113 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
This patch will reset mphy when host reset.
Backup mphy setting after mphy reset control get.
Restore mphy setting after mphy reset.Signed-off-by Peter Wang <[email protected]>--- drivers/ufs/host/ufs-mediatek-sip.h | 9 ++++++++- drivers/ufs/host/ufs-mediatek.c | 14 ++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 3 files changed, 23 insertions(+), 1 deletion(-)drivers/ufs/host/ufs-mediatek-sip.h +8
-1@@ -19,7 +19,7 @@#define UFS_MTK_SIP_SRAM_PWR_CTRL BIT(5)#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7) - +#define UFS_MTK_SIP_MPHY_CTRL BIT(8)/* * Multi-VCC by Numbering @@ -31,6 +31,10 @@ enum ufs_mtk_vcc_num { UFS_VCC_MAX }; +enum ufs_mtk_mphy_op { +UFS_MPHY_BACKUP =0 , +UFS_MPHY_RESTORE +};/* * SMC call wrapper function @@ -80,4 +84,7 @@ static inline void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_device_pwr_ctrl (on, ufs_version, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_PWR_CTRL, &(res), on, ufs_version) +#define ufs_mtk_mphy_ctrl (op, res) \ + ufs_mtk_smc(UFS_MTK_SIP_MPHY_CTRL, &(res), op) +#endif /* !_UFS_MEDIATEK_SIP_H */ drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.c +0
-0
mediatek.c
index2caf0c1d4e17..c4aae031b694100644drivers/ufs/host/ufs-mediatek.c +7
-0@@ -185,16 +185,23 @@ static void ufs_mtk_crypto_enable(struct ufs_hba *hba)static void ufs_mtk_host_reset (struct ufs_hba *hba) {struct ufs_mtk_host *host =ufshcd_get_variant (hba); +struct arm_smccc_res res;reset_control_assert (host->hci_reset);reset_control_assert (host->crypto_reset);reset_control_assert (host->unipro_reset); +reset_control_assert (host->mphy_reset);usleep_range (100 ,110 );reset_control_deassert (host->unipro_reset);reset_control_deassert (host->crypto_reset);reset_control_deassert (host->hci_reset); +reset_control_deassert (host->mphy_reset); + +/* restore mphy setting aftre mphy reset */ +if (host->mphy_reset) +ufs_mtk_mphy_ctrl (UFS_MPHY_RESTORE , res); }static void ufs_mtk_init_reset_control(struct
ufs_hba*hba,drivers/ufs/host/ufs-mediatek.c +2
-0@@ -219,6 +226,8 @@ static void ufs_mtk_init_reset(struct ufs_hba *hba) "unipro_rst");ufs_mtk_init_reset_control (hba, &host->crypto_reset,"crypto_rst" ); +ufs_mtk_init_reset_control (hba, &host->mphy_reset, +"mphy_rst" ); }static int ufs_mtk_hce_enable_notify(struct
ufs_hba*hba,drivers/ufs/host/ufs-mediatek.c +5
-0@@ -918,6 +927,7 @@ static int ufs_mtk_init(struct ufs_hba *hba)struct device *dev = hba->dev;struct ufs_mtk_host *host;int err =0 ; +struct arm_smccc_res res; host =devm_kzalloc (dev,sizeof (*host),GFP_KERNEL );if (!host) {@@ -946,6 +956,10 @@ static int ufs_mtk_init(struct ufs_hba *hba)ufs_mtk_init_reset (hba); +/* backup mphy setting if mphy can reset */ +if (host->mphy_reset) +ufs_mtk_mphy_ctrl (UFS_MPHY_BACKUP , res); +/* Enable runtime autosuspend */ hba->caps |=UFSHCD_CAP_RPM_AUTOSUSPEND ;drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.h +0
-0
mediatek.h
index17be3f748fa0..6129ab59e5f5100644
drivers/ufs/host/ufs-mediatek.h struct ufs_mtk_host { · line 172
Quoted 7 lines
drivers/ufs/host/ufs-mediatek.h +1
-0@@ -166,6 +166,7 @@ struct ufs_mtk_host {struct reset_control *hci_reset;struct reset_control *unipro_reset;struct reset_control *crypto_reset; +struct reset_control *mphy_reset;struct ufs_hba *hba;struct ufs_mtk_crypt_cfg *crypt;struct ufs_mtk_clk mclk;
[email protected]
maintainerPATCH 7/7 ufs: host: mediatek: support rtff in PM flow
In reply to [email protected]From: Peter Wang <[email protected]>
From: Alice Chao <[email protected]>
--- drivers/ufs/host/ufs-mediatek-sip.h | 4 ++++ drivers/ufs/host/ufs-mediatek.c | 35 +++++++++++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 2 ++ 3 files changed, 41 insertions(+)
drivers/ufs/host/ufs-mediatek-sip.h +4 -0
@@ -20,6 +20,7 @@#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7)#define UFS_MTK_SIP_MPHY_CTRL BIT(8) +#define UFS_MTK_SIP_MTCMOS_CTRL BIT(9)/* * Multi-VCC by Numbering
@@ -87,4 +88,7 @@ static inline void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_mphy_ctrl (op, res) \ ufs_mtk_smc(UFS_MTK_SIP_MPHY_CTRL, &(res), op) +#define ufs_mtk_mtcmos_ctrl (op, res) \ + ufs_mtk_smc(UFS_MTK_SIP_MTCMOS_CTRL, &(res), op) +#endif /* !_UFS_MEDIATEK_SIP_H */
drivers/ufs/host/ufs-mediatek.c +35 -0
@@ -127,6 +127,13 @@ static bool ufs_mtk_is_tx_skew_fix(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_TX_SKEW_FIX ); } +static bool ufs_mtk_is_rtff_mtcmos (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_RTFF_MTCMOS ); +} +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) {struct ufs_mtk_host *host =ufshcd_get_variant (hba);
@@ -653,6 +660,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-disable-mcq" )) host->caps |=UFS_MTK_CAP_DISABLE_MCQ ; +if (of_property_read_bool (np,"mediatek,ufs-rtff-mtcmos" )) + host->caps |=UFS_MTK_CAP_RTFF_MTCMOS ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }
@@ -993,6 +1003,15 @@ static int ufs_mtk_init(struct ufs_hba *hba)* Enable phy clocks specifically here. */ ufs_mtk_mphy_power_on (hba, true); + +if (ufs_mtk_is_rtff_mtcmos (hba)) { +/* First Restore here, to avoid backup unexpected value */ +ufs_mtk_mtcmos_ctrl (false, res); + +/* Power on to init */ +ufs_mtk_mtcmos_ctrl (true, res); + } +ufs_mtk_setup_clocks (hba, true,POST_CHANGE ); host->ip_ver =ufshcd_readl (hba,REG_UFS_MTK_IP_VER );
@@ -1823,6 +1842,7 @@ static void ufs_mtk_remove(struct platform_device *pdev)static int ufs_mtk_system_suspend (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res;int ret; ret =ufshcd_system_suspend (dev);
@@ -1831,15 +1851,22 @@ static int ufs_mtk_system_suspend(struct device *dev)ufs_mtk_dev_vreg_set_lpm (hba, true); +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (false, res); + return 0; }static int ufs_mtk_system_resume (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res;ufs_mtk_dev_vreg_set_lpm (hba, false); +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (true, res); +return ufshcd_system_resume (dev); }#endif
@@ -1848,6 +1875,7 @@ static int ufs_mtk_system_resume(struct device *dev)static int ufs_mtk_runtime_suspend (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res;int ret =0 ; ret =ufshcd_runtime_suspend (dev);
@@ -1856,12 +1884,19 @@ static int ufs_mtk_runtime_suspend(struct device *dev)ufs_mtk_dev_vreg_set_lpm (hba, true); +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (false, res); +return 0 ; }static int ufs_mtk_runtime_resume (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res; + +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (true, res);ufs_mtk_dev_vreg_set_lpm (hba, false);
drivers/ufs/host/ufs-mediatek.h +2 -0
@@ -131,6 +131,8 @@ enum ufs_mtk_host_caps {UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 ,UFS_MTK_CAP_TX_SKEW_FIX =1 <<7 ,UFS_MTK_CAP_DISABLE_MCQ =1 <<8 , +/* Control MTCMOS with RTFF */ + UFS_MTK_CAP_RTFF_MTCMOS = 1 << 9, }; struct ufs_mtk_crypt_cfg {
Signature · 1 line
2.18.0
Re: [PATCH v1 7/7] ufs: host: mediatek: support rtff in PM flow
Quoted 153 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
From: Alice Chao <[email protected]>
Reviewed-by Peter Wang <[email protected]>Signed-off-by Peter Wang <[email protected]>Signed-off-by Alice Chao <[email protected]>--- drivers/ufs/host/ufs-mediatek-sip.h | 4 ++++ drivers/ufs/host/ufs-mediatek.c | 35 +++++++++++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 2 ++ 3 files changed, 41 insertions(+)drivers/ufs/host/ufs-mediatek-sip.h +4
-0@@ -20,6 +20,7 @@#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7)#define UFS_MTK_SIP_MPHY_CTRL BIT(8) +#define UFS_MTK_SIP_MTCMOS_CTRL BIT(9)/* * Multi-VCC by Numbering @@ -87,4 +88,7 @@ static inline void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_mphy_ctrl (op, res) \ ufs_mtk_smc(UFS_MTK_SIP_MPHY_CTRL, &(res), op) +#define ufs_mtk_mtcmos_ctrl (op, res) \ + ufs_mtk_smc(UFS_MTK_SIP_MTCMOS_CTRL, &(res), op) +#endif /* !_UFS_MEDIATEK_SIP_H */
drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.c +0
-0
mediatek.c
indexc4aae031b694..2f191525c308100644drivers/ufs/host/ufs-mediatek.c +7
-0@@ -127,6 +127,13 @@ static bool ufs_mtk_is_tx_skew_fix(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_TX_SKEW_FIX ); } +static bool ufs_mtk_is_rtff_mtcmos (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return !!(host->caps &UFS_MTK_CAP_RTFF_MTCMOS ); +} +static bool ufs_mtk_is_allow_vccqx_lpm (struct ufs_hba *hba) {drivers/ufs/host/ufs-mediatek.c +12
-0struct ufs_mtk_host *host =ufshcd_get_variant (hba);@@ -653,6 +660,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-disable-mcq" )) host->caps |=UFS_MTK_CAP_DISABLE_MCQ ; +if (of_property_read_bool (np,"mediatek,ufs-rtff-mtcmos" )) + host->caps |=UFS_MTK_CAP_RTFF_MTCMOS ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }@@ -993,6 +1003,15 @@ static int ufs_mtk_init(struct ufs_hba *hba)* Enable phy clocks specifically here. */ ufs_mtk_mphy_power_on (hba, true); + +if (ufs_mtk_is_rtff_mtcmos (hba)) { +/* First Restore here, to avoid backup unexpected value */ +ufs_mtk_mtcmos_ctrl (false, res); + +/* Power on to init */ +ufs_mtk_mtcmos_ctrl (true, res); + } +ufs_mtk_setup_clocks (hba, true,POST_CHANGE );drivers/ufs/host/ufs-mediatek.c +1
-0host->ip_ver =ufshcd_readl (hba,REG_UFS_MTK_IP_VER );@@ -1823,6 +1842,7 @@ static void ufs_mtk_remove(struct platform_device *pdev)static int ufs_mtk_system_suspend (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res;int ret;drivers/ufs/host/ufs-mediatek.c +7
-0ret =ufshcd_system_suspend (dev);@@ -1831,15 +1851,22 @@ static int ufs_mtk_system_suspend(struct device *dev)ufs_mtk_dev_vreg_set_lpm (hba ,true ); +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (false, res); +return 0 ; }static int ufs_mtk_system_resume (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res;ufs_mtk_dev_vreg_set_lpm (hba, false); +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (true, res); +return ufshcd_system_resume (dev); }#endif
drivers/ufs/host/ufs-mediatek.c +1
-0@@ -1848,6 +1875,7 @@ static int ufs_mtk_system_resume(struct device *dev)static int ufs_mtk_runtime_suspend (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res;int ret =0 ;drivers/ufs/host/ufs-mediatek.c +7
-0ret =ufshcd_runtime_suspend (dev);@@ -1856,12 +1884,19 @@ static int ufs_mtk_runtime_suspend(struct device *dev)ufs_mtk_dev_vreg_set_lpm (hba ,true ); +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (false, res); +return 0 ; }static int ufs_mtk_runtime_resume (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct arm_smccc_res res; + +if (ufs_mtk_is_rtff_mtcmos (hba)) +ufs_mtk_mtcmos_ctrl (true, res);ufs_mtk_dev_vreg_set_lpm (hba, false);drivers/ufs/host/ufs- renamed from drivers/ufs/host/ufs-mediatek.h +0
-0
mediatek.h
index6129ab59e5f5..599fea66663b100644
drivers/ufs/host/ufs-mediatek.h enum ufs_mtk_host_caps { · line 138
Quoted 8 lines
drivers/ufs/host/ufs-mediatek.h +2
-0@@ -131,6 +131,8 @@ enum ufs_mtk_host_caps {UFS_MTK_CAP_PMC_VIA_FASTAUTO =1 <<6 ,UFS_MTK_CAP_TX_SKEW_FIX =1 <<7 ,UFS_MTK_CAP_DISABLE_MCQ =1 <<8 , +/* Control MTCMOS with RTFF */ + UFS_MTK_CAP_RTFF_MTCMOS = 1 << 9, }; struct ufs_mtk_crypt_cfg {
Quoted 18 lines · On Fri, 2024-03-08 at 15:02 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
This series fixes some defects and provide features in MediaTek UFS drivers.
Peter Wang (3):
ufs: host: mediatek: fix vsx/vccqx control logic
ufs: host: mediatek: tx skew fix
ufs: host: mediatek: support mphy resetPo-Wen Kao (3):
ufs: host: mediatek: AddUFS_MTK_CAP_DISABLE_MCQ
ufs: host: mediatek: ufs mtk sip command reconstruct
ufs: host: mediatek: rename host power control APIAlice Chao (1):
ufs: host: mediatek: support rtff in PM flow
Quoted 7 lines
drivers/ufs/host/ufs-mediatek-sip.h | 94 ++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.c | 130 ++++++++++++++++++++++++ ---- drivers/ufs/host/ufs-mediatek.h | 89 +++---------------- 3 files changed, 219 insertions(+), 94 deletions(-) create mode 100755 drivers/ufs/host/ufs-mediatek-sip.h