* [PATCH v5 6/9] cpufreq: mediatek: Use auto-registration of thermal cooling device
2019-01-29 4:55 [PATCH v5 0/9] cpufreq: Add flag to auto-register as cooling device Amit Kucheria
@ 2019-01-29 4:55 ` Amit Kucheria
2019-02-06 13:55 ` Matthias Brugger
2019-01-29 4:55 ` [PATCH v5 8/9] cpufreq: scmi: " Amit Kucheria
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Amit Kucheria @ 2019-01-29 4:55 UTC (permalink / raw)
To: linux-kernel
Cc: Sean Wang, linux-pm, Viresh Kumar, Daniel Lezcano,
Rafael J. Wysocki, linux-mediatek, Matthias Brugger,
linux-arm-kernel
Use the CPUFREQ_IS_COOLING_DEV flag to allow cpufreq core to
automatically register as a thermal cooling device.
This allows removal of boiler plate code from the driver.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/cpufreq/mediatek-cpufreq.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c
index eb8920d39818..4229fcc31310 100644
--- a/drivers/cpufreq/mediatek-cpufreq.c
+++ b/drivers/cpufreq/mediatek-cpufreq.c
@@ -14,7 +14,6 @@
#include <linux/clk.h>
#include <linux/cpu.h>
-#include <linux/cpu_cooling.h>
#include <linux/cpufreq.h>
#include <linux/cpumask.h>
#include <linux/module.h>
@@ -48,7 +47,6 @@ struct mtk_cpu_dvfs_info {
struct regulator *sram_reg;
struct clk *cpu_clk;
struct clk *inter_clk;
- struct thermal_cooling_device *cdev;
struct list_head list_head;
int intermediate_voltage;
bool need_voltage_tracking;
@@ -307,13 +305,6 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
#define DYNAMIC_POWER "dynamic-power-coefficient"
-static void mtk_cpufreq_ready(struct cpufreq_policy *policy)
-{
- struct mtk_cpu_dvfs_info *info = policy->driver_data;
-
- info->cdev = of_cpufreq_cooling_register(policy);
-}
-
static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)
{
struct device *cpu_dev;
@@ -472,7 +463,6 @@ static int mtk_cpufreq_exit(struct cpufreq_policy *policy)
{
struct mtk_cpu_dvfs_info *info = policy->driver_data;
- cpufreq_cooling_unregister(info->cdev);
dev_pm_opp_free_cpufreq_table(info->cpu_dev, &policy->freq_table);
return 0;
@@ -480,13 +470,13 @@ static int mtk_cpufreq_exit(struct cpufreq_policy *policy)
static struct cpufreq_driver mtk_cpufreq_driver = {
.flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK |
- CPUFREQ_HAVE_GOVERNOR_PER_POLICY,
+ CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
+ CPUFREQ_IS_COOLING_DEV,
.verify = cpufreq_generic_frequency_table_verify,
.target_index = mtk_cpufreq_set_target,
.get = cpufreq_generic_get,
.init = mtk_cpufreq_init,
.exit = mtk_cpufreq_exit,
- .ready = mtk_cpufreq_ready,
.name = "mtk-cpufreq",
.attr = cpufreq_generic_attr,
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v5 6/9] cpufreq: mediatek: Use auto-registration of thermal cooling device
2019-01-29 4:55 ` [PATCH v5 6/9] cpufreq: mediatek: Use auto-registration of thermal " Amit Kucheria
@ 2019-02-06 13:55 ` Matthias Brugger
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Brugger @ 2019-02-06 13:55 UTC (permalink / raw)
To: Amit Kucheria, linux-kernel
Cc: Sean Wang, linux-pm, Viresh Kumar, Daniel Lezcano,
Rafael J. Wysocki, linux-mediatek, linux-arm-kernel
On 29/01/2019 05:55, Amit Kucheria wrote:
> Use the CPUFREQ_IS_COOLING_DEV flag to allow cpufreq core to
> automatically register as a thermal cooling device.
>
> This allows removal of boiler plate code from the driver.
>
> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
> drivers/cpufreq/mediatek-cpufreq.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c
> index eb8920d39818..4229fcc31310 100644
> --- a/drivers/cpufreq/mediatek-cpufreq.c
> +++ b/drivers/cpufreq/mediatek-cpufreq.c
> @@ -14,7 +14,6 @@
>
> #include <linux/clk.h>
> #include <linux/cpu.h>
> -#include <linux/cpu_cooling.h>
> #include <linux/cpufreq.h>
> #include <linux/cpumask.h>
> #include <linux/module.h>
> @@ -48,7 +47,6 @@ struct mtk_cpu_dvfs_info {
> struct regulator *sram_reg;
> struct clk *cpu_clk;
> struct clk *inter_clk;
> - struct thermal_cooling_device *cdev;
> struct list_head list_head;
> int intermediate_voltage;
> bool need_voltage_tracking;
> @@ -307,13 +305,6 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
>
> #define DYNAMIC_POWER "dynamic-power-coefficient"
>
> -static void mtk_cpufreq_ready(struct cpufreq_policy *policy)
> -{
> - struct mtk_cpu_dvfs_info *info = policy->driver_data;
> -
> - info->cdev = of_cpufreq_cooling_register(policy);
> -}
> -
> static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)
> {
> struct device *cpu_dev;
> @@ -472,7 +463,6 @@ static int mtk_cpufreq_exit(struct cpufreq_policy *policy)
> {
> struct mtk_cpu_dvfs_info *info = policy->driver_data;
>
> - cpufreq_cooling_unregister(info->cdev);
> dev_pm_opp_free_cpufreq_table(info->cpu_dev, &policy->freq_table);
>
> return 0;
> @@ -480,13 +470,13 @@ static int mtk_cpufreq_exit(struct cpufreq_policy *policy)
>
> static struct cpufreq_driver mtk_cpufreq_driver = {
> .flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK |
> - CPUFREQ_HAVE_GOVERNOR_PER_POLICY,
> + CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
> + CPUFREQ_IS_COOLING_DEV,
> .verify = cpufreq_generic_frequency_table_verify,
> .target_index = mtk_cpufreq_set_target,
> .get = cpufreq_generic_get,
> .init = mtk_cpufreq_init,
> .exit = mtk_cpufreq_exit,
> - .ready = mtk_cpufreq_ready,
> .name = "mtk-cpufreq",
> .attr = cpufreq_generic_attr,
> };
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5 8/9] cpufreq: scmi: Use auto-registration of thermal cooling device
2019-01-29 4:55 [PATCH v5 0/9] cpufreq: Add flag to auto-register as cooling device Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 6/9] cpufreq: mediatek: Use auto-registration of thermal " Amit Kucheria
@ 2019-01-29 4:55 ` Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 9/9] cpufreq: scpi: " Amit Kucheria
2019-02-06 10:32 ` [PATCH v5 0/9] cpufreq: Add flag to auto-register as " Rafael J. Wysocki
3 siblings, 0 replies; 6+ messages in thread
From: Amit Kucheria @ 2019-01-29 4:55 UTC (permalink / raw)
To: linux-kernel
Cc: Viresh Kumar, linux-pm, Rafael J. Wysocki, linux-arm-kernel,
Sudeep Holla
Use the CPUFREQ_IS_COOLING_DEV flag to allow cpufreq core to
automatically register as a thermal cooling device.
This allows removal of boiler plate code from the driver.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/cpufreq/scmi-cpufreq.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
index 242c3370544e..66b633b48eb1 100644
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@ -11,7 +11,6 @@
#include <linux/cpu.h>
#include <linux/cpufreq.h>
#include <linux/cpumask.h>
-#include <linux/cpu_cooling.h>
#include <linux/export.h>
#include <linux/module.h>
#include <linux/pm_opp.h>
@@ -22,7 +21,6 @@
struct scmi_data {
int domain_id;
struct device *cpu_dev;
- struct thermal_cooling_device *cdev;
};
static const struct scmi_handle *handle;
@@ -185,7 +183,6 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy)
{
struct scmi_data *priv = policy->driver_data;
- cpufreq_cooling_unregister(priv->cdev);
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
kfree(priv);
dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
@@ -193,17 +190,11 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy)
return 0;
}
-static void scmi_cpufreq_ready(struct cpufreq_policy *policy)
-{
- struct scmi_data *priv = policy->driver_data;
-
- priv->cdev = of_cpufreq_cooling_register(policy);
-}
-
static struct cpufreq_driver scmi_cpufreq_driver = {
.name = "scmi",
.flags = CPUFREQ_STICKY | CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
- CPUFREQ_NEED_INITIAL_FREQ_CHECK,
+ CPUFREQ_NEED_INITIAL_FREQ_CHECK |
+ CPUFREQ_IS_COOLING_DEV,
.verify = cpufreq_generic_frequency_table_verify,
.attr = cpufreq_generic_attr,
.target_index = scmi_cpufreq_set_target,
@@ -211,7 +202,6 @@ static struct cpufreq_driver scmi_cpufreq_driver = {
.get = scmi_cpufreq_get_rate,
.init = scmi_cpufreq_init,
.exit = scmi_cpufreq_exit,
- .ready = scmi_cpufreq_ready,
};
static int scmi_cpufreq_probe(struct scmi_device *sdev)
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v5 9/9] cpufreq: scpi: Use auto-registration of thermal cooling device
2019-01-29 4:55 [PATCH v5 0/9] cpufreq: Add flag to auto-register as cooling device Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 6/9] cpufreq: mediatek: Use auto-registration of thermal " Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 8/9] cpufreq: scmi: " Amit Kucheria
@ 2019-01-29 4:55 ` Amit Kucheria
2019-02-06 10:32 ` [PATCH v5 0/9] cpufreq: Add flag to auto-register as " Rafael J. Wysocki
3 siblings, 0 replies; 6+ messages in thread
From: Amit Kucheria @ 2019-01-29 4:55 UTC (permalink / raw)
To: linux-kernel
Cc: linux-pm, Viresh Kumar, Daniel Lezcano, Rafael J. Wysocki,
Sudeep Holla, linux-arm-kernel
Use the CPUFREQ_IS_COOLING_DEV flag to allow cpufreq core to
automatically register as a thermal cooling device.
This allows removal of boiler plate code from the driver.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/cpufreq/scpi-cpufreq.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c
index 99449738faa4..1db2f6927e13 100644
--- a/drivers/cpufreq/scpi-cpufreq.c
+++ b/drivers/cpufreq/scpi-cpufreq.c
@@ -22,7 +22,6 @@
#include <linux/cpu.h>
#include <linux/cpufreq.h>
#include <linux/cpumask.h>
-#include <linux/cpu_cooling.h>
#include <linux/export.h>
#include <linux/module.h>
#include <linux/of_platform.h>
@@ -34,7 +33,6 @@
struct scpi_data {
struct clk *clk;
struct device *cpu_dev;
- struct thermal_cooling_device *cdev;
};
static struct scpi_ops *scpi_ops;
@@ -186,7 +184,6 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
{
struct scpi_data *priv = policy->driver_data;
- cpufreq_cooling_unregister(priv->cdev);
clk_put(priv->clk);
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
kfree(priv);
@@ -195,23 +192,16 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
return 0;
}
-static void scpi_cpufreq_ready(struct cpufreq_policy *policy)
-{
- struct scpi_data *priv = policy->driver_data;
-
- priv->cdev = of_cpufreq_cooling_register(policy);
-}
-
static struct cpufreq_driver scpi_cpufreq_driver = {
.name = "scpi-cpufreq",
.flags = CPUFREQ_STICKY | CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
- CPUFREQ_NEED_INITIAL_FREQ_CHECK,
+ CPUFREQ_NEED_INITIAL_FREQ_CHECK |
+ CPUFREQ_IS_COOLING_DEV,
.verify = cpufreq_generic_frequency_table_verify,
.attr = cpufreq_generic_attr,
.get = scpi_cpufreq_get_rate,
.init = scpi_cpufreq_init,
.exit = scpi_cpufreq_exit,
- .ready = scpi_cpufreq_ready,
.target_index = scpi_cpufreq_set_target,
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v5 0/9] cpufreq: Add flag to auto-register as cooling device
2019-01-29 4:55 [PATCH v5 0/9] cpufreq: Add flag to auto-register as cooling device Amit Kucheria
` (2 preceding siblings ...)
2019-01-29 4:55 ` [PATCH v5 9/9] cpufreq: scpi: " Amit Kucheria
@ 2019-02-06 10:32 ` Rafael J. Wysocki
3 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2019-02-06 10:32 UTC (permalink / raw)
To: Amit Kucheria
Cc: open list:CPU FREQUENCY SCALING FRAMEWORK, Viresh Kumar,
Daniel Lezcano, linux-kernel, Eduardo Valentin,
moderated list:ARM/Mediatek SoC support, Sudeep Holla,
Matthias Brugger, Zhang Rui,
moderated list:ARM/Mediatek SoC support
On Tuesday, January 29, 2019 5:55:06 AM CET Amit Kucheria wrote:
> Add a flag for cpufreq drivers to tell cpufreq core to auto-register
> themselves as a thermal cooling device.
>
> There series converts over all the drivers except arm_big_little.c.
> Tested on SDM845 with the qcom-cpufreq-hw driver. Only compile-tested the
> others.
>
> Things needing fixing (but not a blocker for the series):
> - Look at how to detect that we're not in IKS mode in arm_big_little's
> .ready callback.
>
> Changes since v4:
> - Added IS_ENABLED guards in cpufreq.c
> - Changed flag name to CPUFREQ_IS_COOLING_DEV
> - Collected various review tags
>
> Changes since v3:
> - Got rid of wrapper function to register/unregister cooling devices.
> Directly call the function in cpufreq.c
>
> Changes since v2:
> - Get rid of #ifdef'ery and let the pointer exist in all cases
> - Get rid of (!CPU_THERMAL || THERMAL) dependency in all cpufreq drivers'
> Kconfig
>
> Changes since v1:
> - Fix compilation failures with allmodconfig
> - Get rid of #ifdef in cpufreq.c
> - Removed miscellaneous patches and sent them separately
> - Merged patches 1 and 2 from v1
>
> Amit Kucheria (9):
> thermal: cpu_cooling: Require thermal core to be compiled in
> cpufreq: Auto-register the driver as a thermal cooling device if asked
> cpufreq: qcom-hw: Register as a cpufreq cooling device
> cpufreq: imx6q: Use auto-registration of thermal cooling device
> cpufreq: cpufreq-dt: Use auto-registration of thermal cooling device
> cpufreq: mediatek: Use auto-registration of thermal cooling device
> cpufreq: qoriq: Use auto-registration of thermal cooling device
> cpufreq: scmi: Use auto-registration of thermal cooling device
> cpufreq: scpi: Use auto-registration of thermal cooling device
>
> drivers/cpufreq/Kconfig | 3 ---
> drivers/cpufreq/Kconfig.arm | 5 -----
> drivers/cpufreq/cpufreq-dt.c | 14 ++------------
> drivers/cpufreq/cpufreq.c | 13 +++++++++++++
> drivers/cpufreq/imx6q-cpufreq.c | 24 ++----------------------
> drivers/cpufreq/mediatek-cpufreq.c | 14 ++------------
> drivers/cpufreq/qcom-cpufreq-hw.c | 3 ++-
> drivers/cpufreq/qoriq-cpufreq.c | 15 ++-------------
> drivers/cpufreq/scmi-cpufreq.c | 14 ++------------
> drivers/cpufreq/scpi-cpufreq.c | 14 ++------------
> drivers/thermal/Kconfig | 1 +
> include/linux/cpufreq.h | 9 +++++++++
> 12 files changed, 37 insertions(+), 92 deletions(-)
>
>
I've applied the series, thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread