Skip to contentSkip to conversation

phy: qcom-qmp: pipe clock fixes

PATCH Applied Johan Hovold 3 participants 7 messages Apr 20, 2022 – May 2, 2022

Subsystems (2)

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#1 lore raw

PATCH 1/2 phy: qcom-qmp: fix phy-descriptor kernel-doc typo

In reply to Johan Hovold

Fix misspelled "clock" in the description of the pipe_clk field in the PHY-descriptor kernel-doc comment.

---
 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 972f27c0e0a2..8c2300bfe489 100644
@@ -3291,7 +3291,7 @@ struct qmp_phy_combo_cfg {
  * @tx2: iomapped memory space for second lane's tx (in dual lane PHYs)
  * @rx2: iomapped memory space for second lane's rx (in dual lane PHYs)
  * @pcs_misc: iomapped memory space for lane's pcs_misc
- * @pipe_clk: pipe lock
+ * @pipe_clk: pipe clock
  * @index: lane index
  * @qmp: QMP phy to which this lane belongs
  * @lane_rst: lane's reset controller
Signature · 7 lines
2.35.1


-- 
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
#3 lore raw

PATCH 2/2 phy: qcom-qmp: fix pipe-clock imbalance on power-on failure

In reply to Johan Hovold

Make sure to disable the pipe clock also if ufs-reset deassertion fails during power on.

Note that the ufs-reset is asserted in qcom_qmp_phy_com_exit().

Fixes c9b589791fc1 ("phy: qcom: Utilize UFS reset controller")
Cc Evan Green <[email protected]>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +7 -7
index 8c2300bfe489..7d2d1ab061f7 100644
@@ -5375,14 +5375,14 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 		if (ret) {
 			dev_err(qmp->dev, "lane%d reset deassert failed\n",
 				qphy->index);
-			goto err_lane_rst;
+			return ret;
 		}
 	}
 
 	ret = clk_prepare_enable(qphy->pipe_clk);
 	if (ret) {
 		dev_err(qmp->dev, "pipe_clk enable failed err=%d\n", ret);
-		goto err_clk_enable;
+		goto err_reset_lane;
 	}
 
 	/* Tx, Rx, and PCS configurations */
@@ -5433,7 +5433,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 
 	ret = reset_control_deassert(qmp->ufs_reset);
 	if (ret)
-		goto err_lane_rst;
+		goto err_disable_pipe_clk;
 
 	qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
 			       cfg->pcs_misc_tbl_num);
@@ -5472,17 +5472,17 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 					 PHY_INIT_COMPLETE_TIMEOUT);
 		if (ret) {
 			dev_err(qmp->dev, "phy initialization timed-out\n");
-			goto err_pcs_ready;
+			goto err_disable_pipe_clk;
 		}
 	}
 	return 0;
 
-err_pcs_ready:
+err_disable_pipe_clk:
 	clk_disable_unprepare(qphy->pipe_clk);
-err_clk_enable:
+err_reset_lane:
 	if (cfg->has_lane_rst)
 		reset_control_assert(qphy->lane_rst);
-err_lane_rst:
+
 	return ret;
 }
 
Signature · 7 lines
2.35.1


-- 
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
#0 lore raw

cover phy: qcom-qmp: pipe clock fixes

This series fixes a kernel doc typo and pipe clock imbalance on PHY power on failures.

Johan

Johan Hovold (2):
phy: qcom-qmp: fix phy-descriptor kernel-doc typo
phy: qcom-qmp: fix pipe-clock imbalance on power-on failure

 drivers/phy/qualcomm/phy-qcom-qmp.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
Signature · 7 lines
2.35.1


-- 
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
maintainer
#4 lore raw

Re: [PATCH 2/2] phy: qcom-qmp: fix pipe-clock imbalance on power-on failure

In reply to Johan Hovold
Quoted 17 lines · Johan Hovold

Make sure to disable the pipe clock also if ufs-reset deassertion fails during power on.

Note that the ufs-reset is asserted in qcom_qmp_phy_com_exit().

Fixes c9b589791fc1 ("phy: qcom: Utilize UFS reset controller")
Cc Evan Green <[email protected]>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 8c2300bfe489..7d2d1ab061f7 100644

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

Quoted 5 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
@@ -5375,14 +5375,14 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 		if (ret) {
 			dev_err(qmp->dev, "lane%d reset deassert failed\n",
 				qphy->index);
-			goto err_lane_rst;
+			return ret;

This can be skipped if we retain the err_lane_rst label

Quoted 12 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 		}
 	}
 
 	ret = clk_prepare_enable(qphy->pipe_clk);
 	if (ret) {
 		dev_err(qmp->dev, "pipe_clk enable failed err=%d\n", ret);
-		goto err_clk_enable;
+		goto err_reset_lane;
 	}
 
 	/* Tx, Rx, and PCS configurations */

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

Quoted 5 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
@@ -5433,7 +5433,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 
 	ret = reset_control_deassert(qmp->ufs_reset);
 	if (ret)
-		goto err_lane_rst;
+		goto err_disable_pipe_clk;

this is the actual fix...

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

Quoted 9 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 	qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
 			       cfg->pcs_misc_tbl_num);
@@ -5472,17 +5472,17 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 					 PHY_INIT_COMPLETE_TIMEOUT);
 		if (ret) {
 			dev_err(qmp->dev, "phy initialization timed-out\n");
-			goto err_pcs_ready;
+			goto err_disable_pipe_clk;

same rename here

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 		}
 	}
 	return 0;
 

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

Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -3
-err_pcs_ready:
+err_disable_pipe_clk:
 	clk_disable_unprepare(qphy->pipe_clk);
-err_clk_enable:
+err_reset_lane:
 	if (cfg->has_lane_rst)
 		reset_control_assert(qphy->lane_rst);
-err_lane_rst:
+
 	return ret;

while I feel the names given by this patch are better, they should not be in a fix patch. We should just add the one line fix here and do renames later

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 }
 
Signature · 1 line
2.35.1
Signature · 6 lines
~Vinod

-- 
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
maintainer Applied
#2 lore raw

Re: [PATCH 1/2] phy: qcom-qmp: fix phy-descriptor kernel-doc typo

In reply to Johan Hovold
Quoted 2 lines · Johan Hovold

Fix misspelled "clock" in the description of the pipe_clk field in the PHY-descriptor kernel-doc comment.

Applied, thanks

Signature · 6 lines
~Vinod

-- 
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
#5 lore raw

Re: [PATCH 2/2] phy: qcom-qmp: fix pipe-clock imbalance on power-on failure

In reply to Vinod Koul
Quoted 39 lines · Vinod Koul
Quoted 17 lines · Johan Hovold

Make sure to disable the pipe clock also if ufs-reset deassertion fails during power on.

Note that the ufs-reset is asserted in qcom_qmp_phy_com_exit().

Fixes c9b589791fc1 ("phy: qcom: Utilize UFS reset controller")
Cc Evan Green <[email protected]>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 8c2300bfe489..7d2d1ab061f7 100644

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

Quoted 5 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
@@ -5375,14 +5375,14 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 		if (ret) {
 			dev_err(qmp->dev, "lane%d reset deassert failed\n",
 				qphy->index);
-			goto err_lane_rst;
+			return ret;

This can be skipped if we retain the err_lane_rst label

Quoted 13 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 		}
 	}
 
 	ret = clk_prepare_enable(qphy->pipe_clk);
 	if (ret) {
 		dev_err(qmp->dev, "pipe_clk enable failed err=%d\n", ret);
-		goto err_clk_enable;
+		goto err_reset_lane;
 	}
 
 	/* Tx, Rx, and PCS configurations */
@@ -5433,7 +5433,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 
Quoted 6 lines

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

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 	ret = reset_control_deassert(qmp->ufs_reset);
 	if (ret)
-		goto err_lane_rst;
+		goto err_disable_pipe_clk;

this is the actual fix...

Right, but with a one-line fix this would read

	goto err_pcs_ready;

which makes no sense at all. Is that really what you prefer?

Renaming just this one and the below one, would leave the error labels named using two different schemes, which also isn't very nice, but perhaps ok.

Quoted 16 lines

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

Quoted 9 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 	qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
 			       cfg->pcs_misc_tbl_num);
@@ -5472,17 +5472,17 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 					 PHY_INIT_COMPLETE_TIMEOUT);
 		if (ret) {
 			dev_err(qmp->dev, "phy initialization timed-out\n");
-			goto err_pcs_ready;
+			goto err_disable_pipe_clk;

same rename here

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 		}
 	}
 	return 0;
 
Quoted 14 lines

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

Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -3
-err_pcs_ready:
+err_disable_pipe_clk:
 	clk_disable_unprepare(qphy->pipe_clk);
-err_clk_enable:
+err_reset_lane:
 	if (cfg->has_lane_rst)
 		reset_control_assert(qphy->lane_rst);
-err_lane_rst:
+
 	return ret;

while I feel the names given by this patch are better, they should not be in a fix patch. We should just add the one line fix here and do renames later

I'll respin if you prefer, just want to double check that you really want a one line fix (i.e. goto err_pcs_ready).

Johan

Signature · 3 lines
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
maintainer
#6 lore raw

Re: [PATCH 2/2] phy: qcom-qmp: fix pipe-clock imbalance on power-on failure

Quoted 47 lines · Johan Hovold
Quoted 39 lines · Vinod Koul
Quoted 17 lines · Johan Hovold

Make sure to disable the pipe clock also if ufs-reset deassertion fails during power on.

Note that the ufs-reset is asserted in qcom_qmp_phy_com_exit().

Fixes c9b589791fc1 ("phy: qcom: Utilize UFS reset controller")
Cc Evan Green <[email protected]>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
index 8c2300bfe489..7d2d1ab061f7 100644

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

Quoted 5 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
@@ -5375,14 +5375,14 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 		if (ret) {
 			dev_err(qmp->dev, "lane%d reset deassert failed\n",
 				qphy->index);
-			goto err_lane_rst;
+			return ret;

This can be skipped if we retain the err_lane_rst label

Quoted 13 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 		}
 	}
 
 	ret = clk_prepare_enable(qphy->pipe_clk);
 	if (ret) {
 		dev_err(qmp->dev, "pipe_clk enable failed err=%d\n", ret);
-		goto err_clk_enable;
+		goto err_reset_lane;
 	}
 
 	/* Tx, Rx, and PCS configurations */
@@ -5433,7 +5433,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 
Quoted 6 lines

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

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 	ret = reset_control_deassert(qmp->ufs_reset);
 	if (ret)
-		goto err_lane_rst;
+		goto err_disable_pipe_clk;

this is the actual fix...

Quoted 5 lines

Right, but with a one-line fix this would read

	goto err_pcs_ready;

which makes no sense at all. Is that really what you prefer?

Yes I feel for a fix we should always have the minimal changes.. makes porting easier

Quoted 36 lines

Renaming just this one and the below one, would leave the error labels named using two different schemes, which also isn't very nice, but perhaps ok.

Quoted 16 lines

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

Quoted 9 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
 	qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
 			       cfg->pcs_misc_tbl_num);
@@ -5472,17 +5472,17 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
 					 PHY_INIT_COMPLETE_TIMEOUT);
 		if (ret) {
 			dev_err(qmp->dev, "phy initialization timed-out\n");
-			goto err_pcs_ready;
+			goto err_disable_pipe_clk;

same rename here

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +0 -0
 		}
 	}
 	return 0;
 
Quoted 14 lines

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

Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -3
-err_pcs_ready:
+err_disable_pipe_clk:
 	clk_disable_unprepare(qphy->pipe_clk);
-err_clk_enable:
+err_reset_lane:
 	if (cfg->has_lane_rst)
 		reset_control_assert(qphy->lane_rst);
-err_lane_rst:
+
 	return ret;

while I feel the names given by this patch are better, they should not be in a fix patch. We should just add the one line fix here and do renames later

Quoted 2 lines

I'll respin if you prefer, just want to double check that you really want a one line fix (i.e. goto err_pcs_ready).

Yes please

Signature · 1 line
~Vinod