arm64: dts: qcom: x1e80100: Apply consistent critical thermal shutdown

commit 03f2b8eed73418269a158ccebad5d8d8f2f6daa1 upstream.

The firmware configures the TSENS controller with a maximum temperature of
120°C. When reaching that temperature, the hardware automatically triggers
a reset of the entire platform. Some of the thermal zones in x1e80100.dtsi
use a critical trip point of 125°C. It's impossible to reach those.

It's preferable to shut down the system cleanly before reaching the
hardware trip point. Make the critical temperature trip points consistent
by setting all of them to 115°C and apply a consistent hysteresis.
The ACPI tables also specify 115°C as critical shutdown temperature.

Cc: stable@vger.kernel.org
Fixes: 4e915987ff5b ("arm64: dts: qcom: x1e80100: Enable tsens and thermal zone nodes")
Signed-off-by: Stephan Gerhold <stephan.gerhold@linaro.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250219-x1e80100-thermal-fixes-v1-2-d110e44ac3f9@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
index 019b0e627214b5e1fdbf0fd558adf7f1eb24dbc2..e690386bbe4f5ff9b45e8fb96b4bd994711c6cdc 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
@@ -8457,8 +8457,8 @@
                                };
 
                                aoss0-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -8483,7 +8483,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8509,7 +8509,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8535,7 +8535,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8561,7 +8561,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8587,7 +8587,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8613,7 +8613,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8639,7 +8639,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8665,7 +8665,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8683,8 +8683,8 @@
                                };
 
                                cpuss2-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -8701,8 +8701,8 @@
                                };
 
                                cpuss2-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -8719,7 +8719,7 @@
                                };
 
                                mem-critical {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <0>;
                                        type = "critical";
                                };
@@ -8737,7 +8737,7 @@
                                };
 
                                video-critical {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8755,8 +8755,8 @@
                                };
 
                                aoss0-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -8781,7 +8781,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8807,7 +8807,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8833,7 +8833,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8859,7 +8859,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8885,7 +8885,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8911,7 +8911,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8937,7 +8937,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8963,7 +8963,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -8981,8 +8981,8 @@
                                };
 
                                cpuss2-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -8999,8 +8999,8 @@
                                };
 
                                cpuss2-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9017,8 +9017,8 @@
                                };
 
                                aoss0-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9043,7 +9043,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9069,7 +9069,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9095,7 +9095,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9121,7 +9121,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9147,7 +9147,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9173,7 +9173,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9199,7 +9199,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9225,7 +9225,7 @@
                                };
 
                                cpu-critical {
-                                       temperature = <110000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9243,8 +9243,8 @@
                                };
 
                                cpuss2-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9261,8 +9261,8 @@
                                };
 
                                cpuss2-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9279,8 +9279,8 @@
                                };
 
                                aoss0-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9297,8 +9297,8 @@
                                };
 
                                nsp0-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9315,8 +9315,8 @@
                                };
 
                                nsp1-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9333,8 +9333,8 @@
                                };
 
                                nsp2-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9351,8 +9351,8 @@
                                };
 
                                nsp3-critical {
-                                       temperature = <125000>;
-                                       hysteresis = <0>;
+                                       temperature = <115000>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9377,7 +9377,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9403,7 +9403,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9429,7 +9429,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9455,7 +9455,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9481,7 +9481,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9507,7 +9507,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9533,7 +9533,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9559,7 +9559,7 @@
                                };
 
                                trip-point2 {
-                                       temperature = <125000>;
+                                       temperature = <115000>;
                                        hysteresis = <1000>;
                                        type = "critical";
                                };
@@ -9578,7 +9578,7 @@
 
                                camera0-critical {
                                        temperature = <115000>;
-                                       hysteresis = <0>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };
@@ -9596,7 +9596,7 @@
 
                                camera0-critical {
                                        temperature = <115000>;
-                                       hysteresis = <0>;
+                                       hysteresis = <1000>;
                                        type = "critical";
                                };
                        };