feat(BTI): add support for RMM
Setting commandline mbranch-protection=standard
to enable pac-ret+bti.
Set GP Bit in all Stage1 translation entries for code pages.
Signed-off-by: Shruti Gupta <shruti.gupta@arm.com>
Change-Id: I9fad86bb8d393b02a511864046ec65e5a0909d2b
diff --git a/lib/arch/include/aarch64/asm_macros.S b/lib/arch/include/aarch64/asm_macros.S
index 887ab68..787a78a 100644
--- a/lib/arch/include/aarch64/asm_macros.S
+++ b/lib/arch/include/aarch64/asm_macros.S
@@ -43,6 +43,7 @@
.cfi_startproc
.align \_align
\_name:
+ bti jc
.endm
/*
diff --git a/lib/arch/include/arch.h b/lib/arch/include/arch.h
index 64752d1..a37592a 100644
--- a/lib/arch/include/arch.h
+++ b/lib/arch/include/arch.h
@@ -680,6 +680,8 @@
#define SCTLR_ELx_nTLSMD_BIT (UL(1) << 28)
#define SCTLR_ELx_LSMAOE_BIT (UL(1) << 29)
#define SCTLR_ELx_EnIA_BIT (UL(1) << 31)
+#define SCTLR_ELx_BT0_BIT (UL(1) << 35)
+#define SCTLR_ELx_BT1_BIT (UL(1) << 36)
#define SCTLR_EL1_FLAGS (SCTLR_ELx_SPAN_BIT | SCTLR_ELx_EIS_BIT | SCTLR_ELx_nTWE_BIT | \
SCTLR_ELx_nTWI_BIT | SCTLR_ELx_EOS_BIT | SCTLR_ELx_nAA_BIT | \