2014-01-24 Kyrylo Tkachov <kyrylo.tkachov@arm.com>

        * aarch64/cpu-init/rdimon-aem-el3.S (flat_map): Clear WXN bit
        in SCTLR_EL3. Add dsb.

diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 5920a233695f1df8abeb19f5c62198209eec9fc6..3c0c02d9ac71a271bf917f24e4a197493fb382a5 100644 (file)
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-24  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       * aarch64/cpu-init/rdimon-aem-el3.S (flat_map): Clear WXN bit
+       in SCTLR_EL3. Add dsb.
+
 2014-01-10  Jeff Johnston  <jjohnstn@redhat.com>
 
        * arm/configure.in: Revert previous fix and change host_makefile_frag

diff --git a/libgloss/aarch64/cpu-init/rdimon-aem-el3.S b/libgloss/aarch64/cpu-init/rdimon-aem-el3.S
index 6ddf62345820d17b632439be9ae3cf3a376b4846..46376270380c76512f548009e74708b59eeaede5 100644 (file)
--- a/libgloss/aarch64/cpu-init/rdimon-aem-el3.S
+++ b/libgloss/aarch64/cpu-init/rdimon-aem-el3.S
@@ -138,9 +138,12 @@ _flat_map:
 
        mrs     x0, sctlr_el3
        ldr     x1, =0x100d                     /* bits I(12) SA(3) C(2) M(0) */
-       bic     x0, x0, #2                      /* clear bit A(1) */
+       bic     x0, x0, #(1 << 1)               /* clear bit A(1) */
+       mov     x2, #(1 << 19)                  /* clear WXN */
+       bic     x0, x0, x2
        orr     x0, x0, x1                      /* set bits */
 
+       dsb     sy
        msr     sctlr_el3, x0
        isb
        ret