* [PATCH 0/2] phy: qcom-qmp: fix leaks on probe errors @ 2022-04-22 13:09 Johan Hovold 2022-04-22 13:09 ` [PATCH 1/2] phy: qcom-qmp: fix struct clk leak " Johan Hovold 2022-04-22 13:09 ` [PATCH 2/2] phy: qcom-qmp: fix reset-controller " Johan Hovold 0 siblings, 2 replies; 6+ messages in thread From: Johan Hovold @ 2022-04-22 13:09 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). Johan Johan Hovold (2): phy: qcom-qmp: fix struct clk leak on probe errors phy: qcom-qmp: fix reset-controller leak on probe errors drivers/phy/qualcomm/phy-qcom-qmp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 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] 6+ messages in thread
* [PATCH 1/2] phy: qcom-qmp: fix struct clk leak on probe errors 2022-04-22 13:09 [PATCH 0/2] phy: qcom-qmp: fix leaks on probe errors Johan Hovold @ 2022-04-22 13:09 ` Johan Hovold 2022-04-26 23:36 ` Bjorn Andersson 2022-04-22 13:09 ` [PATCH 2/2] phy: qcom-qmp: fix reset-controller " Johan Hovold 1 sibling, 1 reply; 6+ messages in thread From: Johan Hovold @ 2022-04-22 13:09 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> 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] 6+ messages in thread
* Re: [PATCH 1/2] phy: qcom-qmp: fix struct clk leak on probe errors 2022-04-22 13:09 ` [PATCH 1/2] phy: qcom-qmp: fix struct clk leak " Johan Hovold @ 2022-04-26 23:36 ` Bjorn Andersson 0 siblings, 0 replies; 6+ messages in thread From: Bjorn Andersson @ 2022-04-26 23:36 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 Fri 22 Apr 06:09 PDT 2022, Johan Hovold wrote: > 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> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > 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 [flat|nested] 6+ messages in thread
* [PATCH 2/2] phy: qcom-qmp: fix reset-controller leak on probe errors 2022-04-22 13:09 [PATCH 0/2] phy: qcom-qmp: fix leaks on probe errors Johan Hovold 2022-04-22 13:09 ` [PATCH 1/2] phy: qcom-qmp: fix struct clk leak " Johan Hovold @ 2022-04-22 13:09 ` Johan Hovold 2022-04-25 9:45 ` Philipp Zabel 1 sibling, 1 reply; 6+ messages in thread From: Johan Hovold @ 2022-04-22 13:09 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 (questionable) "lane" child nodes, devm_reset_control_get_exclusive() cannot be used (and we shouldn't add devres helpers for the legacy reset controller API). 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> 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] 6+ messages in thread
* Re: [PATCH 2/2] phy: qcom-qmp: fix reset-controller leak on probe errors 2022-04-22 13:09 ` [PATCH 2/2] phy: qcom-qmp: fix reset-controller " Johan Hovold @ 2022-04-25 9:45 ` Philipp Zabel 2022-04-27 6:01 ` Johan Hovold 0 siblings, 1 reply; 6+ messages in thread From: Philipp Zabel @ 2022-04-25 9:45 UTC (permalink / raw) To: Johan Hovold, Kishon Vijay Abraham I, Vinod Koul Cc: Andy Gross, Bjorn Andersson, linux-arm-msm, linux-phy, linux-kernel, stable, Vivek Gautam Hi Johan, On Fr, 2022-04-22 at 15:09 +0200, Johan Hovold wrote: > Make sure to release the lane reset controller in case of a late probe > error (e.g. probe deferral). Right. grepping for "of_reset_control_get", there seem to be are a few other drivers that might share the same issue... > Note that due to the reset controller being defined in devicetree in > (questionable) "lane" child nodes, devm_reset_control_get_exclusive() > cannot be used (and we shouldn't add devres helpers for the legacy reset > controller API). Do you mean of_reset_control_get()? Maybe you could switch to of_reset_control_get_exclusive() while at it? That one might warrant a devres helper if other drivers were to adopt the same pattern. The patch itself looks fine to me, Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] phy: qcom-qmp: fix reset-controller leak on probe errors 2022-04-25 9:45 ` Philipp Zabel @ 2022-04-27 6:01 ` Johan Hovold 0 siblings, 0 replies; 6+ messages in thread From: Johan Hovold @ 2022-04-27 6:01 UTC (permalink / raw) To: Philipp Zabel Cc: Johan Hovold, Kishon Vijay Abraham I, Vinod Koul, Andy Gross, Bjorn Andersson, linux-arm-msm, linux-phy, linux-kernel, stable, Vivek Gautam On Mon, Apr 25, 2022 at 11:45:29AM +0200, Philipp Zabel wrote: > Hi Johan, > > On Fr, 2022-04-22 at 15:09 +0200, Johan Hovold wrote: > > Make sure to release the lane reset controller in case of a late probe > > error (e.g. probe deferral). > > Right. grepping for "of_reset_control_get", there seem to be are a few > other drivers that might share the same issue... Yeah, I'm sure there are more of these. > > Note that due to the reset controller being defined in devicetree in > > (questionable) "lane" child nodes, devm_reset_control_get_exclusive() > > cannot be used (and we shouldn't add devres helpers for the legacy reset > > controller API). > > Do you mean of_reset_control_get()? Maybe you could switch to > of_reset_control_get_exclusive() while at it? Right, I was referring to of_reset_control_get() but obviously of_reset_control_get_exclusive() could still get a devres version so that sentence in parenthesis doesn't make much sense. I must have mistakingly imagined that the latter also retrieved the struct device_node from a struct device like the current devres helpers do. > That one might warrant a devres helper if other drivers were to adopt > the same pattern. Right. > The patch itself looks fine to me, > > Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Thanks for reviewing. I'll send a v2 with an updated commit message and switch to the new API in a new follow-on patch. Johan -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-27 6:01 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-04-22 13:09 [PATCH 0/2] phy: qcom-qmp: fix leaks on probe errors Johan Hovold 2022-04-22 13:09 ` [PATCH 1/2] phy: qcom-qmp: fix struct clk leak " Johan Hovold 2022-04-26 23:36 ` Bjorn Andersson 2022-04-22 13:09 ` [PATCH 2/2] phy: qcom-qmp: fix reset-controller " Johan Hovold 2022-04-25 9:45 ` Philipp Zabel 2022-04-27 6:01 ` Johan Hovold
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).