From: Sibi Sankar <sibis@codeaurora.org>
To: viresh.kumar@linaro.org, sboyd@kernel.org,
georgi.djakov@linaro.org, saravanak@google.com
Cc: nm@ti.com, bjorn.andersson@linaro.org, agross@kernel.org,
david.brown@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com,
rjw@rjwysocki.net, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org, dianders@chromium.org,
mka@chromium.org, vincent.guittot@linaro.org,
amit.kucheria@linaro.org, ulf.hansson@linaro.org,
Sibi Sankar <sibis@codeaurora.org>
Subject: [RFC v3 06/10] opp: Allow multiple opp_tables to be mapped to a single device
Date: Tue, 28 Jan 2020 01:33:46 +0530 [thread overview]
Message-ID: <20200127200350.24465-7-sibis@codeaurora.org> (raw)
In-Reply-To: <20200127200350.24465-1-sibis@codeaurora.org>
Introduce _find_opp_table_indexed and its unlocked variant to allow for
multiple distinct opp_tables to be linked to a single device.
Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
---
drivers/opp/core.c | 41 +++++++++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 8 deletions(-)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index f241e83ec926a..e9d633c9e40b1 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -46,19 +46,26 @@ static struct opp_device *_find_opp_dev(const struct device *dev,
return NULL;
}
-static struct opp_table *_find_opp_table_unlocked(struct device *dev)
+static struct opp_table *_find_opp_table_indexed_unlocked(struct device *dev,
+ int index)
{
struct opp_table *opp_table;
+ struct device_node *np;
bool found;
+ np = _opp_of_get_opp_desc_node(dev->of_node, index);
+ of_node_put(np);
+
list_for_each_entry(opp_table, &opp_tables, node) {
mutex_lock(&opp_table->lock);
found = !!_find_opp_dev(dev, opp_table);
mutex_unlock(&opp_table->lock);
if (found) {
- _get_opp_table_kref(opp_table);
+ if (np && opp_table->np != np)
+ continue;
+ _get_opp_table_kref(opp_table);
return opp_table;
}
}
@@ -67,17 +74,19 @@ static struct opp_table *_find_opp_table_unlocked(struct device *dev)
}
/**
- * _find_opp_table() - find opp_table struct using device pointer
+ * _find_opp_table_indexed() - find opp_table struct using device pointer
* @dev: device pointer used to lookup OPP table
+ * @index: Index number.
*
- * Search OPP table for one containing matching device.
+ * Search OPP table for one containing matching device at the given
+ * index.
*
* Return: pointer to 'struct opp_table' if found, otherwise -ENODEV or
* -EINVAL based on type of error.
*
* The callers must call dev_pm_opp_put_opp_table() after the table is used.
*/
-struct opp_table *_find_opp_table(struct device *dev)
+struct opp_table *_find_opp_table_indexed(struct device *dev, int index)
{
struct opp_table *opp_table;
@@ -87,12 +96,28 @@ struct opp_table *_find_opp_table(struct device *dev)
}
mutex_lock(&opp_table_lock);
- opp_table = _find_opp_table_unlocked(dev);
+ opp_table = _find_opp_table_indexed_unlocked(dev, index);
mutex_unlock(&opp_table_lock);
return opp_table;
}
+/**
+ * _find_opp_table() - find opp_table struct using device pointer
+ * @dev: device pointer used to lookup OPP table
+ *
+ * Search OPP table for one containing matching device.
+ *
+ * Return: pointer to 'struct opp_table' if found, otherwise -ENODEV or
+ * -EINVAL based on type of error.
+ *
+ * The callers must call dev_pm_opp_put_opp_table() after the table is used.
+ */
+struct opp_table *_find_opp_table(struct device *dev)
+{
+ return _find_opp_table_indexed(dev, 0);
+}
+
/**
* dev_pm_opp_get_voltage() - Gets the voltage corresponding to an opp
* @opp: opp for which voltage has to be returned for
@@ -1238,7 +1263,7 @@ static struct opp_table *_opp_get_opp_table(struct device *dev, int index)
/* Hold our table modification lock here */
mutex_lock(&opp_table_lock);
- opp_table = _find_opp_table_unlocked(dev);
+ opp_table = _find_opp_table_indexed_unlocked(dev, index);
if (!IS_ERR(opp_table))
goto unlock;
@@ -2612,7 +2637,7 @@ void _dev_pm_opp_find_and_remove_table(struct device *dev)
struct opp_table *opp_table;
/* Check for existing table for 'dev' */
- opp_table = _find_opp_table(dev);
+ opp_table = _find_opp_table_indexed(dev, 0);
if (IS_ERR(opp_table)) {
int error = PTR_ERR(opp_table);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2020-01-27 20:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-27 20:03 [RFC v3 00/10] DDR/L3 Scaling support on SDM845 and SC7180 SoCs Sibi Sankar
2020-01-27 20:03 ` [RFC v3 01/10] arm64: dts: qcom: sdm845: Add SoC compatible to MTP Sibi Sankar
2020-01-28 20:40 ` Matthias Kaehlcke
2020-01-29 13:45 ` Sibi Sankar
2020-01-27 20:03 ` [RFC v3 02/10] cpufreq: blacklist SDM845 in cpufreq-dt-platdev Sibi Sankar
2020-01-28 20:44 ` Matthias Kaehlcke
2020-01-29 13:46 ` Sibi Sankar
2020-01-30 11:40 ` Sudeep Holla
2020-02-01 12:21 ` Sibi Sankar
2020-01-27 20:03 ` [RFC v3 03/10] cpufreq: blacklist SC7180 " Sibi Sankar
2020-01-28 20:45 ` Matthias Kaehlcke
2020-01-27 20:03 ` [RFC v3 04/10] OPP: Add and export helper to update voltage Sibi Sankar
2020-01-28 21:33 ` Matthias Kaehlcke
2020-01-29 13:49 ` Sibi Sankar
2020-01-27 20:03 ` [RFC v3 05/10] opp: of: export _opp_of_get_opp_desc_node Sibi Sankar
2020-01-27 20:03 ` Sibi Sankar [this message]
2020-01-27 20:03 ` [RFC v3 07/10] opp: Remove multiple attached opp tables from a device Sibi Sankar
2020-01-27 20:03 ` [RFC v3 08/10] cpufreq: qcom: Update the bandwidth levels on frequency change Sibi Sankar
2020-01-29 9:35 ` Lukasz Luba
2020-01-29 14:27 ` Sibi Sankar
2020-01-27 20:03 ` [RFC v3 09/10] arm64: dts: qcom: sdm845: Add cpu OPP tables Sibi Sankar
2020-01-29 1:24 ` Matthias Kaehlcke
2020-01-29 14:05 ` Sibi Sankar
2020-01-29 18:18 ` Matthias Kaehlcke
2020-01-27 20:03 ` [RFC v3 10/10] arm64: dts: qcom: sc7180: " Sibi Sankar
2020-01-29 2:54 ` [RFC v3 00/10] DDR/L3 Scaling support on SDM845 and SC7180 SoCs Rob Clark
2020-01-29 14:21 ` Sibi Sankar
2020-01-29 9:46 ` Lukasz Luba
2020-01-29 14:37 ` Sibi Sankar
2020-01-29 15:47 ` Lukasz Luba
2020-03-17 20:43 ` Sibi Sankar
2020-03-18 3:42 ` Viresh Kumar
2020-03-19 9:42 ` Rajendra Nayak
2020-03-19 10:11 ` Sibi Sankar
2020-03-19 10:24 ` Viresh Kumar
2020-03-19 10:53 ` Rajendra Nayak
2020-03-19 11:08 ` Viresh Kumar
2020-03-19 11:33 ` Rajendra Nayak
2020-03-20 8:01 ` Viresh Kumar
2020-03-19 10:57 ` Sibi Sankar
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=20200127200350.24465-7-sibis@codeaurora.org \
--to=sibis@codeaurora.org \
--cc=agross@kernel.org \
--cc=amit.kucheria@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=georgi.djakov@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mka@chromium.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=saravanak@google.com \
--cc=sboyd@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=vincent.guittot@linaro.org \
--cc=viresh.kumar@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).