Commit 3f7cd28a authored by Armin Wolf's avatar Armin Wolf Committed by Rafael J. Wysocki
Browse files

ACPI: thermal: Execute _SCP before reading trip points 



As specified in section 11.4.13 of the ACPI specification the
operating system is required to evaluate the _ACx and _PSV objects
after executing the _SCP control method.

Move the execution of the _SCP control method before the invocation
of acpi_thermal_get_trip_points() to avoid missing updates to the
_ACx and _PSV objects.

Fixes: b09872a6 ("ACPI: thermal: Fold acpi_thermal_get_info() into its caller")
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Link: https://patch.msgid.link/20250410165456.4173-3-W_Armin@gmx.de


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8cf4fdac

drivers/acpi/thermal.c

+6 −4
Original line number Diff line number Diff line
@@ -803,6 +803,12 @@ static int acpi_thermal_add(struct acpi_device *device) 


	acpi_thermal_aml_dependency_fix(tz);



	/*

	 * Set the cooling mode [_SCP] to active cooling. This needs to happen before

	 * we retrieve the trip point values.

	 */

	acpi_execute_simple_method(tz->device->handle, "_SCP", ACPI_THERMAL_MODE_ACTIVE);



	/* Get trip points [_ACi, _PSV, etc.] (required). */

	acpi_thermal_get_trip_points(tz);
@@ -814,10 +820,6 @@ static int acpi_thermal_add(struct acpi_device *device) 
	if (result)

		goto free_memory;



	/* Set the cooling mode [_SCP] to active cooling. */

	acpi_execute_simple_method(tz->device->handle, "_SCP",

				   ACPI_THERMAL_MODE_ACTIVE);



	/* Determine the default polling frequency [_TZP]. */

	if (tzp)

		tz->polling_frequency = tzp;