commit e2b717e6bde966392676a2993c8384b8153b34fc
author Dimitris Papastamos <dimitris.papastamos@arm.com> Fri Mar 08 09:43:54 2019 +0000
committer GitHub <noreply@github.com> Fri Mar 08 09:43:54 2019 +0000
tree b5aa31f9037c6e1f6382b102eecdeef5938f2861
parent 8807771ff5d803dbd6b43dd0b5628f62b1e21805
parent 7dcbb4f315087c53f3de2bf3b081f76d7513e4fd

Merge pull request #1867 from AlexeiFedorov/af/enable_ptrauth_warm_boot

BL31: Enable pointer authentication support in warm boot path

bl31/aarch64/bl31_entrypoint.S

diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 8e9528b..065edff 100644
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -201,6 +201,19 @@
 #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