[PATCH 2/3] ARM: vexpress: allow to select debug UART address

[Sascha Hauer]

On Sun, Aug 16, 2020 at 11:42:41PM +0200, Lucas Stach wrote:
> DEBUG_LL currently doesn't work on the Vexpress platform for multiple
> reasons: the addresses defined in the header aren't the real UART base
> addresses but only the bus base address, also the referenced MP define
> is never set.
> 
> Add two options to allow the user to select the correct debug UART
> address for both supported Vexpress platforms.
> 
> Signed-off-by: Lucas Stach <dev at lynxeye.de>
> ---
>  arch/arm/mach-vexpress/include/mach/debug_ll.h | 11 +++++------
>  common/Kconfig                                 | 15 +++++++++++++++
>  2 files changed, 20 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-vexpress/include/mach/debug_ll.h b/arch/arm/mach-vexpress/include/mach/debug_ll.h
> index d59f68ea1973..a9c0d9850db8 100644
> --- a/arch/arm/mach-vexpress/include/mach/debug_ll.h
> +++ b/arch/arm/mach-vexpress/include/mach/debug_ll.h
> @@ -10,13 +10,12 @@
>  #include <linux/amba/serial.h>
>  #include <io.h>
>  
> -#define DEBUG_LL_PHYS_BASE		0x10000000
> -#define DEBUG_LL_PHYS_BASE_RS1		0x1c000000
> +#ifdef CONFIG_DEBUG_VEXPRESS_CA9_UART
> +#define DEBUG_LL_UART_ADDR 0x10009000
> +#endif
>  
> -#ifdef MP
> -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE
> -#else
> -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE_RS1
> +#ifdef CONFIG_DEBUG_VEXPRESS_CA15_UART
> +#define DEBUG_LL_UART_ADDR 0x1c090000
>  #endif

With this change DEBUG_LL_UART_ADDR is undefined when CONFIG_DEBUG_LL is
not set.

>  
>  #include <debug_ll/pl011.h>

in this file DEBUG_LL_UART_ADDR is used in a static inline function, so
we may only include it when DEBUG_LL_UART_ADDR is defined.

Not sure what we best do about it, but this breaks compilation of
vexpress_defconfig.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |