From: Thierry Reding <treding@xxxxxxxxxx>
The "heavy throttle" cooling device that SOCTHERM uses isn't a cooling
device in the traditional sense. It's an automatic mechanism that cannot
be actively controlled. Do not expose it as a cooling device and instead
of tying it to a specific trip point, hard-code the temperature at which
the automatic throttling will begin.
While at it, clean up the trip point names to reflect the names used by
the thermal device tree bindings.
Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
---
arch/arm64/boot/dts/nvidia/tegra132.dtsi | 66 ++++++------------
arch/arm64/boot/dts/nvidia/tegra210.dtsi | 86 +++++++-----------------
2 files changed, 45 insertions(+), 107 deletions(-)
diff --git a/arch/arm64/boot/dts/nvidia/tegra132.dtsi b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
index 7e24a212c7e4..105e01be341b 100644
--- a/arch/arm64/boot/dts/nvidia/tegra132.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
@@ -878,11 +878,13 @@ soctherm: thermal-sensor@700e2000 {
#thermal-sensor-cells = <1>;
throttle-cfgs {
- throttle_heavy: heavy {
+ heavy {
nvidia,priority = <100>;
nvidia,cpu-throt-level = <TEGRA_SOCTHERM_THROT_LEVEL_HIGH>;
-
- #cooling-cells = <2>;
+ nvidia,thermal-zones = <&{/thermal-zones/cpu-thermal}>,
+ <&{/thermal-zones/gpu-thermal}>;
+ temperature-millicelsius = <102000>;
+ hysteresis-millicelsius = <4000>;
};
};
};
@@ -1138,114 +1140,84 @@ cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
trips {
- cpu_shutdown_trip {
+ critical {
temperature = <105000>;
hysteresis = <1000>;
type = "critical";
};
- cpu_throttle_trip: throttle-trip {
+ hot {
temperature = <102000>;
hysteresis = <1000>;
type = "hot";
};
};
-
- cooling-maps {
- map0 {
- trip = <&cpu_throttle_trip>;
- cooling-device = <&throttle_heavy 1 1>;
- };
- };
};
mem-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;
trips {
- mem_shutdown_trip {
+ critical {
temperature = <101000>;
hysteresis = <1000>;
type = "critical";
};
- mem_throttle_trip {
+
+ hot {
temperature = <99000>;
hysteresis = <1000>;
type = "hot";
};
};
-
- cooling-maps {
- /*
- * There are currently no cooling maps,
- * because there are no cooling devices.
- */
- };
};
gpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;
trips {
- gpu_shutdown_trip {
+ critical {
temperature = <101000>;
hysteresis = <1000>;
type = "critical";
};
- gpu_throttle_trip: throttle-trip {
+ hot {
temperature = <99000>;
hysteresis = <1000>;
type = "hot";
};
};
-
- cooling-maps {
- map0 {
- trip = <&gpu_throttle_trip>;
- cooling-device = <&throttle_heavy 1 1>;
- };
- };
};
pllx-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;
trips {
- pllx_shutdown_trip {
+ critical {
temperature = <105000>;
hysteresis = <1000>;
type = "critical";
};
- pllx_throttle_trip {
+
+ hot {
temperature = <99000>;
hysteresis = <1000>;
type = "hot";
};
};
-
- cooling-maps {
- /*
- * There are currently no cooling maps,
- * because there are no cooling devices.
- */
- };
};
};
diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
index 47f8268e46bf..b340579594e4 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
@@ -1329,12 +1329,14 @@ soctherm: thermal-sensor@700e2000 {
#thermal-sensor-cells = <1>;
throttle-cfgs {
- throttle_heavy: heavy {
+ heavy {
nvidia,priority = <100>;
nvidia,cpu-throt-percent = <85>;
nvidia,gpu-throt-level = <TEGRA_SOCTHERM_THROT_LEVEL_HIGH>;
-
- #cooling-cells = <2>;
+ nvidia,thermal-zones = <&{/thermal-zones/cpu-thermal}>,
+ <&{/thermal-zones/gpu-thermal}>;
+ temperature-millicelsius = <98500>;
+ hysteresis-millicelsius = <4000>;
};
};
};
@@ -2032,73 +2034,53 @@ cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
trips {
- cpu-shutdown-trip {
+ critical {
temperature = <102500>;
hysteresis = <0>;
type = "critical";
};
- cpu_throttle_trip: throttle-trip {
+ hot {
temperature = <98500>;
hysteresis = <1000>;
type = "hot";
};
};
-
- cooling-maps {
- map0 {
- trip = <&cpu_throttle_trip>;
- cooling-device = <&throttle_heavy 1 1>;
- };
- };
};
mem-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;
trips {
- dram_nominal: mem-nominal-trip {
- temperature = <50000>;
- hysteresis = <1000>;
- type = "passive";
- };
-
- dram_throttle: mem-throttle-trip {
- temperature = <70000>;
- hysteresis = <1000>;
- type = "active";
+ critical {
+ temperature = <103000>;
+ hysteresis = <0>;
+ type = "critical";
};
- mem-hot-trip {
+ hot {
temperature = <100000>;
hysteresis = <1000>;
type = "hot";
};
- mem-shutdown-trip {
- temperature = <103000>;
- hysteresis = <0>;
- type = "critical";
+ emc_throttle_trip: passive {
+ temperature = <95000>;
+ hysteresis = <2000>;
+ type = "passive";
};
};
cooling-maps {
- dram-passive {
- cooling-device = <&emc 0 0>;
- trip = <&dram_nominal>;
- };
-
- dram-active {
+ map-passive {
cooling-device = <&emc 1 1>;
- trip = <&dram_throttle>;
+ trip = <&emc_throttle_trip>;
};
};
};
@@ -2107,58 +2089,42 @@ gpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;
trips {
- gpu-shutdown-trip {
+ critical {
temperature = <103000>;
hysteresis = <0>;
type = "critical";
};
- gpu_throttle_trip: throttle-trip {
+ hot {
temperature = <100000>;
hysteresis = <1000>;
type = "hot";
};
};
-
- cooling-maps {
- map0 {
- trip = <&gpu_throttle_trip>;
- cooling-device = <&throttle_heavy 1 1>;
- };
- };
};
pllx-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
- thermal-sensors =
- <&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;
+ thermal-sensors = <&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;
trips {
- pllx-shutdown-trip {
+ critical {
temperature = <103000>;
hysteresis = <0>;
type = "critical";
};
- pllx-throttle-trip {
+ hot {
temperature = <100000>;
hysteresis = <1000>;
type = "hot";
};
};
-
- cooling-maps {
- /*
- * There are currently no cooling maps,
- * because there are no cooling devices.
- */
- };
};
};
--
2.42.0
