Commit 9d99842f authored by Zhang Rui's avatar Zhang Rui
Browse files

Thermal: set upper and lower limits 



set upper and lower limits when binding
a thermal cooling device to a thermal zone device.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
parent 74051ba5

Documentation/thermal/sysfs-api.txt

+8 −1
Original line number Diff line number Diff line
@@ -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);

drivers/acpi/thermal.c

+35 −18
Original line number Diff line number Diff line
@@ -729,11 +729,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;
@@ -757,13 +755,21 @@ 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 (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;

		}

	}

	}



	for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {

		if (!tz->trips.active[i].flags.valid)
@@ -774,19 +780,32 @@ 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 (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;

		}

	}

	}



	for (i = 0; i < tz->devices.count; i++) {

		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;

		}
@@ -800,16 +819,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, true);

}



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, false);

}



static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {

drivers/platform/x86/acerhdf.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/thermal/thermal_sys.c

+16 −7
Original line number Diff line number Diff line
@@ -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)

include/linux/thermal.h

+4 −1
Original line number Diff line number Diff line
@@ -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(const 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 *);