thermal: core: skip update disabled thermal zones after suspend
diff mbox series

Message ID 20190416170701.50333-1-wvw@google.com
State Awaiting Upstream, archived
Delegated to: Zhang Rui
Headers show
Series
  • thermal: core: skip update disabled thermal zones after suspend
Related show

Commit Message

Wei Wang April 16, 2019, 5:07 p.m. UTC
It is unnecessary to update disabled thermal zones post suspend and
sometimes leads error/warning in bad behaved thermal drivers.

Signed-off-by: Wei Wang <wvw@google.com>
---
 drivers/thermal/thermal_core.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Zhang Rui April 22, 2019, 9:03 a.m. UTC | #1
On 二, 2019-04-16 at 10:07 -0700, Wei Wang wrote:
> It is unnecessary to update disabled thermal zones post suspend and
> sometimes leads error/warning in bad behaved thermal drivers.
> 
a good catch, and in fact, there are more issues about thermal handling
for disabled thermal zones, like we're able to read the temperature of
disabled thermal zones, either via sysfs or via function calls like
thermal_zone_device_update.
For this patch, I will take it as it fixes one of the problem.

thanks,
rui

> Signed-off-by: Wei Wang <wvw@google.com>
> ---
>  drivers/thermal/thermal_core.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/thermal/thermal_core.c
> b/drivers/thermal/thermal_core.c
> index 6590bb5cb688..5baf5cfab999 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -1494,6 +1494,7 @@ static int thermal_pm_notify(struct
> notifier_block *nb,
>  			     unsigned long mode, void *_unused)
>  {
>  	struct thermal_zone_device *tz;
> +	enum thermal_device_mode tz_mode;
>  
>  	switch (mode) {
>  	case PM_HIBERNATION_PREPARE:
> @@ -1506,6 +1507,13 @@ static int thermal_pm_notify(struct
> notifier_block *nb,
>  	case PM_POST_SUSPEND:
>  		atomic_set(&in_suspend, 0);
>  		list_for_each_entry(tz, &thermal_tz_list, node) {
> +			tz_mode = THERMAL_DEVICE_ENABLED;
> +			if (tz->ops->get_mode)
> +				tz->ops->get_mode(tz, &tz_mode);
> +
> +			if (tz_mode == THERMAL_DEVICE_DISABLED)
> +				continue;
> +
>  			thermal_zone_device_init(tz);
>  			thermal_zone_device_update(tz,
>  						   THERMAL_EVENT_UNS
> PECIFIED);
Wei Wang April 22, 2019, 4:44 p.m. UTC | #2
On Mon, Apr 22, 2019 at 2:03 AM Zhang Rui <rui.zhang@intel.com> wrote:
>
> On 二, 2019-04-16 at 10:07 -0700, Wei Wang wrote:
> > It is unnecessary to update disabled thermal zones post suspend and
> > sometimes leads error/warning in bad behaved thermal drivers.
> >
> a good catch, and in fact, there are more issues about thermal handling
> for disabled thermal zones, like we're able to read the temperature of
> disabled thermal zones, either via sysfs or via function calls like
> thermal_zone_device_update.
Thanks Rui for following up. Yes, we noticed the same behavior. Right
now, individual thermal driver can still respect set_mode and present
value meaningful or return error when thermal zone disabled, and
that's what we do locally.
Currently, sysfs-api documents "Preventing kernel thermal zone driver
actions upon trip points so that user application can take full charge
of the thermal management.", so is it intended for some other agents
in kernel or user land polling temperature with function call or sysfs
respectively?

Thanks!
-Wei
> For this patch, I will take it as it fixes one of the problem.
>
> thanks,
> rui
>
> > Signed-off-by: Wei Wang <wvw@google.com>
> > ---
> >  drivers/thermal/thermal_core.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/thermal/thermal_core.c
> > b/drivers/thermal/thermal_core.c
> > index 6590bb5cb688..5baf5cfab999 100644
> > --- a/drivers/thermal/thermal_core.c
> > +++ b/drivers/thermal/thermal_core.c
> > @@ -1494,6 +1494,7 @@ static int thermal_pm_notify(struct
> > notifier_block *nb,
> >                            unsigned long mode, void *_unused)
> >  {
> >       struct thermal_zone_device *tz;
> > +     enum thermal_device_mode tz_mode;
> >
> >       switch (mode) {
> >       case PM_HIBERNATION_PREPARE:
> > @@ -1506,6 +1507,13 @@ static int thermal_pm_notify(struct
> > notifier_block *nb,
> >       case PM_POST_SUSPEND:
> >               atomic_set(&in_suspend, 0);
> >               list_for_each_entry(tz, &thermal_tz_list, node) {
> > +                     tz_mode = THERMAL_DEVICE_ENABLED;
> > +                     if (tz->ops->get_mode)
> > +                             tz->ops->get_mode(tz, &tz_mode);
> > +
> > +                     if (tz_mode == THERMAL_DEVICE_DISABLED)
> > +                             continue;
> > +
> >                       thermal_zone_device_init(tz);
> >                       thermal_zone_device_update(tz,
> >                                                  THERMAL_EVENT_UNS
> > PECIFIED);
Zhang Rui April 23, 2019, 6:15 a.m. UTC | #3
On 一, 2019-04-22 at 09:44 -0700, Wei Wang wrote:
> On Mon, Apr 22, 2019 at 2:03 AM Zhang Rui <rui.zhang@intel.com>
> wrote:
> > 
> > 
> > On 二, 2019-04-16 at 10:07 -0700, Wei Wang wrote:
> > > 
> > > It is unnecessary to update disabled thermal zones post suspend
> > > and
> > > sometimes leads error/warning in bad behaved thermal drivers.
> > > 
> > a good catch, and in fact, there are more issues about thermal
> > handling
> > for disabled thermal zones, like we're able to read the temperature
> > of
> > disabled thermal zones, either via sysfs or via function calls like
> > thermal_zone_device_update.
> Thanks Rui for following up. Yes, we noticed the same behavior. Right
> now, individual thermal driver can still respect set_mode and present
> value meaningful or return error when thermal zone disabled, and
> that's what we do locally.
> Currently, sysfs-api documents "Preventing kernel thermal zone driver
> actions upon trip points so that user application can take full
> charge
> of the thermal management.", so is it intended for some other agents
> in kernel or user land polling temperature with function call or
> sysfs
> respectively?

hmmm, here we have three cases,
1). we can read the temperature and we can take cooling actions.
2). we can read the temperature only
3). we can not read the temperature

we do have a case for 3), e.g. the wifi device, which registers a
thermal zone, but it does not work if wifi firmware is unloaded. And
IMO, we should set the thermal zone mode to disable for this case.

I'm not sure if there is any case for 2), but if we do, it seems to me
that we should set its governor to nop, rather then the way we're
describing in the sys-abi file.

we should fix the code and doc to use "mode" attribute to handle case
3) instead.

thanks,
rui
> 
> Thanks!
> -Wei
> > 
> > For this patch, I will take it as it fixes one of the problem.
> > 
> > thanks,
> > rui
> > 
> > > 
> > > Signed-off-by: Wei Wang <wvw@google.com>
> > > ---
> > >  drivers/thermal/thermal_core.c | 8 ++++++++
> > >  1 file changed, 8 insertions(+)
> > > 
> > > diff --git a/drivers/thermal/thermal_core.c
> > > b/drivers/thermal/thermal_core.c
> > > index 6590bb5cb688..5baf5cfab999 100644
> > > --- a/drivers/thermal/thermal_core.c
> > > +++ b/drivers/thermal/thermal_core.c
> > > @@ -1494,6 +1494,7 @@ static int thermal_pm_notify(struct
> > > notifier_block *nb,
> > >                            unsigned long mode, void *_unused)
> > >  {
> > >       struct thermal_zone_device *tz;
> > > +     enum thermal_device_mode tz_mode;
> > > 
> > >       switch (mode) {
> > >       case PM_HIBERNATION_PREPARE:
> > > @@ -1506,6 +1507,13 @@ static int thermal_pm_notify(struct
> > > notifier_block *nb,
> > >       case PM_POST_SUSPEND:
> > >               atomic_set(&in_suspend, 0);
> > >               list_for_each_entry(tz, &thermal_tz_list, node) {
> > > +                     tz_mode = THERMAL_DEVICE_ENABLED;
> > > +                     if (tz->ops->get_mode)
> > > +                             tz->ops->get_mode(tz, &tz_mode);
> > > +
> > > +                     if (tz_mode == THERMAL_DEVICE_DISABLED)
> > > +                             continue;
> > > +
> > >                       thermal_zone_device_init(tz);
> > >                       thermal_zone_device_update(tz,
> > >                                                  THERMAL_EVENT_UN
> > > S
> > > PECIFIED);
Wei Wang April 23, 2019, 10:50 p.m. UTC | #4
On Mon, Apr 22, 2019 at 11:15 PM Zhang Rui <rui.zhang@intel.com> wrote:
>
> On 一, 2019-04-22 at 09:44 -0700, Wei Wang wrote:
> > On Mon, Apr 22, 2019 at 2:03 AM Zhang Rui <rui.zhang@intel.com>
> > wrote:
> > >
> > >
> > > On 二, 2019-04-16 at 10:07 -0700, Wei Wang wrote:
> > > >
> > > > It is unnecessary to update disabled thermal zones post suspend
> > > > and
> > > > sometimes leads error/warning in bad behaved thermal drivers.
> > > >
> > > a good catch, and in fact, there are more issues about thermal
> > > handling
> > > for disabled thermal zones, like we're able to read the temperature
> > > of
> > > disabled thermal zones, either via sysfs or via function calls like
> > > thermal_zone_device_update.
> > Thanks Rui for following up. Yes, we noticed the same behavior. Right
> > now, individual thermal driver can still respect set_mode and present
> > value meaningful or return error when thermal zone disabled, and
> > that's what we do locally.
> > Currently, sysfs-api documents "Preventing kernel thermal zone driver
> > actions upon trip points so that user application can take full
> > charge
> > of the thermal management.", so is it intended for some other agents
> > in kernel or user land polling temperature with function call or
> > sysfs
> > respectively?
>
> hmmm, here we have three cases,
> 1). we can read the temperature and we can take cooling actions.
> 2). we can read the temperature only
> 3). we can not read the temperature
>
> we do have a case for 3), e.g. the wifi device, which registers a
> thermal zone, but it does not work if wifi firmware is unloaded. And
> IMO, we should set the thermal zone mode to disable for this case.

Agree.

Another thought of suspend/resume case is in mobile world, most of the
thermal zone sensors are interrupt capable and the linked cooling
devices are platform cooling devices whose states won't be affected
during suspend.  So resetting each thermal zone during suspend/resume
just wasted cycles/power on mobile due to re-setting trip threshold
again and again and also delays in device resume. I am proposing that
we have a flag in device tree per thermal zone to let thermal core not
reset during suspend/resume.

> I'm not sure if there is any case for 2), but if we do, it seems to me
> that we should set its governor to nop, rather then the way we're
> describing in the sys-abi file.
+1 noop sounds good. Do you have plan to change it?

>
> we should fix the code and doc to use "mode" attribute to handle case
> 3) instead.
>
> thanks,
> rui
> >
> > Thanks!
> > -Wei
> > >
> > > For this patch, I will take it as it fixes one of the problem.
> > >
> > > thanks,
> > > rui
> > >
> > > >
> > > > Signed-off-by: Wei Wang <wvw@google.com>
> > > > ---
> > > >  drivers/thermal/thermal_core.c | 8 ++++++++
> > > >  1 file changed, 8 insertions(+)
> > > >
> > > > diff --git a/drivers/thermal/thermal_core.c
> > > > b/drivers/thermal/thermal_core.c
> > > > index 6590bb5cb688..5baf5cfab999 100644
> > > > --- a/drivers/thermal/thermal_core.c
> > > > +++ b/drivers/thermal/thermal_core.c
> > > > @@ -1494,6 +1494,7 @@ static int thermal_pm_notify(struct
> > > > notifier_block *nb,
> > > >                            unsigned long mode, void *_unused)
> > > >  {
> > > >       struct thermal_zone_device *tz;
> > > > +     enum thermal_device_mode tz_mode;
> > > >
> > > >       switch (mode) {
> > > >       case PM_HIBERNATION_PREPARE:
> > > > @@ -1506,6 +1507,13 @@ static int thermal_pm_notify(struct
> > > > notifier_block *nb,
> > > >       case PM_POST_SUSPEND:
> > > >               atomic_set(&in_suspend, 0);
> > > >               list_for_each_entry(tz, &thermal_tz_list, node) {
> > > > +                     tz_mode = THERMAL_DEVICE_ENABLED;
> > > > +                     if (tz->ops->get_mode)
> > > > +                             tz->ops->get_mode(tz, &tz_mode);
> > > > +
> > > > +                     if (tz_mode == THERMAL_DEVICE_DISABLED)
> > > > +                             continue;
> > > > +
> > > >                       thermal_zone_device_init(tz);
> > > >                       thermal_zone_device_update(tz,
> > > >                                                  THERMAL_EVENT_UN
> > > > S
> > > > PECIFIED);

Patch
diff mbox series

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 6590bb5cb688..5baf5cfab999 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1494,6 +1494,7 @@  static int thermal_pm_notify(struct notifier_block *nb,
 			     unsigned long mode, void *_unused)
 {
 	struct thermal_zone_device *tz;
+	enum thermal_device_mode tz_mode;
 
 	switch (mode) {
 	case PM_HIBERNATION_PREPARE:
@@ -1506,6 +1507,13 @@  static int thermal_pm_notify(struct notifier_block *nb,
 	case PM_POST_SUSPEND:
 		atomic_set(&in_suspend, 0);
 		list_for_each_entry(tz, &thermal_tz_list, node) {
+			tz_mode = THERMAL_DEVICE_ENABLED;
+			if (tz->ops->get_mode)
+				tz->ops->get_mode(tz, &tz_mode);
+
+			if (tz_mode == THERMAL_DEVICE_DISABLED)
+				continue;
+
 			thermal_zone_device_init(tz);
 			thermal_zone_device_update(tz,
 						   THERMAL_EVENT_UNSPECIFIED);