Commit 92572d2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control fix from Rafael Wysocki:
 "Replace an earlier fix for a recent regression in the Step-Wise
  thermal governor that was not effective in all of the relevant cases
  (Rafael Wysocki)"

* tag 'thermal-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: gov_step_wise: Go straight to instance->lower when mitigation is over
parents 0f47788b 52903814

drivers/thermal/gov_step_wise.c

+5 −18
Original line number Diff line number Diff line
@@ -55,7 +55,11 @@ static unsigned long get_target_state(struct thermal_instance *instance, 
		if (cur_state <= instance->lower)

			return THERMAL_NO_TARGET;



		return clamp(cur_state - 1, instance->lower, instance->upper);

		/*

		 * If 'throttle' is false, no mitigation is necessary, so

		 * request the lower state for this instance.

		 */

		return instance->lower;

	}



	return instance->target;
@@ -93,23 +97,6 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, 
		if (instance->initialized && old_target == instance->target)

			continue;



		if (trip->type == THERMAL_TRIP_PASSIVE) {

			/*

			 * If the target state for this thermal instance

			 * changes from THERMAL_NO_TARGET to something else,

			 * ensure that the zone temperature will be updated

			 * (assuming enabled passive cooling) until it becomes

			 * THERMAL_NO_TARGET again, or the cooling device may

			 * not be reset to its initial state.

			 */

			if (old_target == THERMAL_NO_TARGET &&

			    instance->target != THERMAL_NO_TARGET)

				tz->passive++;

			else if (old_target != THERMAL_NO_TARGET &&

				 instance->target == THERMAL_NO_TARGET)

				tz->passive--;

		}



		instance->initialized = true;



		mutex_lock(&instance->cdev->lock);