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

Commit 5d7bf7b4 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Greg Kroah-Hartman
Browse files

ARM: 8799/1: mm: fix pci_ioremap_io() offset check 



[ Upstream commit 3a58ac65 ]

IO_SPACE_LIMIT is the ending address of the PCI IO space, i.e
something like 0xfffff (and not 0x100000).

Therefore, when offset = 0xf0000 is passed as argument, this function
fails even though the offset + SZ_64K fits below the
IO_SPACE_LIMIT. This makes the last chunk of 64 KB of the I/O space
not usable as it cannot be mapped.

This patch fixes that by substracing 1 to offset + SZ_64K, so that we
compare the addrss of the last byte of the I/O space against
IO_SPACE_LIMIT instead of the address of the first byte of what is
after the I/O space.

Fixes: c2794437 ("ARM: Add fixed PCI i/o mapping")
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@bootlin.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 73c6f860

arch/arm/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ void pci_ioremap_set_mem_type(int mem_type) 


int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr)

{

	BUG_ON(offset + SZ_64K > IO_SPACE_LIMIT);

	BUG_ON(offset + SZ_64K - 1 > IO_SPACE_LIMIT);



	return ioremap_page_range(PCI_IO_VIRT_BASE + offset,

				  PCI_IO_VIRT_BASE + offset + SZ_64K,