Skip to contentSkip to conversation

phy: qcom-qmp: Fixes and updates for sm8150

PATCH Superseded Vinod Koul 5 participants 24 messages Dec 19, 2019 – Dec 23, 2019

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Vinod Koul

author maintainer
#0 lore raw

cover phy: qcom-qmp: Fixes and updates for sm8150

On 5.5-rc1 we have seen regression on UFS phy on 8998 and SM8150. As suggested by Can increasing the timeout helps so we increase the phy init timeout and that fixes the issue for 8998. The patch 1 should be applied to fixes for 5.5

For SM8150 we need additional SW reset so add additional SW reset and configure if flag is defined, while at it do small updates to Use register defines and remove duplicate powerdown write.

Vinod Koul (4):
phy: qcom-qmp: Increase the phy init timeout
phy: qcom-qmp: Use register defines
phy: qcom-qmp: Add optional SW reset
phy: qcom-qmp: remove duplicate powerdown write

 drivers/phy/qualcomm/phy-qcom-qmp.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
Signature · 1 line
2.23.0
author maintainer
#1 lore raw

PATCH 1/4 phy: qcom-qmp: Increase the phy init timeout

If we do full reset of the phy, it seems to take a couple of ms to come up on my system so increase the timeout to 10ms.

This was found by full reset addition by commit 870b1279c7a0 ("scsi: ufs-qcom: Add reset control support for host controller") and fixes the regression to platforms by this commit.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
index 091e20303a14..c2e800a3825a 100644
@@ -66,7 +66,7 @@
 /* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */
 #define CLAMP_EN				BIT(0) /* enables i/o clamp_n */
 
-#define PHY_INIT_COMPLETE_TIMEOUT		1000
+#define PHY_INIT_COMPLETE_TIMEOUT		100000
 #define POWER_DOWN_DELAY_US_MIN			10
 #define POWER_DOWN_DELAY_US_MAX			11
 
Signature · 1 line
2.23.0
Reviewed-by Tested-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] phy: qcom-qmp: Increase the phy init timeout

Quoted 10 lines · Vinod Koul

If we do full reset of the phy, it seems to take a couple of ms to come up on my system so increase the timeout to 10ms.

This was found by full reset addition by commit 870b1279c7a0 ("scsi: ufs-qcom: Add reset control support for host controller") and fixes the regression to platforms by this commit.

Tested on the Lenovo Miix 630 laptop (a msm8998 based system). This addresses the regression.

Quoted 20 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -2
index 091e20303a14..c2e800a3825a 100644
@@ -66,7 +66,7 @@
 /* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */
 #define CLAMP_EN                               BIT(0) /* enables i/o clamp_n */
 
-#define PHY_INIT_COMPLETE_TIMEOUT              1000
+#define PHY_INIT_COMPLETE_TIMEOUT              100000
 #define POWER_DOWN_DELAY_US_MIN                        10
 #define POWER_DOWN_DELAY_US_MAX                        11
 
--

2.23.0

author maintainer
#3 lore raw

Re: [PATCH 1/4] phy: qcom-qmp: Increase the phy init timeout

Quoted 9 lines · Jeffrey Hugo
Quoted 8 lines · Vinod Koul

If we do full reset of the phy, it seems to take a couple of ms to come up on my system so increase the timeout to 10ms.

This was found by full reset addition by commit 870b1279c7a0 ("scsi: ufs-qcom: Add reset control support for host controller") and fixes the regression to platforms by this commit.

Quoted 8 lines
Quoted 2 lines

Tested on the Lenovo Miix 630 laptop (a msm8998 based system). This addresses the regression.

Thanks Jeff for quick test and reviews! Appreciate it.

Quoted 20 lines
Quoted 20 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -2
index 091e20303a14..c2e800a3825a 100644
@@ -66,7 +66,7 @@
 /* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */
 #define CLAMP_EN                               BIT(0) /* enables i/o clamp_n */
 
-#define PHY_INIT_COMPLETE_TIMEOUT              1000
+#define PHY_INIT_COMPLETE_TIMEOUT              100000
 #define POWER_DOWN_DELAY_US_MIN                        10
 #define POWER_DOWN_DELAY_US_MAX                        11
 
--

2.23.0

Signature · 1 line
~Vinod
#4 lore raw

Re: [PATCH 1/4] phy: qcom-qmp: Increase the phy init timeout

In reply to Vinod Koul
Quoted 9 lines · Vinod Koul

If we do full reset of the phy, it seems to take a couple of ms to come up on my system so increase the timeout to 10ms.

This was found by full reset addition by commit 870b1279c7a0 ("scsi: ufs-qcom: Add reset control support for host controller") and fixes the regression to platforms by this commit.

This does look familiar...

https://lore.kernel.org/linux-arm-msm/[email protected]/

Quoted 9 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 091e20303a14..c2e800a3825a 100644

drivers/phy/qualcomm/phy-qcom-qmp.c line 69

Quoted 5 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
@@ -66,7 +66,7 @@
 /* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */
 #define CLAMP_EN				BIT(0) /* enables i/o clamp_n */
 
-#define PHY_INIT_COMPLETE_TIMEOUT		1000
+#define PHY_INIT_COMPLETE_TIMEOUT		100000

100ms seems a little bit excessive, and we do end up waiting this long when we have PCIe links without an attached device...

Do you need >10ms or could we just have my patch merged?

Regards,
Bjorn

Quoted 6 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 #define POWER_DOWN_DELAY_US_MIN			10
 #define POWER_DOWN_DELAY_US_MAX			11
 
Signature · 1 line
2.23.0
author maintainer
#5 lore raw

Re: [PATCH 1/4] phy: qcom-qmp: Increase the phy init timeout

Quoted 28 lines · Bjorn Andersson
Quoted 9 lines · Vinod Koul

If we do full reset of the phy, it seems to take a couple of ms to come up on my system so increase the timeout to 10ms.

This was found by full reset addition by commit 870b1279c7a0 ("scsi: ufs-qcom: Add reset control support for host controller") and fixes the regression to platforms by this commit.

This does look familiar...

https://lore.kernel.org/linux-arm-msm/[email protected]/

Quoted 12 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 091e20303a14..c2e800a3825a 100644
@@ -66,7 +66,7 @@
 /* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */
 #define CLAMP_EN				BIT(0) /* enables i/o clamp_n */
 
Quoted 7 lines

drivers/phy/qualcomm/phy-qcom-qmp.c line 69

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
-#define PHY_INIT_COMPLETE_TIMEOUT		1000
+#define PHY_INIT_COMPLETE_TIMEOUT		100000

100ms seems a little bit excessive, and we do end up waiting this long when we have PCIe links without an attached device...

Do you need >10ms or could we just have my patch merged?

Yeah I quick tested 10ms as well and seems good for me, so either ways if fine, but lets get it applied quickly :-)

Signature · 1 line
~Vinod
author maintainer
#6 lore raw

PATCH 2/4 phy: qcom-qmp: Use register defines

In reply to Vinod Koul

We already define register offsets so use them in register layout.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -2
index c2e800a3825a..06f971ca518e 100644
@@ -166,8 +166,8 @@ static const unsigned int sdm845_ufsphy_regs_layout[] = {
 };
 
 static const unsigned int sm8150_ufsphy_regs_layout[] = {
-	[QPHY_START_CTRL]		= 0x00,
-	[QPHY_PCS_READY_STATUS]		= 0x180,
+	[QPHY_START_CTRL]		= QPHY_V4_PHY_START,
+	[QPHY_SW_RESET]			= QPHY_V4_SW_RESET,
 };
 
 static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = {
Signature · 1 line
2.23.0
Reviewed-by on v1 2/4
#7 lore raw

Re: [PATCH 2/4] phy: qcom-qmp: Use register defines

Quoted 4 lines · Vinod Koul

We already define register offsets so use them in register layout.

Quoted 22 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -3
index c2e800a3825a..06f971ca518e 100644
@@ -166,8 +166,8 @@ static const unsigned int sdm845_ufsphy_regs_layout[] = {
 };
 
 static const unsigned int sm8150_ufsphy_regs_layout[] = {
-       [QPHY_START_CTRL]               = 0x00,
-       [QPHY_PCS_READY_STATUS]         = 0x180,
+       [QPHY_START_CTRL]               = QPHY_V4_PHY_START,
+       [QPHY_SW_RESET]                 = QPHY_V4_SW_RESET,
 };
 
 static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = {
--

2.23.0

#8 lore raw

Re: [PATCH 2/4] phy: qcom-qmp: Use register defines

In reply to Vinod Koul
Quoted 23 lines · Vinod Koul

We already define register offsets so use them in register layout.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -2
index c2e800a3825a..06f971ca518e 100644
@@ -166,8 +166,8 @@ static const unsigned int 
 sdm845_ufsphy_regs_layout[] = {
 };
 
 static const unsigned int sm8150_ufsphy_regs_layout[] = {
-	[QPHY_START_CTRL]		= 0x00,
-	[QPHY_PCS_READY_STATUS]		= 0x180,
+	[QPHY_START_CTRL]		= QPHY_V4_PHY_START,
+	[QPHY_SW_RESET]			= QPHY_V4_SW_RESET,
 };
 
Quoted 1 line

static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = {

Why is the QPHY_PCS_READY_STATUS removed here? Then what "status" are we polling here for UFS PHY?

<snip>

     if (cfg->type == PHY_TYPE_UFS) {
         status = pcs + cfg->regs[QPHY_PCS_READY_STATUS];
         mask = PCS_READY;
         ready = PCS_READY;
     } else {

<snip>

Can Guo.

author maintainer
#9 lore raw

Re: [PATCH 2/4] phy: qcom-qmp: Use register defines

Quoted 29 lines · On 20-12-19, 08:44, [email protected] wrote:
Quoted 23 lines · Vinod Koul

We already define register offsets so use them in register layout.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -2
index c2e800a3825a..06f971ca518e 100644
@@ -166,8 +166,8 @@ static const unsigned int
 sdm845_ufsphy_regs_layout[] = {
 };
 
 static const unsigned int sm8150_ufsphy_regs_layout[] = {
-	[QPHY_START_CTRL]		= 0x00,
-	[QPHY_PCS_READY_STATUS]		= 0x180,
+	[QPHY_START_CTRL]		= QPHY_V4_PHY_START,
+	[QPHY_SW_RESET]			= QPHY_V4_SW_RESET,
 };
 
Quoted 1 line

static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = {

Why is the QPHY_PCS_READY_STATUS removed here? Then what "status" are we polling here for UFS PHY?

Quoted 7 lines

<snip>

     if (cfg->type == PHY_TYPE_UFS) {
         status = pcs + cfg->regs[QPHY_PCS_READY_STATUS];
         mask = PCS_READY;
         ready = PCS_READY;
     } else {

<snip>

Good catch Can, I dont think I intended it that way. Will fix it up!

Thanks

Signature · 1 line
~Vinod
author maintainer
#10 lore raw

PATCH 3/4 phy: qcom-qmp: Add optional SW reset

In reply to Vinod Koul

For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +10 -0
index 06f971ca518e..80304b7cd895 100644
@@ -1023,6 +1023,9 @@ struct qmp_phy_cfg {
 
 	/* true, if PCS block has no separate SW_RESET register */
 	bool no_pcs_sw_reset;
+
+	/* true if sw reset needs to be invoked */
+	bool has_sw_reset;
 };
 
 /**
@@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
 
 	.is_dual_lane_phy	= true,
 	.no_pcs_sw_reset	= true,
+	.has_sw_reset		= true,
 };
 
 static void qcom_qmp_phy_configure(void __iomem *base,
@@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
 			     SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
 	}
 
+	if (cfg->has_sw_reset)
+		qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET);
+
 	if (cfg->has_phy_com_ctrl)
 		qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
 			     SW_PWRDN);
@@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
 	if (cfg->has_phy_dp_com_ctrl)
 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 
+	if (cfg->has_sw_reset)
+		qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+
 	/* start SerDes and Phy-Coding-Sublayer */
 	qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
 
Signature · 1 line
2.23.0
Reviewed-by on v1 3/4
#11 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 6 lines · Vinod Koul

For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register.

Quoted 49 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +10 -1
index 06f971ca518e..80304b7cd895 100644
@@ -1023,6 +1023,9 @@ struct qmp_phy_cfg {
 
        /* true, if PCS block has no separate SW_RESET register */
        bool no_pcs_sw_reset;
+
+       /* true if sw reset needs to be invoked */
+       bool has_sw_reset;
 };
 
 /**
@@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
 
        .is_dual_lane_phy       = true,
        .no_pcs_sw_reset        = true,
+       .has_sw_reset           = true,
 };
 
 static void qcom_qmp_phy_configure(void __iomem *base,
@@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
                             SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
        }
 
+       if (cfg->has_sw_reset)
+               qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET);
+
        if (cfg->has_phy_com_ctrl)
                qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
                             SW_PWRDN);
@@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
        if (cfg->has_phy_dp_com_ctrl)
                qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 
+       if (cfg->has_sw_reset)
+               qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+
        /* start SerDes and Phy-Coding-Sublayer */
        qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
 
--

2.23.0

#12 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

In reply to Vinod Koul
Quoted 34 lines · Vinod Koul

For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +4 -0
index 06f971ca518e..80304b7cd895 100644
@@ -1023,6 +1023,9 @@ struct qmp_phy_cfg {
 
 	/* true, if PCS block has no separate SW_RESET register */
 	bool no_pcs_sw_reset;
+
+	/* true if sw reset needs to be invoked */
+	bool has_sw_reset;
 };
 
 /**
@@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg 
 = {
 
 	.is_dual_lane_phy	= true,
 	.no_pcs_sw_reset	= true,
+	.has_sw_reset		= true,
 };
 

static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy · line 1485

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
@@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy 
 *qphy)
 			     SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
 	}
 
+	if (cfg->has_sw_reset)
+		qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Are you sure you want to set this in the serdes register? QPHY_SW_RESET is in its pcs register.

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_enable(struct phy *phy) · line 1663

Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	if (cfg->has_phy_com_ctrl)
 		qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
 			     SW_PWRDN);
@@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
 	if (cfg->has_phy_dp_com_ctrl)
 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 
+	if (cfg->has_sw_reset)
+		qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Yet you are clearing it from pcs register.

Regards,
Can Guo

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	/* start SerDes and Phy-Coding-Sublayer */
 	qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
#13 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 53 lines · On 2019-12-20 08:22, [email protected] wrote:
Quoted 34 lines · Vinod Koul

For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +4 -0
index 06f971ca518e..80304b7cd895 100644
@@ -1023,6 +1023,9 @@ struct qmp_phy_cfg {
 
 	/* true, if PCS block has no separate SW_RESET register */
 	bool no_pcs_sw_reset;
+
+	/* true if sw reset needs to be invoked */
+	bool has_sw_reset;
 };
 
 /**
@@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg 
 sm8150_ufsphy_cfg = {
 
 	.is_dual_lane_phy	= true,
 	.no_pcs_sw_reset	= true,
+	.has_sw_reset		= true,
 };
 

static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy · line 1485

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
@@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy 
 *qphy)
 			     SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
 	}
 
+	if (cfg->has_sw_reset)
+		qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Are you sure you want to set this in the serdes register? QPHY_SW_RESET is in its pcs register.

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	if (cfg->has_phy_com_ctrl)
 		qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 			     SW_PWRDN);
@@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
 	if (cfg->has_phy_dp_com_ctrl)
 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 
Quoted 11 lines

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_enable(struct phy *phy) · line 1663

Quoted 3 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
+	if (cfg->has_sw_reset)
+		qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Yet you are clearing it from pcs register.

Regards,
Can Guo

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	/* start SerDes and Phy-Coding-Sublayer */
 	qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);

I thought your change would be like this

drivers/phy/qualcomm/phy-qcom-qmp.c +4 -1
index 8e642a6..a4ab4b7 100755
@@ -166,6 +166,7 @@ static const unsigned int sdm845_ufsphy_regs_layout[] = {
 };
 
 static const unsigned int sm8150_ufsphy_regs_layout[] = {
+       [QPHY_SW_RESET]                 = 0x08,
        [QPHY_START_CTRL]               = 0x00,
        [QPHY_PCS_READY_STATUS]         = 0x180,
 };
@@ -1390,7 +1391,6 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
        .pwrdn_ctrl             = SW_PWRDN,
 
        .is_dual_lane_phy       = true,
-       .no_pcs_sw_reset        = true,
 };
 
 static void qcom_qmp_phy_configure(void __iomem *base,
@@ -1475,6 +1475,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
                             SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
        }
 
+       if ((cfg->type == PHY_TYPE_UFS) && (!cfg->no_pcs_sw_reset))
+               qphy_setbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+
        if (cfg->has_phy_com_ctrl)
                qphy_setbits(serdes, 

cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],

                             SW_PWRDN);

Regards,
Can Guo.

author maintainer
#14 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 55 lines · On 20-12-19, 08:49, [email protected] wrote:
Quoted 54 lines · On 2019-12-20 08:22, [email protected] wrote:
Quoted 35 lines · Vinod Koul

For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and
then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +4 -0
index 06f971ca518e..80304b7cd895 100644
@@ -1023,6 +1023,9 @@ struct qmp_phy_cfg {
 
 	/* true, if PCS block has no separate SW_RESET register */
 	bool no_pcs_sw_reset;
+
+	/* true if sw reset needs to be invoked */
+	bool has_sw_reset;
 };
 
 /**
@@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg
 sm8150_ufsphy_cfg = {
 
 	.is_dual_lane_phy	= true,
 	.no_pcs_sw_reset	= true,
+	.has_sw_reset		= true,
 };
 

static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct · line 1485

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
@@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct
 qmp_phy *qphy)
 			     SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
 	}
 
+	if (cfg->has_sw_reset)
+		qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Are you sure you want to set this in the serdes register? QPHY_SW_RESET is in its pcs register.

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	if (cfg->has_phy_com_ctrl)
 		qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 			     SW_PWRDN);
@@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
 	if (cfg->has_phy_dp_com_ctrl)
 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 
Quoted 5 lines
Quoted 5 lines

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_enable(struct phy *phy) · line 1663

Quoted 3 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
+	if (cfg->has_sw_reset)
+		qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Yet you are clearing it from pcs register.

updated now, will send v2

Quoted 32 lines
Quoted 6 lines

Regards,
Can Guo

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	/* start SerDes and Phy-Coding-Sublayer */
 	qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);

I thought your change would be like this

drivers/phy/qualcomm/phy-qcom-qmp.c +1 -0
index 8e642a6..a4ab4b7 100755
@@ -166,6 +166,7 @@ static const unsigned int sdm845_ufsphy_regs_layout[] =
 {
 };
 
 static const unsigned int sm8150_ufsphy_regs_layout[] = {
+       [QPHY_SW_RESET]                 = 0x08,
        [QPHY_START_CTRL]               = 0x00,
        [QPHY_PCS_READY_STATUS]         = 0x180,

};

drivers/phy/qualcomm/phy-qcom-qmp.c +0 -1
@@ -1390,7 +1391,6 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
        .pwrdn_ctrl             = SW_PWRDN,
 
        .is_dual_lane_phy       = true,
-       .no_pcs_sw_reset        = true,
 };
 
 static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) · line 1479

Quoted 5 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -0
@@ -1475,6 +1475,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
                             SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
        }
 
+       if ((cfg->type == PHY_TYPE_UFS) && (!cfg->no_pcs_sw_reset))
+               qphy_setbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);

Well am not sure if no_pcs_sw_reset would do this and side effect on other phys (somehow older ones dont seem to need this). That was the reason for a new flag and to be used for specific instances

Thanks

Signature · 1 line
~Vinod
#15 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 102 lines · Vinod Koul
Quoted 55 lines · On 20-12-19, 08:49, [email protected] wrote:
Quoted 54 lines · On 2019-12-20 08:22, [email protected] wrote:
Quoted 35 lines · Vinod Koul

For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and
then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +4 -0
index 06f971ca518e..80304b7cd895 100644
@@ -1023,6 +1023,9 @@ struct qmp_phy_cfg {
 
 	/* true, if PCS block has no separate SW_RESET register */
 	bool no_pcs_sw_reset;
+
+	/* true if sw reset needs to be invoked */
+	bool has_sw_reset;
 };
 
 /**
@@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg
 sm8150_ufsphy_cfg = {
 
 	.is_dual_lane_phy	= true,
 	.no_pcs_sw_reset	= true,
+	.has_sw_reset		= true,
 };
 

static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct · line 1485

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
@@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct
 qmp_phy *qphy)
 			     SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
 	}
 
+	if (cfg->has_sw_reset)
+		qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Are you sure you want to set this in the serdes register? QPHY_SW_RESET is in its pcs register.

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	if (cfg->has_phy_com_ctrl)
 		qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 			     SW_PWRDN);
@@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
 	if (cfg->has_phy_dp_com_ctrl)
 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 
Quoted 5 lines
Quoted 5 lines

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_enable(struct phy *phy) · line 1663

Quoted 3 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
+	if (cfg->has_sw_reset)
+		qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Yet you are clearing it from pcs register.

updated now, will send v2

Quoted 38 lines
Quoted 6 lines

Regards,
Can Guo

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 	/* start SerDes and Phy-Coding-Sublayer */
 	qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);

I thought your change would be like this

drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 8e642a6..a4ab4b7 100755
@@ -166,6 +166,7 @@ static const unsigned int 

sdm845_ufsphy_regs_layout[] =
{
};

static const unsigned int sm8150_ufsphy_regs_layout[] = {

drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
+       [QPHY_SW_RESET]                 = 0x08,
        [QPHY_START_CTRL]               = 0x00,
        [QPHY_PCS_READY_STATUS]         = 0x180,
 };
@@ -1390,7 +1391,6 @@ static const struct qmp_phy_cfg 
 sm8150_ufsphy_cfg = {
        .pwrdn_ctrl             = SW_PWRDN,
 
        .is_dual_lane_phy       = true,
-       .no_pcs_sw_reset        = true,
 };
 

static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
@@ -1475,6 +1475,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy 
 *qphy)
                             SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
        }
 
Quoted 8 lines

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) · line 1479

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -0
+       if ((cfg->type == PHY_TYPE_UFS) && (!cfg->no_pcs_sw_reset))
+               qphy_setbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);

Well am not sure if no_pcs_sw_reset would do this and side effect on other phys (somehow older ones dont seem to need this). That was the reason for a new flag and to be used for specific instances

Thanks

Hi Vinod,

That is why I added the check as cfg->type == PHY_TYPE_UFS, meaning this change will only apply to UFS.
FYI, start from 8150(include 8150), QPHY_SW_RESET is present in PHY's PCS register. no_pcs_sw_reset = TRUE should only be given to 845 and older targets, like 8998, because they don't have this QPHY_SW_RESET in PHY's register per their design, that's why they leverage the reset control provided by UFS controller.

Thanks,
Can Guo.

author maintainer
#16 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 50 lines · Can Guo
Quoted 38 lines · Vinod Koul
Quoted 37 lines · On 20-12-19, 08:49, [email protected] wrote:
Quoted 4 lines · On 2019-12-20 08:22, [email protected] wrote:

Review

Quoted 2 lines · Vinod Koul
(quoted diff) +0 -0
 	/* start SerDes and Phy-Coding-Sublayer */
 	qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);

I thought your change would be like this

drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 8e642a6..a4ab4b7 100755
@@ -166,6 +166,7 @@ static const unsigned int

sdm845_ufsphy_regs_layout[] =
{
};

static const unsigned int sm8150_ufsphy_regs_layout[] = {

drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
+       [QPHY_SW_RESET]                 = 0x08,
        [QPHY_START_CTRL]               = 0x00,
        [QPHY_PCS_READY_STATUS]         = 0x180,
 };
@@ -1390,7 +1391,6 @@ static const struct qmp_phy_cfg
 sm8150_ufsphy_cfg = {
        .pwrdn_ctrl             = SW_PWRDN,
 
        .is_dual_lane_phy       = true,
-       .no_pcs_sw_reset        = true,
 };
 

static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
@@ -1475,6 +1475,9 @@ static int qcom_qmp_phy_com_init(struct
 qmp_phy *qphy)
                             SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
        }
 
Quoted 8 lines

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) · line 1479

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -0
+       if ((cfg->type == PHY_TYPE_UFS) && (!cfg->no_pcs_sw_reset))
+               qphy_setbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);

Well am not sure if no_pcs_sw_reset would do this and side effect on other phys (somehow older ones dont seem to need this). That was the reason for a new flag and to be used for specific instances

Thanks

Hi Vinod,

Quoted 7 lines

That is why I added the check as cfg->type == PHY_TYPE_UFS, meaning this change will only apply to UFS.
FYI, start from 8150(include 8150), QPHY_SW_RESET is present in PHY's PCS register. no_pcs_sw_reset = TRUE should only be given to 845 and older targets, like 8998, because they don't have this QPHY_SW_RESET in PHY's register per their design, that's why they leverage the reset control provided by UFS controller.

I have removed no_pcs_sw_reset and tested.

Well as you said even with UFS we have variations between various chips, so I thought leaving it separate might be better than creating a chance of regression on older platforms!

Moreover, are we sure that the reset wont be there for other qmp phy's in future other than UFS...

Thanks

Signature · 1 line
~Vinod
#17 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 61 lines · Vinod Koul
Quoted 50 lines · Can Guo
Quoted 38 lines · Vinod Koul
Quoted 37 lines · On 20-12-19, 08:49, [email protected] wrote:
Quoted 4 lines · On 2019-12-20 08:22, [email protected] wrote:

Review

Quoted 2 lines · Vinod Koul
(quoted diff) +0 -0
 	/* start SerDes and Phy-Coding-Sublayer */
 	qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);

I thought your change would be like this

drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 8e642a6..a4ab4b7 100755
@@ -166,6 +166,7 @@ static const unsigned int

sdm845_ufsphy_regs_layout[] =
{
};

static const unsigned int sm8150_ufsphy_regs_layout[] = {

drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
+       [QPHY_SW_RESET]                 = 0x08,
        [QPHY_START_CTRL]               = 0x00,
        [QPHY_PCS_READY_STATUS]         = 0x180,
 };
@@ -1390,7 +1391,6 @@ static const struct qmp_phy_cfg
 sm8150_ufsphy_cfg = {
        .pwrdn_ctrl             = SW_PWRDN,
 
        .is_dual_lane_phy       = true,
-       .no_pcs_sw_reset        = true,
 };
 

static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
@@ -1475,6 +1475,9 @@ static int qcom_qmp_phy_com_init(struct
 qmp_phy *qphy)
                             SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
        }
 
Quoted 8 lines

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) · line 1479

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -0
+       if ((cfg->type == PHY_TYPE_UFS) && (!cfg->no_pcs_sw_reset))
+               qphy_setbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);

Well am not sure if no_pcs_sw_reset would do this and side effect on other phys (somehow older ones dont seem to need this). That was the reason for a new flag and to be used for specific instances

Thanks

Hi Vinod,

Quoted 7 lines

That is why I added the check as cfg->type == PHY_TYPE_UFS, meaning this change will only apply to UFS.
FYI, start from 8150(include 8150), QPHY_SW_RESET is present in PHY's PCS register. no_pcs_sw_reset = TRUE should only be given to 845 and older targets, like 8998, because they don't have this QPHY_SW_RESET in PHY's register per their design, that's why they leverage the reset control provided by UFS controller.

I have removed no_pcs_sw_reset and tested.

Quoted 8 lines

Well as you said even with UFS we have variations between various chips, so I thought leaving it separate might be better than creating a chance of regression on older platforms!

Moreover, are we sure that the reset wont be there for other qmp phy's in future other than UFS...

Thanks

Hi Vinod

We are just removing the no_pcs_sw_reset for 8150, right? Why is it possibly impacting 845 or older paltforms?

In future, we will no longer need no_pcs_sw_reset for any newer QCOM UFS PHY designs, as it is only for 845 and older platforms.

I am sure QPHY_SW_RESET will be within PHY's address space since 8150. Otherwise, it will be a regression in UFS PHY design. We had a lot of discussion about this on 845 years ago, then design team decided to add it on later platforms, so I don't see a reason to remove it again. :)

I am not sure about the other qmp phys, but so long as UFS PHY needs the reset, we need to keep it, as phy-qcom-qmp.c is a common driver. I am not sure if I get your point here. Please correct me I am wrong.

Thanks,

Can Guo.

author maintainer
#18 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 10 lines · Can Guo
Quoted 1 line · Vinod Koul

On 20-12-19, 14:00, Can Guo wrote:

Hi Vinod

We are just removing the no_pcs_sw_reset for 8150, right? Why is it possibly impacting 845 or older paltforms?

In future, we will no longer need no_pcs_sw_reset for any newer QCOM UFS PHY designs, as it is only for 845 and older platforms.

Quoted 8 lines

I am sure QPHY_SW_RESET will be within PHY's address space since 8150. Otherwise, it will be a regression in UFS PHY design. We had a lot of discussion about this on 845 years ago, then design team decided to add it on later platforms, so I don't see a reason to remove it again. :)

I am not sure about the other qmp phys, but so long as UFS PHY needs the reset, we need to keep it, as phy-qcom-qmp.c is a common driver. I am not sure if I get your point here. Please correct me I am wrong.

The argument here is that we are making this UFS specific and we do not know if this will be true in future as QMP is a common phy, so adding a separate flag helps to keep it independent and to be used in other situations.

Thanks

Signature · 1 line
~Vinod
#19 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

Quoted 19 lines · Vinod Koul
Quoted 10 lines · Can Guo
Quoted 1 line · Vinod Koul

On 20-12-19, 14:00, Can Guo wrote:

Hi Vinod

We are just removing the no_pcs_sw_reset for 8150, right? Why is it possibly impacting 845 or older paltforms?

In future, we will no longer need no_pcs_sw_reset for any newer QCOM UFS PHY designs, as it is only for 845 and older platforms.

Quoted 8 lines

I am sure QPHY_SW_RESET will be within PHY's address space since 8150. Otherwise, it will be a regression in UFS PHY design. We had a lot of discussion about this on 845 years ago, then design team decided to add it on later platforms, so I don't see a reason to remove it again. :)

I am not sure about the other qmp phys, but so long as UFS PHY needs the reset, we need to keep it, as phy-qcom-qmp.c is a common driver. I am not sure if I get your point here. Please correct me I am wrong.

Quoted 6 lines

The argument here is that we are making this UFS specific and we do not know if this will be true in future as QMP is a common phy, so adding a separate flag helps to keep it independent and to be used in other situations.

Thanks

We should just remove no_pcs_sw_reset and let existing code take care of PHY reset for UFS.
QMP PHY reset for UFS was differently handled earlier compared to USB/PCie and relied on core for PHY reset. That is not the case with addition of PCS based sw_reset and this won't change in future. There is no need to have UFS specific flag in this driver.

Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#20 lore raw

Re: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset

In reply to [email protected]
Quoted 79 lines · On 12/20/2019 6:19 AM, [email protected] wrote:
Quoted 51 lines · On 2019-12-20 08:22, [email protected] wrote:
Quoted 33 lines · Vinod Koul

For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++

 1 file changed, 10 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +4 -0
index 06f971ca518e..80304b7cd895 100644
@@ -1023,6 +1023,9 @@ struct qmp_phy_cfg {
 
      /* true, if PCS block has no separate SW_RESET register */
      bool no_pcs_sw_reset;
+
+    /* true if sw reset needs to be invoked */
+    bool has_sw_reset;
  };
 
  /**
@@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
 
      .is_dual_lane_phy    = true,
      .no_pcs_sw_reset    = true,
+    .has_sw_reset        = true,
  };
 
  static void qcom_qmp_phy_configure(void __iomem *base,

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) · line 1484

Quoted 6 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
@@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
                   SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
      }
 
+    if (cfg->has_sw_reset)
+        qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Are you sure you want to set this in the serdes register? QPHY_SW_RESET is in its pcs register.

Quoted 7 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
      if (cfg->has_phy_com_ctrl)
          qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
                   SW_PWRDN);
@@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
      if (cfg->has_phy_dp_com_ctrl)
          qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 
Quoted 11 lines

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_enable(struct phy *phy) · line 1663

Quoted 3 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
+    if (cfg->has_sw_reset)
+        qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

Yet you are clearing it from pcs register.

Regards,
Can Guo

Quoted 2 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
      /* start SerDes and Phy-Coding-Sublayer */
      qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);

I thought your change would be like this

drivers/phy/qualcomm/phy-qcom-qmp.c +1 -0
index 8e642a6..a4ab4b7 100755
@@ -166,6 +166,7 @@ static const unsigned int sdm845_ufsphy_regs_layout[] = {
  };
 
  static const unsigned int sm8150_ufsphy_regs_layout[] = {
+       [QPHY_SW_RESET]                 = 0x08,
         [QPHY_START_CTRL]               = 0x00,
         [QPHY_PCS_READY_STATUS]         = 0x180,
  };

drivers/phy/qualcomm/phy-qcom-qmp.c static const struct qmp_phy_cfg sm8150_ufsphy_cfg = { · line 1393

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -1
@@ -1390,7 +1391,6 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
         .pwrdn_ctrl             = SW_PWRDN,
 
         .is_dual_lane_phy       = true,
-       .no_pcs_sw_reset        = true,

This makes sense to me.

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) · line 1480

Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -0
  };
 
  static void qcom_qmp_phy_configure(void __iomem *base,
@@ -1475,6 +1475,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
                              SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
         }
 
+       if ((cfg->type == PHY_TYPE_UFS) && (!cfg->no_pcs_sw_reset))
+               qphy_setbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+

This change is not needed as POR value of SW_RESET bit is '1' which will be set as part of GCC or clk_reset.
We just need to clear this bit which code already takes care of.

Quoted 6 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
         if (cfg->has_phy_com_ctrl)
                 qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
                              SW_PWRDN);

Regards,
Can Guo.

Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
author maintainer
#21 lore raw

PATCH 4/4 phy: qcom-qmp: remove duplicate powerdown write

In reply to Vinod Koul

We already write to QPHY_POWER_DOWN_CONTROL in qcom_qmp_phy_com_init() before invoking qcom_qmp_phy_configure() so remove the duplicate write.

---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 1 -
 1 file changed, 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -1
index 80304b7cd895..309ef15e46b0 100644
@@ -885,7 +885,6 @@ static const struct qmp_phy_init_tbl msm8998_usb3_pcs_tbl[] = {
 };
 
 static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = {
-	QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01),
 	QMP_PHY_INIT_CFG(QSERDES_V4_COM_SYSCLK_EN_SEL, 0xd9),
 	QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_SEL, 0x11),
 	QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_HS_SWITCH_SEL, 0x00),
Signature · 1 line
2.23.0
Reviewed-by on v1 4/4
#22 lore raw

Re: [PATCH 4/4] phy: qcom-qmp: remove duplicate powerdown write

Quoted 5 lines · Vinod Koul

We already write to QPHY_POWER_DOWN_CONTROL in qcom_qmp_phy_com_init() before invoking qcom_qmp_phy_configure() so remove the duplicate write.

Quoted 19 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 1 -
 1 file changed, 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -2
index 80304b7cd895..309ef15e46b0 100644
@@ -885,7 +885,6 @@ static const struct qmp_phy_init_tbl msm8998_usb3_pcs_tbl[] = {
 };
 
 static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = {
-       QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01),
        QMP_PHY_INIT_CFG(QSERDES_V4_COM_SYSCLK_EN_SEL, 0xd9),
        QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_SEL, 0x11),
        QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_HS_SWITCH_SEL, 0x00),
--

2.23.0

Reviewed-by on v1 4/4
#23 lore raw

Re: [PATCH 4/4] phy: qcom-qmp: remove duplicate powerdown write

In reply to Vinod Koul
Quoted 4 lines · Vinod Koul

We already write to QPHY_POWER_DOWN_CONTROL in qcom_qmp_phy_com_init() before invoking qcom_qmp_phy_configure() so remove the duplicate write.

Quoted 18 lines
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 1 -
 1 file changed, 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -1
index 80304b7cd895..309ef15e46b0 100644
@@ -885,7 +885,6 @@ static const struct qmp_phy_init_tbl
 msm8998_usb3_pcs_tbl[] = {
 };
 
 static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = {
-	QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01),
 	QMP_PHY_INIT_CFG(QSERDES_V4_COM_SYSCLK_EN_SEL, 0xd9),
 	QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_SEL, 0x11),

QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_HS_SWITCH_SEL, 0x00),