OPP: Rename and relocate of_genpd_opp_to_performance_state()
[linux-2.6-block.git] / drivers / opp / of.c
index 5a4b47958073ee4526772f35e8b5614cc3c63418..369d63a58ac4b62990231be3cf4f4340cca0db1a 100644 (file)
@@ -73,6 +73,161 @@ struct opp_table *_managed_opp(struct device *dev, int index)
        return managed_table;
 }
 
+/* The caller must call dev_pm_opp_put() after the OPP is used */
+static struct dev_pm_opp *_find_opp_of_np(struct opp_table *opp_table,
+                                         struct device_node *opp_np)
+{
+       struct dev_pm_opp *opp;
+
+       lockdep_assert_held(&opp_table_lock);
+
+       mutex_lock(&opp_table->lock);
+
+       list_for_each_entry(opp, &opp_table->opp_list, node) {
+               if (opp->np == opp_np) {
+                       dev_pm_opp_get(opp);
+                       mutex_unlock(&opp_table->lock);
+                       return opp;
+               }
+       }
+
+       mutex_unlock(&opp_table->lock);
+
+       return NULL;
+}
+
+static struct device_node *of_parse_required_opp(struct device_node *np,
+                                                int index)
+{
+       struct device_node *required_np;
+
+       required_np = of_parse_phandle(np, "required-opps", index);
+       if (unlikely(!required_np)) {
+               pr_err("%s: Unable to parse required-opps: %pOF, index: %d\n",
+                      __func__, np, index);
+       }
+
+       return required_np;
+}
+
+/* The caller must call dev_pm_opp_put_opp_table() after the table is used */
+static struct opp_table *_find_table_of_opp_np(struct device_node *opp_np)
+{
+       struct opp_table *opp_table;
+       struct dev_pm_opp *opp;
+
+       lockdep_assert_held(&opp_table_lock);
+
+       list_for_each_entry(opp_table, &opp_tables, node) {
+               opp = _find_opp_of_np(opp_table, opp_np);
+               if (opp) {
+                       dev_pm_opp_put(opp);
+                       _get_opp_table_kref(opp_table);
+                       return opp_table;
+               }
+       }
+
+       return ERR_PTR(-ENODEV);
+}
+
+/* Free resources previously acquired by _opp_table_alloc_required_tables() */
+static void _opp_table_free_required_tables(struct opp_table *opp_table)
+{
+       struct opp_table **required_opp_tables = opp_table->required_opp_tables;
+       struct device **genpd_virt_devs = opp_table->genpd_virt_devs;
+       int i;
+
+       if (!required_opp_tables)
+               return;
+
+       for (i = 0; i < opp_table->required_opp_count; i++) {
+               if (IS_ERR_OR_NULL(required_opp_tables[i]))
+                       break;
+
+               dev_pm_opp_put_opp_table(required_opp_tables[i]);
+       }
+
+       kfree(required_opp_tables);
+       kfree(genpd_virt_devs);
+
+       opp_table->required_opp_count = 0;
+       opp_table->genpd_virt_devs = NULL;
+       opp_table->required_opp_tables = NULL;
+}
+
+/*
+ * Populate all devices and opp tables which are part of "required-opps" list.
+ * Checking only the first OPP node should be enough.
+ */
+static void _opp_table_alloc_required_tables(struct opp_table *opp_table,
+                                            struct device *dev,
+                                            struct device_node *opp_np)
+{
+       struct opp_table **required_opp_tables;
+       struct device **genpd_virt_devs = NULL;
+       struct device_node *required_np, *np;
+       int count, i;
+
+       /* Traversing the first OPP node is all we need */
+       np = of_get_next_available_child(opp_np, NULL);
+       if (!np) {
+               dev_err(dev, "Empty OPP table\n");
+               return;
+       }
+
+       count = of_count_phandle_with_args(np, "required-opps", NULL);
+       if (!count)
+               goto put_np;
+
+       if (count > 1) {
+               genpd_virt_devs = kcalloc(count, sizeof(*genpd_virt_devs),
+                                       GFP_KERNEL);
+               if (!genpd_virt_devs)
+                       goto put_np;
+       }
+
+       required_opp_tables = kcalloc(count, sizeof(*required_opp_tables),
+                                     GFP_KERNEL);
+       if (!required_opp_tables) {
+               kfree(genpd_virt_devs);
+               goto put_np;
+       }
+
+       opp_table->genpd_virt_devs = genpd_virt_devs;
+       opp_table->required_opp_tables = required_opp_tables;
+       opp_table->required_opp_count = count;
+
+       for (i = 0; i < count; i++) {
+               required_np = of_parse_required_opp(np, i);
+               if (!required_np)
+                       goto free_required_tables;
+
+               required_opp_tables[i] = _find_table_of_opp_np(required_np);
+               of_node_put(required_np);
+
+               if (IS_ERR(required_opp_tables[i]))
+                       goto free_required_tables;
+
+               /*
+                * We only support genpd's OPPs in the "required-opps" for now,
+                * as we don't know how much about other cases. Error out if the
+                * required OPP doesn't belong to a genpd.
+                */
+               if (!required_opp_tables[i]->is_genpd) {
+                       dev_err(dev, "required-opp doesn't belong to genpd: %pOF\n",
+                               required_np);
+                       goto free_required_tables;
+               }
+       }
+
+       goto put_np;
+
+free_required_tables:
+       _opp_table_free_required_tables(opp_table);
+put_np:
+       of_node_put(np);
+}
+
 void _of_init_opp_table(struct opp_table *opp_table, struct device *dev,
                        int index)
 {
@@ -92,6 +247,9 @@ void _of_init_opp_table(struct opp_table *opp_table, struct device *dev,
        of_property_read_u32(np, "voltage-tolerance",
                             &opp_table->voltage_tolerance_v1);
 
+       if (of_find_property(np, "#power-domain-cells", NULL))
+               opp_table->is_genpd = true;
+
        /* Get OPP table node */
        opp_np = _opp_of_get_opp_desc_node(np, index);
        of_node_put(np);
@@ -106,9 +264,86 @@ void _of_init_opp_table(struct opp_table *opp_table, struct device *dev,
 
        opp_table->np = opp_np;
 
+       _opp_table_alloc_required_tables(opp_table, dev, opp_np);
        of_node_put(opp_np);
 }
 
+void _of_clear_opp_table(struct opp_table *opp_table)
+{
+       _opp_table_free_required_tables(opp_table);
+}
+
+/*
+ * Release all resources previously acquired with a call to
+ * _of_opp_alloc_required_opps().
+ */
+void _of_opp_free_required_opps(struct opp_table *opp_table,
+                               struct dev_pm_opp *opp)
+{
+       struct dev_pm_opp **required_opps = opp->required_opps;
+       int i;
+
+       if (!required_opps)
+               return;
+
+       for (i = 0; i < opp_table->required_opp_count; i++) {
+               if (!required_opps[i])
+                       break;
+
+               /* Put the reference back */
+               dev_pm_opp_put(required_opps[i]);
+       }
+
+       kfree(required_opps);
+       opp->required_opps = NULL;
+}
+
+/* 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)
+               return -ENOMEM;
+
+       opp->required_opps = required_opps;
+
+       for (i = 0; i < count; i++) {
+               required_table = opp_table->required_opp_tables[i];
+
+               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;
+                       goto free_required_opps;
+               }
+       }
+
+       return 0;
+
+free_required_opps:
+       _of_opp_free_required_opps(opp_table, opp);
+
+       return ret;
+}
+
 static bool _opp_is_supported(struct device *dev, struct opp_table *opp_table,
                              struct device_node *np)
 {
@@ -326,8 +561,7 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
        ret = of_property_read_u64(np, "opp-hz", &rate);
        if (ret < 0) {
                /* "opp-hz" is optional for devices like power domains. */
-               if (!of_find_property(dev->of_node, "#power-domain-cells",
-                                     NULL)) {
+               if (!opp_table->is_genpd) {
                        dev_err(dev, "%s: opp-hz not found\n", __func__);
                        goto free_opp;
                }
@@ -354,21 +588,26 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
        new_opp->dynamic = false;
        new_opp->available = true;
 
+       ret = _of_opp_alloc_required_opps(opp_table, new_opp);
+       if (ret)
+               goto free_opp;
+
        if (!of_property_read_u32(np, "clock-latency-ns", &val))
                new_opp->clock_latency_ns = val;
 
-       new_opp->pstate = of_genpd_opp_to_performance_state(dev, np);
-
        ret = opp_parse_supplies(new_opp, dev, opp_table);
        if (ret)
-               goto free_opp;
+               goto free_required_opps;
+
+       if (opp_table->is_genpd)
+               new_opp->pstate = pm_genpd_opp_to_performance_state(dev, new_opp);
 
        ret = _opp_add(dev, new_opp, opp_table, rate_not_available);
        if (ret) {
                /* Don't return error for duplicate OPPs */
                if (ret == -EBUSY)
                        ret = 0;
-               goto free_opp;
+               goto free_required_opps;
        }
 
        /* OPP to select on device suspend */
@@ -398,6 +637,8 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
        blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_ADD, new_opp);
        return new_opp;
 
+free_required_opps:
+       _of_opp_free_required_opps(opp_table, new_opp);
 free_opp:
        _opp_free(new_opp);
 
@@ -728,6 +969,50 @@ put_cpu_node:
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_of_get_sharing_cpus);
 
+/**
+ * of_get_required_opp_performance_state() - Search for required OPP and return its performance state.
+ * @np: Node that contains the "required-opps" property.
+ * @index: Index of the phandle to parse.
+ *
+ * Returns the performance state of the OPP pointed out by the "required-opps"
+ * property at @index in @np.
+ *
+ * Return: Positive performance state on success, otherwise 0 on errors.
+ */
+unsigned int of_get_required_opp_performance_state(struct device_node *np,
+                                                  int index)
+{
+       struct dev_pm_opp *opp;
+       struct device_node *required_np;
+       struct opp_table *opp_table;
+       unsigned int pstate = 0;
+
+       required_np = of_parse_required_opp(np, index);
+       if (!required_np)
+               return 0;
+
+       opp_table = _find_table_of_opp_np(required_np);
+       if (IS_ERR(opp_table)) {
+               pr_err("%s: Failed to find required OPP table %pOF: %ld\n",
+                      __func__, np, PTR_ERR(opp_table));
+               goto put_required_np;
+       }
+
+       opp = _find_opp_of_np(opp_table, required_np);
+       if (opp) {
+               pstate = opp->pstate;
+               dev_pm_opp_put(opp);
+       }
+
+       dev_pm_opp_put_opp_table(opp_table);
+
+put_required_np:
+       of_node_put(required_np);
+
+       return pstate;
+}
+EXPORT_SYMBOL_GPL(of_get_required_opp_performance_state);
+
 /**
  * of_dev_pm_opp_find_required_opp() - Search for required OPP.
  * @dev: The device whose OPP node is referenced by the 'np' DT node.