From patchwork Wed Aug 8 12:50:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 1295021 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0DAA83FCFC for ; Wed, 8 Aug 2012 12:50:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753837Ab2HHMuU (ORCPT ); Wed, 8 Aug 2012 08:50:20 -0400 Received: from na3sys009aog120.obsmtp.com ([74.125.149.140]:36243 "EHLO na3sys009aog120.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753652Ab2HHMuS (ORCPT ); Wed, 8 Aug 2012 08:50:18 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]) (using TLSv1) by na3sys009aob120.postini.com ([74.125.148.12]) with SMTP ID DSNKUCJgibrMyut92bd6wiAKc3egsZ04vIy/@postini.com; Wed, 08 Aug 2012 05:50:18 PDT Received: by obbuo19 with SMTP id uo19so1034891obb.11 for ; Wed, 08 Aug 2012 05:50:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=IOyN/3SnwcAcyb9T0ihe6+NjOh3C+rZ/bfB9bQSpbZk=; b=kynLgvZeXzcgtflctb7UwuPXna7TFFOxVuLEFY+Q9xmm+jC4xQsVhW2qukVYn2xLK1 b5E6xouVvIFnp5p3OkIKkWuKRUvz1ynIROLLVbr2BgWgKsGZfBv1nXxip9On5geJwUZP CW8JBCHhztuorsVuenRrLZYp/rdk57/WBa3jerJNFN+mv5x6YqxhKPSATg+NkLsSWdjJ tw5vuHXdCvqbys3U4OUvHZy21/b0O9kZ0gxJm75uY5yoNBYme9ywrDtBH55J2uSXMO2F Wkvxv3HXIOYAbLxv9AU3lu0kJYzBrl0sqbPHtlhdvCvg+oLpIDq1MK/rbDRuLWo5A7O5 Skmg== MIME-Version: 1.0 Received: by 10.182.76.136 with SMTP id k8mr29877313obw.25.1344430217241; Wed, 08 Aug 2012 05:50:17 -0700 (PDT) Received: by 10.76.84.1 with HTTP; Wed, 8 Aug 2012 05:50:17 -0700 (PDT) In-Reply-To: <1343182273-32096-7-git-send-email-rui.zhang@intel.com> References: <1343182273-32096-1-git-send-email-rui.zhang@intel.com> <1343182273-32096-7-git-send-email-rui.zhang@intel.com> Date: Wed, 8 Aug 2012 15:50:17 +0300 Message-ID: Subject: Re: [PATCH RESEND 06/16] Thermal: set upper and lower limits From: "Valentin, Eduardo" To: Zhang Rui Cc: "Rafael J. Wysocki" , Matthew Garrett , Len Brown , R Durgadoss , Amit Kachhap , Wei Ni , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org X-Gm-Message-State: ALoCoQlFYMbec4WmsO9ImW/H1+jvxXwct7u5PT468lpwDrJ/kITo0ZKmUxP2diQ6uQTilfR0hq1W Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Hello Rui, On Wed, Jul 25, 2012 at 5:11 AM, Zhang Rui wrote: > set upper and lower limits when binding > a thermal cooling device to a thermal zone device. > > Signed-off-by: Zhang Rui > --- > Documentation/thermal/sysfs-api.txt | 9 +++++- > drivers/acpi/thermal.c | 53 +++++++++++++++++++++++------------ > drivers/platform/x86/acerhdf.c | 3 +- > drivers/thermal/thermal_sys.c | 23 ++++++++++----- > include/linux/thermal.h | 5 +++- Could you please update omap-thermal-common.c (drivers/staging/omap-thermal/omap-thermal-common.c) as well? otherwise I will get a compilation problem: drivers/staging/omap-thermal/omap-thermal-common.c: In function 'omap_thermal_bind': drivers/staging/omap-thermal/omap-thermal-common.c:123: error: too few arguments to function 'thermal_zone_bind_cooling_device' make[3]: *** [drivers/staging/omap-thermal/omap-thermal-common.o] Error 1 make[3]: *** Waiting for unfinished jobs.... FYR: /* Unbind callback functions for thermal zone */ Cheers, > 5 files changed, 65 insertions(+), 28 deletions(-) > > diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt > index c087dbc..ca1a1a3 100644 > --- a/Documentation/thermal/sysfs-api.txt > +++ b/Documentation/thermal/sysfs-api.txt > @@ -84,7 +84,8 @@ temperature) and throttle appropriate devices. > > 1.3 interface for binding a thermal zone device with a thermal cooling device > 1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, > - int trip, struct thermal_cooling_device *cdev); > + int trip, struct thermal_cooling_device *cdev, > + unsigned long upper, unsigned long lower); > > This interface function bind a thermal cooling device to the certain trip > point of a thermal zone device. > @@ -93,6 +94,12 @@ temperature) and throttle appropriate devices. > cdev: thermal cooling device > trip: indicates which trip point the cooling devices is associated with > in this thermal zone. > + upper:the Maximum cooling state for this trip point. > + THERMAL_NO_LIMIT means no upper limit, > + and the cooling device can be in max_state. > + lower:the Minimum cooling state can be used for this trip point. > + THERMAL_NO_LIMIT means no lower limit, > + and the cooling device can be in cooling state 0. > > 1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, > int trip, struct thermal_cooling_device *cdev); > diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c > index 8275e7b..0154eac 100644 > --- a/drivers/acpi/thermal.c > +++ b/drivers/acpi/thermal.c > @@ -727,11 +727,9 @@ static int thermal_notify(struct thermal_zone_device *thermal, int trip, > return 0; > } > > -typedef int (*cb)(struct thermal_zone_device *, int, > - struct thermal_cooling_device *); > static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, > struct thermal_cooling_device *cdev, > - cb action) > + bool bind) > { > struct acpi_device *device = cdev->devdata; > struct acpi_thermal *tz = thermal->devdata; > @@ -755,11 +753,19 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, > i++) { > handle = tz->trips.passive.devices.handles[i]; > status = acpi_bus_get_device(handle, &dev); > - if (ACPI_SUCCESS(status) && (dev == device)) { > - result = action(thermal, trip, cdev); > - if (result) > - goto failed; > - } > + if (ACPI_FAILURE(status) || dev != device) > + continue; > + if (bind) > + result = > + thermal_zone_bind_cooling_device > + (thermal, trip, cdev, > + THERMAL_NO_LIMIT, THERMAL_NO_LIMIT); > + else > + result = > + thermal_zone_unbind_cooling_device > + (thermal, trip, cdev); > + if (result) > + goto failed; > } > } > > @@ -772,11 +778,17 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, > j++) { > handle = tz->trips.active[i].devices.handles[j]; > status = acpi_bus_get_device(handle, &dev); > - if (ACPI_SUCCESS(status) && (dev == device)) { > - result = action(thermal, trip, cdev); > - if (result) > - goto failed; > - } > + if (ACPI_FAILURE(status) || dev != device) > + continue; > + if (bind) > + result = thermal_zone_bind_cooling_device > + (thermal, trip, cdev, > + THERMAL_NO_LIMIT, THERMAL_NO_LIMIT); > + else > + result = thermal_zone_unbind_cooling_device > + (thermal, trip, cdev); > + if (result) > + goto failed; > } > } > > @@ -784,7 +796,14 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, > handle = tz->devices.handles[i]; > status = acpi_bus_get_device(handle, &dev); > if (ACPI_SUCCESS(status) && (dev == device)) { > - result = action(thermal, -1, cdev); > + if (bind) > + result = thermal_zone_bind_cooling_device > + (thermal, -1, cdev, > + THERMAL_NO_LIMIT, > + THERMAL_NO_LIMIT); > + else > + result = thermal_zone_unbind_cooling_device > + (thermal, -1, cdev); > if (result) > goto failed; > } > @@ -798,16 +817,14 @@ static int > acpi_thermal_bind_cooling_device(struct thermal_zone_device *thermal, > struct thermal_cooling_device *cdev) > { > - return acpi_thermal_cooling_device_cb(thermal, cdev, > - thermal_zone_bind_cooling_device); > + return acpi_thermal_cooling_device_cb(thermal, cdev, 1); > } > > static int > acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal, > struct thermal_cooling_device *cdev) > { > - return acpi_thermal_cooling_device_cb(thermal, cdev, > - thermal_zone_unbind_cooling_device); > + return acpi_thermal_cooling_device_cb(thermal, cdev, 0); > } > > static const struct thermal_zone_device_ops acpi_thermal_zone_ops = { > diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c > index 39abb15..a207466 100644 > --- a/drivers/platform/x86/acerhdf.c > +++ b/drivers/platform/x86/acerhdf.c > @@ -329,7 +329,8 @@ static int acerhdf_bind(struct thermal_zone_device *thermal, > if (cdev != cl_dev) > return 0; > > - if (thermal_zone_bind_cooling_device(thermal, 0, cdev)) { > + if (thermal_zone_bind_cooling_device(thermal, 0, cdev, > + THERMAL_NO_LIMIT, THERMAL_NO_LIMIT)) { > pr_err("error binding cooling dev\n"); > return -EINVAL; > } > diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c > index 008e2eb..62b4279 100644 > --- a/drivers/thermal/thermal_sys.c > +++ b/drivers/thermal/thermal_sys.c > @@ -315,8 +315,9 @@ passive_store(struct device *dev, struct device_attribute *attr, > if (!strncmp("Processor", cdev->type, > sizeof("Processor"))) > thermal_zone_bind_cooling_device(tz, > - THERMAL_TRIPS_NONE, > - cdev); > + THERMAL_TRIPS_NONE, cdev, > + THERMAL_NO_LIMIT, > + THERMAL_NO_LIMIT); > } > mutex_unlock(&thermal_list_lock); > if (!tz->passive_delay) > @@ -801,7 +802,8 @@ static void thermal_zone_device_check(struct work_struct *work) > */ > int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, > int trip, > - struct thermal_cooling_device *cdev) > + struct thermal_cooling_device *cdev, > + unsigned long upper, unsigned long lower) > { > struct thermal_cooling_device_instance *dev; > struct thermal_cooling_device_instance *pos; > @@ -825,6 +827,15 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, > if (tz != pos1 || cdev != pos2) > return -EINVAL; > > + cdev->ops->get_max_state(cdev, &max_state); > + > + /* lower default 0, upper default max_state */ > + lower = lower == THERMAL_NO_LIMIT ? 0 : lower; > + upper = upper == THERMAL_NO_LIMIT ? max_state : upper; > + > + if (lower > upper || upper > max_state) > + return -EINVAL; > + > dev = > kzalloc(sizeof(struct thermal_cooling_device_instance), GFP_KERNEL); > if (!dev) > @@ -832,10 +843,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, > dev->tz = tz; > dev->cdev = cdev; > dev->trip = trip; > - > - cdev->ops->get_max_state(cdev, &max_state); > - dev->upper = max_state; > - dev->lower = 0; > + dev->upper = upper; > + dev->lower = lower; > > result = get_idr(&tz->idr, &tz->lock, &dev->id); > if (result) > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > index cfc8d90..a43b12c 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -75,6 +75,8 @@ struct thermal_cooling_device_ops { > int (*set_cur_state) (struct thermal_cooling_device *, unsigned long); > }; > > +#define THERMAL_NO_LIMIT -1UL /* no upper/lower limit requirement */ > + > #define THERMAL_TRIPS_NONE -1 > #define THERMAL_MAX_TRIPS 12 > #define THERMAL_NAME_LENGTH 20 > @@ -157,7 +159,8 @@ struct thermal_zone_device *thermal_zone_device_register(char *, int, int, > void thermal_zone_device_unregister(struct thermal_zone_device *); > > int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, > - struct thermal_cooling_device *); > + struct thermal_cooling_device *, > + unsigned long, unsigned long); > int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int, > struct thermal_cooling_device *); > void thermal_zone_device_update(struct thermal_zone_device *); > -- > 1.7.9.5 > --- a/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/drivers/staging/omap-thermal/omap-thermal-common.c @@ -120,7 +120,9 @@ static int omap_thermal_bind(struct thermal_zone_device *thermal, /* TODO: bind with min and max states */ /* Simple thing, two trips, one passive another critical */ - return thermal_zone_bind_cooling_device(thermal, 0, cdev); + return thermal_zone_bind_cooling_device(thermal, 0, cdev, + THERMAL_NO_LIMIT, + THERMAL_NO_LIMIT); }