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: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Thomas Sujith <sujith.thomas@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Zhang Rui
Len Brown
parent
3f655ef8c4
commit
ce44e19701
1 changed files with 189 additions and 146 deletions
|
|
@ -323,173 +323,221 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
|
#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
|
||||||
|
|
||||||
|
#define ACPI_TRIPS_INIT (ACPI_TRIPS_CRITICAL | ACPI_TRIPS_HOT | \
|
||||||
|
ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE | \
|
||||||
|
ACPI_TRIPS_DEVICES)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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;
|
acpi_status status = AE_OK;
|
||||||
int i = 0;
|
struct acpi_handle_list devices;
|
||||||
|
int valid = 0;
|
||||||
|
int i;
|
||||||
if (!tz)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
/* Critical Shutdown (required) */
|
/* Critical Shutdown (required) */
|
||||||
|
if (flag & ACPI_TRIPS_CRITICAL) {
|
||||||
status = acpi_evaluate_integer(tz->device->handle, "_CRT", NULL,
|
status = acpi_evaluate_integer(tz->device->handle,
|
||||||
&tz->trips.critical.temperature);
|
"_CRT", NULL, &tz->trips.critical.temperature);
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
tz->trips.critical.flags.valid = 0;
|
|
||||||
ACPI_EXCEPTION((AE_INFO, status, "No critical threshold"));
|
|
||||||
return -ENODEV;
|
|
||||||
} else {
|
|
||||||
tz->trips.critical.flags.valid = 1;
|
|
||||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
||||||
"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;
|
tz->trips.critical.flags.valid = 0;
|
||||||
} else if (crt > 0) {
|
ACPI_EXCEPTION((AE_INFO, status,
|
||||||
unsigned long crt_k = CELSIUS_TO_KELVIN(crt);
|
"No critical threshold"));
|
||||||
|
return -ENODEV;
|
||||||
/*
|
} else {
|
||||||
* Allow override to lower critical threshold
|
tz->trips.critical.flags.valid = 1;
|
||||||
*/
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||||
if (crt_k < tz->trips.critical.temperature)
|
"Found critical threshold [%lu]\n",
|
||||||
tz->trips.critical.temperature = crt_k;
|
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
|
||||||
|
*/
|
||||||
|
if (crt_k < tz->trips.critical.temperature)
|
||||||
|
tz->trips.critical.temperature = crt_k;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Critical Sleep (optional) */
|
/* Critical Sleep (optional) */
|
||||||
|
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"));
|
|
||||||
} else {
|
|
||||||
tz->trips.hot.flags.valid = 1;
|
|
||||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found hot threshold [%lu]\n",
|
|
||||||
tz->trips.hot.temperature));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Passive: Processors (optional) */
|
|
||||||
|
|
||||||
if (psv == -1) {
|
|
||||||
status = AE_SUPPORT;
|
|
||||||
} else if (psv > 0) {
|
|
||||||
tz->trips.passive.temperature = CELSIUS_TO_KELVIN(psv);
|
|
||||||
status = AE_OK;
|
|
||||||
} else {
|
|
||||||
status = acpi_evaluate_integer(tz->device->handle,
|
status = acpi_evaluate_integer(tz->device->handle,
|
||||||
"_PSV", NULL, &tz->trips.passive.temperature);
|
"_HOT", NULL, &tz->trips.hot.temperature);
|
||||||
}
|
if (ACPI_FAILURE(status)) {
|
||||||
|
tz->trips.hot.flags.valid = 0;
|
||||||
if (ACPI_FAILURE(status)) {
|
|
||||||
tz->trips.passive.flags.valid = 0;
|
|
||||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No passive threshold\n"));
|
|
||||||
} else {
|
|
||||||
tz->trips.passive.flags.valid = 1;
|
|
||||||
|
|
||||||
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);
|
|
||||||
if (ACPI_FAILURE(status))
|
|
||||||
tz->trips.passive.flags.valid = 0;
|
|
||||||
|
|
||||||
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 (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,
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||||
"Found passive threshold [%lu]\n",
|
"No hot threshold\n"));
|
||||||
tz->trips.passive.temperature));
|
} else {
|
||||||
|
tz->trips.hot.flags.valid = 1;
|
||||||
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||||
|
"Found hot threshold [%lu]\n",
|
||||||
|
tz->trips.critical.temperature));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Active: Fans, etc. (optional) */
|
/* Passive (optional) */
|
||||||
|
if (flag & ACPI_TRIPS_PASSIVE) {
|
||||||
|
valid = tz->trips.passive.flags.valid;
|
||||||
|
if (psv == -1) {
|
||||||
|
status = AE_SUPPORT;
|
||||||
|
} else if (psv > 0) {
|
||||||
|
tz->trips.passive.temperature = CELSIUS_TO_KELVIN(psv);
|
||||||
|
status = AE_OK;
|
||||||
|
} else {
|
||||||
|
status = acpi_evaluate_integer(tz->device->handle,
|
||||||
|
"_PSV", NULL, &tz->trips.passive.temperature);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ACPI_FAILURE(status))
|
||||||
|
tz->trips.passive.flags.valid = 0;
|
||||||
|
else {
|
||||||
|
tz->trips.passive.flags.valid = 1;
|
||||||
|
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);
|
||||||
|
if (ACPI_FAILURE(status))
|
||||||
|
tz->trips.passive.flags.valid = 0;
|
||||||
|
status = acpi_evaluate_integer(
|
||||||
|
tz->device->handle, "_TSP",
|
||||||
|
NULL, &tz->trips.passive.tsp);
|
||||||
|
if (ACPI_FAILURE(status))
|
||||||
|
tz->trips.passive.flags.valid = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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;
|
||||||
|
else
|
||||||
|
tz->trips.passive.flags.valid = 1;
|
||||||
|
|
||||||
|
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++) {
|
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
|
||||||
|
|
||||||
char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };
|
char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };
|
||||||
|
valid = tz->trips.active[i].flags.valid;
|
||||||
|
|
||||||
if (act == -1)
|
if (act == -1)
|
||||||
break; /* disable all active trip points */
|
break; /* disable all active trip points */
|
||||||
|
|
||||||
status = acpi_evaluate_integer(tz->device->handle,
|
if (flag & ACPI_TRIPS_ACTIVE) {
|
||||||
name, NULL, &tz->trips.active[i].temperature);
|
status = acpi_evaluate_integer(tz->device->handle,
|
||||||
|
name, NULL, &tz->trips.active[i].temperature);
|
||||||
if (ACPI_FAILURE(status)) {
|
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)
|
||||||
|
break;
|
||||||
|
if (i == 1)
|
||||||
|
tz->trips.active[0].temperature =
|
||||||
|
CELSIUS_TO_KELVIN(act);
|
||||||
|
else
|
||||||
|
/*
|
||||||
|
* Don't allow override higher than
|
||||||
|
* the next higher trip point
|
||||||
|
*/
|
||||||
|
tz->trips.active[i - 1].temperature =
|
||||||
|
(tz->trips.active[i - 2].temperature <
|
||||||
|
CELSIUS_TO_KELVIN(act) ?
|
||||||
|
tz->trips.active[i - 2].temperature :
|
||||||
|
CELSIUS_TO_KELVIN(act));
|
||||||
break;
|
break;
|
||||||
if (act <= 0) /* no override requested */
|
} else
|
||||||
break;
|
tz->trips.active[i].flags.valid = 1;
|
||||||
if (i == 1) { /* 1 trip point */
|
|
||||||
tz->trips.active[0].temperature =
|
|
||||||
CELSIUS_TO_KELVIN(act);
|
|
||||||
} else { /* multiple trips */
|
|
||||||
/*
|
|
||||||
* Don't allow override higher than
|
|
||||||
* the next higher trip point
|
|
||||||
*/
|
|
||||||
tz->trips.active[i - 1].temperature =
|
|
||||||
(tz->trips.active[i - 2].temperature <
|
|
||||||
CELSIUS_TO_KELVIN(act) ?
|
|
||||||
tz->trips.active[i - 2].temperature :
|
|
||||||
CELSIUS_TO_KELVIN(act));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
name[2] = 'L';
|
name[2] = 'L';
|
||||||
status =
|
if ((flag & ACPI_TRIPS_DEVICES) && tz->trips.active[i].flags.valid ) {
|
||||||
acpi_evaluate_reference(tz->device->handle, name, NULL,
|
memset(&devices, 0, sizeof(struct acpi_handle_list));
|
||||||
&tz->trips.active[i].devices);
|
status = acpi_evaluate_reference(tz->device->handle,
|
||||||
if (ACPI_SUCCESS(status)) {
|
name, NULL, &devices);
|
||||||
tz->trips.active[i].flags.valid = 1;
|
if (ACPI_FAILURE(status))
|
||||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
tz->trips.active[i].flags.valid = 0;
|
||||||
"Found active threshold [%d]:[%lu]\n",
|
else
|
||||||
i, tz->trips.active[i].temperature));
|
tz->trips.active[i].flags.valid = 1;
|
||||||
} else
|
|
||||||
ACPI_EXCEPTION((AE_INFO, status,
|
if (memcmp(&tz->trips.active[i].devices, &devices,
|
||||||
"Invalid active threshold [%d]", i));
|
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");
|
||||||
|
|
||||||
|
if (!tz->trips.active[i].flags.valid)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int acpi_thermal_get_devices(struct acpi_thermal *tz)
|
static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
|
||||||
{
|
{
|
||||||
acpi_status status = AE_OK;
|
return acpi_thermal_trips_update(tz, ACPI_TRIPS_INIT);
|
||||||
|
|
||||||
|
|
||||||
if (!tz)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
status =
|
|
||||||
acpi_evaluate_reference(tz->device->handle, "_TZD", NULL, &tz->devices);
|
|
||||||
if (ACPI_FAILURE(status))
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int acpi_thermal_critical(struct acpi_thermal *tz)
|
static int acpi_thermal_critical(struct acpi_thermal *tz)
|
||||||
|
|
@ -1453,15 +1501,15 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
|
||||||
acpi_thermal_check(tz);
|
acpi_thermal_check(tz);
|
||||||
break;
|
break;
|
||||||
case ACPI_THERMAL_NOTIFY_THRESHOLDS:
|
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_thermal_check(tz);
|
||||||
acpi_bus_generate_proc_event(device, event, 0);
|
acpi_bus_generate_proc_event(device, event, 0);
|
||||||
acpi_bus_generate_netlink_event(device->pnp.device_class,
|
acpi_bus_generate_netlink_event(device->pnp.device_class,
|
||||||
device->dev.bus_id, event, 0);
|
device->dev.bus_id, event, 0);
|
||||||
break;
|
break;
|
||||||
case ACPI_THERMAL_NOTIFY_DEVICES:
|
case ACPI_THERMAL_NOTIFY_DEVICES:
|
||||||
if (tz->flags.devices)
|
acpi_thermal_trips_update(tz, ACPI_TRIPS_REFRESH_DEVICES);
|
||||||
acpi_thermal_get_devices(tz);
|
acpi_thermal_check(tz);
|
||||||
acpi_bus_generate_proc_event(device, event, 0);
|
acpi_bus_generate_proc_event(device, event, 0);
|
||||||
acpi_bus_generate_netlink_event(device->pnp.device_class,
|
acpi_bus_generate_netlink_event(device->pnp.device_class,
|
||||||
device->dev.bus_id, event, 0);
|
device->dev.bus_id, event, 0);
|
||||||
|
|
@ -1504,11 +1552,6 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
|
||||||
else
|
else
|
||||||
acpi_thermal_get_polling_frequency(tz);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue