MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET

This change “MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET” in Linux kernel is authored by Paul Burton <paul.burton [at] mips.com> on Fri Jul 27 18:23:19 2018 -0700.

MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET

isa_virt_to_bus() & isa_bus_to_virt() claim to treat ISA bus addresses
as being identical to physical addresses, but they fail to do so in the
presence of a non-zero PHYS_OFFSET.

Correct this by having them use virt_to_phys() & phys_to_virt(), which
consolidates the calculations to one place & ensures that ISA bus
addresses do indeed match physical addresses.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20047/
Cc: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: Vladimir Kondratiev <vladimir.kondratiev@intel.com>

This Linux change may have been applied to various maintained Linux releases and you can find Linux releases including commit 0494d7f.

There are 8 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/mips/include/asm/io.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index cd170d9..54c730a 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -143,14 +143,14 @@ static inline void * phys_to_virt(unsigned long address)
  * ISA I/O bus memory addresses are 1:1 with the physical address.
-static inline unsigned long isa_virt_to_bus(volatile void * address)
+static inline unsigned long isa_virt_to_bus(volatile void *address)
-	return (unsigned long)address - PAGE_OFFSET;
+	return virt_to_phys(address);
-static inline void * isa_bus_to_virt(unsigned long address)
+static inline void *isa_bus_to_virt(unsigned long address)
-	return (void *)(address + PAGE_OFFSET);
+	return phys_to_virt(address);
 #define isa_page_to_bus page_to_phys

The commit for this change in Linux stable tree is 0494d7f (patch).

Leave a Reply

Your email address will not be published. Required fields are marked *