diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2014-01-24 19:01:15 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2014-01-24 19:01:15 +0000 |
| commit | 0388ee3d90900bf61e33c3adcec4b27be4891974 (patch) | |
| tree | 3f07ae906c539f6f6ecb57b399f414baf7c0cb94 /libgloss | |
| parent | 76e4f83fc6c68cfe319df5cad0ab7e65cd6eb4e9 (diff) | |
| download | newlib-0388ee3d90900bf61e33c3adcec4b27be4891974.zip newlib-0388ee3d90900bf61e33c3adcec4b27be4891974.tar.gz newlib-0388ee3d90900bf61e33c3adcec4b27be4891974.tar.bz2 | |
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.
Diffstat (limited to 'libgloss')
| -rw-r--r-- | libgloss/ChangeLog | 5 | ||||
| -rw-r--r-- | libgloss/aarch64/cpu-init/rdimon-aem-el3.S | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 5920a23..3c0c02d 100644 --- 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 6ddf623..4637627 100644 --- 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 |