phy: qcom-qmp: fix leaks on probe errors
Subsystems (3)
v2 cover phy: qcom-qmp: fix leaks on probe errors
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(-)
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v2 1/3 phy: qcom-qmp: fix struct clk leak on probe errors
Make sure to release the pipe clock reference in case of a late probe error (e.g. probe deferral).
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -1
@@ -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 ) {
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v2 2/3 phy: qcom-qmp: fix reset-controller leak on probe errors
In reply to Johan HovoldMake 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.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +9 -0
@@ -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 )
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v2 3/3 phy: qcom-qmp: switch to explicit reset helpers
In reply to Johan HovoldSwitch 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.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -2
@@ -5701,7 +5701,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfgstruct 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);
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v2 3/3] phy: qcom-qmp: switch to explicit reset helpers
Quoted 10 lines · 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()anddevm_reset_control_get()are just transitional wrappers for the explicit API so there's no functional change.Suggested-by Philipp Zabel <[email protected]>Signed-off-by Johan Hovold <[email protected]>
Quoted 29 lines
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/phy/qualcomm/phy-qcom-qmp.c +2
-2@@ -5701,7 +5701,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfgstruct 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);Signature · 1 line
2.35.1
Re: [PATCH v2 2/3] phy: qcom-qmp: fix reset-controller leak on probe errors
In reply to Johan HovoldQuoted 7 lines · Johan Hovold
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.
Quoted 5 lines
Fixes e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")Cc [email protected] # 4.12Cc Vivek Gautam <[email protected]>Reviewed-by Philipp Zabel <[email protected]>Signed-off-by Johan Hovold <[email protected]>
Quoted 34 lines
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/phy/qualcomm/phy-qcom-qmp.c +9
-0@@ -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 )Signature · 1 line
2.35.1
Quoted 2 lines · Johan Hovold
Here are two more fixes addressing resource leaks on probe errors (e.g. probe deferral) and a related cleanup.
Applied, thanks
Signature · 6 lines
~Vinod -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy