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

Merge "feat(versal): update macro name to generic and move to common place" into integration

Browse source
This commit is contained in:
Joanna Farley 2022-09-16 10:56:59 +02:00 • committed by TrustedFirmware Code Review
commit 8edd190e64
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plat/xilinx/common/include/pm_common.h
View file

@ -27,6 +27,11 @@
#endif #endif
#define PAYLOAD_ARG_SIZE 4U /* size in bytes */ #define PAYLOAD_ARG_SIZE 4U /* size in bytes */
#define TZ_VERSION_MAJOR 1
#define TZ_VERSION_MINOR 0
#define TZ_VERSION ((TZ_VERSION_MAJOR << 16) | \
TZ_VERSION_MINOR)
/** /**
* pm_ipi - struct for capturing IPI-channel specific info * pm_ipi - struct for capturing IPI-channel specific info
* @local_ipi_id Local IPI agent ID * @local_ipi_id Local IPI agent ID

4
plat/xilinx/versal/include/plat_pm_common.h
View file

@ -19,8 +19,4 @@
#define NON_SECURE_FLAG 1U #define NON_SECURE_FLAG 1U
#define SECURE_FLAG 0U #define SECURE_FLAG 0U
#define VERSAL_TZ_VERSION_MAJOR 1U
#define VERSAL_TZ_VERSION_MINOR 0U
#define VERSAL_TZ_VERSION ((VERSAL_TZ_VERSION_MAJOR << 16U) | \
VERSAL_TZ_VERSION_MINOR)
#endif /* PLAT_PM_COMMON_H */ #endif /* PLAT_PM_COMMON_H */

2
plat/xilinx/versal/pm_service/pm_svc_main.c
View file

@ -289,7 +289,7 @@ static uintptr_t TF_A_specific_handler(uint32_t api_id, uint32_t *pm_arg,
case PM_GET_TRUSTZONE_VERSION: case PM_GET_TRUSTZONE_VERSION:
SMC_RET1(handle, (uint64_t)PM_RET_SUCCESS | SMC_RET1(handle, (uint64_t)PM_RET_SUCCESS |
((uint64_t)VERSAL_TZ_VERSION << 32U)); ((uint64_t)TZ_VERSION << 32U));
default: default:
return (uintptr_t)0; return (uintptr_t)0;