Commit 1bca17e8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-power', 'acpi-fan', 'acpi-thermal', 'acpi-button' and 'acpi-video' 

Merge five ACPI driver updates for 6.15-rc1:

 - Use the str_on_off() helper function instead of hard-coded strings in
   the ACPI power resources handling code (Thorsten Blum).

 - Add fan speed reporting for ACPI fans that have _FST, but otherwise
   do not support the entire ACPI 4 fan interface (Joshua Grisham).

 - Fix a stale comment regarding trip points in acpi_thermal_add() that
   diverged from the commented code after removing _CRT evaluation from
   acpi_thermal_get_trip_points() (xueqin Luo).

 - Make ACPI button driver also subscribe to system events (Mario
   Limonciello).

 - Use the str_yes_no() helper function instead of hard-coded strings in
   the ACPI backlight (video) driver (Thorsten Blum).

* acpi-power:
  ACPI: power: Use str_on_off() helper function

* acpi-fan:
  ACPI: fan: Add fan speed reporting for fans with only _FST

* acpi-thermal:
  ACPI: thermal: Fix stale comment regarding trip points

* acpi-button:
  ACPI: button: Install notifier for system events as well

* acpi-video:
  ACPI: video: Use str_yes_no() helper in acpi_video_bus_add()
parents 425b1c97 7d36289a 6c00f29f 01ca2846 a7e23ec1 064009eb

drivers/acpi/acpi_video.c

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/acpi.h>

#include <acpi/video.h>

#include <linux/uaccess.h>

#include <linux/string_choices.h>



#define ACPI_VIDEO_BUS_NAME		"Video Bus"

#define ACPI_VIDEO_DEVICE_NAME		"Video Device"
@@ -2039,9 +2040,9 @@ static int acpi_video_bus_add(struct acpi_device *device) 


	pr_info("%s [%s] (multi-head: %s  rom: %s  post: %s)\n",

	       ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),

	       video->flags.multihead ? "yes" : "no",

	       video->flags.rom ? "yes" : "no",

	       video->flags.post ? "yes" : "no");

	       str_yes_no(video->flags.multihead),

	       str_yes_no(video->flags.rom),

	       str_yes_no(video->flags.post));

	mutex_lock(&video_list_lock);

	list_add_tail(&video->entry, &video_bus_head);

	mutex_unlock(&video_list_lock);

drivers/acpi/button.c

+8 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define ACPI_BUTTON_CLASS		"button"

#define ACPI_BUTTON_FILE_STATE		"state"

#define ACPI_BUTTON_TYPE_UNKNOWN	0x00

#define ACPI_BUTTON_NOTIFY_WAKE		0x02

#define ACPI_BUTTON_NOTIFY_STATUS	0x80



#define ACPI_BUTTON_SUBCLASS_POWER	"power"
@@ -443,7 +444,12 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) 
	struct input_dev *input;

	int keycode;



	if (event != ACPI_BUTTON_NOTIFY_STATUS) {

	switch (event) {

	case ACPI_BUTTON_NOTIFY_STATUS:

		break;

	case ACPI_BUTTON_NOTIFY_WAKE:

		break;

	default:

		acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",

				  event);

		return;
@@ -629,7 +635,7 @@ static int acpi_button_add(struct acpi_device *device) 
		break;

	default:

		status = acpi_install_notify_handler(device->handle,

						     ACPI_DEVICE_NOTIFY, handler,

						     ACPI_ALL_NOTIFY, handler,

						     device);

		break;

	}

drivers/acpi/fan.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct acpi_fan_fst { 


struct acpi_fan {

	bool acpi4;

	bool has_fst;

	struct acpi_fan_fif fif;

	struct acpi_fan_fps *fps;

	int fps_count;

drivers/acpi/fan_attr.c

+22 −15
Original line number Diff line number Diff line
@@ -75,15 +75,6 @@ int acpi_fan_create_attributes(struct acpi_device *device) 
	struct acpi_fan *fan = acpi_driver_data(device);

	int i, status;



	sysfs_attr_init(&fan->fine_grain_control.attr);

	fan->fine_grain_control.show = show_fine_grain_control;

	fan->fine_grain_control.store = NULL;

	fan->fine_grain_control.attr.name = "fine_grain_control";

	fan->fine_grain_control.attr.mode = 0444;

	status = sysfs_create_file(&device->dev.kobj, &fan->fine_grain_control.attr);

	if (status)

		return status;



	/* _FST is present if we are here */

	sysfs_attr_init(&fan->fst_speed.attr);

	fan->fst_speed.show = show_fan_speed;
@@ -92,7 +83,19 @@ int acpi_fan_create_attributes(struct acpi_device *device) 
	fan->fst_speed.attr.mode = 0444;

	status = sysfs_create_file(&device->dev.kobj, &fan->fst_speed.attr);

	if (status)

		goto rem_fine_grain_attr;

		return status;



	if (!fan->acpi4)

		return 0;



	sysfs_attr_init(&fan->fine_grain_control.attr);

	fan->fine_grain_control.show = show_fine_grain_control;

	fan->fine_grain_control.store = NULL;

	fan->fine_grain_control.attr.name = "fine_grain_control";

	fan->fine_grain_control.attr.mode = 0444;

	status = sysfs_create_file(&device->dev.kobj, &fan->fine_grain_control.attr);

	if (status)

		goto rem_fst_attr;



	for (i = 0; i < fan->fps_count; ++i) {

		struct acpi_fan_fps *fps = &fan->fps[i];
@@ -109,18 +112,18 @@ int acpi_fan_create_attributes(struct acpi_device *device) 


			for (j = 0; j < i; ++j)

				sysfs_remove_file(&device->dev.kobj, &fan->fps[j].dev_attr.attr);

			goto rem_fst_attr;

			goto rem_fine_grain_attr;

		}

	}



	return 0;



rem_fst_attr:

	sysfs_remove_file(&device->dev.kobj, &fan->fst_speed.attr);



rem_fine_grain_attr:

	sysfs_remove_file(&device->dev.kobj, &fan->fine_grain_control.attr);



rem_fst_attr:

	sysfs_remove_file(&device->dev.kobj, &fan->fst_speed.attr);



	return status;

}
@@ -129,9 +132,13 @@ void acpi_fan_delete_attributes(struct acpi_device *device) 
	struct acpi_fan *fan = acpi_driver_data(device);

	int i;



	sysfs_remove_file(&device->dev.kobj, &fan->fst_speed.attr);



	if (!fan->acpi4)

		return;



	for (i = 0; i < fan->fps_count; ++i)

		sysfs_remove_file(&device->dev.kobj, &fan->fps[i].dev_attr.attr);



	sysfs_remove_file(&device->dev.kobj, &fan->fst_speed.attr);

	sysfs_remove_file(&device->dev.kobj, &fan->fine_grain_control.attr);

}

drivers/acpi/fan_core.c

+18 −7
Original line number Diff line number Diff line
@@ -203,12 +203,16 @@ static const struct thermal_cooling_device_ops fan_cooling_ops = { 
 * --------------------------------------------------------------------------

*/



static bool acpi_fan_has_fst(struct acpi_device *device)

{

	return acpi_has_method(device->handle, "_FST");

}



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");

	       acpi_has_method(device->handle, "_FSL");

}



static int acpi_fan_get_fif(struct acpi_device *device)
@@ -327,7 +331,12 @@ static int acpi_fan_probe(struct platform_device *pdev) 
	device->driver_data = fan;

	platform_set_drvdata(pdev, fan);



	if (acpi_fan_is_acpi4(device)) {

	if (acpi_fan_has_fst(device)) {

		fan->has_fst = true;

		fan->acpi4 = acpi_fan_is_acpi4(device);

	}



	if (fan->acpi4) {

		result = acpi_fan_get_fif(device);

		if (result)

			return result;
@@ -335,7 +344,9 @@ static int acpi_fan_probe(struct platform_device *pdev) 
		result = acpi_fan_get_fps(device);

		if (result)

			return result;

	}



	if (fan->has_fst) {

		result = devm_acpi_fan_create_hwmon(device);

		if (result)

			return result;
@@ -343,9 +354,9 @@ static int acpi_fan_probe(struct platform_device *pdev) 
		result = acpi_fan_create_attributes(device);

		if (result)

			return result;

	}



		fan->acpi4 = true;

	} else {

	if (!fan->acpi4) {

		result = acpi_device_update_power(device, NULL);

		if (result) {

			dev_err(&device->dev, "Failed to set initial power state\n");
@@ -391,7 +402,7 @@ static int acpi_fan_probe(struct platform_device *pdev) 
err_unregister:

	thermal_cooling_device_unregister(cdev);

err_end:

	if (fan->acpi4)

	if (fan->has_fst)

		acpi_fan_delete_attributes(device);



	return result;
@@ -401,7 +412,7 @@ static void acpi_fan_remove(struct platform_device *pdev) 
{

	struct acpi_fan *fan = platform_get_drvdata(pdev);



	if (fan->acpi4) {

	if (fan->has_fst) {

		struct acpi_device *device = ACPI_COMPANION(&pdev->dev);



		acpi_fan_delete_attributes(device);