| Message ID | 1393483668.2637.12.camel@rzhang1-mobl4 (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
Hi Rui, On Thu, Feb 27, 2014 at 06:47:48AM +0000, Zhang Rui wrote: > On Thu, 2014-02-27 at 14:41 +0800, Zhang Rui wrote: > > From cd587add3043ed7bf3347e5d956f65ec8adf04cf Mon Sep 17 00:00:00 2001 > > From: Zhang Rui <rui.zhang@intel.com> > > Date: Fri, 24 Jan 2014 10:23:19 +0800 > > Subject: [PATCH] Thermal: thermal zone governor fix > > oops. forgot to attach the updated version. > > thanks, > rui > > From dff1b207825609e73c7722bc79dda0ea29974931 Mon Sep 17 00:00:00 2001 > From: Zhang Rui <rui.zhang@intel.com> > Date: Fri, 24 Jan 2014 10:23:19 +0800 > Subject: [PATCH] Thermal: thermal zone governor fix > > This patch does a cleanup about the thermal zone govenor, > setting and make the following rule. > 1. For thermal zone devices that are registered w/o tz->tzp, > they can use the default thermal governor only. > 2. For thermal zone devices w/ governor name specified in > tz->tzp->governor_name, we will use the default govenor > if the governor specified is not available at the moment, > and update tz->governor when the matched governor is registered. Right, but this doesn't solve my problem. What I was trying to say was that we should get the default governor if tz->tzp->governor_name is not initialized. of_parse_thermal_zones() calls thermal_zone_device_register() with a tzp that has an empty governor_name and ends up with no governor. I'll send a patch that gets you the default governor if you don't specify a governor_name in tzp and add your patch on top. Cheers, Javi -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: Javi Merino [mailto:javi.merino@arm.com] > Sent: Thursday, February 27, 2014 9:41 PM > To: Zhang, Rui > Cc: Linux PM list; eduardo; wni@nvidia.com > Subject: Re: [PATCH] Thermal: thermal zone governor fix > Importance: High > > Hi Rui, > > On Thu, Feb 27, 2014 at 06:47:48AM +0000, Zhang Rui wrote: > > On Thu, 2014-02-27 at 14:41 +0800, Zhang Rui wrote: > > > From cd587add3043ed7bf3347e5d956f65ec8adf04cf Mon Sep 17 00:00:00 > > > 2001 > > > From: Zhang Rui <rui.zhang@intel.com> > > > Date: Fri, 24 Jan 2014 10:23:19 +0800 > > > Subject: [PATCH] Thermal: thermal zone governor fix > > > > oops. forgot to attach the updated version. > > > > thanks, > > rui > > > > From dff1b207825609e73c7722bc79dda0ea29974931 Mon Sep 17 00:00:00 2001 > > From: Zhang Rui <rui.zhang@intel.com> > > Date: Fri, 24 Jan 2014 10:23:19 +0800 > > Subject: [PATCH] Thermal: thermal zone governor fix > > > > This patch does a cleanup about the thermal zone govenor, setting and > > make the following rule. > > 1. For thermal zone devices that are registered w/o tz->tzp, > > they can use the default thermal governor only. > > 2. For thermal zone devices w/ governor name specified in > > tz->tzp->governor_name, we will use the default govenor > > if the governor specified is not available at the moment, > > and update tz->governor when the matched governor is registered. > > Right, but this doesn't solve my problem. What I was trying to say was > that we should get the default governor if tz->tzp->governor_name is not > initialized. of_parse_thermal_zones() calls > thermal_zone_device_register() with a tzp that has an empty governor_name > and ends up with no governor. > I know, I tried to fix this by checking the input parameter in __find_governor, and apparently I did it wrong. Refreshed patch attached. (My Linux machine is broken at the moment, thus I will resend the refreshed patch to the list later, if you think it fixes the problem for you this time.) Thanks, rui
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 338a88b..9377487 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -56,10 +56,15 @@ static LIST_HEAD(thermal_governor_list); static DEFINE_MUTEX(thermal_list_lock); static DEFINE_MUTEX(thermal_governor_lock); +static struct thermal_governor *def_governor; + static struct thermal_governor *__find_governor(const char *name) { struct thermal_governor *pos; + if (!name) + return def_governor; + list_for_each_entry(pos, &thermal_governor_list, governor_list) if (!strnicmp(name, pos->name, THERMAL_NAME_LENGTH)) return pos; @@ -82,17 +87,23 @@ int thermal_register_governor(struct thermal_governor *governor) if (__find_governor(governor->name) == NULL) { err = 0; list_add(&governor->governor_list, &thermal_governor_list); + if (!def_governor && !strncmp(governor->name, + DEFAULT_THERMAL_GOVERNOR, THERMAL_NAME_LENGTH)) + def_governor = governor; } mutex_lock(&thermal_list_lock); list_for_each_entry(pos, &thermal_tz_list, node) { + /* + * only thermal zones with specified tz->tzp->governor_name + * may run with tz->govenor unset + */ if (pos->governor) continue; - if (pos->tzp) - name = pos->tzp->governor_name; - else - name = DEFAULT_THERMAL_GOVERNOR; + + name = pos->tzp->governor_name; + if (!strnicmp(name, governor->name, THERMAL_NAME_LENGTH)) pos->governor = governor; } @@ -342,8 +353,8 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz) static void handle_non_critical_trips(struct thermal_zone_device *tz, int trip, enum thermal_trip_type trip_type) { - if (tz->governor) - tz->governor->throttle(tz, trip); + tz->governor ? tz->governor->throttle(tz, trip) : + def_governor->throttle(tz, trip); } static void handle_critical_trips(struct thermal_zone_device *tz, @@ -1533,7 +1544,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, if (tz->tzp) tz->governor = __find_governor(tz->tzp->governor_name); else - tz->governor = __find_governor(DEFAULT_THERMAL_GOVERNOR); + tz->governor = def_governor; mutex_unlock(&thermal_governor_lock);