On 3/2/25 15:21, Heinrich Schuchardt wrote:
> Instead of using the implementation specific struct jmp_buf_data use the
> standard compliant type jmp_buf when switching exception levels.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schucha...@canonical.com>
> ---
> arch/arm/cpu/armv7/exception_level.c | 6 +++---
> arch/arm/cpu/armv8/exception_level.c | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/exception_level.c
> b/arch/arm/cpu/armv7/exception_level.c
> index c63b0e13666..a55c158ce51 100644
> --- a/arch/arm/cpu/armv7/exception_level.c
> +++ b/arch/arm/cpu/armv7/exception_level.c
> @@ -24,7 +24,7 @@
> *
> * @non_secure_jmp: jump buffer for restoring stack and registers
> */
> -static void entry_non_secure(struct jmp_buf_data *non_secure_jmp)
> +static void entry_non_secure(jmp_buf non_secure_jmp)
> {
> dcache_enable();
> debug("Reached non-secure mode\n");
> @@ -42,10 +42,10 @@ static void entry_non_secure(struct jmp_buf_data
> *non_secure_jmp)
> void switch_to_non_secure_mode(void)
> {
> static bool is_nonsec;
> - struct jmp_buf_data non_secure_jmp;
> + jmp_buf non_secure_jmp;
>
> if (armv7_boot_nonsec() && !is_nonsec) {
> - if (setjmp(&non_secure_jmp))
> + if (setjmp(non_secure_jmp))
> return;
> dcache_disable(); /* flush cache before switch to HYP */
> armv7_init_nonsec();
> diff --git a/arch/arm/cpu/armv8/exception_level.c
> b/arch/arm/cpu/armv8/exception_level.c
> index 58e816007f0..746737861e7 100644
> --- a/arch/arm/cpu/armv8/exception_level.c
> +++ b/arch/arm/cpu/armv8/exception_level.c
> @@ -23,7 +23,7 @@
> *
> * @non_secure_jmp: jump buffer for restoring stack and registers
> */
> -static void entry_non_secure(struct jmp_buf_data *non_secure_jmp)
> +static void entry_non_secure(jmp_buf non_secure_jmp)
> {
> dcache_enable();
> debug("Reached non-secure mode\n");
> @@ -42,11 +42,11 @@ static void entry_non_secure(struct jmp_buf_data
> *non_secure_jmp)
> */
> void switch_to_non_secure_mode(void)
> {
> - struct jmp_buf_data non_secure_jmp;
> + jmp_buf non_secure_jmp;
>
> /* On AArch64 we need to make sure we call our payload in < EL3 */
> if (current_el() == 3) {
> - if (setjmp(&non_secure_jmp))
> + if (setjmp(non_secure_jmp))
> return;
> dcache_disable(); /* flush cache before switch to EL2 */
>
Reviewed-by: Jerome Forissier <jerome.foriss...@linaro.org>
Regards,
--
Jerome
