superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI: thermal: switch to use <linux/units.h> helpers 

This switches the ACPI thermal zone driver to use
celsius_to_deci_kelvin(), deci_kelvin_to_celsius(), and
deci_kelvin_to_millicelsius_with_offset() in <linux/units.h> instead of
helpers in <linux/thermal.h>.

This is preparation for centralizing the kelvin to/from Celsius
conversion helpers in <linux/units.h>.

Link: http://lkml.kernel.org/r/1576386975-7941-3-git-send-email-akinobu.mita@gmail.com
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Sujith Thomas <sujith.thomas@intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Amit Kucheria <amit.kucheria@verdurent.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Jens Axboe <axboe@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Jonathan Cameron <jic23@kernel.org>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Luca Coelho <luciano.coelho@intel.com>
Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
pull/759/merge
Akinobu Mita 2020-01-30 22:15:33 -08:00 committed by Linus Torvalds
parent 23331e4893
commit 7f49a5cb94
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/acpi/thermal.c
View File

@ -27,6 +27,7 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/units.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
@ -172,7 +173,7 @@ struct acpi_thermal {
struct acpi_handle_list devices; struct acpi_handle_list devices;
struct thermal_zone_device *thermal_zone; struct thermal_zone_device *thermal_zone;
int tz_enabled; int tz_enabled;
int kelvin_offset; int kelvin_offset; /* in millidegrees */
struct work_struct thermal_check_work; struct work_struct thermal_check_work;
}; };
@ -297,7 +298,8 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
if (crt == -1) { if (crt == -1) {
tz->trips.critical.flags.valid = 0; tz->trips.critical.flags.valid = 0;
} else if (crt > 0) { } else if (crt > 0) {
unsigned long crt_k = CELSIUS_TO_DECI_KELVIN(crt); unsigned long crt_k = celsius_to_deci_kelvin(crt);
/* /*
* Allow override critical threshold * Allow override critical threshold
*/ */
@ -333,7 +335,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
if (psv == -1) { if (psv == -1) {
status = AE_SUPPORT; status = AE_SUPPORT;
} else if (psv > 0) { } else if (psv > 0) {
tmp = CELSIUS_TO_DECI_KELVIN(psv); tmp = celsius_to_deci_kelvin(psv);
status = AE_OK; status = AE_OK;
} else { } else {
status = acpi_evaluate_integer(tz->device->handle, status = acpi_evaluate_integer(tz->device->handle,
@ -413,7 +415,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
break; break;
if (i == 1) if (i == 1)
tz->trips.active[0].temperature = tz->trips.active[0].temperature =
CELSIUS_TO_DECI_KELVIN(act); celsius_to_deci_kelvin(act);
else else
/* /*
* Don't allow override higher than * Don't allow override higher than
@ -421,9 +423,9 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
*/ */
tz->trips.active[i - 1].temperature = tz->trips.active[i - 1].temperature =
(tz->trips.active[i - 2].temperature < (tz->trips.active[i - 2].temperature <
CELSIUS_TO_DECI_KELVIN(act) ? celsius_to_deci_kelvin(act) ?
tz->trips.active[i - 2].temperature : tz->trips.active[i - 2].temperature :
CELSIUS_TO_DECI_KELVIN(act)); celsius_to_deci_kelvin(act));
break; break;
} else { } else {
tz->trips.active[i].temperature = tmp; tz->trips.active[i].temperature = tmp;
@ -519,7 +521,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)
if (result) if (result)
return result; return result;
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(tz->temperature, *temp = deci_kelvin_to_millicelsius_with_offset(tz->temperature,
tz->kelvin_offset); tz->kelvin_offset);
return 0; return 0;
} }
@ -624,7 +626,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
if (tz->trips.critical.flags.valid) { if (tz->trips.critical.flags.valid) {
if (!trip) { if (!trip) {
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( *temp = deci_kelvin_to_millicelsius_with_offset(
tz->trips.critical.temperature, tz->trips.critical.temperature,
tz->kelvin_offset); tz->kelvin_offset);
return 0; return 0;
@ -634,7 +636,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
if (tz->trips.hot.flags.valid) { if (tz->trips.hot.flags.valid) {
if (!trip) { if (!trip) {
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( *temp = deci_kelvin_to_millicelsius_with_offset(
tz->trips.hot.temperature, tz->trips.hot.temperature,
tz->kelvin_offset); tz->kelvin_offset);
return 0; return 0;
@ -644,7 +646,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
if (tz->trips.passive.flags.valid) { if (tz->trips.passive.flags.valid) {
if (!trip) { if (!trip) {
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( *temp = deci_kelvin_to_millicelsius_with_offset(
tz->trips.passive.temperature, tz->trips.passive.temperature,
tz->kelvin_offset); tz->kelvin_offset);
return 0; return 0;
@ -655,7 +657,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
tz->trips.active[i].flags.valid; i++) { tz->trips.active[i].flags.valid; i++) {
if (!trip) { if (!trip) {
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( *temp = deci_kelvin_to_millicelsius_with_offset(
tz->trips.active[i].temperature, tz->trips.active[i].temperature,
tz->kelvin_offset); tz->kelvin_offset);
return 0; return 0;
@ -672,7 +674,7 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
struct acpi_thermal *tz = thermal->devdata; struct acpi_thermal *tz = thermal->devdata;
if (tz->trips.critical.flags.valid) { if (tz->trips.critical.flags.valid) {
*temperature = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( *temperature = deci_kelvin_to_millicelsius_with_offset(
tz->trips.critical.temperature, tz->trips.critical.temperature,
tz->kelvin_offset); tz->kelvin_offset);
return 0; return 0;
@ -692,7 +694,7 @@ static int thermal_get_trend(struct thermal_zone_device *thermal,
if (type == THERMAL_TRIP_ACTIVE) { if (type == THERMAL_TRIP_ACTIVE) {
int trip_temp; int trip_temp;
int temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( int temp = deci_kelvin_to_millicelsius_with_offset(
tz->temperature, tz->kelvin_offset); tz->temperature, tz->kelvin_offset);
if (thermal_get_trip_temp(thermal, trip, &trip_temp)) if (thermal_get_trip_temp(thermal, trip, &trip_temp))
return -EINVAL; return -EINVAL;
@ -1043,9 +1045,9 @@ static void acpi_thermal_guess_offset(struct acpi_thermal *tz)
{ {
if (tz->trips.critical.flags.valid && if (tz->trips.critical.flags.valid &&
(tz->trips.critical.temperature % 5) == 1) (tz->trips.critical.temperature % 5) == 1)
tz->kelvin_offset = 2731; tz->kelvin_offset = 273100;
else else
tz->kelvin_offset = 2732; tz->kelvin_offset = 273200;
} }
static void acpi_thermal_check_fn(struct work_struct *work) static void acpi_thermal_check_fn(struct work_struct *work)
@ -1087,7 +1089,7 @@ static int acpi_thermal_add(struct acpi_device *device)
INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn); INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn);
pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device), pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device),
acpi_device_bid(device), DECI_KELVIN_TO_CELSIUS(tz->temperature)); acpi_device_bid(device), deci_kelvin_to_celsius(tz->temperature));
goto end; goto end;
free_memory: free_memory: