All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/3] phy: qcom-qmp: fix leaks on probe errors
@ 2022-04-27  6:32 ` Johan Hovold
  0 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold

Here are two more fixes addressing resource leaks on probe errors (e.g.
probe deferral) and a related cleanup.

Johan

Changes in v2
 - add Bjorn and Philipp's reviewed-by tags
 - fix reset-controller leak commit message (Philipp)
 - add patch to switch to explicit reset API (Philipp)

Johan Hovold (3):
  phy: qcom-qmp: fix struct clk leak on probe errors
  phy: qcom-qmp: fix reset-controller leak on probe errors
  phy: qcom-qmp: switch to explicit reset helpers

 drivers/phy/qualcomm/phy-qcom-qmp.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

-- 
2.35.1


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH v2 0/3] phy: qcom-qmp: fix leaks on probe errors
@ 2022-04-27  6:32 ` Johan Hovold
  0 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold

Here are two more fixes addressing resource leaks on probe errors (e.g.
probe deferral) and a related cleanup.

Johan

Changes in v2
 - add Bjorn and Philipp's reviewed-by tags
 - fix reset-controller leak commit message (Philipp)
 - add patch to switch to explicit reset API (Philipp)

Johan Hovold (3):
  phy: qcom-qmp: fix struct clk leak on probe errors
  phy: qcom-qmp: fix reset-controller leak on probe errors
  phy: qcom-qmp: switch to explicit reset helpers

 drivers/phy/qualcomm/phy-qcom-qmp.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

-- 
2.35.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH v2 1/3] phy: qcom-qmp: fix struct clk leak on probe errors
  2022-04-27  6:32 ` Johan Hovold
@ 2022-04-27  6:32   ` Johan Hovold
  -1 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold, stable, Vivek Gautam

Make sure to release the pipe clock reference in case of a late probe
error (e.g. probe deferral).

Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org      # 4.12
Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 7d2d1ab061f7..a84f7d1fc9b7 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -6077,7 +6077,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 	 * all phys that don't need this.
 	 */
 	snprintf(prop_name, sizeof(prop_name), "pipe%d", id);
-	qphy->pipe_clk = of_clk_get_by_name(np, prop_name);
+	qphy->pipe_clk = devm_get_clk_from_child(dev, np, prop_name);
 	if (IS_ERR(qphy->pipe_clk)) {
 		if (cfg->type == PHY_TYPE_PCIE ||
 		    cfg->type == PHY_TYPE_USB3) {
-- 
2.35.1


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v2 1/3] phy: qcom-qmp: fix struct clk leak on probe errors
@ 2022-04-27  6:32   ` Johan Hovold
  0 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold, stable, Vivek Gautam

Make sure to release the pipe clock reference in case of a late probe
error (e.g. probe deferral).

Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org      # 4.12
Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 7d2d1ab061f7..a84f7d1fc9b7 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -6077,7 +6077,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 	 * all phys that don't need this.
 	 */
 	snprintf(prop_name, sizeof(prop_name), "pipe%d", id);
-	qphy->pipe_clk = of_clk_get_by_name(np, prop_name);
+	qphy->pipe_clk = devm_get_clk_from_child(dev, np, prop_name);
 	if (IS_ERR(qphy->pipe_clk)) {
 		if (cfg->type == PHY_TYPE_PCIE ||
 		    cfg->type == PHY_TYPE_USB3) {
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v2 2/3] phy: qcom-qmp: fix reset-controller leak on probe errors
  2022-04-27  6:32 ` Johan Hovold
@ 2022-04-27  6:32   ` Johan Hovold
  -1 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold, stable, Vivek Gautam

Make sure to release the lane reset controller in case of a late probe
error (e.g. probe deferral).

Note that due to the reset controller being defined in devicetree in
"lane" child nodes, devm_reset_control_get_exclusive() cannot be used
directly.

Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org      # 4.12
Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index a84f7d1fc9b7..3f77830921f5 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -6005,6 +6005,11 @@ static const struct phy_ops qcom_qmp_pcie_ufs_ops = {
 	.owner		= THIS_MODULE,
 };
 
+static void qcom_qmp_reset_control_put(void *data)
+{
+	reset_control_put(data);
+}
+
 static
 int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 			void __iomem *serdes, const struct qmp_phy_cfg *cfg)
@@ -6099,6 +6104,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 			dev_err(dev, "failed to get lane%d reset\n", id);
 			return PTR_ERR(qphy->lane_rst);
 		}
+		ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put,
+					       qphy->lane_rst);
+		if (ret)
+			return ret;
 	}
 
 	if (cfg->type == PHY_TYPE_UFS || cfg->type == PHY_TYPE_PCIE)
-- 
2.35.1


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v2 2/3] phy: qcom-qmp: fix reset-controller leak on probe errors
@ 2022-04-27  6:32   ` Johan Hovold
  0 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold, stable, Vivek Gautam

Make sure to release the lane reset controller in case of a late probe
error (e.g. probe deferral).

Note that due to the reset controller being defined in devicetree in
"lane" child nodes, devm_reset_control_get_exclusive() cannot be used
directly.

Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org      # 4.12
Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index a84f7d1fc9b7..3f77830921f5 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -6005,6 +6005,11 @@ static const struct phy_ops qcom_qmp_pcie_ufs_ops = {
 	.owner		= THIS_MODULE,
 };
 
+static void qcom_qmp_reset_control_put(void *data)
+{
+	reset_control_put(data);
+}
+
 static
 int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 			void __iomem *serdes, const struct qmp_phy_cfg *cfg)
@@ -6099,6 +6104,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 			dev_err(dev, "failed to get lane%d reset\n", id);
 			return PTR_ERR(qphy->lane_rst);
 		}
+		ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put,
+					       qphy->lane_rst);
+		if (ret)
+			return ret;
 	}
 
 	if (cfg->type == PHY_TYPE_UFS || cfg->type == PHY_TYPE_PCIE)
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v2 3/3] phy: qcom-qmp: switch to explicit reset helpers
  2022-04-27  6:32 ` Johan Hovold
@ 2022-04-27  6:32   ` Johan Hovold
  -1 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold

Switch to consistently using the explicit reset-controller API which
makes it clear that the reset controllers are used exclusively by the
PHY driver.

Note that the deprecated of_reset_control_get() and
devm_reset_control_get() are just transitional wrappers for the explicit
API so there's no functional change.

Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 3f77830921f5..160d723fc773 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -5701,7 +5701,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg
 		struct reset_control *rst;
 		const char *name = cfg->reset_list[i];
 
-		rst = devm_reset_control_get(dev, name);
+		rst = devm_reset_control_get_exclusive(dev, name);
 		if (IS_ERR(rst)) {
 			dev_err(dev, "failed to get %s reset\n", name);
 			return PTR_ERR(rst);
@@ -6099,7 +6099,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 	/* Get lane reset, if any */
 	if (cfg->has_lane_rst) {
 		snprintf(prop_name, sizeof(prop_name), "lane%d", id);
-		qphy->lane_rst = of_reset_control_get(np, prop_name);
+		qphy->lane_rst = of_reset_control_get_exclusive(np, prop_name);
 		if (IS_ERR(qphy->lane_rst)) {
 			dev_err(dev, "failed to get lane%d reset\n", id);
 			return PTR_ERR(qphy->lane_rst);
-- 
2.35.1


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v2 3/3] phy: qcom-qmp: switch to explicit reset helpers
@ 2022-04-27  6:32   ` Johan Hovold
  0 siblings, 0 replies; 14+ messages in thread
From: Johan Hovold @ 2022-04-27  6:32 UTC (permalink / raw)
  To: Kishon Vijay Abraham I, Vinod Koul
  Cc: Andy Gross, Bjorn Andersson, Philipp Zabel, linux-arm-msm,
	linux-phy, linux-kernel, Johan Hovold

Switch to consistently using the explicit reset-controller API which
makes it clear that the reset controllers are used exclusively by the
PHY driver.

Note that the deprecated of_reset_control_get() and
devm_reset_control_get() are just transitional wrappers for the explicit
API so there's no functional change.

Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 3f77830921f5..160d723fc773 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -5701,7 +5701,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg
 		struct reset_control *rst;
 		const char *name = cfg->reset_list[i];
 
-		rst = devm_reset_control_get(dev, name);
+		rst = devm_reset_control_get_exclusive(dev, name);
 		if (IS_ERR(rst)) {
 			dev_err(dev, "failed to get %s reset\n", name);
 			return PTR_ERR(rst);
@@ -6099,7 +6099,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
 	/* Get lane reset, if any */
 	if (cfg->has_lane_rst) {
 		snprintf(prop_name, sizeof(prop_name), "lane%d", id);
-		qphy->lane_rst = of_reset_control_get(np, prop_name);
+		qphy->lane_rst = of_reset_control_get_exclusive(np, prop_name);
 		if (IS_ERR(qphy->lane_rst)) {
 			dev_err(dev, "failed to get lane%d reset\n", id);
 			return PTR_ERR(qphy->lane_rst);
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH v2 3/3] phy: qcom-qmp: switch to explicit reset helpers
  2022-04-27  6:32   ` Johan Hovold
@ 2022-05-02 13:02     ` Bjorn Andersson
  -1 siblings, 0 replies; 14+ messages in thread
From: Bjorn Andersson @ 2022-05-02 13:02 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Kishon Vijay Abraham I, Vinod Koul, Andy Gross, Philipp Zabel,
	linux-arm-msm, linux-phy, linux-kernel

On Tue 26 Apr 23:32 PDT 2022, Johan Hovold wrote:

> Switch to consistently using the explicit reset-controller API which
> makes it clear that the reset controllers are used exclusively by the
> PHY driver.
> 
> Note that the deprecated of_reset_control_get() and
> devm_reset_control_get() are just transitional wrappers for the explicit
> API so there's no functional change.
> 
> Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---
>  drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index 3f77830921f5..160d723fc773 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -5701,7 +5701,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg
>  		struct reset_control *rst;
>  		const char *name = cfg->reset_list[i];
>  
> -		rst = devm_reset_control_get(dev, name);
> +		rst = devm_reset_control_get_exclusive(dev, name);
>  		if (IS_ERR(rst)) {
>  			dev_err(dev, "failed to get %s reset\n", name);
>  			return PTR_ERR(rst);
> @@ -6099,7 +6099,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
>  	/* Get lane reset, if any */
>  	if (cfg->has_lane_rst) {
>  		snprintf(prop_name, sizeof(prop_name), "lane%d", id);
> -		qphy->lane_rst = of_reset_control_get(np, prop_name);
> +		qphy->lane_rst = of_reset_control_get_exclusive(np, prop_name);
>  		if (IS_ERR(qphy->lane_rst)) {
>  			dev_err(dev, "failed to get lane%d reset\n", id);
>  			return PTR_ERR(qphy->lane_rst);
> -- 
> 2.35.1
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v2 3/3] phy: qcom-qmp: switch to explicit reset helpers
@ 2022-05-02 13:02     ` Bjorn Andersson
  0 siblings, 0 replies; 14+ messages in thread
From: Bjorn Andersson @ 2022-05-02 13:02 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Kishon Vijay Abraham I, Vinod Koul, Andy Gross, Philipp Zabel,
	linux-arm-msm, linux-phy, linux-kernel

On Tue 26 Apr 23:32 PDT 2022, Johan Hovold wrote:

> Switch to consistently using the explicit reset-controller API which
> makes it clear that the reset controllers are used exclusively by the
> PHY driver.
> 
> Note that the deprecated of_reset_control_get() and
> devm_reset_control_get() are just transitional wrappers for the explicit
> API so there's no functional change.
> 
> Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---
>  drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index 3f77830921f5..160d723fc773 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -5701,7 +5701,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg
>  		struct reset_control *rst;
>  		const char *name = cfg->reset_list[i];
>  
> -		rst = devm_reset_control_get(dev, name);
> +		rst = devm_reset_control_get_exclusive(dev, name);
>  		if (IS_ERR(rst)) {
>  			dev_err(dev, "failed to get %s reset\n", name);
>  			return PTR_ERR(rst);
> @@ -6099,7 +6099,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
>  	/* Get lane reset, if any */
>  	if (cfg->has_lane_rst) {
>  		snprintf(prop_name, sizeof(prop_name), "lane%d", id);
> -		qphy->lane_rst = of_reset_control_get(np, prop_name);
> +		qphy->lane_rst = of_reset_control_get_exclusive(np, prop_name);
>  		if (IS_ERR(qphy->lane_rst)) {
>  			dev_err(dev, "failed to get lane%d reset\n", id);
>  			return PTR_ERR(qphy->lane_rst);
> -- 
> 2.35.1
> 

-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v2 2/3] phy: qcom-qmp: fix reset-controller leak on probe errors
  2022-04-27  6:32   ` Johan Hovold
@ 2022-05-02 13:03     ` Bjorn Andersson
  -1 siblings, 0 replies; 14+ messages in thread
From: Bjorn Andersson @ 2022-05-02 13:03 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Kishon Vijay Abraham I, Vinod Koul, Andy Gross, Philipp Zabel,
	linux-arm-msm, linux-phy, linux-kernel, stable, Vivek Gautam

On Tue 26 Apr 23:32 PDT 2022, Johan Hovold wrote:

> Make sure to release the lane reset controller in case of a late probe
> error (e.g. probe deferral).
> 
> Note that due to the reset controller being defined in devicetree in
> "lane" child nodes, devm_reset_control_get_exclusive() cannot be used
> directly.
> 
> Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
> Cc: stable@vger.kernel.org      # 4.12
> Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---
>  drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index a84f7d1fc9b7..3f77830921f5 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -6005,6 +6005,11 @@ static const struct phy_ops qcom_qmp_pcie_ufs_ops = {
>  	.owner		= THIS_MODULE,
>  };
>  
> +static void qcom_qmp_reset_control_put(void *data)
> +{
> +	reset_control_put(data);
> +}
> +
>  static
>  int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
>  			void __iomem *serdes, const struct qmp_phy_cfg *cfg)
> @@ -6099,6 +6104,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
>  			dev_err(dev, "failed to get lane%d reset\n", id);
>  			return PTR_ERR(qphy->lane_rst);
>  		}
> +		ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put,
> +					       qphy->lane_rst);
> +		if (ret)
> +			return ret;
>  	}
>  
>  	if (cfg->type == PHY_TYPE_UFS || cfg->type == PHY_TYPE_PCIE)
> -- 
> 2.35.1
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v2 2/3] phy: qcom-qmp: fix reset-controller leak on probe errors
@ 2022-05-02 13:03     ` Bjorn Andersson
  0 siblings, 0 replies; 14+ messages in thread
From: Bjorn Andersson @ 2022-05-02 13:03 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Kishon Vijay Abraham I, Vinod Koul, Andy Gross, Philipp Zabel,
	linux-arm-msm, linux-phy, linux-kernel, stable, Vivek Gautam

On Tue 26 Apr 23:32 PDT 2022, Johan Hovold wrote:

> Make sure to release the lane reset controller in case of a late probe
> error (e.g. probe deferral).
> 
> Note that due to the reset controller being defined in devicetree in
> "lane" child nodes, devm_reset_control_get_exclusive() cannot be used
> directly.
> 
> Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
> Cc: stable@vger.kernel.org      # 4.12
> Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---
>  drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index a84f7d1fc9b7..3f77830921f5 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -6005,6 +6005,11 @@ static const struct phy_ops qcom_qmp_pcie_ufs_ops = {
>  	.owner		= THIS_MODULE,
>  };
>  
> +static void qcom_qmp_reset_control_put(void *data)
> +{
> +	reset_control_put(data);
> +}
> +
>  static
>  int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
>  			void __iomem *serdes, const struct qmp_phy_cfg *cfg)
> @@ -6099,6 +6104,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
>  			dev_err(dev, "failed to get lane%d reset\n", id);
>  			return PTR_ERR(qphy->lane_rst);
>  		}
> +		ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put,
> +					       qphy->lane_rst);
> +		if (ret)
> +			return ret;
>  	}
>  
>  	if (cfg->type == PHY_TYPE_UFS || cfg->type == PHY_TYPE_PCIE)
> -- 
> 2.35.1
> 

-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v2 0/3] phy: qcom-qmp: fix leaks on probe errors
  2022-04-27  6:32 ` Johan Hovold
@ 2022-05-03  4:41   ` Vinod Koul
  -1 siblings, 0 replies; 14+ messages in thread
From: Vinod Koul @ 2022-05-03  4:41 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Kishon Vijay Abraham I, Andy Gross, Bjorn Andersson,
	Philipp Zabel, linux-arm-msm, linux-phy, linux-kernel

On 27-04-22, 08:32, Johan Hovold wrote:
> Here are two more fixes addressing resource leaks on probe errors (e.g.
> probe deferral) and a related cleanup.

Applied, thanks

-- 
~Vinod

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v2 0/3] phy: qcom-qmp: fix leaks on probe errors
@ 2022-05-03  4:41   ` Vinod Koul
  0 siblings, 0 replies; 14+ messages in thread
From: Vinod Koul @ 2022-05-03  4:41 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Kishon Vijay Abraham I, Andy Gross, Bjorn Andersson,
	Philipp Zabel, linux-arm-msm, linux-phy, linux-kernel

On 27-04-22, 08:32, Johan Hovold wrote:
> Here are two more fixes addressing resource leaks on probe errors (e.g.
> probe deferral) and a related cleanup.

Applied, thanks

-- 
~Vinod

-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2022-05-03  4:41 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-27  6:32 [PATCH v2 0/3] phy: qcom-qmp: fix leaks on probe errors Johan Hovold
2022-04-27  6:32 ` Johan Hovold
2022-04-27  6:32 ` [PATCH v2 1/3] phy: qcom-qmp: fix struct clk leak " Johan Hovold
2022-04-27  6:32   ` Johan Hovold
2022-04-27  6:32 ` [PATCH v2 2/3] phy: qcom-qmp: fix reset-controller " Johan Hovold
2022-04-27  6:32   ` Johan Hovold
2022-05-02 13:03   ` Bjorn Andersson
2022-05-02 13:03     ` Bjorn Andersson
2022-04-27  6:32 ` [PATCH v2 3/3] phy: qcom-qmp: switch to explicit reset helpers Johan Hovold
2022-04-27  6:32   ` Johan Hovold
2022-05-02 13:02   ` Bjorn Andersson
2022-05-02 13:02     ` Bjorn Andersson
2022-05-03  4:41 ` [PATCH v2 0/3] phy: qcom-qmp: fix leaks on probe errors Vinod Koul
2022-05-03  4:41   ` Vinod Koul

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.