Skip to contentSkip to conversation

powercap/drivers/dtpm: Create the dtpm hierarchy

PATCH Superseded Daniel Lezcano 2 participants 10 messages Jan 19, 2022 – Jan 25, 2022

Subsystems (4)

v6 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v6 cover powercap/drivers/dtpm: Create the dtpm hierarchy

The DTPM hierarchy is the base to build on top of it a power budget allocator. It reflects the power consumption of the group of devices and allows to cap their power.

The core code is there but there is no way to describe the desired hierarchy yet.

A first proposal introduced the description through configfs [1] but was rejected [2].

A second proposal based on the device tree with a binding similar to the power domains [3] was proposed but finally rejected [4].

This sixth version delegates the hierarchy creation to the SoC with a specific and self-encapsulated code using an array to describe the tree. The SoC DTPM driver defines an array of nodes pointing to their parents. The hierarchy description can integrate a DT node and in the future a SCMI node, that means the description can mix different type of nodes.

As the DTPM tree depends on different devices which could be modules, the SoC specific description must always be compiled as a module and describe the module softdeps in order to let the userspace to handle proper loading ordering.

In addition to the hierarchy creation, the devfreq dtpm support is also integrated into this series.

This series was tested on a rock960 (revision B - rk3399 based) and a db845c (Qualcomm sdm845 based).

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/YGYg6ZeZ1181%[email protected]/
[3] https://lore.kernel.org/all/[email protected]/
[4] https://lore.kernel.org/all/[email protected]/

Changelog:
V6:
- Switched the init table to a subsystem arrays
- Checked 'setup' function is set before calling it
- Moved out of the loop the 'of_node_put'
- Explicitely add DTPM_NODE_VIRTUAL in documentation
- Moved powercap_register_control_type() into the hierarchy creation function
- Removed the sdm845 description
- Made rk3399 always as a module and added module softdeps

V5:
- Remove DT bindings
- Added description with an array
- Added simple description for rk3399 and sdm845
- Moved dtpm table to the data section

V4:
- Added missing powerzone-cells
- Changed powerzone name to comply with the pattern property

V3:
- Remove GPU section as no power is available (yet)
- Remove '#powerzone-cells' conforming to the bindings change
- Removed required property 'compatible'
- Removed powerzone-cells from the topmost node
- Removed powerzone-cells from cpus 'consumers' in example
- Set additionnal property to false

V2:
- Added pattern properties and stick to powerzone-*
- Added required property compatible and powerzone-cells
- Added additionnal property
- Added compatible
- Renamed to 'powerzones'
- Added missing powerzone-cells to the topmost node
- Fixed errors reported by 'make DT_CHECKER_FLAGS=-m dt_binding_check'
- Move description in the SoC dtsi specific file
- Fixed missing prototype warning reported by lkp@

V1: Initial post

Daniel Lezcano (5):
powercap/drivers/dtpm: Convert the init table section to a simple
array
powercap/drivers/dtpm: Add hierarchy creation powercap/drivers/dtpm: Add CPU DT initialization support powercap/drivers/dtpm: Add dtpm devfreq with energy model support rockchip/soc/drivers: Add DTPM description for rk3399

 drivers/powercap/Kconfig          |   8 ++
 drivers/powercap/Makefile         |   1 +
 drivers/powercap/dtpm.c           | 170 ++++++++++++++++++++++++-
 drivers/powercap/dtpm_cpu.c       |  41 +++++-
 drivers/powercap/dtpm_devfreq.c   | 204 ++++++++++++++++++++++++++++++
 drivers/powercap/dtpm_subsys.h    |  22 ++++
 drivers/soc/rockchip/Kconfig      |   8 ++
 drivers/soc/rockchip/Makefile     |   1 +
 drivers/soc/rockchip/dtpm.c       |  59 +++++++++
 include/asm-generic/vmlinux.lds.h |  11 --
 include/linux/dtpm.h              |  33 +++--
 11 files changed, 519 insertions(+), 39 deletions(-)
 create mode 100644 drivers/powercap/dtpm_devfreq.c
 create mode 100644 drivers/powercap/dtpm_subsys.h
 create mode 100644 drivers/soc/rockchip/dtpm.c
Signature · 1 line
2.25.1
#1 lore raw

PATCH v6 1/5 powercap/drivers/dtpm: Convert the init table section to a simple array

The init table section is freed after the system booted. However the next changes will make per module the DTPM description, so the table won't be accessible when the module is loaded.

In order to fix that, we should move the table to the data section where there are very few entries and that makes strange to add it there.

The main goal of the table was to keep self-encapsulated code and we can keep it almost as it by using an array instead.

---
 drivers/powercap/dtpm.c           |  2 ++
 drivers/powercap/dtpm_cpu.c       |  5 ++++-
 drivers/powercap/dtpm_subsys.h    | 18 ++++++++++++++++++
 include/asm-generic/vmlinux.lds.h | 11 -----------
 include/linux/dtpm.h              | 24 +++---------------------
 5 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100644 drivers/powercap/dtpm_subsys.h
drivers/powercap/dtpm.c +2 -0
index 8cb45f2d3d78..0e5c93443c70 100644
@@ -24,6 +24,8 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 
+#include "dtpm_subsys.h"
+
 #define DTPM_POWER_LIMIT_FLAG 0
 
 static const char *constraint_name[] = {
drivers/powercap/dtpm_cpu.c +4 -1
index b740866b228d..5763e0ce2af5 100644
@@ -269,4 +269,7 @@ static int __init dtpm_cpu_init(void)
 	return 0;
 }
 
-DTPM_DECLARE(dtpm_cpu, dtpm_cpu_init);
+struct dtpm_subsys_ops dtpm_cpu_ops = {
+	.name = KBUILD_MODNAME,
+	.init = dtpm_cpu_init,
+};
drivers/powercap/dtpm_subsys.h new file +18 -0
new file mode 100644
index 000000000000..2a3a2055f60e
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2022 Linaro Ltd
+ *
+ * Author: Daniel Lezcano <[email protected]>
+ */
+#ifndef ___DTPM_SUBSYS_H__
+#define ___DTPM_SUBSYS_H__
+
+extern struct dtpm_subsys_ops dtpm_cpu_ops;
+
+struct dtpm_subsys_ops *dtpm_subsys[] = {
+#ifdef CONFIG_DTPM_CPU
+	&dtpm_cpu_ops,
+#endif
+};
+
+#endif
include/asm-generic/vmlinux.lds.h +0 -11
index 42f3866bca69..2a10db2f0bc5 100644
@@ -321,16 +321,6 @@
 #define THERMAL_TABLE(name)
 #endif
 
-#ifdef CONFIG_DTPM
-#define DTPM_TABLE()							\
-	. = ALIGN(8);							\
-	__dtpm_table = .;						\
-	KEEP(*(__dtpm_table))						\
-	__dtpm_table_end = .;
-#else
-#define DTPM_TABLE()
-#endif
-
 #define KERNEL_DTB()							\
 	STRUCT_ALIGN();							\
 	__dtb_start = .;						\
@@ -723,7 +713,6 @@
 	ACPI_PROBE_TABLE(irqchip)					\
 	ACPI_PROBE_TABLE(timer)						\
 	THERMAL_TABLE(governor)						\
-	DTPM_TABLE()							\
 	EARLYCON_TABLE()						\
 	LSM_TABLE()							\
 	EARLY_LSM_TABLE()						\
include/linux/dtpm.h +3 -21
index d37e5d06a357..506048158a50 100644
@@ -32,29 +32,11 @@ struct dtpm_ops {
 	void (*release)(struct dtpm *);
 };
 
-typedef int (*dtpm_init_t)(void);
-
-struct dtpm_descr {
-	dtpm_init_t init;
+struct dtpm_subsys_ops {
+	const char *name;
+	int (*init)(void);
 };
 
-/* Init section thermal table */
-extern struct dtpm_descr __dtpm_table[];
-extern struct dtpm_descr __dtpm_table_end[];
-
-#define DTPM_TABLE_ENTRY(name, __init)				\
-	static struct dtpm_descr __dtpm_table_entry_##name	\
-	__used __section("__dtpm_table") = {			\
-		.init = __init,					\
-	}
-
-#define DTPM_DECLARE(name, init)	DTPM_TABLE_ENTRY(name, init)
-
-#define for_each_dtpm_table(__dtpm)	\
-	for (__dtpm = __dtpm_table;	\
-	     __dtpm < __dtpm_table_end;	\
-	     __dtpm++)
-
 static inline struct dtpm *to_dtpm(struct powercap_zone *zone)
 {
 	return container_of(zone, struct dtpm, zone);
Signature · 1 line
2.25.1
Reviewed-by on v6 1/5
#2 lore raw

Re: [PATCH v6 1/5] powercap/drivers/dtpm: Convert the init table section to a simple array

Quoted 9 lines · Daniel Lezcano

The init table section is freed after the system booted. However the next changes will make per module the DTPM description, so the table won't be accessible when the module is loaded.

In order to fix that, we should move the table to the data section where there are very few entries and that makes strange to add it there.

Quoted 5 lines

The main goal of the table was to keep self-encapsulated code and we can keep it almost as it by using an array instead.

Thanks for updating!

Kind regards
Uffe

Quoted 128 lines
---
 drivers/powercap/dtpm.c           |  2 ++
 drivers/powercap/dtpm_cpu.c       |  5 ++++-
 drivers/powercap/dtpm_subsys.h    | 18 ++++++++++++++++++
 include/asm-generic/vmlinux.lds.h | 11 -----------
 include/linux/dtpm.h              | 24 +++---------------------
 5 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100644 drivers/powercap/dtpm_subsys.h
drivers/powercap/dtpm.c +2 -0
index 8cb45f2d3d78..0e5c93443c70 100644
@@ -24,6 +24,8 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 
+#include "dtpm_subsys.h"
+
 #define DTPM_POWER_LIMIT_FLAG 0
 
 static const char *constraint_name[] = {
drivers/powercap/dtpm_cpu.c +4 -1
index b740866b228d..5763e0ce2af5 100644
@@ -269,4 +269,7 @@ static int __init dtpm_cpu_init(void)
        return 0;
 }
 
-DTPM_DECLARE(dtpm_cpu, dtpm_cpu_init);
+struct dtpm_subsys_ops dtpm_cpu_ops = {
+       .name = KBUILD_MODNAME,
+       .init = dtpm_cpu_init,
+};
drivers/powercap/dtpm_subsys.h new file +18 -0
new file mode 100644
index 000000000000..2a3a2055f60e
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2022 Linaro Ltd
+ *
+ * Author: Daniel Lezcano <[email protected]>
+ */
+#ifndef ___DTPM_SUBSYS_H__
+#define ___DTPM_SUBSYS_H__
+
+extern struct dtpm_subsys_ops dtpm_cpu_ops;
+
+struct dtpm_subsys_ops *dtpm_subsys[] = {
+#ifdef CONFIG_DTPM_CPU
+       &dtpm_cpu_ops,
+#endif
+};
+
+#endif
include/asm-generic/vmlinux.lds.h +0 -11
index 42f3866bca69..2a10db2f0bc5 100644
@@ -321,16 +321,6 @@
 #define THERMAL_TABLE(name)
 #endif
 
-#ifdef CONFIG_DTPM
-#define DTPM_TABLE()                                                   \
-       . = ALIGN(8);                                                   \
-       __dtpm_table = .;                                               \
-       KEEP(*(__dtpm_table))                                           \
-       __dtpm_table_end = .;
-#else
-#define DTPM_TABLE()
-#endif
-
 #define KERNEL_DTB()                                                   \
        STRUCT_ALIGN();                                                 \
        __dtb_start = .;                                                \
@@ -723,7 +713,6 @@
        ACPI_PROBE_TABLE(irqchip)                                       \
        ACPI_PROBE_TABLE(timer)                                         \
        THERMAL_TABLE(governor)                                         \
-       DTPM_TABLE()                                                    \
        EARLYCON_TABLE()                                                \
        LSM_TABLE()                                                     \
        EARLY_LSM_TABLE()                                               \
include/linux/dtpm.h +3 -22
index d37e5d06a357..506048158a50 100644
@@ -32,29 +32,11 @@ struct dtpm_ops {
        void (*release)(struct dtpm *);
 };
 
-typedef int (*dtpm_init_t)(void);
-
-struct dtpm_descr {
-       dtpm_init_t init;
+struct dtpm_subsys_ops {
+       const char *name;
+       int (*init)(void);
 };
 
-/* Init section thermal table */
-extern struct dtpm_descr __dtpm_table[];
-extern struct dtpm_descr __dtpm_table_end[];
-
-#define DTPM_TABLE_ENTRY(name, __init)                         \
-       static struct dtpm_descr __dtpm_table_entry_##name      \
-       __used __section("__dtpm_table") = {                    \
-               .init = __init,                                 \
-       }
-
-#define DTPM_DECLARE(name, init)       DTPM_TABLE_ENTRY(name, init)
-
-#define for_each_dtpm_table(__dtpm)    \
-       for (__dtpm = __dtpm_table;     \
-            __dtpm < __dtpm_table_end; \
-            __dtpm++)
-
 static inline struct dtpm *to_dtpm(struct powercap_zone *zone)
 {
        return container_of(zone, struct dtpm, zone);
--

2.25.1

#3 lore raw

PATCH v6 2/5 powercap/drivers/dtpm: Add hierarchy creation

In reply to Daniel Lezcano

The DTPM framework is available but without a way to configure it.

This change provides a way to create a hierarchy of DTPM node where the power consumption reflects the sum of the children's power consumption.

It is up to the platform to specify an array of dtpm nodes where each element has a pointer to its parent, except the top most one. The type of the node gives the indication of which initialization callback to call. At this time, we can create a virtual node, where its purpose is to be a parent in the hierarchy, and a DT node where the name describes its path.

In order to ensure a nice self-encapsulation, the DTPM subsys array contains a couple of initialization functions, one to setup the DTPM backend and one to initialize it up. With this approach, the DTPM framework has a very few material to export.

---
 drivers/powercap/Kconfig |   1 +
 drivers/powercap/dtpm.c  | 168 ++++++++++++++++++++++++++++++++++++++-
 include/linux/dtpm.h     |  15 ++++
 3 files changed, 181 insertions(+), 3 deletions(-)
drivers/powercap/Kconfig +1 -0
index 8242e8c5ed77..b1ca339957e3 100644
@@ -46,6 +46,7 @@ config IDLE_INJECT
 
 config DTPM
 	bool "Power capping for Dynamic Thermal Power Management (EXPERIMENTAL)"
+	depends on OF
 	help
 	  This enables support for the power capping for the dynamic
 	  thermal power management userspace engine.
drivers/powercap/dtpm.c +165 -3

185 lines not on this page · raw message

include/linux/dtpm.h +15 -0
index 506048158a50..f7a25c70dd4c 100644
@@ -32,9 +32,23 @@ struct dtpm_ops {
 	void (*release)(struct dtpm *);
 };
 
+struct device_node;
+
 struct dtpm_subsys_ops {
 	const char *name;
 	int (*init)(void);
+	int (*setup)(struct dtpm *, struct device_node *);
+};
+
+enum DTPM_NODE_TYPE {
+	DTPM_NODE_VIRTUAL = 0,
+	DTPM_NODE_DT,
+};
+
+struct dtpm_node {
+	enum DTPM_NODE_TYPE type;
+	const char *name;
+	struct dtpm_node *parent;
 };
 
 static inline struct dtpm *to_dtpm(struct powercap_zone *zone)
@@ -52,4 +66,5 @@ void dtpm_unregister(struct dtpm *dtpm);
 
 int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent);
 
+int dtpm_create_hierarchy(struct of_device_id *dtpm_match_table);
 #endif
Signature · 1 line
2.25.1
#4 lore raw

Re: [PATCH v6 2/5] powercap/drivers/dtpm: Add hierarchy creation

Quoted 121 lines · Daniel Lezcano

The DTPM framework is available but without a way to configure it.

This change provides a way to create a hierarchy of DTPM node where the power consumption reflects the sum of the children's power consumption.

It is up to the platform to specify an array of dtpm nodes where each element has a pointer to its parent, except the top most one. The type of the node gives the indication of which initialization callback to call. At this time, we can create a virtual node, where its purpose is to be a parent in the hierarchy, and a DT node where the name describes its path.

In order to ensure a nice self-encapsulation, the DTPM subsys array contains a couple of initialization functions, one to setup the DTPM backend and one to initialize it up. With this approach, the DTPM framework has a very few material to export.

---
 drivers/powercap/Kconfig |   1 +
 drivers/powercap/dtpm.c  | 168 ++++++++++++++++++++++++++++++++++++++-
 include/linux/dtpm.h     |  15 ++++
 3 files changed, 181 insertions(+), 3 deletions(-)
drivers/powercap/Kconfig +1 -0
index 8242e8c5ed77..b1ca339957e3 100644
@@ -46,6 +46,7 @@ config IDLE_INJECT
 
 config DTPM
        bool "Power capping for Dynamic Thermal Power Management (EXPERIMENTAL)"
+       depends on OF
        help
          This enables support for the power capping for the dynamic
          thermal power management userspace engine.
drivers/powercap/dtpm.c +66 -1
index 0e5c93443c70..10032f7132c4 100644
@@ -23,6 +23,7 @@
 #include <linux/powercap.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 
 #include "dtpm_subsys.h"
 
@@ -463,14 +464,175 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent)
        return 0;
 }
 
-static int __init init_dtpm(void)
+static struct dtpm *dtpm_setup_virtual(const struct dtpm_node *hierarchy,
+                                      struct dtpm *parent)
 {
+       struct dtpm *dtpm;
+       int ret;
+
+       dtpm = kzalloc(sizeof(*dtpm), GFP_KERNEL);
+       if (!dtpm)
+               return ERR_PTR(-ENOMEM);
+       dtpm_init(dtpm, NULL);
+
+       ret = dtpm_register(hierarchy->name, dtpm, parent);
+       if (ret) {
+               pr_err("Failed to register dtpm node '%s': %d\n",
+                      hierarchy->name, ret);
+               kfree(dtpm);
+               return ERR_PTR(ret);
+       }
+
+       return dtpm;
+}
+
+static struct dtpm *dtpm_setup_dt(const struct dtpm_node *hierarchy,
+                                 struct dtpm *parent)
+{
+       struct device_node *np;
+       int i, ret;
+
+       np = of_find_node_by_path(hierarchy->name);
+       if (!np) {
+               pr_err("Failed to find '%s'\n", hierarchy->name);
+               return ERR_PTR(-ENXIO);
+       }
+
+       for (i = 0; i < ARRAY_SIZE(dtpm_subsys); i++) {
+
+               if (!dtpm_subsys[i]->setup)
+                       continue;
+
+               ret = dtpm_subsys[i]->setup(parent, np);
+               if (ret) {
+                       pr_err("Failed to setup '%s': %d\n", dtpm_subsys[i]->name, ret);
+                       of_node_put(np);
+                       return ERR_PTR(ret);
+               }
+       }
+
+       of_node_put(np);
+
+       /*
+        * By returning a NULL pointer, we let know the caller there
+        * is no child for us as we are a leaf of the tree
+        */
+       return NULL;
+}
+
+typedef struct dtpm * (*dtpm_node_callback_t)(const struct dtpm_node *, struct dtpm *);
+
+dtpm_node_callback_t dtpm_node_callback[] = {
+       [DTPM_NODE_VIRTUAL] = dtpm_setup_virtual,
+       [DTPM_NODE_DT] = dtpm_setup_dt,
+};
+
+static int dtpm_for_each_child(const struct dtpm_node *hierarchy,
+                              const struct dtpm_node *it, struct dtpm *parent)
+{

drivers/powercap/dtpm.c int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) · line 542

Quoted 10 lines
drivers/powercap/dtpm.c +10 -0
+       struct dtpm *dtpm;
+       int i, ret;
+
+       for (i = 0; hierarchy[i].name; i++) {
+
+               if (hierarchy[i].parent != it)
+                       continue;
+
+               dtpm = dtpm_node_callback[hierarchy[i].type](&hierarchy[i], parent);
+               if (!dtpm || IS_ERR(dtpm))

This can be tested with the "IS_ERR_OR_NULL()" macro.

drivers/powercap/dtpm.c int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) · line 543

Quoted 1 line
drivers/powercap/dtpm.c +1 -0
+                       continue;

We have discussed the error path previously. Just ignoring errors here and continuing with the initialization, isn't normally how we design good kernel code.

However, you have also explained that the error path is special and somewhat non-trivial to manage in this case. I get that now and thanks for clarifying.

Nevertheless, I think it deserves to be explained a bit with a comment in the code of what goes on here. Otherwise another developer that looks at this code in the future, may think it looks suspicious too.

drivers/powercap/dtpm.c int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) · line 551

Quoted 8 lines
drivers/powercap/dtpm.c +8 -0
+
+               ret = dtpm_for_each_child(hierarchy, &hierarchy[i], dtpm);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}

[...]

Other than the above, this looks good to me!

Kind regards
Uffe

#5 lore raw

Re: [PATCH v6 2/5] powercap/drivers/dtpm: Add hierarchy creation

Quoted 160 lines · Ulf Hansson
Quoted 121 lines · Daniel Lezcano

The DTPM framework is available but without a way to configure it.

This change provides a way to create a hierarchy of DTPM node where the power consumption reflects the sum of the children's power consumption.

It is up to the platform to specify an array of dtpm nodes where each element has a pointer to its parent, except the top most one. The type of the node gives the indication of which initialization callback to call. At this time, we can create a virtual node, where its purpose is to be a parent in the hierarchy, and a DT node where the name describes its path.

In order to ensure a nice self-encapsulation, the DTPM subsys array contains a couple of initialization functions, one to setup the DTPM backend and one to initialize it up. With this approach, the DTPM framework has a very few material to export.

---
 drivers/powercap/Kconfig |   1 +
 drivers/powercap/dtpm.c  | 168 ++++++++++++++++++++++++++++++++++++++-
 include/linux/dtpm.h     |  15 ++++
 3 files changed, 181 insertions(+), 3 deletions(-)
drivers/powercap/Kconfig +1 -0
index 8242e8c5ed77..b1ca339957e3 100644
@@ -46,6 +46,7 @@ config IDLE_INJECT
 
 config DTPM
        bool "Power capping for Dynamic Thermal Power Management (EXPERIMENTAL)"
+       depends on OF
        help
          This enables support for the power capping for the dynamic
          thermal power management userspace engine.
drivers/powercap/dtpm.c +66 -1
index 0e5c93443c70..10032f7132c4 100644
@@ -23,6 +23,7 @@
 #include <linux/powercap.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 
 #include "dtpm_subsys.h"
 
@@ -463,14 +464,175 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent)
        return 0;
 }
 
-static int __init init_dtpm(void)
+static struct dtpm *dtpm_setup_virtual(const struct dtpm_node *hierarchy,
+                                      struct dtpm *parent)
 {
+       struct dtpm *dtpm;
+       int ret;
+
+       dtpm = kzalloc(sizeof(*dtpm), GFP_KERNEL);
+       if (!dtpm)
+               return ERR_PTR(-ENOMEM);
+       dtpm_init(dtpm, NULL);
+
+       ret = dtpm_register(hierarchy->name, dtpm, parent);
+       if (ret) {
+               pr_err("Failed to register dtpm node '%s': %d\n",
+                      hierarchy->name, ret);
+               kfree(dtpm);
+               return ERR_PTR(ret);
+       }
+
+       return dtpm;
+}
+
+static struct dtpm *dtpm_setup_dt(const struct dtpm_node *hierarchy,
+                                 struct dtpm *parent)
+{
+       struct device_node *np;
+       int i, ret;
+
+       np = of_find_node_by_path(hierarchy->name);
+       if (!np) {
+               pr_err("Failed to find '%s'\n", hierarchy->name);
+               return ERR_PTR(-ENXIO);
+       }
+
+       for (i = 0; i < ARRAY_SIZE(dtpm_subsys); i++) {
+
+               if (!dtpm_subsys[i]->setup)
+                       continue;
+
+               ret = dtpm_subsys[i]->setup(parent, np);
+               if (ret) {
+                       pr_err("Failed to setup '%s': %d\n", dtpm_subsys[i]->name, ret);
+                       of_node_put(np);
+                       return ERR_PTR(ret);
+               }
+       }
+
+       of_node_put(np);
+
+       /*
+        * By returning a NULL pointer, we let know the caller there
+        * is no child for us as we are a leaf of the tree
+        */
+       return NULL;
+}
+
+typedef struct dtpm * (*dtpm_node_callback_t)(const struct dtpm_node *, struct dtpm *);
+
+dtpm_node_callback_t dtpm_node_callback[] = {
+       [DTPM_NODE_VIRTUAL] = dtpm_setup_virtual,
+       [DTPM_NODE_DT] = dtpm_setup_dt,
+};
+
+static int dtpm_for_each_child(const struct dtpm_node *hierarchy,
+                              const struct dtpm_node *it, struct dtpm *parent)
+{

drivers/powercap/dtpm.c int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) · line 542

Quoted 10 lines
drivers/powercap/dtpm.c +10 -0
+       struct dtpm *dtpm;
+       int i, ret;
+
+       for (i = 0; hierarchy[i].name; i++) {
+
+               if (hierarchy[i].parent != it)
+                       continue;
+
+               dtpm = dtpm_node_callback[hierarchy[i].type](&hierarchy[i], parent);
+               if (!dtpm || IS_ERR(dtpm))

This can be tested with the "IS_ERR_OR_NULL()" macro.

drivers/powercap/dtpm.c int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) · line 543

Quoted 1 line
drivers/powercap/dtpm.c +1 -0
+                       continue;

We have discussed the error path previously. Just ignoring errors here and continuing with the initialization, isn't normally how we design good kernel code.

However, you have also explained that the error path is special and somewhat non-trivial to manage in this case. I get that now and thanks for clarifying.

Nevertheless, I think it deserves to be explained a bit with a comment in the code of what goes on here. Otherwise another developer that looks at this code in the future, may think it looks suspicious too.

Quoted 8 lines
drivers/powercap/dtpm.c +8 -0
+
+               ret = dtpm_for_each_child(hierarchy, &hierarchy[i], dtpm);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}

[...]

Quoted 1 line

Other than the above, this looks good to me!

With the above fixed, shall I add your reviewed-by ?

Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
#6 lore raw

Re: [PATCH v6 2/5] powercap/drivers/dtpm: Add hierarchy creation

Quoted 162 lines · Daniel Lezcano
Quoted 160 lines · Ulf Hansson
Quoted 121 lines · Daniel Lezcano

The DTPM framework is available but without a way to configure it.

This change provides a way to create a hierarchy of DTPM node where the power consumption reflects the sum of the children's power consumption.

It is up to the platform to specify an array of dtpm nodes where each element has a pointer to its parent, except the top most one. The type of the node gives the indication of which initialization callback to call. At this time, we can create a virtual node, where its purpose is to be a parent in the hierarchy, and a DT node where the name describes its path.

In order to ensure a nice self-encapsulation, the DTPM subsys array contains a couple of initialization functions, one to setup the DTPM backend and one to initialize it up. With this approach, the DTPM framework has a very few material to export.

---
 drivers/powercap/Kconfig |   1 +
 drivers/powercap/dtpm.c  | 168 ++++++++++++++++++++++++++++++++++++++-
 include/linux/dtpm.h     |  15 ++++
 3 files changed, 181 insertions(+), 3 deletions(-)
drivers/powercap/Kconfig +1 -0
index 8242e8c5ed77..b1ca339957e3 100644
@@ -46,6 +46,7 @@ config IDLE_INJECT
 
 config DTPM
        bool "Power capping for Dynamic Thermal Power Management (EXPERIMENTAL)"
+       depends on OF
        help
          This enables support for the power capping for the dynamic
          thermal power management userspace engine.
drivers/powercap/dtpm.c +66 -1
index 0e5c93443c70..10032f7132c4 100644
@@ -23,6 +23,7 @@
 #include <linux/powercap.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 
 #include "dtpm_subsys.h"
 
@@ -463,14 +464,175 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent)
        return 0;
 }
 
-static int __init init_dtpm(void)
+static struct dtpm *dtpm_setup_virtual(const struct dtpm_node *hierarchy,
+                                      struct dtpm *parent)
 {
+       struct dtpm *dtpm;
+       int ret;
+
+       dtpm = kzalloc(sizeof(*dtpm), GFP_KERNEL);
+       if (!dtpm)
+               return ERR_PTR(-ENOMEM);
+       dtpm_init(dtpm, NULL);
+
+       ret = dtpm_register(hierarchy->name, dtpm, parent);
+       if (ret) {
+               pr_err("Failed to register dtpm node '%s': %d\n",
+                      hierarchy->name, ret);
+               kfree(dtpm);
+               return ERR_PTR(ret);
+       }
+
+       return dtpm;
+}
+
+static struct dtpm *dtpm_setup_dt(const struct dtpm_node *hierarchy,
+                                 struct dtpm *parent)
+{
+       struct device_node *np;
+       int i, ret;
+
+       np = of_find_node_by_path(hierarchy->name);
+       if (!np) {
+               pr_err("Failed to find '%s'\n", hierarchy->name);
+               return ERR_PTR(-ENXIO);
+       }
+
+       for (i = 0; i < ARRAY_SIZE(dtpm_subsys); i++) {
+
+               if (!dtpm_subsys[i]->setup)
+                       continue;
+
+               ret = dtpm_subsys[i]->setup(parent, np);
+               if (ret) {
+                       pr_err("Failed to setup '%s': %d\n", dtpm_subsys[i]->name, ret);
+                       of_node_put(np);
+                       return ERR_PTR(ret);
+               }
+       }
+
+       of_node_put(np);
+
+       /*
+        * By returning a NULL pointer, we let know the caller there
+        * is no child for us as we are a leaf of the tree
+        */
+       return NULL;
+}
+
+typedef struct dtpm * (*dtpm_node_callback_t)(const struct dtpm_node *, struct dtpm *);
+
+dtpm_node_callback_t dtpm_node_callback[] = {
+       [DTPM_NODE_VIRTUAL] = dtpm_setup_virtual,
+       [DTPM_NODE_DT] = dtpm_setup_dt,
+};
+
+static int dtpm_for_each_child(const struct dtpm_node *hierarchy,
+                              const struct dtpm_node *it, struct dtpm *parent)
+{

drivers/powercap/dtpm.c int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) · line 542

Quoted 10 lines
drivers/powercap/dtpm.c +10 -0
+       struct dtpm *dtpm;
+       int i, ret;
+
+       for (i = 0; hierarchy[i].name; i++) {
+
+               if (hierarchy[i].parent != it)
+                       continue;
+
+               dtpm = dtpm_node_callback[hierarchy[i].type](&hierarchy[i], parent);
+               if (!dtpm || IS_ERR(dtpm))

This can be tested with the "IS_ERR_OR_NULL()" macro.

drivers/powercap/dtpm.c int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) · line 543

Quoted 1 line
drivers/powercap/dtpm.c +1 -0
+                       continue;

We have discussed the error path previously. Just ignoring errors here and continuing with the initialization, isn't normally how we design good kernel code.

However, you have also explained that the error path is special and somewhat non-trivial to manage in this case. I get that now and thanks for clarifying.

Nevertheless, I think it deserves to be explained a bit with a comment in the code of what goes on here. Otherwise another developer that looks at this code in the future, may think it looks suspicious too.

Quoted 8 lines
drivers/powercap/dtpm.c +8 -0
+
+               ret = dtpm_for_each_child(hierarchy, &hierarchy[i], dtpm);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}

[...]

Quoted 3 lines
Quoted 1 line

Other than the above, this looks good to me!

With the above fixed, shall I add your reviewed-by ?

Sure, that's fine!

Kind regards
Uffe

#7 lore raw

PATCH v6 3/5 powercap/drivers/dtpm: Add CPU DT initialization support

In reply to Daniel Lezcano

Based on the previous DT changes in the core code, use the 'setup' callback to initialize the CPU DTPM backend.

Code is reorganized to stick to the DTPM table description. No functional changes.

---
 drivers/powercap/dtpm_cpu.c | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)
drivers/powercap/dtpm_cpu.c +30 -6
index 5763e0ce2af5..eed5ad688d46 100644
@@ -21,6 +21,7 @@
 #include <linux/cpuhotplug.h>
 #include <linux/dtpm.h>
 #include <linux/energy_model.h>
+#include <linux/of.h>
 #include <linux/pm_qos.h>
 #include <linux/slab.h>
 #include <linux/units.h>
@@ -176,6 +177,17 @@ static int cpuhp_dtpm_cpu_offline(unsigned int cpu)
 }
 
 static int cpuhp_dtpm_cpu_online(unsigned int cpu)
+{
+	struct dtpm_cpu *dtpm_cpu;
+
+	dtpm_cpu = per_cpu(dtpm_per_cpu, cpu);
+	if (dtpm_cpu)
+		return dtpm_update_power(&dtpm_cpu->dtpm);
+
+	return 0;
+}
+
+static int __dtpm_cpu_setup(int cpu, struct dtpm *parent)
 {
 	struct dtpm_cpu *dtpm_cpu;
 	struct cpufreq_policy *policy;
@@ -183,6 +195,10 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu)
 	char name[CPUFREQ_NAME_LEN];
 	int ret = -ENOMEM;
 
+	dtpm_cpu = per_cpu(dtpm_per_cpu, cpu);
+	if (dtpm_cpu)
+		return 0;
+
 	policy = cpufreq_cpu_get(cpu);
 	if (!policy)
 		return 0;
@@ -191,10 +207,6 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu)
 	if (!pd)
 		return -EINVAL;
 
-	dtpm_cpu = per_cpu(dtpm_per_cpu, cpu);
-	if (dtpm_cpu)
-		return dtpm_update_power(&dtpm_cpu->dtpm);
-
 	dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL);
 	if (!dtpm_cpu)
 		return -ENOMEM;
@@ -207,7 +219,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_cpu->dtpm, NULL);
+	ret = dtpm_register(name, &dtpm_cpu->dtpm, parent);
 	if (ret)
 		goto out_kfree_dtpm_cpu;
 
@@ -231,7 +243,18 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu)
 	return ret;
 }
 
-static int __init dtpm_cpu_init(void)
+static int dtpm_cpu_setup(struct dtpm *dtpm, struct device_node *np)
+{
+	int cpu;
+
+	cpu = of_cpu_node_to_id(np);
+	if (cpu < 0)
+		return 0;
+
+	return __dtpm_cpu_setup(cpu, dtpm);
+}
+
+static int dtpm_cpu_init(void)
 {
 	int ret;
 
@@ -272,4 +295,5 @@ static int __init dtpm_cpu_init(void)
 struct dtpm_subsys_ops dtpm_cpu_ops = {
 	.name = KBUILD_MODNAME,
 	.init = dtpm_cpu_init,
+	.setup = dtpm_cpu_setup,
 };
Signature · 1 line
2.25.1
#8 lore raw

PATCH v6 4/5 powercap/drivers/dtpm: Add dtpm devfreq with energy model support

In reply to Daniel Lezcano

Currently the dtpm supports the CPUs via cpufreq and the energy model. This change provides the same for the device which supports devfreq.

Each device supporting devfreq and having an energy model can be added to the hierarchy.

The concept is the same as the cpufreq DTPM support: the QoS is used to aggregate the requests and the energy model gives the value of the instantaneous power consumption ponderated by the load of the device.

Cc Chanwoo Choi <[email protected]>
Cc Lukasz Luba <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc MyungJoo Ham <[email protected]>
---
 drivers/powercap/Kconfig        |   7 ++
 drivers/powercap/Makefile       |   1 +
 drivers/powercap/dtpm_devfreq.c | 204 ++++++++++++++++++++++++++++++++
 drivers/powercap/dtpm_subsys.h  |   4 +
 4 files changed, 216 insertions(+)
 create mode 100644 drivers/powercap/dtpm_devfreq.c
drivers/powercap/Kconfig +7 -0
index b1ca339957e3..515e3ceb3393 100644
@@ -57,4 +57,11 @@ config DTPM_CPU
 	help
 	  This enables support for CPU power limitation based on
 	  energy model.
+
+config DTPM_DEVFREQ
+	bool "Add device power capping based on the energy model"
+	depends on DTPM && ENERGY_MODEL
+	help
+	  This enables support for device power limitation based on
+	  energy model.
 endif
drivers/powercap/Makefile +1 -0
index fabcf388a8d3..494617cdad88 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_DTPM) += dtpm.o
 obj-$(CONFIG_DTPM_CPU) += dtpm_cpu.o
+obj-$(CONFIG_DTPM_DEVFREQ) += dtpm_devfreq.o
 obj-$(CONFIG_POWERCAP)	+= powercap_sys.o
 obj-$(CONFIG_INTEL_RAPL_CORE) += intel_rapl_common.o
 obj-$(CONFIG_INTEL_RAPL) += intel_rapl_msr.o
drivers/powercap/dtpm_devfreq.c new file +204 -0

204 lines not on this page · raw message

drivers/powercap/dtpm_subsys.h +4 -0
index 2a3a2055f60e..db1712938a96 100644
@@ -8,11 +8,15 @@
 #define ___DTPM_SUBSYS_H__
 
 extern struct dtpm_subsys_ops dtpm_cpu_ops;
+extern struct dtpm_subsys_ops dtpm_devfreq_ops;
 
 struct dtpm_subsys_ops *dtpm_subsys[] = {
 #ifdef CONFIG_DTPM_CPU
 	&dtpm_cpu_ops,
 #endif
+#ifdef CONFIG_DTPM_DEVFREQ
+	&dtpm_devfreq_ops,
+#endif
 };
 
 #endif
Signature · 1 line
2.25.1
#9 lore raw

PATCH v6 5/5 rockchip/soc/drivers: Add DTPM description for rk3399

In reply to Daniel Lezcano

The DTPM framework does support now the hierarchy description.

The platform specific code can call the hierarchy creation function with an array of struct dtpm_node pointing to their parent.

This patch provides a description of the big / Little CPUs and the GPU and tie them together under a virtual 'package' name. Only rk3399 is described now.

The description could be extended in the future with the memory controller with devfreq.

The description is always a module and it describes the soft dependencies. The userspace has to load the softdeps module in the right order.

---
 drivers/soc/rockchip/Kconfig  |  8 +++++
 drivers/soc/rockchip/Makefile |  1 +
 drivers/soc/rockchip/dtpm.c   | 59 +++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 drivers/soc/rockchip/dtpm.c
drivers/soc/rockchip/Kconfig +8 -0
index 25eb2c1e31bb..6dc017f02431 100644
@@ -34,4 +34,12 @@ config ROCKCHIP_PM_DOMAINS
 
           If unsure, say N.
 
+config ROCKCHIP_DTPM
+	tristate "Rockchip DTPM hierarchy"
+	depends on DTPM && DRM_PANFROST && m
+	help
+	 Describe the hierarchy for the Dynamic Thermal Power
+	 Management tree on this platform. That will create all the
+	 power capping capable devices.
+
 endif
drivers/soc/rockchip/Makefile +1 -0
index 875032f7344e..05f31a4e743c 100644
@@ -5,3 +5,4 @@
 obj-$(CONFIG_ROCKCHIP_GRF) += grf.o
 obj-$(CONFIG_ROCKCHIP_IODOMAIN) += io-domain.o
 obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm_domains.o
+obj-$(CONFIG_ROCKCHIP_DTPM) += dtpm.o
drivers/soc/rockchip/dtpm.c new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
2.25.1