From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9EAB71586D7; Mon, 29 Jan 2024 17:08:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548118; cv=none; b=rvZAOS6fGezFt59gBw9rtLTbvuwi/FZKbkHbJLAhLkK2KtRCOLF98zj6fIYZo2FndkXgpWlnK606haj8JF7Qj7ujVDvNa4yl6ZRAsyOc05aRnfEqkQYyeFxvT0P18/qrzCW4vF5dwyCpn7oSlDtcWCwWL21b/eR4E+0j4hfhFOk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548118; c=relaxed/simple; bh=H+4aWzEl4Vbm+oFoQOfsIawjk2k3cdEUbPkjRKNYG1M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ck3qubBrTR6w4Pov2m/P0EfwiJVjuabE2sc0XWrlZUmeCM/Yj25lNIviG7cGCI3KAs9t0GW1R+gqXak7yf9UrUiJp6JgFf7hZDCf5FlhShBLeX9+lAw+jn0LWTo0MIpfzlIb0/g2C48+CCYBVqYb/Ih+pinQJu481GiTCfk371s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TII8O07F; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TII8O07F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64EFFC433C7; Mon, 29 Jan 2024 17:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706548118; bh=H+4aWzEl4Vbm+oFoQOfsIawjk2k3cdEUbPkjRKNYG1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TII8O07FoFbQ1YhVFP2ps+w90Aa760oU7uC06zWkBLsAEu1PKx3kM7PG6/ng39ioF IIsZSutFViHCU+jl5iz5q9GnGcY8Punkrtg8FU0zJGPLiuGbM61POMAY55V9cVZLcy K6MG9zvLj8rSVfESBmd/BHrYf2qu/ckChsmy7UuY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wei Wang , Di Shen , Lukasz Luba , "Rafael J. Wysocki" Subject: [PATCH 6.7 119/346] thermal: gov_power_allocator: avoid inability to reset a cdev Date: Mon, 29 Jan 2024 09:02:30 -0800 Message-ID: <20240129170019.885253012@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129170016.356158639@linuxfoundation.org> References: <20240129170016.356158639@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Di Shen commit e95fa7404716f6e25021e66067271a4ad8eb1486 upstream. Commit 0952177f2a1f ("thermal/core/power_allocator: Update once cooling devices when temp is low") adds an update flag to avoid triggering a thermal event when there is no need, and the thermal cdev is updated once when the temperature is low. But when the trips are writable, and switch_on_temp is set to be a higher value, the cooling device state may not be reset to 0, because last_temperature is smaller than switch_on_temp. For example: First: switch_on_temp=70 control_temp=85; Then userspace change the trip_temp: switch_on_temp=45 control_temp=55 cur_temp=54 Then userspace reset the trip_temp: switch_on_temp=70 control_temp=85 cur_temp=57 last_temp=54 At this time, the cooling device state should be reset to 0. However, because cur_temp(57) < switch_on_temp(70) last_temp(54) < switch_on_temp(70) ----> update = false, update is false, the cooling device state can not be reset. Using the observation that tz->passive can also be regarded as the temperature status, set the update flag to the tz->passive value. When the temperature drops below switch_on for the first time, the states of cooling devices can be reset once, and tz->passive is updated to 0. In the next round, because tz->passive is 0, cdev->state will not be updated. By using the tz->passive value as the "update" flag, the issue above can be solved, and the cooling devices can be updated only once when the temperature is low. Fixes: 0952177f2a1f ("thermal/core/power_allocator: Update once cooling devices when temp is low") Cc: 5.13+ # 5.13+ Suggested-by: Wei Wang Signed-off-by: Di Shen Reviewed-by: Lukasz Luba [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/thermal/gov_power_allocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/thermal/gov_power_allocator.c +++ b/drivers/thermal/gov_power_allocator.c @@ -693,7 +693,7 @@ static int power_allocator_throttle(stru trip = params->trip_switch_on; if (trip && tz->temperature < trip->temperature) { - update = tz->last_temperature >= trip->temperature; + update = tz->passive; tz->passive = 0; reset_pid_controller(params); allow_maximum_power(tz, update);