Merge branch 'thermal-core' (53389edd) · Commits · EulixOS / Software / Kernel

drivers/acpi/thermal.c

+31 −14

Original line number	Diff line number	Diff line
		@@ -787,6 +787,32 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
		.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)
		{
		int trips = 0;
		@@ -820,21 +846,15 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
		if (IS_ERR(tz->thermal_zone))
		return -ENODEV;

		result = sysfs_create_link(&tz->device->dev.kobj,
		&tz->thermal_zone->device.kobj, "thermal_zone");
		result = acpi_thermal_zone_sysfs_add(tz);
		if (result)
		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,
		tz->thermal_zone);
		if (ACPI_FAILURE(status)) {
		result = -ENODEV;
		goto remove_dev_link;
		goto remove_links;
		}

		result = thermal_zone_device_enable(tz->thermal_zone);
		@@ -848,10 +868,8 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)

		acpi_bus_detach:
		acpi_bus_detach_private_data(tz->device->handle);
		remove_dev_link:
		sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");
		remove_tz_link:
		sysfs_remove_link(&tz->device->dev.kobj, "thermal_zone");
		remove_links:
		acpi_thermal_zone_sysfs_remove(tz);
		unregister_tzd:
		thermal_zone_device_unregister(tz->thermal_zone);

		@@ -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)
		{
		sysfs_remove_link(&tz->device->dev.kobj, "thermal_zone");
		sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");
		acpi_thermal_zone_sysfs_remove(tz);
		thermal_zone_device_unregister(tz->thermal_zone);
		tz->thermal_zone = NULL;
		acpi_bus_detach_private_data(tz->device->handle);

drivers/thermal/gov_step_wise.c

+6 −22

Original line number	Diff line number	Diff line
		@@ -21,19 +21,11 @@
		* a. if the trend is THERMAL_TREND_RAISING, use higher cooling
		* state for this trip point
		* 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,
		* a. if the trend is THERMAL_TREND_RAISING, do nothing
		* b. if the trend is THERMAL_TREND_DROPPING, use lower cooling
		* state for this trip point, if the cooling state already
		* 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,
		enum thermal_trend trend, bool throttle)
		@@ -61,25 +53,17 @@ static unsigned long get_target_state(struct thermal_instance *instance,
		return next_target;
		}

		switch (trend) {
		case THERMAL_TREND_RAISING:
		if (throttle) {
		if (trend == THERMAL_TREND_RAISING)
		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 {
		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);
		}
		}
		break;
		default:
		break;
		}

		return next_target;
		}

drivers/thermal/intel/Kconfig

+0 −9

Original line number	Diff line number	Diff line
		@@ -103,15 +103,6 @@ config INTEL_TCC_COOLING
		on how fast the setting takes effect, and how much the CPU frequency
		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
		bool "Intel Hardware Feedback Interface"
		depends on NET

drivers/thermal/intel/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -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_TCC_COOLING) += intel_tcc_cooling.o
		obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
		obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
		obj-$(CONFIG_INTEL_HFI_THERMAL) += intel_hfi.o

drivers/thermal/intel/intel_menlow.c

deleted100644 → 0

+0 −521

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Intel menlow Driver for thermal management extension
		*
		* Copyright (C) 2008 Intel Corp
		* Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
		* Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
		*
		* This driver creates the sys I/F for programming the sensors.
		* It also implements the driver for intel menlow memory controller (hardware
		* id is INT0002) which makes use of the platform specific ACPI methods
		* to get/set bandwidth.
		*/

		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

		#include <linux/acpi.h>
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/pci.h>
		#include <linux/pm.h>
		#include <linux/slab.h>
		#include <linux/thermal.h>
		#include <linux/types.h>
		#include <linux/units.h>

		MODULE_AUTHOR("Thomas Sujith");
		MODULE_AUTHOR("Zhang Rui");
		MODULE_DESCRIPTION("Intel Menlow platform specific driver");
		MODULE_LICENSE("GPL v2");

		/*
		* Memory controller device control
		*/

		#define MEMORY_GET_BANDWIDTH "GTHS"
		#define MEMORY_SET_BANDWIDTH "STHS"
		#define MEMORY_ARG_CUR_BANDWIDTH 1
		#define MEMORY_ARG_MAX_BANDWIDTH 0

		static void intel_menlow_unregister_sensor(void);

		/*
		* GTHS returning 'n' would mean that [0,n-1] states are supported
		* In that case max_cstate would be n-1
		* GTHS returning '0' would mean that no bandwidth control states are supported
		*/
		static int memory_get_max_bandwidth(struct thermal_cooling_device *cdev,
		unsigned long *max_state)
		{
		struct acpi_device *device = cdev->devdata;
		acpi_handle handle = device->handle;
		unsigned long long value;
		struct acpi_object_list arg_list;
		union acpi_object arg;
		acpi_status status = AE_OK;

		arg_list.count = 1;
		arg_list.pointer = &arg;
		arg.type = ACPI_TYPE_INTEGER;
		arg.integer.value = MEMORY_ARG_MAX_BANDWIDTH;
		status = acpi_evaluate_integer(handle, MEMORY_GET_BANDWIDTH,
		&arg_list, &value);
		if (ACPI_FAILURE(status))
		return -EFAULT;

		if (!value)
		return -EINVAL;

		*max_state = value - 1;
		return 0;
		}

		static int memory_get_cur_bandwidth(struct thermal_cooling_device *cdev,
		unsigned long *value)
		{
		struct acpi_device *device = cdev->devdata;
		acpi_handle handle = device->handle;
		unsigned long long result;
		struct acpi_object_list arg_list;
		union acpi_object arg;
		acpi_status status = AE_OK;

		arg_list.count = 1;
		arg_list.pointer = &arg;
		arg.type = ACPI_TYPE_INTEGER;
		arg.integer.value = MEMORY_ARG_CUR_BANDWIDTH;
		status = acpi_evaluate_integer(handle, MEMORY_GET_BANDWIDTH,
		&arg_list, &result);
		if (ACPI_FAILURE(status))
		return -EFAULT;

		*value = result;
		return 0;
		}

		static int memory_set_cur_bandwidth(struct thermal_cooling_device *cdev,
		unsigned long state)
		{
		struct acpi_device *device = cdev->devdata;
		acpi_handle handle = device->handle;
		struct acpi_object_list arg_list;
		union acpi_object arg;
		acpi_status status;
		unsigned long long temp;
		unsigned long max_state;

		if (memory_get_max_bandwidth(cdev, &max_state))
		return -EFAULT;

		if (state > max_state)
		return -EINVAL;

		arg_list.count = 1;
		arg_list.pointer = &arg;
		arg.type = ACPI_TYPE_INTEGER;
		arg.integer.value = state;

		status =
		acpi_evaluate_integer(handle, MEMORY_SET_BANDWIDTH, &arg_list,
		&temp);

		pr_info("Bandwidth value was %ld: status is %d\n", state, status);
		if (ACPI_FAILURE(status))
		return -EFAULT;

		return 0;
		}

		static const struct thermal_cooling_device_ops memory_cooling_ops = {
		.get_max_state = memory_get_max_bandwidth,
		.get_cur_state = memory_get_cur_bandwidth,
		.set_cur_state = memory_set_cur_bandwidth,
		};

		/*
		* Memory Device Management
		*/
		static int intel_menlow_memory_add(struct acpi_device *device)
		{
		int result = -ENODEV;
		struct thermal_cooling_device *cdev;

		if (!device)
		return -EINVAL;

		if (!acpi_has_method(device->handle, MEMORY_GET_BANDWIDTH))
		goto end;

		if (!acpi_has_method(device->handle, MEMORY_SET_BANDWIDTH))
		goto end;

		cdev = thermal_cooling_device_register("Memory controller", device,
		&memory_cooling_ops);
		if (IS_ERR(cdev)) {
		result = PTR_ERR(cdev);
		goto end;
		}

		device->driver_data = cdev;
		result = sysfs_create_link(&device->dev.kobj,
		&cdev->device.kobj, "thermal_cooling");
		if (result)
		goto unregister;

		result = sysfs_create_link(&cdev->device.kobj,
		&device->dev.kobj, "device");
		if (result) {
		sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
		goto unregister;
		}

		end:
		return result;

		unregister:
		thermal_cooling_device_unregister(cdev);
		return result;

		}

		static void intel_menlow_memory_remove(struct acpi_device *device)
		{
		struct thermal_cooling_device *cdev;

		if (!device)
		return;

		cdev = acpi_driver_data(device);
		if (!cdev)
		return;

		sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
		sysfs_remove_link(&cdev->device.kobj, "device");
		thermal_cooling_device_unregister(cdev);
		}

		static const struct acpi_device_id intel_menlow_memory_ids[] = {
		{"INT0002", 0},
		{"", 0},
		};

		static struct acpi_driver intel_menlow_memory_driver = {
		.name = "intel_menlow_thermal_control",
		.ids = intel_menlow_memory_ids,
		.ops = {
		.add = intel_menlow_memory_add,
		.remove = intel_menlow_memory_remove,
		},
		};

		/*
		* Sensor control on menlow platform
		*/

		#define THERMAL_AUX0 0
		#define THERMAL_AUX1 1
		#define GET_AUX0 "GAX0"
		#define GET_AUX1 "GAX1"
		#define SET_AUX0 "SAX0"
		#define SET_AUX1 "SAX1"

		struct intel_menlow_attribute {
		struct device_attribute attr;
		struct device *device;
		acpi_handle handle;
		struct list_head node;
		};

		static LIST_HEAD(intel_menlow_attr_list);
		static DEFINE_MUTEX(intel_menlow_attr_lock);

		/*
		* sensor_get_auxtrip - get the current auxtrip value from sensor
		* @handle: Object handle
		* @index : GET_AUX1/GET_AUX0
		* @value : The address will be fill by the value
		*/
		static int sensor_get_auxtrip(acpi_handle handle, int index,
		unsigned long long *value)
		{
		acpi_status status;

		if ((index != 0 && index != 1) \|\| !value)
		return -EINVAL;

		status = acpi_evaluate_integer(handle, index ? GET_AUX1 : GET_AUX0,
		NULL, value);
		if (ACPI_FAILURE(status))
		return -EIO;

		return 0;
		}

		/*
		* sensor_set_auxtrip - set the new auxtrip value to sensor
		* @handle: Object handle
		* @index : GET_AUX1/GET_AUX0
		* @value : The value will be set
		*/
		static int sensor_set_auxtrip(acpi_handle handle, int index, int value)
		{
		acpi_status status;
		union acpi_object arg = {
		ACPI_TYPE_INTEGER
		};
		struct acpi_object_list args = {
		1, &arg
		};
		unsigned long long temp;

		if (index != 0 && index != 1)
		return -EINVAL;

		status = acpi_evaluate_integer(handle, index ? GET_AUX0 : GET_AUX1,
		NULL, &temp);
		if (ACPI_FAILURE(status))
		return -EIO;
		if ((index && value < temp) \|\| (!index && value > temp))
		return -EINVAL;

		arg.integer.value = value;
		status = acpi_evaluate_integer(handle, index ? SET_AUX1 : SET_AUX0,
		&args, &temp);
		if (ACPI_FAILURE(status))
		return -EIO;

		/* do we need to check the return value of SAX0/SAX1 ? */

		return 0;
		}

		#define to_intel_menlow_attr(_attr) \
		container_of(_attr, struct intel_menlow_attribute, attr)

		static ssize_t aux_show(struct device dev, struct device_attribute dev_attr,
		char *buf, int idx)
		{
		struct intel_menlow_attribute *attr = to_intel_menlow_attr(dev_attr);
		unsigned long long value;
		int result;

		result = sensor_get_auxtrip(attr->handle, idx, &value);
		if (result)
		return result;

		return sprintf(buf, "%lu", deci_kelvin_to_celsius(value));
		}

		static ssize_t aux0_show(struct device *dev,
		struct device_attribute dev_attr, char buf)
		{
		return aux_show(dev, dev_attr, buf, 0);
		}

		static ssize_t aux1_show(struct device *dev,
		struct device_attribute dev_attr, char buf)
		{
		return aux_show(dev, dev_attr, buf, 1);
		}

		static ssize_t aux_store(struct device dev, struct device_attribute dev_attr,
		const char *buf, size_t count, int idx)
		{
		struct intel_menlow_attribute *attr = to_intel_menlow_attr(dev_attr);
		int value;
		int result;

		/Sanity check; should be a positive integer /
		if (!sscanf(buf, "%d", &value))
		return -EINVAL;

		if (value < 0)
		return -EINVAL;

		result = sensor_set_auxtrip(attr->handle, idx,
		celsius_to_deci_kelvin(value));
		return result ? result : count;
		}

		static ssize_t aux0_store(struct device *dev,
		struct device_attribute *dev_attr,
		const char *buf, size_t count)
		{
		return aux_store(dev, dev_attr, buf, count, 0);
		}

		static ssize_t aux1_store(struct device *dev,
		struct device_attribute *dev_attr,
		const char *buf, size_t count)
		{
		return aux_store(dev, dev_attr, buf, count, 1);
		}

		/* BIOS can enable/disable the thermal user application in dabney platform */
		#define BIOS_ENABLED "\\_TZ.GSTS"
		static ssize_t bios_enabled_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		acpi_status status;
		unsigned long long bios_enabled;

		status = acpi_evaluate_integer(NULL, BIOS_ENABLED, NULL, &bios_enabled);
		if (ACPI_FAILURE(status))
		return -ENODEV;

		return sprintf(buf, "%s\n", bios_enabled ? "enabled" : "disabled");
		}

		static int intel_menlow_add_one_attribute(char name, umode_t mode, void show,
		void store, struct device dev,
		acpi_handle handle)
		{
		struct intel_menlow_attribute *attr;
		int result;

		attr = kzalloc(sizeof(struct intel_menlow_attribute), GFP_KERNEL);
		if (!attr)
		return -ENOMEM;

		sysfs_attr_init(&attr->attr.attr); /* That is consistent naming :D */
		attr->attr.attr.name = name;
		attr->attr.attr.mode = mode;
		attr->attr.show = show;
		attr->attr.store = store;
		attr->device = dev;
		attr->handle = handle;

		result = device_create_file(dev, &attr->attr);
		if (result) {
		kfree(attr);
		return result;
		}

		mutex_lock(&intel_menlow_attr_lock);
		list_add_tail(&attr->node, &intel_menlow_attr_list);
		mutex_unlock(&intel_menlow_attr_lock);

		return 0;
		}

		static acpi_status intel_menlow_register_sensor(acpi_handle handle, u32 lvl,
		void context, void *rv)
		{
		acpi_status status;
		acpi_handle dummy;
		struct thermal_zone_device *thermal;
		int result;

		result = acpi_bus_get_private_data(handle, (void **)&thermal);
		if (result)
		return 0;

		/* _TZ must have the AUX0/1 methods */
		status = acpi_get_handle(handle, GET_AUX0, &dummy);
		if (ACPI_FAILURE(status))
		return (status == AE_NOT_FOUND) ? AE_OK : status;

		status = acpi_get_handle(handle, SET_AUX0, &dummy);
		if (ACPI_FAILURE(status))
		return (status == AE_NOT_FOUND) ? AE_OK : status;

		result = intel_menlow_add_one_attribute("aux0", 0644,
		aux0_show, aux0_store,
		&thermal->device, handle);
		if (result)
		return AE_ERROR;

		status = acpi_get_handle(handle, GET_AUX1, &dummy);
		if (ACPI_FAILURE(status))
		goto aux1_not_found;

		status = acpi_get_handle(handle, SET_AUX1, &dummy);
		if (ACPI_FAILURE(status))
		goto aux1_not_found;

		result = intel_menlow_add_one_attribute("aux1", 0644,
		aux1_show, aux1_store,
		&thermal->device, handle);
		if (result) {
		intel_menlow_unregister_sensor();
		return AE_ERROR;
		}

		/*
		* create the "dabney_enabled" attribute which means the user app
		* should be loaded or not
		*/

		result = intel_menlow_add_one_attribute("bios_enabled", 0444,
		bios_enabled_show, NULL,
		&thermal->device, handle);
		if (result) {
		intel_menlow_unregister_sensor();
		return AE_ERROR;
		}

		return AE_OK;

		aux1_not_found:
		if (status == AE_NOT_FOUND)
		return AE_OK;

		intel_menlow_unregister_sensor();
		return status;
		}

		static void intel_menlow_unregister_sensor(void)
		{
		struct intel_menlow_attribute pos, next;

		mutex_lock(&intel_menlow_attr_lock);
		list_for_each_entry_safe(pos, next, &intel_menlow_attr_list, node) {
		list_del(&pos->node);
		device_remove_file(pos->device, &pos->attr);
		kfree(pos);
		}
		mutex_unlock(&intel_menlow_attr_lock);

		return;
		}

		static int __init intel_menlow_module_init(void)
		{
		int result = -ENODEV;
		acpi_status status;
		unsigned long long enable;

		if (acpi_disabled)
		return result;

		/* Looking for the \_TZ.GSTS method */
		status = acpi_evaluate_integer(NULL, BIOS_ENABLED, NULL, &enable);
		if (ACPI_FAILURE(status) \|\| !enable)
		return -ENODEV;

		/* Looking for ACPI device MEM0 with hardware id INT0002 */
		result = acpi_bus_register_driver(&intel_menlow_memory_driver);
		if (result)
		return result;

		/* Looking for sensors in each ACPI thermal zone */
		status = acpi_walk_namespace(ACPI_TYPE_THERMAL, ACPI_ROOT_OBJECT,
		ACPI_UINT32_MAX,
		intel_menlow_register_sensor, NULL, NULL, NULL);
		if (ACPI_FAILURE(status)) {
		acpi_bus_unregister_driver(&intel_menlow_memory_driver);
		return -ENODEV;
		}

		return 0;
		}

		static void __exit intel_menlow_module_exit(void)
		{
		acpi_bus_unregister_driver(&intel_menlow_memory_driver);
		intel_menlow_unregister_sensor();
		}

		module_init(intel_menlow_module_init);
		module_exit(intel_menlow_module_exit);