]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch from 5.10 and 5.15
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Nov 2021 14:21:43 +0000 (15:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Nov 2021 14:21:43 +0000 (15:21 +0100)
queue-5.10/arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch [deleted file]
queue-5.10/series
queue-5.15/arm64-dts-qcom-fix-node-name-of-rpm-msg-ram-device-n.patch
queue-5.15/arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch [deleted file]
queue-5.15/series

diff --git a/queue-5.10/arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch b/queue-5.10/arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch
deleted file mode 100644 (file)
index 154089f..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-From eed9a37a47452c7b83480a6b9d575a6cfd9cdc1e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Oct 2021 22:49:53 +0200
-Subject: arm64: dts: qcom: msm8916: Add CPU ACC and SAW/SPM
-
-From: Stephan Gerhold <stephan@gerhold.net>
-
-[ Upstream commit a22f9a766e1dc61f8f6ee2edfe83d4d23d78e059 ]
-
-Add the device tree nodes necessary for SMP bring-up and cpuidle
-without PSCI on ARM32. The hardware is typically controlled by the
-PSCI implementation in the TrustZone firmware and is therefore marked
-as status = "reserved" by default (from the device tree specification):
-
-  "Indicates that the device is operational, but should not be used.
-   Typically this is used for devices that are controlled by another
-   software component, such as platform firmware."
-
-Since this is part of the MSM8916 SoC it should be added to msm8916.dtsi
-but in practice these nodes should only get enabled via an extra include
-on ARM32.
-
-This is necessary for some devices with signed firmware which is missing
-both ARM64 and PSCI support and can therefore only boot ARM32 kernels.
-
-Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20211004204955.21077-13-stephan@gerhold.net
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8916.dtsi | 56 +++++++++++++++++++++++++++
- 1 file changed, 56 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
-index d26f9acf8e126..fd4c44b8eb58a 100644
---- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
-@@ -123,6 +123,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD0>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu0_acc>;
-+                      qcom,saw = <&cpu0_saw>;
-               };
-               CPU1: cpu@1 {
-@@ -136,6 +138,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD1>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu1_acc>;
-+                      qcom,saw = <&cpu1_saw>;
-               };
-               CPU2: cpu@2 {
-@@ -149,6 +153,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD2>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu2_acc>;
-+                      qcom,saw = <&cpu2_saw>;
-               };
-               CPU3: cpu@3 {
-@@ -162,6 +168,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD3>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu3_acc>;
-+                      qcom,saw = <&cpu3_saw>;
-               };
-               L2_0: l2-cache {
-@@ -1794,6 +1802,54 @@
-                               status = "disabled";
-                       };
-               };
-+
-+              cpu0_acc: power-manager@b088000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b088000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu0_saw: power-manager@b089000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b089000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu1_acc: power-manager@b098000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b098000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu1_saw: power-manager@b099000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b099000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu2_acc: power-manager@b0a8000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b0a8000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu2_saw: power-manager@b0a9000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b0a9000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu3_acc: power-manager@b0b8000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b0b8000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu3_saw: power-manager@b0b9000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b0b9000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-       };
-       thermal-zones {
--- 
-2.33.0
-
index 0f41b9ba1d9f5f6871fc4d850345aa0ec1e53ebf..4da8eb2ab63f1b0cc4b1b6f454ff7c1ce5e53599 100644 (file)
@@ -41,7 +41,6 @@ scsi-target-fix-ordered-tag-handling.patch
 scsi-target-fix-alua_tg_pt_gps_count-tracking.patch
 iio-imu-st_lsm6dsx-avoid-potential-array-overflow-in.patch
 powerpc-5200-dts-fix-memory-node-unit-name.patch
-arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch
 arm-dts-qcom-fix-memory-and-mdio-nodes-naming-for-rb.patch
 alsa-gus-fix-null-pointer-dereference-on-pointer-blo.patch
 powerpc-dcr-use-cmplwi-instead-of-3-argument-cmpli.patch
index db93977c7d8fea164a4c2ea82b5bb93a23deea80..7615702b10e5b4e949e78694297edd591a4ac974 100644 (file)
@@ -20,20 +20,18 @@ Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 Link: https://lore.kernel.org/r/20211018110009.30837-1-stephan@gerhold.net
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +-
- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +-
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
- arch/arm64/boot/dts/qcom/qcs404.dtsi  | 2 +-
- arch/arm64/boot/dts/qcom/sdm630.dtsi  | 2 +-
- arch/arm64/boot/dts/qcom/sm6125.dtsi  | 2 +-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi |    2 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi |    2 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi |    2 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi |    2 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi  |    2 +-
+ arch/arm64/boot/dts/qcom/sdm630.dtsi  |    2 +-
+ arch/arm64/boot/dts/qcom/sm6125.dtsi  |    2 +-
  7 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
-index 38d5f2a4f2ae9..5b5619b74d3a1 100644
 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
 +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
-@@ -453,7 +453,7 @@
+@@ -445,7 +445,7 @@
                        };
                };
  
@@ -42,8 +40,6 @@ index 38d5f2a4f2ae9..5b5619b74d3a1 100644
                        compatible = "qcom,rpm-msg-ram";
                        reg = <0x00060000 0x8000>;
                };
-diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
-index 986fe60dec5fb..5a9a5ed0565f6 100644
 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
 +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
 @@ -715,7 +715,7 @@
@@ -55,8 +51,6 @@ index 986fe60dec5fb..5a9a5ed0565f6 100644
                        compatible = "qcom,rpm-msg-ram";
                        reg = <0xfc428000 0x4000>;
                };
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index 52df22ab3f6ae..f8d28dd76cfa8 100644
 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
 +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
 @@ -638,7 +638,7 @@
@@ -68,8 +62,6 @@ index 52df22ab3f6ae..f8d28dd76cfa8 100644
                        compatible = "qcom,rpm-msg-ram";
                        reg = <0x00068000 0x6000>;
                };
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 5a221cfc41387..228339f81c327 100644
 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
 +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
 @@ -861,7 +861,7 @@
@@ -81,8 +73,6 @@ index 5a221cfc41387..228339f81c327 100644
                        compatible = "qcom,rpm-msg-ram";
                        reg = <0x00778000 0x7000>;
                };
-diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
-index 339790ba585de..ca5be16479809 100644
 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
 +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
 @@ -318,7 +318,7 @@
@@ -94,8 +84,6 @@ index 339790ba585de..ca5be16479809 100644
                        compatible = "qcom,rpm-msg-ram";
                        reg = <0x00060000 0x6000>;
                };
-diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
-index 9c7f87e42fccd..a8724fd60645f 100644
 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
 +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
 @@ -541,7 +541,7 @@
@@ -107,8 +95,6 @@ index 9c7f87e42fccd..a8724fd60645f 100644
                        compatible = "qcom,rpm-msg-ram";
                        reg = <0x00778000 0x7000>;
                };
-diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
-index 2b37ce6a9f9c5..9f476e3d0720b 100644
 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
 +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
 @@ -380,7 +380,7 @@
@@ -120,6 +106,3 @@ index 2b37ce6a9f9c5..9f476e3d0720b 100644
                        compatible = "qcom,rpm-msg-ram";
                        reg = <0x045f0000 0x7000>;
                };
--- 
-2.33.0
-
diff --git a/queue-5.15/arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch b/queue-5.15/arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch
deleted file mode 100644 (file)
index e7fd21c..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-From 4b41a4624fb79b1745e888594425ec592946fb80 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Oct 2021 22:49:53 +0200
-Subject: arm64: dts: qcom: msm8916: Add CPU ACC and SAW/SPM
-
-From: Stephan Gerhold <stephan@gerhold.net>
-
-[ Upstream commit a22f9a766e1dc61f8f6ee2edfe83d4d23d78e059 ]
-
-Add the device tree nodes necessary for SMP bring-up and cpuidle
-without PSCI on ARM32. The hardware is typically controlled by the
-PSCI implementation in the TrustZone firmware and is therefore marked
-as status = "reserved" by default (from the device tree specification):
-
-  "Indicates that the device is operational, but should not be used.
-   Typically this is used for devices that are controlled by another
-   software component, such as platform firmware."
-
-Since this is part of the MSM8916 SoC it should be added to msm8916.dtsi
-but in practice these nodes should only get enabled via an extra include
-on ARM32.
-
-This is necessary for some devices with signed firmware which is missing
-both ARM64 and PSCI support and can therefore only boot ARM32 kernels.
-
-Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20211004204955.21077-13-stephan@gerhold.net
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8916.dtsi | 56 +++++++++++++++++++++++++++
- 1 file changed, 56 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
-index 519abec2430f0..38d5f2a4f2ae9 100644
---- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
-@@ -124,6 +124,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD0>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu0_acc>;
-+                      qcom,saw = <&cpu0_saw>;
-               };
-               CPU1: cpu@1 {
-@@ -137,6 +139,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD1>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu1_acc>;
-+                      qcom,saw = <&cpu1_saw>;
-               };
-               CPU2: cpu@2 {
-@@ -150,6 +154,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD2>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu2_acc>;
-+                      qcom,saw = <&cpu2_saw>;
-               };
-               CPU3: cpu@3 {
-@@ -163,6 +169,8 @@
-                       #cooling-cells = <2>;
-                       power-domains = <&CPU_PD3>;
-                       power-domain-names = "psci";
-+                      qcom,acc = <&cpu3_acc>;
-+                      qcom,saw = <&cpu3_saw>;
-               };
-               L2_0: l2-cache {
-@@ -1877,6 +1885,54 @@
-                               status = "disabled";
-                       };
-               };
-+
-+              cpu0_acc: power-manager@b088000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b088000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu0_saw: power-manager@b089000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b089000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu1_acc: power-manager@b098000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b098000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu1_saw: power-manager@b099000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b099000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu2_acc: power-manager@b0a8000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b0a8000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu2_saw: power-manager@b0a9000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b0a9000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu3_acc: power-manager@b0b8000 {
-+                      compatible = "qcom,msm8916-acc";
-+                      reg = <0x0b0b8000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-+
-+              cpu3_saw: power-manager@b0b9000 {
-+                      compatible = "qcom,msm8916-saw2-v3.0-cpu", "qcom,saw2";
-+                      reg = <0x0b0b9000 0x1000>;
-+                      status = "reserved"; /* Controlled by PSCI firmware */
-+              };
-       };
-       thermal-zones {
--- 
-2.33.0
-
index 654c0a7393d11f935e08fce6441cf35767000de1..86e39e95b5b58a25d90af12301a38e1f824a2255 100644 (file)
@@ -69,7 +69,6 @@ scsi-lpfc-fix-link-down-processing-to-address-null-p.patch
 scsi-lpfc-allow-fabric-node-recovery-if-recovery-is-.patch
 memory-tegra20-emc-add-runtime-dependency-on-devfreq.patch
 powerpc-5200-dts-fix-memory-node-unit-name.patch
-arm64-dts-qcom-msm8916-add-cpu-acc-and-saw-spm.patch
 arm-dts-qcom-fix-memory-and-mdio-nodes-naming-for-rb.patch
 arm64-dts-qcom-fix-node-name-of-rpm-msg-ram-device-n.patch
 alsa-gus-fix-null-pointer-dereference-on-pointer-blo.patch