diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-16 16:28:15 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-16 16:28:15 (GMT) |
| commit | e12399fec3793e0c2b75d366c7fd48a360f6e328 (patch) | |
| tree | fee270c800c2c9bb646eabee322dddd2b213e03b | |
| parent | 378ce74bee4cb0183489bc0f850790a2264ca975 (diff) | |
| parent | 2bf30108435339c4cf149f9d279d0dc961345393 (diff) | |
| download | linux-fsl-qoriq-e12399fec3793e0c2b75d366c7fd48a360f6e328.tar.xz | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 7177c4a..242dd07 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -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 diff --git a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h index 9e80d92..418f501 100644 --- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h +++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h @@ -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 |