Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce44e197 authored by Zhang Rui's avatar Zhang Rui Committed by Len Brown
Browse files

ACPI: ACPI thermal zone handle notification correctly 



Change the ACPI thermal action upon notification 0x81 and 0x82.

According to the ACPI spec, we should:
re-evaluate _PSV and _ACx methods upon notification 0x81
re-evaluate _PSL and _ALx and _TZD upon notificaiton 0x82.
But the current code re-evaluates all the trip points for 0x81 while
only re-evaluates _TZD for 0x82.

Fix this violation of ACPI spec.

TODO: devices in _PSL, _ALx and _TZD may change after a notification 0x82.
      At this time, we need to re-bind the cooling devices with the thermal zone.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarThomas Sujith <sujith.thomas@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3f655ef8

drivers/acpi/thermal.c

+184 −141
Original line number Diff line number Diff line
@@ -323,22 +323,49 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode) 
	return 0;

}



static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)

{

	acpi_status status = AE_OK;

	int i = 0;

#define ACPI_TRIPS_CRITICAL	0x01

#define ACPI_TRIPS_HOT		0x02

#define ACPI_TRIPS_PASSIVE	0x04

#define ACPI_TRIPS_ACTIVE	0x08

#define ACPI_TRIPS_DEVICES	0x10



#define ACPI_TRIPS_REFRESH_THRESHOLDS	(ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE)

#define ACPI_TRIPS_REFRESH_DEVICES	ACPI_TRIPS_DEVICES



	if (!tz)

		return -EINVAL;

#define ACPI_TRIPS_INIT      (ACPI_TRIPS_CRITICAL | ACPI_TRIPS_HOT |	\

			      ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE |	\

			      ACPI_TRIPS_DEVICES)



	/* Critical Shutdown (required) */

/*

 * This exception is thrown out in two cases:

 * 1.An invalid trip point becomes invalid or a valid trip point becomes invalid

 *   when re-evaluating the AML code.

 * 2.TODO: Devices listed in _PSL, _ALx, _TZD may change.

 *   We need to re-bind the cooling devices of a thermal zone when this occurs.

 */

#define ACPI_THERMAL_TRIPS_EXCEPTION(flags, str)	\

do {	\

	if (flags != ACPI_TRIPS_INIT)	\

		ACPI_EXCEPTION((AE_INFO, AE_ERROR,	\

		"ACPI thermal trip point %s changed\n"	\

		"Please send acpidump to linux-acpi@vger.kernel.org\n", str)); \

} while (0)



static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)

{

	acpi_status status = AE_OK;

	struct acpi_handle_list devices;

	int valid = 0;

	int i;



	status = acpi_evaluate_integer(tz->device->handle, "_CRT", NULL,

				       &tz->trips.critical.temperature);

	/* Critical Shutdown (required) */

	if (flag & ACPI_TRIPS_CRITICAL) {

		status = acpi_evaluate_integer(tz->device->handle,

				"_CRT", NULL, &tz->trips.critical.temperature);

		if (ACPI_FAILURE(status)) {

			tz->trips.critical.flags.valid = 0;

		ACPI_EXCEPTION((AE_INFO, status, "No critical threshold"));

			ACPI_EXCEPTION((AE_INFO, status,

					"No critical threshold"));

			return -ENODEV;

		} else {

			tz->trips.critical.flags.valid = 1;
@@ -346,13 +373,11 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz) 
					"Found critical threshold [%lu]\n",

					tz->trips.critical.temperature));

		}



		if (tz->trips.critical.flags.valid == 1) {

			if (crt == -1) {

				tz->trips.critical.flags.valid = 0;

			} else if (crt > 0) {

				unsigned long crt_k = CELSIUS_TO_KELVIN(crt);



				/*

				 * Allow override to lower critical threshold

				 */
@@ -360,23 +385,27 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz) 
					tz->trips.critical.temperature = crt_k;

			}

		}

	}



	/* Critical Sleep (optional) */



	status =

	    acpi_evaluate_integer(tz->device->handle, "_HOT", NULL,

				  &tz->trips.hot.temperature);

	if (flag & ACPI_TRIPS_HOT) {

		status = acpi_evaluate_integer(tz->device->handle,

				"_HOT", NULL, &tz->trips.hot.temperature);

		if (ACPI_FAILURE(status)) {

			tz->trips.hot.flags.valid = 0;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No hot threshold\n"));

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					"No hot threshold\n"));

		} else {

			tz->trips.hot.flags.valid = 1;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found hot threshold [%lu]\n",

				  tz->trips.hot.temperature));

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					"Found hot threshold [%lu]\n",

					tz->trips.critical.temperature));

		}

	}



	/* Passive: Processors (optional) */



	/* Passive (optional) */

	if (flag & ACPI_TRIPS_PASSIVE) {

		valid = tz->trips.passive.flags.valid;

		if (psv == -1) {

			status = AE_SUPPORT;

		} else if (psv > 0) {
@@ -387,65 +416,71 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz) 
				"_PSV", NULL, &tz->trips.passive.temperature);

		}



	if (ACPI_FAILURE(status)) {

		if (ACPI_FAILURE(status))

			tz->trips.passive.flags.valid = 0;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No passive threshold\n"));

	} else {

		else {

			tz->trips.passive.flags.valid = 1;



		status =

		    acpi_evaluate_integer(tz->device->handle, "_TC1", NULL,

					  &tz->trips.passive.tc1);

			if (flag == ACPI_TRIPS_INIT) {

				status = acpi_evaluate_integer(

						tz->device->handle, "_TC1",

						NULL, &tz->trips.passive.tc1);

				if (ACPI_FAILURE(status))

					tz->trips.passive.flags.valid = 0;



		status =

		    acpi_evaluate_integer(tz->device->handle, "_TC2", NULL,

					  &tz->trips.passive.tc2);

				status = acpi_evaluate_integer(

						tz->device->handle, "_TC2",

						NULL, &tz->trips.passive.tc2);

				if (ACPI_FAILURE(status))

					tz->trips.passive.flags.valid = 0;



		status =

		    acpi_evaluate_integer(tz->device->handle, "_TSP", NULL,

					  &tz->trips.passive.tsp);

				status = acpi_evaluate_integer(

						tz->device->handle, "_TSP",

						NULL, &tz->trips.passive.tsp);

				if (ACPI_FAILURE(status))

					tz->trips.passive.flags.valid = 0;



		status =

		    acpi_evaluate_reference(tz->device->handle, "_PSL", NULL,

					    &tz->trips.passive.devices);

			}

		}

	}

	if ((flag & ACPI_TRIPS_DEVICES) && tz->trips.passive.flags.valid) {

		memset(&devices, 0, sizeof(struct acpi_handle_list));

		status = acpi_evaluate_reference(tz->device->handle, "_PSL",

							NULL, &devices);

		if (ACPI_FAILURE(status))

			tz->trips.passive.flags.valid = 0;



		if (!tz->trips.passive.flags.valid)

			printk(KERN_WARNING PREFIX "Invalid passive threshold\n");

		else

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					  "Found passive threshold [%lu]\n",

					  tz->trips.passive.temperature));

	}

			tz->trips.passive.flags.valid = 1;



	/* Active: Fans, etc. (optional) */

		if (memcmp(&tz->trips.passive.devices, &devices,

				sizeof(struct acpi_handle_list))) {

			memcpy(&tz->trips.passive.devices, &devices,

				sizeof(struct acpi_handle_list));

			ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");

		}

	}

	if ((flag & ACPI_TRIPS_PASSIVE) || (flag & ACPI_TRIPS_DEVICES)) {

		if (valid != tz->trips.passive.flags.valid)

				ACPI_THERMAL_TRIPS_EXCEPTION(flag, "state");

	}



	/* Active (optional) */

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



		char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };

		valid = tz->trips.active[i].flags.valid;



		if (act == -1)

			break; /* disable all active trip points */



		if (flag & ACPI_TRIPS_ACTIVE) {

			status = acpi_evaluate_integer(tz->device->handle,

				name, NULL, &tz->trips.active[i].temperature);



			if (ACPI_FAILURE(status)) {

			if (i == 0)	/* no active trip points */

				tz->trips.active[i].flags.valid = 0;

				if (i == 0)

					break;

			if (act <= 0)	/* no override requested */

				if (act <= 0)

					break;

			if (i == 1) {	/* 1 trip point */

				if (i == 1)

					tz->trips.active[0].temperature =

						CELSIUS_TO_KELVIN(act);

			} else {	/* multiple trips */

				else

					/*

					 * Don't allow override higher than

					 * the next higher trip point
@@ -455,43 +490,56 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz) 
						CELSIUS_TO_KELVIN(act) ?

						tz->trips.active[i - 2].temperature :

						CELSIUS_TO_KELVIN(act));

			}

				break;

			} else

				tz->trips.active[i].flags.valid = 1;

		}



		name[2] = 'L';

		status =

		    acpi_evaluate_reference(tz->device->handle, name, NULL,

					    &tz->trips.active[i].devices);

		if (ACPI_SUCCESS(status)) {

		if ((flag & ACPI_TRIPS_DEVICES) && tz->trips.active[i].flags.valid ) {

			memset(&devices, 0, sizeof(struct acpi_handle_list));

			status = acpi_evaluate_reference(tz->device->handle,

						name, NULL, &devices);

			if (ACPI_FAILURE(status))

				tz->trips.active[i].flags.valid = 0;

			else

				tz->trips.active[i].flags.valid = 1;

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					  "Found active threshold [%d]:[%lu]\n",

					  i, tz->trips.active[i].temperature));

		} else

			ACPI_EXCEPTION((AE_INFO, status,

					"Invalid active threshold [%d]", i));

	}



	return 0;

			if (memcmp(&tz->trips.active[i].devices, &devices,

					sizeof(struct acpi_handle_list))) {

				memcpy(&tz->trips.active[i].devices, &devices,

					sizeof(struct acpi_handle_list));

				ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");

			}

		}

		if ((flag & ACPI_TRIPS_ACTIVE) || (flag & ACPI_TRIPS_DEVICES))

			if (valid != tz->trips.active[i].flags.valid)

				ACPI_THERMAL_TRIPS_EXCEPTION(flag, "state");



static int acpi_thermal_get_devices(struct acpi_thermal *tz)

{

	acpi_status status = AE_OK;





	if (!tz)

		return -EINVAL;

		if (!tz->trips.active[i].flags.valid)

			break;

	}



	status =

	    acpi_evaluate_reference(tz->device->handle, "_TZD", NULL, &tz->devices);

	if (ACPI_FAILURE(status))

		return -ENODEV;

	if (flag & ACPI_TRIPS_DEVICES) {

		memset(&devices, 0, sizeof(struct acpi_handle_list));

		status = acpi_evaluate_reference(tz->device->handle, "_TZD",

						NULL, &devices);

		if (memcmp(&tz->devices, &devices,

				sizeof(struct acpi_handle_list))) {

			memcpy(&tz->devices, &devices,

				sizeof(struct acpi_handle_list));

			ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");

		}

	}



	return 0;

}



static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)

{

	return acpi_thermal_trips_update(tz, ACPI_TRIPS_INIT);

}



static int acpi_thermal_critical(struct acpi_thermal *tz)

{

	if (!tz || !tz->trips.critical.flags.valid || nocrt)
@@ -1453,15 +1501,15 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data) 
		acpi_thermal_check(tz);

		break;

	case ACPI_THERMAL_NOTIFY_THRESHOLDS:

		acpi_thermal_get_trip_points(tz);

		acpi_thermal_trips_update(tz, ACPI_TRIPS_REFRESH_THRESHOLDS);

		acpi_thermal_check(tz);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  device->dev.bus_id, event, 0);

		break;

	case ACPI_THERMAL_NOTIFY_DEVICES:

		if (tz->flags.devices)

			acpi_thermal_get_devices(tz);

		acpi_thermal_trips_update(tz, ACPI_TRIPS_REFRESH_DEVICES);

		acpi_thermal_check(tz);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  device->dev.bus_id, event, 0);
@@ -1504,11 +1552,6 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz) 
	else

		acpi_thermal_get_polling_frequency(tz);



	/* Get devices in this thermal zone [_TZD] (optional) */

	result = acpi_thermal_get_devices(tz);

	if (!result)

		tz->flags.devices = 1;



	return 0;

}