Add initial support for DPTF adaptive performance policy

Makefile.am

@@ -9,6 +9,8 @@ AM_CFLAGS = ${DBUS_CFLAGS}
 AM_CXXFLAGS = \
 	${DBUS_CFLAGS} \
 	$(XML_CFLAGS) \
+	$(UPOWER_CFLAGS) \
+	$(EVDEV_CFLAGS) \
 	-DTDRUNDIR=\"$(tdrundir)\" \
 	-DTDCONFDIR=\"$(tdconfdir)\" \
 	$(CXXFLAGS) \
@@ -33,7 +35,10 @@ thermald_LDADD = \
 	$(LIBNL_LIBS) \
 	$(LIBM) \
 	$(LIBDL) \
-	$(XML_LIBS)
+	$(XML_LIBS) \
+	$(LZMA_LIBS) \
+	$(UPOWER_LIBS) \
+	$(EVDEV_LIBS)
 
 BUILT_SOURCES = \
 	thd_dbus_interface.h
@@ -45,6 +50,7 @@ thermald_SOURCES = \
 	src/thd_cdev.cpp \
 	src/thd_cdev_therm_sys_fs.cpp \
 	src/thd_engine_default.cpp \
+	src/thd_engine_adaptive.cpp \
 	src/thd_sys_fs.cpp \
 	src/thd_trip_point.cpp \
 	src/thd_zone.cpp \

README.txt

@@ -30,6 +30,9 @@ Install
 	yum install glib-devel
 	yum install dbus-glib-devel
 	yum install libxml2-devel
+	yum install upower-devel
+	yum install xz-devel
+	yum install libevdev-devel
 
 Replace yum with dnf for later Fedora versions.
 
@@ -64,6 +67,9 @@ Building on Ubuntu
 	sudo apt-get install libdbus-1-dev
 	sudo apt-get install libdbus-glib-1-dev
 	sudo apt-get install libxml2-dev
+	sudo apt-get install libupower-glib-dev
+	sudo apt-get install liblzma-dev
+	sudo apt-get install libevdev-dev
 
 2
 Build

configure.ac

@@ -70,6 +70,12 @@ AC_SUBST(GLIB_LIBS)
 
 PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.4)
 
+PKG_CHECK_MODULES(LZMA, liblzma)
+
+PKG_CHECK_MODULES(UPOWER, upower-glib)
+
+PKG_CHECK_MODULES(EVDEV, libevdev)
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX

patches/0001-thermal-int340x_thermal-Export-GDDV.patch

@@ -0,0 +1,115 @@
+From 38bca68953e268e389aafac1be70067fe88ff8d3 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg59@google.com>
+Date: Fri, 27 Mar 2020 20:35:51 -0700
+Subject: [PATCH 1/2] thermal/int340x_thermal: Export GDDV
+
+Implementing DPTF properly requires making use of firmware-provided
+information associated with the INT3400 device. Calling GDDV provides a
+buffer of information which userland can then interpret to determine
+appropriate DPTF policy.
+
+Signed-off-by: Matthew Garrett <mjg59@google.com>
+---
+ .../intel/int340x_thermal/int3400_thermal.c   | 47 +++++++++++++++++++
+ 1 file changed, 47 insertions(+)
+
+diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+index efae0c02d898..5785c0b09e54 100644
+--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
++++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+@@ -52,6 +52,25 @@ struct int3400_thermal_priv {
+ 	u8 uuid_bitmap;
+ 	int rel_misc_dev_res;
+ 	int current_uuid_index;
++	char *data_vault;
++};
++
++static ssize_t data_vault_read(struct file *file, struct kobject *kobj,
++	     struct bin_attribute *attr, char *buf, loff_t off, size_t count)
++{
++	memcpy(buf, attr->private + off, count);
++	return count;
++}
++
++static BIN_ATTR_RO(data_vault, 0);
++
++static struct bin_attribute *data_attributes[] = {
++	&bin_attr_data_vault,
++	NULL,
++};
++
++static const struct attribute_group data_attribute_group = {
++	.bin_attrs = data_attributes,
+ };
+
+ static ssize_t available_uuids_show(struct device *dev,
+@@ -280,8 +299,11 @@ static struct thermal_zone_params int3400_thermal_params = {
+
+ static int int3400_thermal_probe(struct platform_device *pdev)
+ {
++	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ 	struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+ 	struct int3400_thermal_priv *priv;
++	union acpi_object *obj;
++	acpi_status status;
+ 	int result;
+
+ 	if (!adev)
+@@ -309,6 +331,19 @@ static int int3400_thermal_probe(struct platform_device *pdev)
+
+ 	platform_set_drvdata(pdev, priv);
+
++	status = acpi_evaluate_object(priv->adev->handle, "GDDV", NULL, &buffer);
++	if (ACPI_SUCCESS(status) && buffer.length) {
++		obj = buffer.pointer;
++		if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 1
++			&& obj->package.elements[0].type == ACPI_TYPE_BUFFER) {
++			priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer, obj->package.elements[0].buffer.length, GFP_KERNEL);
++			bin_attr_data_vault.private = priv->data_vault;
++			bin_attr_data_vault.size = obj->package.elements[0].buffer.length;
++		}
++
++		kfree(buffer.pointer);
++	}
++
+ 	int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
+ 	int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
+
+@@ -327,6 +362,12 @@ static int int3400_thermal_probe(struct platform_device *pdev)
+ 	if (result)
+ 		goto free_rel_misc;
+
++	if (priv->data_vault) {
++		result = sysfs_create_group(&pdev->dev.kobj, &data_attribute_group);
++		if (result)
++			goto free_uuid;
++	}
++
+ 	result = acpi_install_notify_handler(
+ 			priv->adev->handle, ACPI_DEVICE_NOTIFY, int3400_notify,
+ 			(void *)priv);
+@@ -336,6 +377,9 @@ static int int3400_thermal_probe(struct platform_device *pdev)
+ 	return 0;
+
+ free_sysfs:
++	if (priv->data_vault)
++		sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);
++free_uuid:
+ 	sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group);
+ free_rel_misc:
+ 	if (!priv->rel_misc_dev_res)
+@@ -360,8 +404,11 @@ static int int3400_thermal_remove(struct platform_device *pdev)
+ 	if (!priv->rel_misc_dev_res)
+ 		acpi_thermal_rel_misc_device_remove(priv->adev->handle);
+
++	if (priv->data_vault)
++		sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);
+ 	sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group);
+ 	thermal_zone_device_unregister(priv->thermal);
++	kfree(priv->data_vault);
+ 	kfree(priv->trts);
+ 	kfree(priv->arts);
+ 	kfree(priv);
+-- 
+2.24.1
+