From 1d2706dbaf98634aa1eecc65e52b54acf330df3d Mon Sep 17 00:00:00 2001 From: Boyan Karatotev Date: Mon, 6 Mar 2023 14:45:15 +0000 Subject: [PATCH] chore(pauth): remove redundant pauth_disable_el3() call Both bl2_main and bl2_run_next_image call pauth_disable_el3. However, bl2_main is the only caller of bl2_run_next_image so it doesn't need to call it Signed-off-by: Boyan Karatotev Change-Id: I91769b2994ad643d2259c211936dbac4ef010d25 --- bl2/aarch64/bl2_run_next_image.S | 9 --------- lib/extensions/pauth/pauth_helpers.S | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/bl2/aarch64/bl2_run_next_image.S b/bl2/aarch64/bl2_run_next_image.S index f0a8be87a..1431a5fef 100644 --- a/bl2/aarch64/bl2_run_next_image.S +++ b/bl2/aarch64/bl2_run_next_image.S @@ -24,15 +24,6 @@ func bl2_run_next_image tlbi alle3 bl bl2_el3_plat_prepare_exit -#if ENABLE_PAUTH - /* --------------------------------------------- - * Disable pointer authentication before jumping - * to next boot image. - * --------------------------------------------- - */ - bl pauth_disable_el3 -#endif /* ENABLE_PAUTH */ - ldp x0, x1, [x20, #ENTRY_POINT_INFO_PC_OFFSET] msr elr_el3, x0 msr spsr_el3, x1 diff --git a/lib/extensions/pauth/pauth_helpers.S b/lib/extensions/pauth/pauth_helpers.S index d483c7df7..fb5fa9788 100644 --- a/lib/extensions/pauth/pauth_helpers.S +++ b/lib/extensions/pauth/pauth_helpers.S @@ -45,7 +45,7 @@ func pauth_init_enable_el1 endfunc pauth_init_enable_el1 /* ------------------------------------------------------------- - * Disable pointer authentication in EL3 + * Disable pointer authentication in EL1 * ------------------------------------------------------------- */ func pauth_disable_el1