Linux-PM Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v3 0/5] add coupled regulators for Exynos5422/5800
       [not found] <CGME20190719150553eucas1p142b965afae13224712d51f9c28162165@eucas1p1.samsung.com>
@ 2019-07-19 15:05 ` k.konieczny
       [not found]   ` <CGME20190719150553eucas1p1665462f3fc0e06fc9c082e258be3a851@eucas1p1.samsung.com>
                     ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: k.konieczny @ 2019-07-19 15:05 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Chanwoo Choi,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	linux-pm, linux-samsung-soc

Hi,

The main purpose of this patch series is to add coupled regulators for
Exynos5422/5800 to keep constrain on voltage difference between vdd_arm
and vdd_int to be at most 300mV. In exynos-bus instead of using
regulator_set_voltage_tol() with default voltage tolerance it should be
used regulator_set_voltage_triplet() with volatege range, and this is
already present in opp/core.c code, so it can be reused. While at this,
move setting regulators into opp/core.

This patchset was tested on Odroid XU3.

The DTS coupled regulators patch depends on 2nd and 3rd patches.

Changes:
v3:
- added new exynos-bus patch to correct clock and regulator enabling
  and disabling sequence as suggested by Chanwoo Choi
- corrected error path in enable and improved commit message in opp/core
- improve comment in devfreq/exynos-bus.c before devfreq_recommended_opp()
- change cover letter as there is new patch
- added note before Signed-off-by in 4th patch
v2:
- improve regulators enable/disable code in opp/core as suggested by
  Viresh Kumar
- add new patch for remove unused dt-bindings as suggested by Krzysztof
  Kozlowski

Regards,
Kamil

Kamil Konieczny (4):
  devfreq: exynos-bus: correct clock enable sequence
  opp: core: add regulators enable and disable
  devfreq: exynos-bus: convert to use dev_pm_opp_set_rate()
  dt-bindings: devfreq: exynos-bus: remove unused property

Marek Szyprowski (1):
  ARM: dts: exynos: add initial data for coupled regulators for
    Exynos5422/5800

 .../bindings/devfreq/exynos-bus.txt           |   2 -
 arch/arm/boot/dts/exynos5420.dtsi             |  34 ++--
 arch/arm/boot/dts/exynos5422-odroid-core.dtsi |   4 +
 arch/arm/boot/dts/exynos5800-peach-pi.dts     |   4 +
 arch/arm/boot/dts/exynos5800.dtsi             |  32 ++--
 drivers/devfreq/exynos-bus.c                  | 181 ++++++------------
 drivers/opp/core.c                            |  16 +-
 7 files changed, 113 insertions(+), 160 deletions(-)

-- 
2.22.0


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

* [PATCH v3 1/5] devfreq: exynos-bus: correct clock enable sequence
       [not found]   ` <CGME20190719150553eucas1p1665462f3fc0e06fc9c082e258be3a851@eucas1p1.samsung.com>
@ 2019-07-19 15:05     ` k.konieczny
  2019-07-25  9:58       ` Chanwoo Choi
  0 siblings, 1 reply; 13+ messages in thread
From: k.konieczny @ 2019-07-19 15:05 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Chanwoo Choi,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	linux-pm, linux-samsung-soc

Regulators should be enabled before clocks to avoid h/w hang. This
require change in exynos_bus_probe() to move exynos_bus_parse_of()
after exynos_bus_parent_parse_of() and change in enabling sequence
of regulator and clock in exynos_bus_parse_of(). Similar change is
needed in exynos_bus_exit() where clock should be disabled first.

Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
---
This patch is new to this series.

---
 drivers/devfreq/exynos-bus.c | 58 ++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index 486cc5b422f1..f391044aa39d 100644
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@ -194,11 +194,11 @@ static void exynos_bus_exit(struct device *dev)
 	if (ret < 0)
 		dev_warn(dev, "failed to disable the devfreq-event devices\n");
 
+	clk_disable_unprepare(bus->clk);
 	if (bus->regulator)
 		regulator_disable(bus->regulator);
 
 	dev_pm_opp_of_remove_table(dev);
-	clk_disable_unprepare(bus->clk);
 }
 
 /*
@@ -326,8 +326,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
 	return ret;
 }
 
-static int exynos_bus_parse_of(struct device_node *np,
-			      struct exynos_bus *bus)
+static int exynos_bus_parse_of(struct exynos_bus *bus)
 {
 	struct device *dev = bus->dev;
 	struct dev_pm_opp *opp;
@@ -341,36 +340,35 @@ static int exynos_bus_parse_of(struct device_node *np,
 		return PTR_ERR(bus->clk);
 	}
 
-	ret = clk_prepare_enable(bus->clk);
+	/* Get the freq and voltage from OPP table to scale the bus freq */
+	ret = dev_pm_opp_of_add_table(dev);
 	if (ret < 0) {
-		dev_err(dev, "failed to get enable clock\n");
+		dev_err(dev, "failed to get OPP table\n");
 		return ret;
 	}
 
-	/* Get the freq and voltage from OPP table to scale the bus freq */
-	ret = dev_pm_opp_of_add_table(dev);
+	ret = clk_prepare_enable(bus->clk);
 	if (ret < 0) {
-		dev_err(dev, "failed to get OPP table\n");
+		dev_err(dev, "failed to enable clock\n");
 		goto err_clk;
 	}
-
 	rate = clk_get_rate(bus->clk);
 
 	opp = devfreq_recommended_opp(dev, &rate, 0);
 	if (IS_ERR(opp)) {
 		dev_err(dev, "failed to find dev_pm_opp\n");
 		ret = PTR_ERR(opp);
-		goto err_opp;
+		goto err;
 	}
 	bus->curr_freq = dev_pm_opp_get_freq(opp);
 	dev_pm_opp_put(opp);
 
 	return 0;
 
-err_opp:
-	dev_pm_opp_of_remove_table(dev);
-err_clk:
+err:
 	clk_disable_unprepare(bus->clk);
+err_clk:
+	dev_pm_opp_of_remove_table(dev);
 
 	return ret;
 }
@@ -386,6 +384,7 @@ static int exynos_bus_probe(struct platform_device *pdev)
 	struct exynos_bus *bus;
 	int ret, max_state;
 	unsigned long min_freq, max_freq;
+	bool passive = false;
 
 	if (!np) {
 		dev_err(dev, "failed to find devicetree node\n");
@@ -399,27 +398,31 @@ static int exynos_bus_probe(struct platform_device *pdev)
 	bus->dev = &pdev->dev;
 	platform_set_drvdata(pdev, bus);
 
-	/* Parse the device-tree to get the resource information */
-	ret = exynos_bus_parse_of(np, bus);
-	if (ret < 0)
-		return ret;
-
 	profile = devm_kzalloc(dev, sizeof(*profile), GFP_KERNEL);
-	if (!profile) {
-		ret = -ENOMEM;
-		goto err;
-	}
+	if (!profile)
+		return -ENOMEM;
 
 	node = of_parse_phandle(dev->of_node, "devfreq", 0);
 	if (node) {
 		of_node_put(node);
-		goto passive;
+		passive = true;
 	} else {
 		ret = exynos_bus_parent_parse_of(np, bus);
+		if (ret < 0)
+			return ret;
 	}
 
-	if (ret < 0)
-		goto err;
+	/* Parse the device-tree to get the resource information */
+	ret = exynos_bus_parse_of(bus);
+	if (ret < 0) {
+		if (!passive)
+			regulator_disable(bus->regulator);
+
+		return ret;
+	}
+
+	if (passive)
+		goto passive;
 
 	/* Initialize the struct profile and governor data for parent device */
 	profile->polling_ms = 50;
@@ -508,8 +511,11 @@ static int exynos_bus_probe(struct platform_device *pdev)
 	return 0;
 
 err:
-	dev_pm_opp_of_remove_table(dev);
 	clk_disable_unprepare(bus->clk);
+	if (!passive)
+		regulator_disable(bus->regulator);
+
+	dev_pm_opp_of_remove_table(dev);
 
 	return ret;
 }
-- 
2.22.0


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

* [PATCH v3 2/5] opp: core: add regulators enable and disable
       [not found]   ` <CGME20190719150554eucas1p2f4c9e4d2767ab740d419c42d4aeed6d5@eucas1p2.samsung.com>
@ 2019-07-19 15:05     ` k.konieczny
  2019-07-23  1:48       ` Viresh Kumar
  0 siblings, 1 reply; 13+ messages in thread
From: k.konieczny @ 2019-07-19 15:05 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Chanwoo Choi,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	linux-pm, linux-samsung-soc

Add enable regulators to dev_pm_opp_set_regulators() and disable
regulators to dev_pm_opp_put_regulators(). Even if bootloader
leaves regulators enabled, they should be enabled in kernel in
order to increase the reference count.

Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
---
Changes in v3:
- corrected error path in enable
- improved commit message
Changes in v2:
- move regulator enable and disable into loop
---
 drivers/opp/core.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 0e7703fe733f..a8a480cdabab 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1570,6 +1570,12 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
 			goto free_regulators;
 		}
 
+		ret = regulator_enable(reg);
+		if (ret < 0) {
+			regulator_put(reg);
+			goto free_regulators;
+		}
+
 		opp_table->regulators[i] = reg;
 	}
 
@@ -1583,8 +1589,10 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
 	return opp_table;
 
 free_regulators:
-	while (i != 0)
-		regulator_put(opp_table->regulators[--i]);
+	while (i--) {
+		regulator_disable(opp_table->regulators[i]);
+		regulator_put(opp_table->regulators[i]);
+	}
 
 	kfree(opp_table->regulators);
 	opp_table->regulators = NULL;
@@ -1610,8 +1618,10 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)
 	/* Make sure there are no concurrent readers while updating opp_table */
 	WARN_ON(!list_empty(&opp_table->opp_list));
 
-	for (i = opp_table->regulator_count - 1; i >= 0; i--)
+	for (i = opp_table->regulator_count - 1; i >= 0; i--) {
+		regulator_disable(opp_table->regulators[i]);
 		regulator_put(opp_table->regulators[i]);
+	}
 
 	_free_set_opp_data(opp_table);
 
-- 
2.22.0


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

* [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate()
       [not found]   ` <CGME20190719150555eucas1p197adc3c58e45c53137fd70cadbfae60e@eucas1p1.samsung.com>
@ 2019-07-19 15:05     ` k.konieczny
  2019-07-25 10:17       ` Chanwoo Choi
  0 siblings, 1 reply; 13+ messages in thread
From: k.konieczny @ 2019-07-19 15:05 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Chanwoo Choi,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	linux-pm, linux-samsung-soc

Reuse opp core code for setting bus clock and voltage. As a side
effect this allow useage of coupled regulators feature (required
for boards using Exynos5422/5800 SoCs) because dev_pm_opp_set_rate()
uses regulator_set_voltage_triplet() for setting regulator voltage
while the old code used regulator_set_voltage_tol() with fixed
tolerance. This patch also removes no longer needed parsing of DT
property "exynos,voltage-tolerance" (no Exynos devfreq DT node uses
it).

Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
---
 drivers/devfreq/exynos-bus.c | 143 +++++++++--------------------------
 1 file changed, 37 insertions(+), 106 deletions(-)

diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index f391044aa39d..c2147b0912a0 100644
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 
 #define DEFAULT_SATURATION_RATIO	40
-#define DEFAULT_VOLTAGE_TOLERANCE	2
 
 struct exynos_bus {
 	struct device *dev;
@@ -37,9 +36,9 @@ struct exynos_bus {
 
 	unsigned long curr_freq;
 
-	struct regulator *regulator;
+	struct opp_table *opp_table;
+
 	struct clk *clk;
-	unsigned int voltage_tolerance;
 	unsigned int ratio;
 };
 
@@ -99,56 +98,23 @@ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags)
 {
 	struct exynos_bus *bus = dev_get_drvdata(dev);
 	struct dev_pm_opp *new_opp;
-	unsigned long old_freq, new_freq, new_volt, tol;
 	int ret = 0;
 
-	/* Get new opp-bus instance according to new bus clock */
+	/* Get correct frequency for bus. */
 	new_opp = devfreq_recommended_opp(dev, freq, flags);
 	if (IS_ERR(new_opp)) {
 		dev_err(dev, "failed to get recommended opp instance\n");
 		return PTR_ERR(new_opp);
 	}
 
-	new_freq = dev_pm_opp_get_freq(new_opp);
-	new_volt = dev_pm_opp_get_voltage(new_opp);
 	dev_pm_opp_put(new_opp);
 
-	old_freq = bus->curr_freq;
-
-	if (old_freq == new_freq)
-		return 0;
-	tol = new_volt * bus->voltage_tolerance / 100;
-
 	/* Change voltage and frequency according to new OPP level */
 	mutex_lock(&bus->lock);
+	ret = dev_pm_opp_set_rate(dev, *freq);
+	if (!ret)
+		bus->curr_freq = *freq;
 
-	if (old_freq < new_freq) {
-		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
-		if (ret < 0) {
-			dev_err(bus->dev, "failed to set voltage\n");
-			goto out;
-		}
-	}
-
-	ret = clk_set_rate(bus->clk, new_freq);
-	if (ret < 0) {
-		dev_err(dev, "failed to change clock of bus\n");
-		clk_set_rate(bus->clk, old_freq);
-		goto out;
-	}
-
-	if (old_freq > new_freq) {
-		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
-		if (ret < 0) {
-			dev_err(bus->dev, "failed to set voltage\n");
-			goto out;
-		}
-	}
-	bus->curr_freq = new_freq;
-
-	dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
-			old_freq, new_freq, clk_get_rate(bus->clk));
-out:
 	mutex_unlock(&bus->lock);
 
 	return ret;
@@ -195,8 +161,8 @@ static void exynos_bus_exit(struct device *dev)
 		dev_warn(dev, "failed to disable the devfreq-event devices\n");
 
 	clk_disable_unprepare(bus->clk);
-	if (bus->regulator)
-		regulator_disable(bus->regulator);
+	if (bus->opp_table)
+		dev_pm_opp_put_regulators(bus->opp_table);
 
 	dev_pm_opp_of_remove_table(dev);
 }
@@ -209,39 +175,23 @@ static int exynos_bus_passive_target(struct device *dev, unsigned long *freq,
 {
 	struct exynos_bus *bus = dev_get_drvdata(dev);
 	struct dev_pm_opp *new_opp;
-	unsigned long old_freq, new_freq;
-	int ret = 0;
+	int ret;
 
-	/* Get new opp-bus instance according to new bus clock */
+	/* Get correct frequency for bus. */
 	new_opp = devfreq_recommended_opp(dev, freq, flags);
 	if (IS_ERR(new_opp)) {
 		dev_err(dev, "failed to get recommended opp instance\n");
 		return PTR_ERR(new_opp);
 	}
 
-	new_freq = dev_pm_opp_get_freq(new_opp);
 	dev_pm_opp_put(new_opp);
 
-	old_freq = bus->curr_freq;
-
-	if (old_freq == new_freq)
-		return 0;
-
 	/* Change the frequency according to new OPP level */
 	mutex_lock(&bus->lock);
+	ret = dev_pm_opp_set_rate(dev, *freq);
+	if (!ret)
+		bus->curr_freq = *freq;
 
-	ret = clk_set_rate(bus->clk, new_freq);
-	if (ret < 0) {
-		dev_err(dev, "failed to set the clock of bus\n");
-		goto out;
-	}
-
-	*freq = new_freq;
-	bus->curr_freq = new_freq;
-
-	dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
-			old_freq, new_freq, clk_get_rate(bus->clk));
-out:
 	mutex_unlock(&bus->lock);
 
 	return ret;
@@ -259,20 +209,9 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
 					struct exynos_bus *bus)
 {
 	struct device *dev = bus->dev;
-	int i, ret, count, size;
-
-	/* Get the regulator to provide each bus with the power */
-	bus->regulator = devm_regulator_get(dev, "vdd");
-	if (IS_ERR(bus->regulator)) {
-		dev_err(dev, "failed to get VDD regulator\n");
-		return PTR_ERR(bus->regulator);
-	}
-
-	ret = regulator_enable(bus->regulator);
-	if (ret < 0) {
-		dev_err(dev, "failed to enable VDD regulator\n");
-		return ret;
-	}
+	struct opp_table *opp_table;
+	const char *vdd = "vdd";
+	int i, count, size;
 
 	/*
 	 * Get the devfreq-event devices to get the current utilization of
@@ -281,26 +220,29 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
 	count = devfreq_event_get_edev_count(dev);
 	if (count < 0) {
 		dev_err(dev, "failed to get the count of devfreq-event dev\n");
-		ret = count;
-		goto err_regulator;
+		return count;
 	}
-	bus->edev_count = count;
 
+	bus->edev_count = count;
 	size = sizeof(*bus->edev) * count;
 	bus->edev = devm_kzalloc(dev, size, GFP_KERNEL);
-	if (!bus->edev) {
-		ret = -ENOMEM;
-		goto err_regulator;
-	}
+	if (!bus->edev)
+		return -ENOMEM;
 
 	for (i = 0; i < count; i++) {
 		bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);
-		if (IS_ERR(bus->edev[i])) {
-			ret = -EPROBE_DEFER;
-			goto err_regulator;
-		}
+		if (IS_ERR(bus->edev[i]))
+			return -EPROBE_DEFER;
+	}
+
+	opp_table = dev_pm_opp_set_regulators(dev, &vdd, 1);
+	if (IS_ERR(opp_table)) {
+		i = PTR_ERR(opp_table);
+		dev_err(dev, "failed to set regulators %d\n", i);
+		return i;
 	}
 
+	bus->opp_table = opp_table;
 	/*
 	 * Optionally, Get the saturation ratio according to Exynos SoC
 	 * When measuring the utilization of each AXI bus with devfreq-event
@@ -314,16 +256,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
 	if (of_property_read_u32(np, "exynos,saturation-ratio", &bus->ratio))
 		bus->ratio = DEFAULT_SATURATION_RATIO;
 
-	if (of_property_read_u32(np, "exynos,voltage-tolerance",
-					&bus->voltage_tolerance))
-		bus->voltage_tolerance = DEFAULT_VOLTAGE_TOLERANCE;
-
 	return 0;
-
-err_regulator:
-	regulator_disable(bus->regulator);
-
-	return ret;
 }
 
 static int exynos_bus_parse_of(struct exynos_bus *bus)
@@ -414,12 +347,8 @@ static int exynos_bus_probe(struct platform_device *pdev)
 
 	/* Parse the device-tree to get the resource information */
 	ret = exynos_bus_parse_of(bus);
-	if (ret < 0) {
-		if (!passive)
-			regulator_disable(bus->regulator);
-
-		return ret;
-	}
+	if (ret < 0)
+		goto err_reg;
 
 	if (passive)
 		goto passive;
@@ -512,10 +441,12 @@ static int exynos_bus_probe(struct platform_device *pdev)
 
 err:
 	clk_disable_unprepare(bus->clk);
-	if (!passive)
-		regulator_disable(bus->regulator);
-
 	dev_pm_opp_of_remove_table(dev);
+err_reg:
+	if (bus->opp_table) {
+		dev_pm_opp_put_regulators(bus->opp_table);
+		bus->opp_table = NULL;
+	}
 
 	return ret;
 }
-- 
2.22.0


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

* [PATCH v3 4/5] ARM: dts: exynos: add initial data for coupled regulators for Exynos5422/5800
       [not found]   ` <CGME20190719150556eucas1p291b9e533a80d77e2f58452f0e1fe8b35@eucas1p2.samsung.com>
@ 2019-07-19 15:05     ` k.konieczny
  0 siblings, 0 replies; 13+ messages in thread
From: k.konieczny @ 2019-07-19 15:05 UTC (permalink / raw)
  To: k.konieczny
  Cc: Marek Szyprowski, Bartlomiej Zolnierkiewicz, Chanwoo Choi,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	linux-pm, linux-samsung-soc

From: Marek Szyprowski <m.szyprowski@samsung.com>

Declare Exynos5422/5800 voltage ranges for opp points for big cpu core and
bus wcore and couple their voltage supllies as vdd_arm and vdd_int should
be in 300mV range.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
[k.konieczny: add missing patch description]
Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 arch/arm/boot/dts/exynos5420.dtsi             | 34 +++++++++----------
 arch/arm/boot/dts/exynos5422-odroid-core.dtsi |  4 +++
 arch/arm/boot/dts/exynos5800-peach-pi.dts     |  4 +++
 arch/arm/boot/dts/exynos5800.dtsi             | 32 ++++++++---------
 4 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 5fb2326875dc..0cbf74750553 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -48,62 +48,62 @@
 			opp-shared;
 			opp-1800000000 {
 				opp-hz = /bits/ 64 <1800000000>;
-				opp-microvolt = <1250000>;
+				opp-microvolt = <1250000 1250000 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1700000000 {
 				opp-hz = /bits/ 64 <1700000000>;
-				opp-microvolt = <1212500>;
+				opp-microvolt = <1212500 1212500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1600000000 {
 				opp-hz = /bits/ 64 <1600000000>;
-				opp-microvolt = <1175000>;
+				opp-microvolt = <1175000 1175000 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1500000000 {
 				opp-hz = /bits/ 64 <1500000000>;
-				opp-microvolt = <1137500>;
+				opp-microvolt = <1137500 1137500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1400000000 {
 				opp-hz = /bits/ 64 <1400000000>;
-				opp-microvolt = <1112500>;
+				opp-microvolt = <1112500 1112500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1300000000 {
 				opp-hz = /bits/ 64 <1300000000>;
-				opp-microvolt = <1062500>;
+				opp-microvolt = <1062500 1062500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1200000000 {
 				opp-hz = /bits/ 64 <1200000000>;
-				opp-microvolt = <1037500>;
+				opp-microvolt = <1037500 1037500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1100000000 {
 				opp-hz = /bits/ 64 <1100000000>;
-				opp-microvolt = <1012500>;
+				opp-microvolt = <1012500 1012500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-1000000000 {
 				opp-hz = /bits/ 64 <1000000000>;
-				opp-microvolt = < 987500>;
+				opp-microvolt = < 987500 987500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-900000000 {
 				opp-hz = /bits/ 64 <900000000>;
-				opp-microvolt = < 962500>;
+				opp-microvolt = < 962500 962500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-800000000 {
 				opp-hz = /bits/ 64 <800000000>;
-				opp-microvolt = < 937500>;
+				opp-microvolt = < 937500 937500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 			opp-700000000 {
 				opp-hz = /bits/ 64 <700000000>;
-				opp-microvolt = < 912500>;
+				opp-microvolt = < 912500 912500 1500000>;
 				clock-latency-ns = <140000>;
 			};
 		};
@@ -1100,23 +1100,23 @@
 
 			opp00 {
 				opp-hz = /bits/ 64 <84000000>;
-				opp-microvolt = <925000>;
+				opp-microvolt = <925000 925000 1400000>;
 			};
 			opp01 {
 				opp-hz = /bits/ 64 <111000000>;
-				opp-microvolt = <950000>;
+				opp-microvolt = <950000 950000 1400000>;
 			};
 			opp02 {
 				opp-hz = /bits/ 64 <222000000>;
-				opp-microvolt = <950000>;
+				opp-microvolt = <950000 950000 1400000>;
 			};
 			opp03 {
 				opp-hz = /bits/ 64 <333000000>;
-				opp-microvolt = <950000>;
+				opp-microvolt = <950000 950000 1400000>;
 			};
 			opp04 {
 				opp-hz = /bits/ 64 <400000000>;
-				opp-microvolt = <987500>;
+				opp-microvolt = <987500 987500 1400000>;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
index 25d95de15c9b..65d094256b54 100644
--- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
@@ -428,6 +428,8 @@
 				regulator-max-microvolt = <1500000>;
 				regulator-always-on;
 				regulator-boot-on;
+				regulator-coupled-with = <&buck3_reg>;
+				regulator-coupled-max-spread = <300000>;
 			};
 
 			buck3_reg: BUCK3 {
@@ -436,6 +438,8 @@
 				regulator-max-microvolt = <1400000>;
 				regulator-always-on;
 				regulator-boot-on;
+				regulator-coupled-with = <&buck2_reg>;
+				regulator-coupled-max-spread = <300000>;
 			};
 
 			buck4_reg: BUCK4 {
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index e0f470fe54c8..5c1e965ed7e9 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -257,6 +257,8 @@
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-ramp-delay = <12500>;
+				regulator-coupled-with = <&buck3_reg>;
+				regulator-coupled-max-spread = <300000>;
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -269,6 +271,8 @@
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-ramp-delay = <12500>;
+				regulator-coupled-with = <&buck2_reg>;
+				regulator-coupled-max-spread = <300000>;
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
diff --git a/arch/arm/boot/dts/exynos5800.dtsi b/arch/arm/boot/dts/exynos5800.dtsi
index 57d3b319fd65..2a74735d161c 100644
--- a/arch/arm/boot/dts/exynos5800.dtsi
+++ b/arch/arm/boot/dts/exynos5800.dtsi
@@ -22,61 +22,61 @@
 
 &cluster_a15_opp_table {
 	opp-1700000000 {
-		opp-microvolt = <1250000>;
+		opp-microvolt = <1250000 1250000 1500000>;
 	};
 	opp-1600000000 {
-		opp-microvolt = <1250000>;
+		opp-microvolt = <1250000 1250000 1500000>;
 	};
 	opp-1500000000 {
-		opp-microvolt = <1100000>;
+		opp-microvolt = <1100000 1100000 1500000>;
 	};
 	opp-1400000000 {
-		opp-microvolt = <1100000>;
+		opp-microvolt = <1100000 1100000 1500000>;
 	};
 	opp-1300000000 {
-		opp-microvolt = <1100000>;
+		opp-microvolt = <1100000 1100000 1500000>;
 	};
 	opp-1200000000 {
-		opp-microvolt = <1000000>;
+		opp-microvolt = <1000000 1000000 1500000>;
 	};
 	opp-1100000000 {
-		opp-microvolt = <1000000>;
+		opp-microvolt = <1000000 1000000 1500000>;
 	};
 	opp-1000000000 {
-		opp-microvolt = <1000000>;
+		opp-microvolt = <1000000 1000000 1500000>;
 	};
 	opp-900000000 {
-		opp-microvolt = <1000000>;
+		opp-microvolt = <1000000 1000000 1500000>;
 	};
 	opp-800000000 {
-		opp-microvolt = <900000>;
+		opp-microvolt = <900000 900000 1500000>;
 	};
 	opp-700000000 {
-		opp-microvolt = <900000>;
+		opp-microvolt = <900000 900000 1500000>;
 	};
 	opp-600000000 {
 		opp-hz = /bits/ 64 <600000000>;
-		opp-microvolt = <900000>;
+		opp-microvolt = <900000 900000 1500000>;
 		clock-latency-ns = <140000>;
 	};
 	opp-500000000 {
 		opp-hz = /bits/ 64 <500000000>;
-		opp-microvolt = <900000>;
+		opp-microvolt = <900000 900000 1500000>;
 		clock-latency-ns = <140000>;
 	};
 	opp-400000000 {
 		opp-hz = /bits/ 64 <400000000>;
-		opp-microvolt = <900000>;
+		opp-microvolt = <900000 900000 1500000>;
 		clock-latency-ns = <140000>;
 	};
 	opp-300000000 {
 		opp-hz = /bits/ 64 <300000000>;
-		opp-microvolt = <900000>;
+		opp-microvolt = <900000 900000 1500000>;
 		clock-latency-ns = <140000>;
 	};
 	opp-200000000 {
 		opp-hz = /bits/ 64 <200000000>;
-		opp-microvolt = <900000>;
+		opp-microvolt = <900000 900000 1500000>;
 		clock-latency-ns = <140000>;
 	};
 };
-- 
2.22.0


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

* [PATCH v3 5/5] dt-bindings: devfreq: exynos-bus: remove unused property
       [not found]   ` <CGME20190719150556eucas1p2bc6f133c48ec1be9b36119a414887969@eucas1p2.samsung.com>
@ 2019-07-19 15:05     ` k.konieczny
  0 siblings, 0 replies; 13+ messages in thread
From: k.konieczny @ 2019-07-19 15:05 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Chanwoo Choi,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	linux-pm, linux-samsung-soc

Remove unused DT property "exynos,voltage-tolerance".

Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 Documentation/devicetree/bindings/devfreq/exynos-bus.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
index f8e946471a58..e71f752cc18f 100644
--- a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
+++ b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
@@ -50,8 +50,6 @@ Required properties only for passive bus device:
 Optional properties only for parent bus device:
 - exynos,saturation-ratio: the percentage value which is used to calibrate
 			the performance count against total cycle count.
-- exynos,voltage-tolerance: the percentage value for bus voltage tolerance
-			which is used to calculate the max voltage.
 
 Detailed correlation between sub-blocks and power line according to Exynos SoC:
 - In case of Exynos3250, there are two power line as following:
-- 
2.22.0


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

* Re: [PATCH v3 2/5] opp: core: add regulators enable and disable
  2019-07-19 15:05     ` [PATCH v3 2/5] opp: core: add regulators enable and disable k.konieczny
@ 2019-07-23  1:48       ` Viresh Kumar
  0 siblings, 0 replies; 13+ messages in thread
From: Viresh Kumar @ 2019-07-23  1:48 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Chanwoo Choi,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	linux-pm, linux-samsung-soc

On 19-07-19, 17:05, k.konieczny@partner.samsung.com wrote:
> Add enable regulators to dev_pm_opp_set_regulators() and disable
> regulators to dev_pm_opp_put_regulators(). Even if bootloader
> leaves regulators enabled, they should be enabled in kernel in
> order to increase the reference count.
> 
> Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
> ---
> Changes in v3:
> - corrected error path in enable
> - improved commit message
> Changes in v2:
> - move regulator enable and disable into loop
> ---
>  drivers/opp/core.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/opp/core.c b/drivers/opp/core.c
> index 0e7703fe733f..a8a480cdabab 100644
> --- a/drivers/opp/core.c
> +++ b/drivers/opp/core.c
> @@ -1570,6 +1570,12 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
>  			goto free_regulators;
>  		}
>  
> +		ret = regulator_enable(reg);
> +		if (ret < 0) {
> +			regulator_put(reg);
> +			goto free_regulators;
> +		}
> +
>  		opp_table->regulators[i] = reg;
>  	}
>  
> @@ -1583,8 +1589,10 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
>  	return opp_table;
>  
>  free_regulators:
> -	while (i != 0)
> -		regulator_put(opp_table->regulators[--i]);
> +	while (i--) {
> +		regulator_disable(opp_table->regulators[i]);
> +		regulator_put(opp_table->regulators[i]);
> +	}
>  
>  	kfree(opp_table->regulators);
>  	opp_table->regulators = NULL;
> @@ -1610,8 +1618,10 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)
>  	/* Make sure there are no concurrent readers while updating opp_table */
>  	WARN_ON(!list_empty(&opp_table->opp_list));
>  
> -	for (i = opp_table->regulator_count - 1; i >= 0; i--)
> +	for (i = opp_table->regulator_count - 1; i >= 0; i--) {
> +		regulator_disable(opp_table->regulators[i]);
>  		regulator_put(opp_table->regulators[i]);
> +	}
>  
>  	_free_set_opp_data(opp_table);

Applied. Thanks.

-- 
viresh

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

* Re: [PATCH v3 1/5] devfreq: exynos-bus: correct clock enable sequence
  2019-07-19 15:05     ` [PATCH v3 1/5] devfreq: exynos-bus: correct clock enable sequence k.konieczny
@ 2019-07-25  9:58       ` Chanwoo Choi
  0 siblings, 0 replies; 13+ messages in thread
From: Chanwoo Choi @ 2019-07-25  9:58 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Krzysztof Kozlowski,
	Kukjin Kim, Kyungmin Park, Mark Rutland, MyungJoo Ham,
	Nishanth Menon, Rob Herring, Stephen Boyd, Viresh Kumar,
	devicetree, linux-arm-kernel, linux-kernel, linux-pm,
	linux-samsung-soc

Hi Kamil,

On 19. 7. 20. 오전 12:05, k.konieczny@partner.samsung.com wrote:
> Regulators should be enabled before clocks to avoid h/w hang. This
> require change in exynos_bus_probe() to move exynos_bus_parse_of()
> after exynos_bus_parent_parse_of() and change in enabling sequence
> of regulator and clock in exynos_bus_parse_of(). Similar change is
> needed in exynos_bus_exit() where clock should be disabled first.
> 
> Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
> ---
> This patch is new to this series.
> 
> ---
>  drivers/devfreq/exynos-bus.c | 58 ++++++++++++++++++++----------------
>  1 file changed, 32 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
> index 486cc5b422f1..f391044aa39d 100644
> --- a/drivers/devfreq/exynos-bus.c
> +++ b/drivers/devfreq/exynos-bus.c
> @@ -194,11 +194,11 @@ static void exynos_bus_exit(struct device *dev)
>  	if (ret < 0)
>  		dev_warn(dev, "failed to disable the devfreq-event devices\n");
>  
> +	clk_disable_unprepare(bus->clk);
>  	if (bus->regulator)
>  		regulator_disable(bus->regulator);
>  
>  	dev_pm_opp_of_remove_table(dev);
> -	clk_disable_unprepare(bus->clk);
>  }
>  
>  /*
> @@ -326,8 +326,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>  	return ret;
>  }
>  
> -static int exynos_bus_parse_of(struct device_node *np,
> -			      struct exynos_bus *bus)
> +static int exynos_bus_parse_of(struct exynos_bus *bus)
>  {
>  	struct device *dev = bus->dev;
>  	struct dev_pm_opp *opp;
> @@ -341,36 +340,35 @@ static int exynos_bus_parse_of(struct device_node *np,
>  		return PTR_ERR(bus->clk);
>  	}
>  
> -	ret = clk_prepare_enable(bus->clk);
> +	/* Get the freq and voltage from OPP table to scale the bus freq */
> +	ret = dev_pm_opp_of_add_table(dev);
>  	if (ret < 0) {
> -		dev_err(dev, "failed to get enable clock\n");
> +		dev_err(dev, "failed to get OPP table\n");
>  		return ret;
>  	}
>  
> -	/* Get the freq and voltage from OPP table to scale the bus freq */
> -	ret = dev_pm_opp_of_add_table(dev);
> +	ret = clk_prepare_enable(bus->clk);
>  	if (ret < 0) {
> -		dev_err(dev, "failed to get OPP table\n");
> +		dev_err(dev, "failed to enable clock\n");
>  		goto err_clk;
>  	}
> -
>  	rate = clk_get_rate(bus->clk);
>  
>  	opp = devfreq_recommended_opp(dev, &rate, 0);
>  	if (IS_ERR(opp)) {
>  		dev_err(dev, "failed to find dev_pm_opp\n");
>  		ret = PTR_ERR(opp);
> -		goto err_opp;
> +		goto err;
>  	}
>  	bus->curr_freq = dev_pm_opp_get_freq(opp);
>  	dev_pm_opp_put(opp);
>  
>  	return 0;
>  
> -err_opp:
> -	dev_pm_opp_of_remove_table(dev);
> -err_clk:
> +err:
>  	clk_disable_unprepare(bus->clk);
> +err_clk:
> +	dev_pm_opp_of_remove_table(dev);
>  
>  	return ret;
>  }
> @@ -386,6 +384,7 @@ static int exynos_bus_probe(struct platform_device *pdev)
>  	struct exynos_bus *bus;
>  	int ret, max_state;
>  	unsigned long min_freq, max_freq;
> +	bool passive = false;
>  
>  	if (!np) {
>  		dev_err(dev, "failed to find devicetree node\n");
> @@ -399,27 +398,31 @@ static int exynos_bus_probe(struct platform_device *pdev)
>  	bus->dev = &pdev->dev;
>  	platform_set_drvdata(pdev, bus);
>  
> -	/* Parse the device-tree to get the resource information */
> -	ret = exynos_bus_parse_of(np, bus);
> -	if (ret < 0)
> -		return ret;
> -
>  	profile = devm_kzalloc(dev, sizeof(*profile), GFP_KERNEL);
> -	if (!profile) {
> -		ret = -ENOMEM;
> -		goto err;
> -	}
> +	if (!profile)
> +		return -ENOMEM;
>  
>  	node = of_parse_phandle(dev->of_node, "devfreq", 0);
>  	if (node) {
>  		of_node_put(node);
> -		goto passive;
> +		passive = true;
>  	} else {
>  		ret = exynos_bus_parent_parse_of(np, bus);
> +		if (ret < 0)
> +			return ret;
>  	}
>  
> -	if (ret < 0)
> -		goto err;
> +	/* Parse the device-tree to get the resource information */
> +	ret = exynos_bus_parse_of(bus);
> +	if (ret < 0) {
> +		if (!passive)
> +			regulator_disable(bus->regulator);
> +
> +		return ret;
> +	}
> +
> +	if (passive)
> +		goto passive;
>  
>  	/* Initialize the struct profile and governor data for parent device */
>  	profile->polling_ms = 50;
> @@ -508,8 +511,11 @@ static int exynos_bus_probe(struct platform_device *pdev)
>  	return 0;
>  
>  err:
> -	dev_pm_opp_of_remove_table(dev);
>  	clk_disable_unprepare(bus->clk);
> +	if (!passive)
> +		regulator_disable(bus->regulator);
> +
> +	dev_pm_opp_of_remove_table(dev);
>  
>  	return ret;
>  }
> 

Acked-by: Chanwoo Choi <cw00.choi@samsung.com>

-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

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

* Re: [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate()
  2019-07-19 15:05     ` [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate() k.konieczny
@ 2019-07-25 10:17       ` Chanwoo Choi
  2019-07-25 13:35         ` Kamil Konieczny
  0 siblings, 1 reply; 13+ messages in thread
From: Chanwoo Choi @ 2019-07-25 10:17 UTC (permalink / raw)
  To: k.konieczny
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Krzysztof Kozlowski,
	Kukjin Kim, Kyungmin Park, Mark Rutland, MyungJoo Ham,
	Nishanth Menon, Rob Herring, Stephen Boyd, Viresh Kumar,
	devicetree, linux-arm-kernel, linux-kernel, linux-pm,
	linux-samsung-soc

Hi Kamil,

Looks good to me. But, I have some comment. Please check them.

After this patch, exynos_bus_target is perfectly same with
exynos_bus_passive_target. The exynos_bus_passive_target() could be removed.

On 19. 7. 20. 오전 12:05, k.konieczny@partner.samsung.com wrote:
> Reuse opp core code for setting bus clock and voltage. As a side
> effect this allow useage of coupled regulators feature (required

s/useage/usage ?

> for boards using Exynos5422/5800 SoCs) because dev_pm_opp_set_rate()
> uses regulator_set_voltage_triplet() for setting regulator voltage
> while the old code used regulator_set_voltage_tol() with fixed
> tolerance. This patch also removes no longer needed parsing of DT
> property "exynos,voltage-tolerance" (no Exynos devfreq DT node uses
> it).
> 
> Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
> ---
>  drivers/devfreq/exynos-bus.c | 143 +++++++++--------------------------
>  1 file changed, 37 insertions(+), 106 deletions(-)
> 
> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
> index f391044aa39d..c2147b0912a0 100644
> --- a/drivers/devfreq/exynos-bus.c
> +++ b/drivers/devfreq/exynos-bus.c
> @@ -25,7 +25,6 @@
>  #include <linux/slab.h>
>  
>  #define DEFAULT_SATURATION_RATIO	40
> -#define DEFAULT_VOLTAGE_TOLERANCE	2
>  
>  struct exynos_bus {
>  	struct device *dev;
> @@ -37,9 +36,9 @@ struct exynos_bus {
>  
>  	unsigned long curr_freq;
>  
> -	struct regulator *regulator;
> +	struct opp_table *opp_table;
> +
>  	struct clk *clk;
> -	unsigned int voltage_tolerance;
>  	unsigned int ratio;
>  };
>  
> @@ -99,56 +98,23 @@ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags)
>  {
>  	struct exynos_bus *bus = dev_get_drvdata(dev);
>  	struct dev_pm_opp *new_opp;
> -	unsigned long old_freq, new_freq, new_volt, tol;
>  	int ret = 0;
>  
> -	/* Get new opp-bus instance according to new bus clock */
> +	/* Get correct frequency for bus. */
>  	new_opp = devfreq_recommended_opp(dev, freq, flags);
>  	if (IS_ERR(new_opp)) {
>  		dev_err(dev, "failed to get recommended opp instance\n");
>  		return PTR_ERR(new_opp);
>  	}
>  
> -	new_freq = dev_pm_opp_get_freq(new_opp);
> -	new_volt = dev_pm_opp_get_voltage(new_opp);
>  	dev_pm_opp_put(new_opp);
>  
> -	old_freq = bus->curr_freq;
> -
> -	if (old_freq == new_freq)
> -		return 0;
> -	tol = new_volt * bus->voltage_tolerance / 100;
> -
>  	/* Change voltage and frequency according to new OPP level */
>  	mutex_lock(&bus->lock);
> +	ret = dev_pm_opp_set_rate(dev, *freq);
> +	if (!ret)
> +		bus->curr_freq = *freq;
>  
> -	if (old_freq < new_freq) {
> -		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
> -		if (ret < 0) {
> -			dev_err(bus->dev, "failed to set voltage\n");
> -			goto out;
> -		}
> -	}
> -
> -	ret = clk_set_rate(bus->clk, new_freq);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to change clock of bus\n");
> -		clk_set_rate(bus->clk, old_freq);
> -		goto out;
> -	}
> -
> -	if (old_freq > new_freq) {
> -		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
> -		if (ret < 0) {
> -			dev_err(bus->dev, "failed to set voltage\n");
> -			goto out;
> -		}
> -	}
> -	bus->curr_freq = new_freq;
> -
> -	dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
> -			old_freq, new_freq, clk_get_rate(bus->clk));
> -out:
>  	mutex_unlock(&bus->lock);
>  
>  	return ret;
> @@ -195,8 +161,8 @@ static void exynos_bus_exit(struct device *dev)
>  		dev_warn(dev, "failed to disable the devfreq-event devices\n");
>  
>  	clk_disable_unprepare(bus->clk);
> -	if (bus->regulator)
> -		regulator_disable(bus->regulator);
> +	if (bus->opp_table)
> +		dev_pm_opp_put_regulators(bus->opp_table);
>  
>  	dev_pm_opp_of_remove_table(dev);
>  }
> @@ -209,39 +175,23 @@ static int exynos_bus_passive_target(struct device *dev, unsigned long *freq,
>  {
>  	struct exynos_bus *bus = dev_get_drvdata(dev);
>  	struct dev_pm_opp *new_opp;
> -	unsigned long old_freq, new_freq;
> -	int ret = 0;
> +	int ret;
>  
> -	/* Get new opp-bus instance according to new bus clock */
> +	/* Get correct frequency for bus. */
>  	new_opp = devfreq_recommended_opp(dev, freq, flags);
>  	if (IS_ERR(new_opp)) {
>  		dev_err(dev, "failed to get recommended opp instance\n");
>  		return PTR_ERR(new_opp);
>  	}
>  
> -	new_freq = dev_pm_opp_get_freq(new_opp);
>  	dev_pm_opp_put(new_opp);
>  
> -	old_freq = bus->curr_freq;
> -
> -	if (old_freq == new_freq)
> -		return 0;
> -
>  	/* Change the frequency according to new OPP level */
>  	mutex_lock(&bus->lock);
> +	ret = dev_pm_opp_set_rate(dev, *freq);
> +	if (!ret)
> +		bus->curr_freq = *freq;
>  
> -	ret = clk_set_rate(bus->clk, new_freq);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to set the clock of bus\n");
> -		goto out;
> -	}
> -
> -	*freq = new_freq;
> -	bus->curr_freq = new_freq;
> -
> -	dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
> -			old_freq, new_freq, clk_get_rate(bus->clk));
> -out:
>  	mutex_unlock(&bus->lock);
>  
>  	return ret;
> @@ -259,20 +209,9 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>  					struct exynos_bus *bus)
>  {
>  	struct device *dev = bus->dev;
> -	int i, ret, count, size;
> -
> -	/* Get the regulator to provide each bus with the power */
> -	bus->regulator = devm_regulator_get(dev, "vdd");
> -	if (IS_ERR(bus->regulator)) {
> -		dev_err(dev, "failed to get VDD regulator\n");
> -		return PTR_ERR(bus->regulator);
> -	}
> -
> -	ret = regulator_enable(bus->regulator);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to enable VDD regulator\n");
> -		return ret;
> -	}
> +	struct opp_table *opp_table;
> +	const char *vdd = "vdd";
> +	int i, count, size;
>  
>  	/*
>  	 * Get the devfreq-event devices to get the current utilization of
> @@ -281,26 +220,29 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>  	count = devfreq_event_get_edev_count(dev);
>  	if (count < 0) {
>  		dev_err(dev, "failed to get the count of devfreq-event dev\n");
> -		ret = count;
> -		goto err_regulator;
> +		return count;
>  	}
> -	bus->edev_count = count;
>  
> +	bus->edev_count = count;
>  	size = sizeof(*bus->edev) * count;
>  	bus->edev = devm_kzalloc(dev, size, GFP_KERNEL);
> -	if (!bus->edev) {
> -		ret = -ENOMEM;
> -		goto err_regulator;
> -	}
> +	if (!bus->edev)
> +		return -ENOMEM;
>  
>  	for (i = 0; i < count; i++) {
>  		bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);
> -		if (IS_ERR(bus->edev[i])) {
> -			ret = -EPROBE_DEFER;
> -			goto err_regulator;
> -		}
> +		if (IS_ERR(bus->edev[i]))
> +			return -EPROBE_DEFER;
> +	}
> +
> +	opp_table = dev_pm_opp_set_regulators(dev, &vdd, 1);
> +	if (IS_ERR(opp_table)) {
> +		i = PTR_ERR(opp_table);
> +		dev_err(dev, "failed to set regulators %d\n", i);
> +		return i;

Maybe, you just used the 'i' defined variable instead of adding
new variable. But, I think that you better to add new variable
like 'err' for the readability. Or, jut use the 'PTR_ERR(opp_table)'
directly without any additional variable.

>  	}
>  
> +	bus->opp_table = opp_table;

Add blank line. 

>  	/*
>  	 * Optionally, Get the saturation ratio according to Exynos SoC
>  	 * When measuring the utilization of each AXI bus with devfreq-event
> @@ -314,16 +256,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>  	if (of_property_read_u32(np, "exynos,saturation-ratio", &bus->ratio))
>  		bus->ratio = DEFAULT_SATURATION_RATIO;
>  
> -	if (of_property_read_u32(np, "exynos,voltage-tolerance",
> -					&bus->voltage_tolerance))
> -		bus->voltage_tolerance = DEFAULT_VOLTAGE_TOLERANCE;
> -
>  	return 0;
> -
> -err_regulator:
> -	regulator_disable(bus->regulator);
> -
> -	return ret;
>  }
>  
>  static int exynos_bus_parse_of(struct exynos_bus *bus)
> @@ -414,12 +347,8 @@ static int exynos_bus_probe(struct platform_device *pdev)
>  
>  	/* Parse the device-tree to get the resource information */
>  	ret = exynos_bus_parse_of(bus);
> -	if (ret < 0) {
> -		if (!passive)
> -			regulator_disable(bus->regulator);
> -
> -		return ret;
> -	}
> +	if (ret < 0)
> +		goto err_reg;
>  
>  	if (passive)
>  		goto passive;
> @@ -512,10 +441,12 @@ static int exynos_bus_probe(struct platform_device *pdev)
>  
>  err:
>  	clk_disable_unprepare(bus->clk);
> -	if (!passive)
> -		regulator_disable(bus->regulator);
> -
>  	dev_pm_opp_of_remove_table(dev);

This function removes the 'opp_table'. But, the below code
uses the 'opp_table' variable by dev_pm_opp_put_regulators().

To disable the regulator, you have to call dev_pm_opp_of_remove_table(dev)
after dev_pm_opp_put_regulators(bus->opp_table).

> +err_reg:
> +	if (bus->opp_table) {
> +		dev_pm_opp_put_regulators(bus->opp_table);
> +		bus->opp_table = NULL;
> +	}
>  
>  	return ret;
>  }
> 


-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

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

* Re: [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate()
  2019-07-25 10:17       ` Chanwoo Choi
@ 2019-07-25 13:35         ` Kamil Konieczny
  2019-07-25 14:53           ` Chanwoo Choi
  0 siblings, 1 reply; 13+ messages in thread
From: Kamil Konieczny @ 2019-07-25 13:35 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Krzysztof Kozlowski,
	Kukjin Kim, Kyungmin Park, Mark Rutland, MyungJoo Ham,
	Nishanth Menon, Rob Herring, Stephen Boyd, Viresh Kumar,
	devicetree, linux-arm-kernel, linux-kernel, linux-pm,
	linux-samsung-soc

Hi Chanwoo,

On 25.07.2019 12:17, Chanwoo Choi wrote:
> Hi Kamil,
> 
> Looks good to me. But, I have some comment. Please check them.

Thank you for review, please see answers below.

> After this patch, exynos_bus_target is perfectly same with
> exynos_bus_passive_target. The exynos_bus_passive_target() could be removed.

Ok, I will make it in separate patch to simplify review process.

> On 19. 7. 20. 오전 12:05, k.konieczny@partner.samsung.com wrote:
>> Reuse opp core code for setting bus clock and voltage. As a side
>> effect this allow useage of coupled regulators feature (required
> 
> s/useage/usage ?

Good catch, I will change it.

>> for boards using Exynos5422/5800 SoCs) because dev_pm_opp_set_rate()
>> uses regulator_set_voltage_triplet() for setting regulator voltage
>> while the old code used regulator_set_voltage_tol() with fixed
>> tolerance. This patch also removes no longer needed parsing of DT
>> property "exynos,voltage-tolerance" (no Exynos devfreq DT node uses
>> it).
>>
>> Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
>> ---
>>  drivers/devfreq/exynos-bus.c | 143 +++++++++--------------------------
>>  1 file changed, 37 insertions(+), 106 deletions(-)
>>
>> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
>> index f391044aa39d..c2147b0912a0 100644
>> --- a/drivers/devfreq/exynos-bus.c
>> +++ b/drivers/devfreq/exynos-bus.c
>> @@ -25,7 +25,6 @@
>>  #include <linux/slab.h>
>>  
>>  #define DEFAULT_SATURATION_RATIO	40
>> -#define DEFAULT_VOLTAGE_TOLERANCE	2
>>  
>>  struct exynos_bus {
>>  	struct device *dev;
>> @@ -37,9 +36,9 @@ struct exynos_bus {
>>  
>>  	unsigned long curr_freq;
>>  
>> -	struct regulator *regulator;
>> +	struct opp_table *opp_table;
>> +
>>  	struct clk *clk;
>> -	unsigned int voltage_tolerance;
>>  	unsigned int ratio;
>>  };
>>  
>> @@ -99,56 +98,23 @@ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags)
>>  {
>>  	struct exynos_bus *bus = dev_get_drvdata(dev);
>>  	struct dev_pm_opp *new_opp;
>> -	unsigned long old_freq, new_freq, new_volt, tol;
>>  	int ret = 0;
>>  
>> -	/* Get new opp-bus instance according to new bus clock */
>> +	/* Get correct frequency for bus. */
>>  	new_opp = devfreq_recommended_opp(dev, freq, flags);
>>  	if (IS_ERR(new_opp)) {
>>  		dev_err(dev, "failed to get recommended opp instance\n");
>>  		return PTR_ERR(new_opp);
>>  	}
>>  
>> -	new_freq = dev_pm_opp_get_freq(new_opp);
>> -	new_volt = dev_pm_opp_get_voltage(new_opp);
>>  	dev_pm_opp_put(new_opp);
>>  
>> -	old_freq = bus->curr_freq;
>> -
>> -	if (old_freq == new_freq)
>> -		return 0;
>> -	tol = new_volt * bus->voltage_tolerance / 100;
>> -
>>  	/* Change voltage and frequency according to new OPP level */
>>  	mutex_lock(&bus->lock);
>> +	ret = dev_pm_opp_set_rate(dev, *freq);
>> +	if (!ret)
>> +		bus->curr_freq = *freq;
>>  
>> -	if (old_freq < new_freq) {
>> -		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
>> -		if (ret < 0) {
>> -			dev_err(bus->dev, "failed to set voltage\n");
>> -			goto out;
>> -		}
>> -	}
>> -
>> -	ret = clk_set_rate(bus->clk, new_freq);
>> -	if (ret < 0) {
>> -		dev_err(dev, "failed to change clock of bus\n");
>> -		clk_set_rate(bus->clk, old_freq);
>> -		goto out;
>> -	}
>> -
>> -	if (old_freq > new_freq) {
>> -		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
>> -		if (ret < 0) {
>> -			dev_err(bus->dev, "failed to set voltage\n");
>> -			goto out;
>> -		}
>> -	}
>> -	bus->curr_freq = new_freq;
>> -
>> -	dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
>> -			old_freq, new_freq, clk_get_rate(bus->clk));
>> -out:
>>  	mutex_unlock(&bus->lock);
>>  
>>  	return ret;
>> @@ -195,8 +161,8 @@ static void exynos_bus_exit(struct device *dev)
>>  		dev_warn(dev, "failed to disable the devfreq-event devices\n");
>>  
>>  	clk_disable_unprepare(bus->clk);
>> -	if (bus->regulator)
>> -		regulator_disable(bus->regulator);
>> +	if (bus->opp_table)
>> +		dev_pm_opp_put_regulators(bus->opp_table);
>>  
>>  	dev_pm_opp_of_remove_table(dev);
>>  }
>> @@ -209,39 +175,23 @@ static int exynos_bus_passive_target(struct device *dev, unsigned long *freq,
>>  {
>>  	struct exynos_bus *bus = dev_get_drvdata(dev);
>>  	struct dev_pm_opp *new_opp;
>> -	unsigned long old_freq, new_freq;
>> -	int ret = 0;
>> +	int ret;
>>  
>> -	/* Get new opp-bus instance according to new bus clock */
>> +	/* Get correct frequency for bus. */
>>  	new_opp = devfreq_recommended_opp(dev, freq, flags);
>>  	if (IS_ERR(new_opp)) {
>>  		dev_err(dev, "failed to get recommended opp instance\n");
>>  		return PTR_ERR(new_opp);
>>  	}
>>  
>> -	new_freq = dev_pm_opp_get_freq(new_opp);
>>  	dev_pm_opp_put(new_opp);
>>  
>> -	old_freq = bus->curr_freq;
>> -
>> -	if (old_freq == new_freq)
>> -		return 0;
>> -
>>  	/* Change the frequency according to new OPP level */
>>  	mutex_lock(&bus->lock);
>> +	ret = dev_pm_opp_set_rate(dev, *freq);
>> +	if (!ret)
>> +		bus->curr_freq = *freq;
>>  
>> -	ret = clk_set_rate(bus->clk, new_freq);
>> -	if (ret < 0) {
>> -		dev_err(dev, "failed to set the clock of bus\n");
>> -		goto out;
>> -	}
>> -
>> -	*freq = new_freq;
>> -	bus->curr_freq = new_freq;
>> -
>> -	dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
>> -			old_freq, new_freq, clk_get_rate(bus->clk));
>> -out:
>>  	mutex_unlock(&bus->lock);
>>  
>>  	return ret;
>> @@ -259,20 +209,9 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>  					struct exynos_bus *bus)
>>  {
>>  	struct device *dev = bus->dev;
>> -	int i, ret, count, size;
>> -
>> -	/* Get the regulator to provide each bus with the power */
>> -	bus->regulator = devm_regulator_get(dev, "vdd");
>> -	if (IS_ERR(bus->regulator)) {
>> -		dev_err(dev, "failed to get VDD regulator\n");
>> -		return PTR_ERR(bus->regulator);
>> -	}
>> -
>> -	ret = regulator_enable(bus->regulator);
>> -	if (ret < 0) {
>> -		dev_err(dev, "failed to enable VDD regulator\n");
>> -		return ret;
>> -	}
>> +	struct opp_table *opp_table;
>> +	const char *vdd = "vdd";
>> +	int i, count, size;
>>  
>>  	/*
>>  	 * Get the devfreq-event devices to get the current utilization of
>> @@ -281,26 +220,29 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>  	count = devfreq_event_get_edev_count(dev);
>>  	if (count < 0) {
>>  		dev_err(dev, "failed to get the count of devfreq-event dev\n");
>> -		ret = count;
>> -		goto err_regulator;
>> +		return count;
>>  	}
>> -	bus->edev_count = count;
>>  
>> +	bus->edev_count = count;
>>  	size = sizeof(*bus->edev) * count;
>>  	bus->edev = devm_kzalloc(dev, size, GFP_KERNEL);
>> -	if (!bus->edev) {
>> -		ret = -ENOMEM;
>> -		goto err_regulator;
>> -	}
>> +	if (!bus->edev)
>> +		return -ENOMEM;
>>  
>>  	for (i = 0; i < count; i++) {
>>  		bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);
>> -		if (IS_ERR(bus->edev[i])) {
>> -			ret = -EPROBE_DEFER;
>> -			goto err_regulator;
>> -		}
>> +		if (IS_ERR(bus->edev[i]))
>> +			return -EPROBE_DEFER;
>> +	}
>> +
>> +	opp_table = dev_pm_opp_set_regulators(dev, &vdd, 1);
>> +	if (IS_ERR(opp_table)) {
>> +		i = PTR_ERR(opp_table);
>> +		dev_err(dev, "failed to set regulators %d\n", i);
>> +		return i;
> 
> Maybe, you just used the 'i' defined variable instead of adding
> new variable. But, I think that you better to add new variable
> like 'err' for the readability. Or, jut use the 'PTR_ERR(opp_table)'
> directly without any additional variable.

I will remove not related changes, so here I will reuse 'ret' variable.

>>  	}
>>  
>> +	bus->opp_table = opp_table;
> 
> Add blank line. 

OK

>>  	/*
>>  	 * Optionally, Get the saturation ratio according to Exynos SoC
>>  	 * When measuring the utilization of each AXI bus with devfreq-event
>> @@ -314,16 +256,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>  	if (of_property_read_u32(np, "exynos,saturation-ratio", &bus->ratio))
>>  		bus->ratio = DEFAULT_SATURATION_RATIO;
>>  
>> -	if (of_property_read_u32(np, "exynos,voltage-tolerance",
>> -					&bus->voltage_tolerance))
>> -		bus->voltage_tolerance = DEFAULT_VOLTAGE_TOLERANCE;
>> -
>>  	return 0;
>> -
>> -err_regulator:
>> -	regulator_disable(bus->regulator);
>> -
>> -	return ret;
>>  }
>>  
>>  static int exynos_bus_parse_of(struct exynos_bus *bus)
>> @@ -414,12 +347,8 @@ static int exynos_bus_probe(struct platform_device *pdev)
>>  
>>  	/* Parse the device-tree to get the resource information */
>>  	ret = exynos_bus_parse_of(bus);
>> -	if (ret < 0) {
>> -		if (!passive)
>> -			regulator_disable(bus->regulator);
>> -
>> -		return ret;
>> -	}
>> +	if (ret < 0)
>> +		goto err_reg;
>>  
>>  	if (passive)
>>  		goto passive;
>> @@ -512,10 +441,12 @@ static int exynos_bus_probe(struct platform_device *pdev)
>>  
>>  err:
>>  	clk_disable_unprepare(bus->clk);
>> -	if (!passive)
>> -		regulator_disable(bus->regulator);
>> -
>>  	dev_pm_opp_of_remove_table(dev);
> 
> This function removes the 'opp_table'. But, the below code
> uses the 'opp_table' variable by dev_pm_opp_put_regulators().
> 
> To disable the regulator, you have to call dev_pm_opp_of_remove_table(dev)
> after dev_pm_opp_put_regulators(bus->opp_table).

Regulators should be set before dev_pm_opp_add_table(), so exit sequence
should be in reverse order,

init order:

exynos_bus_parent_parse_of()
	dev_pm_opp_set_regulators()
exynos_bus_parse_of()
	clk_prepare_enable()
	dev_pm_opp_of_add_table()

exit or error order:

dev_pm_opp_of_remove_table()
clk_disable_unprepare()
if (bus->opp_table)
	dev_pm_opp_put_regulators(bus->opp_table);

I will send v4 soon.

>> +err_reg:
>> +	if (bus->opp_table) {
>> +		dev_pm_opp_put_regulators(bus->opp_table);
>> +		bus->opp_table = NULL;
>> +	}
>>  
>>  	return ret;
>>  }

-- 
Best regards,
Kamil Konieczny
Samsung R&D Institute Poland


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

* Re: [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate()
  2019-07-25 13:35         ` Kamil Konieczny
@ 2019-07-25 14:53           ` Chanwoo Choi
  2019-07-25 15:15             ` Kamil Konieczny
  0 siblings, 1 reply; 13+ messages in thread
From: Chanwoo Choi @ 2019-07-25 14:53 UTC (permalink / raw)
  To: Kamil Konieczny
  Cc: Chanwoo Choi, Bartlomiej Zolnierkiewicz, Marek Szyprowski,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	Linux PM list, linux-samsung-soc

2019년 7월 25일 (목) 오후 11:19, Kamil Konieczny
<k.konieczny@partner.samsung.com>님이 작성:
>
> Hi Chanwoo,
>
> On 25.07.2019 12:17, Chanwoo Choi wrote:
> > Hi Kamil,
> >
> > Looks good to me. But, I have some comment. Please check them.
>
> Thank you for review, please see answers below.
>
> > After this patch, exynos_bus_target is perfectly same with
> > exynos_bus_passive_target. The exynos_bus_passive_target() could be removed.
>
> Ok, I will make it in separate patch to simplify review process.

I think you can just modify this patch without any separate patch.

> > On 19. 7. 20. 오전 12:05, k.konieczny@partner.samsung.com wrote:
> >> Reuse opp core code for setting bus clock and voltage. As a side
> >> effect this allow useage of coupled regulators feature (required
> >
> > s/useage/usage ?
>
> Good catch, I will change it.
>
> >> for boards using Exynos5422/5800 SoCs) because dev_pm_opp_set_rate()
> >> uses regulator_set_voltage_triplet() for setting regulator voltage
> >> while the old code used regulator_set_voltage_tol() with fixed
> >> tolerance. This patch also removes no longer needed parsing of DT
> >> property "exynos,voltage-tolerance" (no Exynos devfreq DT node uses
> >> it).
> >>
> >> Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
> >> ---
> >>  drivers/devfreq/exynos-bus.c | 143 +++++++++--------------------------
> >>  1 file changed, 37 insertions(+), 106 deletions(-)
> >>
> >> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
> >> index f391044aa39d..c2147b0912a0 100644
> >> --- a/drivers/devfreq/exynos-bus.c
> >> +++ b/drivers/devfreq/exynos-bus.c
> >> @@ -25,7 +25,6 @@
> >>  #include <linux/slab.h>
> >>
> >>  #define DEFAULT_SATURATION_RATIO    40
> >> -#define DEFAULT_VOLTAGE_TOLERANCE   2
> >>
> >>  struct exynos_bus {
> >>      struct device *dev;
> >> @@ -37,9 +36,9 @@ struct exynos_bus {
> >>
> >>      unsigned long curr_freq;
> >>
> >> -    struct regulator *regulator;
> >> +    struct opp_table *opp_table;
> >> +
> >>      struct clk *clk;
> >> -    unsigned int voltage_tolerance;
> >>      unsigned int ratio;
> >>  };
> >>
> >> @@ -99,56 +98,23 @@ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags)
> >>  {
> >>      struct exynos_bus *bus = dev_get_drvdata(dev);
> >>      struct dev_pm_opp *new_opp;
> >> -    unsigned long old_freq, new_freq, new_volt, tol;
> >>      int ret = 0;
> >>
> >> -    /* Get new opp-bus instance according to new bus clock */
> >> +    /* Get correct frequency for bus. */
> >>      new_opp = devfreq_recommended_opp(dev, freq, flags);
> >>      if (IS_ERR(new_opp)) {
> >>              dev_err(dev, "failed to get recommended opp instance\n");
> >>              return PTR_ERR(new_opp);
> >>      }
> >>
> >> -    new_freq = dev_pm_opp_get_freq(new_opp);
> >> -    new_volt = dev_pm_opp_get_voltage(new_opp);
> >>      dev_pm_opp_put(new_opp);
> >>
> >> -    old_freq = bus->curr_freq;
> >> -
> >> -    if (old_freq == new_freq)
> >> -            return 0;
> >> -    tol = new_volt * bus->voltage_tolerance / 100;
> >> -
> >>      /* Change voltage and frequency according to new OPP level */
> >>      mutex_lock(&bus->lock);
> >> +    ret = dev_pm_opp_set_rate(dev, *freq);
> >> +    if (!ret)
> >> +            bus->curr_freq = *freq;
> >>
> >> -    if (old_freq < new_freq) {
> >> -            ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
> >> -            if (ret < 0) {
> >> -                    dev_err(bus->dev, "failed to set voltage\n");
> >> -                    goto out;
> >> -            }
> >> -    }
> >> -
> >> -    ret = clk_set_rate(bus->clk, new_freq);
> >> -    if (ret < 0) {
> >> -            dev_err(dev, "failed to change clock of bus\n");
> >> -            clk_set_rate(bus->clk, old_freq);
> >> -            goto out;
> >> -    }
> >> -
> >> -    if (old_freq > new_freq) {
> >> -            ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
> >> -            if (ret < 0) {
> >> -                    dev_err(bus->dev, "failed to set voltage\n");
> >> -                    goto out;
> >> -            }
> >> -    }
> >> -    bus->curr_freq = new_freq;
> >> -
> >> -    dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
> >> -                    old_freq, new_freq, clk_get_rate(bus->clk));
> >> -out:
> >>      mutex_unlock(&bus->lock);
> >>
> >>      return ret;
> >> @@ -195,8 +161,8 @@ static void exynos_bus_exit(struct device *dev)
> >>              dev_warn(dev, "failed to disable the devfreq-event devices\n");
> >>
> >>      clk_disable_unprepare(bus->clk);
> >> -    if (bus->regulator)
> >> -            regulator_disable(bus->regulator);
> >> +    if (bus->opp_table)
> >> +            dev_pm_opp_put_regulators(bus->opp_table);
> >>
> >>      dev_pm_opp_of_remove_table(dev);
> >>  }
> >> @@ -209,39 +175,23 @@ static int exynos_bus_passive_target(struct device *dev, unsigned long *freq,
> >>  {
> >>      struct exynos_bus *bus = dev_get_drvdata(dev);
> >>      struct dev_pm_opp *new_opp;
> >> -    unsigned long old_freq, new_freq;
> >> -    int ret = 0;
> >> +    int ret;
> >>
> >> -    /* Get new opp-bus instance according to new bus clock */
> >> +    /* Get correct frequency for bus. */
> >>      new_opp = devfreq_recommended_opp(dev, freq, flags);
> >>      if (IS_ERR(new_opp)) {
> >>              dev_err(dev, "failed to get recommended opp instance\n");
> >>              return PTR_ERR(new_opp);
> >>      }
> >>
> >> -    new_freq = dev_pm_opp_get_freq(new_opp);
> >>      dev_pm_opp_put(new_opp);
> >>
> >> -    old_freq = bus->curr_freq;
> >> -
> >> -    if (old_freq == new_freq)
> >> -            return 0;
> >> -
> >>      /* Change the frequency according to new OPP level */
> >>      mutex_lock(&bus->lock);
> >> +    ret = dev_pm_opp_set_rate(dev, *freq);
> >> +    if (!ret)
> >> +            bus->curr_freq = *freq;
> >>
> >> -    ret = clk_set_rate(bus->clk, new_freq);
> >> -    if (ret < 0) {
> >> -            dev_err(dev, "failed to set the clock of bus\n");
> >> -            goto out;
> >> -    }
> >> -
> >> -    *freq = new_freq;
> >> -    bus->curr_freq = new_freq;
> >> -
> >> -    dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
> >> -                    old_freq, new_freq, clk_get_rate(bus->clk));
> >> -out:
> >>      mutex_unlock(&bus->lock);
> >>
> >>      return ret;
> >> @@ -259,20 +209,9 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
> >>                                      struct exynos_bus *bus)
> >>  {
> >>      struct device *dev = bus->dev;
> >> -    int i, ret, count, size;
> >> -
> >> -    /* Get the regulator to provide each bus with the power */
> >> -    bus->regulator = devm_regulator_get(dev, "vdd");
> >> -    if (IS_ERR(bus->regulator)) {
> >> -            dev_err(dev, "failed to get VDD regulator\n");
> >> -            return PTR_ERR(bus->regulator);
> >> -    }
> >> -
> >> -    ret = regulator_enable(bus->regulator);
> >> -    if (ret < 0) {
> >> -            dev_err(dev, "failed to enable VDD regulator\n");
> >> -            return ret;
> >> -    }
> >> +    struct opp_table *opp_table;
> >> +    const char *vdd = "vdd";
> >> +    int i, count, size;
> >>
> >>      /*
> >>       * Get the devfreq-event devices to get the current utilization of
> >> @@ -281,26 +220,29 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
> >>      count = devfreq_event_get_edev_count(dev);
> >>      if (count < 0) {
> >>              dev_err(dev, "failed to get the count of devfreq-event dev\n");
> >> -            ret = count;
> >> -            goto err_regulator;
> >> +            return count;
> >>      }
> >> -    bus->edev_count = count;
> >>
> >> +    bus->edev_count = count;
> >>      size = sizeof(*bus->edev) * count;
> >>      bus->edev = devm_kzalloc(dev, size, GFP_KERNEL);
> >> -    if (!bus->edev) {
> >> -            ret = -ENOMEM;
> >> -            goto err_regulator;
> >> -    }
> >> +    if (!bus->edev)
> >> +            return -ENOMEM;
> >>
> >>      for (i = 0; i < count; i++) {
> >>              bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);
> >> -            if (IS_ERR(bus->edev[i])) {
> >> -                    ret = -EPROBE_DEFER;
> >> -                    goto err_regulator;
> >> -            }
> >> +            if (IS_ERR(bus->edev[i]))
> >> +                    return -EPROBE_DEFER;
> >> +    }
> >> +
> >> +    opp_table = dev_pm_opp_set_regulators(dev, &vdd, 1);
> >> +    if (IS_ERR(opp_table)) {
> >> +            i = PTR_ERR(opp_table);
> >> +            dev_err(dev, "failed to set regulators %d\n", i);
> >> +            return i;
> >
> > Maybe, you just used the 'i' defined variable instead of adding
> > new variable. But, I think that you better to add new variable
> > like 'err' for the readability. Or, jut use the 'PTR_ERR(opp_table)'
> > directly without any additional variable.
>
> I will remove not related changes, so here I will reuse 'ret' variable.
>
> >>      }
> >>
> >> +    bus->opp_table = opp_table;
> >
> > Add blank line.
>
> OK
>
> >>      /*
> >>       * Optionally, Get the saturation ratio according to Exynos SoC
> >>       * When measuring the utilization of each AXI bus with devfreq-event
> >> @@ -314,16 +256,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
> >>      if (of_property_read_u32(np, "exynos,saturation-ratio", &bus->ratio))
> >>              bus->ratio = DEFAULT_SATURATION_RATIO;
> >>
> >> -    if (of_property_read_u32(np, "exynos,voltage-tolerance",
> >> -                                    &bus->voltage_tolerance))
> >> -            bus->voltage_tolerance = DEFAULT_VOLTAGE_TOLERANCE;
> >> -
> >>      return 0;
> >> -
> >> -err_regulator:
> >> -    regulator_disable(bus->regulator);
> >> -
> >> -    return ret;
> >>  }
> >>
> >>  static int exynos_bus_parse_of(struct exynos_bus *bus)
> >> @@ -414,12 +347,8 @@ static int exynos_bus_probe(struct platform_device *pdev)
> >>
> >>      /* Parse the device-tree to get the resource information */
> >>      ret = exynos_bus_parse_of(bus);
> >> -    if (ret < 0) {
> >> -            if (!passive)
> >> -                    regulator_disable(bus->regulator);
> >> -
> >> -            return ret;
> >> -    }
> >> +    if (ret < 0)
> >> +            goto err_reg;
> >>
> >>      if (passive)
> >>              goto passive;
> >> @@ -512,10 +441,12 @@ static int exynos_bus_probe(struct platform_device *pdev)
> >>
> >>  err:
> >>      clk_disable_unprepare(bus->clk);
> >> -    if (!passive)
> >> -            regulator_disable(bus->regulator);
> >> -
> >>      dev_pm_opp_of_remove_table(dev);
> >
> > This function removes the 'opp_table'. But, the below code
> > uses the 'opp_table' variable by dev_pm_opp_put_regulators().
> >
> > To disable the regulator, you have to call dev_pm_opp_of_remove_table(dev)
> > after dev_pm_opp_put_regulators(bus->opp_table).
>
> Regulators should be set before dev_pm_opp_add_table(), so exit sequence
> should be in reverse order,
>
> init order:
>
> exynos_bus_parent_parse_of()
>         dev_pm_opp_set_regulators()
> exynos_bus_parse_of()
>         clk_prepare_enable()
>         dev_pm_opp_of_add_table()
>
> exit or error order:
>
> dev_pm_opp_of_remove_table()
> clk_disable_unprepare()
> if (bus->opp_table)
>         dev_pm_opp_put_regulators(bus->opp_table);

dev_pm_opp_of_remove_table() have to be called at the end of exit sequence
after disabling clock and put regulators. Because dev_pm_opp_of_remove_table()
frees the 'opp_table' pointer of device.

clk_disable_unprepare()
if (bus->opp_table)
          dev_pm_opp_put_regulators(bus->opp_table);
dev_pm_opp_of_remove_table()

>
> I will send v4 soon.
>
> >> +err_reg:
> >> +    if (bus->opp_table) {
> >> +            dev_pm_opp_put_regulators(bus->opp_table);
> >> +            bus->opp_table = NULL;
> >> +    }
> >>
> >>      return ret;
> >>  }
>
> --
> Best regards,
> Kamil Konieczny
> Samsung R&D Institute Poland
>


-- 
Best Regards,
Chanwoo Choi

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

* Re: [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate()
  2019-07-25 14:53           ` Chanwoo Choi
@ 2019-07-25 15:15             ` Kamil Konieczny
  2019-07-26  1:02               ` Chanwoo Choi
  0 siblings, 1 reply; 13+ messages in thread
From: Kamil Konieczny @ 2019-07-25 15:15 UTC (permalink / raw)
  To: cwchoi00
  Cc: Chanwoo Choi, Bartlomiej Zolnierkiewicz, Marek Szyprowski,
	Krzysztof Kozlowski, Kukjin Kim, Kyungmin Park, Mark Rutland,
	MyungJoo Ham, Nishanth Menon, Rob Herring, Stephen Boyd,
	Viresh Kumar, devicetree, linux-arm-kernel, linux-kernel,
	Linux PM list, linux-samsung-soc

Hi,

On 25.07.2019 16:53, Chanwoo Choi wrote:
> 2019년 7월 25일 (목) 오후 11:19, Kamil Konieczny
> <k.konieczny@partner.samsung.com>님이 작성:
>>
>> Hi Chanwoo,
>>
>> On 25.07.2019 12:17, Chanwoo Choi wrote:
>>> Hi Kamil,
>>>
>>> Looks good to me. But, I have some comment. Please check them.
>>
>> Thank you for review, please see answers below.
>>
>>> After this patch, exynos_bus_target is perfectly same with
>>> exynos_bus_passive_target. The exynos_bus_passive_target() could be removed.
>>
>> Ok, I will make it in separate patch to simplify review process.
> 
> I think you can just modify this patch without any separate patch.

Do you want me to send v5 with patch 5 squashed in patch 3 ?
 
>>> On 19. 7. 20. 오전 12:05, k.konieczny@partner.samsung.com wrote:
>>>> Reuse opp core code for setting bus clock and voltage. As a side
>>>> effect this allow useage of coupled regulators feature (required
>>>
>>> s/useage/usage ?
>>
>> Good catch, I will change it.
>>
>>>> for boards using Exynos5422/5800 SoCs) because dev_pm_opp_set_rate()
>>>> uses regulator_set_voltage_triplet() for setting regulator voltage
>>>> while the old code used regulator_set_voltage_tol() with fixed
>>>> tolerance. This patch also removes no longer needed parsing of DT
>>>> property "exynos,voltage-tolerance" (no Exynos devfreq DT node uses
>>>> it).
>>>>
>>>> Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
>>>> ---
>>>>  drivers/devfreq/exynos-bus.c | 143 +++++++++--------------------------
>>>>  1 file changed, 37 insertions(+), 106 deletions(-)
>>>>
>>>> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
>>>> index f391044aa39d..c2147b0912a0 100644
>>>> --- a/drivers/devfreq/exynos-bus.c
>>>> +++ b/drivers/devfreq/exynos-bus.c
>>>> @@ -25,7 +25,6 @@
>>>>  #include <linux/slab.h>
>>>>
>>>>  #define DEFAULT_SATURATION_RATIO    40
>>>> -#define DEFAULT_VOLTAGE_TOLERANCE   2
>>>>
>>>>  struct exynos_bus {
>>>>      struct device *dev;
>>>> @@ -37,9 +36,9 @@ struct exynos_bus {
>>>>
>>>>      unsigned long curr_freq;
>>>>
>>>> -    struct regulator *regulator;
>>>> +    struct opp_table *opp_table;
>>>> +
>>>>      struct clk *clk;
>>>> -    unsigned int voltage_tolerance;
>>>>      unsigned int ratio;
>>>>  };
>>>>
>>>> @@ -99,56 +98,23 @@ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags)
>>>>  {
>>>>      struct exynos_bus *bus = dev_get_drvdata(dev);
>>>>      struct dev_pm_opp *new_opp;
>>>> -    unsigned long old_freq, new_freq, new_volt, tol;
>>>>      int ret = 0;
>>>>
>>>> -    /* Get new opp-bus instance according to new bus clock */
>>>> +    /* Get correct frequency for bus. */
>>>>      new_opp = devfreq_recommended_opp(dev, freq, flags);
>>>>      if (IS_ERR(new_opp)) {
>>>>              dev_err(dev, "failed to get recommended opp instance\n");
>>>>              return PTR_ERR(new_opp);
>>>>      }
>>>>
>>>> -    new_freq = dev_pm_opp_get_freq(new_opp);
>>>> -    new_volt = dev_pm_opp_get_voltage(new_opp);
>>>>      dev_pm_opp_put(new_opp);
>>>>
>>>> -    old_freq = bus->curr_freq;
>>>> -
>>>> -    if (old_freq == new_freq)
>>>> -            return 0;
>>>> -    tol = new_volt * bus->voltage_tolerance / 100;
>>>> -
>>>>      /* Change voltage and frequency according to new OPP level */
>>>>      mutex_lock(&bus->lock);
>>>> +    ret = dev_pm_opp_set_rate(dev, *freq);
>>>> +    if (!ret)
>>>> +            bus->curr_freq = *freq;
>>>>
>>>> -    if (old_freq < new_freq) {
>>>> -            ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
>>>> -            if (ret < 0) {
>>>> -                    dev_err(bus->dev, "failed to set voltage\n");
>>>> -                    goto out;
>>>> -            }
>>>> -    }
>>>> -
>>>> -    ret = clk_set_rate(bus->clk, new_freq);
>>>> -    if (ret < 0) {
>>>> -            dev_err(dev, "failed to change clock of bus\n");
>>>> -            clk_set_rate(bus->clk, old_freq);
>>>> -            goto out;
>>>> -    }
>>>> -
>>>> -    if (old_freq > new_freq) {
>>>> -            ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
>>>> -            if (ret < 0) {
>>>> -                    dev_err(bus->dev, "failed to set voltage\n");
>>>> -                    goto out;
>>>> -            }
>>>> -    }
>>>> -    bus->curr_freq = new_freq;
>>>> -
>>>> -    dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
>>>> -                    old_freq, new_freq, clk_get_rate(bus->clk));
>>>> -out:
>>>>      mutex_unlock(&bus->lock);
>>>>
>>>>      return ret;
>>>> @@ -195,8 +161,8 @@ static void exynos_bus_exit(struct device *dev)
>>>>              dev_warn(dev, "failed to disable the devfreq-event devices\n");
>>>>
>>>>      clk_disable_unprepare(bus->clk);
>>>> -    if (bus->regulator)
>>>> -            regulator_disable(bus->regulator);
>>>> +    if (bus->opp_table)
>>>> +            dev_pm_opp_put_regulators(bus->opp_table);
>>>>
>>>>      dev_pm_opp_of_remove_table(dev);
>>>>  }
>>>> @@ -209,39 +175,23 @@ static int exynos_bus_passive_target(struct device *dev, unsigned long *freq,
>>>>  {
>>>>      struct exynos_bus *bus = dev_get_drvdata(dev);
>>>>      struct dev_pm_opp *new_opp;
>>>> -    unsigned long old_freq, new_freq;
>>>> -    int ret = 0;
>>>> +    int ret;
>>>>
>>>> -    /* Get new opp-bus instance according to new bus clock */
>>>> +    /* Get correct frequency for bus. */
>>>>      new_opp = devfreq_recommended_opp(dev, freq, flags);
>>>>      if (IS_ERR(new_opp)) {
>>>>              dev_err(dev, "failed to get recommended opp instance\n");
>>>>              return PTR_ERR(new_opp);
>>>>      }
>>>>
>>>> -    new_freq = dev_pm_opp_get_freq(new_opp);
>>>>      dev_pm_opp_put(new_opp);
>>>>
>>>> -    old_freq = bus->curr_freq;
>>>> -
>>>> -    if (old_freq == new_freq)
>>>> -            return 0;
>>>> -
>>>>      /* Change the frequency according to new OPP level */
>>>>      mutex_lock(&bus->lock);
>>>> +    ret = dev_pm_opp_set_rate(dev, *freq);
>>>> +    if (!ret)
>>>> +            bus->curr_freq = *freq;
>>>>
>>>> -    ret = clk_set_rate(bus->clk, new_freq);
>>>> -    if (ret < 0) {
>>>> -            dev_err(dev, "failed to set the clock of bus\n");
>>>> -            goto out;
>>>> -    }
>>>> -
>>>> -    *freq = new_freq;
>>>> -    bus->curr_freq = new_freq;
>>>> -
>>>> -    dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
>>>> -                    old_freq, new_freq, clk_get_rate(bus->clk));
>>>> -out:
>>>>      mutex_unlock(&bus->lock);
>>>>
>>>>      return ret;
>>>> @@ -259,20 +209,9 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>>>                                      struct exynos_bus *bus)
>>>>  {
>>>>      struct device *dev = bus->dev;
>>>> -    int i, ret, count, size;
>>>> -
>>>> -    /* Get the regulator to provide each bus with the power */
>>>> -    bus->regulator = devm_regulator_get(dev, "vdd");
>>>> -    if (IS_ERR(bus->regulator)) {
>>>> -            dev_err(dev, "failed to get VDD regulator\n");
>>>> -            return PTR_ERR(bus->regulator);
>>>> -    }
>>>> -
>>>> -    ret = regulator_enable(bus->regulator);
>>>> -    if (ret < 0) {
>>>> -            dev_err(dev, "failed to enable VDD regulator\n");
>>>> -            return ret;
>>>> -    }
>>>> +    struct opp_table *opp_table;
>>>> +    const char *vdd = "vdd";
>>>> +    int i, count, size;
>>>>
>>>>      /*
>>>>       * Get the devfreq-event devices to get the current utilization of
>>>> @@ -281,26 +220,29 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>>>      count = devfreq_event_get_edev_count(dev);
>>>>      if (count < 0) {
>>>>              dev_err(dev, "failed to get the count of devfreq-event dev\n");
>>>> -            ret = count;
>>>> -            goto err_regulator;
>>>> +            return count;
>>>>      }
>>>> -    bus->edev_count = count;
>>>>
>>>> +    bus->edev_count = count;
>>>>      size = sizeof(*bus->edev) * count;
>>>>      bus->edev = devm_kzalloc(dev, size, GFP_KERNEL);
>>>> -    if (!bus->edev) {
>>>> -            ret = -ENOMEM;
>>>> -            goto err_regulator;
>>>> -    }
>>>> +    if (!bus->edev)
>>>> +            return -ENOMEM;
>>>>
>>>>      for (i = 0; i < count; i++) {
>>>>              bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);
>>>> -            if (IS_ERR(bus->edev[i])) {
>>>> -                    ret = -EPROBE_DEFER;
>>>> -                    goto err_regulator;
>>>> -            }
>>>> +            if (IS_ERR(bus->edev[i]))
>>>> +                    return -EPROBE_DEFER;
>>>> +    }
>>>> +
>>>> +    opp_table = dev_pm_opp_set_regulators(dev, &vdd, 1);
>>>> +    if (IS_ERR(opp_table)) {
>>>> +            i = PTR_ERR(opp_table);
>>>> +            dev_err(dev, "failed to set regulators %d\n", i);
>>>> +            return i;
>>>
>>> Maybe, you just used the 'i' defined variable instead of adding
>>> new variable. But, I think that you better to add new variable
>>> like 'err' for the readability. Or, jut use the 'PTR_ERR(opp_table)'
>>> directly without any additional variable.
>>
>> I will remove not related changes, so here I will reuse 'ret' variable.
>>
>>>>      }
>>>>
>>>> +    bus->opp_table = opp_table;
>>>
>>> Add blank line.
>>
>> OK
>>
>>>>      /*
>>>>       * Optionally, Get the saturation ratio according to Exynos SoC
>>>>       * When measuring the utilization of each AXI bus with devfreq-event
>>>> @@ -314,16 +256,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>>>      if (of_property_read_u32(np, "exynos,saturation-ratio", &bus->ratio))
>>>>              bus->ratio = DEFAULT_SATURATION_RATIO;
>>>>
>>>> -    if (of_property_read_u32(np, "exynos,voltage-tolerance",
>>>> -                                    &bus->voltage_tolerance))
>>>> -            bus->voltage_tolerance = DEFAULT_VOLTAGE_TOLERANCE;
>>>> -
>>>>      return 0;
>>>> -
>>>> -err_regulator:
>>>> -    regulator_disable(bus->regulator);
>>>> -
>>>> -    return ret;
>>>>  }
>>>>
>>>>  static int exynos_bus_parse_of(struct exynos_bus *bus)
>>>> @@ -414,12 +347,8 @@ static int exynos_bus_probe(struct platform_device *pdev)
>>>>
>>>>      /* Parse the device-tree to get the resource information */
>>>>      ret = exynos_bus_parse_of(bus);
>>>> -    if (ret < 0) {
>>>> -            if (!passive)
>>>> -                    regulator_disable(bus->regulator);
>>>> -
>>>> -            return ret;
>>>> -    }
>>>> +    if (ret < 0)
>>>> +            goto err_reg;
>>>>
>>>>      if (passive)
>>>>              goto passive;
>>>> @@ -512,10 +441,12 @@ static int exynos_bus_probe(struct platform_device *pdev)
>>>>
>>>>  err:
>>>>      clk_disable_unprepare(bus->clk);
>>>> -    if (!passive)
>>>> -            regulator_disable(bus->regulator);
>>>> -
>>>>      dev_pm_opp_of_remove_table(dev);
>>>
>>> This function removes the 'opp_table'. But, the below code
>>> uses the 'opp_table' variable by dev_pm_opp_put_regulators().
>>>
>>> To disable the regulator, you have to call dev_pm_opp_of_remove_table(dev)
>>> after dev_pm_opp_put_regulators(bus->opp_table).
>>
>> Regulators should be set before dev_pm_opp_add_table(), so exit sequence
>> should be in reverse order,
>>
>> init order:
>>
>> exynos_bus_parent_parse_of()
>>         dev_pm_opp_set_regulators()
>> exynos_bus_parse_of()
>>         clk_prepare_enable()
>>         dev_pm_opp_of_add_table()
>>
>> exit or error order:
>>
>> dev_pm_opp_of_remove_table()
>> clk_disable_unprepare()
>> if (bus->opp_table)
>>         dev_pm_opp_put_regulators(bus->opp_table);
> 
> dev_pm_opp_of_remove_table() have to be called at the end of exit sequence
> after disabling clock and put regulators. Because dev_pm_opp_of_remove_table()
> frees the 'opp_table' pointer of device.
> 
> clk_disable_unprepare()
> if (bus->opp_table)
>           dev_pm_opp_put_regulators(bus->opp_table);
> dev_pm_opp_of_remove_table()

The table is reference counted so it will be freed after count go to zero.

>> I will send v4 soon.
>>
>>>> +err_reg:
>>>> +    if (bus->opp_table) {
>>>> +            dev_pm_opp_put_regulators(bus->opp_table);
>>>> +            bus->opp_table = NULL;
>>>> +    }
>>>>
>>>>      return ret;
>>>>  }

-- 
Best regards,
Kamil Konieczny
Samsung R&D Institute Poland


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

* Re: [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate()
  2019-07-25 15:15             ` Kamil Konieczny
@ 2019-07-26  1:02               ` Chanwoo Choi
  0 siblings, 0 replies; 13+ messages in thread
From: Chanwoo Choi @ 2019-07-26  1:02 UTC (permalink / raw)
  To: Kamil Konieczny, cwchoi00
  Cc: Bartlomiej Zolnierkiewicz, Marek Szyprowski, Krzysztof Kozlowski,
	Kukjin Kim, Kyungmin Park, Mark Rutland, MyungJoo Ham,
	Nishanth Menon, Rob Herring, Stephen Boyd, Viresh Kumar,
	devicetree, linux-arm-kernel, linux-kernel, Linux PM list,
	linux-samsung-soc

Hi,

On 19. 7. 26. 오전 12:15, Kamil Konieczny wrote:
> Hi,
> 
> On 25.07.2019 16:53, Chanwoo Choi wrote:
>> 2019년 7월 25일 (목) 오후 11:19, Kamil Konieczny
>> <k.konieczny@partner.samsung.com>님이 작성:
>>>
>>> Hi Chanwoo,
>>>
>>> On 25.07.2019 12:17, Chanwoo Choi wrote:
>>>> Hi Kamil,
>>>>
>>>> Looks good to me. But, I have some comment. Please check them.
>>>
>>> Thank you for review, please see answers below.
>>>
>>>> After this patch, exynos_bus_target is perfectly same with
>>>> exynos_bus_passive_target. The exynos_bus_passive_target() could be removed.
>>>
>>> Ok, I will make it in separate patch to simplify review process.
>>
>> I think you can just modify this patch without any separate patch.
> 
> Do you want me to send v5 with patch 5 squashed in patch 3 ?

Yes. In result, it made two functions same by this patch
So, I think that can combine them without separate patch.

>  
>>>> On 19. 7. 20. 오전 12:05, k.konieczny@partner.samsung.com wrote:
>>>>> Reuse opp core code for setting bus clock and voltage. As a side
>>>>> effect this allow useage of coupled regulators feature (required
>>>>
>>>> s/useage/usage ?
>>>
>>> Good catch, I will change it.
>>>
>>>>> for boards using Exynos5422/5800 SoCs) because dev_pm_opp_set_rate()
>>>>> uses regulator_set_voltage_triplet() for setting regulator voltage
>>>>> while the old code used regulator_set_voltage_tol() with fixed
>>>>> tolerance. This patch also removes no longer needed parsing of DT
>>>>> property "exynos,voltage-tolerance" (no Exynos devfreq DT node uses
>>>>> it).
>>>>>
>>>>> Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
>>>>> ---
>>>>>  drivers/devfreq/exynos-bus.c | 143 +++++++++--------------------------
>>>>>  1 file changed, 37 insertions(+), 106 deletions(-)
>>>>>
>>>>> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
>>>>> index f391044aa39d..c2147b0912a0 100644
>>>>> --- a/drivers/devfreq/exynos-bus.c
>>>>> +++ b/drivers/devfreq/exynos-bus.c
>>>>> @@ -25,7 +25,6 @@
>>>>>  #include <linux/slab.h>
>>>>>
>>>>>  #define DEFAULT_SATURATION_RATIO    40
>>>>> -#define DEFAULT_VOLTAGE_TOLERANCE   2
>>>>>
>>>>>  struct exynos_bus {
>>>>>      struct device *dev;
>>>>> @@ -37,9 +36,9 @@ struct exynos_bus {
>>>>>
>>>>>      unsigned long curr_freq;
>>>>>
>>>>> -    struct regulator *regulator;
>>>>> +    struct opp_table *opp_table;
>>>>> +
>>>>>      struct clk *clk;
>>>>> -    unsigned int voltage_tolerance;
>>>>>      unsigned int ratio;
>>>>>  };
>>>>>
>>>>> @@ -99,56 +98,23 @@ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags)
>>>>>  {
>>>>>      struct exynos_bus *bus = dev_get_drvdata(dev);
>>>>>      struct dev_pm_opp *new_opp;
>>>>> -    unsigned long old_freq, new_freq, new_volt, tol;
>>>>>      int ret = 0;
>>>>>
>>>>> -    /* Get new opp-bus instance according to new bus clock */
>>>>> +    /* Get correct frequency for bus. */
>>>>>      new_opp = devfreq_recommended_opp(dev, freq, flags);
>>>>>      if (IS_ERR(new_opp)) {
>>>>>              dev_err(dev, "failed to get recommended opp instance\n");
>>>>>              return PTR_ERR(new_opp);
>>>>>      }
>>>>>
>>>>> -    new_freq = dev_pm_opp_get_freq(new_opp);
>>>>> -    new_volt = dev_pm_opp_get_voltage(new_opp);
>>>>>      dev_pm_opp_put(new_opp);
>>>>>
>>>>> -    old_freq = bus->curr_freq;
>>>>> -
>>>>> -    if (old_freq == new_freq)
>>>>> -            return 0;
>>>>> -    tol = new_volt * bus->voltage_tolerance / 100;
>>>>> -
>>>>>      /* Change voltage and frequency according to new OPP level */
>>>>>      mutex_lock(&bus->lock);
>>>>> +    ret = dev_pm_opp_set_rate(dev, *freq);
>>>>> +    if (!ret)
>>>>> +            bus->curr_freq = *freq;
>>>>>
>>>>> -    if (old_freq < new_freq) {
>>>>> -            ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
>>>>> -            if (ret < 0) {
>>>>> -                    dev_err(bus->dev, "failed to set voltage\n");
>>>>> -                    goto out;
>>>>> -            }
>>>>> -    }
>>>>> -
>>>>> -    ret = clk_set_rate(bus->clk, new_freq);
>>>>> -    if (ret < 0) {
>>>>> -            dev_err(dev, "failed to change clock of bus\n");
>>>>> -            clk_set_rate(bus->clk, old_freq);
>>>>> -            goto out;
>>>>> -    }
>>>>> -
>>>>> -    if (old_freq > new_freq) {
>>>>> -            ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
>>>>> -            if (ret < 0) {
>>>>> -                    dev_err(bus->dev, "failed to set voltage\n");
>>>>> -                    goto out;
>>>>> -            }
>>>>> -    }
>>>>> -    bus->curr_freq = new_freq;
>>>>> -
>>>>> -    dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
>>>>> -                    old_freq, new_freq, clk_get_rate(bus->clk));
>>>>> -out:
>>>>>      mutex_unlock(&bus->lock);
>>>>>
>>>>>      return ret;
>>>>> @@ -195,8 +161,8 @@ static void exynos_bus_exit(struct device *dev)
>>>>>              dev_warn(dev, "failed to disable the devfreq-event devices\n");
>>>>>
>>>>>      clk_disable_unprepare(bus->clk);
>>>>> -    if (bus->regulator)
>>>>> -            regulator_disable(bus->regulator);
>>>>> +    if (bus->opp_table)
>>>>> +            dev_pm_opp_put_regulators(bus->opp_table);
>>>>>
>>>>>      dev_pm_opp_of_remove_table(dev);
>>>>>  }
>>>>> @@ -209,39 +175,23 @@ static int exynos_bus_passive_target(struct device *dev, unsigned long *freq,
>>>>>  {
>>>>>      struct exynos_bus *bus = dev_get_drvdata(dev);
>>>>>      struct dev_pm_opp *new_opp;
>>>>> -    unsigned long old_freq, new_freq;
>>>>> -    int ret = 0;
>>>>> +    int ret;
>>>>>
>>>>> -    /* Get new opp-bus instance according to new bus clock */
>>>>> +    /* Get correct frequency for bus. */
>>>>>      new_opp = devfreq_recommended_opp(dev, freq, flags);
>>>>>      if (IS_ERR(new_opp)) {
>>>>>              dev_err(dev, "failed to get recommended opp instance\n");
>>>>>              return PTR_ERR(new_opp);
>>>>>      }
>>>>>
>>>>> -    new_freq = dev_pm_opp_get_freq(new_opp);
>>>>>      dev_pm_opp_put(new_opp);
>>>>>
>>>>> -    old_freq = bus->curr_freq;
>>>>> -
>>>>> -    if (old_freq == new_freq)
>>>>> -            return 0;
>>>>> -
>>>>>      /* Change the frequency according to new OPP level */
>>>>>      mutex_lock(&bus->lock);
>>>>> +    ret = dev_pm_opp_set_rate(dev, *freq);
>>>>> +    if (!ret)
>>>>> +            bus->curr_freq = *freq;
>>>>>
>>>>> -    ret = clk_set_rate(bus->clk, new_freq);
>>>>> -    if (ret < 0) {
>>>>> -            dev_err(dev, "failed to set the clock of bus\n");
>>>>> -            goto out;
>>>>> -    }
>>>>> -
>>>>> -    *freq = new_freq;
>>>>> -    bus->curr_freq = new_freq;
>>>>> -
>>>>> -    dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
>>>>> -                    old_freq, new_freq, clk_get_rate(bus->clk));
>>>>> -out:
>>>>>      mutex_unlock(&bus->lock);
>>>>>
>>>>>      return ret;
>>>>> @@ -259,20 +209,9 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>>>>                                      struct exynos_bus *bus)
>>>>>  {
>>>>>      struct device *dev = bus->dev;
>>>>> -    int i, ret, count, size;
>>>>> -
>>>>> -    /* Get the regulator to provide each bus with the power */
>>>>> -    bus->regulator = devm_regulator_get(dev, "vdd");
>>>>> -    if (IS_ERR(bus->regulator)) {
>>>>> -            dev_err(dev, "failed to get VDD regulator\n");
>>>>> -            return PTR_ERR(bus->regulator);
>>>>> -    }
>>>>> -
>>>>> -    ret = regulator_enable(bus->regulator);
>>>>> -    if (ret < 0) {
>>>>> -            dev_err(dev, "failed to enable VDD regulator\n");
>>>>> -            return ret;
>>>>> -    }
>>>>> +    struct opp_table *opp_table;
>>>>> +    const char *vdd = "vdd";
>>>>> +    int i, count, size;
>>>>>
>>>>>      /*
>>>>>       * Get the devfreq-event devices to get the current utilization of
>>>>> @@ -281,26 +220,29 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>>>>      count = devfreq_event_get_edev_count(dev);
>>>>>      if (count < 0) {
>>>>>              dev_err(dev, "failed to get the count of devfreq-event dev\n");
>>>>> -            ret = count;
>>>>> -            goto err_regulator;
>>>>> +            return count;
>>>>>      }
>>>>> -    bus->edev_count = count;
>>>>>
>>>>> +    bus->edev_count = count;
>>>>>      size = sizeof(*bus->edev) * count;
>>>>>      bus->edev = devm_kzalloc(dev, size, GFP_KERNEL);
>>>>> -    if (!bus->edev) {
>>>>> -            ret = -ENOMEM;
>>>>> -            goto err_regulator;
>>>>> -    }
>>>>> +    if (!bus->edev)
>>>>> +            return -ENOMEM;
>>>>>
>>>>>      for (i = 0; i < count; i++) {
>>>>>              bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);
>>>>> -            if (IS_ERR(bus->edev[i])) {
>>>>> -                    ret = -EPROBE_DEFER;
>>>>> -                    goto err_regulator;
>>>>> -            }
>>>>> +            if (IS_ERR(bus->edev[i]))
>>>>> +                    return -EPROBE_DEFER;
>>>>> +    }
>>>>> +
>>>>> +    opp_table = dev_pm_opp_set_regulators(dev, &vdd, 1);
>>>>> +    if (IS_ERR(opp_table)) {
>>>>> +            i = PTR_ERR(opp_table);
>>>>> +            dev_err(dev, "failed to set regulators %d\n", i);
>>>>> +            return i;
>>>>
>>>> Maybe, you just used the 'i' defined variable instead of adding
>>>> new variable. But, I think that you better to add new variable
>>>> like 'err' for the readability. Or, jut use the 'PTR_ERR(opp_table)'
>>>> directly without any additional variable.
>>>
>>> I will remove not related changes, so here I will reuse 'ret' variable.
>>>
>>>>>      }
>>>>>
>>>>> +    bus->opp_table = opp_table;
>>>>
>>>> Add blank line.
>>>
>>> OK
>>>
>>>>>      /*
>>>>>       * Optionally, Get the saturation ratio according to Exynos SoC
>>>>>       * When measuring the utilization of each AXI bus with devfreq-event
>>>>> @@ -314,16 +256,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
>>>>>      if (of_property_read_u32(np, "exynos,saturation-ratio", &bus->ratio))
>>>>>              bus->ratio = DEFAULT_SATURATION_RATIO;
>>>>>
>>>>> -    if (of_property_read_u32(np, "exynos,voltage-tolerance",
>>>>> -                                    &bus->voltage_tolerance))
>>>>> -            bus->voltage_tolerance = DEFAULT_VOLTAGE_TOLERANCE;
>>>>> -
>>>>>      return 0;
>>>>> -
>>>>> -err_regulator:
>>>>> -    regulator_disable(bus->regulator);
>>>>> -
>>>>> -    return ret;
>>>>>  }
>>>>>
>>>>>  static int exynos_bus_parse_of(struct exynos_bus *bus)
>>>>> @@ -414,12 +347,8 @@ static int exynos_bus_probe(struct platform_device *pdev)
>>>>>
>>>>>      /* Parse the device-tree to get the resource information */
>>>>>      ret = exynos_bus_parse_of(bus);
>>>>> -    if (ret < 0) {
>>>>> -            if (!passive)
>>>>> -                    regulator_disable(bus->regulator);
>>>>> -
>>>>> -            return ret;
>>>>> -    }
>>>>> +    if (ret < 0)
>>>>> +            goto err_reg;
>>>>>
>>>>>      if (passive)
>>>>>              goto passive;
>>>>> @@ -512,10 +441,12 @@ static int exynos_bus_probe(struct platform_device *pdev)
>>>>>
>>>>>  err:
>>>>>      clk_disable_unprepare(bus->clk);
>>>>> -    if (!passive)
>>>>> -            regulator_disable(bus->regulator);
>>>>> -
>>>>>      dev_pm_opp_of_remove_table(dev);
>>>>
>>>> This function removes the 'opp_table'. But, the below code
>>>> uses the 'opp_table' variable by dev_pm_opp_put_regulators().
>>>>
>>>> To disable the regulator, you have to call dev_pm_opp_of_remove_table(dev)
>>>> after dev_pm_opp_put_regulators(bus->opp_table).
>>>
>>> Regulators should be set before dev_pm_opp_add_table(), so exit sequence
>>> should be in reverse order,
>>>
>>> init order:
>>>
>>> exynos_bus_parent_parse_of()
>>>         dev_pm_opp_set_regulators()
>>> exynos_bus_parse_of()
>>>         clk_prepare_enable()
>>>         dev_pm_opp_of_add_table()
>>>
>>> exit or error order:
>>>
>>> dev_pm_opp_of_remove_table()
>>> clk_disable_unprepare()
>>> if (bus->opp_table)
>>>         dev_pm_opp_put_regulators(bus->opp_table);
>>
>> dev_pm_opp_of_remove_table() have to be called at the end of exit sequence
>> after disabling clock and put regulators. Because dev_pm_opp_of_remove_table()
>> frees the 'opp_table' pointer of device.
>>
>> clk_disable_unprepare()
>> if (bus->opp_table)
>>           dev_pm_opp_put_regulators(bus->opp_table);
>> dev_pm_opp_of_remove_table()
> 
> The table is reference counted so it will be freed after count go to zero.

You're right. I checked it with OPP code.

> 
>>> I will send v4 soon.
>>>
>>>>> +err_reg:
>>>>> +    if (bus->opp_table) {
>>>>> +            dev_pm_opp_put_regulators(bus->opp_table);
>>>>> +            bus->opp_table = NULL;
>>>>> +    }
>>>>>
>>>>>      return ret;
>>>>>  }
> 


-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

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

end of thread, back to index

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <CGME20190719150553eucas1p142b965afae13224712d51f9c28162165@eucas1p1.samsung.com>
2019-07-19 15:05 ` [PATCH v3 0/5] add coupled regulators for Exynos5422/5800 k.konieczny
     [not found]   ` <CGME20190719150553eucas1p1665462f3fc0e06fc9c082e258be3a851@eucas1p1.samsung.com>
2019-07-19 15:05     ` [PATCH v3 1/5] devfreq: exynos-bus: correct clock enable sequence k.konieczny
2019-07-25  9:58       ` Chanwoo Choi
     [not found]   ` <CGME20190719150554eucas1p2f4c9e4d2767ab740d419c42d4aeed6d5@eucas1p2.samsung.com>
2019-07-19 15:05     ` [PATCH v3 2/5] opp: core: add regulators enable and disable k.konieczny
2019-07-23  1:48       ` Viresh Kumar
     [not found]   ` <CGME20190719150555eucas1p197adc3c58e45c53137fd70cadbfae60e@eucas1p1.samsung.com>
2019-07-19 15:05     ` [PATCH v3 3/5] devfreq: exynos-bus: convert to use dev_pm_opp_set_rate() k.konieczny
2019-07-25 10:17       ` Chanwoo Choi
2019-07-25 13:35         ` Kamil Konieczny
2019-07-25 14:53           ` Chanwoo Choi
2019-07-25 15:15             ` Kamil Konieczny
2019-07-26  1:02               ` Chanwoo Choi
     [not found]   ` <CGME20190719150556eucas1p291b9e533a80d77e2f58452f0e1fe8b35@eucas1p2.samsung.com>
2019-07-19 15:05     ` [PATCH v3 4/5] ARM: dts: exynos: add initial data for coupled regulators for Exynos5422/5800 k.konieczny
     [not found]   ` <CGME20190719150556eucas1p2bc6f133c48ec1be9b36119a414887969@eucas1p2.samsung.com>
2019-07-19 15:05     ` [PATCH v3 5/5] dt-bindings: devfreq: exynos-bus: remove unused property k.konieczny

Linux-PM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-pm/0 linux-pm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-pm linux-pm/ https://lore.kernel.org/linux-pm \
		linux-pm@vger.kernel.org linux-pm@archiver.kernel.org
	public-inbox-index linux-pm


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-pm


AGPL code for this site: git clone https://public-inbox.org/ public-inbox