Refactor ARMv8.3 Pointer Authentication support code

[project/bcm63xx/atf.git] / bl2 / bl2_main.c

diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index 79b0e717bbd7ce214a753030e5d4c38a4ba4629d..802c1746436e7272aa36e228675338385b809389 100644 (file)
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -4,13 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
 #include <arch_helpers.h>
+#include <arch_features.h>
 #include <bl1/bl1.h>
 #include <bl2/bl2.h>
 #include <common/bl_common.h>
 #include <common/debug.h>
 #include <drivers/auth/auth_mod.h>
 #include <drivers/console.h>
+#include <lib/extensions/pauth.h>
 #include <plat/common/platform.h>
 
 #include "bl2_private.h"
@@ -31,18 +35,16 @@ void bl2_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
        /* Perform early platform-specific setup */
        bl2_early_platform_setup2(arg0, arg1, arg2, arg3);
 
-#ifdef __aarch64__
-       /*
-        * Update pointer authentication key before the MMU is enabled. It is
-        * saved in the rodata section, that can be writen before enabling the
-        * MMU. This function must be called after the console is initialized
-        * in the early platform setup.
-        */
-       bl_handle_pauth();
-#endif /* __aarch64__ */
-
        /* Perform late platform-specific setup */
        bl2_plat_arch_setup();
+
+#if CTX_INCLUDE_PAUTH_REGS
+       /*
+        * Assert that the ARMv8.3-PAuth registers are present or an access
+        * fault will be triggered when they are being saved or restored.
+        */
+       assert(is_armv8_3_pauth_present());
+#endif /* CTX_INCLUDE_PAUTH_REGS */
 }
 
 #else /* if BL2_AT_EL3 */
@@ -55,18 +57,16 @@ void bl2_el3_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
        /* Perform early platform-specific setup */
        bl2_el3_early_platform_setup(arg0, arg1, arg2, arg3);
 
-#ifdef __aarch64__
-       /*
-        * Update pointer authentication key before the MMU is enabled. It is
-        * saved in the rodata section, that can be writen before enabling the
-        * MMU. This function must be called after the console is initialized
-        * in the early platform setup.
-        */
-       bl_handle_pauth();
-#endif /* __aarch64__ */
-
        /* Perform late platform-specific setup */
        bl2_el3_plat_arch_setup();
+
+#if CTX_INCLUDE_PAUTH_REGS
+       /*
+        * Assert that the ARMv8.3-PAuth registers are present or an access
+        * fault will be triggered when they are being saved or restored.
+        */
+       assert(is_armv8_3_pauth_present());
+#endif /* CTX_INCLUDE_PAUTH_REGS */
 }
 #endif /* BL2_AT_EL3 */
 
@@ -108,6 +108,13 @@ void bl2_main(void)
 
        console_flush();
 
+#if ENABLE_PAUTH
+       /*
+        * Disable pointer authentication before running next boot image
+        */
+       pauth_disable_el1();
+#endif /* ENABLE_PAUTH */
+
        /*
         * Run next BL image via an SMC to BL1. Information on how to pass
         * control to the BL32 (if present) and BL33 software images will
@@ -119,6 +126,13 @@ void bl2_main(void)
        print_entry_point_info(next_bl_ep_info);
        console_flush();
 
+#if ENABLE_PAUTH
+       /*
+        * Disable pointer authentication before running next boot image
+        */
+       pauth_disable_el3();
+#endif /* ENABLE_PAUTH */
+
        bl2_run_next_image(next_bl_ep_info);
 #endif /* BL2_AT_EL3 */
 }