tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Deepak Saxena and committed by Linus Torvalds e6ed89ac 9a8fca04

+2 -1
unified split
+2 -1
arch/arm/mm/proc-xsc3.S
··· 427 #endif 428 mcr p15, 0, r0, c1, c0, 1 @ set auxiliary control reg 429 mrc p15, 0, r0, c1, c0, 0 @ get control register 430 - bic r0, r0, #0x0200 @ .... ..R. .... .... 431 bic r0, r0, #0x0002 @ .... .... .... ..A. 432 orr r0, r0, #0x0005 @ .... .... .... .C.M 433 #if BTB_ENABLE 434 orr r0, r0, #0x3900 @ ..VI Z..S .... .... 435 #else 436 orr r0, r0, #0x3100 @ ..VI ...S .... .... 437 #endif 438 #if L2_CACHE_ENABLE
··· 427 #endif 428 mcr p15, 0, r0, c1, c0, 1 @ set auxiliary control reg 429 mrc p15, 0, r0, c1, c0, 0 @ get control register 430 bic r0, r0, #0x0002 @ .... .... .... ..A. 431 orr r0, r0, #0x0005 @ .... .... .... .C.M 432 #if BTB_ENABLE 433 + bic r0, r0, #0x0200 @ .... ..R. .... .... 434 orr r0, r0, #0x3900 @ ..VI Z..S .... .... 435 #else 436 + bic r0, r0, #0x0a00 @ .... Z.R. .... .... 437 orr r0, r0, #0x3100 @ ..VI ...S .... .... 438 #endif 439 #if L2_CACHE_ENABLE