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, 20 insertions, 16 deletions

diff --git a/arch/arm/mach-sa1100/include/mach/debug-macro.S b/arch/arm/mach-sa1100/include/mach/debug-macro.S
index 336adccea54..0cd0fc9635b 100644
--- a/arch/arm/mach-sa1100/include/mach/debug-macro.S
+++ b/arch/arm/mach-sa1100/include/mach/debug-macro.S
@@ -12,33 +12,37 @@
 */
 #include <mach/hardware.h>
 
-                .macro  addruart, rx, tmp
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0x80000000        @ physical base address
-                movne   \rx, #0xf8000000        @ virtual address
+                .macro  addruart, rp, rv
+                mrc     p15, 0, \rp, c1, c0
+                tst     \rp, #1                 @ MMU enabled?
+                moveq   \rp, #0x80000000        @ physical base address
+                movne   \rp, #0xf8000000        @ virtual address
 
                 @ We probe for the active serial port here, coherently with
                 @ the comment in arch/arm/mach-sa1100/include/mach/uncompress.h.
                 @ We assume r1 can be clobbered.
 
                 @ see if Ser3 is active
-                add     \rx, \rx, #0x00050000
-                ldr     r1, [\rx, #UTCR3]
-                tst     r1, #UTCR3_TXE
+                add     \rp, \rp, #0x00050000
+                ldr     \rv, [\rp, #UTCR3]
+                tst     \rv, #UTCR3_TXE
 
                 @ if Ser3 is inactive, then try Ser1
-                addeq   \rx, \rx, #(0x00010000 - 0x00050000)
-                ldreq   r1, [\rx, #UTCR3]
-                tsteq   r1, #UTCR3_TXE
+                addeq   \rp, \rp, #(0x00010000 - 0x00050000)
+                ldreq   \rv, [\rp, #UTCR3]
+                tsteq   \rv, #UTCR3_TXE
 
                 @ if Ser1 is inactive, then try Ser2
-                addeq   \rx, \rx, #(0x00030000 - 0x00010000)
-                ldreq   r1, [\rx, #UTCR3]
-                tsteq   r1, #UTCR3_TXE
+                addeq   \rp, \rp, #(0x00030000 - 0x00010000)
+                ldreq   \rv, [\rp, #UTCR3]
+                tsteq   \rv, #UTCR3_TXE
+
+                @ clear top bits, and generate both phys and virt addresses
+                lsl     \rp, \rp, #8
+                lsr     \rp, \rp, #8
+                orr     \rv, \rp, #0xf8000000   @ virtual
+                orr     \rp, \rp, #0x80000000   @ physical
 
-                @ if all ports are inactive, then there is nothing we can do
-                moveq   pc, lr
                 .endm
 
                 .macro  senduart,rd,rx