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>
102 lines
2.9 KiB
ArmAsm
102 lines
2.9 KiB
ArmAsm
/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
|
|
*
|
|
* Debugging macro include header
|
|
*
|
|
* Copyright (C) 1994-1999 Russell King
|
|
* Copyright (C) 2005 Simtec Electronics
|
|
*
|
|
* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <mach/map.h>
|
|
#include <mach/regs-gpio.h>
|
|
#include <plat/regs-serial.h>
|
|
|
|
#define S3C2410_UART1_OFF (0x4000)
|
|
#define SHIFT_2440TXF (14-9)
|
|
|
|
.macro addruart, rp, rv
|
|
ldr \rp, = S3C24XX_PA_UART
|
|
ldr \rv, = S3C24XX_VA_UART
|
|
#if CONFIG_DEBUG_S3C_UART != 0
|
|
add \rp, \rp, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
|
|
add \rv, \rv, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
|
|
#endif
|
|
.endm
|
|
|
|
.macro fifo_full_s3c24xx rd, rx
|
|
@ check for arm920 vs arm926. currently assume all arm926
|
|
@ devices have an 64 byte FIFO identical to the s3c2440
|
|
mrc p15, 0, \rd, c0, c0
|
|
and \rd, \rd, #0xff0
|
|
teq \rd, #0x260
|
|
beq 1004f
|
|
mrc p15, 0, \rd, c1, c0
|
|
tst \rd, #1
|
|
addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
|
|
addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
|
|
bic \rd, \rd, #0xff000
|
|
ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
|
|
and \rd, \rd, #0x00ff0000
|
|
teq \rd, #0x00440000 @ is it 2440?
|
|
1004:
|
|
ldr \rd, [ \rx, # S3C2410_UFSTAT ]
|
|
moveq \rd, \rd, lsr #SHIFT_2440TXF
|
|
tst \rd, #S3C2410_UFSTAT_TXFULL
|
|
.endm
|
|
|
|
.macro fifo_full_s3c2410 rd, rx
|
|
ldr \rd, [ \rx, # S3C2410_UFSTAT ]
|
|
tst \rd, #S3C2410_UFSTAT_TXFULL
|
|
.endm
|
|
|
|
/* fifo level reading */
|
|
|
|
.macro fifo_level_s3c24xx rd, rx
|
|
@ check for arm920 vs arm926. currently assume all arm926
|
|
@ devices have an 64 byte FIFO identical to the s3c2440
|
|
mrc p15, 0, \rd, c0, c0
|
|
and \rd, \rd, #0xff0
|
|
teq \rd, #0x260
|
|
beq 10000f
|
|
mrc p15, 0, \rd, c1, c0
|
|
tst \rd, #1
|
|
addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
|
|
addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
|
|
bic \rd, \rd, #0xff000
|
|
ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
|
|
and \rd, \rd, #0x00ff0000
|
|
teq \rd, #0x00440000 @ is it 2440?
|
|
|
|
10000:
|
|
ldr \rd, [ \rx, # S3C2410_UFSTAT ]
|
|
andne \rd, \rd, #S3C2410_UFSTAT_TXMASK
|
|
andeq \rd, \rd, #S3C2440_UFSTAT_TXMASK
|
|
.endm
|
|
|
|
.macro fifo_level_s3c2410 rd, rx
|
|
ldr \rd, [ \rx, # S3C2410_UFSTAT ]
|
|
and \rd, \rd, #S3C2410_UFSTAT_TXMASK
|
|
.endm
|
|
|
|
/* Select the correct implementation depending on the configuration. The
|
|
* S3C2440 will get selected by default, as these are the most widely
|
|
* used variants of these
|
|
*/
|
|
|
|
#if defined(CONFIG_CPU_LLSERIAL_S3C2410_ONLY)
|
|
#define fifo_full fifo_full_s3c2410
|
|
#define fifo_level fifo_level_s3c2410
|
|
#elif !defined(CONFIG_CPU_LLSERIAL_S3C2440_ONLY)
|
|
#define fifo_full fifo_full_s3c24xx
|
|
#define fifo_level fifo_level_s3c24xx
|
|
#endif
|
|
|
|
/* include the reset of the code which will do the work */
|
|
|
|
#include <plat/debug-macro.S>
|