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

Commit e6ed89ac authored by Deepak Saxena's avatar Deepak Saxena Committed by Linus Torvalds
Browse files

[PATCH] ARM: explicitly disable BTB on ixp2350 



We don't enable the BTB on the ixp2350 as that can cause weird
crashes (erratum #42.)  However, some bootloaders enable the BTB,
which means that we have to disable the BTB explicitly.

Found thanks to Tom Rini.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a8fca04

arch/arm/mm/proc-xsc3.S

+2 −1
Original line number Original line Diff line number Diff line
@@ -427,12 +427,13 @@ __xsc3_setup: 
#endif

#endif

	mcr	p15, 0, r0, c1, c0, 1		@ set auxiliary control reg

	mcr	p15, 0, r0, c1, c0, 1		@ set auxiliary control reg

	mrc	p15, 0, r0, c1, c0, 0		@ get control register

	mrc	p15, 0, r0, c1, c0, 0		@ get control register

	bic	r0, r0, #0x0200			@ .... ..R. .... ....

	bic	r0, r0, #0x0002			@ .... .... .... ..A.

	bic	r0, r0, #0x0002			@ .... .... .... ..A.

	orr	r0, r0, #0x0005			@ .... .... .... .C.M

	orr	r0, r0, #0x0005			@ .... .... .... .C.M

#if BTB_ENABLE

#if BTB_ENABLE

	bic	r0, r0, #0x0200			@ .... ..R. .... ....

	orr	r0, r0, #0x3900			@ ..VI Z..S .... ....

	orr	r0, r0, #0x3900			@ ..VI Z..S .... ....

#else

#else

	bic	r0, r0, #0x0a00			@ .... Z.R. .... ....

	orr	r0, r0, #0x3100			@ ..VI ...S .... ....

	orr	r0, r0, #0x3100			@ ..VI ...S .... ....

#endif

#endif

#if L2_CACHE_ENABLE

#if L2_CACHE_ENABLE