thermal: ti-soc-thermal: Enable addition power management
Subsystems (4)
PATCH v2 1/2 thermal: ti-soc-thermal: Enable addition power management
The bandgap sensor can be idled when the processor is too, but it isn't currently being done, so the power consumption of OMAP3 boards can elevated if the bangap sensor is enabled.
This patch attempts to use some additional power management to idle the clock to the bandgap when not needed.
---
V2: Fix issue where variable stating the suspend mode isn't being
properly set and cleared.
drivers/thermal/ti-soc-thermal/ti-bandgap.c +49 -1
@@ -25,10 +25,18 @@#include <linux/of_platform.h> #include <linux/of_irq.h> #include <linux/io.h> +#include <linux/cpu_pm.h> +#include <linux/device.h> +#include <linux/pm_runtime.h> +#include <linux/pm.h> +#include <linux/of.h> +#include <linux/of_device.h> #include "ti-bandgap.h" static int ti_bandgap_force_single_read (struct ti_bandgap *bgp,int id); +static int bandgap_omap_cpu_notifier (struct notifier_block *nb, +unsigned long cmd,void *v);/*** Helper functions to access registers and their bitfields ***/
@@ -1008,6 +1016,9 @@ int ti_bandgap_probe(struct platform_device *pdev) } } + bgp->nb.notifier_call = bandgap_omap_cpu_notifier; +cpu_pm_register_notifier (&bgp->nb); +return 0 ; remove_last_cooling:
@@ -1041,7 +1052,9 @@ int ti_bandgap_remove(struct platform_device *pdev)struct ti_bandgap *bgp =platform_get_drvdata (pdev);int i; -/* First thing is to remove sensor interfaces */ +cpu_pm_unregister_notifier (&bgp->nb); + +/* Remove sensor interfaces */ for (i =0 ; i < bgp->conf->sensor_count; i++) {if (bgp->conf->sensors[i].unregister_cooling) bgp->conf->sensors[i].unregister_cooling (bgp, i);
@@ -1150,9 +1163,43 @@ static int ti_bandgap_suspend(struct device *dev)if (TI_BANDGAP_HAS (bgp,CLK_CTRL ))clk_disable_unprepare (bgp->fclock); + bgp->is_suspended = true; +return err; } +static int bandgap_omap_cpu_notifier (struct notifier_block *nb, +unsigned long cmd,void *v) +{ +struct ti_bandgap *bgp; + + bgp = container_of(nb, struct ti_bandgap, nb); + +spin_lock (&bgp->lock); +switch (cmd) { +case CPU_CLUSTER_PM_ENTER : +if (bgp->is_suspended) +break ; +ti_bandgap_save_ctxt (bgp); +ti_bandgap_power (bgp, false); +if (TI_BANDGAP_HAS (bgp,CLK_CTRL )) +clk_disable (bgp->fclock); +break ; +case CPU_CLUSTER_PM_ENTER_FAILED : +case CPU_CLUSTER_PM_EXIT : +if (bgp->is_suspended) +break ; +if (TI_BANDGAP_HAS (bgp,CLK_CTRL )) +clk_enable (bgp->fclock); +ti_bandgap_power (bgp, true); +ti_bandgap_restore_ctxt (bgp); +break ; + } +spin_unlock (&bgp->lock); + +return NOTIFY_OK ; +} +static int ti_bandgap_resume (struct device *dev) {struct ti_bandgap *bgp =dev_get_drvdata (dev);
@@ -1161,6 +1208,7 @@ static int ti_bandgap_resume(struct device *dev)clk_prepare_enable (bgp->fclock);ti_bandgap_power (bgp, true); + bgp->is_suspended = false;return ti_bandgap_restore_ctxt (bgp); }
drivers/thermal/ti-soc-thermal/ti-bandgap.h +6 -0
@@ -12,6 +12,10 @@#include <linux/spinlock.h> #include <linux/types.h> #include <linux/err.h> +#include <linux/cpu_pm.h> +#include <linux/device.h> +#include <linux/pm_runtime.h> +#include <linux/pm.h> struct gpio_desc ;
@@ -203,6 +207,8 @@ struct ti_bandgap {int irq;struct gpio_desc *tshut_gpiod;u32 clk_rate; +struct notifier_block nb; + unsigned int is_suspended:1; };/**
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/2 ARM: omap2plus_defconfig: Enable OMAP3_THERMAL
With the additional power management options enabled, this patch enables OMAP3_THERMAL by default.
---
V2: No change
arch/arm/configs/omap2plus_defconfig +1 -0
@@ -303,6 +303,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y CONFIG_TI_THERMAL=y +CONFIG_OMAP3_THERMAL=y CONFIG_OMAP4_THERMAL=y CONFIG_OMAP5_THERMAL=y CONFIG_DRA752_THERMAL=y
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 4 lines · On Wed, 19 Aug 2020 07:59:23 -0500 Adam Ford <[email protected]> wrote:
The bandgap sensor can be idled when the processor is too, but it isn't currently being done, so the power consumption of OMAP3 boards can elevated if the bangap sensor is enabled.
Quoted 9 lines
This patch attempts to use some additional power management to idle the clock to the bandgap when not needed.
Signed-off-by Adam Ford <[email protected]>Reported-by kernel test robot <[email protected]>---
V2: Fix issue where variable stating the suspend mode isn't being
properly set and cleared.
I get
root@(none):/# cat /sys/class/thermal/thermal_zone0/type cpu_thermal root@(none):/# cat /sys/class/thermal/thermal_zone0/temp 50000 root@(none):/# cat /sys/class/thermal/thermal_zone1/ available_policies mode subsystem/ integral_cutoff offset sustainable_power k_d passive temp k_i policy type k_po power/ uevent k_pu slope root@(none):/# cat /sys/class/thermal/thermal_zone1/type bq27000-battery root@(none):/# cat /sys/kernel/debug/pm_debug/count usbhost_pwrdm (ON),OFF:3459,RET:635,INA:0,ON:4095,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0 sgx_pwrdm (OFF),OFF:1,RET:0,INA:1,ON:2,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0 core_pwrdm (ON),OFF:86,RET:7,INA:0,ON:94,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0,RET-MEMBANK2-OFF:0 per_pwrdm (ON),OFF:1518,RET:64,INA:0,ON:1583,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0 dss_pwrdm (ON),OFF:3459,RET:635,INA:0,ON:4095,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0 cam_pwrdm (OFF),OFF:1,RET:1,INA:0,ON:2,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0 neon_pwrdm (ON),OFF:2845,RET:1131,INA:119,ON:4096,RET-LOGIC-OFF:0 mpu_pwrdm (ON),OFF:2845,RET:1130,INA:119,ON:4095,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0 iva2_pwrdm (OFF),OFF:1,RET:1,INA:0,ON:2,RET-LOGIC-OFF:0,RET-MEMBANK1-OFF:0,RET-MEMBANK2-OFF:0,RET-MEMBANK3-OFF:0,RET-MEMBANK4-OFF:0 usbhost_clkdm->usbhost_pwrdm (1) sgx_clkdm->sgx_pwrdm (0) per_clkdm->per_pwrdm (13) cam_clkdm->cam_pwrdm (0) dss_clkdm->dss_pwrdm (1) d2d_clkdm->core_pwrdm (0) iva2_clkdm->iva2_pwrdm (0) mpu_clkdm->mpu_pwrdm (0) core_l4_clkdm->core_pwrdm (20) core_l3_clkdm->core_pwrdm (1) neon_clkdm->neon_pwrdm (0) root@(none):/#
So things still turn off.
Quoted 120 lines
drivers/thermal/ti-soc-thermal/ti-bandgap.c +49
-1@@ -25,10 +25,18 @@#include <linux/of_platform.h> #include <linux/of_irq.h> #include <linux/io.h> +#include <linux/cpu_pm.h> +#include <linux/device.h> +#include <linux/pm_runtime.h> +#include <linux/pm.h> +#include <linux/of.h> +#include <linux/of_device.h> #include "ti-bandgap.h" static int ti_bandgap_force_single_read (struct ti_bandgap *bgp,int id); +static int bandgap_omap_cpu_notifier (struct notifier_block *nb, +unsigned long cmd,void *v);/*** Helper functions to access registers and their bitfields ***/ @@ -1008,6 +1016,9 @@ int ti_bandgap_probe(struct platform_device *pdev) } } + bgp->nb.notifier_call = bandgap_omap_cpu_notifier; +cpu_pm_register_notifier (&bgp->nb); +return 0 ; remove_last_cooling:@@ -1041,7 +1052,9 @@ int ti_bandgap_remove(struct platform_device *pdev)struct ti_bandgap *bgp =platform_get_drvdata (pdev);int i; -/* First thing is to remove sensor interfaces */ +cpu_pm_unregister_notifier (&bgp->nb); + +/* Remove sensor interfaces */ for (i =0 ; i < bgp->conf->sensor_count; i++) {if (bgp->conf->sensors[i].unregister_cooling) bgp->conf->sensors[i].unregister_cooling (bgp, i);@@ -1150,9 +1163,43 @@ static int ti_bandgap_suspend(struct device *dev)if (TI_BANDGAP_HAS (bgp,CLK_CTRL ))clk_disable_unprepare (bgp->fclock); + bgp->is_suspended = true; +return err; } +static int bandgap_omap_cpu_notifier (struct notifier_block *nb, +unsigned long cmd,void *v) +{ +struct ti_bandgap *bgp; + + bgp = container_of(nb, struct ti_bandgap, nb); + +spin_lock (&bgp->lock); +switch (cmd) { +case CPU_CLUSTER_PM_ENTER : +if (bgp->is_suspended) +break ; +ti_bandgap_save_ctxt (bgp); +ti_bandgap_power (bgp, false); +if (TI_BANDGAP_HAS (bgp,CLK_CTRL )) +clk_disable (bgp->fclock); +break ; +case CPU_CLUSTER_PM_ENTER_FAILED : +case CPU_CLUSTER_PM_EXIT : +if (bgp->is_suspended) +break ; +if (TI_BANDGAP_HAS (bgp,CLK_CTRL )) +clk_enable (bgp->fclock); +ti_bandgap_power (bgp, true); +ti_bandgap_restore_ctxt (bgp); +break ; + } +spin_unlock (&bgp->lock); + +return NOTIFY_OK ; +} +static int ti_bandgap_resume (struct device *dev) {struct ti_bandgap *bgp =dev_get_drvdata (dev);@@ -1161,6 +1208,7 @@ static int ti_bandgap_resume(struct device *dev)clk_prepare_enable (bgp->fclock);ti_bandgap_power (bgp, true); + bgp->is_suspended = false;return ti_bandgap_restore_ctxt (bgp); }drivers/thermal/ti-soc-thermal/ti-bandgap.h +6
-0@@ -12,6 +12,10 @@#include <linux/spinlock.h> #include <linux/types.h> #include <linux/err.h> +#include <linux/cpu_pm.h> +#include <linux/device.h> +#include <linux/pm_runtime.h> +#include <linux/pm.h> struct gpio_desc ;@@ -203,6 +207,8 @@ struct ti_bandgap {int irq;struct gpio_desc *tshut_gpiod;u32 clk_rate; +struct notifier_block nb; + unsigned int is_suspended:1; };/**
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Adam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on omap/for-next]
[also build test ERROR on linus/master v5.9-rc1 next-20200819] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Adam-Ford/thermal-ti-soc-thermal-Enable-addition-power-management/20200819-210657 base: https://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git for-next config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=sh
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "bandgap_omap_cpu_notifier" [drivers/thermal/ti-soc-thermal/ti-soc-thermal.ko] undefined!
ERROR: modpost: "__delay" [drivers/net/phy/mdio-cavium.ko] undefined!
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Andreas Kemnade
maintainerQuoted 4 lines · On Wed, 19 Aug 2020 07:59:23 -0500 Adam Ford <[email protected]> wrote:
The bandgap sensor can be idled when the processor is too, but it isn't currently being done, so the power consumption of OMAP3 boards can elevated if the bangap sensor is enabled.
Quoted 9 lines
This patch attempts to use some additional power management to idle the clock to the bandgap when not needed.
Signed-off-by Adam Ford <[email protected]>Reported-by kernel test robot <[email protected]>---
V2: Fix issue where variable stating the suspend mode isn't being
properly set and cleared.
hmm, it is not in linux-next. Can we expect that for v5.10?
Regards,
Andreas
Quoted 10 lines · Andreas Kemnade
Quoted 7 lines · On Wed, 19 Aug 2020 07:59:23 -0500 Adam Ford <[email protected]> wrote:
The bandgap sensor can be idled when the processor is too, but it isn't currently being done, so the power consumption of OMAP3 boards can elevated if the bangap sensor is enabled.
This patch attempts to use some additional power management to idle the clock to the bandgap when not needed.
Quoted 7 lines
Quoted 6 lines
Signed-off-by Adam Ford <[email protected]>Reported-by kernel test robot <[email protected]>---
V2: Fix issue where variable stating the suspend mode isn't being
properly set and cleared.hmm, it is not in linux-next. Can we expect that for v5.10?
The reason I did not pick this patch is because lkp reported an error on it.
https://marc.info/?l=linux-pm&m=159788472017308&w=2
Signature · 10 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 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
A message that is not in the archive (sent off-list or not yet received): CAHCN7xLUrh7xr0pr5Bz0unWQXGkiKDK88hZKx7WXGyr2RBWTVg@mail.gmail.com
Andreas Kemnade
maintainerQuoted 29 lines · On Thu, 10 Sep 2020 14:33:13 -0500 Adam Ford <[email protected]> wrote:
Quoted 17 lines · Daniel Lezcano
Quoted 16 lines · Andreas Kemnade
Quoted 13 lines · On Wed, 19 Aug 2020 07:59:23 -0500 Adam Ford <[email protected]> wrote:
The bandgap sensor can be idled when the processor is too, but it isn't currently being done, so the power consumption of OMAP3 boards can elevated if the bangap sensor is enabled.
This patch attempts to use some additional power management to idle the clock to the bandgap when not needed.
Signed-off-by Adam Ford <[email protected]>Reported-by kernel test robot <[email protected]>---
V2: Fix issue where variable stating the suspend mode isn't being
properly set and cleared.Quoted 9 lines
Quoted 1 line
hmm, it is not in linux-next. Can we expect that for v5.10?
The reason I did not pick this patch is because lkp reported an error on it.
Quoted 6 lines
That error message shows it's trying to be built with 'sh' cross compiler, but should be build with an ARM.
I can run a manual test of the patch against a different branch if necessary, but I had built and tested it, so I know it worked at one time.
hmm, what about compile-testing without CONFIG_PM_SLEEP?
The function definition is guarded by that.
So it is not a sh-specific problem.
Regards,
Andreas