devfreq: Register devfreq as a cooling device on demand
Subsystems (8)
DRM drivers DRM misc Arm Qualcomm mailing list DRM driver for Qualcomm display hardware +4 more subsystems
PATCH v2 1/4 devfreq: Register devfreq as a cooling device on demand
Currently the default behavior is to manually having the devfreq backend to register themselves as a devfreq cooling device.
Instead of adding the code in the drivers for the thermal cooling device registering, let's provide a flag in the devfreq's profile to tell the common devfreq code to register the newly created devfreq as a cooling device.
Suggested-by Chanwoo Choi <[email protected]>
Signed-off-by Daniel Lezcano <[email protected]>
--- drivers/devfreq/devfreq.c | 11 +++++++++++ include/linux/devfreq.h | 7 +++++++ 2 files changed, 18 insertions(+)
drivers/devfreq/devfreq.c +11 -0
@@ -11,6 +11,7 @@#include <linux/kmod.h> #include <linux/sched.h> #include <linux/debugfs.h> +#include <linux/devfreq_cooling.h> #include <linux/errno.h> #include <linux/err.h> #include <linux/init.h>
@@ -26,6 +27,7 @@#include <linux/hrtimer.h> #include <linux/of.h> #include <linux/pm_qos.h> +#include <linux/thermal.h> #include <linux/units.h> #include "governor.h"
@@ -935,6 +937,13 @@ struct devfreq *devfreq_add_device(struct device *dev,mutex_unlock (&devfreq_list_lock); +if (devfreq->profile->is_cooling_device) { + devfreq->cdev =devfreq_cooling_em_register (devfreq,NULL ); +if (IS_ERR (devfreq->cdev)) +dev_info (dev,"Failed to register devfreq " +"cooling device\n" ); + } +return devfreq; err_init:
@@ -960,6 +969,8 @@ int devfreq_remove_device(struct devfreq *devfreq)if (!devfreq)return -EINVAL ; +thermal_cooling_device_unregister (devfreq->cdev); +if (devfreq->governor) { devfreq->governor->event_handler (devfreq,DEVFREQ_GOV_STOP ,NULL );
include/linux/devfreq.h +7 -0
@@ -98,11 +98,15 @@ struct devfreq_dev_status {* @freq_table: Optional list of frequencies to support statistics * and freq_table must be generated in ascending order. * @max_state: The size of freq_table. +* +* @is_cooling_device: A self-explanatory boolean giving the device a +* cooling effect property. */ struct devfreq_dev_profile {unsigned long initial_freq;unsigned int polling_ms;enum devfreq_timer timer; +bool is_cooling_device;int (*target)(struct device *dev,unsigned long *freq,u32 flags); int (*get_dev_status)(struct device *dev,
@@ -198,6 +202,9 @@ struct devfreq {struct srcu_notifier_head transition_notifier_list; +/* Pointer to the cooling device if used for thermal mitigation */ +struct thermal_cooling_device *cdev; +struct notifier_block nb_min;struct notifier_block nb_max; };
Signature · 1 line
2.17.1
PATCH v2 2/4 devfreq/drivers/lima: Use devfreq cooling device registration
The devfreq core code is able to register the devfreq device as a cooling device if the 'is_cooling_device' flag is set in the profile.
Use this flag and remove the cooling device registering code.
Signed-off-by Daniel Lezcano <[email protected]>
--- drivers/gpu/drm/lima/lima_devfreq.c | 14 +------------- drivers/gpu/drm/lima/lima_devfreq.h | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-)
drivers/gpu/drm/lima/lima_devfreq.c +1 -13
@@ -7,7 +7,6 @@*/ #include <linux/clk.h> #include <linux/devfreq.h> -#include <linux/devfreq_cooling.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/pm_opp.h>
@@ -84,17 +83,13 @@ static struct devfreq_dev_profile lima_devfreq_profile = { .polling_ms = 50, /* ~3 frames */ .target = lima_devfreq_target, .get_dev_status = lima_devfreq_get_dev_status, + .is_cooling_device = true, };void lima_devfreq_fini (struct lima_device *ldev) {struct lima_devfreq *devfreq = &ldev->devfreq; -if (devfreq->cooling) { -devfreq_cooling_unregister (devfreq->cooling); - devfreq->cooling =NULL ; - } -if (devfreq->devfreq) {devm_devfreq_remove_device (ldev->dev, devfreq->devfreq); devfreq->devfreq =NULL ;
@@ -110,7 +105,6 @@ void lima_devfreq_fini(struct lima_device *ldev)int lima_devfreq_init (struct lima_device *ldev) { -struct thermal_cooling_device *cooling;struct device *dev = ldev->dev;struct opp_table *opp_table;struct devfreq *devfreq;
@@ -173,12 +167,6 @@ int lima_devfreq_init(struct lima_device *ldev) ldevfreq->devfreq = devfreq; - cooling =of_devfreq_cooling_register (dev->of_node, devfreq); -if (IS_ERR (cooling)) -dev_info (dev,"Failed to register cooling device\n" ); -else - ldevfreq->cooling = cooling; -return 0 ; err_fini:
drivers/gpu/drm/lima/lima_devfreq.h +0 -2
@@ -9,7 +9,6 @@struct devfreq ;struct opp_table ; -struct thermal_cooling_device ;struct lima_device ;
@@ -17,7 +16,6 @@ struct lima_devfreq {struct devfreq *devfreq;struct opp_table *clkname_opp_table;struct opp_table *regulators_opp_table; -struct thermal_cooling_device *cooling;ktime_t busy_time;ktime_t idle_time;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/4 devfreq/drivers/msm: Use devfreq cooling device registration
In reply to Daniel LezcanoThe devfreq core code is able to register the devfreq device as a cooling device if the 'is_cooling_device' flag is set in the profile.
Use this flag and remove the cooling device registering code.
Tested on dragonboard 845c
Signed-off-by Daniel Lezcano <[email protected]>
--- drivers/gpu/drm/msm/msm_gpu.c | 12 +----------- drivers/gpu/drm/msm/msm_gpu.h | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-)
drivers/gpu/drm/msm/msm_gpu.c +1 -11
@@ -14,7 +14,6 @@#include <generated/utsrelease.h> #include <linux/string_helpers.h> #include <linux/devfreq.h> -#include <linux/devfreq_cooling.h> #include <linux/devcoredump.h> #include <linux/sched/task.h>
@@ -82,6 +81,7 @@ static struct devfreq_dev_profile msm_devfreq_profile = { .target = msm_devfreq_target, .get_dev_status = msm_devfreq_get_dev_status, .get_cur_freq = msm_devfreq_get_cur_freq, + .is_cooling_device = true, };static void msm_devfreq_init (struct msm_gpu *gpu)
@@ -112,14 +112,6 @@ static void msm_devfreq_init(struct msm_gpu *gpu) }devfreq_suspend_device (gpu->devfreq.devfreq); - - gpu->cooling =of_devfreq_cooling_register (gpu->pdev->dev.of_node, - gpu->devfreq.devfreq); -if (IS_ERR (gpu->cooling)) { -DRM_DEV_ERROR (&gpu->pdev->dev, -"Couldn't register GPU cooling device\n" ); - gpu->cooling =NULL ; - } }static int enable_pwrrail (struct msm_gpu *gpu)
@@ -1056,6 +1048,4 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)if (gpu->worker) {kthread_destroy_worker (gpu->worker); } - -devfreq_cooling_unregister (gpu->cooling); }
drivers/gpu/drm/msm/msm_gpu.h +0 -2
@@ -155,8 +155,6 @@ struct msm_gpu {struct msm_gpu_state *crashstate;/* True if the hardware supports expanded apriv (a650 and newer) */ bool hw_apriv; - -struct thermal_cooling_device *cooling; };static inline struct msm_gpu *dev_to_gpu (struct device *dev)
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/4 devfreq/drivers/panfrost: Use devfreq cooling device registration
In reply to Daniel LezcanoThe devfreq core code is able to register the devfreq device as a cooling device if the 'is_cooling_device' flag is set in the profile.
Use this flag and remove the cooling device registering code.
Tested on rock960.
Signed-off-by Daniel Lezcano <[email protected]>
--- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 14 +------------- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 --- 2 files changed, 1 insertion(+), 16 deletions(-)
drivers/gpu/drm/panfrost/panfrost_devfreq.c +1 -13
@@ -3,7 +3,6 @@#include <linux/clk.h> #include <linux/devfreq.h> -#include <linux/devfreq_cooling.h> #include <linux/platform_device.h> #include <linux/pm_opp.h>
@@ -80,6 +79,7 @@ static struct devfreq_dev_profile panfrost_devfreq_profile = { .polling_ms = 50, /* ~3 frames */ .target = panfrost_devfreq_target, .get_dev_status = panfrost_devfreq_get_dev_status, + .is_cooling_device = true, };int panfrost_devfreq_init (struct panfrost_device *pfdev)
@@ -90,7 +90,6 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)struct device *dev = &pfdev->pdev->dev;struct devfreq *devfreq;struct opp_table *opp_table; -struct thermal_cooling_device *cooling;struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq; opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names,
@@ -139,12 +138,6 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) } pfdevfreq->devfreq = devfreq; - cooling =devfreq_cooling_em_register (devfreq,NULL ); -if (IS_ERR (cooling)) -DRM_DEV_INFO (dev,"Failed to register cooling device\n" ); -else - pfdevfreq->cooling = cooling; -return 0 ; err_fini:
@@ -156,11 +149,6 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev) {struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq; -if (pfdevfreq->cooling) { -devfreq_cooling_unregister (pfdevfreq->cooling); - pfdevfreq->cooling =NULL ; - } -if (pfdevfreq->opp_of_table_added) {dev_pm_opp_of_remove_table (&pfdev->pdev->dev); pfdevfreq->opp_of_table_added = false;
drivers/gpu/drm/panfrost/panfrost_devfreq.h +0 -3
@@ -9,14 +9,11 @@struct devfreq ;struct opp_table ; -struct thermal_cooling_device ; -struct panfrost_device ;struct panfrost_devfreq {struct devfreq *devfreq;struct opp_table *regulators_opp_table; -struct thermal_cooling_device *cooling;bool opp_of_table_added;ktime_t busy_time;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi,
Quoted 28 lines · Daniel Lezcano
Currently the default behavior is to manually having the devfreq backend to register themselves as a devfreq cooling device.
Instead of adding the code in the drivers for the thermal cooling device registering, let's provide a flag in the devfreq's profile to tell the common devfreq code to register the newly created devfreq as a cooling device.
Suggested-by Chanwoo Choi <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>--- drivers/devfreq/devfreq.c | 11 +++++++++++ include/linux/devfreq.h | 7 +++++++ 2 files changed, 18 insertions(+)drivers/devfreq/devfreq.c +1
-0@@ -11,6 +11,7 @@#include <linux/kmod.h> #include <linux/sched.h> #include <linux/debugfs.h> +#include <linux/devfreq_cooling.h> #include <linux/errno.h> #include <linux/err.h> #include <linux/init.h>
drivers/devfreq/devfreq.c line 30
Quoted 4 lines
drivers/devfreq/devfreq.c +1
-0@@ -26,6 +27,7 @@#include <linux/hrtimer.h> #include <linux/of.h> #include <linux/pm_qos.h> +#include <linux/thermal.h> > #include <linux/units.h>
Acutally, current devfreq-next branch doesn't contain previous your patch about units clean-up. So that when I applied it to next branch, merge conflict happen because of '<linux/units.h>'.
Just send the patches again regardless of 'devfreq: Use HZ macros'.
drivers/devfreq/devfreq.c struct devfreq *devfreq_add_device(struct device *dev, · line 944
Quoted 11 lines
drivers/devfreq/devfreq.c +5
-0#include "governor.h" @@ -935,6 +937,13 @@ struct devfreq *devfreq_add_device(struct device *dev,mutex_unlock (&devfreq_list_lock); +if (devfreq->profile->is_cooling_device) { + devfreq->cdev =devfreq_cooling_em_register (devfreq,NULL ); +if (IS_ERR (devfreq->cdev)) +dev_info (dev,"Failed to register devfreq " +"cooling device\n" );
Have to initialize devfreq->cdev by NULL when error happen. Because of just returning from thermal_cooling_device_unregister when cdev is not used.
Quoted 35 lines
drivers/devfreq/devfreq.c +4
-0+ } +return devfreq; err_init:@@ -960,6 +969,8 @@ int devfreq_remove_device(struct devfreq *devfreq)if (!devfreq)return -EINVAL ; +thermal_cooling_device_unregister (devfreq->cdev); +if (devfreq->governor) { devfreq->governor->event_handler (devfreq,DEVFREQ_GOV_STOP ,NULL );include/linux/devfreq.h +4
-0@@ -98,11 +98,15 @@ struct devfreq_dev_status {* @freq_table: Optional list of frequencies to support statistics * and freq_table must be generated in ascending order. * @max_state: The size of freq_table. +* +* @is_cooling_device: A self-explanatory boolean giving the device a +* cooling effect property. */ struct devfreq_dev_profile {unsigned long initial_freq;unsigned int polling_ms;enum devfreq_timer timer; +bool is_cooling_device;int (*target)(struct device *dev,unsigned long *freq,u32 flags); int (*get_dev_status)(struct device *dev,
include/linux/devfreq.h struct devfreq { · line 206
Quoted 5 lines
include/linux/devfreq.h +2
-0@@ -198,6 +202,9 @@ struct devfreq {struct srcu_notifier_head transition_notifier_list; + /* Pointer to the cooling device if used for thermal mitigation */ > + struct thermal_cooling_device *cdev; +
You need to the description of cdev instance to 'struct devfreq'.
Quoted 4 lines
include/linux/devfreq.h +0
-0struct notifier_block nb_min;struct notifier_block nb_max; };
Signature · 3 lines
Best Regards, Samsung Electronics Chanwoo Choi