0ea1293009
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>
88 lines
2.2 KiB
ArmAsm
88 lines
2.2 KiB
ArmAsm
/*
|
|
* Debugging macro for DaVinci
|
|
*
|
|
* Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
|
|
*
|
|
* 2007 (c) MontaVista Software, Inc. This file is licensed under
|
|
* the terms of the GNU General Public License version 2. This program
|
|
* is licensed "as is" without any warranty of any kind, whether express
|
|
* or implied.
|
|
*/
|
|
|
|
/* Modifications
|
|
* Jan 2009 Chaithrika U S Added senduart, busyuart, waituart
|
|
* macros, based on debug-8250.S file
|
|
* but using 32-bit accesses required for
|
|
* some davinci devices.
|
|
*/
|
|
|
|
#include <linux/serial_reg.h>
|
|
|
|
#include <asm/memory.h>
|
|
|
|
#include <mach/serial.h>
|
|
|
|
#define UART_SHIFT 2
|
|
|
|
.pushsection .data
|
|
davinci_uart_phys: .word 0
|
|
davinci_uart_virt: .word 0
|
|
.popsection
|
|
|
|
.macro addruart, rp, rv
|
|
|
|
/* Use davinci_uart_phys/virt if already configured */
|
|
10: mrc p15, 0, \rp, c1, c0
|
|
tst \rp, #1 @ MMU enabled?
|
|
ldreq \rp, =__virt_to_phys(davinci_uart_phys)
|
|
ldrne \rp, =davinci_uart_phys
|
|
add \rv, \rp, #4 @ davinci_uart_virt
|
|
ldr \rp, [\rp, #0]
|
|
ldr \rv, [\rv, #0]
|
|
cmp \rp, #0 @ is port configured?
|
|
cmpne \rv, #0
|
|
bne 99f @ already configured
|
|
|
|
/* Check the debug UART address set in uncompress.h */
|
|
mrc p15, 0, \rp, c1, c0
|
|
tst \rp, #1 @ MMU enabled?
|
|
|
|
/* Copy uart phys address from decompressor uart info */
|
|
ldreq \rv, =__virt_to_phys(davinci_uart_phys)
|
|
ldrne \rv, =davinci_uart_phys
|
|
ldreq \rp, =DAVINCI_UART_INFO
|
|
ldrne \rp, =__phys_to_virt(DAVINCI_UART_INFO)
|
|
ldr \rp, [\rp, #0]
|
|
str \rp, [\rv]
|
|
|
|
/* Copy uart virt address from decompressor uart info */
|
|
ldreq \rv, =__virt_to_phys(davinci_uart_virt)
|
|
ldrne \rv, =davinci_uart_virt
|
|
ldreq \rp, =DAVINCI_UART_INFO
|
|
ldrne \rp, =__phys_to_virt(DAVINCI_UART_INFO)
|
|
ldr \rp, [\rp, #4]
|
|
str \rp, [\rv]
|
|
|
|
b 10b
|
|
99:
|
|
.endm
|
|
|
|
.macro senduart,rd,rx
|
|
str \rd, [\rx, #UART_TX << UART_SHIFT]
|
|
.endm
|
|
|
|
.macro busyuart,rd,rx
|
|
1002: ldr \rd, [\rx, #UART_LSR << UART_SHIFT]
|
|
and \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE
|
|
teq \rd, #UART_LSR_TEMT | UART_LSR_THRE
|
|
bne 1002b
|
|
.endm
|
|
|
|
.macro waituart,rd,rx
|
|
#ifdef FLOW_CONTROL
|
|
1001: ldr \rd, [\rx, #UART_MSR << UART_SHIFT]
|
|
tst \rd, #UART_MSR_CTS
|
|
beq 1001b
|
|
#endif
|
|
.endm
|
|
|