arm64: dts: Update cache properties for Arm Ltd platforms

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 relevant device trees nodes accordingly.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Link: https://lore.kernel.org/r/20221107155825.1644604-6-pierre.gondois@arm.com
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm64/boot/dts/arm/corstone1000.dtsi b/arch/arm64/boot/dts/arm/corstone1000.dtsi
index 4e46826f883af7c1978157a5ceb05acc79ae0d10..21f1f952e9854dfddd691f1bdff6c8c5805a5aac 100644 (file)
--- a/arch/arm64/boot/dts/arm/corstone1000.dtsi
+++ b/arch/arm64/boot/dts/arm/corstone1000.dtsi
@@ -53,6 +53,7 @@
 
        L2_0: l2-cache0 {
                compatible = "cache";
+               cache-unified;
                cache-level = <2>;
                cache-size = <0x80000>;
                cache-line-size = <64>;

diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 83e3e7e3984fc2c715a46dd53e24c5a066273300..c8bd23b1a7ba8fed5cfb3fa88ca99fc351046df4 100644 (file)
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -58,6 +58,7 @@
 
                L2_0: l2-cache0 {
                        compatible = "cache";
+                       cache-level = <2>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index 6451c62146fdab52eb28292022d2f3d358e86c28..1d90eeebb37d8f68854ebbe6143bb1d37e5fe50a 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -189,6 +189,7 @@
 
                A57_L2: l2-cache0 {
                        compatible = "cache";
+                       cache-unified;
                        cache-size = <0x200000>;
                        cache-line-size = <64>;
                        cache-sets = <2048>;
@@ -197,6 +198,7 @@
 
                A53_L2: l2-cache1 {
                        compatible = "cache";
+                       cache-unified;
                        cache-size = <0x100000>;
                        cache-line-size = <64>;
                        cache-sets = <1024>;

diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index 438cd1ff4bd0809721942d69274ba09ac692925f..d2ada69b0a433c3948a335ec18511ecbae174cb9 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -195,6 +195,7 @@
 
                A72_L2: l2-cache0 {
                        compatible = "cache";
+                       cache-unified;
                        cache-size = <0x200000>;
                        cache-line-size = <64>;
                        cache-sets = <2048>;
@@ -203,6 +204,7 @@
 
                A53_L2: l2-cache1 {
                        compatible = "cache";
+                       cache-unified;
                        cache-size = <0x100000>;
                        cache-line-size = <64>;
                        cache-sets = <1024>;

diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index cf4a582113999f737f7a78094dd0df8cbc8b6a42..5e48a01a5b9fdd9e14a15f6f6d9aee17575d589e 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -194,6 +194,7 @@
 
                A57_L2: l2-cache0 {
                        compatible = "cache";
+                       cache-unified;
                        cache-size = <0x200000>;
                        cache-line-size = <64>;
                        cache-sets = <2048>;
@@ -202,6 +203,7 @@
 
                A53_L2: l2-cache1 {
                        compatible = "cache";
+                       cache-unified;
                        cache-size = <0x100000>;
                        cache-line-size = <64>;
                        cache-sets = <1024>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index 258991ad7cc0af2ecc7a7f5ec793f98074a1164e..ef68f5aae7ddf7b7ac1d886ca30de613d08aebd7 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -71,6 +71,7 @@
 
                L2_0: l2-cache0 {
                        compatible = "cache";
+                       cache-level = <2>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
index 5b6d9d8e934db472ea29a67859174535beb6ecfe..796cd7d02eb55ac954a7d828000c706651250130 100644 (file)
--- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
@@ -57,6 +57,7 @@
 
                L2_0: l2-cache0 {
                        compatible = "cache";
+                       cache-level = <2>;
                };
        };