Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu into fixes

Merge " mvebu fixes for 3.19-rc (part #3)" from Andrew Lunn: mvebu: completely disable hardware I/O coherency * tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: completely disable hardware I/O coherency Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu into fixes
Merge " mvebu fixes for 3.19-rc (part #3)" from Andrew Lunn: mvebu: completely disable hardware I/O coherency * tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: completely disable hardware I/O coherency Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson · Eric Lee · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent 966903a98f
Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff
arch/arm/mach-mvebu/coherency.c
@@ -246,9 +246,14 @@
 	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)
...	...	@@ -246,9 +246,14 @@
246	246	return type;
247	247	}
248	248
	249	+/*
	250	+ * As a precaution, we currently completely disable hardware I/O
	251	+ * coherency, until enough testing is done with automatic I/O
	252	+ * synchronization barriers to validate that it is a proper solution.
	253	+ */
249	254	int coherency_available(void)
250	255	{
251		- return coherency_type() != COHERENCY_FABRIC_TYPE_NONE;
	256	+ return false;
252	257	}
253	258
254	259	int __init coherency_init(void)