Merge branch 'int340x-thermal' of .git into next (6ceaf58a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/acpi/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ config ACPI_VIDEO

		config ACPI_FAN
		tristate "Fan"
		select THERMAL
		depends on THERMAL
		default y
		help
		This driver supports ACPI fan devices, allowing user-mode

drivers/acpi/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ acpi-y += pci_root.o pci_link.o pci_irq.o
		acpi-y += acpi_lpss.o
		acpi-y += acpi_platform.o
		acpi-y += acpi_pnp.o
		acpi-y += int340x_thermal.o
		acpi-y += power.o
		acpi-y += event.o
		acpi-y += sysfs.o

drivers/acpi/acpi_platform.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -113,3 +113,4 @@ struct platform_device acpi_create_platform_device(struct acpi_device adev)
		kfree(resources);
		return pdev;
		}
		EXPORT_SYMBOL_GPL(acpi_create_platform_device);

drivers/acpi/device_pm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -343,6 +343,7 @@ int acpi_device_update_power(struct acpi_device device, int state_p)

		return 0;
		}
		EXPORT_SYMBOL_GPL(acpi_device_update_power);

		int acpi_bus_update_power(acpi_handle handle, int *state_p)
		{

drivers/acpi/fan.c

+265 −76

Original line number	Diff line number	Diff line
		@@ -30,24 +30,19 @@
		#include <asm/uaccess.h>
		#include <linux/thermal.h>
		#include <linux/acpi.h>

		#define PREFIX "ACPI: "

		#define ACPI_FAN_CLASS "fan"
		#define ACPI_FAN_FILE_STATE "state"

		#define _COMPONENT ACPI_FAN_COMPONENT
		ACPI_MODULE_NAME("fan");
		#include <linux/platform_device.h>
		#include <linux/sort.h>

		MODULE_AUTHOR("Paul Diefenbaugh");
		MODULE_DESCRIPTION("ACPI Fan Driver");
		MODULE_LICENSE("GPL");

		static int acpi_fan_add(struct acpi_device *device);
		static int acpi_fan_remove(struct acpi_device *device);
		static int acpi_fan_probe(struct platform_device *pdev);
		static int acpi_fan_remove(struct platform_device *pdev);

		static const struct acpi_device_id fan_device_ids[] = {
		{"PNP0C0B", 0},
		{"INT3404", 0},
		{"", 0},
		};
		MODULE_DEVICE_TABLE(acpi, fan_device_ids);
		@@ -66,37 +61,100 @@ static struct dev_pm_ops acpi_fan_pm = {
		#define FAN_PM_OPS_PTR NULL
		#endif

		static struct acpi_driver acpi_fan_driver = {
		.name = "fan",
		.class = ACPI_FAN_CLASS,
		.ids = fan_device_ids,
		.ops = {
		.add = acpi_fan_add,
		struct acpi_fan_fps {
		u64 control;
		u64 trip_point;
		u64 speed;
		u64 noise_level;
		u64 power;
		};

		struct acpi_fan_fif {
		u64 revision;
		u64 fine_grain_ctrl;
		u64 step_size;
		u64 low_speed_notification;
		};

		struct acpi_fan {
		bool acpi4;
		struct acpi_fan_fif fif;
		struct acpi_fan_fps *fps;
		int fps_count;
		struct thermal_cooling_device *cdev;
		};

		static struct platform_driver acpi_fan_driver = {
		.probe = acpi_fan_probe,
		.remove = acpi_fan_remove,
		.driver = {
		.name = "acpi-fan",
		.acpi_match_table = fan_device_ids,
		.pm = FAN_PM_OPS_PTR,
		},
		.drv.pm = FAN_PM_OPS_PTR,
		};

		/* thermal cooling device callbacks */
		static int fan_get_max_state(struct thermal_cooling_device *cdev, unsigned long
		*state)
		{
		/* ACPI fan device only support two states: ON/OFF */
		struct acpi_device *device = cdev->devdata;
		struct acpi_fan *fan = acpi_driver_data(device);

		if (fan->acpi4)
		*state = fan->fps_count - 1;
		else
		*state = 1;
		return 0;
		}

		static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
		*state)
		static int fan_get_state_acpi4(struct acpi_device device, unsigned long state)
		{
		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
		struct acpi_fan *fan = acpi_driver_data(device);
		union acpi_object *obj;
		acpi_status status;
		int control, i;

		status = acpi_evaluate_object(device->handle, "_FST", NULL, &buffer);
		if (ACPI_FAILURE(status)) {
		dev_err(&device->dev, "Get fan state failed\n");
		return status;
		}

		obj = buffer.pointer;
		if (!obj \|\| obj->type != ACPI_TYPE_PACKAGE \|\|
		obj->package.count != 3 \|\|
		obj->package.elements[1].type != ACPI_TYPE_INTEGER) {
		dev_err(&device->dev, "Invalid _FST data\n");
		status = -EINVAL;
		goto err;
		}

		control = obj->package.elements[1].integer.value;
		for (i = 0; i < fan->fps_count; i++) {
		if (control == fan->fps[i].control)
		break;
		}
		if (i == fan->fps_count) {
		dev_dbg(&device->dev, "Invalid control value returned\n");
		status = -EINVAL;
		goto err;
		}

		*state = i;

		err:
		kfree(obj);
		return status;
		}

		static int fan_get_state(struct acpi_device device, unsigned long state)
		{
		struct acpi_device *device = cdev->devdata;
		int result;
		int acpi_state = ACPI_STATE_D0;

		if (!device)
		return -EINVAL;

		result = acpi_bus_update_power(device->handle, &acpi_state);
		result = acpi_device_update_power(device, &acpi_state);
		if (result)
		return result;

		@@ -105,19 +163,55 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
		return 0;
		}

		static int
		fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
		static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
		*state)
		{
		struct acpi_device *device = cdev->devdata;
		int result;
		struct acpi_fan *fan = acpi_driver_data(device);

		if (fan->acpi4)
		return fan_get_state_acpi4(device, state);
		else
		return fan_get_state(device, state);
		}

		if (!device \|\| (state != 0 && state != 1))
		static int fan_set_state(struct acpi_device *device, unsigned long state)
		{
		if (state != 0 && state != 1)
		return -EINVAL;

		result = acpi_bus_set_power(device->handle,
		return acpi_device_set_power(device,
		state ? ACPI_STATE_D0 : ACPI_STATE_D3_COLD);
		}

		return result;
		static int fan_set_state_acpi4(struct acpi_device *device, unsigned long state)
		{
		struct acpi_fan *fan = acpi_driver_data(device);
		acpi_status status;

		if (state >= fan->fps_count)
		return -EINVAL;

		status = acpi_execute_simple_method(device->handle, "_FSL",
		fan->fps[state].control);
		if (ACPI_FAILURE(status)) {
		dev_dbg(&device->dev, "Failed to set state by _FSL\n");
		return status;
		}

		return 0;
		}

		static int
		fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
		{
		struct acpi_device *device = cdev->devdata;
		struct acpi_fan *fan = acpi_driver_data(device);

		if (fan->acpi4)
		return fan_set_state_acpi4(device, state);
		else
		return fan_set_state(device, state);
		}

		static const struct thermal_cooling_device_ops fan_cooling_ops = {
		@@ -130,22 +224,126 @@ static const struct thermal_cooling_device_ops fan_cooling_ops = {
		Driver Interface
		-------------------------------------------------------------------------- */

		static int acpi_fan_add(struct acpi_device *device)
		static bool acpi_fan_is_acpi4(struct acpi_device *device)
		{
		return acpi_has_method(device->handle, "_FIF") &&
		acpi_has_method(device->handle, "_FPS") &&
		acpi_has_method(device->handle, "_FSL") &&
		acpi_has_method(device->handle, "_FST");
		}

		static int acpi_fan_get_fif(struct acpi_device *device)
		{
		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
		struct acpi_fan *fan = acpi_driver_data(device);
		struct acpi_buffer format = { sizeof("NNNN"), "NNNN" };
		struct acpi_buffer fif = { sizeof(fan->fif), &fan->fif };
		union acpi_object *obj;
		acpi_status status;

		status = acpi_evaluate_object(device->handle, "_FIF", NULL, &buffer);
		if (ACPI_FAILURE(status))
		return status;

		obj = buffer.pointer;
		if (!obj \|\| obj->type != ACPI_TYPE_PACKAGE) {
		dev_err(&device->dev, "Invalid _FIF data\n");
		status = -EINVAL;
		goto err;
		}

		status = acpi_extract_package(obj, &format, &fif);
		if (ACPI_FAILURE(status)) {
		dev_err(&device->dev, "Invalid _FIF element\n");
		status = -EINVAL;
		}

		err:
		kfree(obj);
		return status;
		}

		static int acpi_fan_speed_cmp(const void a, const void b)
		{
		const struct acpi_fan_fps *fps1 = a;
		const struct acpi_fan_fps *fps2 = b;
		return fps1->speed - fps2->speed;
		}

		static int acpi_fan_get_fps(struct acpi_device *device)
		{
		struct acpi_fan *fan = acpi_driver_data(device);
		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
		union acpi_object *obj;
		acpi_status status;
		int i;

		status = acpi_evaluate_object(device->handle, "_FPS", NULL, &buffer);
		if (ACPI_FAILURE(status))
		return status;

		obj = buffer.pointer;
		if (!obj \|\| obj->type != ACPI_TYPE_PACKAGE \|\| obj->package.count < 2) {
		dev_err(&device->dev, "Invalid _FPS data\n");
		status = -EINVAL;
		goto err;
		}

		fan->fps_count = obj->package.count - 1; /* minus revision field */
		fan->fps = devm_kzalloc(&device->dev,
		fan->fps_count * sizeof(struct acpi_fan_fps),
		GFP_KERNEL);
		if (!fan->fps) {
		dev_err(&device->dev, "Not enough memory\n");
		status = -ENOMEM;
		goto err;
		}
		for (i = 0; i < fan->fps_count; i++) {
		struct acpi_buffer format = { sizeof("NNNNN"), "NNNNN" };
		struct acpi_buffer fps = { sizeof(fan->fps[i]), &fan->fps[i] };
		status = acpi_extract_package(&obj->package.elements[i + 1],
		&format, &fps);
		if (ACPI_FAILURE(status)) {
		dev_err(&device->dev, "Invalid _FPS element\n");
		break;
		}
		}

		/* sort the state array according to fan speed in increase order */
		sort(fan->fps, fan->fps_count, sizeof(*fan->fps),
		acpi_fan_speed_cmp, NULL);

		err:
		kfree(obj);
		return status;
		}

		static int acpi_fan_probe(struct platform_device *pdev)
		{
		int result = 0;
		struct thermal_cooling_device *cdev;
		struct acpi_fan *fan;
		struct acpi_device *device = ACPI_COMPANION(&pdev->dev);

		if (!device)
		return -EINVAL;

		strcpy(acpi_device_name(device), "Fan");
		strcpy(acpi_device_class(device), ACPI_FAN_CLASS);
		fan = devm_kzalloc(&pdev->dev, sizeof(*fan), GFP_KERNEL);
		if (!fan) {
		dev_err(&device->dev, "No memory for fan\n");
		return -ENOMEM;
		}
		device->driver_data = fan;
		platform_set_drvdata(pdev, fan);

		result = acpi_bus_update_power(device->handle, NULL);
		if (acpi_fan_is_acpi4(device)) {
		if (acpi_fan_get_fif(device) \|\| acpi_fan_get_fps(device))
		goto end;
		fan->acpi4 = true;
		} else {
		result = acpi_device_update_power(device, NULL);
		if (result) {
		printk(KERN_ERR PREFIX "Setting initial power state\n");
		dev_err(&device->dev, "Setting initial power state\n");
		goto end;
		}
		}

		cdev = thermal_cooling_device_register("Fan", device,
		&fan_cooling_ops);
		@@ -154,45 +352,34 @@ static int acpi_fan_add(struct acpi_device *device)
		goto end;
		}

		dev_dbg(&device->dev, "registered as cooling_device%d\n", cdev->id);
		dev_dbg(&pdev->dev, "registered as cooling_device%d\n", cdev->id);

		device->driver_data = cdev;
		result = sysfs_create_link(&device->dev.kobj,
		fan->cdev = cdev;
		result = sysfs_create_link(&pdev->dev.kobj,
		&cdev->device.kobj,
		"thermal_cooling");
		if (result)
		dev_err(&device->dev, "Failed to create sysfs link "
		dev_err(&pdev->dev, "Failed to create sysfs link "
		"'thermal_cooling'\n");

		result = sysfs_create_link(&cdev->device.kobj,
		&device->dev.kobj,
		&pdev->dev.kobj,
		"device");
		if (result)
		dev_err(&device->dev, "Failed to create sysfs link "
		dev_err(&pdev->dev, "Failed to create sysfs link "
		"'device'\n");

		printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
		acpi_device_name(device), acpi_device_bid(device),
		!device->power.state ? "on" : "off");

		end:
		return result;
		}

		static int acpi_fan_remove(struct acpi_device *device)
		static int acpi_fan_remove(struct platform_device *pdev)
		{
		struct thermal_cooling_device *cdev;
		struct acpi_fan *fan = platform_get_drvdata(pdev);

		if (!device)
		return -EINVAL;

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

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

		return 0;
		}
		@@ -200,10 +387,11 @@ static int acpi_fan_remove(struct acpi_device *device)
		#ifdef CONFIG_PM_SLEEP
		static int acpi_fan_suspend(struct device *dev)
		{
		if (!dev)
		return -EINVAL;
		struct acpi_fan *fan = dev_get_drvdata(dev);
		if (fan->acpi4)
		return 0;

		acpi_bus_set_power(to_acpi_device(dev)->handle, ACPI_STATE_D0);
		acpi_device_set_power(ACPI_COMPANION(dev), ACPI_STATE_D0);

		return AE_OK;
		}
		@@ -211,16 +399,17 @@ static int acpi_fan_suspend(struct device *dev)
		static int acpi_fan_resume(struct device *dev)
		{
		int result;
		struct acpi_fan *fan = dev_get_drvdata(dev);

		if (!dev)
		return -EINVAL;
		if (fan->acpi4)
		return 0;

		result = acpi_bus_update_power(to_acpi_device(dev)->handle, NULL);
		result = acpi_device_update_power(ACPI_COMPANION(dev), NULL);
		if (result)
		printk(KERN_ERR PREFIX "Error updating fan power state\n");
		dev_err(dev, "Error updating fan power state\n");

		return result;
		}
		#endif

		module_acpi_driver(acpi_fan_driver);
		module_platform_driver(acpi_fan_driver);