Re: [PATCH 2/3] [ARM] msm: make debugging UART (for DEBUG_LL) configurable

Pavel Machek
2009-06-15T13:20:32Z

Hi!

> Signed-off-by: Brian Swetland <swetland@google.com>
> ---
> arch/arm/mach-msm/Kconfig | 24 ++++++++++++++++++++++++
> arch/arm/mach-msm/include/mach/debug-macro.S | 25 ++++++++++++++++++-------
> arch/arm/mach-msm/include/mach/msm_iomap.h | 12 ++++++++++++
> arch/arm/mach-msm/include/mach/uncompress.h | 7 +++++++
> arch/arm/mach-msm/io.c | 3 +++
> 5 files changed, 64 insertions(+), 7 deletions(-)

I'm not sure if this is appropriate for mainline at this point. It
seems like few people have debug cable at this point...

> +config MSM_DEBUG_UART
> + int
> + default 1 if MSM_DEBUG_UART1
> + default 2 if MSM_DEBUG_UART2
> + default 3 if MSM_DEBUG_UART3

...and those that do, have it at fixed uart, no?

> index 1db3c97..ab772cc 100644
> --- a/arch/arm/mach-msm/include/mach/debug-macro.S
> +++ b/arch/arm/mach-msm/include/mach/debug-macro.S
> @@ -14,15 +14,18 @@
> *
> */
>
> +
> +
> #include <mach/hardware.h>
> #include <mach/msm_iomap.h>

It has enough lines, already...

> +#ifdef CONFIG_MSM_DEBUG_UART
> .macro addruart,rx
> @ see if the MMU is enabled and select appropriate base address
> mrc p15, 0, \rx, c1, c0
> tst \rx, #1
> - ldreq \rx, =MSM_UART1_PHYS
> - movne \rx, #0
> + ldreq \rx, =MSM_DEBUG_UART_PHYS
> + ldrne \rx, =MSM_DEBUG_UART_BASE
> .endm
>
> .macro senduart,rd,rx
> @@ -32,13 +35,21 @@
>
> .macro waituart,rd,rx
> @ wait for TX_READY
> - teq \rx, #0
> - bne 2f
> -1: ldr \rd, [\rx, #0x08]
> +1001: ldr \rd, [\rx, #0x08]
> tst \rd, #0x04
> - beq 1b
> -2:
> + beq 1001b
> +1002:
> + .endm

Is the 1002 label required?

Pavel

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html