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

Commit 2bf30108 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

[ARM] Kirkwood: disable propagation of mbus error to the CPU local bus 



Disable propagation of mbus errors to the CPU local bus, as this causes
mbus errors (which can occur for example for PCI aborts) to throw CPU
aborts, which we're not set up to deal with.

Reported-by: default avatarDieter Kiermaier <dk-arm-linux@gmx.de>
Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 156171c7

arch/arm/mach-kirkwood/common.c

+8 −0
Original line number Diff line number Diff line
@@ -915,6 +915,14 @@ void __init kirkwood_init(void) 
	kirkwood_uart0_data[0].uartclk = kirkwood_tclk;

	kirkwood_uart1_data[0].uartclk = kirkwood_tclk;



	/*

	 * Disable propagation of mbus errors to the CPU local bus,

	 * as this causes mbus errors (which can occur for example

	 * for PCI aborts) to throw CPU aborts, which we're not set

	 * up to deal with.

	 */

	writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);



	kirkwood_setup_cpu_mbus();



#ifdef CONFIG_CACHE_FEROCEON_L2

arch/arm/mach-kirkwood/include/mach/bridge-regs.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 


#include <mach/kirkwood.h>



#define CPU_CONFIG		(BRIDGE_VIRT_BASE | 0x0100)

#define CPU_CONFIG_ERROR_PROP	0x00000004



#define CPU_CONTROL		(BRIDGE_VIRT_BASE | 0x0104)

#define CPU_RESET		0x00000002