1cd8ae19a9
Add backported patched from 5.x from usb related fixes Up kernel version to most recent lts
144 lines
4.5 KiB
Diff
144 lines
4.5 KiB
Diff
From 99935bd4b5b4558beb069222e6d6143fe5830d64 Mon Sep 17 00:00:00 2001
|
|
From: Viresh Kumar <viresh.kumar@linaro.org>
|
|
Date: Fri, 16 Nov 2018 15:31:13 +0530
|
|
Subject: [PATCH 02/54] ARM: dts: rockchip: Add all CPUs in cooling maps
|
|
|
|
Each CPU can (and does) participate in cooling down the system but the
|
|
DT only captures a handful of them, normally CPU0, in the cooling maps.
|
|
Things work by chance currently as under normal circumstances its the
|
|
first CPU of each cluster which is used by the operating systems to
|
|
probe the cooling devices. But as soon as this CPU ordering changes and
|
|
any other CPU is used to bring up the cooling device, we will start
|
|
seeing failures.
|
|
|
|
Also the DT is rather incomplete when we list only one CPU in the
|
|
cooling maps, as the hardware doesn't have any such limitations.
|
|
|
|
Update cooling maps to include all devices affected by individual trip
|
|
points.
|
|
|
|
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm/boot/dts/rk322x.dtsi | 10 ++++++++--
|
|
arch/arm/boot/dts/rk3288-veyron-mickey.dts | 24 ++++++++++++++----------
|
|
arch/arm/boot/dts/rk3288.dtsi | 15 ++++++++++++---
|
|
3 files changed, 34 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
|
|
index cd8f2a3b0e91..29f19076dceb 100644
|
|
--- a/arch/arm/boot/dts/rk322x.dtsi
|
|
+++ b/arch/arm/boot/dts/rk322x.dtsi
|
|
@@ -493,12 +493,18 @@
|
|
map0 {
|
|
trip = <&cpu_alert0>;
|
|
cooling-device =
|
|
- <&cpu0 THERMAL_NO_LIMIT 6>;
|
|
+ <&cpu0 THERMAL_NO_LIMIT 6>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT 6>,
|
|
+ <&cpu2 THERMAL_NO_LIMIT 6>,
|
|
+ <&cpu3 THERMAL_NO_LIMIT 6>;
|
|
};
|
|
map1 {
|
|
trip = <&cpu_alert1>;
|
|
cooling-device =
|
|
- <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
};
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
|
|
index 1e0158acf895..d889ab3c8235 100644
|
|
--- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
|
|
@@ -81,8 +81,10 @@
|
|
*/
|
|
cpu_warm_limit_cpu {
|
|
trip = <&cpu_alert_warm>;
|
|
- cooling-device =
|
|
- <&cpu0 THERMAL_NO_LIMIT 4>;
|
|
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT 4>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT 4>,
|
|
+ <&cpu2 THERMAL_NO_LIMIT 4>,
|
|
+ <&cpu3 THERMAL_NO_LIMIT 4>;
|
|
};
|
|
|
|
/*
|
|
@@ -103,23 +105,25 @@
|
|
*/
|
|
cpu_almost_hot_limit_cpu {
|
|
trip = <&cpu_alert_almost_hot>;
|
|
- cooling-device =
|
|
- <&cpu0 5 6>;
|
|
+ cooling-device = <&cpu0 5 6>, <&cpu1 5 6>, <&cpu2 5 6>,
|
|
+ <&cpu3 5 6>;
|
|
};
|
|
cpu_hot_limit_cpu {
|
|
trip = <&cpu_alert_hot>;
|
|
- cooling-device =
|
|
- <&cpu0 7 7>;
|
|
+ cooling-device = <&cpu0 7 7>, <&cpu1 7 7>, <&cpu2 7 7>,
|
|
+ <&cpu3 7 7>;
|
|
};
|
|
cpu_hotter_limit_cpu {
|
|
trip = <&cpu_alert_hotter>;
|
|
- cooling-device =
|
|
- <&cpu0 7 8>;
|
|
+ cooling-device = <&cpu0 7 8>, <&cpu1 7 8>, <&cpu2 7 8>,
|
|
+ <&cpu3 7 8>;
|
|
};
|
|
cpu_very_hot_limit_cpu {
|
|
trip = <&cpu_alert_very_hot>;
|
|
- cooling-device =
|
|
- <&cpu0 8 THERMAL_NO_LIMIT>;
|
|
+ cooling-device = <&cpu0 8 THERMAL_NO_LIMIT>,
|
|
+ <&cpu1 8 THERMAL_NO_LIMIT>,
|
|
+ <&cpu2 8 THERMAL_NO_LIMIT>,
|
|
+ <&cpu3 8 THERMAL_NO_LIMIT>;
|
|
};
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
index 0840ffb3205c..1da86e82bb57 100644
|
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
@@ -508,12 +508,18 @@
|
|
map0 {
|
|
trip = <&cpu_alert0>;
|
|
cooling-device =
|
|
- <&cpu0 THERMAL_NO_LIMIT 6>;
|
|
+ <&cpu0 THERMAL_NO_LIMIT 6>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT 6>,
|
|
+ <&cpu2 THERMAL_NO_LIMIT 6>,
|
|
+ <&cpu3 THERMAL_NO_LIMIT 6>;
|
|
};
|
|
map1 {
|
|
trip = <&cpu_alert1>;
|
|
cooling-device =
|
|
- <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
};
|
|
};
|
|
};
|
|
@@ -541,7 +547,10 @@
|
|
map0 {
|
|
trip = <&gpu_alert0>;
|
|
cooling-device =
|
|
- <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
};
|
|
};
|
|
};
|
|
--
|
|
2.11.0
|
|
|