OPP: Minor cleanups

---
 drivers/opp/of.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/opp/of.c +2 -2

index ae5c405bbf9a..85e2af3d6a49 100644
@@ -208,9 +208,9 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,
 		mutex_lock(&opp_table_lock);
 		list_add(&opp_table->lazy, &lazy_opp_tables);
 		mutex_unlock(&opp_table_lock);
-	}
-	else
+	} else {
 		_update_set_required_opps(opp_table);
+	}
 
 	goto put_np;

Signature · 1 line

2.31.1.272.g89b43f80a514

Ulf Hansson

Reviewed-by on v1 1/5

2023-10-16 10:12 UTC #2 lore raw

Re: [PATCH 1/5] OPP: Fix formatting of if/else block

Quoted 4 lines · Viresh Kumar

Add {} to both if else blocks or none.
Signed-off-by Viresh Kumar <[email protected]>

Kind regards
Uffe

Quoted 23 lines

---
 drivers/opp/of.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/opp/of.c +2 -3

index ae5c405bbf9a..85e2af3d6a49 100644
@@ -208,9 +208,9 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,
                mutex_lock(&opp_table_lock);
                list_add(&opp_table->lazy, &lazy_opp_tables);
                mutex_unlock(&opp_table_lock);
-       }
-       else
+       } else {
                _update_set_required_opps(opp_table);
+       }
 
        goto put_np;
 
--

2.31.1.272.g89b43f80a514

Viresh Kumar

author

2023-10-13 08:49 UTC #3 lore raw

PATCH 2/5 OPP: Add _link_required_opps() to avoid code duplication

Factor out _link_required_opps() to remove duplicate code. No functional change.

---
 drivers/opp/of.c | 62 ++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

drivers/opp/of.c +29 ~~-33~~

index 85e2af3d6a49..81fa27599d58 100644
@@ -296,24 +296,41 @@ void _of_clear_opp(struct opp_table *opp_table, struct dev_pm_opp *opp)
 	of_node_put(opp->np);
 }
 
+static int _link_required_opps(struct dev_pm_opp *opp,
+			       struct opp_table *required_table, int index)
+{
+	struct device_node *np;
+
+	np = of_parse_required_opp(opp->np, index);
+	if (unlikely(!np))
+		return -ENODEV;
+
+	opp->required_opps[index] = _find_opp_of_np(required_table, np);
+	of_node_put(np);
+
+	if (!opp->required_opps[index]) {
+		pr_err("%s: Unable to find required OPP node: %pOF (%d)\n",
+		       __func__, opp->np, index);
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
 /* Populate all required OPPs which are part of "required-opps" list */
 static int _of_opp_alloc_required_opps(struct opp_table *opp_table,
 				       struct dev_pm_opp *opp)
 {
-	struct dev_pm_opp **required_opps;
 	struct opp_table *required_table;
-	struct device_node *np;
 	int i, ret, count = opp_table->required_opp_count;
 
 	if (!count)
 		return 0;
 
-	required_opps = kcalloc(count, sizeof(*required_opps), GFP_KERNEL);
-	if (!required_opps)
+	opp->required_opps = kcalloc(count, sizeof(*opp->required_opps), GFP_KERNEL);
+	if (!opp->required_opps)
 		return -ENOMEM;
 
-	opp->required_opps = required_opps;
-
 	for (i = 0; i < count; i++) {
 		required_table = opp_table->required_opp_tables[i];

@@ -321,21 +338,9 @@ static int _of_opp_alloc_required_opps(struct opp_table *opp_table,
 		if (IS_ERR_OR_NULL(required_table))
 			continue;
 
-		np = of_parse_required_opp(opp->np, i);
-		if (unlikely(!np)) {
-			ret = -ENODEV;
-			goto free_required_opps;
-		}
-
-		required_opps[i] = _find_opp_of_np(required_table, np);
-		of_node_put(np);
-
-		if (!required_opps[i]) {
-			pr_err("%s: Unable to find required OPP node: %pOF (%d)\n",
-			       __func__, opp->np, i);
-			ret = -ENODEV;
+		ret = _link_required_opps(opp, required_table, i);
+		if (ret)
 			goto free_required_opps;
-		}
 	}
 
 	return 0;

@@ -350,22 +355,13 @@ static int _of_opp_alloc_required_opps(struct opp_table *opp_table,
 static int lazy_link_required_opps(struct opp_table *opp_table,
 				   struct opp_table *new_table, int index)
 {
-	struct device_node *required_np;
 	struct dev_pm_opp *opp;
+	int ret;
 
 	list_for_each_entry(opp, &opp_table->opp_list, node) {
-		required_np = of_parse_required_opp(opp->np, index);
-		if (unlikely(!required_np))
-			return -ENODEV;
-
-		opp->required_opps[index] = _find_opp_of_np(new_table, required_np);
-		of_node_put(required_np);
-
-		if (!opp->required_opps[index]) {
-			pr_err("%s: Unable to find required OPP node: %pOF (%d)\n",
-			       __func__, opp->np, index);
-			return -ENODEV;
-		}
+		ret = _link_required_opps(opp, new_table, index);
+		if (ret)
+			return ret;
 	}
 
 	return 0;

Signature · 1 line

2.31.1.272.g89b43f80a514

Ulf Hansson

Reviewed-by on v1 2/5

2023-10-16 10:12 UTC #4 lore raw

Re: [PATCH 2/5] OPP: Add _link_required_opps() to avoid code duplication

Quoted 5 lines · Viresh Kumar

Factor out _link_required_opps() to remove duplicate code. No functional change.
Signed-off-by Viresh Kumar <[email protected]>

Kind regards
Uffe

Quoted 110 lines

---
 drivers/opp/of.c | 62 ++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

drivers/opp/of.c +29 ~~-34~~

index 85e2af3d6a49..81fa27599d58 100644
@@ -296,24 +296,41 @@ void _of_clear_opp(struct opp_table *opp_table, struct dev_pm_opp *opp)
        of_node_put(opp->np);
 }
 
+static int _link_required_opps(struct dev_pm_opp *opp,
+                              struct opp_table *required_table, int index)
+{
+       struct device_node *np;
+
+       np = of_parse_required_opp(opp->np, index);
+       if (unlikely(!np))
+               return -ENODEV;
+
+       opp->required_opps[index] = _find_opp_of_np(required_table, np);
+       of_node_put(np);
+
+       if (!opp->required_opps[index]) {
+               pr_err("%s: Unable to find required OPP node: %pOF (%d)\n",
+                      __func__, opp->np, index);
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
 /* Populate all required OPPs which are part of "required-opps" list */
 static int _of_opp_alloc_required_opps(struct opp_table *opp_table,
                                       struct dev_pm_opp *opp)
 {
-       struct dev_pm_opp **required_opps;
        struct opp_table *required_table;
-       struct device_node *np;
        int i, ret, count = opp_table->required_opp_count;
 
        if (!count)
                return 0;
 
-       required_opps = kcalloc(count, sizeof(*required_opps), GFP_KERNEL);
-       if (!required_opps)
+       opp->required_opps = kcalloc(count, sizeof(*opp->required_opps), GFP_KERNEL);
+       if (!opp->required_opps)
                return -ENOMEM;
 
-       opp->required_opps = required_opps;
-
        for (i = 0; i < count; i++) {
                required_table = opp_table->required_opp_tables[i];

@@ -321,21 +338,9 @@ static int _of_opp_alloc_required_opps(struct opp_table *opp_table,
                if (IS_ERR_OR_NULL(required_table))
                        continue;
 
-               np = of_parse_required_opp(opp->np, i);
-               if (unlikely(!np)) {
-                       ret = -ENODEV;
-                       goto free_required_opps;
-               }
-
-               required_opps[i] = _find_opp_of_np(required_table, np);
-               of_node_put(np);
-
-               if (!required_opps[i]) {
-                       pr_err("%s: Unable to find required OPP node: %pOF (%d)\n",
-                              __func__, opp->np, i);
-                       ret = -ENODEV;
+               ret = _link_required_opps(opp, required_table, i);
+               if (ret)
                        goto free_required_opps;
-               }
        }
 
        return 0;

@@ -350,22 +355,13 @@ static int _of_opp_alloc_required_opps(struct opp_table *opp_table,
 static int lazy_link_required_opps(struct opp_table *opp_table,
                                   struct opp_table *new_table, int index)
 {
-       struct device_node *required_np;
        struct dev_pm_opp *opp;
+       int ret;
 
        list_for_each_entry(opp, &opp_table->opp_list, node) {
-               required_np = of_parse_required_opp(opp->np, index);
-               if (unlikely(!required_np))
-                       return -ENODEV;
-
-               opp->required_opps[index] = _find_opp_of_np(new_table, required_np);
-               of_node_put(required_np);
-
-               if (!opp->required_opps[index]) {
-                       pr_err("%s: Unable to find required OPP node: %pOF (%d)\n",
-                              __func__, opp->np, index);
-                       return -ENODEV;
-               }
+               ret = _link_required_opps(opp, new_table, index);
+               if (ret)
+                       return ret;
        }
 
        return 0;
--

2.31.1.272.g89b43f80a514

Viresh Kumar

author

2023-10-13 08:49 UTC #5 lore raw

PATCH 3/5 OPP: Reorder code in _opp_set_required_opps_genpd()

Reorder code in _opp_set_required_opps_genpd() to reduce duplicate code.

---
 drivers/opp/core.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

drivers/opp/core.c +19 ~~-15~~

index f42b663a4d8b..3516e79cf743 100644
@@ -1076,7 +1076,18 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 {
 	struct device **genpd_virt_devs =
 		opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev;
-	int i, ret = 0;
+	int index, target, delta, ret;
+
+	/* Scaling up? Set required OPPs in normal order, else reverse */
+	if (!scaling_down) {
+		index = 0;
+		target = opp_table->required_opp_count;
+		delta = 1;
+	} else {
+		index = opp_table->required_opp_count - 1;
+		target = -1;
+		delta = -1;
+	}
 
 	/*
 	 * Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev

@@ -1084,24 +1095,17 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 	 */
 	mutex_lock(&opp_table->genpd_virt_dev_lock);
 
-	/* Scaling up? Set required OPPs in normal order, else reverse */
-	if (!scaling_down) {
-		for (i = 0; i < opp_table->required_opp_count; i++) {
-			ret = _set_performance_state(dev, genpd_virt_devs[i], opp, i);
-			if (ret)
-				break;
-		}
-	} else {
-		for (i = opp_table->required_opp_count - 1; i >= 0; i--) {
-			ret = _set_performance_state(dev, genpd_virt_devs[i], opp, i);
-			if (ret)
-				break;
-		}
+	while (index != target) {
+		ret = _set_performance_state(dev, genpd_virt_devs[index], opp, index);
+		if (ret)
+			break;
+
+		index += delta;
 	}
 
 	mutex_unlock(&opp_table->genpd_virt_dev_lock);
 
-	return ret;
+	return 0;
 }
 
 /* This is only called for PM domain for now */

Signature · 1 line

2.31.1.272.g89b43f80a514

Ulf Hansson

2023-10-16 10:12 UTC #6 lore raw

Re: [PATCH 3/5] OPP: Reorder code in _opp_set_required_opps_genpd()

Quoted 51 lines · Viresh Kumar

Reorder code in _opp_set_required_opps_genpd() to reduce duplicate code.

---
 drivers/opp/core.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

drivers/opp/core.c +14 ~~-14~~

index f42b663a4d8b..3516e79cf743 100644
@@ -1076,7 +1076,18 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 {
        struct device **genpd_virt_devs =
                opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev;
-       int i, ret = 0;
+       int index, target, delta, ret;
+
+       /* Scaling up? Set required OPPs in normal order, else reverse */
+       if (!scaling_down) {
+               index = 0;
+               target = opp_table->required_opp_count;
+               delta = 1;
+       } else {
+               index = opp_table->required_opp_count - 1;
+               target = -1;
+               delta = -1;
+       }
 
        /*
         * Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev

@@ -1084,24 +1095,17 @@ static int _opp_set_required_opps_genpd(struct device *dev,
         */
        mutex_lock(&opp_table->genpd_virt_dev_lock);
 
-       /* Scaling up? Set required OPPs in normal order, else reverse */
-       if (!scaling_down) {
-               for (i = 0; i < opp_table->required_opp_count; i++) {
-                       ret = _set_performance_state(dev, genpd_virt_devs[i], opp, i);
-                       if (ret)
-                               break;
-               }
-       } else {
-               for (i = opp_table->required_opp_count - 1; i >= 0; i--) {
-                       ret = _set_performance_state(dev, genpd_virt_devs[i], opp, i);
-                       if (ret)
-                               break;
-               }
+       while (index != target) {
+               ret = _set_performance_state(dev, genpd_virt_devs[index], opp, index);

drivers/opp/core.c static int _opp_set_required_opps_genpd(struct device *dev, · line 1108

Quoted 10 lines

drivers/opp/core.c +5 -1

+               if (ret)
+                       break;
+
+               index += delta;
        }
 
        mutex_unlock(&opp_table->genpd_virt_dev_lock);
 
-       return ret;
+       return 0;

Why always return 0 and not the error code anymore?

[...]

Kind regards
Uffe

Viresh Kumar

author

2023-10-16 10:38 UTC #7 lore raw

Re: [PATCH 3/5] OPP: Reorder code in _opp_set_required_opps_genpd()

Quoted 1 line · Ulf Hansson

Why always return 0 and not the error code anymore?

Oops, fixed with:

drivers/opp/core.c +2 -2

index 3516e79cf743..42ca52fbe210 100644
@@ -1076,7 +1076,7 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 {
        struct device **genpd_virt_devs =
                opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev;
-       int index, target, delta, ret;
+       int index, target, delta, ret = 0;
 
        /* Scaling up? Set required OPPs in normal order, else reverse */
        if (!scaling_down) {

@@ -1105,7 +1105,7 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 
        mutex_unlock(&opp_table->genpd_virt_dev_lock);
 
-       return 0;
+       return ret;
 }
 
 /* This is only called for PM domain for now */

Signature · 1 line

viresh

Ulf Hansson

Reviewed-by

2023-10-16 14:51 UTC #8 lore raw

Re: [PATCH 3/5] OPP: Reorder code in _opp_set_required_opps_genpd()

Quoted 21 lines · Viresh Kumar

Quoted 1 line · Ulf Hansson

Why always return 0 and not the error code anymore?

Oops, fixed with:

drivers/opp/core.c +1 -1

index 3516e79cf743..42ca52fbe210 100644
@@ -1076,7 +1076,7 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 {
        struct device **genpd_virt_devs =
                opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev;
-       int index, target, delta, ret;
+       int index, target, delta, ret = 0;
 
        /* Scaling up? Set required OPPs in normal order, else reverse */
        if (!scaling_down) {

drivers/opp/core.c static int _opp_set_required_opps_genpd(struct device *dev, · line 1111

Quoted 8 lines

drivers/opp/core.c +1 -1

@@ -1105,7 +1105,7 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 
        mutex_unlock(&opp_table->genpd_virt_dev_lock);
 
-       return 0;
+       return ret;
 }
 
 /* This is only called for PM domain for now */

Kind regards
Uffe

Viresh Kumar

author

2023-10-13 08:49 UTC #9 lore raw

PATCH 4/5 OPP: Remove genpd_virt_dev_lock

All the config operations for OPP tables share common code paths now and none of the other ones have such protection in place. Either all should have it or none.

The understanding here is that user won't clear the OPP configs while still using them and so such a case won't happen. We can always come back and use a wider lock for all resource types if required.

Also fix the error on failing to allocate memory.

---
 drivers/opp/core.c | 33 +++------------------------------
 drivers/opp/opp.h  |  2 --
 2 files changed, 3 insertions(+), 32 deletions(-)

drivers/opp/core.c +3 ~~-30~~

index 3516e79cf743..befe46036ad5 100644
@@ -1089,12 +1089,6 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 		delta = -1;
 	}
 
-	/*
-	 * Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev
-	 * after it is freed from another thread.
-	 */
-	mutex_lock(&opp_table->genpd_virt_dev_lock);
-
 	while (index != target) {
 		ret = _set_performance_state(dev, genpd_virt_devs[index], opp, index);
 		if (ret)

@@ -1103,8 +1097,6 @@ static int _opp_set_required_opps_genpd(struct device *dev,
 		index += delta;
 	}
 
-	mutex_unlock(&opp_table->genpd_virt_dev_lock);
-
 	return 0;
 }

@@ -1474,7 +1466,6 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index)
 		return ERR_PTR(-ENOMEM);
 
 	mutex_init(&opp_table->lock);
-	mutex_init(&opp_table->genpd_virt_dev_lock);
 	INIT_LIST_HEAD(&opp_table->dev_list);
 	INIT_LIST_HEAD(&opp_table->lazy);

@@ -1510,7 +1501,6 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index)
 remove_opp_dev:
 	_of_clear_opp_table(opp_table);
 	_remove_opp_dev(opp_dev, opp_table);
-	mutex_destroy(&opp_table->genpd_virt_dev_lock);
 	mutex_destroy(&opp_table->lock);
 err:
 	kfree(opp_table);

@@ -1678,7 +1668,6 @@ static void _opp_table_kref_release(struct kref *kref)
 	list_for_each_entry_safe(opp_dev, temp, &opp_table->dev_list, node)
 		_remove_opp_dev(opp_dev, opp_table);
 
-	mutex_destroy(&opp_table->genpd_virt_dev_lock);
 	mutex_destroy(&opp_table->lock);
 	kfree(opp_table);
 }

@@ -2395,7 +2384,7 @@ static void _opp_put_config_regulators_helper(struct opp_table *opp_table)
 		opp_table->config_regulators = NULL;
 }
 
-static void _detach_genpd(struct opp_table *opp_table)
+static void _opp_detach_genpd(struct opp_table *opp_table)
 {
 	int index;

@@ -2449,13 +2438,11 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev,
 	if (!opp_table->required_opp_count)
 		return -EPROBE_DEFER;
 
-	mutex_lock(&opp_table->genpd_virt_dev_lock);
-
 	opp_table->genpd_virt_devs = kcalloc(opp_table->required_opp_count,
 					     sizeof(*opp_table->genpd_virt_devs),
 					     GFP_KERNEL);
 	if (!opp_table->genpd_virt_devs)
-		goto unlock;
+		return -ENOMEM;
 
 	while (*name) {
 		if (index >= opp_table->required_opp_count) {

@@ -2478,29 +2465,15 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev,
 
 	if (virt_devs)
 		*virt_devs = opp_table->genpd_virt_devs;
-	mutex_unlock(&opp_table->genpd_virt_dev_lock);
 
 	return 0;
 
 err:
-	_detach_genpd(opp_table);
-unlock:
-	mutex_unlock(&opp_table->genpd_virt_dev_lock);
+	_opp_detach_genpd(opp_table);
 	return ret;
 
 }
 
-static void _opp_detach_genpd(struct opp_table *opp_table)
-{
-	/*
-	 * Acquire genpd_virt_dev_lock to make sure virt_dev isn't getting
-	 * used in parallel.
-	 */
-	mutex_lock(&opp_table->genpd_virt_dev_lock);
-	_detach_genpd(opp_table);
-	mutex_unlock(&opp_table->genpd_virt_dev_lock);
-}
-
 static void _opp_clear_config(struct opp_config_data *data)
 {
 	if (data->flags & OPP_CONFIG_GENPD)

drivers/opp/opp.h +0 -2

index fefdf9845692..08366f90f16b 100644
@@ -160,7 +160,6 @@ enum opp_table_access {
  * @rate_clk_single: Currently configured frequency for single clk.
  * @current_opp: Currently configured OPP for the table.
  * @suspend_opp: Pointer to OPP to be used during device suspend.
- * @genpd_virt_dev_lock: Mutex protecting the genpd virtual device pointers.
  * @genpd_virt_devs: List of virtual devices for multiple genpd support.
  * @required_opp_tables: List of device OPP tables that are required by OPPs in
  *		this table.

@@ -212,7 +211,6 @@ struct opp_table {
 	struct dev_pm_opp *current_opp;
 	struct dev_pm_opp *suspend_opp;
 
-	struct mutex genpd_virt_dev_lock;
 	struct device **genpd_virt_devs;
 	struct opp_table **required_opp_tables;
 	unsigned int required_opp_count;

Signature · 1 line

2.31.1.272.g89b43f80a514

Ulf Hansson

Reviewed-by on v1 4/5

2023-10-16 10:12 UTC #10 lore raw

Re: [PATCH 4/5] OPP: Remove genpd_virt_dev_lock

Quoted 5 lines · Viresh Kumar

All the config operations for OPP tables share common code paths now and none of the other ones have such protection in place. Either all should have it or none.

Quoted 7 lines

The understanding here is that user won't clear the OPP configs while still using them and so such a case won't happen. We can always come back and use a wider lock for all resource types if required.
Also fix the error on failing to allocate memory.
Signed-off-by Viresh Kumar <[email protected]>

Kind regards
Uffe

Quoted 133 lines

---
 drivers/opp/core.c | 33 +++------------------------------
 drivers/opp/opp.h  |  2 --
 2 files changed, 3 insertions(+), 32 deletions(-)

drivers/opp/core.c +3 ~~-30~~

index 3516e79cf743..befe46036ad5 100644
@@ -1089,12 +1089,6 @@ static int _opp_set_required_opps_genpd(struct device *dev,
                delta = -1;
        }
 
-       /*
-        * Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev
-        * after it is freed from another thread.
-        */
-       mutex_lock(&opp_table->genpd_virt_dev_lock);
-
        while (index != target) {
                ret = _set_performance_state(dev, genpd_virt_devs[index], opp, index);
                if (ret)

@@ -1103,8 +1097,6 @@ static int _opp_set_required_opps_genpd(struct device *dev,
                index += delta;
        }
 
-       mutex_unlock(&opp_table->genpd_virt_dev_lock);
-
        return 0;
 }

@@ -1474,7 +1466,6 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index)
                return ERR_PTR(-ENOMEM);
 
        mutex_init(&opp_table->lock);
-       mutex_init(&opp_table->genpd_virt_dev_lock);
        INIT_LIST_HEAD(&opp_table->dev_list);
        INIT_LIST_HEAD(&opp_table->lazy);

@@ -1510,7 +1501,6 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index)
 remove_opp_dev:
        _of_clear_opp_table(opp_table);
        _remove_opp_dev(opp_dev, opp_table);
-       mutex_destroy(&opp_table->genpd_virt_dev_lock);
        mutex_destroy(&opp_table->lock);
 err:
        kfree(opp_table);

@@ -1678,7 +1668,6 @@ static void _opp_table_kref_release(struct kref *kref)
        list_for_each_entry_safe(opp_dev, temp, &opp_table->dev_list, node)
                _remove_opp_dev(opp_dev, opp_table);
 
-       mutex_destroy(&opp_table->genpd_virt_dev_lock);
        mutex_destroy(&opp_table->lock);
        kfree(opp_table);
 }

@@ -2395,7 +2384,7 @@ static void _opp_put_config_regulators_helper(struct opp_table *opp_table)
                opp_table->config_regulators = NULL;
 }
 
-static void _detach_genpd(struct opp_table *opp_table)
+static void _opp_detach_genpd(struct opp_table *opp_table)
 {
        int index;

@@ -2449,13 +2438,11 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev,
        if (!opp_table->required_opp_count)
                return -EPROBE_DEFER;
 
-       mutex_lock(&opp_table->genpd_virt_dev_lock);
-
        opp_table->genpd_virt_devs = kcalloc(opp_table->required_opp_count,
                                             sizeof(*opp_table->genpd_virt_devs),
                                             GFP_KERNEL);
        if (!opp_table->genpd_virt_devs)
-               goto unlock;
+               return -ENOMEM;
 
        while (*name) {
                if (index >= opp_table->required_opp_count) {

@@ -2478,29 +2465,15 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev,
 
        if (virt_devs)
                *virt_devs = opp_table->genpd_virt_devs;
-       mutex_unlock(&opp_table->genpd_virt_dev_lock);
 
        return 0;
 
 err:
-       _detach_genpd(opp_table);
-unlock:
-       mutex_unlock(&opp_table->genpd_virt_dev_lock);
+       _opp_detach_genpd(opp_table);
        return ret;
 
 }
 
-static void _opp_detach_genpd(struct opp_table *opp_table)
-{
-       /*
-        * Acquire genpd_virt_dev_lock to make sure virt_dev isn't getting
-        * used in parallel.
-        */
-       mutex_lock(&opp_table->genpd_virt_dev_lock);
-       _detach_genpd(opp_table);
-       mutex_unlock(&opp_table->genpd_virt_dev_lock);
-}
-
 static void _opp_clear_config(struct opp_config_data *data)
 {
        if (data->flags & OPP_CONFIG_GENPD)

drivers/opp/opp.h +0 -3

index fefdf9845692..08366f90f16b 100644
@@ -160,7 +160,6 @@ enum opp_table_access {
  * @rate_clk_single: Currently configured frequency for single clk.
  * @current_opp: Currently configured OPP for the table.
  * @suspend_opp: Pointer to OPP to be used during device suspend.
- * @genpd_virt_dev_lock: Mutex protecting the genpd virtual device pointers.
  * @genpd_virt_devs: List of virtual devices for multiple genpd support.
  * @required_opp_tables: List of device OPP tables that are required by OPPs in
  *             this table.

@@ -212,7 +211,6 @@ struct opp_table {
        struct dev_pm_opp *current_opp;
        struct dev_pm_opp *suspend_opp;
 
-       struct mutex genpd_virt_dev_lock;
        struct device **genpd_virt_devs;
        struct opp_table **required_opp_tables;
        unsigned int required_opp_count;
--

2.31.1.272.g89b43f80a514

Viresh Kumar

author

2023-10-13 08:49 UTC #11 lore raw

PATCH 5/5 OPP: No need to defer probe from _opp_attach_genpd()

When the new interface for attaching genpd's via the OPP core was added, it was possible for required_opp_count to be zero, but not anymore.

Remove the unused check.

---
 drivers/opp/core.c | 8 --------
 1 file changed, 8 deletions(-)

drivers/opp/core.c +0 -8

index befe46036ad5..c069aabefa00 100644
@@ -2430,14 +2430,6 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev,
 	if (opp_table->genpd_virt_devs)
 		return 0;
 
-	/*
-	 * If the genpd's OPP table isn't already initialized, parsing of the
-	 * required-opps fail for dev. We should retry this after genpd's OPP
-	 * table is added.
-	 */
-	if (!opp_table->required_opp_count)
-		return -EPROBE_DEFER;
-
 	opp_table->genpd_virt_devs = kcalloc(opp_table->required_opp_count,
 					     sizeof(*opp_table->genpd_virt_devs),
 					     GFP_KERNEL);

Signature · 1 line

2.31.1.272.g89b43f80a514

Ulf Hansson

Reviewed-by on v1 5/5

2023-10-16 10:12 UTC #12 lore raw

Re: [PATCH 5/5] OPP: No need to defer probe from _opp_attach_genpd()

Quoted 7 lines · Viresh Kumar

When the new interface for attaching genpd's via the OPP core was added, it was possible for required_opp_count to be zero, but not anymore.
Remove the unused check.
Signed-off-by Viresh Kumar <[email protected]>