From: Zhang Rui <rui.zhang@intel.com>
To: rafael.j.wysocki@intel.com
Cc: zhangn1985@outlook.com, daniel.lezcano@linaro.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH] thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature
Date: Mon, 19 May 2025 15:09:01 +0800 [thread overview]
Message-ID: <20250519070901.1031233-1-rui.zhang@intel.com> (raw)
The tj_max value obtained from the Intel TCC library are in Celsius,
whereas the thermal subsystem operates in milli-Celsius.
This discrepancy leads to incorrect trip temperature calculations.
Fix bogus trip temperature by converting tj_max to milli-Celsius Unit.
Fixes: 8ef0ca4a177d ("Merge back other thermal control material for 6.3.")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reported-by: zhang ning <zhangn1985@outlook.com>
Closes: https://lore.kernel.org/all/TY2PR01MB3786EF0FE24353026293F5ACCD97A@TY2PR01MB3786.jpnprd01.prod.outlook.com/
Tested-by: zhang ning <zhangn1985@outlook.com>
---
Commit 983eb370cb87 ("thermal/x86_pkg_temp_thermal: Use Intel TCC
library") converts tj_max to use the standard API without switching the
Unit, which is a bug. This was mitigated by the next commit 58374a3970a0
("thermal/x86_pkg_temp_thermal: Add support for handling dynamic tjmax")
which uses the Celsius tj_max for failure check only.
This may confuse the maintainer and the bug was introduced by commit
8ef0ca4a177d ("Merge back other thermal control material for 6.3."),
when addressing the conflicts with commit d3ecaf17b586
("thermal/drivers/intel: Use generic thermal_zone_get_trip() function").
---
drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c
index 4894a26b1e4e..3fc679b6f11b 100644
--- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@ -330,6 +330,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
tj_max = intel_tcc_get_tjmax(cpu);
if (tj_max < 0)
return tj_max;
+ tj_max *= 1000;
zonedev = kzalloc(sizeof(*zonedev), GFP_KERNEL);
if (!zonedev)
--
2.43.0
next reply other threads:[~2025-05-19 7:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-19 7:09 Zhang Rui [this message]
2025-05-19 19:10 ` [PATCH] thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250519070901.1031233-1-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=zhangn1985@outlook.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox