Skip to contentSkip to conversation

clk: meson: Hold reference returned by of_get_parent()

PATCH Applied Liang He 5 participants 5 messages Jun 28, 2022 – Aug 19, 2022

Subsystems (3)

v2 of 5 Applied Latest is v5 →

lore
Share & tools
lore

Liang He

author
#0 lore raw

PATCH v2 1/1 clk: meson: Hold reference returned by of_get_parent()

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes 88e2da81241e ("clk: meson: aoclk: refactor common code into dedicated file")
Fixes 6682bd4d443f ("clk: meson: factorise meson64 peripheral clock controller drivers")
Fixes bb6eddd1d28c ("clk: meson: meson8b: use the HHI syscon if available")

---
changelog:

v2: change the name of 'tp', change the title format, keep reverse christmas tree
v1: hold reference returned by of_get_parent()

v1-link: https://lore.kernel.org/all/[email protected]/

Patched files have been compiled test in 5.19rc2.

 drivers/clk/meson/meson-aoclk.c | 5 ++++-
 drivers/clk/meson/meson-eeclk.c | 5 ++++-
 drivers/clk/meson/meson8b.c     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)
drivers/clk/meson/meson-aoclk.c +4 -1
index 27cd2c1f3f61..434cd8f9de82 100644
@@ -38,6 +38,7 @@ int meson_aoclkc_probe(struct platform_device *pdev)
 	struct meson_aoclk_reset_controller *rstc;
 	struct meson_aoclk_data *data;
 	struct device *dev = &pdev->dev;
+	struct device_node *np;
 	struct regmap *regmap;
 	int ret, clkid;
 
@@ -49,7 +50,9 @@ int meson_aoclkc_probe(struct platform_device *pdev)
 	if (!rstc)
 		return -ENOMEM;
 
-	regmap = syscon_node_to_regmap(of_get_parent(dev->of_node));
+	np = of_get_parent(dev->of_node);
+	regmap = syscon_node_to_regmap(np);
+	of_node_put(np);
 	if (IS_ERR(regmap)) {
 		dev_err(dev, "failed to get regmap\n");
 		return PTR_ERR(regmap);
drivers/clk/meson/meson-eeclk.c +4 -1
index 8d5a5dab955a..0e5e6b57eb20 100644
@@ -18,6 +18,7 @@ int meson_eeclkc_probe(struct platform_device *pdev)
 {
 	const struct meson_eeclkc_data *data;
 	struct device *dev = &pdev->dev;
+	struct device_node *np;
 	struct regmap *map;
 	int ret, i;
 
@@ -26,7 +27,9 @@ int meson_eeclkc_probe(struct platform_device *pdev)
 		return -EINVAL;
 
 	/* Get the hhi system controller node */
-	map = syscon_node_to_regmap(of_get_parent(dev->of_node));
+	np = of_get_parent(dev->of_node);
+	map = syscon_node_to_regmap(np);
+	of_node_put(np);
 	if (IS_ERR(map)) {
 		dev_err(dev,
 			"failed to get HHI regmap\n");
drivers/clk/meson/meson8b.c +4 -1
index 8f3b7a94a667..827e78fb16a8 100644
@@ -3792,12 +3792,15 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
 			struct clk_hw_onecell_data *clk_hw_onecell_data)
 {
 	struct meson8b_clk_reset *rstc;
+	struct device_node *parent_np;
 	const char *notifier_clk_name;
 	struct clk *notifier_clk;
 	struct regmap *map;
 	int i, ret;
 
-	map = syscon_node_to_regmap(of_get_parent(np));
+	parent_np = of_get_parent(np);
+	map = syscon_node_to_regmap(parent_np);
+	of_node_put(parent_np);
 	if (IS_ERR(map)) {
 		pr_err("failed to get HHI regmap - Trying obsolete regs\n");
 		return;
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 81 lines · Liang He

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes 88e2da81241e ("clk: meson: aoclk: refactor common code into dedicated file")
Fixes 6682bd4d443f ("clk: meson: factorise meson64 peripheral clock controller drivers")
Fixes bb6eddd1d28c ("clk: meson: meson8b: use the HHI syscon if available")

---
changelog:

v2: change the name of 'tp', change the title format, keep reverse christmas tree
v1: hold reference returned by of_get_parent()

v1-link: https://lore.kernel.org/all/[email protected]/

Patched files have been compiled test in 5.19rc2.

  drivers/clk/meson/meson-aoclk.c | 5 ++++-
  drivers/clk/meson/meson-eeclk.c | 5 ++++-
  drivers/clk/meson/meson8b.c     | 5 ++++-
  3 files changed, 12 insertions(+), 3 deletions(-)
drivers/clk/meson/meson-aoclk.c +4 -1
index 27cd2c1f3f61..434cd8f9de82 100644
@@ -38,6 +38,7 @@ int meson_aoclkc_probe(struct platform_device *pdev)
  	struct meson_aoclk_reset_controller *rstc;
  	struct meson_aoclk_data *data;
  	struct device *dev = &pdev->dev;
+	struct device_node *np;
  	struct regmap *regmap;
  	int ret, clkid;
 
@@ -49,7 +50,9 @@ int meson_aoclkc_probe(struct platform_device *pdev)
  	if (!rstc)
  		return -ENOMEM;
 
-	regmap = syscon_node_to_regmap(of_get_parent(dev->of_node));
+	np = of_get_parent(dev->of_node);
+	regmap = syscon_node_to_regmap(np);
+	of_node_put(np);
  	if (IS_ERR(regmap)) {
  		dev_err(dev, "failed to get regmap\n");
  		return PTR_ERR(regmap);
drivers/clk/meson/meson-eeclk.c +4 -1
index 8d5a5dab955a..0e5e6b57eb20 100644
@@ -18,6 +18,7 @@ int meson_eeclkc_probe(struct platform_device *pdev)
  {
  	const struct meson_eeclkc_data *data;
  	struct device *dev = &pdev->dev;
+	struct device_node *np;
  	struct regmap *map;
  	int ret, i;
 
@@ -26,7 +27,9 @@ int meson_eeclkc_probe(struct platform_device *pdev)
  		return -EINVAL;
 
  	/* Get the hhi system controller node */
-	map = syscon_node_to_regmap(of_get_parent(dev->of_node));
+	np = of_get_parent(dev->of_node);
+	map = syscon_node_to_regmap(np);
+	of_node_put(np);
  	if (IS_ERR(map)) {
  		dev_err(dev,
  			"failed to get HHI regmap\n");
drivers/clk/meson/meson8b.c +1 -0
index 8f3b7a94a667..827e78fb16a8 100644
@@ -3792,12 +3792,15 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
  			struct clk_hw_onecell_data *clk_hw_onecell_data)
  {
  	struct meson8b_clk_reset *rstc;
+	struct device_node *parent_np;
  	const char *notifier_clk_name;
  	struct clk *notifier_clk;

drivers/clk/meson/meson8b.c static void __init meson8b_clkc_init_common(struct device_node *np, · line 3806

Quoted 10 lines
drivers/clk/meson/meson8b.c +3 -1
  	struct regmap *map;
  	int i, ret;
 
-	map = syscon_node_to_regmap(of_get_parent(np));
+	parent_np = of_get_parent(np);
+	map = syscon_node_to_regmap(parent_np);
+	of_node_put(parent_np);
  	if (IS_ERR(map)) {
  		pr_err("failed to get HHI regmap - Trying obsolete regs\n");
  		return;

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

reviewer Reviewed-by on v2 1/1
#2 lore raw
In reply to Liang He
Quoted 9 lines · Liang He

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes 88e2da81241e ("clk: meson: aoclk: refactor common code into dedicated file")
Fixes 6682bd4d443f ("clk: meson: factorise meson64 peripheral clock controller drivers")
Fixes bb6eddd1d28c ("clk: meson: meson8b: use the HHI syscon if available")
Quoted 5 lines

---
changelog:

v2: change the name of 'tp', change the title format, keep reverse christmas tree
v1: hold reference returned by of_get_parent()

Thank you for these changes in v2!

maintainer
#3 lore raw
In reply to Liang He
Quoted 6 lines · Liang He

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes 88e2da81241e ("clk: meson: aoclk: refactor common code into dedicated file")
Fixes 6682bd4d443f ("clk: meson: factorise meson64 peripheral clock controller drivers")
Fixes bb6eddd1d28c ("clk: meson: meson8b: use the HHI syscon if available")

Fixing different commits with a single one is not going to make stable backport easy. I would prefer if you could submit a patch for each fixes/driver.

Not blocking for a v3 but worth considering after looking at the number of drivers making the same mistake:
* make a syscon function to deal with of_get_parent(), syscon_node_to_regmap() and of_node_put() instead of duplicating the code everywhere.
* Propose a coccinelle script to detect/fix this in the future

Quoted 85 lines

---
changelog:

v2: change the name of 'tp', change the title format, keep reverse christmas tree
v1: hold reference returned by of_get_parent()

v1-link: https://lore.kernel.org/all/[email protected]/

Patched files have been compiled test in 5.19rc2.

 drivers/clk/meson/meson-aoclk.c | 5 ++++-
 drivers/clk/meson/meson-eeclk.c | 5 ++++-
 drivers/clk/meson/meson8b.c     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)
drivers/clk/meson/meson-aoclk.c +4 -1
index 27cd2c1f3f61..434cd8f9de82 100644
@@ -38,6 +38,7 @@ int meson_aoclkc_probe(struct platform_device *pdev)
 	struct meson_aoclk_reset_controller *rstc;
 	struct meson_aoclk_data *data;
 	struct device *dev = &pdev->dev;
+	struct device_node *np;
 	struct regmap *regmap;
 	int ret, clkid;
 
@@ -49,7 +50,9 @@ int meson_aoclkc_probe(struct platform_device *pdev)
 	if (!rstc)
 		return -ENOMEM;
 
-	regmap = syscon_node_to_regmap(of_get_parent(dev->of_node));
+	np = of_get_parent(dev->of_node);
+	regmap = syscon_node_to_regmap(np);
+	of_node_put(np);
 	if (IS_ERR(regmap)) {
 		dev_err(dev, "failed to get regmap\n");
 		return PTR_ERR(regmap);
drivers/clk/meson/meson-eeclk.c +4 -1
index 8d5a5dab955a..0e5e6b57eb20 100644
@@ -18,6 +18,7 @@ int meson_eeclkc_probe(struct platform_device *pdev)
 {
 	const struct meson_eeclkc_data *data;
 	struct device *dev = &pdev->dev;
+	struct device_node *np;
 	struct regmap *map;
 	int ret, i;
 
@@ -26,7 +27,9 @@ int meson_eeclkc_probe(struct platform_device *pdev)
 		return -EINVAL;
 
 	/* Get the hhi system controller node */
-	map = syscon_node_to_regmap(of_get_parent(dev->of_node));
+	np = of_get_parent(dev->of_node);
+	map = syscon_node_to_regmap(np);
+	of_node_put(np);
 	if (IS_ERR(map)) {
 		dev_err(dev,
 			"failed to get HHI regmap\n");
drivers/clk/meson/meson8b.c +4 -1
index 8f3b7a94a667..827e78fb16a8 100644
@@ -3792,12 +3792,15 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
 			struct clk_hw_onecell_data *clk_hw_onecell_data)
 {
 	struct meson8b_clk_reset *rstc;
+	struct device_node *parent_np;
 	const char *notifier_clk_name;
 	struct clk *notifier_clk;
 	struct regmap *map;
 	int i, ret;
 
-	map = syscon_node_to_regmap(of_get_parent(np));
+	parent_np = of_get_parent(np);
+	map = syscon_node_to_regmap(parent_np);
+	of_node_put(parent_np);
 	if (IS_ERR(map)) {
 		pr_err("failed to get HHI regmap - Trying obsolete regs\n");
 		return;
maintainer Applied
#4 lore raw
In reply to Liang He

Quoting Liang He (2022-06-28 07:10:38)

Quoted 9 lines

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes 88e2da81241e ("clk: meson: aoclk: refactor common code into dedicated file")
Fixes 6682bd4d443f ("clk: meson: factorise meson64 peripheral clock controller drivers")
Fixes bb6eddd1d28c ("clk: meson: meson8b: use the HHI syscon if available")

---

Applied to clk-next