mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-08-16 17:37:02 +02:00
caff3c8724
This patch fixes the following compilation error
reported by aarch64-none-elf-gcc 11.0.0:
bl32/tsp/tsp_main.c: In function 'tsp_smc_handler':
bl32/tsp/tsp_main.c:393:9: error: 'tsp_get_magic'
accessing 32 bytes in a region of size 16
[-Werror=stringop-overflow=]
393 | tsp_get_magic(service_args);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
bl32/tsp/tsp_main.c:393:9: note: referencing argument 1
of type 'uint64_t *' {aka 'long long unsigned int *'}
In file included from bl32/tsp/tsp_main.c:19:
bl32/tsp/tsp_private.h:64:6: note: in a call to function 'tsp_get_magic'
64 | void tsp_get_magic(uint64_t args[4]);
| ^~~~~~~~~~~~~
by changing declaration of tsp_get_magic function from
void tsp_get_magic(uint64_t args[4]);
to
uint128_t tsp_get_magic(void);
which returns arguments directly in x0 and x1 registers.
In bl32\tsp\tsp_main.c the current tsp_smc_handler()
implementation calls tsp_get_magic(service_args);
, where service_args array is declared as
uint64_t service_args[2];
and tsp_get_magic() in bl32\tsp\aarch64\tsp_request.S
copies only 2 registers in output buffer:
/* Store returned arguments to the array */
stp x0, x1, [x4, #0]
Change-Id: Ib34759fc5d7bb803e6c734540d91ea278270b330
Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
154 lines
4.0 KiB
C
154 lines
4.0 KiB
C
/*
|
|
* Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#ifndef TSP_PRIVATE_H
|
|
#define TSP_PRIVATE_H
|
|
|
|
/* Definitions to help the assembler access the SMC/ERET args structure */
|
|
#define TSP_ARGS_SIZE 0x40
|
|
#define TSP_ARG0 0x0
|
|
#define TSP_ARG1 0x8
|
|
#define TSP_ARG2 0x10
|
|
#define TSP_ARG3 0x18
|
|
#define TSP_ARG4 0x20
|
|
#define TSP_ARG5 0x28
|
|
#define TSP_ARG6 0x30
|
|
#define TSP_ARG7 0x38
|
|
#define TSP_ARGS_END 0x40
|
|
|
|
|
|
#ifndef __ASSEMBLER__
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <platform_def.h> /* For CACHE_WRITEBACK_GRANULE */
|
|
|
|
#include <bl32/tsp/tsp.h>
|
|
#include <lib/cassert.h>
|
|
#include <lib/spinlock.h>
|
|
|
|
typedef struct work_statistics {
|
|
/* Number of s-el1 interrupts on this cpu */
|
|
uint32_t sel1_intr_count;
|
|
/* Number of non s-el1 interrupts on this cpu which preempted TSP */
|
|
uint32_t preempt_intr_count;
|
|
/* Number of sync s-el1 interrupts on this cpu */
|
|
uint32_t sync_sel1_intr_count;
|
|
/* Number of s-el1 interrupts returns on this cpu */
|
|
uint32_t sync_sel1_intr_ret_count;
|
|
uint32_t smc_count; /* Number of returns on this cpu */
|
|
uint32_t eret_count; /* Number of entries on this cpu */
|
|
uint32_t cpu_on_count; /* Number of cpu on requests */
|
|
uint32_t cpu_off_count; /* Number of cpu off requests */
|
|
uint32_t cpu_suspend_count; /* Number of cpu suspend requests */
|
|
uint32_t cpu_resume_count; /* Number of cpu resume requests */
|
|
} __aligned(CACHE_WRITEBACK_GRANULE) work_statistics_t;
|
|
|
|
typedef struct tsp_args {
|
|
uint64_t _regs[TSP_ARGS_END >> 3];
|
|
} __aligned(CACHE_WRITEBACK_GRANULE) tsp_args_t;
|
|
|
|
/* Macros to access members of the above structure using their offsets */
|
|
#define read_sp_arg(args, offset) ((args)->_regs[offset >> 3])
|
|
#define write_sp_arg(args, offset, val) (((args)->_regs[offset >> 3]) \
|
|
= val)
|
|
/*
|
|
* Ensure that the assembler's view of the size of the tsp_args is the
|
|
* same as the compilers
|
|
*/
|
|
CASSERT(TSP_ARGS_SIZE == sizeof(tsp_args_t), assert_sp_args_size_mismatch);
|
|
|
|
uint128_t tsp_get_magic(void);
|
|
|
|
tsp_args_t *tsp_cpu_resume_main(uint64_t max_off_pwrlvl,
|
|
uint64_t arg1,
|
|
uint64_t arg2,
|
|
uint64_t arg3,
|
|
uint64_t arg4,
|
|
uint64_t arg5,
|
|
uint64_t arg6,
|
|
uint64_t arg7);
|
|
tsp_args_t *tsp_cpu_suspend_main(uint64_t arg0,
|
|
uint64_t arg1,
|
|
uint64_t arg2,
|
|
uint64_t arg3,
|
|
uint64_t arg4,
|
|
uint64_t arg5,
|
|
uint64_t arg6,
|
|
uint64_t arg7);
|
|
tsp_args_t *tsp_cpu_on_main(void);
|
|
tsp_args_t *tsp_cpu_off_main(uint64_t arg0,
|
|
uint64_t arg1,
|
|
uint64_t arg2,
|
|
uint64_t arg3,
|
|
uint64_t arg4,
|
|
uint64_t arg5,
|
|
uint64_t arg6,
|
|
uint64_t arg7);
|
|
|
|
/* Generic Timer functions */
|
|
void tsp_generic_timer_start(void);
|
|
void tsp_generic_timer_handler(void);
|
|
void tsp_generic_timer_stop(void);
|
|
void tsp_generic_timer_save(void);
|
|
void tsp_generic_timer_restore(void);
|
|
|
|
/* S-EL1 interrupt management functions */
|
|
void tsp_update_sync_sel1_intr_stats(uint32_t type, uint64_t elr_el3);
|
|
|
|
|
|
/* Data structure to keep track of TSP statistics */
|
|
extern spinlock_t console_lock;
|
|
extern work_statistics_t tsp_stats[PLATFORM_CORE_COUNT];
|
|
|
|
/* Vector table of jumps */
|
|
extern tsp_vectors_t tsp_vector_table;
|
|
|
|
/* functions */
|
|
int32_t tsp_common_int_handler(void);
|
|
int32_t tsp_handle_preemption(void);
|
|
|
|
tsp_args_t *tsp_abort_smc_handler(uint64_t func,
|
|
uint64_t arg1,
|
|
uint64_t arg2,
|
|
uint64_t arg3,
|
|
uint64_t arg4,
|
|
uint64_t arg5,
|
|
uint64_t arg6,
|
|
uint64_t arg7);
|
|
|
|
tsp_args_t *tsp_smc_handler(uint64_t func,
|
|
uint64_t arg1,
|
|
uint64_t arg2,
|
|
uint64_t arg3,
|
|
uint64_t arg4,
|
|
uint64_t arg5,
|
|
uint64_t arg6,
|
|
uint64_t arg7);
|
|
|
|
tsp_args_t *tsp_system_reset_main(uint64_t arg0,
|
|
uint64_t arg1,
|
|
uint64_t arg2,
|
|
uint64_t arg3,
|
|
uint64_t arg4,
|
|
uint64_t arg5,
|
|
uint64_t arg6,
|
|
uint64_t arg7);
|
|
|
|
tsp_args_t *tsp_system_off_main(uint64_t arg0,
|
|
uint64_t arg1,
|
|
uint64_t arg2,
|
|
uint64_t arg3,
|
|
uint64_t arg4,
|
|
uint64_t arg5,
|
|
uint64_t arg6,
|
|
uint64_t arg7);
|
|
|
|
uint64_t tsp_main(void);
|
|
#endif /* __ASSEMBLER__ */
|
|
|
|
#endif /* TSP_PRIVATE_H */
|