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

feat(handoff): fix register convention r1/x1 value on transfer list

Browse source 
According to recently firmware handsoff spec [1]'s "Register usage at handoff
boundary", Transfer List's signature value was changed from 0x40_b10b
(3 bytes) to 4a0f_b10b (4 bytes).

As updating of TL's signature, register value of x1/r1 should be:

In aarch32's r1 value should be
    R1[23:0]: set to the TL signature (4a0f_b10b -> masked range value: 0f_b10b)
    R1[31:24]: version of the register convention ==  1
and
In aarch64's x1 value should be
    X1[31:0]: set to the TL signature (4a0f_b10b)
    X1[39:32]: version of the register convention ==  1
    X1[63:40]: MBZ
(See the [2] and [3]).

Therefore, it requires to separate mask and shift value for register
convention version field when sets each r1/x1.

This patch fix two problems:
   1. breaking X1 value with updated specification in aarch64
        - change of length of signature field.

   2. previous error value set in R1 in arm32.
        - length of signature should be 24, but it uses 32bit signature.

This change is breaking change. It requires some patch for other
softwares (u-boot[4], optee[5]).

Link: https://github.com/FirmwareHandoff/firmware_handoff [1]
Link: https://github.com/FirmwareHandoff/firmware_handoff/issues/32 [2]
Link: 5aa7aa1d3a [3]
Link: https://lists.denx.de/pipermail/u-boot/2024-July/558628.html [4]
Link: https://github.com/OP-TEE/optee_os/pull/6933 [5]
Signed-off-by: Levi Yun <yeoreum.yun@arm.com>
Change-Id: Ie417e054a7a4c192024a2679419e99efeded1705
This commit is contained in:
levi.yun 2024-05-13 10:27:17 +01:00 • committed by Levi Yun
parent 638e3aa5a2
commit 7475815f4b
4 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/lib/transfer_list.h
View file

@ -29,7 +29,22 @@
* Version of the register convention used.
* Set to 1 for both AArch64 and AArch32 according to fw handoff spec v0.9
*/
#define REGISTER_CONVENTION_VERSION_MASK (1 << 24)
#define REGISTER_CONVENTION_VERSION_SHIFT_64 UL(32)
#define REGISTER_CONVENTION_VERSION_SHIFT_32 UL(24)
#define REGISTER_CONVENTION_VERSION_MASK UL(0xff)
#define REGISTER_CONVENTION_VERSION UL(1)
#define TRANSFER_LIST_HANDOFF_X1_VALUE(__version) \
((TRANSFER_LIST_SIGNATURE & \
((1UL << REGISTER_CONVENTION_VERSION_SHIFT_64) - 1)) | \
(((__version) & REGISTER_CONVENTION_VERSION_MASK) << \
REGISTER_CONVENTION_VERSION_SHIFT_64))
#define TRANSFER_LIST_HANDOFF_R1_VALUE(__version) \
((TRANSFER_LIST_SIGNATURE & \
((1UL << REGISTER_CONVENTION_VERSION_SHIFT_32) - 1)) | \
(((__version) & REGISTER_CONVENTION_VERSION_MASK) << \
REGISTER_CONVENTION_VERSION_SHIFT_32))
#ifndef __ASSEMBLER__

21
lib/transfer_list/transfer_list.c
View file

@ -63,20 +63,21 @@ transfer_list_set_handoff_args(struct transfer_list_header *tl,
te = transfer_list_find(tl, TL_TAG_FDT);
dt = transfer_list_entry_data(te);
ep_info->args.arg1 = TRANSFER_LIST_SIGNATURE |
REGISTER_CONVENTION_VERSION_MASK;
ep_info->args.arg3 = (uintptr_t)tl;
if (GET_RW(ep_info->spsr) == MODE_RW_32) {
/* aarch32 */
ep_info->args.arg0 = 0;
ep_info->args.arg2 = (uintptr_t)dt;
} else {
/* aarch64 */
#ifdef __aarch64__
if (GET_RW(ep_info->spsr) == MODE_RW_64) {
ep_info->args.arg0 = (uintptr_t)dt;
ep_info->args.arg1 = TRANSFER_LIST_HANDOFF_X1_VALUE(REGISTER_CONVENTION_VERSION);
ep_info->args.arg2 = 0;
} else
#endif
{
ep_info->args.arg0 = 0;
ep_info->args.arg1 = TRANSFER_LIST_HANDOFF_R1_VALUE(REGISTER_CONVENTION_VERSION);
ep_info->args.arg2 = (uintptr_t)dt;
}
ep_info->args.arg3 = (uintptr_t)tl;
return ep_info;
}

16
plat/qemu/common/qemu_bl2_setup.c
View file

@ -357,12 +357,20 @@ static int qemu_bl2_handle_post_image_load(unsigned int image_id)
case BL31_IMAGE_ID:
/*
* arg0 is a bl_params_t reserved for bl31_early_platform_setup2
* we just need arg1 and arg3 for BL31 to update th TL from S
* we just need arg1 and arg3 for BL31 to update the TL from S
* to NS memory before it exits
*/
bl_mem_params->ep_info.args.arg1 =
TRANSFER_LIST_SIGNATURE |
REGISTER_CONVENTION_VERSION_MASK;
#ifdef __aarch64__
if (GET_RW(bl_mem_params->ep_info.spsr) == MODE_RW_64) {
bl_mem_params->ep_info.args.arg1 =
TRANSFER_LIST_HANDOFF_X1_VALUE(REGISTER_CONVENTION_VERSION);
} else
#endif
{
bl_mem_params->ep_info.args.arg1 =
TRANSFER_LIST_HANDOFF_R1_VALUE(REGISTER_CONVENTION_VERSION);
}
bl_mem_params->ep_info.args.arg3 = (uintptr_t)bl2_tl;
break;
#endif

7
services/spd/opteed/opteed_main.c
View file

@ -552,13 +552,14 @@ static int32_t opteed_handle_smc_load(uint64_t data_size, uint32_t data_pa)
if (opteed_rw == OPTEE_AARCH64) {
arg0 = (uint64_t)dt;
arg1 = TRANSFER_LIST_HANDOFF_X1_VALUE(REGISTER_CONVENTION_VERSION);
arg2 = 0;
} else {
arg2 = (uint64_t)dt;
arg0 = 0;
arg1 = TRANSFER_LIST_HANDOFF_R1_VALUE(REGISTER_CONVENTION_VERSION);
arg2 = (uint64_t)dt;
}
arg1 = TRANSFER_LIST_SIGNATURE |
REGISTER_CONVENTION_VERSION_MASK;
arg3 = (uint64_t)bl31_tl;
} else {
/* Default handoff arguments */