| Message ID | 1411580498-17367-1-git-send-email-will.deacon@arm.com |
|---|---|
| State | Accepted |
| Commit | 2c553ac19e73235b61b67fdc5c14be9913a2758d |
| Headers | show |
On Wed, Sep 24, 2014 at 06:41:38PM +0100, Will Deacon wrote: > SCTLR.HA (hardware access flag) is deprecated and not actually > implemented by any CPUs. Furthermore, it can confuse cr_alignment checks > where the whole value of SCTLR is compared against the value sitting in > the hardware, since the bit is actually RAZ/WI and will not match the > saved cr_alignment value. > > Signed-off-by: Will Deacon <will.deacon@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S index b64e67c7f176..d3daed0ae0ad 100644 --- a/arch/arm/mm/proc-v7-3level.S +++ b/arch/arm/mm/proc-v7-3level.S @@ -157,9 +157,9 @@ ENDPROC(cpu_v7_set_pte_ext) * TFR EV X F IHD LR S * .EEE ..EE PUI. .TAT 4RVI ZWRS BLDP WCAM * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx < forced - * 11 0 110 1 0011 1100 .111 1101 < we want + * 11 0 110 0 0011 1100 .111 1101 < we want */ .align 2 .type v7_crval, #object v7_crval: - crval clear=0x0120c302, mmuset=0x30c23c7d, ucset=0x00c01c7c + crval clear=0x0122c302, mmuset=0x30c03c7d, ucset=0x00c01c7c
SCTLR.HA (hardware access flag) is deprecated and not actually implemented by any CPUs. Furthermore, it can confuse cr_alignment checks where the whole value of SCTLR is compared against the value sitting in the hardware, since the bit is actually RAZ/WI and will not match the saved cr_alignment value. Signed-off-by: Will Deacon <will.deacon@arm.com> --- v1 -> v2: Reword commit message arch/arm/mm/proc-v7-3level.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)