arm64: dts: fsl: 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: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 3364a7fe18e0bac43178c8cd0f0cb95cff1b42e6..712cc27755cc270fef039a4f41ddfef13905e8d6 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -171,8 +171,10 @@
                                map0 {
                                        trip = <&cpu_alert>;
                                        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/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 54a3827788badeba4beeabede47adafcbb155b08..8cfc84826023372e4d50296088b814596c3b4afa 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -140,8 +140,10 @@
                                map0 {
                                        trip = <&cpu_alert>;
                                        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/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index b8b710015e151046ebf63e7b074a4cd96af6e1cb..42a935bac07d12902877a7b0b4b589211be1149c 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -152,15 +152,14 @@
                                map0 {
                                        trip = <&cpu_alert>;
                                        cooling-device =
-                                               <&cpu0 THERMAL_NO_LIMIT
-                                               THERMAL_NO_LIMIT>;
-                               };
-
-                               map1 {
-                                       trip = <&cpu_alert>;
-                                       cooling-device =
-                                               <&cpu4 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>,
+                                               <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                               <&cpu5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                               <&cpu6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                               <&cpu7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
                                };
                        };
                };

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index f3591966c3476a00f18fc76cb5f9348410a7e49b..6d6ca166f86b7c6cc0ca423c88aab54be6804d99 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -101,26 +101,14 @@
                                map0 {
                                        trip = <&cpu_alert>;
                                        cooling-device =
-                                               <&cpu0 THERMAL_NO_LIMIT
-                                               THERMAL_NO_LIMIT>;
-                               };
-                               map1 {
-                                       trip = <&cpu_alert>;
-                                       cooling-device =
-                                               <&cpu2 THERMAL_NO_LIMIT
-                                               THERMAL_NO_LIMIT>;
-                               };
-                               map2 {
-                                       trip = <&cpu_alert>;
-                                       cooling-device =
-                                               <&cpu4 THERMAL_NO_LIMIT
-                                               THERMAL_NO_LIMIT>;
-                               };
-                               map3 {
-                                       trip = <&cpu_alert>;
-                                       cooling-device =
-                                               <&cpu6 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>,
+                                               <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                               <&cpu5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                               <&cpu6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                               <&cpu7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
                                };
                        };
                };