diff options
Diffstat (limited to 'bl32/tsp/tsp_main.c')
| -rw-r--r-- | bl32/tsp/tsp_main.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/bl32/tsp/tsp_main.c b/bl32/tsp/tsp_main.c index 0a817351c..e1d961cc6 100644 --- a/bl32/tsp/tsp_main.c +++ b/bl32/tsp/tsp_main.c @@ -4,14 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <platform_def.h> +#include <assert.h> +#include <arch_features.h> #include <arch_helpers.h> #include <bl32/tsp/tsp.h> #include <common/bl_common.h> #include <common/debug.h> #include <lib/spinlock.h> #include <plat/common/platform.h> +#include <platform_def.h> #include <platform_tsp.h> #include "tsp_private.h" @@ -79,16 +81,16 @@ void tsp_setup(void) /* Perform early platform-specific setup */ tsp_early_platform_setup(); - /* - * 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(); - /* Perform late platform-specific setup */ tsp_plat_arch_setup(); + +#if ENABLE_PAUTH + /* + * 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 /* ENABLE_PAUTH */ } /******************************************************************************* |