3.11.10.11 -stable review patch. If anyone has any objections, please let me
know.
------------------
From: Willy Tarreau <w...@1wt.eu>
commit b6d07e0273d3296cfbdc88145b8a00ddbefb310a upstream.
mvebu_pcie_handle_membase_change() and
mvebu_pcie_handle_iobase_change() do not correctly compute the window
size. PCI uses an inclusive start/end address pair, which requires a
+1 when converting to size.
This only worked because a bug in the mbus driver allowed it to
silently accept and round up bogus sizes.
Fix this by adding one to the computed size.
Fixes: 45361a4fe446 ('PCIe driver for Marvell Armada 370/XP systems')
Signed-off-by: Willy Tarreau <w...@1wt.eu>
Reviewed-By: Jason Gunthorpe <jguntho...@obsidianresearch.com>
Signed-off-by: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
Link:
https://lkml.kernel.org/r/1397823593-1932-5-git-send-email-thomas.petazz...@free-electrons.com
Tested-by: Neil Greatorex <n...@fatboyfat.co.uk>
Acked-by: Bjorn Helgaas <bhelg...@google.com>
Signed-off-by: Jason Cooper <ja...@lakedaemon.net>
Signed-off-by: Luis Henriques <luis.henriq...@canonical.com>
---
drivers/pci/host/pci-mvebu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 86d3fa4ba88e..bf95d8c4e78a 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -293,7 +293,7 @@ static void mvebu_pcie_handle_iobase_change(struct
mvebu_pcie_port *port)
port->iowin_base = port->pcie->io.start + iobase;
port->iowin_size = ((0xFFF | ((port->bridge.iolimit & 0xF0) << 8) |
(port->bridge.iolimitupper << 16)) -
- iobase);
+ iobase) + 1;
mvebu_mbus_add_window_remap_flags(port->name, port->iowin_base,
port->iowin_size,
@@ -328,7 +328,7 @@ static void mvebu_pcie_handle_membase_change(struct
mvebu_pcie_port *port)
port->memwin_base = ((port->bridge.membase & 0xFFF0) << 16);
port->memwin_size =
(((port->bridge.memlimit & 0xFFF0) << 16) | 0xFFFFF) -
- port->memwin_base;
+ port->memwin_base + 1;
mvebu_mbus_add_window_remap_flags(port->name, port->memwin_base,
port->memwin_size,
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
