diff options
| author | Stefan Roese <sr@denx.de> | 2015-07-01 13:28:39 +0200 |
|---|---|---|
| committer | Luka Perkov <luka.perkov@sartura.hr> | 2015-08-17 18:48:57 +0200 |
| commit | 501c098a1f2cdaa930cb1a7166d3724467890a64 (patch) | |
| tree | e7d0d5d15a2ff119e768e71bf63ed24f66e4823d | |
| parent | 2b181b5b0427fb2d7efd12c1c04fc3eb5ce953d6 (diff) | |
| download | u-boot-imx-501c098a1f2cdaa930cb1a7166d3724467890a64.zip u-boot-imx-501c098a1f2cdaa930cb1a7166d3724467890a64.tar.gz u-boot-imx-501c098a1f2cdaa930cb1a7166d3724467890a64.tar.bz2 | |
arm: mvebu: Disable MBUS error propagation
Accessing MBUS windows not backed-up by e.g. PCIe devices will
hang the SoC. Disable MBUS error propagation back to CPU allows
to read 0xffffffff instead of hanging the SoC.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
| -rw-r--r-- | arch/arm/mach-mvebu/cpu.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/soc.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 23c2a97..fa82067 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -241,6 +241,9 @@ int arch_cpu_init(void) */ mvebu_mbus_probe(windows, ARRAY_SIZE(windows)); + /* Disable MBUS error propagation */ + clrsetbits_le32(SOC_COHERENCY_FABRIC_CTRL_REG, MBUS_ERR_PROP_EN, 0); + return 0; } #endif /* CONFIG_ARCH_CPU_INIT */ diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 71254c5..a29e5dc 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -66,6 +66,9 @@ #define MVEBU_SATA0_BASE (MVEBU_REGISTER(0xa8000)) #define MVEBU_SDIO_BASE (MVEBU_REGISTER(0xd8000)) +#define SOC_COHERENCY_FABRIC_CTRL_REG (MVEBU_REGISTER(0x20200)) +#define MBUS_ERR_PROP_EN (1 << 8) + #define MBUS_BRIDGE_WIN_CTRL_REG (MVEBU_REGISTER(0x20250)) #define MBUS_BRIDGE_WIN_BASE_REG (MVEBU_REGISTER(0x20254)) |