Commit ec4dc9ec authored by Zhichang Yuan's avatar Zhichang Yuan Committed by Sasha Levin

of/pci: Fix pci_address_to_pio() conversion of CPU address to I/O port

[ Upstream commit 5dbb4c61 ]

41f8bba7 ("of/pci: Add pci_register_io_range() and
pci_pio_to_address()") added support for systems with several I/O ranges
described by OF bindings.  It modified pci_address_to_pio() look up the
io_range for a given CPU physical address, but the conversion was wrong.

Fix the conversion of address to I/O port.

[bhelgaas: changelog]
Fixes: 41f8bba7 ("of/pci: Add pci_register_io_range() and pci_pio_to_address()")
Signed-off-by: default avatarZhichang Yuan <yuanzhichang@hisilicon.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
CC: stable@vger.kernel.org	# v3.18+
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 217c008c
......@@ -765,7 +765,7 @@ unsigned long __weak pci_address_to_pio(phys_addr_t address)
spin_lock(&io_range_lock);
list_for_each_entry(res, &io_range_list, list) {
if (address >= res->start && address < res->start + res->size) {
addr = res->start - address + offset;
addr = address - res->start + offset;
break;
}
offset += res->size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment