Browse Source
Merge pull request #1867 from AlexeiFedorov/af/enable_ptrauth_warm_boot
BL31: Enable pointer authentication support in warm boot path
pull/1872/head
Dimitris Papastamos
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
13 additions and
0 deletions
-
bl31/aarch64/bl31_entrypoint.S
|
|
|
@ -201,6 +201,19 @@ func bl31_warm_entrypoint |
|
|
|
#endif |
|
|
|
bl bl31_plat_enable_mmu |
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- |
|
|
|
* Enable pointer authentication |
|
|
|
* -------------------------------------------------------------------- |
|
|
|
*/ |
|
|
|
#if ENABLE_PAUTH |
|
|
|
bl pauth_load_bl_apiakey |
|
|
|
|
|
|
|
mrs x0, sctlr_el3 |
|
|
|
orr x0, x0, #SCTLR_EnIA_BIT |
|
|
|
msr sctlr_el3, x0 |
|
|
|
isb |
|
|
|
#endif /* ENABLE_PAUTH */ |
|
|
|
|
|
|
|
bl psci_warmboot_entrypoint |
|
|
|
|
|
|
|
#if ENABLE_RUNTIME_INSTRUMENTATION |
|
|
|
|
