Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-18 02:24:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "el3spmc-fix-v2.12-rc0" into integration

Browse source 
* changes:
  feat(qemu): increase size of bl31
  fix(qemu): fix EL3-SPMC data store alignment
  fix(qemu): fix build error with spmd
This commit is contained in:
Olivier Deprez 2024-11-19 14:57:37 +01:00 • committed by TrustedFirmware Code Review
commit 847d6f4ab9
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plat/qemu/common/qemu_common.c
View file

@ -178,7 +178,7 @@ int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
*/ */
#define PLAT_SPMC_SHMEM_DATASTORE_SIZE 64 * 1024 #define PLAT_SPMC_SHMEM_DATASTORE_SIZE 64 * 1024
uint8_t plat_spmc_shmem_datastore[PLAT_SPMC_SHMEM_DATASTORE_SIZE]; uint8_t plat_spmc_shmem_datastore[PLAT_SPMC_SHMEM_DATASTORE_SIZE] __aligned(2 * sizeof(long));
int plat_spmc_shmem_datastore_get(uint8_t **datastore, size_t *size) int plat_spmc_shmem_datastore_get(uint8_t **datastore, size_t *size)
{ {
@ -198,16 +198,17 @@ int plat_spmc_shmem_reclaim(struct ffa_mtd *desc)
} }
#endif #endif
#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) #if defined(SPD_spmd)
/*
* A dummy implementation of the platform handler for Group0 secure interrupt.
*/
int plat_spmd_handle_group0_interrupt(uint32_t intid) int plat_spmd_handle_group0_interrupt(uint32_t intid)
{ {
/*
* Currently, there are no sources of Group0 secure interrupt
* enabled for QEMU.
*/
(void)intid; (void)intid;
return -1; return -1;
} }
#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ #endif /*defined(SPD_spmd)*/
#if ENABLE_RME #if ENABLE_RME
/* /*

2
plat/qemu/qemu/include/platform_def.h
View file

@ -150,7 +150,7 @@
* Put BL3-1 at the top of the Trusted SRAM. BL31_BASE is calculated using the * Put BL3-1 at the top of the Trusted SRAM. BL31_BASE is calculated using the
* current BL3-1 debug size plus a little space for growth. * current BL3-1 debug size plus a little space for growth.
*/ */
#define BL31_BASE (BL31_LIMIT - 0x60000) #define BL31_BASE (BL31_LIMIT - 0x70000)
#define BL31_LIMIT (BL_RAM_BASE + BL_RAM_SIZE - FW_HANDOFF_SIZE) #define BL31_LIMIT (BL_RAM_BASE + BL_RAM_SIZE - FW_HANDOFF_SIZE)
#define BL31_PROGBITS_LIMIT BL1_RW_BASE #define BL31_PROGBITS_LIMIT BL1_RW_BASE