diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-18 08:19:52 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-23 23:48:08 -0400 |
commit | b566e782be32145664d96ada3e389f17d32742e5 (patch) | |
tree | ea163932e1e11bdda40122b986de3403ffc779b2 | |
parent | 09752a12f430f58523fb6f435f5e30e4048fcfb2 (diff) |
bus: mvebu-mbus: allow several windows with the same target/attribute
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')
Cc: <stable@vger.kernel.org> # v3.10+
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1397823593-1932-7-git-send-email-thomas.petazzoni@free-electrons.com
Tested-by: Neil Greatorex <neil@fatboyfat.co.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | drivers/bus/mvebu-mbus.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index afee0f731111..00b73448b22e 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c | |||
@@ -223,12 +223,6 @@ static int mvebu_mbus_window_conflicts(struct mvebu_mbus_state *mbus, | |||
223 | */ | 223 | */ |
224 | if ((u64)base < wend && end > wbase) | 224 | if ((u64)base < wend && end > wbase) |
225 | return 0; | 225 | return 0; |
226 | |||
227 | /* | ||
228 | * Check if target/attribute conflicts | ||
229 | */ | ||
230 | if (target == wtarget && attr == wattr) | ||
231 | return 0; | ||
232 | } | 226 | } |
233 | 227 | ||
234 | return 1; | 228 | return 1; |