Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6d07e02 authored by Willy Tarreau's avatar Willy Tarreau Committed by Jason Cooper
Browse files

PCI: mvebu: fix off-by-one in the computed size of the mbus windows 



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: 45361a4f ('PCIe driver for Marvell Armada 370/XP systems')
Cc: <stable@vger.kernel.org> # v3.11+
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Reviewed-By: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1397823593-1932-5-git-send-email-thomas.petazzoni@free-electrons.com


Tested-by: default avatarNeil Greatorex <neil@fatboyfat.co.uk>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent c9eaa447

drivers/pci/host/pci-mvebu.c

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,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_by_id(port->io_target, port->io_attr,

					  port->iowin_base, port->iowin_size,
@@ -364,7 +364,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_by_id(port->mem_target, port->mem_attr,

				    port->memwin_base, port->memwin_size);