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

Zhichang Yuan · bjorn-helgaas · commit 5dbb4c616722 · 2015-05-16T10:38:39.000-05:00
41f8bba ("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: 41f8bba ("of/pci: Add pci_register_io_range() and pci_pio_to_address()") Signed-off-by: Zhichang Yuan <yuanzhichang@hisilicon.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> CC: stable@vger.kernel.org # v3.18+
diff --git a/drivers/of/address.c b/drivers/of/address.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ unsigned long __weak pci_address_to_pio(phys_addr_t address)`
`765`	`765`	`spin_lock(&io_range_lock);`
`766`	`766`	`list_for_each_entry(res, &io_range_list, list) {`
`767`	`767`	`if (address >= res->start && address < res->start + res->size) {`
`768`		`- addr = res->start - address + offset;`
	`768`	`+ addr = address - res->start + offset;`
`769`	`769`	`break;`
`770`	`770`	`}`
`771`	`771`	`offset += res->size;`