Skip to contentSkip to conversation

PM / devfreq: rk3399_dmc: Disable devfreq-event device when fails

PATCH In review Yangtao Li 2 participants 5 messages Dec 22, 2019 – Dec 23, 2019

Subsystems (3)
lore
Share & tools
lore

Yangtao Li

author
#0 lore raw

PATCH v2 1/2 PM / devfreq: rk3399_dmc: Disable devfreq-event device when fails

The probe process may fail, but the devfreq event device remains enabled. Call devfreq_event_disable_edev on the error return path.

---
v2:
-change subject
-rename lable to err_edev
-fix error path handler

---
 drivers/devfreq/rk3399_dmc.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/devfreq/rk3399_dmc.c +12 -5
index 2f1027c5b647..4288745304c7 100644
@@ -364,7 +364,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 			if (res.a0) {
 				dev_err(dev, "Failed to set dram param: %ld\n",
 					res.a0);
-				return -EINVAL;
+				ret = -EINVAL;
+				goto err_edev;
 			}
 		}
 	}
@@ -373,8 +374,10 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 	if (node) {
 		data->regmap_pmu = syscon_node_to_regmap(node);
 		of_node_put(node);
-		if (IS_ERR(data->regmap_pmu))
-			return PTR_ERR(data->regmap_pmu);
+		if (IS_ERR(data->regmap_pmu)) {
+			ret = PTR_ERR(data->regmap_pmu);
+			goto err_edev;
+		}
 	}
 
 	regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
@@ -392,7 +395,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 		data->odt_dis_freq = data->timing.lpddr4_odt_dis_freq;
 		break;
 	default:
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_edev;
 	};
 
 	arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,
@@ -426,7 +430,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 	 */
 	if (dev_pm_opp_of_add_table(dev)) {
 		dev_err(dev, "Invalid operating-points in device tree.\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_edev;
 	}
 
 	of_property_read_u32(np, "upthreshold",
@@ -466,6 +471,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 
 err_free_opp:
 	dev_pm_opp_of_remove_table(&pdev->dev);
+err_edev:
+	devfreq_event_disable_edev(data->edev);
 	return ret;
 }
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 2/2 PM / devfreq: exynos-bus: Disable devfreq-event device when fails

The exynos_bus_profile_init process may fail, but the devfreq event device remains enabled. Call devfreq_event_disable_edev on the error return path.

---
v2:
-change subject
-rename lable to err_edev
-add return value check

---
 drivers/devfreq/exynos-bus.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/devfreq/exynos-bus.c +8 -1
index 7f5917d59072..948e9340f91c 100644
@@ -335,10 +335,17 @@ static int exynos_bus_profile_init(struct exynos_bus *bus,
 	ret = exynos_bus_set_event(bus);
 	if (ret < 0) {
 		dev_err(dev, "failed to set event to devfreq-event devices\n");
-		return ret;
+		goto err_edev;
 	}
 
 	return 0;
+
+err_edev:
+	ret = exynos_bus_disable_edev(bus);
+	if (ret < 0)
+		dev_warn(dev, "failed to disable the devfreq-event devices\n");
+
+	return ret;
 }
 
 static int exynos_bus_profile_init_passive(struct exynos_bus *bus,
Signature · 1 line
2.17.1
maintainer
#2 lore raw

Re: [PATCH v2 2/2] PM / devfreq: exynos-bus: Disable devfreq-event device when fails

Quoted 27 lines · Yangtao Li

The exynos_bus_profile_init process may fail, but the devfreq event device remains enabled. Call devfreq_event_disable_edev on the error return path.

---
v2:

(quoted diff) +0 -4
-change subject
-rename lable to err_edev
-add return value check
---
 drivers/devfreq/exynos-bus.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/devfreq/exynos-bus.c +1 -1
index 7f5917d59072..948e9340f91c 100644
@@ -335,10 +335,17 @@ static int exynos_bus_profile_init(struct exynos_bus *bus,
 	ret = exynos_bus_set_event(bus);
 	if (ret < 0) {
 		dev_err(dev, "failed to set event to devfreq-event devices\n");
-		return ret;
+		goto err_edev;
 	}
 
 	return 0;

drivers/devfreq/exynos-bus.c static int exynos_bus_profile_init(struct exynos_bus *bus, · line 351

Quoted 10 lines
drivers/devfreq/exynos-bus.c +7 -0
+
+err_edev:
+	ret = exynos_bus_disable_edev(bus);
+	if (ret < 0)
+		dev_warn(dev, "failed to disable the devfreq-event devices\n");
+
+	return ret;
 }
 
 static int exynos_bus_profile_init_passive(struct exynos_bus *bus,

Applied it.

Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics
maintainer
#3 lore raw

Re: [PATCH v2 2/2] PM / devfreq: exynos-bus: Disable devfreq-event device when fails

Quoted 36 lines · Chanwoo Choi
Quoted 35 lines · Yangtao Li

The exynos_bus_profile_init process may fail, but the devfreq event device remains enabled. Call devfreq_event_disable_edev on the error return path.

---
v2:

(quoted diff) +0 -4
-change subject
-rename lable to err_edev
-add return value check
---
 drivers/devfreq/exynos-bus.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/devfreq/exynos-bus.c +8 -1
index 7f5917d59072..948e9340f91c 100644
@@ -335,10 +335,17 @@ static int exynos_bus_profile_init(struct exynos_bus *bus,
 	ret = exynos_bus_set_event(bus);
 	if (ret < 0) {
 		dev_err(dev, "failed to set event to devfreq-event devices\n");
-		return ret;
+		goto err_edev;
 	}
 
 	return 0;
+
+err_edev:
+	ret = exynos_bus_disable_edev(bus);
+	if (ret < 0)
+		dev_warn(dev, "failed to disable the devfreq-event devices\n");
+
+	return ret;
 }
 
Quoted 5 lines

drivers/devfreq/exynos-bus.c static int exynos_bus_profile_init(struct exynos_bus *bus, · line 351

Quoted 2 lines
drivers/devfreq/exynos-bus.c +0 -0
 static int exynos_bus_profile_init_passive(struct exynos_bus *bus,

Applied it.

I'm sorry. I applied the v3[1] patch instead of this.
[1] https://patchwork.kernel.org/patch/11307721/

Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics
maintainer
#4 lore raw
In reply to Yangtao Li
Quoted 63 lines · Yangtao Li

The probe process may fail, but the devfreq event device remains enabled. Call devfreq_event_disable_edev on the error return path.

---
v2:

(quoted diff) +0 -4
-change subject
-rename lable to err_edev
-fix error path handler
---
 drivers/devfreq/rk3399_dmc.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/devfreq/rk3399_dmc.c +10 -5
index 2f1027c5b647..4288745304c7 100644
@@ -364,7 +364,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 			if (res.a0) {
 				dev_err(dev, "Failed to set dram param: %ld\n",
 					res.a0);
-				return -EINVAL;
+				ret = -EINVAL;
+				goto err_edev;
 			}
 		}
 	}
@@ -373,8 +374,10 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 	if (node) {
 		data->regmap_pmu = syscon_node_to_regmap(node);
 		of_node_put(node);
-		if (IS_ERR(data->regmap_pmu))
-			return PTR_ERR(data->regmap_pmu);
+		if (IS_ERR(data->regmap_pmu)) {
+			ret = PTR_ERR(data->regmap_pmu);
+			goto err_edev;
+		}
 	}
 
 	regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
@@ -392,7 +395,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 		data->odt_dis_freq = data->timing.lpddr4_odt_dis_freq;
 		break;
 	default:
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_edev;
 	};
 
 	arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,
@@ -426,7 +430,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 	 */
 	if (dev_pm_opp_of_add_table(dev)) {
 		dev_err(dev, "Invalid operating-points in device tree.\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_edev;
 	}
 
 	of_property_read_u32(np, "upthreshold",

drivers/devfreq/rk3399_dmc.c static int rk3399_dmcfreq_probe(struct platform_device *pdev) · line 478

Quoted 8 lines
drivers/devfreq/rk3399_dmc.c +2 -0
@@ -466,6 +471,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 
 err_free_opp:
 	dev_pm_opp_of_remove_table(&pdev->dev);
+err_edev:
+	devfreq_event_disable_edev(data->edev);
 	return ret;
 }
 

Applied it.

Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics