diff options
author | Manish Pandey <manish.pandey2@arm.com> | 2020-07-27 13:57:21 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-07-27 13:57:21 +0000 |
commit | 8a669d956699e967ca7f298d4bf74111c10dd164 (patch) | |
tree | 3ca54a71167a91304db18c5ee891ce2f831f03b6 /spm/cactus/cactus_main.c | |
parent | d07b682769c1861bf12ef3a9177c62796c5c9d2b (diff) | |
parent | 57c6ddbfddeb0d5ebe27d62b426bb1029fe8d622 (diff) | |
download | tf-a-tests-8a669d956699e967ca7f298d4bf74111c10dd164.tar.gz |
Merge changes from topic "ffa_tests"
* changes:
Cactus: tidying FFA_VERSION test.
Cactus: FFA_PARTITION_INFO_GET test.
Cactus: FFA_FEATURES test.
SPM: TFTF test of FFA_FEATURES interface.
Diffstat (limited to 'spm/cactus/cactus_main.c')
-rw-r--r-- | spm/cactus/cactus_main.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c index 49764eccd..31906d597 100644 --- a/spm/cactus/cactus_main.c +++ b/spm/cactus/cactus_main.c @@ -102,12 +102,12 @@ static void cactus_print_memory_layout(unsigned int vm_id) (void *)CACTUS_BSS_START, (void *)CACTUS_BSS_END); NOTICE(" RX : %p - %p\n", - (void *)(CACTUS_RX_BASE + ((vm_id - 1) * CACTUS_RX_TX_SIZE)), - (void *)(CACTUS_TX_BASE + ((vm_id - 1) * CACTUS_RX_TX_SIZE))); + (void *)get_sp_rx_start(vm_id), + (void *)get_sp_rx_end(vm_id)); NOTICE(" TX : %p - %p\n", - (void *)(CACTUS_TX_BASE + ((vm_id - 1) * CACTUS_RX_TX_SIZE)), - (void *)(CACTUS_RX_BASE + (vm_id * CACTUS_RX_TX_SIZE))); + (void *)get_sp_tx_start(vm_id), + (void *)get_sp_tx_end(vm_id)); } static void cactus_plat_configure_mmu(unsigned int vm_id) @@ -129,13 +129,13 @@ static void cactus_plat_configure_mmu(unsigned int vm_id) CACTUS_BSS_END - CACTUS_BSS_START, MT_RW_DATA); - mmap_add_region((CACTUS_RX_BASE + ((vm_id - 1) * CACTUS_RX_TX_SIZE)), - (CACTUS_RX_BASE + ((vm_id - 1) * CACTUS_RX_TX_SIZE)), + mmap_add_region(get_sp_rx_start(vm_id), + get_sp_rx_start(vm_id), (CACTUS_RX_TX_SIZE / 2), MT_RO_DATA); - mmap_add_region((CACTUS_TX_BASE + ((vm_id - 1) * CACTUS_RX_TX_SIZE)), - (CACTUS_TX_BASE + ((vm_id - 1) * CACTUS_RX_TX_SIZE)), + mmap_add_region(get_sp_tx_start(vm_id), + get_sp_tx_start(vm_id), (CACTUS_RX_TX_SIZE / 2), MT_RW_DATA); @@ -147,6 +147,7 @@ void __dead2 cactus_main(void) { assert(IS_IN_EL1() != 0); + struct mailbox_buffers mb; /* Clear BSS */ memset((void *)CACTUS_BSS_START, 0, CACTUS_BSS_END - CACTUS_BSS_START); @@ -159,6 +160,8 @@ void __dead2 cactus_main(void) } ffa_vm_id_t ffa_id = ffa_id_ret.ret2 & 0xffff; + mb.send = (void *) get_sp_tx_start(ffa_id); + mb.recv = (void *) get_sp_rx_start(ffa_id); /* Configure and enable Stage-1 MMU, enable D-Cache */ cactus_plat_configure_mmu(ffa_id); @@ -190,7 +193,7 @@ void __dead2 cactus_main(void) cactus_print_memory_layout(ffa_id); /* Invoking Tests */ - ffa_tests(); + ffa_tests(&mb); /* End up to message loop */ message_loop(ffa_id); |