Commit 53389edd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'thermal-core'

Merge additional thermal core and ACPI thermal changes for 6.4-rc1:

 - Clean up the step-wise thermal governor (Zhang Rui).

 - Introduce thermal_zone_device() for accessing the device field of
   struct thermal_zone_device and two drivers use it (Daniel Lezcano).

 - Clean up the ACPI thermal driver a bit (Daniel Lezcano).

 - Delete the thermal driver for Intel Menlow platforms that is not
   expected to have any users (Rafael Wysocki).

* thermal-core:
  thermal: intel: menlow: Get rid of this driver
  ACPI: thermal: Move to dedicated function sysfs extra attr creation
  ACPI: thermal: Use thermal_zone_device()
  thermal: intel: pch_thermal: Use thermal driver device to write a trace
  thermal: core: Encapsulate tz->device field
  thermal: gov_step_wise: Adjust code logic to match comment
  thermal: gov_step_wise: Delete obsolete comment
parents dd235832 2b6a7409
...@@ -787,6 +787,32 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { ...@@ -787,6 +787,32 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
.critical = acpi_thermal_zone_device_critical, .critical = acpi_thermal_zone_device_critical,
}; };
static int acpi_thermal_zone_sysfs_add(struct acpi_thermal *tz)
{
struct device *tzdev = thermal_zone_device(tz->thermal_zone);
int ret;
ret = sysfs_create_link(&tz->device->dev.kobj,
&tzdev->kobj, "thermal_zone");
if (ret)
return ret;
ret = sysfs_create_link(&tzdev->kobj,
&tz->device->dev.kobj, "device");
if (ret)
sysfs_remove_link(&tz->device->dev.kobj, "thermal_zone");
return ret;
}
static void acpi_thermal_zone_sysfs_remove(struct acpi_thermal *tz)
{
struct device *tzdev = thermal_zone_device(tz->thermal_zone);
sysfs_remove_link(&tz->device->dev.kobj, "thermal_zone");
sysfs_remove_link(&tzdev->kobj, "device");
}
static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
{ {
int trips = 0; int trips = 0;
...@@ -820,21 +846,15 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) ...@@ -820,21 +846,15 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
if (IS_ERR(tz->thermal_zone)) if (IS_ERR(tz->thermal_zone))
return -ENODEV; return -ENODEV;
result = sysfs_create_link(&tz->device->dev.kobj, result = acpi_thermal_zone_sysfs_add(tz);
&tz->thermal_zone->device.kobj, "thermal_zone");
if (result) if (result)
goto unregister_tzd; goto unregister_tzd;
result = sysfs_create_link(&tz->thermal_zone->device.kobj,
&tz->device->dev.kobj, "device");
if (result)
goto remove_tz_link;
status = acpi_bus_attach_private_data(tz->device->handle, status = acpi_bus_attach_private_data(tz->device->handle,
tz->thermal_zone); tz->thermal_zone);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
result = -ENODEV; result = -ENODEV;
goto remove_dev_link; goto remove_links;
} }
result = thermal_zone_device_enable(tz->thermal_zone); result = thermal_zone_device_enable(tz->thermal_zone);
...@@ -848,10 +868,8 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) ...@@ -848,10 +868,8 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
acpi_bus_detach: acpi_bus_detach:
acpi_bus_detach_private_data(tz->device->handle); acpi_bus_detach_private_data(tz->device->handle);
remove_dev_link: remove_links:
sysfs_remove_link(&tz->thermal_zone->device.kobj, "device"); acpi_thermal_zone_sysfs_remove(tz);
remove_tz_link:
sysfs_remove_link(&tz->device->dev.kobj, "thermal_zone");
unregister_tzd: unregister_tzd:
thermal_zone_device_unregister(tz->thermal_zone); thermal_zone_device_unregister(tz->thermal_zone);
...@@ -860,8 +878,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) ...@@ -860,8 +878,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
static void acpi_thermal_unregister_thermal_zone(struct acpi_thermal *tz) static void acpi_thermal_unregister_thermal_zone(struct acpi_thermal *tz)
{ {
sysfs_remove_link(&tz->device->dev.kobj, "thermal_zone"); acpi_thermal_zone_sysfs_remove(tz);
sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");
thermal_zone_device_unregister(tz->thermal_zone); thermal_zone_device_unregister(tz->thermal_zone);
tz->thermal_zone = NULL; tz->thermal_zone = NULL;
acpi_bus_detach_private_data(tz->device->handle); acpi_bus_detach_private_data(tz->device->handle);
......
...@@ -21,19 +21,11 @@ ...@@ -21,19 +21,11 @@
* a. if the trend is THERMAL_TREND_RAISING, use higher cooling * a. if the trend is THERMAL_TREND_RAISING, use higher cooling
* state for this trip point * state for this trip point
* b. if the trend is THERMAL_TREND_DROPPING, do nothing * b. if the trend is THERMAL_TREND_DROPPING, do nothing
* c. if the trend is THERMAL_TREND_RAISE_FULL, use upper limit
* for this trip point
* d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit
* for this trip point
* If the temperature is lower than a trip point, * If the temperature is lower than a trip point,
* a. if the trend is THERMAL_TREND_RAISING, do nothing * a. if the trend is THERMAL_TREND_RAISING, do nothing
* b. if the trend is THERMAL_TREND_DROPPING, use lower cooling * b. if the trend is THERMAL_TREND_DROPPING, use lower cooling
* state for this trip point, if the cooling state already * state for this trip point, if the cooling state already
* equals lower limit, deactivate the thermal instance * equals lower limit, deactivate the thermal instance
* c. if the trend is THERMAL_TREND_RAISE_FULL, do nothing
* d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit,
* if the cooling state already equals lower limit,
* deactivate the thermal instance
*/ */
static unsigned long get_target_state(struct thermal_instance *instance, static unsigned long get_target_state(struct thermal_instance *instance,
enum thermal_trend trend, bool throttle) enum thermal_trend trend, bool throttle)
...@@ -61,25 +53,17 @@ static unsigned long get_target_state(struct thermal_instance *instance, ...@@ -61,25 +53,17 @@ static unsigned long get_target_state(struct thermal_instance *instance,
return next_target; return next_target;
} }
switch (trend) {
case THERMAL_TREND_RAISING:
if (throttle) { if (throttle) {
if (trend == THERMAL_TREND_RAISING)
next_target = clamp((cur_state + 1), instance->lower, instance->upper); next_target = clamp((cur_state + 1), instance->lower, instance->upper);
}
break;
case THERMAL_TREND_DROPPING:
if (cur_state <= instance->lower) {
if (!throttle)
next_target = THERMAL_NO_TARGET;
} else { } else {
if (!throttle) { if (trend == THERMAL_TREND_DROPPING) {
if (cur_state <= instance->lower)
next_target = THERMAL_NO_TARGET;
else
next_target = clamp((cur_state - 1), instance->lower, instance->upper); next_target = clamp((cur_state - 1), instance->lower, instance->upper);
} }
} }
break;
default:
break;
}
return next_target; return next_target;
} }
......
...@@ -103,15 +103,6 @@ config INTEL_TCC_COOLING ...@@ -103,15 +103,6 @@ config INTEL_TCC_COOLING
on how fast the setting takes effect, and how much the CPU frequency on how fast the setting takes effect, and how much the CPU frequency
is reduced. is reduced.
config INTEL_MENLOW
tristate "Thermal Management driver for Intel menlow platform"
depends on ACPI_THERMAL
help
ACPI thermal management enhancement driver on
Intel Menlow platform.
If unsure, say N.
config INTEL_HFI_THERMAL config INTEL_HFI_THERMAL
bool "Intel Hardware Feedback Interface" bool "Intel Hardware Feedback Interface"
depends on NET depends on NET
......
...@@ -13,5 +13,4 @@ obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o ...@@ -13,5 +13,4 @@ obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o
obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o
obj-$(CONFIG_INTEL_TCC_COOLING) += intel_tcc_cooling.o obj-$(CONFIG_INTEL_TCC_COOLING) += intel_tcc_cooling.o
obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
obj-$(CONFIG_INTEL_HFI_THERMAL) += intel_hfi.o obj-$(CONFIG_INTEL_HFI_THERMAL) += intel_hfi.o
This diff is collapsed.
...@@ -127,7 +127,8 @@ static int pch_thermal_get_temp(struct thermal_zone_device *tzd, int *temp) ...@@ -127,7 +127,8 @@ static int pch_thermal_get_temp(struct thermal_zone_device *tzd, int *temp)
static void pch_critical(struct thermal_zone_device *tzd) static void pch_critical(struct thermal_zone_device *tzd)
{ {
dev_dbg(&tzd->device, "%s: critical temperature reached\n", tzd->type); dev_dbg(thermal_zone_device(tzd), "%s: critical temperature reached\n",
thermal_zone_device_type(tzd));
} }
static struct thermal_zone_device_ops tzd_ops = { static struct thermal_zone_device_ops tzd_ops = {
......
...@@ -1398,6 +1398,12 @@ int thermal_zone_device_id(struct thermal_zone_device *tzd) ...@@ -1398,6 +1398,12 @@ int thermal_zone_device_id(struct thermal_zone_device *tzd)
} }
EXPORT_SYMBOL_GPL(thermal_zone_device_id); EXPORT_SYMBOL_GPL(thermal_zone_device_id);
struct device *thermal_zone_device(struct thermal_zone_device *tzd)
{
return &tzd->device;
}
EXPORT_SYMBOL_GPL(thermal_zone_device);
/** /**
* thermal_zone_device_unregister - removes the registered thermal zone device * thermal_zone_device_unregister - removes the registered thermal zone device
* @tz: the thermal zone device to remove * @tz: the thermal zone device to remove
......
...@@ -313,6 +313,7 @@ thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int ...@@ -313,6 +313,7 @@ thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int
void *thermal_zone_device_priv(struct thermal_zone_device *tzd); void *thermal_zone_device_priv(struct thermal_zone_device *tzd);
const char *thermal_zone_device_type(struct thermal_zone_device *tzd); const char *thermal_zone_device_type(struct thermal_zone_device *tzd);
int thermal_zone_device_id(struct thermal_zone_device *tzd); int thermal_zone_device_id(struct thermal_zone_device *tzd);
struct device *thermal_zone_device(struct thermal_zone_device *tzd);
int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
struct thermal_cooling_device *, struct thermal_cooling_device *,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment