[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: Dieter Kiermaier <dk-arm-linux@gmx.de> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
This commit is contained in:
parent
156171c71a
commit
2bf3010843
|
@ -915,6 +915,14 @@ void __init kirkwood_init(void)
|
||||||
kirkwood_uart0_data[0].uartclk = kirkwood_tclk;
|
kirkwood_uart0_data[0].uartclk = kirkwood_tclk;
|
||||||
kirkwood_uart1_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();
|
kirkwood_setup_cpu_mbus();
|
||||||
|
|
||||||
#ifdef CONFIG_CACHE_FEROCEON_L2
|
#ifdef CONFIG_CACHE_FEROCEON_L2
|
||||||
|
|
|
@ -13,6 +13,9 @@
|
||||||
|
|
||||||
#include <mach/kirkwood.h>
|
#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_CONTROL (BRIDGE_VIRT_BASE | 0x0104)
|
||||||
#define CPU_RESET 0x00000002
|
#define CPU_RESET 0x00000002
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue