forked from Minki/linux
[ARM] Collect Primecell PL01x-based debug implementations together
Several ARM machine implementations used a PL01x primecell compatible serial port for debugging purposes, and indepdently implemented the low level debug macros every time. Provide a common implementation and convert these implementations to use this version. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
268099e3cc
commit
71dccd0f15
|
@ -11,8 +11,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/amba/serial.h>
|
|
||||||
|
|
||||||
.macro addruart,rx
|
.macro addruart,rx
|
||||||
mrc p15, 0, \rx, c1, c0
|
mrc p15, 0, \rx, c1, c0
|
||||||
tst \rx, #1 @ MMU enabled?
|
tst \rx, #1 @ MMU enabled?
|
||||||
|
@ -21,18 +19,4 @@
|
||||||
addne \rx, \rx, #0x16000000 >> 4
|
addne \rx, \rx, #0x16000000 >> 4
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
.macro senduart,rd,rx
|
#include <asm/hardware/debug-pl01x.S>
|
||||||
strb \rd, [\rx, #UART01x_DR]
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro waituart,rd,rx
|
|
||||||
1001: ldr \rd, [\rx, #0x18] @ UARTFLG
|
|
||||||
tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full
|
|
||||||
bne 1001b
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro busyuart,rd,rx
|
|
||||||
1001: ldr \rd, [\rx, #0x18] @ UARTFLG
|
|
||||||
tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy
|
|
||||||
bne 1001b
|
|
||||||
.endm
|
|
||||||
|
|
|
@ -11,8 +11,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/amba/serial.h>
|
|
||||||
|
|
||||||
.macro addruart,rx
|
.macro addruart,rx
|
||||||
mrc p15, 0, \rx, c1, c0
|
mrc p15, 0, \rx, c1, c0
|
||||||
tst \rx, #1 @ MMU enabled?
|
tst \rx, #1 @ MMU enabled?
|
||||||
|
@ -21,18 +19,4 @@
|
||||||
orr \rx, \rx, #0x00009000
|
orr \rx, \rx, #0x00009000
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
.macro senduart,rd,rx
|
#include <asm/hardware/debug-pl01x.S>
|
||||||
strb \rd, [\rx, #UART01x_DR]
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro waituart,rd,rx
|
|
||||||
1001: ldr \rd, [\rx, #0x18] @ UARTFLG
|
|
||||||
tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full
|
|
||||||
bne 1001b
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro busyuart,rd,rx
|
|
||||||
1001: ldr \rd, [\rx, #0x18] @ UARTFLG
|
|
||||||
tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy
|
|
||||||
bne 1001b
|
|
||||||
.endm
|
|
||||||
|
|
|
@ -11,8 +11,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/amba/serial.h>
|
|
||||||
|
|
||||||
.macro addruart,rx
|
.macro addruart,rx
|
||||||
mrc p15, 0, \rx, c1, c0
|
mrc p15, 0, \rx, c1, c0
|
||||||
tst \rx, #1 @ MMU enabled?
|
tst \rx, #1 @ MMU enabled?
|
||||||
|
@ -22,18 +20,4 @@
|
||||||
orr \rx, \rx, #0x00001000
|
orr \rx, \rx, #0x00001000
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
.macro senduart,rd,rx
|
#include <asm/hardware/debug-pl01x.S>
|
||||||
strb \rd, [\rx, #UART01x_DR]
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro waituart,rd,rx
|
|
||||||
1001: ldr \rd, [\rx, #0x18] @ UARTFLG
|
|
||||||
tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full
|
|
||||||
bne 1001b
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro busyuart,rd,rx
|
|
||||||
1001: ldr \rd, [\rx, #0x18] @ UARTFLG
|
|
||||||
tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy
|
|
||||||
bne 1001b
|
|
||||||
.endm
|
|
||||||
|
|
29
include/asm-arm/hardware/debug-pl01x.S
Normal file
29
include/asm-arm/hardware/debug-pl01x.S
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
/* linux/include/asm-arm/arch-integrator/debug-macro.S
|
||||||
|
*
|
||||||
|
* Debugging macro include header
|
||||||
|
*
|
||||||
|
* Copyright (C) 1994-1999 Russell King
|
||||||
|
* 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 <linux/amba/serial.h>
|
||||||
|
|
||||||
|
.macro senduart,rd,rx
|
||||||
|
strb \rd, [\rx, #UART01x_DR]
|
||||||
|
.endm
|
||||||
|
|
||||||
|
.macro waituart,rd,rx
|
||||||
|
1001: ldr \rd, [\rx, #UART01x_FR]
|
||||||
|
tst \rd, #UART01x_FR_TXFF
|
||||||
|
bne 1001b
|
||||||
|
.endm
|
||||||
|
|
||||||
|
.macro busyuart,rd,rx
|
||||||
|
1001: ldr \rd, [\rx, #UART01x_FR]
|
||||||
|
tst \rd, #UART01x_FR_BUSY
|
||||||
|
bne 1001b
|
||||||
|
.endm
|
Loading…
Reference in New Issue
Block a user