Merge pull request #1867 from AlexeiFedorov/af/enable_ptrauth_warm_boot

BL31: Enable pointer authentication support in warm boot path

Merge pull request #1867 from AlexeiFedorov/af/enable_ptrauth_warm_boot
BL31: Enable pointer authentication support in warm boot path
e2b717e6 · Dimitris Papastamos · GitHub · 8807771f · 7dcbb4f3 · e2b717e6
Unverified Commit e2b717e6 authored 6 years ago by Dimitris Papastamos Committed by GitHub 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 13 additions and 0 deletions
+13 -0
--- 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