diff options
author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-02-27 14:32:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-27 14:32:35 +0000 |
commit | 57bc6424cd7021e64d2af876b7d79b685893a208 (patch) | |
tree | 7ac40b1632b32078b667add460c4f1a3a0b5ed5b /bl31/bl31_main.c | |
parent | fc159c62ed6779bbf64882535e245629dd059e98 (diff) | |
parent | 67b6ff9f8ccd84cea1627d738f3e2d4eb0a789e1 (diff) | |
download | trusted-firmware-a-57bc6424cd7021e64d2af876b7d79b685893a208.tar.gz |
Merge pull request #1829 from antonio-nino-diaz-arm/an/pauth
Add Pointer Authentication (ARMv8.3-PAuth) support to the TF
Diffstat (limited to 'bl31/bl31_main.c')
-rw-r--r-- | bl31/bl31_main.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index da35f75eda..aca16d6779 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -64,6 +64,27 @@ void __init bl31_lib_init(void) } /******************************************************************************* + * Setup function for BL31. + ******************************************************************************/ +void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, + u_register_t arg3) +{ + /* Perform early platform-specific setup */ + bl31_early_platform_setup2(arg0, arg1, arg2, arg3); + + /* + * 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 */ + bl31_plat_arch_setup(); +} + +/******************************************************************************* * BL31 is responsible for setting up the runtime services for the primary cpu * before passing control to the bootloader or an Operating System. This * function calls runtime_svc_init() which initializes all registered runtime |