@@ -127,7 +127,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)
if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp->available)
pr_err("%s: Invalid parameters\n", __func__);
else
- v = tmp_opp->u_volt;
+ v = tmp_opp->supplies[0].u_volt;
return v;
}
@@ -491,13 +491,14 @@ struct device_list_opp *_add_list_dev(const struct device *dev,
/**
* _add_device_opp() - Find device OPP table or allocate a new one
* @dev: device for which we do this operation
+ * @supply_count: Number of supplies available for each OPP.
*
* It tries to find an existing table first, if it couldn't find one, it
* allocates a new OPP table and returns that.
*
* Return: valid device_opp pointer if success, else NULL.
*/
-static struct device_opp *_add_device_opp(struct device *dev)
+static struct device_opp *_add_device_opp(struct device *dev, int supply_count)
{
struct device_opp *dev_opp;
struct device_list_opp *list_dev;
@@ -515,6 +516,7 @@ static struct device_opp *_add_device_opp(struct device *dev)
if (!dev_opp)
return NULL;
+ dev_opp->supply_count = supply_count;
INIT_LIST_HEAD(&dev_opp->dev_list);
list_dev = _add_list_dev(dev, dev_opp);
@@ -652,24 +654,31 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq)
}
EXPORT_SYMBOL_GPL(dev_pm_opp_remove);
-static struct dev_pm_opp *_allocate_opp(struct device *dev,
- struct device_opp **dev_opp)
+static struct dev_pm_opp *
+_allocate_opp(struct device *dev, struct device_opp **dev_opp, int supply_count)
{
struct dev_pm_opp *opp;
+ size_t size = sizeof(*opp);
+
+ /* Memory for the OPP and its supplies is allocated together */
+ size += supply_count * sizeof(*opp->supplies);
/* allocate new OPP node */
- opp = kzalloc(sizeof(*opp), GFP_KERNEL);
+ opp = kzalloc(size, GFP_KERNEL);
if (!opp)
return NULL;
INIT_LIST_HEAD(&opp->node);
- *dev_opp = _add_device_opp(dev);
+ *dev_opp = _add_device_opp(dev, supply_count);
if (!*dev_opp) {
kfree(opp);
return NULL;
}
+ /* Supplies points to the memory right after the opp */
+ opp->supplies = (struct opp_supply *)(opp + 1);
+
return opp;
}
@@ -699,10 +708,12 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
/* Duplicate OPPs */
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);
+ __func__, opp->rate, opp->supplies[0].u_volt,
+ opp->available, new_opp->rate,
+ new_opp->supplies[0].u_volt, new_opp->available);
- return opp->available && new_opp->u_volt == opp->u_volt ?
+ return opp->available &&
+ opp->supplies[0].u_volt == new_opp->supplies[0].u_volt ?
0 : -EEXIST;
}
@@ -754,7 +765,7 @@ static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,
/* Hold our list modification lock here */
mutex_lock(&dev_opp_list_lock);
- new_opp = _allocate_opp(dev, &dev_opp);
+ new_opp = _allocate_opp(dev, &dev_opp, 1);
if (!new_opp) {
ret = -ENOMEM;
goto unlock;
@@ -762,7 +773,7 @@ static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,
/* populate the opp table */
new_opp->rate = freq;
- new_opp->u_volt = u_volt;
+ new_opp->supplies[0].u_volt = u_volt;
new_opp->available = true;
new_opp->dynamic = dynamic;
@@ -789,6 +800,7 @@ static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,
/* TODO: Support multiple regulators */
static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev)
{
+ struct opp_supply *supply = &opp->supplies[0];
u32 microvolt[3] = {0};
u32 val;
int count, ret;
@@ -812,12 +824,12 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev)
return -EINVAL;
}
- opp->u_volt = microvolt[0];
- opp->u_volt_min = microvolt[1];
- opp->u_volt_max = microvolt[2];
+ supply->u_volt = microvolt[0];
+ supply->u_volt_min = microvolt[1];
+ supply->u_volt_max = microvolt[2];
if (!of_property_read_u32(opp->np, "opp-microamp", &val))
- opp->u_amp = val;
+ supply->u_amp = val;
return 0;
}
@@ -826,6 +838,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev)
* _opp_add_static_v2() - Allocate static OPPs (As per 'v2' DT bindings)
* @dev: device for which we do this operation
* @np: device node
+ * @supply_count: Number of supplies available for each OPP
*
* This function adds an opp definition to the opp list and returns status. The
* opp can be controlled using dev_pm_opp_enable/disable functions and may be
@@ -845,10 +858,12 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev)
* -ENOMEM Memory allocation failure
* -EINVAL Failed parsing the OPP node
*/
-static int _opp_add_static_v2(struct device *dev, struct device_node *np)
+static int _opp_add_static_v2(struct device *dev, struct device_node *np,
+ int supply_count)
{
struct device_opp *dev_opp;
struct dev_pm_opp *new_opp;
+ struct opp_supply *supply;
u64 rate;
u32 val;
int ret;
@@ -856,7 +871,7 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)
/* Hold our list modification lock here */
mutex_lock(&dev_opp_list_lock);
- new_opp = _allocate_opp(dev, &dev_opp);
+ new_opp = _allocate_opp(dev, &dev_opp, supply_count);
if (!new_opp) {
ret = -ENOMEM;
goto unlock;
@@ -906,9 +921,10 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)
mutex_unlock(&dev_opp_list_lock);
+ supply = &new_opp->supplies[0];
pr_debug("%s: turbo:%d rate:%lu uv:%lu uvmin:%lu uvmax:%lu latency:%lu\n",
- __func__, new_opp->turbo, new_opp->rate, new_opp->u_volt,
- new_opp->u_volt_min, new_opp->u_volt_max,
+ __func__, new_opp->turbo, new_opp->rate, supply->u_volt,
+ supply->u_volt_min, supply->u_volt_max,
new_opp->clock_latency_ns);
/*
@@ -1195,7 +1211,8 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np)
for_each_available_child_of_node(opp_np, np) {
count++;
- ret = _opp_add_static_v2(dev, np);
+ /* Todo: Add support for multiple supplies */
+ ret = _opp_add_static_v2(dev, np, 1);
if (ret) {
dev_err(dev, "%s: Failed to add OPP, %d\n", __func__,
ret);
@@ -34,6 +34,7 @@ void opp_debug_remove_one(struct dev_pm_opp *opp)
int opp_debug_create_one(struct dev_pm_opp *opp, struct device_opp *dev_opp)
{
struct dentry *pdentry = dev_opp->dentry;
+ struct opp_supply *supply = &opp->supplies[0];
struct dentry *d;
char name[15];
@@ -59,18 +60,18 @@ int opp_debug_create_one(struct dev_pm_opp *opp, struct device_opp *dev_opp)
return -ENOMEM;
if (!debugfs_create_u32("u_volt_target", S_IRUGO, d,
- (u32 *)&opp->u_volt))
+ (u32 *)&supply->u_volt))
return -ENOMEM;
if (!debugfs_create_u32("u_volt_min", S_IRUGO, d,
- (u32 *)&opp->u_volt_min))
+ (u32 *)&supply->u_volt_min))
return -ENOMEM;
if (!debugfs_create_u32("u_volt_max", S_IRUGO, d,
- (u32 *)&opp->u_volt_max))
+ (u32 *)&supply->u_volt_max))
return -ENOMEM;
- if (!debugfs_create_u32("u_amp", S_IRUGO, d, (u32 *)&opp->u_amp))
+ if (!debugfs_create_u32("u_amp", S_IRUGO, d, (u32 *)&supply->u_amp))
return -ENOMEM;
if (!debugfs_create_u32("clock_latency_ns", S_IRUGO, d,
@@ -39,6 +39,22 @@
*/
/**
+ * struct opp_supply - Per power-supply structure
+ * @u_volt: Target voltage in microvolts corresponding to this OPP
+ * @u_volt_min: Minimum voltage in microvolts corresponding to this OPP
+ * @u_volt_max: Maximum voltage in microvolts corresponding to this OPP
+ * @u_amp: Maximum current drawn by the device in microamperes
+ *
+ * This structure stores the OPP power-supply information for a given device.
+ */
+struct opp_supply {
+ unsigned long u_volt;
+ unsigned long u_volt_min;
+ unsigned long u_volt_max;
+ unsigned long u_amp;
+};
+
+/**
* struct dev_pm_opp - Generic OPP description structure
* @node: opp list node. The nodes are maintained throughout the lifetime
* of boot. It is expected only an optimal set of OPPs are
@@ -52,10 +68,7 @@
* @available: true/false - marks if this OPP as available or not
* @turbo: true if turbo (boost) OPP
* @rate: Frequency in hertz
- * @u_volt: Target voltage in microvolts corresponding to this OPP
- * @u_volt_min: Minimum voltage in microvolts corresponding to this OPP
- * @u_volt_max: Maximum voltage in microvolts corresponding to this OPP
- * @u_amp: Maximum current drawn by the device in microamperes
+ * @supplies: Array of power-supplies for the device.
* @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's
* frequency from any other OPP's frequency.
* @dev_opp: points back to the device_opp struct this opp belongs to
@@ -73,10 +86,8 @@ struct dev_pm_opp {
bool turbo;
unsigned long rate;
- unsigned long u_volt;
- unsigned long u_volt_min;
- unsigned long u_volt_max;
- unsigned long u_amp;
+ struct opp_supply *supplies;
+
unsigned long clock_latency_ns;
struct device_opp *dev_opp;
@@ -123,6 +134,7 @@ struct device_list_opp {
* @dev_list: list of devices that share these OPPs
* @opp_list: list of opps
* @np: struct device_node pointer for opp's DT node.
+ * @supply_count: Number of power-supplies
* @shared_opp: OPP is shared between multiple devices.
* @dentry: debugfs dentry pointer of the real device directory (not links).
* @dentry_name: Name of the real dentry.
@@ -145,6 +157,7 @@ struct device_opp {
struct device_node *np;
unsigned long clock_latency_ns_max;
+ unsigned int supply_count;
bool shared_opp;
struct dev_pm_opp *suspend_opp;
Support for multiple regulators will be added later, until then move all power-supply related information in a separate structure. To make allocating/freeing memory for these supply structures easy, allocate memory for them along with opp. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/base/power/opp/core.c | 57 ++++++++++++++++++++++++++-------------- drivers/base/power/opp/debugfs.c | 9 ++++--- drivers/base/power/opp/opp.h | 29 ++++++++++++++------ 3 files changed, 63 insertions(+), 32 deletions(-)