aboutsummaryrefslogtreecommitdiff
path: root/spm
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2020-04-30 16:31:32 +0100
committerManish Pandey <manish.pandey2@arm.com>2020-05-20 10:50:43 +0100
commit09d3ce922a82c76e5c231219fe16c719633cf048 (patch)
tree536558dbcc3e81536a84c42010dff760b7418c08 /spm
parent26c6f8119722ad6872d45d39a19db3f44e96678a (diff)
downloadtf-a-tests-09d3ce922a82c76e5c231219fe16c719633cf048.tar.gz
cactus: update memory/device region nodes in manifest
add memory/device region nodes in partition manifest to test SPM functionality, memory region has 3 entries(RX, TX and a dummy) while device regions has single dummy entry. RX/TX entries reference to the memory regions through phandle. Memory regions are mapped with following Attributes, RX buffer: read-only TX buffer: read-write dummy: read-write-execute Device region mapped with read-write attribute. Refer to "psa-ffa-manifest-binding.rst" in TF-A project for details about encoding of attributes. Signed-off-by: Manish Pandey <manish.pandey2@arm.com> Change-Id: I1937d99b9ed54e0a578f353d1a44983b9edd5ec0
Diffstat (limited to 'spm')
-rw-r--r--spm/cactus/cactus-secondary.dts38
-rw-r--r--spm/cactus/cactus.dts39
2 files changed, 55 insertions, 22 deletions
diff --git a/spm/cactus/cactus-secondary.dts b/spm/cactus/cactus-secondary.dts
index 4450b1bb6..8a140a971 100644
--- a/spm/cactus/cactus-secondary.dts
+++ b/spm/cactus/cactus-secondary.dts
@@ -35,28 +35,44 @@
rx_tx-info {
compatible = "arm,ffa-manifest-rx_tx-buffer";
-
- description = "NS RX/TX Buffer";
- pages-count = <1>;
- attributes = <0x0>;
- base-address = <0x7200000>;
+ rx-buffer = <&rxbuffer>;
+ tx-buffer = <&txbuffer>;
};
memory-regions {
compatible = "arm,ffa-manifest-memory-regions";
+
+ rxbuffer: rx-buffer {
+ description = "rx-buffer";
+ pages-count = <1>;
+ base-address = <0x00000000 0x7202000>;
+ attributes = <0x1>; /* read-only */
+ };
+
+ txbuffer: tx-buffer {
+ description = "tx-buffer";
+ pages-count = <1>;
+ base-address = <0x00000000 0x7203000>;
+ attributes = <0x3>; /* read-write */
+ };
+
+ /* Without optional base-address */
test-memory {
- description = "Test Memory";
- pages-count = <32>; /* 128KiB with 4KiB pages */
- base-address = <0x00000000 0x21000000>;
- attributes = <0x0>;
+ description = "test-memory";
+ pages-count = <4>;
+ attributes = <0x7>; /* read-write-execute */
};
};
device-regions {
compatible = "arm,ffa-manifest-device-regions";
- attributes = <0x0>;
+
test-reg {
- reg = <0x10000008 0x00000001 1>; /* Arbitrary test address */
+ /* Dummy values */
+ base-address = <0x00000000 0x24000000>;
+ pages-count = <16>;
+ attributes = <0x3>; /* read-write */
+ reg = <0x10000008 0x00000001 1>;
smmu-id = <1>;
stream-ids = <0x0 0x1>;
interrupts = <0x2 0x3>,
diff --git a/spm/cactus/cactus.dts b/spm/cactus/cactus.dts
index ea2b133e5..2e30db4ad 100644
--- a/spm/cactus/cactus.dts
+++ b/spm/cactus/cactus.dts
@@ -35,32 +35,49 @@
rx_tx-info {
compatible = "arm,ffa-manifest-rx_tx-buffer";
-
- description = "NS RX/TX Buffer";
- pages-count = <1>;
- attributes = <0x0>;
- base-address = <0x7200000>;
+ rx-buffer = <&rxbuffer>;
+ tx-buffer = <&txbuffer>;
};
memory-regions {
compatible = "arm,ffa-manifest-memory-regions";
+
+ rxbuffer: rx-buffer {
+ description = "rx-buffer";
+ pages-count = <1>;
+ base-address = <0x00000000 0x7200000>;
+ attributes = <0x1>; /* read-only */
+ };
+
+ txbuffer: tx-buffer {
+ description = "tx-buffer";
+ pages-count = <1>;
+ base-address = <0x00000000 0x7201000>;
+ attributes = <0x3>; /* read-write */
+ };
+
+ /* Without optional base-address */
test-memory {
- description = "Test Memory";
- pages-count = <32>; /* 128KiB with 4KiB pages */
- base-address = <0x00000000 0x21000000>;
- attributes = <0x0>;
+ description = "test-memory";
+ pages-count = <4>;
+ attributes = <0x7>; /* read-write-execute */
};
};
device-regions {
compatible = "arm,ffa-manifest-device-regions";
- attributes = <0x0>;
+
test-reg {
- reg = <0x10000008 0x00000001 1>; /* Arbitrary test address */
+ /* Dummy Values */
+ base-address = <0x00000000 0x22000000>;
+ pages-count = <64>;
+ attributes = <0x3>; /* read-write */
+ reg = <0x10000008 0x00000001 1>;
smmu-id = <1>;
stream-ids = <0x0 0x1>;
interrupts = <0x2 0x3>,
<0x4 0x5>;
+ exclusive-access;
};
};