Skip to contentSkip to conversation

arm64: dts: qcom: sc7280: revert back to PSCI PC mode

PATCH In review Chia-I Wu 3 participants 4 messages Dec 21, 2023

Subsystems (4)
lore
Share & tools
lore

Chia-I Wu

author
#0 lore raw

PATCH 1/1 arm64: dts: qcom: sc7280: revert back to PSCI PC mode

This effectively reverts 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states") for sc7280-herobrine.

Fixes 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states")
---
 .../boot/dts/qcom/sc7280-firmware-tfa.dtsi    | 107 ++++++++++++++++++
 .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi |   1 +
 arch/arm64/boot/dts/qcom/sc7280.dtsi          |   4 +-
 3 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-firmware-tfa.dtsi
arch/arm64/boot/dts/qcom/sc7280-firmware-tfa.dtsi new file +107 -0
new file mode 100644
index 0000000000000..b3fc03da244d6
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Devices that use SC7280 with TrustedFirmware-A
+ * need PSCI PC mode instead of the OSI mode provided
+ * by Qualcomm firmware.
+ */
+
+&CPU0 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+			   &LITTLE_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+&CPU1 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+			   &LITTLE_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+&CPU2 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+			   &LITTLE_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+&CPU3 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+			   &LITTLE_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+&CPU4 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&BIG_CPU_SLEEP_0
+			   &BIG_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+&CPU5 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&BIG_CPU_SLEEP_0
+			   &BIG_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+&CPU6 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&BIG_CPU_SLEEP_0
+			   &BIG_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+&CPU7 {
+	/delete-property/ power-domains;
+	/delete-property/ power-domain-names;
+
+	cpu-idle-states = <&BIG_CPU_SLEEP_0
+			   &BIG_CPU_SLEEP_1
+			   &CLUSTER_SLEEP_0>;
+};
+
+/delete-node/ &domain_idle_states;
+
+&idle_states {
+	CLUSTER_SLEEP_0: cluster-sleep-0 {
+		compatible = "arm,idle-state";
+		idle-state-name = "cluster-power-down";
+		arm,psci-suspend-param = <0x40003444>;
+		entry-latency-us = <3263>;
+		exit-latency-us = <6562>;
+		min-residency-us = <9926>;
+		local-timer-stop;
+	};
+};
+
+/delete-node/ &CPU_PD0;
+/delete-node/ &CPU_PD1;
+/delete-node/ &CPU_PD2;
+/delete-node/ &CPU_PD3;
+/delete-node/ &CPU_PD4;
+/delete-node/ &CPU_PD5;
+/delete-node/ &CPU_PD6;
+/delete-node/ &CPU_PD7;
+/delete-node/ &CLUSTER_PD;
+
+&apps_rsc {
+	/delete-property/ power-domains;
+};
arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +1 -0
index 9ea6636125ad9..09b2d370bf7e0 100644
@@ -19,6 +19,7 @@
 
 #include "sc7280-qcard.dtsi"
 #include "sc7280-chrome-common.dtsi"
+#include "sc7280-firmware-tfa.dtsi"
 
 / {
 	chosen {
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -2
index 66f1eb83cca7e..354bf2868eba6 100644
@@ -383,7 +383,7 @@ core7 {
 			};
 		};
 
-		idle-states {
+		idle_states: idle-states {
 			entry-method = "psci";
 
 			LITTLE_CPU_SLEEP_0: cpu-sleep-0-0 {
@@ -427,7 +427,7 @@ BIG_CPU_SLEEP_1: cpu-sleep-1-1 {
 			};
 		};
 
-		domain-idle-states {
+		domain_idle_states: domain-idle-states {
 			CLUSTER_SLEEP_0: cluster-sleep-0 {
 				compatible = "domain-idle-state";
 				idle-state-name = "cluster-power-down";
Signature · 1 line
2.43.0.195.gebba966016-goog
#1 lore raw
Quoted 6 lines · Chia-I Wu

This effectively reverts 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states") for sc7280-herobrine.

Fixes 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states")

---

0 explanations?

Konrad

author
#2 lore raw
Quoted 9 lines · Konrad Dybcio
Quoted 6 lines · Chia-I Wu

This effectively reverts 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states") for sc7280-herobrine.

Fixes 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states")

---

0 explanations?

Ouch. It's in the comment

+ * Devices that use SC7280 with TrustedFirmware-A
+ * need PSCI PC mode instead of the OSI mode provided
+ * by Qualcomm firmware.

and is similar to the case with sc7180-trogdor. I can send v2 if necessary.

Quoted 2 lines

Konrad

#3 lore raw
Quoted 10 lines · Chia-I Wu
Quoted 8 lines · Konrad Dybcio
Quoted 6 lines · Chia-I Wu

This effectively reverts 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states") for sc7280-herobrine.

Fixes 7925ca85e9561 ("arm64: dts: qcom: sc7280: Add power-domains for cpuidle states")

---

Quoted 8 lines
Quoted 1 line

0 explanations?

Ouch. It's in the comment

+ * Devices that use SC7280 with TrustedFirmware-A
+ * need PSCI PC mode instead of the OSI mode provided
+ * by Qualcomm firmware.

and is similar to the case with sc7180-trogdor. I can send v2 if necessary.

Absolutely necessary. And so does the accurate commit subject. The existing one means that the whole SC7280 PSCI mode is reversed, while instead you do it only for the TF-A platforms.

Signature · 2 lines
With best wishes
Dmitry