MIPS: Use CPHYSADDR to implement mips32 virt_to_phys

Use CPHYSADDR to implement the virt_to_phys function for converting from
a virtual to a physical address for MIPS32, much as is already done for
MIPS64. This allows for virt_to_phys to work regardless of whether the
address being translated is in kseg0 or kseg1, unlike the previous
subtraction based approach which only worked for addresses in kseg0.
This allows for drivers to provide an address to virt_to_phys without
needing to manually ensure that kseg1 addresses are converted to
equivalent kseg0 addresses first.

This patch is equivalent to this Linux patch currently waiting to be
reviewed & merged:

    https://patchwork.linux-mips.org/patch/12564/

Signed-off-by: Paul Burton <paul.burton@imgtec.com>

diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 723a60a199a2ef244f226f7e37527978d3011364..5b86386bc1cb2fbd98a97581f1f44d57f78c3946 100644 (file)
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -92,11 +92,8 @@ static inline unsigned long virt_to_phys(volatile const void *address)
 #ifdef CONFIG_64BIT
        if (addr < CKSEG0)
                return XPHYSADDR(addr);
-
-       return CPHYSADDR(addr);
-#else
-       return addr - PAGE_OFFSET + PHYS_OFFSET;
 #endif
+       return CPHYSADDR(addr);
 }
 
 /*