arm: return both physical and virtual addresses from addruart

Rather than checking the MMU status in every instance of addruart, do it
once in kernel/debug.S, and change the existing addruart macros to
return both physical and virtual addresses. The main debug code can then
select the appropriate address to use.

This will also allow us to retreive the address of a uart for the MMU
state that we're not current in.

Updated with fixes for OMAP from Jason Wang <jason77.wang@gmail.com>
and Tony Lindgren <tony@atomide.com>, and fix for versatile express from
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Jason Wang <jason77.wang@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>

1 files changed, 10 insertions, 12 deletions

diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index 60dda1318f22..3c9e0c40c679 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -15,12 +15,10 @@
 
 #ifndef CONFIG_DEBUG_DC21285_PORT
         /* For NetWinder debugging */
-                .macro  addruart, rx, tmp
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0x7c000000        @ physical
-                movne   \rx, #0xff000000        @ virtual
-                orr     \rx, \rx, #0x000003f8
+                .macro  addruart, rp, rv
+                mov     \rp, #0x000003f8
+                orr     \rv, \rp, #0x7c000000   @ physical
+                orr     \rp, \rp, #0xff000000   @ virtual
                 .endm
 
 #define UART_SHIFT      0
@@ -32,14 +30,14 @@
                 .equ    dc21285_high, ARMCSR_BASE & 0xff000000
                 .equ    dc21285_low,  ARMCSR_BASE & 0x00ffffff
 
-                .macro  addruart, rx, tmp
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0x42000000
-                movne   \rx, #dc21285_high
+                .macro  addruart, rp, rv
                 .if     dc21285_low
-                orrne   \rx, \rx, #dc21285_low
+                mov     \rp, #dc21285_low
+                .else
+                mov     \rp, #0
                 .endif
+                orr     \rv, \rp, #0x42000000
+                orr     \rp, \rp, #dc21285_high
                 .endm
 
                 .macro  senduart,rd,rx