From: Viresh Kumar <viresh.kumar@linaro.org> To: Rafael Wysocki <rjw@rjwysocki.net>, rob.herring@linaro.org, nm@ti.com Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, arnd.bergmann@linaro.org, broonie@kernel.org, mike.turquette@linaro.org, sboyd@codeaurora.org, Sudeep.Holla@arm.com, viswanath.puttagunta@linaro.org, l.stach@pengutronix.de, thomas.petazzoni@free-electrons.com, linux-arm-kernel@lists.infradead.org, ta.omasab@gmail.com, kesavan.abhilash@gmail.com, khilman@linaro.org, santosh.shilimkar@oracle.com, Viresh Kumar <viresh.kumar@linaro.org> Subject: [PATCH 04/10] OPP: Break _opp_add_dynamic() into smaller functions Date: Mon, 15 Jun 2015 17:27:30 +0530 [thread overview] Message-ID: <15b69640a8672d983f2233e16e52ca275d36c816.1434369079.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1434369079.git.viresh.kumar@linaro.org> In-Reply-To: <cover.1434369079.git.viresh.kumar@linaro.org> Later commits would add support for new OPP bindings and this would be required then. So, lets do it in a separate patch to make it easily reviewable. Another change worth noticing is INIT_LIST_HEAD(&opp->node). We weren't doing it earlier as we never tried to delete a list node before it is added to list. But this wouldn't be the case anymore. We might try to delete a node (just to reuse the same code paths), without it being getting added to the list. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/base/power/opp.c | 115 +++++++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 44 deletions(-) diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 4b646f36f252..2ac48ff9c1ef 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -484,6 +484,7 @@ static void _kfree_opp_rcu(struct rcu_head *head) * _opp_remove() - Remove an OPP from a table definition * @dev_opp: points back to the device_opp struct this opp belongs to * @opp: pointer to the OPP to remove + * @notify: OPP_EVENT_REMOVE notification should be sent or not * * This function removes an opp definition from the opp list. * @@ -492,13 +493,14 @@ static void _kfree_opp_rcu(struct rcu_head *head) * strategy. */ static void _opp_remove(struct device_opp *dev_opp, - struct dev_pm_opp *opp) + struct dev_pm_opp *opp, bool notify) { /* * Notify the changes in the availability of the operable * frequency/voltage list. */ - srcu_notifier_call_chain(&dev_opp->srcu_head, OPP_EVENT_REMOVE, opp); + if (notify) + srcu_notifier_call_chain(&dev_opp->srcu_head, OPP_EVENT_REMOVE, opp); list_del_rcu(&opp->node); call_srcu(&dev_opp->srcu_head.srcu, &opp->rcu_head, _kfree_opp_rcu); @@ -544,12 +546,65 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq) goto unlock; } - _opp_remove(dev_opp, opp); + _opp_remove(dev_opp, opp, true); unlock: mutex_unlock(&dev_opp_list_lock); } EXPORT_SYMBOL_GPL(dev_pm_opp_remove); +static struct dev_pm_opp *_allocate_opp(struct device *dev, + struct device_opp **dev_opp) +{ + struct dev_pm_opp *opp; + + /* allocate new OPP node */ + opp = kzalloc(sizeof(*opp), GFP_KERNEL); + if (!opp) + return NULL; + + INIT_LIST_HEAD(&opp->node); + + *dev_opp = _add_device_opp(dev); + if (!*dev_opp) { + kfree(opp); + return NULL; + } + + return opp; +} + +static int _opp_add(struct dev_pm_opp *new_opp, struct device_opp *dev_opp) +{ + struct dev_pm_opp *opp = NULL; + struct list_head *head = &dev_opp->opp_list; + + /* + * Insert new OPP in order of increasing frequency + * and discard if already present + */ + list_for_each_entry_rcu(opp, &dev_opp->opp_list, node) { + if (new_opp->rate <= opp->rate) + break; + + head = &opp->node; + } + + /* Duplicate OPPs ? */ + if (opp && new_opp->rate == opp->rate) { + dev_warn(dev_opp->dev, + "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n", + __func__, opp->rate, opp->u_volt, opp->available, + new_opp->rate, new_opp->u_volt, new_opp->available); + return opp->available && new_opp->u_volt == opp->u_volt ? + 0 : -EEXIST; + } + + new_opp->dev_opp = dev_opp; + list_add_rcu(&new_opp->node, head); + + return 0; +} + /** * _opp_add_dynamic() - Allocate a dynamic OPP. * @dev: device for which we do this operation @@ -581,55 +636,28 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq, long u_volt, bool dynamic) { struct device_opp *dev_opp; - struct dev_pm_opp *opp = NULL, *new_opp; - struct list_head *head; + struct dev_pm_opp *new_opp; int ret; - /* allocate new OPP node */ - new_opp = kzalloc(sizeof(*new_opp), GFP_KERNEL); - if (!new_opp) - return -ENOMEM; - /* Hold our list modification lock here */ mutex_lock(&dev_opp_list_lock); + new_opp = _allocate_opp(dev, &dev_opp); + if (!new_opp) { + ret = -ENOMEM; + goto unlock; + } + /* populate the opp table */ new_opp->rate = freq; new_opp->u_volt = u_volt; new_opp->available = true; + new_opp->dynamic = dynamic; - dev_opp = _add_device_opp(dev); - if (!dev_opp) { - ret = -ENOMEM; + ret = _opp_add(new_opp, dev_opp); + if (ret) goto free_opp; - } - - /* - * Insert new OPP in order of increasing frequency - * and discard if already present - */ - head = &dev_opp->opp_list; - list_for_each_entry_rcu(opp, &dev_opp->opp_list, node) { - if (new_opp->rate <= opp->rate) - break; - else - head = &opp->node; - } - - /* Duplicate OPPs ? */ - if (opp && new_opp->rate == opp->rate) { - ret = opp->available && new_opp->u_volt == opp->u_volt ? - 0 : -EEXIST; - - dev_warn(dev, "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n", - __func__, opp->rate, opp->u_volt, opp->available, - new_opp->rate, new_opp->u_volt, new_opp->available); - goto remove_dev_opp; - } - new_opp->dynamic = dynamic; - new_opp->dev_opp = dev_opp; - list_add_rcu(&new_opp->node, head); mutex_unlock(&dev_opp_list_lock); /* @@ -639,11 +667,10 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq, srcu_notifier_call_chain(&dev_opp->srcu_head, OPP_EVENT_ADD, new_opp); return 0; -remove_dev_opp: - _remove_device_opp(dev_opp); free_opp: + _opp_remove(dev_opp, new_opp, false); +unlock: mutex_unlock(&dev_opp_list_lock); - kfree(new_opp); return ret; } @@ -871,7 +898,7 @@ void of_free_opp_table(struct device *dev) /* Free static OPPs */ list_for_each_entry_safe(opp, tmp, &dev_opp->opp_list, node) { if (!opp->dynamic) - _opp_remove(dev_opp, opp); + _opp_remove(dev_opp, opp, true); } mutex_unlock(&dev_opp_list_lock); -- 2.4.0
WARNING: multiple messages have this Message-ID (diff)
From: viresh.kumar@linaro.org (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/10] OPP: Break _opp_add_dynamic() into smaller functions Date: Mon, 15 Jun 2015 17:27:30 +0530 [thread overview] Message-ID: <15b69640a8672d983f2233e16e52ca275d36c816.1434369079.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1434369079.git.viresh.kumar@linaro.org> Later commits would add support for new OPP bindings and this would be required then. So, lets do it in a separate patch to make it easily reviewable. Another change worth noticing is INIT_LIST_HEAD(&opp->node). We weren't doing it earlier as we never tried to delete a list node before it is added to list. But this wouldn't be the case anymore. We might try to delete a node (just to reuse the same code paths), without it being getting added to the list. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/base/power/opp.c | 115 +++++++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 44 deletions(-) diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 4b646f36f252..2ac48ff9c1ef 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -484,6 +484,7 @@ static void _kfree_opp_rcu(struct rcu_head *head) * _opp_remove() - Remove an OPP from a table definition * @dev_opp: points back to the device_opp struct this opp belongs to * @opp: pointer to the OPP to remove + * @notify: OPP_EVENT_REMOVE notification should be sent or not * * This function removes an opp definition from the opp list. * @@ -492,13 +493,14 @@ static void _kfree_opp_rcu(struct rcu_head *head) * strategy. */ static void _opp_remove(struct device_opp *dev_opp, - struct dev_pm_opp *opp) + struct dev_pm_opp *opp, bool notify) { /* * Notify the changes in the availability of the operable * frequency/voltage list. */ - srcu_notifier_call_chain(&dev_opp->srcu_head, OPP_EVENT_REMOVE, opp); + if (notify) + srcu_notifier_call_chain(&dev_opp->srcu_head, OPP_EVENT_REMOVE, opp); list_del_rcu(&opp->node); call_srcu(&dev_opp->srcu_head.srcu, &opp->rcu_head, _kfree_opp_rcu); @@ -544,12 +546,65 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq) goto unlock; } - _opp_remove(dev_opp, opp); + _opp_remove(dev_opp, opp, true); unlock: mutex_unlock(&dev_opp_list_lock); } EXPORT_SYMBOL_GPL(dev_pm_opp_remove); +static struct dev_pm_opp *_allocate_opp(struct device *dev, + struct device_opp **dev_opp) +{ + struct dev_pm_opp *opp; + + /* allocate new OPP node */ + opp = kzalloc(sizeof(*opp), GFP_KERNEL); + if (!opp) + return NULL; + + INIT_LIST_HEAD(&opp->node); + + *dev_opp = _add_device_opp(dev); + if (!*dev_opp) { + kfree(opp); + return NULL; + } + + return opp; +} + +static int _opp_add(struct dev_pm_opp *new_opp, struct device_opp *dev_opp) +{ + struct dev_pm_opp *opp = NULL; + struct list_head *head = &dev_opp->opp_list; + + /* + * Insert new OPP in order of increasing frequency + * and discard if already present + */ + list_for_each_entry_rcu(opp, &dev_opp->opp_list, node) { + if (new_opp->rate <= opp->rate) + break; + + head = &opp->node; + } + + /* Duplicate OPPs ? */ + if (opp && new_opp->rate == opp->rate) { + dev_warn(dev_opp->dev, + "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n", + __func__, opp->rate, opp->u_volt, opp->available, + new_opp->rate, new_opp->u_volt, new_opp->available); + return opp->available && new_opp->u_volt == opp->u_volt ? + 0 : -EEXIST; + } + + new_opp->dev_opp = dev_opp; + list_add_rcu(&new_opp->node, head); + + return 0; +} + /** * _opp_add_dynamic() - Allocate a dynamic OPP. * @dev: device for which we do this operation @@ -581,55 +636,28 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq, long u_volt, bool dynamic) { struct device_opp *dev_opp; - struct dev_pm_opp *opp = NULL, *new_opp; - struct list_head *head; + struct dev_pm_opp *new_opp; int ret; - /* allocate new OPP node */ - new_opp = kzalloc(sizeof(*new_opp), GFP_KERNEL); - if (!new_opp) - return -ENOMEM; - /* Hold our list modification lock here */ mutex_lock(&dev_opp_list_lock); + new_opp = _allocate_opp(dev, &dev_opp); + if (!new_opp) { + ret = -ENOMEM; + goto unlock; + } + /* populate the opp table */ new_opp->rate = freq; new_opp->u_volt = u_volt; new_opp->available = true; + new_opp->dynamic = dynamic; - dev_opp = _add_device_opp(dev); - if (!dev_opp) { - ret = -ENOMEM; + ret = _opp_add(new_opp, dev_opp); + if (ret) goto free_opp; - } - - /* - * Insert new OPP in order of increasing frequency - * and discard if already present - */ - head = &dev_opp->opp_list; - list_for_each_entry_rcu(opp, &dev_opp->opp_list, node) { - if (new_opp->rate <= opp->rate) - break; - else - head = &opp->node; - } - - /* Duplicate OPPs ? */ - if (opp && new_opp->rate == opp->rate) { - ret = opp->available && new_opp->u_volt == opp->u_volt ? - 0 : -EEXIST; - - dev_warn(dev, "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n", - __func__, opp->rate, opp->u_volt, opp->available, - new_opp->rate, new_opp->u_volt, new_opp->available); - goto remove_dev_opp; - } - new_opp->dynamic = dynamic; - new_opp->dev_opp = dev_opp; - list_add_rcu(&new_opp->node, head); mutex_unlock(&dev_opp_list_lock); /* @@ -639,11 +667,10 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq, srcu_notifier_call_chain(&dev_opp->srcu_head, OPP_EVENT_ADD, new_opp); return 0; -remove_dev_opp: - _remove_device_opp(dev_opp); free_opp: + _opp_remove(dev_opp, new_opp, false); +unlock: mutex_unlock(&dev_opp_list_lock); - kfree(new_opp); return ret; } @@ -871,7 +898,7 @@ void of_free_opp_table(struct device *dev) /* Free static OPPs */ list_for_each_entry_safe(opp, tmp, &dev_opp->opp_list, node) { if (!opp->dynamic) - _opp_remove(dev_opp, opp); + _opp_remove(dev_opp, opp, true); } mutex_unlock(&dev_opp_list_lock); -- 2.4.0
next prev parent reply other threads:[~2015-06-15 11:58 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-15 11:57 [PATCH 00/10] OPP: Add code to support operating-points-v2 bindings Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-06-15 11:57 ` [PATCH 01/10] opp: Relocate few routines Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-02 1:25 ` Stephen Boyd 2015-07-02 1:25 ` Stephen Boyd 2015-07-24 17:08 ` Bartlomiej Zolnierkiewicz 2015-07-24 17:08 ` Bartlomiej Zolnierkiewicz 2015-06-15 11:57 ` [PATCH 02/10] OPP: Create _remove_device_opp() for freeing dev_opp Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-02 1:25 ` Stephen Boyd 2015-07-02 1:25 ` Stephen Boyd 2015-07-24 17:13 ` Bartlomiej Zolnierkiewicz 2015-07-24 17:13 ` Bartlomiej Zolnierkiewicz 2015-06-15 11:57 ` [PATCH 03/10] OPP: Allocate dev_opp from _add_device_opp() Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-02 1:02 ` Stephen Boyd 2015-07-02 1:02 ` Stephen Boyd 2015-07-02 6:24 ` Viresh Kumar 2015-07-02 6:24 ` Viresh Kumar 2015-07-02 23:46 ` Stephen Boyd 2015-07-02 23:46 ` Stephen Boyd 2015-07-03 6:45 ` Viresh Kumar 2015-07-03 6:45 ` Viresh Kumar 2015-07-06 22:31 ` Stephen Boyd 2015-07-06 22:31 ` Stephen Boyd 2015-07-24 17:25 ` Bartlomiej Zolnierkiewicz 2015-07-24 17:25 ` Bartlomiej Zolnierkiewicz 2015-06-15 11:57 ` Viresh Kumar [this message] 2015-06-15 11:57 ` [PATCH 04/10] OPP: Break _opp_add_dynamic() into smaller functions Viresh Kumar 2015-07-24 17:42 ` Bartlomiej Zolnierkiewicz 2015-07-24 17:42 ` Bartlomiej Zolnierkiewicz 2015-06-15 11:57 ` [PATCH 05/10] opp: Add support to parse "operating-points-v2" bindings Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-02 1:13 ` Stephen Boyd 2015-07-02 1:13 ` Stephen Boyd 2015-07-02 6:38 ` Viresh Kumar 2015-07-02 6:38 ` Viresh Kumar 2015-07-02 16:07 ` Stephen Boyd 2015-07-02 16:07 ` Stephen Boyd 2015-07-03 6:08 ` Viresh Kumar 2015-07-03 6:08 ` Viresh Kumar 2015-07-08 13:41 ` Bartlomiej Zolnierkiewicz 2015-07-08 13:41 ` Bartlomiej Zolnierkiewicz 2015-07-09 5:18 ` Viresh Kumar 2015-07-09 5:18 ` Viresh Kumar 2015-07-24 18:02 ` Bartlomiej Zolnierkiewicz 2015-07-24 18:02 ` Bartlomiej Zolnierkiewicz 2015-07-27 3:14 ` Viresh Kumar 2015-07-27 3:14 ` Viresh Kumar 2015-07-27 3:02 ` Viresh Kumar 2015-07-27 3:02 ` Viresh Kumar 2015-07-28 23:03 ` Stephen Boyd 2015-07-28 23:03 ` Stephen Boyd 2015-07-29 6:53 ` Viresh Kumar 2015-07-29 6:53 ` Viresh Kumar 2015-07-30 10:17 ` Viresh Kumar 2015-07-30 10:17 ` Viresh Kumar 2015-06-15 11:57 ` [PATCH 06/10] OPP: Add clock-latency-ns support Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-02 1:27 ` Stephen Boyd 2015-07-02 1:27 ` Stephen Boyd 2015-06-15 11:57 ` [PATCH 07/10] opp: Add OPP sharing information to OPP library Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-17 22:51 ` Stephen Boyd 2015-07-17 22:51 ` Stephen Boyd 2015-07-18 6:33 ` Viresh Kumar 2015-07-18 6:33 ` Viresh Kumar 2015-07-20 17:46 ` Stephen Boyd 2015-07-20 17:46 ` Stephen Boyd 2015-07-21 2:18 ` Viresh Kumar 2015-07-21 2:18 ` Viresh Kumar 2015-07-27 3:20 ` Viresh Kumar 2015-07-27 3:20 ` Viresh Kumar 2015-06-15 11:57 ` [PATCH 08/10] OPP: Add support for opp-suspend Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-17 19:22 ` Stephen Boyd 2015-07-17 19:22 ` Stephen Boyd 2015-07-18 6:32 ` Viresh Kumar 2015-07-18 6:32 ` Viresh Kumar 2015-06-15 11:57 ` [PATCH 09/10] opp: Add helpers for initializing CPU OPPs Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-06-15 11:57 ` [PATCH 10/10] cpufreq-dt: Add support for operating-points-v2 bindings Viresh Kumar 2015-06-15 11:57 ` Viresh Kumar 2015-07-09 16:13 ` Bartlomiej Zolnierkiewicz 2015-07-09 16:13 ` Bartlomiej Zolnierkiewicz 2015-07-09 16:44 ` Bartlomiej Zolnierkiewicz 2015-07-09 16:44 ` Bartlomiej Zolnierkiewicz 2015-07-15 2:59 ` Viresh Kumar 2015-07-15 2:59 ` Viresh Kumar 2015-06-30 16:44 ` [PATCH 00/10] OPP: Add code to support " Viresh Kumar 2015-06-30 16:44 ` Viresh Kumar 2015-07-17 2:36 ` Viresh Kumar 2015-07-17 2:36 ` Viresh Kumar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=15b69640a8672d983f2233e16e52ca275d36c816.1434369079.git.viresh.kumar@linaro.org \ --to=viresh.kumar@linaro.org \ --cc=Sudeep.Holla@arm.com \ --cc=arnd.bergmann@linaro.org \ --cc=broonie@kernel.org \ --cc=kesavan.abhilash@gmail.com \ --cc=khilman@linaro.org \ --cc=l.stach@pengutronix.de \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=mike.turquette@linaro.org \ --cc=nm@ti.com \ --cc=rjw@rjwysocki.net \ --cc=rob.herring@linaro.org \ --cc=santosh.shilimkar@oracle.com \ --cc=sboyd@codeaurora.org \ --cc=ta.omasab@gmail.com \ --cc=thomas.petazzoni@free-electrons.com \ --cc=viswanath.puttagunta@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.