[kernel] r22729 - in dists/sid/linux/debian: . patches patches/bugfix/armel
Ian James Campbell
ijc at moszumanska.debian.org
Mon Jun 1 21:09:04 UTC 2015
Author: ijc
Date: Mon Jun 1 21:09:02 2015
New Revision: 22729
Log:
[arm] Fix mvebu-mbus for non-io-coherent platforms.
Added:
dists/sid/linux/debian/patches/bugfix/armel/
dists/sid/linux/debian/patches/bugfix/armel/bus-mvebu-mbus-do-not-set-WIN_CTRL_SYNCBARRIER-on-no.patch
Modified:
dists/sid/linux/debian/changelog
dists/sid/linux/debian/patches/series
Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog Mon Jun 1 00:12:40 2015 (r22728)
+++ dists/sid/linux/debian/changelog Mon Jun 1 21:09:02 2015 (r22729)
@@ -7,6 +7,8 @@
* [armhf] Enable PCIe support for IMX6 boards. Patch from Vagrant
Cascadian (Closes: #787029)
* [armhf] Add stmmac-platform module to nic-modules udeb. (Closes: #786716)
+ * [arm] Fix mvebu-mbus for non-io-coherent platforms. In particular
+ armel/{orion5x,kirkwood}.
-- Ben Hutchings <ben at decadent.org.uk> Wed, 27 May 2015 21:36:56 +0100
Added: dists/sid/linux/debian/patches/bugfix/armel/bus-mvebu-mbus-do-not-set-WIN_CTRL_SYNCBARRIER-on-no.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/armel/bus-mvebu-mbus-do-not-set-WIN_CTRL_SYNCBARRIER-on-no.patch Mon Jun 1 21:09:02 2015 (r22729)
@@ -0,0 +1,50 @@
+From f16b8208c320e4f8433a03acb7756d90f1b57981 Mon Sep 17 00:00:00 2001
+From: Nicolas Schichan <nschichan at freebox.fr>
+Date: Thu, 28 May 2015 10:40:12 +0200
+Subject: [PATCH] bus: mvebu-mbus: do not set WIN_CTRL_SYNCBARRIER on non
+ io-coherent platforms.
+Origin: http://article.gmane.org/gmane.linux.kernel.stable/137371
+
+Commit a0b5cd4ac2d6 ("bus: mvebu-mbus: use automatic I/O
+synchronization barriers") enabled the usage of automatic I/O
+synchronization barriers by enabling bit WIN_CTRL_SYNCBARRIER in the
+control registers of MBus windows, but on non io-coherent platforms
+(orion5x, kirkwood and dove) the WIN_CTRL_SYNCBARRIER bit in
+the window control register is either reserved (all windows except 6
+and 7) or enables read-only protection (windows 6 and 7).
+
+Signed-off-by: Nicolas Schichan <nschichan at freebox.fr>
+Reviewed-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
+Cc: <stable at vger.kernel.org> # v4.0+
+Fixes: a0b5cd4ac2d6 ("bus: mvebu-mbus: use automatic I/O synchronization barriers")
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
+---
+ drivers/bus/mvebu-mbus.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
+index fb9ec62..7fa4510 100644
+--- a/drivers/bus/mvebu-mbus.c
++++ b/drivers/bus/mvebu-mbus.c
+@@ -70,6 +70,7 @@
+ */
+ #define WIN_CTRL_OFF 0x0000
+ #define WIN_CTRL_ENABLE BIT(0)
++/* Only on HW I/O coherency capable platforms */
+ #define WIN_CTRL_SYNCBARRIER BIT(1)
+ #define WIN_CTRL_TGT_MASK 0xf0
+ #define WIN_CTRL_TGT_SHIFT 4
+@@ -323,8 +324,9 @@ static int mvebu_mbus_setup_window(struct mvebu_mbus_state *mbus,
+ ctrl = ((size - 1) & WIN_CTRL_SIZE_MASK) |
+ (attr << WIN_CTRL_ATTR_SHIFT) |
+ (target << WIN_CTRL_TGT_SHIFT) |
+- WIN_CTRL_SYNCBARRIER |
+ WIN_CTRL_ENABLE;
++ if (mbus->hw_io_coherency)
++ ctrl |= WIN_CTRL_SYNCBARRIER;
+
+ writel(base & WIN_BASE_LOW, addr + WIN_BASE_OFF);
+ writel(ctrl, addr + WIN_CTRL_OFF);
+--
+2.1.4
+
Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series Mon Jun 1 00:12:40 2015 (r22728)
+++ dists/sid/linux/debian/patches/series Mon Jun 1 21:09:02 2015 (r22729)
@@ -42,6 +42,7 @@
bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
bugfix/x86/config-enable-need_dma_map_state-by-default-when-swi.patch
+bugfix/armel/bus-mvebu-mbus-do-not-set-WIN_CTRL_SYNCBARRIER-on-no.patch
# Arch features
features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
More information about the Kernel-svn-changes
mailing list