mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 21:52:04 +00:00
eb8500b874
After commit 81ad4276b5 ("Thermal: Ignore invalid trip points") all
user_space governor notifications via RW trip point is broken in intel
thermal drivers. This commits marks trip_points with value of 0 during
call to thermal_zone_device_register() as invalid. RW trip points can be
0 as user space will set the correct trip temperature later.
During driver init, x86_package_temp and all int340x drivers sets RW trip
temperature as 0. This results in all these trips marked as invalid by
the thermal core.
To fix this initialize RW trips to THERMAL_TEMP_INVALID instead of 0.
Cc: <stable@vger.kernel.org>
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210430122343.1789899-1-srinivas.pandruvada@linux.intel.com
303 lines
7.9 KiB
C
303 lines
7.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* int340x_thermal_zone.c
|
|
* Copyright (c) 2015, Intel Corporation.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/acpi.h>
|
|
#include <linux/thermal.h>
|
|
#include <linux/units.h>
|
|
#include "int340x_thermal_zone.h"
|
|
|
|
static int int340x_thermal_get_zone_temp(struct thermal_zone_device *zone,
|
|
int *temp)
|
|
{
|
|
struct int34x_thermal_zone *d = zone->devdata;
|
|
unsigned long long tmp;
|
|
acpi_status status;
|
|
|
|
if (d->override_ops && d->override_ops->get_temp)
|
|
return d->override_ops->get_temp(zone, temp);
|
|
|
|
status = acpi_evaluate_integer(d->adev->handle, "_TMP", NULL, &tmp);
|
|
if (ACPI_FAILURE(status))
|
|
return -EIO;
|
|
|
|
if (d->lpat_table) {
|
|
int conv_temp;
|
|
|
|
conv_temp = acpi_lpat_raw_to_temp(d->lpat_table, (int)tmp);
|
|
if (conv_temp < 0)
|
|
return conv_temp;
|
|
|
|
*temp = (unsigned long)conv_temp * 10;
|
|
} else
|
|
/* _TMP returns the temperature in tenths of degrees Kelvin */
|
|
*temp = deci_kelvin_to_millicelsius(tmp);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone,
|
|
int trip, int *temp)
|
|
{
|
|
struct int34x_thermal_zone *d = zone->devdata;
|
|
int i;
|
|
|
|
if (d->override_ops && d->override_ops->get_trip_temp)
|
|
return d->override_ops->get_trip_temp(zone, trip, temp);
|
|
|
|
if (trip < d->aux_trip_nr)
|
|
*temp = d->aux_trips[trip];
|
|
else if (trip == d->crt_trip_id)
|
|
*temp = d->crt_temp;
|
|
else if (trip == d->psv_trip_id)
|
|
*temp = d->psv_temp;
|
|
else if (trip == d->hot_trip_id)
|
|
*temp = d->hot_temp;
|
|
else {
|
|
for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
|
|
if (d->act_trips[i].valid &&
|
|
d->act_trips[i].id == trip) {
|
|
*temp = d->act_trips[i].temp;
|
|
break;
|
|
}
|
|
}
|
|
if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone,
|
|
int trip,
|
|
enum thermal_trip_type *type)
|
|
{
|
|
struct int34x_thermal_zone *d = zone->devdata;
|
|
int i;
|
|
|
|
if (d->override_ops && d->override_ops->get_trip_type)
|
|
return d->override_ops->get_trip_type(zone, trip, type);
|
|
|
|
if (trip < d->aux_trip_nr)
|
|
*type = THERMAL_TRIP_PASSIVE;
|
|
else if (trip == d->crt_trip_id)
|
|
*type = THERMAL_TRIP_CRITICAL;
|
|
else if (trip == d->hot_trip_id)
|
|
*type = THERMAL_TRIP_HOT;
|
|
else if (trip == d->psv_trip_id)
|
|
*type = THERMAL_TRIP_PASSIVE;
|
|
else {
|
|
for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
|
|
if (d->act_trips[i].valid &&
|
|
d->act_trips[i].id == trip) {
|
|
*type = THERMAL_TRIP_ACTIVE;
|
|
break;
|
|
}
|
|
}
|
|
if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone,
|
|
int trip, int temp)
|
|
{
|
|
struct int34x_thermal_zone *d = zone->devdata;
|
|
acpi_status status;
|
|
char name[10];
|
|
|
|
if (d->override_ops && d->override_ops->set_trip_temp)
|
|
return d->override_ops->set_trip_temp(zone, trip, temp);
|
|
|
|
snprintf(name, sizeof(name), "PAT%d", trip);
|
|
status = acpi_execute_simple_method(d->adev->handle, name,
|
|
millicelsius_to_deci_kelvin(temp));
|
|
if (ACPI_FAILURE(status))
|
|
return -EIO;
|
|
|
|
d->aux_trips[trip] = temp;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone,
|
|
int trip, int *temp)
|
|
{
|
|
struct int34x_thermal_zone *d = zone->devdata;
|
|
acpi_status status;
|
|
unsigned long long hyst;
|
|
|
|
if (d->override_ops && d->override_ops->get_trip_hyst)
|
|
return d->override_ops->get_trip_hyst(zone, trip, temp);
|
|
|
|
status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);
|
|
if (ACPI_FAILURE(status))
|
|
*temp = 0;
|
|
else
|
|
*temp = hyst * 100;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void int340x_thermal_critical(struct thermal_zone_device *zone)
|
|
{
|
|
dev_dbg(&zone->device, "%s: critical temperature reached\n", zone->type);
|
|
}
|
|
|
|
static struct thermal_zone_device_ops int340x_thermal_zone_ops = {
|
|
.get_temp = int340x_thermal_get_zone_temp,
|
|
.get_trip_temp = int340x_thermal_get_trip_temp,
|
|
.get_trip_type = int340x_thermal_get_trip_type,
|
|
.set_trip_temp = int340x_thermal_set_trip_temp,
|
|
.get_trip_hyst = int340x_thermal_get_trip_hyst,
|
|
.critical = int340x_thermal_critical,
|
|
};
|
|
|
|
static int int340x_thermal_get_trip_config(acpi_handle handle, char *name,
|
|
int *temp)
|
|
{
|
|
unsigned long long r;
|
|
acpi_status status;
|
|
|
|
status = acpi_evaluate_integer(handle, name, NULL, &r);
|
|
if (ACPI_FAILURE(status))
|
|
return -EIO;
|
|
|
|
*temp = deci_kelvin_to_millicelsius(r);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int int340x_thermal_read_trips(struct int34x_thermal_zone *int34x_zone)
|
|
{
|
|
int trip_cnt = int34x_zone->aux_trip_nr;
|
|
int i;
|
|
|
|
int34x_zone->crt_trip_id = -1;
|
|
if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_CRT",
|
|
&int34x_zone->crt_temp))
|
|
int34x_zone->crt_trip_id = trip_cnt++;
|
|
|
|
int34x_zone->hot_trip_id = -1;
|
|
if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_HOT",
|
|
&int34x_zone->hot_temp))
|
|
int34x_zone->hot_trip_id = trip_cnt++;
|
|
|
|
int34x_zone->psv_trip_id = -1;
|
|
if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_PSV",
|
|
&int34x_zone->psv_temp))
|
|
int34x_zone->psv_trip_id = trip_cnt++;
|
|
|
|
for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
|
|
char name[5] = { '_', 'A', 'C', '0' + i, '\0' };
|
|
|
|
if (int340x_thermal_get_trip_config(int34x_zone->adev->handle,
|
|
name,
|
|
&int34x_zone->act_trips[i].temp))
|
|
break;
|
|
|
|
int34x_zone->act_trips[i].id = trip_cnt++;
|
|
int34x_zone->act_trips[i].valid = true;
|
|
}
|
|
|
|
return trip_cnt;
|
|
}
|
|
EXPORT_SYMBOL_GPL(int340x_thermal_read_trips);
|
|
|
|
static struct thermal_zone_params int340x_thermal_params = {
|
|
.governor_name = "user_space",
|
|
.no_hwmon = true,
|
|
};
|
|
|
|
struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
|
|
struct thermal_zone_device_ops *override_ops)
|
|
{
|
|
struct int34x_thermal_zone *int34x_thermal_zone;
|
|
acpi_status status;
|
|
unsigned long long trip_cnt;
|
|
int trip_mask = 0;
|
|
int ret;
|
|
|
|
int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone),
|
|
GFP_KERNEL);
|
|
if (!int34x_thermal_zone)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
int34x_thermal_zone->adev = adev;
|
|
int34x_thermal_zone->override_ops = override_ops;
|
|
|
|
status = acpi_evaluate_integer(adev->handle, "PATC", NULL, &trip_cnt);
|
|
if (ACPI_FAILURE(status))
|
|
trip_cnt = 0;
|
|
else {
|
|
int i;
|
|
|
|
int34x_thermal_zone->aux_trips =
|
|
kcalloc(trip_cnt,
|
|
sizeof(*int34x_thermal_zone->aux_trips),
|
|
GFP_KERNEL);
|
|
if (!int34x_thermal_zone->aux_trips) {
|
|
ret = -ENOMEM;
|
|
goto err_trip_alloc;
|
|
}
|
|
trip_mask = BIT(trip_cnt) - 1;
|
|
int34x_thermal_zone->aux_trip_nr = trip_cnt;
|
|
for (i = 0; i < trip_cnt; ++i)
|
|
int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID;
|
|
}
|
|
|
|
trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);
|
|
|
|
int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table(
|
|
adev->handle);
|
|
|
|
int34x_thermal_zone->zone = thermal_zone_device_register(
|
|
acpi_device_bid(adev),
|
|
trip_cnt,
|
|
trip_mask, int34x_thermal_zone,
|
|
&int340x_thermal_zone_ops,
|
|
&int340x_thermal_params,
|
|
0, 0);
|
|
if (IS_ERR(int34x_thermal_zone->zone)) {
|
|
ret = PTR_ERR(int34x_thermal_zone->zone);
|
|
goto err_thermal_zone;
|
|
}
|
|
ret = thermal_zone_device_enable(int34x_thermal_zone->zone);
|
|
if (ret)
|
|
goto err_enable;
|
|
|
|
return int34x_thermal_zone;
|
|
|
|
err_enable:
|
|
thermal_zone_device_unregister(int34x_thermal_zone->zone);
|
|
err_thermal_zone:
|
|
acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
|
|
kfree(int34x_thermal_zone->aux_trips);
|
|
err_trip_alloc:
|
|
kfree(int34x_thermal_zone);
|
|
return ERR_PTR(ret);
|
|
}
|
|
EXPORT_SYMBOL_GPL(int340x_thermal_zone_add);
|
|
|
|
void int340x_thermal_zone_remove(struct int34x_thermal_zone
|
|
*int34x_thermal_zone)
|
|
{
|
|
thermal_zone_device_unregister(int34x_thermal_zone->zone);
|
|
acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
|
|
kfree(int34x_thermal_zone->aux_trips);
|
|
kfree(int34x_thermal_zone);
|
|
}
|
|
EXPORT_SYMBOL_GPL(int340x_thermal_zone_remove);
|
|
|
|
MODULE_AUTHOR("Aaron Lu <aaron.lu@intel.com>");
|
|
MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
|
|
MODULE_DESCRIPTION("Intel INT340x common thermal zone handler");
|
|
MODULE_LICENSE("GPL v2");
|