arm64: dts: qcom: Update cache properties
authorPierre Gondois <pierre.gondois@arm.com>
Mon, 7 Nov 2022 15:57:09 +0000 (16:57 +0100)
committerBjorn Andersson <andersson@kernel.org>
Thu, 29 Dec 2022 16:22:11 +0000 (10:22 -0600)
The DeviceTree Specification v0.3 specifies that the cache node
'compatible' and 'cache-level' properties are 'required'. Cf.
s3.8 Multi-level and Shared Cache Nodes
The 'cache-unified' property should be present if one of the
properties for unified cache is present ('cache-size', ...).

Update the Device Trees accordingly.

About msm8953.dtsi:
According to the Devicetree Specification v0.3,
s3.7.3 'Internal (L1) Cache Properties',
  cache-unified:
  If present, specifies the cache has a unified or-
  ganization. If not present, specifies that the
  cache has a Harvard architecture with separate
  caches for instructions and data.
Plus, the 'cache-level' property seems to be reserved to higher
cache levels (cf s3.8).

To describe a l1 data/instruction cache couple, no cache
information should be described. Remove the l1 cache nodes.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
[bjorn: Moved "qcom" to $subject prefix]
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221107155825.1644604-17-pierre.gondois@arm.com
arch/arm64/boot/dts/qcom/msm8953.dtsi
arch/arm64/boot/dts/qcom/sc7180.dtsi
arch/arm64/boot/dts/qcom/sc7280.dtsi
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
arch/arm64/boot/dts/qcom/sm6125.dtsi
arch/arm64/boot/dts/qcom/sm6350.dtsi
arch/arm64/boot/dts/qcom/sm8150.dtsi
arch/arm64/boot/dts/qcom/sm8250.dtsi
arch/arm64/boot/dts/qcom/sm8350.dtsi
arch/arm64/boot/dts/qcom/sm8450.dtsi

index 62d2ae30711b3cd66c2eff9439b5aee842b842fb..091284756106db26af6aa0ea21ea05d3b56b6226 100644 (file)
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_0>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                CPU1: cpu@1 {
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_0>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                CPU2: cpu@2 {
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_0>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                CPU3: cpu@3 {
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_0>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                CPU4: cpu@100 {
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_1>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                CPU5: cpu@101 {
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_1>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                CPU6: cpu@102 {
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_1>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                CPU7: cpu@103 {
                        capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_1>;
                        #cooling-cells = <2>;
-
-                       l1-icache {
-                               compatible = "cache";
-                       };
-                       l1-dcache {
-                               compatible = "cache";
-                       };
                };
 
                cpu-map {
index 773f182edc265d369bb4a0fc0021ac7bcf0806d0..b858091687f2c090dd60568f9483ce4ed2e01739 100644 (file)
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                        compatible = "cache";
+                                       cache-level = <3>;
                                };
                        };
                };
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_100: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_200: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_300: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_400: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_500: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        L2_600: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        L2_700: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
index 1fd2935ccd303e58932f63cf4ee68d8853e7c4ee..0388b3698e7010909ca4b1b37d8405d1484f7070 100644 (file)
                        #cooling-cells = <2>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                        compatible = "cache";
+                                       cache-level = <3>;
                                };
                        };
                };
                        #cooling-cells = <2>;
                        L2_100: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_200: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_300: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_400: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_500: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_600: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_700: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
index c6546d0d241ac61c541146995b7d282f947f0816..1f64a86beada4f77af31b30fd2c5e4e7f4ba2c2b 100644 (file)
                        #cooling-cells = <2>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                      compatible = "cache";
+                                     cache-level = <3>;
                                };
                        };
                };
                        #cooling-cells = <2>;
                        L2_100: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_200: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_300: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_400: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_500: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_600: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_700: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
index 9d124610ec0c8cccae5e745a64367e9921e86d47..767486acbec8dc45ce7e0795b335e6f8f7406417 100644 (file)
                        next-level-cache = <&L2_0>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                      compatible = "cache";
+                                     cache-level = <3>;
                                };
                        };
                };
                        next-level-cache = <&L2_100>;
                        L2_100: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        next-level-cache = <&L2_200>;
                        L2_200: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        next-level-cache = <&L2_300>;
                        L2_300: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        next-level-cache = <&L2_400>;
                        L2_400: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        next-level-cache = <&L2_500>;
                        L2_500: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        next-level-cache = <&L2_600>;
                        L2_600: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        next-level-cache = <&L2_700>;
                        L2_700: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
index 7e25a4f85594f6d9a66d0f0bc55339dd97f67bfe..fa102ba4032b1e714a62df89b9b6ec02ce0d6fe7 100644 (file)
@@ -45,6 +45,7 @@
                        next-level-cache = <&L2_0>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                        };
                };
 
@@ -84,6 +85,7 @@
                        next-level-cache = <&L2_1>;
                        L2_1: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                        };
                };
 
index 00e43a0d2dd67c8e78bd4ea01552cc070cfa77c3..dcf2e7ccaea717cc7ff39d7cedb467407c9ac2da 100644 (file)
                        #cooling-cells = <2>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                        compatible = "cache";
+                                       cache-level = <3>;
                                };
                        };
                };
@@ -69,6 +71,7 @@
                        #cooling-cells = <2>;
                        L2_100: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
@@ -85,6 +88,7 @@
                        #cooling-cells = <2>;
                        L2_200: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_300: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_400: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_500: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
 
                        #cooling-cells = <2>;
                        L2_600: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_700: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
index c13acede4594760a56eedb149ced3a4ab1c09b64..70d436dd158abac778d5cf58f738e6f5fb162574 100644 (file)
                        #cooling-cells = <2>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                      compatible = "cache";
+                                     cache-level = <3>;
                                };
                        };
                };
@@ -84,6 +86,7 @@
                        #cooling-cells = <2>;
                        L2_100: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
 
                        #cooling-cells = <2>;
                        L2_200: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_300: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_400: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_500: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_600: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_700: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
index 1e4a281602e10b708db93a54a65b572420ee9439..2baaa63737053d55ff16142645542425bc87537d 100644 (file)
                        #cooling-cells = <2>;
                        L2_0: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                        compatible = "cache";
+                                       cache-level = <3>;
                                };
                        };
                };
                        #cooling-cells = <2>;
                        L2_100: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_200: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_300: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_400: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_500: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
 
                        #cooling-cells = <2>;
                        L2_600: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_700: l2-cache {
                                compatible = "cache";
+                               cache-level = <2>;
                                next-level-cache = <&L3_0>;
                        };
                };
index 245dce24ec599c0d8b062f9953a234a792508616..2eccf14a9a312b5ef979d2953d624e5e52337cb1 100644 (file)
                        #cooling-cells = <2>;
                        L2_0: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                      compatible = "cache";
+                                     cache-level = <3>;
                                };
                        };
                };
@@ -92,6 +94,7 @@
                        #cooling-cells = <2>;
                        L2_100: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_200: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_300: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_400: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_500: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
 
                        #cooling-cells = <2>;
                        L2_600: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        #cooling-cells = <2>;
                        L2_700: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
index e9e51b1a1bd30dedc0cd6cee836c79a904fa6227..1610f5ea49d2db471a3aaac10ad66df6cd3f339d 100644 (file)
                        clocks = <&cpufreq_hw 0>;
                        L2_0: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                                L3_0: l3-cache {
                                      compatible = "cache";
+                                     cache-level = <3>;
                                };
                        };
                };
@@ -77,6 +79,7 @@
                        clocks = <&cpufreq_hw 0>;
                        L2_100: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
@@ -94,6 +97,7 @@
                        clocks = <&cpufreq_hw 0>;
                        L2_200: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        clocks = <&cpufreq_hw 0>;
                        L2_300: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        clocks = <&cpufreq_hw 1>;
                        L2_400: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        clocks = <&cpufreq_hw 1>;
                        L2_500: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
 
                        clocks = <&cpufreq_hw 1>;
                        L2_600: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };
                        clocks = <&cpufreq_hw 2>;
                        L2_700: l2-cache {
                              compatible = "cache";
+                             cache-level = <2>;
                              next-level-cache = <&L3_0>;
                        };
                };