mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
ARM: 8849/1: NOMMU: Fix encodings for PMSAv8's PRBAR4/PRLAR4
[ Upstream commitd410a8a49e
] To access PRBARn, where n is referenced as a binary number: MRC p15, 0, <Rt>, c6, c8+n[3:1], 4*n[0] ; Read PRBARn into Rt MCR p15, 0, <Rt>, c6, c8+n[3:1], 4*n[0] ; Write Rt into PRBARn To access PRLARn, where n is referenced as a binary number: MRC p15, 0, <Rt>, c6, c8+n[3:1], 4*n[0]+1 ; Read PRLARn into Rt MCR p15, 0, <Rt>, c6, c8+n[3:1], 4*n[0]+1 ; Write Rt into PRLARn For PR{B,L}AR4, n is 4, n[0] is 0, n[3:1] is 2, while current encoding done with n[0] set to 1 which is wrong. Use proper encoding instead. Fixes:046835b4aa
("ARM: 8757/1: NOMMU: Support PMSAv8 MPU") Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
0acf4a0034
commit
0aa85e6081
1 changed files with 2 additions and 2 deletions
|
@ -441,8 +441,8 @@ M_CLASS(str r6, [r12, #PMSAv8_RLAR_A(3)])
|
||||||
str r5, [r12, #PMSAv8_RBAR_A(0)]
|
str r5, [r12, #PMSAv8_RBAR_A(0)]
|
||||||
str r6, [r12, #PMSAv8_RLAR_A(0)]
|
str r6, [r12, #PMSAv8_RLAR_A(0)]
|
||||||
#else
|
#else
|
||||||
mcr p15, 0, r5, c6, c10, 1 @ PRBAR4
|
mcr p15, 0, r5, c6, c10, 0 @ PRBAR4
|
||||||
mcr p15, 0, r6, c6, c10, 2 @ PRLAR4
|
mcr p15, 0, r6, c6, c10, 1 @ PRLAR4
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
ret lr
|
ret lr
|
||||||
|
|
Loading…
Reference in a new issue