thermal: ti-soc-thermal: Enable addition power management
Subsystems (4)
PATCH 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.
---
V3: bandgap_omap_cpu_notifier is only defined when CONFIG_PM_SLEEP
is enabled, so make all references to it also depend on CONFIG_PM_SLEEP as well
V2: Fix issue where variable stating the suspend mode isn't being
properly set and cleared.
drivers/thermal/ti-soc-thermal/ti-bandgap.c +53 -1
@@ -25,10 +25,20 @@#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); +#ifdef CONFIG_PM_SLEEP +static int bandgap_omap_cpu_notifier (struct notifier_block *nb, +unsigned long cmd,void *v); +#endif /*** Helper functions to access registers and their bitfields ***/
@@ -1008,6 +1018,11 @@ int ti_bandgap_probe(struct platform_device *pdev) } } +#ifdef CONFIG_PM_SLEEP + bgp->nb.notifier_call = bandgap_omap_cpu_notifier; +cpu_pm_register_notifier (&bgp->nb); +#endif +return 0 ; remove_last_cooling:
@@ -1041,7 +1056,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 +1167,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 +1212,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 2/2 ARM: omap2plus_defconfig: Enable OMAP3_THERMAL
With the additional power management options enabled, this patch enables OMAP3_THERMAL by default.
---
V3: No change 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
Re: [PATCH 2/2] ARM: omap2plus_defconfig: Enable OMAP3_THERMAL
Quoted 8 lines · Adam Ford
With the additional power management options enabled, this patch enables
OMAP3_THERMALby default.Signed-off-by Adam Ford <[email protected]>---
V3: No change V2: No change
Tony,
Can you apply [2/2] to the OMAP branch?
It looks like 1/2 was applied to the linux-pm [1]
thanks,
Quoted 16 lines
arch/arm/configs/omap2plus_defconfig +1
-1@@ -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 --2.25.1
Re: [PATCH 2/2] ARM: omap2plus_defconfig: Enable OMAP3_THERMAL
Quoted 11 lines · Adam Ford
Quoted 8 lines · Adam Ford
With the additional power management options enabled, this patch enables
OMAP3_THERMALby default.Signed-off-by Adam Ford <[email protected]>---
V3: No change V2: No change
Quoted 5 lines
Tony,
Can you apply [2/2] to the OMAP branch?
It looks like 1/2 was applied to the linux-pm [1]
Tony,
The defconfig update doesn't show in your branch. Is there someone else I should ping about this?
thanks
Quoted 24 lines
thanks,
Quoted 16 lines
arch/arm/configs/omap2plus_defconfig +1
-1@@ -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 --2.25.1
Tony Lindgren
maintainerRe: [PATCH 2/2] ARM: omap2plus_defconfig: Enable OMAP3_THERMAL
In reply to Adam FordQuoted 5 lines · Adam Ford
Quoted 4 lines · Adam Ford
With the additional power management options enabled, this patch enables
OMAP3_THERMALby default.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Adam Ford <[email protected]>---
V3: No change V2: No changeTony,
Can you apply [2/2] to the OMAP branch?
Sorry for the delay, applying into omap-for-v5.11/defconfig thanks.
Regards,
Tony
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 8 lines · Adam Ford
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 8 lines
Signed-off-by Adam Ford <[email protected]>Reported-by kernel test robot <[email protected]>---
V3:bandgap_omap_cpu_notifieris only defined whenCONFIG_PM_SLEEP
is enabled, so make all references to it also depend onCONFIG_PM_SLEEPas well
Gentle nudge on this one. It was in the queue for a while, and got lost, then resurrected again.
thanks
adam
Quoted 130 lines
V2: Fix issue where variable stating the suspend mode isn't being
properly set and cleared.drivers/thermal/ti-soc-thermal/ti-bandgap.c +53
-1@@ -25,10 +25,20 @@#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); +#ifdef CONFIG_PM_SLEEP +static int bandgap_omap_cpu_notifier (struct notifier_block *nb, +unsigned long cmd,void *v); +#endif /*** Helper functions to access registers and their bitfields ***/ @@ -1008,6 +1018,11 @@ int ti_bandgap_probe(struct platform_device *pdev) } } +#ifdef CONFIG_PM_SLEEP + bgp->nb.notifier_call = bandgap_omap_cpu_notifier; +cpu_pm_register_notifier (&bgp->nb); +#endif +return 0 ; remove_last_cooling:@@ -1041,7 +1056,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 +1167,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 +1212,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
-1@@ -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; };/** -- 2.25.1
Quoted 11 lines · Adam Ford
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]>---
[ ... ]
drivers/thermal/ti-soc-thermal/ti-bandgap.c static int ti_bandgap_suspend(struct device *dev) · line 1170
Quoted 12 lines
drivers/thermal/ti-soc-thermal/ti-bandgap.c +4
-1-/* 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 +1167,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;
Is this flag really needed?
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