This is a note to let you know that I've just added the patch titled
bus: mvebu-mbus: allow several windows with the same target/attribute
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bus-mvebu-mbus-allow-several-windows-with-the-same-target-attribute.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b566e782be32145664d96ada3e389f17d32742e5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx>
Date: Fri, 18 Apr 2014 14:19:52 +0200
Subject: bus: mvebu-mbus: allow several windows with the same target/attribute
From: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx>
commit b566e782be32145664d96ada3e389f17d32742e5 upstream.
Having multiple windows with the same target and attribute is actually
legal, and can be useful for PCIe windows, when PCIe BARs have a size
that isn't a power of two, and we therefore need to create several
MBus windows to cover the PCIe BAR for a given PCIe interface.
Fixes: fddddb52a6c4 ('bus: introduce an Marvell EBU MBus driver')
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/1397823593-1932-7-git-send-email-thomas.petazzoni@xxxxxxxxxxxxxxxxxx
Tested-by: Neil Greatorex <neil@xxxxxxxxxxxxxxx>
Signed-off-by: Jason Cooper <jason@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/bus/mvebu-mbus.c | 6 ------
1 file changed, 6 deletions(-)
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -222,12 +222,6 @@ static int mvebu_mbus_window_conflicts(s
*/
if ((u64)base < wend && end > wbase)
return 0;
-
- /*
- * Check if target/attribute conflicts
- */
- if (target == wtarget && attr == wattr)
- return 0;
}
return 1;
Patches currently in stable-queue which might be from thomas.petazzoni@xxxxxxxxxxxxxxxxxx are
queue-3.14/pci-mvebu-fix-off-by-one-in-the-computed-size-of-the-mbus-windows.patch
queue-3.14/arm-orion5x-fix-target-id-for-crypto-sram-window.patch
queue-3.14/arm-mvebu-fix-nor-bus-width-in-armada-xp-db-device-tree.patch
queue-3.14/arm-mvebu-mvebu-soc-id-keep-clock-enabled-if-pcie-unit-is-enabled.patch
queue-3.14/irqchip-armada-370-xp-fix-releasing-of-msis.patch
queue-3.14/pci-mvebu-split-pcie-bars-into-multiple-mbus-windows-when-needed.patch
queue-3.14/memory-mvebu-devbus-fix-the-conversion-of-the-bus-width.patch
queue-3.14/irqchip-armada-370-xp-implement-the-check_device-msi_chip-operation.patch
queue-3.14/arm-mvebu-mvebu-soc-id-add-missing-clk_put-call.patch
queue-3.14/irqchip-armada-370-xp-fix-invalid-cast-of-signed-value-into-unsigned-variable.patch
queue-3.14/bus-mvebu-mbus-allow-several-windows-with-the-same-target-attribute.patch
queue-3.14/arm-mvebu-fix-nor-bus-width-in-armada-xp-gp-device-tree.patch
queue-3.14/arm-mvebu-fix-nor-bus-width-in-armada-xp-openblocks-ax3-device-tree.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html