* [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II
@ 2020-01-17 3:51 Stanley Chu
2020-01-17 3:51 ` [PATCH v1 1/3] scsi: ufs-mediatek: add dbg_register_dump implementation Stanley Chu
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Stanley Chu @ 2020-01-17 3:51 UTC (permalink / raw)
To: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: Stanley Chu, bvanassche, andy.teng, chun-hung.wu, kuohong.wang,
linux-kernel, cang, linux-mediatek, peter.wang, matthias.bgg,
beanhuo, linux-arm-kernel, asutoshd
Hi,
This series adds some MediaTek vendor implementations in UFS driver:
- Callback dbg_register_dump
- Low-power mode for hibern8 state
Stanley Chu (3):
scsi: ufs-mediatek: add dbg_register_dump implementation
scsi: ufs: export some functions for vendor usage
scsi: ufs-mediatek: enable low-power mode for hibern8 state
drivers/scsi/ufs/ufs-mediatek.c | 70 +++++++++++++++++++++++++++++++++
drivers/scsi/ufs/ufs-mediatek.h | 5 +++
drivers/scsi/ufs/ufshcd.c | 11 ++++--
drivers/scsi/ufs/ufshcd.h | 3 ++
4 files changed, 85 insertions(+), 4 deletions(-)
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v1 1/3] scsi: ufs-mediatek: add dbg_register_dump implementation
2020-01-17 3:51 [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Stanley Chu
@ 2020-01-17 3:51 ` Stanley Chu
2020-01-19 14:05 ` Alim Akhtar
2020-01-17 3:51 ` [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage Stanley Chu
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Stanley Chu @ 2020-01-17 3:51 UTC (permalink / raw)
To: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: Stanley Chu, bvanassche, andy.teng, chun-hung.wu, kuohong.wang,
linux-kernel, cang, linux-mediatek, peter.wang, matthias.bgg,
beanhuo, linux-arm-kernel, asutoshd
Add dbg_register_dump variant vendor implementation in MediaTek
UFS driver.
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
drivers/scsi/ufs/ufs-mediatek.c | 16 ++++++++++++++++
drivers/scsi/ufs/ufs-mediatek.h | 5 +++++
2 files changed, 21 insertions(+)
diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 8d999c0e60fe..d5194d0c4ef5 100644
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -406,6 +406,21 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
return 0;
}
+static void ufs_mtk_dbg_register_dump(struct ufs_hba *hba)
+{
+ ufshcd_dump_regs(hba, REG_UFS_REFCLK_CTRL, 0x4, "Ref-Clk Ctrl ");
+
+ ufshcd_dump_regs(hba, REG_UFS_EXTREG, 0x4, "Ext Reg ");
+
+ ufshcd_dump_regs(hba, REG_UFS_MPHYCTRL,
+ REG_UFS_REJECT_MON - REG_UFS_MPHYCTRL + 4,
+ "MPHY Ctrl ");
+
+ /* Direct debugging information to REG_MTK_PROBE */
+ ufshcd_writel(hba, 0x20, REG_UFS_DEBUG_SEL);
+ ufshcd_dump_regs(hba, REG_UFS_PROBE, 0x4, "Debug Probe ");
+}
+
static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba,
struct ufs_dev_desc *card)
{
@@ -430,6 +445,7 @@ static struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
.apply_dev_quirks = ufs_mtk_apply_dev_quirks,
.suspend = ufs_mtk_suspend,
.resume = ufs_mtk_resume,
+ .dbg_register_dump = ufs_mtk_dbg_register_dump,
.device_reset = ufs_mtk_device_reset,
};
diff --git a/drivers/scsi/ufs/ufs-mediatek.h b/drivers/scsi/ufs/ufs-mediatek.h
index 31b7fead19eb..fccdd979d6fb 100644
--- a/drivers/scsi/ufs/ufs-mediatek.h
+++ b/drivers/scsi/ufs/ufs-mediatek.h
@@ -13,6 +13,11 @@
* Vendor specific UFSHCI Registers
*/
#define REG_UFS_REFCLK_CTRL 0x144
+#define REG_UFS_EXTREG 0x2100
+#define REG_UFS_MPHYCTRL 0x2200
+#define REG_UFS_REJECT_MON 0x22AC
+#define REG_UFS_DEBUG_SEL 0x22C0
+#define REG_UFS_PROBE 0x22C8
/*
* Ref-clk control
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage
2020-01-17 3:51 [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Stanley Chu
2020-01-17 3:51 ` [PATCH v1 1/3] scsi: ufs-mediatek: add dbg_register_dump implementation Stanley Chu
@ 2020-01-17 3:51 ` Stanley Chu
2020-01-19 14:12 ` Alim Akhtar
2020-01-20 20:49 ` Asutosh Das (asd)
2020-01-17 3:51 ` [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state Stanley Chu
2020-01-21 0:10 ` [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Martin K. Petersen
3 siblings, 2 replies; 10+ messages in thread
From: Stanley Chu @ 2020-01-17 3:51 UTC (permalink / raw)
To: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: Stanley Chu, bvanassche, andy.teng, chun-hung.wu, kuohong.wang,
linux-kernel, cang, linux-mediatek, peter.wang, matthias.bgg,
beanhuo, linux-arm-kernel, asutoshd
Export below functions for vendor usage,
int ufshcd_hba_enable(struct ufs_hba *hba);
int ufshcd_make_hba_operational(struct ufs_hba *hba);
int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
drivers/scsi/ufs/ufshcd.c | 11 +++++++----
drivers/scsi/ufs/ufshcd.h | 3 +++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index bea036ab189a..1168baf358ea 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -250,7 +250,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba);
static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
bool skip_ref_clk);
static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);
-static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
@@ -3865,7 +3864,7 @@ static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba)
return ret;
}
-static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
+int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
{
struct uic_command uic_cmd = {0};
int ret;
@@ -3891,6 +3890,7 @@ static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
return ret;
}
+EXPORT_SYMBOL_GPL(ufshcd_uic_hibern8_exit);
void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit)
{
@@ -4162,7 +4162,7 @@ static int ufshcd_complete_dev_init(struct ufs_hba *hba)
*
* Returns 0 on success, non-zero value on failure
*/
-static int ufshcd_make_hba_operational(struct ufs_hba *hba)
+int ufshcd_make_hba_operational(struct ufs_hba *hba)
{
int err = 0;
u32 reg;
@@ -4208,6 +4208,7 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
out:
return err;
}
+EXPORT_SYMBOL_GPL(ufshcd_make_hba_operational);
/**
* ufshcd_hba_stop - Send controller to reset state
@@ -4285,7 +4286,7 @@ static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
return 0;
}
-static int ufshcd_hba_enable(struct ufs_hba *hba)
+int ufshcd_hba_enable(struct ufs_hba *hba)
{
int ret;
@@ -4310,6 +4311,8 @@ static int ufshcd_hba_enable(struct ufs_hba *hba)
return ret;
}
+EXPORT_SYMBOL_GPL(ufshcd_hba_enable);
+
static int ufshcd_disable_tx_lcc(struct ufs_hba *hba, bool peer)
{
int tx_lanes, i, err = 0;
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index b1a1c65be8b1..fca372d98495 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -799,8 +799,11 @@ static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg)
int ufshcd_alloc_host(struct device *, struct ufs_hba **);
void ufshcd_dealloc_host(struct ufs_hba *);
+int ufshcd_hba_enable(struct ufs_hba *hba);
int ufshcd_init(struct ufs_hba * , void __iomem * , unsigned int);
+int ufshcd_make_hba_operational(struct ufs_hba *hba);
void ufshcd_remove(struct ufs_hba *);
+int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
u32 val, unsigned long interval_us,
unsigned long timeout_ms, bool can_sleep);
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state
2020-01-17 3:51 [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Stanley Chu
2020-01-17 3:51 ` [PATCH v1 1/3] scsi: ufs-mediatek: add dbg_register_dump implementation Stanley Chu
2020-01-17 3:51 ` [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage Stanley Chu
@ 2020-01-17 3:51 ` Stanley Chu
2020-01-19 14:27 ` Alim Akhtar
2020-01-20 20:52 ` Asutosh Das (asd)
2020-01-21 0:10 ` [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Martin K. Petersen
3 siblings, 2 replies; 10+ messages in thread
From: Stanley Chu @ 2020-01-17 3:51 UTC (permalink / raw)
To: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: Stanley Chu, bvanassche, andy.teng, chun-hung.wu, kuohong.wang,
linux-kernel, cang, linux-mediatek, peter.wang, matthias.bgg,
beanhuo, linux-arm-kernel, asutoshd
In MediaTek Chipsets, UniPro link and ufshci can enter proprietary
low-power mode while link is in hibern8 state.
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
drivers/scsi/ufs/ufs-mediatek.c | 53 +++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index d5194d0c4ef5..f32f3f34f6d0 100644
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -382,11 +382,60 @@ static void ufs_mtk_device_reset(struct ufs_hba *hba)
dev_info(hba->dev, "device reset done\n");
}
+static int ufs_mtk_link_set_hpm(struct ufs_hba *hba)
+{
+ int err;
+
+ err = ufshcd_hba_enable(hba);
+ if (err)
+ return err;
+
+ err = ufshcd_dme_set(hba,
+ UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
+ 0);
+ if (err)
+ return err;
+
+ err = ufshcd_uic_hibern8_exit(hba);
+ if (!err)
+ ufshcd_set_link_active(hba);
+ else
+ return err;
+
+ err = ufshcd_make_hba_operational(hba);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+static int ufs_mtk_link_set_lpm(struct ufs_hba *hba)
+{
+ int err;
+
+ err = ufshcd_dme_set(hba,
+ UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
+ 1);
+ if (err) {
+ /* Resume UniPro state for following error recovery */
+ ufshcd_dme_set(hba,
+ UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
+ 0);
+ return err;
+ }
+
+ return 0;
+}
+
static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
{
+ int err;
struct ufs_mtk_host *host = ufshcd_get_variant(hba);
if (ufshcd_is_link_hibern8(hba)) {
+ err = ufs_mtk_link_set_lpm(hba);
+ if (err)
+ return -EAGAIN;
phy_power_off(host->mphy);
ufs_mtk_setup_ref_clk(hba, false);
}
@@ -397,10 +446,14 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
{
struct ufs_mtk_host *host = ufshcd_get_variant(hba);
+ int err;
if (ufshcd_is_link_hibern8(hba)) {
ufs_mtk_setup_ref_clk(hba, true);
phy_power_on(host->mphy);
+ err = ufs_mtk_link_set_hpm(hba);
+ if (err)
+ return err;
}
return 0;
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v1 1/3] scsi: ufs-mediatek: add dbg_register_dump implementation
2020-01-17 3:51 ` [PATCH v1 1/3] scsi: ufs-mediatek: add dbg_register_dump implementation Stanley Chu
@ 2020-01-19 14:05 ` Alim Akhtar
0 siblings, 0 replies; 10+ messages in thread
From: Alim Akhtar @ 2020-01-19 14:05 UTC (permalink / raw)
To: Stanley Chu
Cc: linux-scsi, Martin K. Petersen, andy.teng, James E.J. Bottomley,
chun-hung.wu, Kuohong Wang, open list, Avri Altman, Can Guo,
linux-mediatek, peter.wang, Alim Akhtar, Matthias Brugger,
asutoshd, Bart Van Assche, linux-arm-kernel, Bean Huo (beanhuo)
Hi Stanley
On Fri, Jan 17, 2020 at 9:44 AM Stanley Chu <stanley.chu@mediatek.com> wrote:
>
> Add dbg_register_dump variant vendor implementation in MediaTek
> UFS driver.
>
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
> ---
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> drivers/scsi/ufs/ufs-mediatek.c | 16 ++++++++++++++++
> drivers/scsi/ufs/ufs-mediatek.h | 5 +++++
> 2 files changed, 21 insertions(+)
>
> diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
> index 8d999c0e60fe..d5194d0c4ef5 100644
> --- a/drivers/scsi/ufs/ufs-mediatek.c
> +++ b/drivers/scsi/ufs/ufs-mediatek.c
> @@ -406,6 +406,21 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
> return 0;
> }
>
> +static void ufs_mtk_dbg_register_dump(struct ufs_hba *hba)
> +{
> + ufshcd_dump_regs(hba, REG_UFS_REFCLK_CTRL, 0x4, "Ref-Clk Ctrl ");
> +
> + ufshcd_dump_regs(hba, REG_UFS_EXTREG, 0x4, "Ext Reg ");
> +
> + ufshcd_dump_regs(hba, REG_UFS_MPHYCTRL,
> + REG_UFS_REJECT_MON - REG_UFS_MPHYCTRL + 4,
> + "MPHY Ctrl ");
> +
> + /* Direct debugging information to REG_MTK_PROBE */
> + ufshcd_writel(hba, 0x20, REG_UFS_DEBUG_SEL);
> + ufshcd_dump_regs(hba, REG_UFS_PROBE, 0x4, "Debug Probe ");
> +}
> +
> static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba,
> struct ufs_dev_desc *card)
> {
> @@ -430,6 +445,7 @@ static struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
> .apply_dev_quirks = ufs_mtk_apply_dev_quirks,
> .suspend = ufs_mtk_suspend,
> .resume = ufs_mtk_resume,
> + .dbg_register_dump = ufs_mtk_dbg_register_dump,
> .device_reset = ufs_mtk_device_reset,
> };
>
> diff --git a/drivers/scsi/ufs/ufs-mediatek.h b/drivers/scsi/ufs/ufs-mediatek.h
> index 31b7fead19eb..fccdd979d6fb 100644
> --- a/drivers/scsi/ufs/ufs-mediatek.h
> +++ b/drivers/scsi/ufs/ufs-mediatek.h
> @@ -13,6 +13,11 @@
> * Vendor specific UFSHCI Registers
> */
> #define REG_UFS_REFCLK_CTRL 0x144
> +#define REG_UFS_EXTREG 0x2100
> +#define REG_UFS_MPHYCTRL 0x2200
> +#define REG_UFS_REJECT_MON 0x22AC
> +#define REG_UFS_DEBUG_SEL 0x22C0
> +#define REG_UFS_PROBE 0x22C8
>
> /*
> * Ref-clk control
> --
> 2.18.0
--
Regards,
Alim
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage
2020-01-17 3:51 ` [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage Stanley Chu
@ 2020-01-19 14:12 ` Alim Akhtar
2020-01-20 20:49 ` Asutosh Das (asd)
1 sibling, 0 replies; 10+ messages in thread
From: Alim Akhtar @ 2020-01-19 14:12 UTC (permalink / raw)
To: Stanley Chu
Cc: linux-scsi, Martin K. Petersen, andy.teng, James E.J. Bottomley,
chun-hung.wu, Kuohong Wang, open list, Avri Altman, Can Guo,
linux-mediatek, peter.wang, Alim Akhtar, Matthias Brugger,
asutoshd, Bart Van Assche, linux-arm-kernel, Bean Huo (beanhuo)
On Fri, Jan 17, 2020 at 9:45 AM Stanley Chu <stanley.chu@mediatek.com> wrote:
>
> Export below functions for vendor usage,
>
> int ufshcd_hba_enable(struct ufs_hba *hba);
> int ufshcd_make_hba_operational(struct ufs_hba *hba);
> int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
>
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
> ---
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> drivers/scsi/ufs/ufshcd.c | 11 +++++++----
> drivers/scsi/ufs/ufshcd.h | 3 +++
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index bea036ab189a..1168baf358ea 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -250,7 +250,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba);
> static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
> bool skip_ref_clk);
> static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);
> -static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
> static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
> static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
> static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
> @@ -3865,7 +3864,7 @@ static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba)
> return ret;
> }
>
> -static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
> +int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
> {
> struct uic_command uic_cmd = {0};
> int ret;
> @@ -3891,6 +3890,7 @@ static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
>
> return ret;
> }
> +EXPORT_SYMBOL_GPL(ufshcd_uic_hibern8_exit);
>
> void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit)
> {
> @@ -4162,7 +4162,7 @@ static int ufshcd_complete_dev_init(struct ufs_hba *hba)
> *
> * Returns 0 on success, non-zero value on failure
> */
> -static int ufshcd_make_hba_operational(struct ufs_hba *hba)
> +int ufshcd_make_hba_operational(struct ufs_hba *hba)
> {
> int err = 0;
> u32 reg;
> @@ -4208,6 +4208,7 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
> out:
> return err;
> }
> +EXPORT_SYMBOL_GPL(ufshcd_make_hba_operational);
>
> /**
> * ufshcd_hba_stop - Send controller to reset state
> @@ -4285,7 +4286,7 @@ static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
> return 0;
> }
>
> -static int ufshcd_hba_enable(struct ufs_hba *hba)
> +int ufshcd_hba_enable(struct ufs_hba *hba)
> {
> int ret;
>
> @@ -4310,6 +4311,8 @@ static int ufshcd_hba_enable(struct ufs_hba *hba)
>
> return ret;
> }
> +EXPORT_SYMBOL_GPL(ufshcd_hba_enable);
> +
> static int ufshcd_disable_tx_lcc(struct ufs_hba *hba, bool peer)
> {
> int tx_lanes, i, err = 0;
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> index b1a1c65be8b1..fca372d98495 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -799,8 +799,11 @@ static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg)
>
> int ufshcd_alloc_host(struct device *, struct ufs_hba **);
> void ufshcd_dealloc_host(struct ufs_hba *);
> +int ufshcd_hba_enable(struct ufs_hba *hba);
> int ufshcd_init(struct ufs_hba * , void __iomem * , unsigned int);
> +int ufshcd_make_hba_operational(struct ufs_hba *hba);
> void ufshcd_remove(struct ufs_hba *);
> +int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
> int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
> u32 val, unsigned long interval_us,
> unsigned long timeout_ms, bool can_sleep);
> --
> 2.18.0
--
Regards,
Alim
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state
2020-01-17 3:51 ` [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state Stanley Chu
@ 2020-01-19 14:27 ` Alim Akhtar
2020-01-20 20:52 ` Asutosh Das (asd)
1 sibling, 0 replies; 10+ messages in thread
From: Alim Akhtar @ 2020-01-19 14:27 UTC (permalink / raw)
To: Stanley Chu
Cc: linux-scsi, Martin K. Petersen, andy.teng, James E.J. Bottomley,
chun-hung.wu, Kuohong Wang, open list, Avri Altman, Can Guo,
linux-mediatek, peter.wang, Alim Akhtar, Matthias Brugger,
asutoshd, Bart Van Assche, linux-arm-kernel, Bean Huo (beanhuo)
On Fri, Jan 17, 2020 at 9:44 AM Stanley Chu <stanley.chu@mediatek.com> wrote:
>
> In MediaTek Chipsets, UniPro link and ufshci can enter proprietary
> low-power mode while link is in hibern8 state.
>
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
> ---
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> drivers/scsi/ufs/ufs-mediatek.c | 53 +++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
>
> diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
> index d5194d0c4ef5..f32f3f34f6d0 100644
> --- a/drivers/scsi/ufs/ufs-mediatek.c
> +++ b/drivers/scsi/ufs/ufs-mediatek.c
> @@ -382,11 +382,60 @@ static void ufs_mtk_device_reset(struct ufs_hba *hba)
> dev_info(hba->dev, "device reset done\n");
> }
>
> +static int ufs_mtk_link_set_hpm(struct ufs_hba *hba)
> +{
> + int err;
> +
> + err = ufshcd_hba_enable(hba);
> + if (err)
> + return err;
> +
> + err = ufshcd_dme_set(hba,
> + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
> + 0);
> + if (err)
> + return err;
> +
> + err = ufshcd_uic_hibern8_exit(hba);
> + if (!err)
> + ufshcd_set_link_active(hba);
> + else
> + return err;
> +
> + err = ufshcd_make_hba_operational(hba);
> + if (err)
> + return err;
> +
> + return 0;
> +}
> +
> +static int ufs_mtk_link_set_lpm(struct ufs_hba *hba)
> +{
> + int err;
> +
> + err = ufshcd_dme_set(hba,
> + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
> + 1);
> + if (err) {
> + /* Resume UniPro state for following error recovery */
> + ufshcd_dme_set(hba,
> + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
> + 0);
> + return err;
> + }
> +
> + return 0;
> +}
> +
> static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
> {
> + int err;
> struct ufs_mtk_host *host = ufshcd_get_variant(hba);
>
> if (ufshcd_is_link_hibern8(hba)) {
> + err = ufs_mtk_link_set_lpm(hba);
> + if (err)
> + return -EAGAIN;
> phy_power_off(host->mphy);
> ufs_mtk_setup_ref_clk(hba, false);
> }
> @@ -397,10 +446,14 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
> static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
> {
> struct ufs_mtk_host *host = ufshcd_get_variant(hba);
> + int err;
>
> if (ufshcd_is_link_hibern8(hba)) {
> ufs_mtk_setup_ref_clk(hba, true);
> phy_power_on(host->mphy);
> + err = ufs_mtk_link_set_hpm(hba);
> + if (err)
> + return err;
> }
>
> return 0;
> --
> 2.18.0
--
Regards,
Alim
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage
2020-01-17 3:51 ` [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage Stanley Chu
2020-01-19 14:12 ` Alim Akhtar
@ 2020-01-20 20:49 ` Asutosh Das (asd)
1 sibling, 0 replies; 10+ messages in thread
From: Asutosh Das (asd) @ 2020-01-20 20:49 UTC (permalink / raw)
To: Stanley Chu, linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: bvanassche, andy.teng, chun-hung.wu, kuohong.wang, linux-kernel,
cang, linux-mediatek, peter.wang, matthias.bgg, linux-arm-kernel,
beanhuo
On 1/16/2020 7:51 PM, Stanley Chu wrote:
> Export below functions for vendor usage,
>
> int ufshcd_hba_enable(struct ufs_hba *hba);
> int ufshcd_make_hba_operational(struct ufs_hba *hba);
> int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
>
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
> ---
LGTM.
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
> drivers/scsi/ufs/ufshcd.c | 11 +++++++----
> drivers/scsi/ufs/ufshcd.h | 3 +++
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index bea036ab189a..1168baf358ea 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -250,7 +250,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba);
> static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
> bool skip_ref_clk);
> static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);
> -static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
> static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
> static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
> static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
> @@ -3865,7 +3864,7 @@ static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba)
> return ret;
> }
>
> -static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
> +int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
> {
> struct uic_command uic_cmd = {0};
> int ret;
> @@ -3891,6 +3890,7 @@ static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
>
> return ret;
> }
> +EXPORT_SYMBOL_GPL(ufshcd_uic_hibern8_exit);
>
> void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit)
> {
> @@ -4162,7 +4162,7 @@ static int ufshcd_complete_dev_init(struct ufs_hba *hba)
> *
> * Returns 0 on success, non-zero value on failure
> */
> -static int ufshcd_make_hba_operational(struct ufs_hba *hba)
> +int ufshcd_make_hba_operational(struct ufs_hba *hba)
> {
> int err = 0;
> u32 reg;
> @@ -4208,6 +4208,7 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
> out:
> return err;
> }
> +EXPORT_SYMBOL_GPL(ufshcd_make_hba_operational);
>
> /**
> * ufshcd_hba_stop - Send controller to reset state
> @@ -4285,7 +4286,7 @@ static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
> return 0;
> }
>
> -static int ufshcd_hba_enable(struct ufs_hba *hba)
> +int ufshcd_hba_enable(struct ufs_hba *hba)
> {
> int ret;
>
> @@ -4310,6 +4311,8 @@ static int ufshcd_hba_enable(struct ufs_hba *hba)
>
> return ret;
> }
> +EXPORT_SYMBOL_GPL(ufshcd_hba_enable);
> +
> static int ufshcd_disable_tx_lcc(struct ufs_hba *hba, bool peer)
> {
> int tx_lanes, i, err = 0;
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> index b1a1c65be8b1..fca372d98495 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -799,8 +799,11 @@ static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg)
>
> int ufshcd_alloc_host(struct device *, struct ufs_hba **);
> void ufshcd_dealloc_host(struct ufs_hba *);
> +int ufshcd_hba_enable(struct ufs_hba *hba);
> int ufshcd_init(struct ufs_hba * , void __iomem * , unsigned int);
> +int ufshcd_make_hba_operational(struct ufs_hba *hba);
> void ufshcd_remove(struct ufs_hba *);
> +int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
> int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
> u32 val, unsigned long interval_us,
> unsigned long timeout_ms, bool can_sleep);
>
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state
2020-01-17 3:51 ` [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state Stanley Chu
2020-01-19 14:27 ` Alim Akhtar
@ 2020-01-20 20:52 ` Asutosh Das (asd)
1 sibling, 0 replies; 10+ messages in thread
From: Asutosh Das (asd) @ 2020-01-20 20:52 UTC (permalink / raw)
To: Stanley Chu, linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: bvanassche, andy.teng, chun-hung.wu, kuohong.wang, linux-kernel,
cang, linux-mediatek, peter.wang, matthias.bgg, linux-arm-kernel,
beanhuo
On 1/16/2020 7:51 PM, Stanley Chu wrote:
> In MediaTek Chipsets, UniPro link and ufshci can enter proprietary
> low-power mode while link is in hibern8 state.
>
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
> ---
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
> drivers/scsi/ufs/ufs-mediatek.c | 53 +++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
>
> diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
> index d5194d0c4ef5..f32f3f34f6d0 100644
> --- a/drivers/scsi/ufs/ufs-mediatek.c
> +++ b/drivers/scsi/ufs/ufs-mediatek.c
> @@ -382,11 +382,60 @@ static void ufs_mtk_device_reset(struct ufs_hba *hba)
> dev_info(hba->dev, "device reset done\n");
> }
>
> +static int ufs_mtk_link_set_hpm(struct ufs_hba *hba)
> +{
> + int err;
> +
> + err = ufshcd_hba_enable(hba);
> + if (err)
> + return err;
> +
> + err = ufshcd_dme_set(hba,
> + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
> + 0);
> + if (err)
> + return err;
> +
> + err = ufshcd_uic_hibern8_exit(hba);
> + if (!err)
> + ufshcd_set_link_active(hba);
> + else
> + return err;
> +
> + err = ufshcd_make_hba_operational(hba);
> + if (err)
> + return err;
> +
> + return 0;
> +}
> +
> +static int ufs_mtk_link_set_lpm(struct ufs_hba *hba)
> +{
> + int err;
> +
> + err = ufshcd_dme_set(hba,
> + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
> + 1);
> + if (err) {
> + /* Resume UniPro state for following error recovery */
> + ufshcd_dme_set(hba,
> + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0),
> + 0);
> + return err;
> + }
> +
> + return 0;
> +}
> +
> static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
> {
> + int err;
> struct ufs_mtk_host *host = ufshcd_get_variant(hba);
>
> if (ufshcd_is_link_hibern8(hba)) {
> + err = ufs_mtk_link_set_lpm(hba);
> + if (err)
> + return -EAGAIN;
> phy_power_off(host->mphy);
> ufs_mtk_setup_ref_clk(hba, false);
> }
> @@ -397,10 +446,14 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
> static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
> {
> struct ufs_mtk_host *host = ufshcd_get_variant(hba);
> + int err;
>
> if (ufshcd_is_link_hibern8(hba)) {
> ufs_mtk_setup_ref_clk(hba, true);
> phy_power_on(host->mphy);
> + err = ufs_mtk_link_set_hpm(hba);
> + if (err)
> + return err;
> }
>
> return 0;
>
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II
2020-01-17 3:51 [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Stanley Chu
` (2 preceding siblings ...)
2020-01-17 3:51 ` [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state Stanley Chu
@ 2020-01-21 0:10 ` Martin K. Petersen
3 siblings, 0 replies; 10+ messages in thread
From: Martin K. Petersen @ 2020-01-21 0:10 UTC (permalink / raw)
To: Stanley Chu
Cc: linux-scsi, martin.petersen, andy.teng, jejb, chun-hung.wu,
kuohong.wang, linux-kernel, avri.altman, cang, linux-mediatek,
peter.wang, alim.akhtar, matthias.bgg, asutoshd, bvanassche,
linux-arm-kernel, beanhuo
Stanley,
> This series adds some MediaTek vendor implementations in UFS driver:
> - Callback dbg_register_dump
> - Low-power mode for hibern8 state
Applied to 5.6/scsi-queue, thanks!
--
Martin K. Petersen Oracle Linux Engineering
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-01-21 0:11 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-17 3:51 [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Stanley Chu
2020-01-17 3:51 ` [PATCH v1 1/3] scsi: ufs-mediatek: add dbg_register_dump implementation Stanley Chu
2020-01-19 14:05 ` Alim Akhtar
2020-01-17 3:51 ` [PATCH v1 2/3] scsi: ufs: export some functions for vendor usage Stanley Chu
2020-01-19 14:12 ` Alim Akhtar
2020-01-20 20:49 ` Asutosh Das (asd)
2020-01-17 3:51 ` [PATCH v1 3/3] scsi: ufs-mediatek: enable low-power mode for hibern8 state Stanley Chu
2020-01-19 14:27 ` Alim Akhtar
2020-01-20 20:52 ` Asutosh Das (asd)
2020-01-21 0:10 ` [PATCH v1 0/3] scsi: ufs-mediatek: add MediaTek vendor implementation part II Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).