A SoC can be differently structured depending on the platform and the
kernel can not be aware of all the combinations, as well as the
specific tweaks for a particular board.
The creation of the hierarchy must be delegated to userspace.
These changes provide a registering mechanism where the different
subsystems will initialize their dtpm backends and register with a
name the dtpm node in a list.
The next changes will provide an userspace interface to create
hierarchically the different nodes. Those will be created by name and
found via the list filled by the different subsystem.
If a specified name is not found in the list, it is assumed to be a
virtual node which will have children and the default is to allocate
such node.
Cc: Greg KH <gre...@linuxfoundation.org>
Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org>
Reviewed-by: Lukasz Luba <lukasz.l...@arm.com>
---
V6:
- Added the EXPORT_SYMBOL_GPL
V5:
- Decrease log level from 'info' to 'debug'
- Remove the refcount, it is pointless, lifetime cycle is already
handled by the device refcounting. The dtpm node allocator is in
charge of freeing it.
- Rename the functions to 'dtpm_add, dtpm_del, dtpm_lookup'
- Fix missing kfrees when deleting the node from the list
V4:
- Fixed typo in the commit log
V2:
- Fixed error code path by dropping lock
---
drivers/powercap/dtpm.c | 124 ++++++++++++++++++++++++++++++++++--
drivers/powercap/dtpm_cpu.c | 8 +--
include/linux/dtpm.h | 6 ++
3 files changed, 130 insertions(+), 8 deletions(-)
diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c
index 58433b8ef9a1..a707cc2965a1 100644
--- a/drivers/powercap/dtpm.c
+++ b/drivers/powercap/dtpm.c
@@ -34,6 +34,14 @@ static DEFINE_MUTEX(dtpm_lock);
static struct powercap_control_type *pct;
static struct dtpm *root;
+struct dtpm_node {
+ const char *name;
+ struct dtpm *dtpm;
+ struct list_head node;
+};
+
+static LIST_HEAD(dtpm_list);
+
static int get_time_window_us(struct powercap_zone *pcz, int cid, u64 *window)
{
return -ENOSYS;
@@ -152,6 +160,116 @@ static int __dtpm_update_power(struct dtpm *dtpm)
return ret;
}
+static struct dtpm *__dtpm_lookup(const char *name)
+{
+ struct dtpm_node *node;
+
+ list_for_each_entry(node, &dtpm_list, node) {
+ if (!strcmp(name, node->name))
+ return node->dtpm;
+ }
+
+ return NULL;
+}
+
+/**
+ * dtpm_lookup - Lookup for a registered dtpm node given its name
+ * @name: the name of the dtpm device
+ *
+ * The function looks up in the list of the registered dtpm
+ * devices. This function must be called to create a dtpm node in the
+ * powercap hierarchy.
+ *
+ * Return: a pointer to a dtpm structure, NULL if not found.
+ */
+struct dtpm *dtpm_lookup(const char *name)
+{
+ struct dtpm *dtpm;
+
+ mutex_lock(&dtpm_lock);
+ dtpm = __dtpm_lookup(name);
+ mutex_unlock(&dtpm_lock);
+
+ return dtpm;
+}
+EXPORT_SYMBOL_GPL(dtpm_lookup);
+
+/**
+ * dtpm_add - Add the dtpm in the dtpm list
+ * @name: a name used as an identifier
+ * @dtpm: the dtpm node to be registered
+ *
+ * Stores the dtpm device in a list. The list contains all the devices
+ * which are power capable in terms of limitation and power
+ * consumption measurements. Even if conceptually, a power capable
+ * device won't register itself twice, the function will check if it
+ * was already registered in order to prevent a misuse of the API.
+ *
+ * Return: 0 on success, -EEXIST if the device name is already present
+ * in the list, -ENOMEM in case of memory allocation failure.
+ */
+int dtpm_add(const char *name, struct dtpm *dtpm)
+{
+ struct dtpm_node *node;
+ int ret;
+
+ mutex_lock(&dtpm_lock);
+
+ ret = -EEXIST;
+ if (__dtpm_lookup(name))
+ goto out_unlock;
+
+ ret = -ENOMEM;
+ node = kzalloc(sizeof(*node), GFP_KERNEL);
+ if (!node)
+ goto out_unlock;
+
+ node->name = kstrdup(name, GFP_KERNEL);
+ if (!node->name) {
+ kfree(node);
+ goto out_unlock;
+ }
+
+ node->dtpm = dtpm;
+
+ list_add(&node->node, &dtpm_list);
+
+ ret = 0;
+out_unlock:
+ mutex_unlock(&dtpm_lock);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(dtpm_add);
+
+/**
+ * dtpm_del - Remove the dtpm device from the list
+ * @name: the dtpm device name to be removed
+ *
+ * Remove the dtpm device from the list of the registered devices.
+ */
+void dtpm_del(const char *name)
+{
+ struct dtpm_node *node;
+
+ mutex_lock(&dtpm_lock);
+
+ list_for_each_entry(node, &dtpm_list, node) {
+
+ if (strcmp(name, node->name))
+ continue;
+
+ list_del(&node->node);
+ kfree(node->name);
+ kfree(node);
+
+ break;
+ }
+
+ mutex_unlock(&dtpm_lock);
+}
+EXPORT_SYMBOL_GPL(dtpm_del);
+
/**
* dtpm_update_power - Update the power on the dtpm
* @dtpm: a pointer to a dtpm structure to update
@@ -208,8 +326,6 @@ int dtpm_release_zone(struct powercap_zone *pcz)
if (root == dtpm)
root = NULL;
- kfree(dtpm);
-
return 0;
}
@@ -388,7 +504,7 @@ void dtpm_unregister(struct dtpm *dtpm)
{
powercap_unregister_zone(pct, &dtpm->zone);
- pr_info("Unregistered dtpm node '%s'\n", dtpm->zone.name);
+ pr_debug("Unregistered dtpm node '%s'\n", dtpm->zone.name);
}
/**
@@ -457,7 +573,7 @@ int dtpm_register(const char *name, struct dtpm *dtpm,
struct dtpm *parent)
if (dtpm->ops && !dtpm->ops->update_power_uw(dtpm))
__dtpm_add_power(dtpm);
- pr_info("Registered dtpm node '%s' / %llu-%llu uW, \n",
+ pr_debug("Created dtpm node '%s' / %llu-%llu uW, \n",
dtpm->zone.name, dtpm->power_min, dtpm->power_max);
mutex_unlock(&dtpm_lock);
diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c
index f6076de39540..9deafd16a197 100644
--- a/drivers/powercap/dtpm_cpu.c
+++ b/drivers/powercap/dtpm_cpu.c
@@ -177,7 +177,7 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu)
snprintf(name, sizeof(name), "cpu%d-cpufreq", dtpm_cpu->cpu);
- ret = dtpm_register(name, dtpm, NULL);
+ ret = dtpm_add(name, dtpm);
if (ret)
goto out_kfree_dtpm_cpu;
@@ -185,12 +185,12 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu)
&dtpm_cpu->qos_req, FREQ_QOS_MAX,
pd->table[pd->nr_perf_states - 1].frequency);
if (ret)
- goto out_dtpm_unregister;
+ goto out_dtpm_del;
return 0;
-out_dtpm_unregister:
- dtpm_unregister(dtpm);
+out_dtpm_del:
+ dtpm_del(name);
dtpm_cpu = NULL;
dtpm = NULL;
diff --git a/include/linux/dtpm.h b/include/linux/dtpm.h
index acf8d3638988..577c71d4e098 100644
--- a/include/linux/dtpm.h
+++ b/include/linux/dtpm.h
@@ -75,4 +75,10 @@ int dtpm_register(const char *name, struct dtpm *dtpm,
struct dtpm *parent);
int dtpm_register_cpu(struct dtpm *parent);
+struct dtpm *dtpm_lookup(const char *name);
+
+int dtpm_add(const char *name, struct dtpm *dtpm);
+
+void dtpm_del(const char *name);
+
#endif
--
2.17.1
