Message ID | 13555515.uLZWGnKmhe@rjwysocki.net (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | thermal: core: Sanitize polling delay values | expand |
On Fri, Jul 5, 2024 at 9:34 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > If polling_delay is nonzero and passive_delay is 0, the thermal zone > will use polling except when tz->passive is nonzero, which does not make > sense. > > Also if polling_delay is nonzero and passive_delay is greater than > polling_delay, the thermal zone temperature will be updated less often > when tz->passive is nonzero. This does not make sense either. > > Ensure that none of the above will happen. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Well, the changelog is OK, but the patch is not. I'll send a v2 shortly.
Index: linux-pm/drivers/thermal/thermal_core.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_core.c +++ linux-pm/drivers/thermal/thermal_core.c @@ -1440,6 +1440,9 @@ thermal_zone_device_register_with_trips( td->threshold = INT_MAX; } + if (polling_delay > 0 && passive_delay > polling_delay) + passive_delay = polling_delay; + thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay); thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);