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

Commit 7fb00c2f authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Russell King
Browse files

ARM: 8114/1: LPAE: load upper bits of early TTBR0/TTBR1 



This patch fixes booting when idmap pgd lays above 4gb. Commit
4756dcbf mostly had fixed this, but it'd failed to load upper bits.

Also this fixes adding TTBR1_OFFSET to TTRR1: if lower part overflows
carry flag must be added to the upper part.

Signed-off-by: default avatarKonstantin Khlebnikov <k.khlebnikov@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c309bfa9

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

+3 −4
Original line number Diff line number Diff line
@@ -146,12 +146,11 @@ ENDPROC(cpu_v7_set_pte_ext) 
	mov	\tmp, \ttbr1, lsr #(32 - ARCH_PGD_SHIFT)	@ upper bits

	mov	\ttbr1, \ttbr1, lsl #ARCH_PGD_SHIFT		@ lower bits

	addls	\ttbr1, \ttbr1, #TTBR1_OFFSET

	mcrr	p15, 1, \ttbr1, \zero, c2			@ load TTBR1

	adcls	\tmp, \tmp, #0

	mcrr	p15, 1, \ttbr1, \tmp, c2			@ load TTBR1

	mov	\tmp, \ttbr0, lsr #(32 - ARCH_PGD_SHIFT)	@ upper bits

	mov	\ttbr0, \ttbr0, lsl #ARCH_PGD_SHIFT		@ lower bits

	mcrr	p15, 0, \ttbr0, \zero, c2			@ load TTBR0

	mcrr	p15, 1, \ttbr1, \zero, c2			@ load TTBR1

	mcrr	p15, 0, \ttbr0, \zero, c2			@ load TTBR0

	mcrr	p15, 0, \ttbr0, \tmp, c2			@ load TTBR0

	.endm



	/*