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 <boyan.karatotev@arm.com> Change-Id: I91769b2994ad643d2259c211936dbac4ef010d25
2 years ago · 1d2706dbaf
2 changed files with 1 additions and 10 deletions
--- 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
--- 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