Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c553ac1 authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 8164/1: mm: clear SCTLR.HA instead of setting it for LPAE 



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.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 505013bc

arch/arm/mm/proc-v7-3level.S

+2 −2
Original line number Diff line number Diff line
@@ -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