[PATCH] arm64: dts: qcom: shikra: Drop CPU critical trips

[PATCH] arm64: dts: qcom: shikra: Drop CPU critical trips

[Gaurav Kohli]

Shikra firmware handles CPU thermal mitigation up to 117 C, while
Linux CPU critical trips trigger at 115 C. This can shut the system
down before firmware reaches the end of its mitigation range.

Drop the critical trips from the CPU thermal zones and leave the hot
trips, non-CPU critical trips and GPUSS passive cooling map unchanged.

Signed-off-by: Gaurav Kohli <gaurav.kohli@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/shikra.dtsi | 42 ------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/shikra.dtsi b/arch/arm64/boot/dts/qcom/shikra.dtsi
index c1f06f692f66..7c1e77e38c52 100644
--- a/arch/arm64/boot/dts/qcom/shikra.dtsi
+++ b/arch/arm64/boot/dts/qcom/shikra.dtsi
@@ -3754,12 +3754,6 @@ trip-point0 {
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu00-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -3772,12 +3766,6 @@ trip-point0 {
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu01-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -3790,12 +3778,6 @@ trip-point0 {
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu10-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -3808,12 +3790,6 @@ trip-point0 {
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu11-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -3826,12 +3802,6 @@ trip-point0 {
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpuss0-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -3966,12 +3936,6 @@ trip-point0 {
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu02-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -3984,12 +3948,6 @@ trip-point0 {
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpuss1-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 	};

---
base-commit: 3d7783543c2646af69ad65825e810060494bea21
change-id: 20260924-shikra_crit_trip-7a11bbb66b71

Best regards,
-- 
Gaurav Kohli <gaurav.kohli@oss.qualcomm.com>

Re: [PATCH] arm64: dts: qcom: shikra: Drop CPU critical trips

[Abel Vesa]

On 26-09-24 19:52:32, Gaurav Kohli wrote:
> Shikra firmware handles CPU thermal mitigation up to 117 C, while
> Linux CPU critical trips trigger at 115 C. This can shut the system
> down before firmware reaches the end of its mitigation range.
> 
> Drop the critical trips from the CPU thermal zones and leave the hot
> trips, non-CPU critical trips and GPUSS passive cooling map unchanged.

I thought that was the whole point of having the critical trips set to
115 C, so that the kernel can gracefully shut down before firmware cuts
it off.

What happens if CPU gets to 117 C and the critical trips are removed?
How will firmware thermal mitigation handle it?

Re: [PATCH] arm64: dts: qcom: shikra: Drop CPU critical trips

[Gaurav Kohli]

On 9/25/2026 3:13 PM, Abel Vesa wrote:
> On 26-09-24 19:52:32, Gaurav Kohli wrote:
>> Shikra firmware handles CPU thermal mitigation up to 117 C, while
>> Linux CPU critical trips trigger at 115 C. This can shut the system
>> down before firmware reaches the end of its mitigation range.
>>
>> Drop the critical trips from the CPU thermal zones and leave the hot
>> trips, non-CPU critical trips and GPUSS passive cooling map unchanged.
> 
> I thought that was the whole point of having the critical trips set to
> 115 C, so that the kernel can gracefully shut down before firmware cuts
> it off.
> 
> What happens if CPU gets to 117 C and the critical trips are removed?
> How will firmware thermal mitigation handle it?

Thanks Abel for review.

For the CPU thermal zones on this SoC, hardware-side mitigation is 
already available at 115 C and 117 C, and hardware shutdown is at 120 C. 
Because of that, a Linux critical trip at 115 C is not very useful. It 
overlaps with the hardware mitigation range and can trigger shutdown 
before the firmware thermal sequence has completed.

So the CPU critical trips are removed and the firmware/hardware 
mitigation is left to handle those thresholds as critical is not helping 
here.