diff options
| author | Daniel Boulby <daniel.boulby@arm.com> | 2022-01-05 19:44:30 +0000 |
|---|---|---|
| committer | Daniel Boulby <daniel.boulby@arm.com> | 2022-01-06 10:24:36 +0000 |
| commit | 8aa994cc1d314dbfe5332c7aecdeff80c37f886d (patch) | |
| tree | b92cda0f9198cf262a6b69a1894e4e7d868fa0be /spm/cactus/cactus_tests | |
| parent | e7d9c4a9fe8e44a8ea53d786a29019c96ff23ec7 (diff) | |
test(ff-a): update partition info to include uuids
The ffa_partition_info_get interface has been updated in spm to
return the uuid of the partition in the descriptor. Updates the
tests to check this.
Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I8f4cc4a26a781288896e56977c198c69fa09d974
Diffstat (limited to 'spm/cactus/cactus_tests')
| -rw-r--r-- | spm/cactus/cactus_tests/cactus_test_ffa.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/spm/cactus/cactus_tests/cactus_test_ffa.c b/spm/cactus/cactus_tests/cactus_test_ffa.c index 2e47ebc..bca3984 100644 --- a/spm/cactus/cactus_tests/cactus_test_ffa.c +++ b/spm/cactus/cactus_tests/cactus_test_ffa.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, Arm Limited. All rights reserved. + * Copyright (c) 2018-2022, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -18,12 +18,12 @@ /* FFA version test helpers */ #define FFA_MAJOR 1U -#define FFA_MINOR 0U +#define FFA_MINOR 1U static uint32_t spm_version; static const struct ffa_uuid sp_uuids[] = { - {PRIMARY_UUID}, {SECONDARY_UUID}, {TERTIARY_UUID} + {PRIMARY_UUID}, {SECONDARY_UUID}, {TERTIARY_UUID}, {IVY_UUID} }; static const struct ffa_uuid null_uuid = { .uuid = {0} }; @@ -34,7 +34,8 @@ static const struct ffa_partition_info ffa_expected_partition_info[] = { .exec_context = PRIMARY_EXEC_CTX_COUNT, .properties = (FFA_PARTITION_DIRECT_REQ_RECV | FFA_PARTITION_DIRECT_REQ_SEND | - FFA_PARTITION_NOTIFICATION) + FFA_PARTITION_NOTIFICATION), + .uuid = sp_uuids[0] }, /* Secondary partition info */ { @@ -42,7 +43,8 @@ static const struct ffa_partition_info ffa_expected_partition_info[] = { .exec_context = SECONDARY_EXEC_CTX_COUNT, .properties = (FFA_PARTITION_DIRECT_REQ_RECV | FFA_PARTITION_DIRECT_REQ_SEND | - FFA_PARTITION_NOTIFICATION) + FFA_PARTITION_NOTIFICATION), + .uuid = sp_uuids[1] }, /* Tertiary partition info */ { @@ -50,13 +52,16 @@ static const struct ffa_partition_info ffa_expected_partition_info[] = { .exec_context = TERTIARY_EXEC_CTX_COUNT, .properties = (FFA_PARTITION_DIRECT_REQ_RECV | FFA_PARTITION_DIRECT_REQ_SEND | - FFA_PARTITION_NOTIFICATION) + FFA_PARTITION_NOTIFICATION), + .uuid = sp_uuids[2] }, /* Ivy partition info */ { .id = SP_ID(4), .exec_context = IVY_EXEC_CTX_COUNT, - .properties = (FFA_PARTITION_DIRECT_REQ_RECV | FFA_PARTITION_DIRECT_REQ_SEND) + .properties = (FFA_PARTITION_DIRECT_REQ_RECV | + FFA_PARTITION_DIRECT_REQ_SEND), + .uuid = sp_uuids[3] } }; |