diff options
Diffstat (limited to 'spm/cactus/plat/arm/fvp/fdts/cactus.dts')
-rw-r--r-- | spm/cactus/plat/arm/fvp/fdts/cactus.dts | 84 |
1 files changed, 55 insertions, 29 deletions
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus.dts b/spm/cactus/plat/arm/fvp/fdts/cactus.dts index 1c28fde49..3effb39d7 100644 --- a/spm/cactus/plat/arm/fvp/fdts/cactus.dts +++ b/spm/cactus/plat/arm/fvp/fdts/cactus.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, Arm Limited. All rights reserved. + * Copyright (c) 2019-2023, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause * @@ -15,8 +15,8 @@ /* Properties */ description = "Base-1"; - ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */ - uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>; + ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */ + uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>; id = <1>; auxiliary-id = <0xae>; stream-endpoint-ids = <0 1 2 3>; @@ -24,14 +24,21 @@ exception-level = <2>; /* S-EL1 */ execution-state = <0>; /* AARCH64 */ load-address = <0x7000000>; - entrypoint-offset = <0x00001000>; + entrypoint-offset = <0x00002000>; xlat-granule = <0>; /* 4KiB */ boot-order = <0>; - messaging-method = <3>; /* Direct messaging with managed exit */ - run-time-model = <0>; /* Run to completion */ + messaging-method = <3>; /* Direct messaging only */ + ns-interrupts-action = <1>; /* Managed exit is supported */ + notification-support; /* Support receipt of notifications. */ /* Boot protocol */ - gp-register-num = <0x0>; + gp-register-num = <0>; + + /* Boot Info */ + boot-info { + compatible = "arm,ffa-manifest-boot-info"; + ffa_manifest; + }; rx_tx-info { compatible = "arm,ffa-manifest-rx_tx-buffer"; @@ -56,11 +63,12 @@ attributes = <0x3>; /* read-write */ }; - /* Without optional base-address */ - test-memory { - description = "test-memory"; - pages-count = <4>; - attributes = <0x7>; /* read-write-execute */ + /* Memory to be shared in memory sharing tests. */ + share-memory { + description = "share-memory"; + pages-count = <1>; + base-address =<0x00000000 0x7500000>; + attributes = <0x3>; /* read-write */ }; /* @@ -72,6 +80,9 @@ pages-count = <4>; base-address = <0x00000000 0x7400000>; attributes = <0x3>; /* read-write */ + smmu-id = <0>; + stream-ids = <0x0 0x1>; + stream-ids-access-permissions = <0x3 0x3>; }; smmuv3-memcpy-dst { @@ -79,18 +90,25 @@ pages-count = <4>; base-address = <0x00000000 0x7404000>; attributes = <0x3>; /* read-write */ + smmu-id = <0>; + stream-ids = <0x0 0x1>; + stream-ids-access-permissions = <0x3 0x3>; + }; + + smmuv3-ns-region { + description = "smmuv3-memcpy-ns-region"; + pages-count = <8>; + base-address = <0x0 0x90000000>; + attributes = <0xb>; /* ns-read-write */ + smmu-id = <0>; + stream-ids = <0x0 0x1>; + stream-ids-access-permissions = <0xb 0xb>; }; }; device-regions { compatible = "arm,ffa-manifest-device-regions"; - uart2 { - base-address = <0x00000000 0x1c0b0000>; - pages-count = <1>; - attributes = <0x3>; /* read-write */ - }; - smmuv3-testengine { /* * SMMUv3TestEngine is a DMA IP modeled in the @@ -105,18 +123,26 @@ stream-ids = <0x0 0x1>; }; - test-reg { - /* Dummy Values */ - base-address = <0x00000000 0x22000000>; - pages-count = <64>; + sec_wdog { + /* SP805 Trusted Watchdog Module */ + base-address = <0x00000000 0x2a490000>; + pages-count = <32>; /* Two 64KB pages */ attributes = <0x3>; /* read-write */ - reg = <0x10000008 0x00000001 1>; - smmu-id = <1>; - stream-ids = <0x0 0x1>; - interrupts = <0x2 0x3>, - <0x4 0x5>; - exclusive-access; + interrupts = <56 0x900>; }; - }; + espi_test_node { + /* + * A dummy device region node representing a fake + * peripheral. Explicitly used to specify properties of + * interrupt 5000, in the extended SPI range, used for + * testing purposes. All the properties below except + * `interrupts` are irrelevant. + */ + base-address = <0x00000000 0x1c130000>; + pages-count = <1>; /* One 4KB page */ + attributes = <0x1>; /* read-only */ + interrupts = <5000 0x900>; + }; + }; }; |