Merge pull request #924 from antonio-nino-diaz-arm/an/fix-xn-bit

[project/bcm63xx/atf.git] / lib / xlat_tables_v2 / aarch64 / xlat_tables_arch.c

diff --git a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
index 9ce78403621401a66a3dd4713b0c14cc0aea937c..cc41fc3ee1f420b8b51bfdbe697a1b67d8ae93a6 100644 (file)
--- a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
+++ b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
@@ -127,6 +127,25 @@ void xlat_arch_tlbi_va_sync(void)
 
 #endif /* PLAT_XLAT_TABLES_DYNAMIC */
 
+int xlat_arch_current_el(void)
+{
+       int el = GET_EL(read_CurrentEl());
+
+       assert(el > 0);
+
+       return el;
+}
+
+uint64_t xlat_arch_get_xn_desc(int el)
+{
+       if (el == 3) {
+               return UPPER_ATTRS(XN);
+       } else {
+               assert(el == 1);
+               return UPPER_ATTRS(PXN);
+       }
+}
+
 void init_xlat_tables_arch(unsigned long long max_pa)
 {
        assert((PLAT_PHY_ADDR_SPACE_SIZE - 1) <=