Merge pull request ARM-software#1867 from AlexeiFedorov/af/enable_ptr…

…auth_warm_boot BL31: Enable pointer authentication support in warm boot path
skullandbones · Mar 8, 2019 · e2b717e · e2b717e
2 parents 8807771 + 7dcbb4f
commit e2b717e
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/bl31/aarch64/bl31_entrypoint.S b/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