summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2015-01-19 23:00:15 +0100
committerAndrew Lunn <andrew@lunn.ch>2015-01-19 23:00:15 +0100
commitfe6e91e3387e4f90ed4605a1a538248a31686c16 (patch)
treed4e10d0d214ca73500fcbb3dbbd25027320fddda /arch/arm/mach-mvebu
parentARM: mvebu: Update the SoC ID and revision definitions (diff)
parentbus: mvebu-mbus: fix support of MBus window 13 (diff)
downloadlinux-fe6e91e3387e4f90ed4605a1a538248a31686c16.tar.xz
linux-fe6e91e3387e4f90ed4605a1a538248a31686c16.zip
Merge branch 'mvebu/fixes-3' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r--arch/arm/mach-mvebu/coherency.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index 3585cb394e9b..caa21e9b8cd9 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -246,9 +246,14 @@ static int coherency_type(void)
return type;
}
+/*
+ * As a precaution, we currently completely disable hardware I/O
+ * coherency, until enough testing is done with automatic I/O
+ * synchronization barriers to validate that it is a proper solution.
+ */
int coherency_available(void)
{
- return coherency_type() != COHERENCY_FABRIC_TYPE_NONE;
+ return false;
}
int __init coherency_init(void)