[v2] ARM: debug-ll: add default address for digicolor

Message ID 20190417125153.2510262-1-arnd@arndb.de
State New
Headers show
Series
  • [v2] ARM: debug-ll: add default address for digicolor
Related show

Commit Message

Arnd Bergmann April 17, 2019, 12:51 p.m.
The digicolor platform has three UARTs, but the Kconfig.debug
file explicitly lists port zero as the one to be used for the
console, while not providing any default values.

This can get an automated randconfig build stuck in a loop
waiting for the user to input the number. As we already know
the physical address, this patch provides that number as
default, along with a reasonable default value for the virtual
address.

Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
v2: fix physical address

 arch/arm/Kconfig.debug | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.20.0

Comments

Baruch Siach April 17, 2019, 2:18 p.m. | #1
Hi Arnd,

On Wed, Apr 17 2019, Arnd Bergmann wrote:
> The digicolor platform has three UARTs, but the Kconfig.debug

> file explicitly lists port zero as the one to be used for the

> console, while not providing any default values.

>

> This can get an automated randconfig build stuck in a loop

> waiting for the user to input the number. As we already know

> the physical address, this patch provides that number as

> default, along with a reasonable default value for the virtual

> address.

>

> Cc: Baruch Siach <baruch@tkos.co.il>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

> v2: fix physical address

>

>  arch/arm/Kconfig.debug | 2 ++

>  1 file changed, 2 insertions(+)

>

> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug

> index 6d6e0330930b..12c0d29b75e3 100644

> --- a/arch/arm/Kconfig.debug

> +++ b/arch/arm/Kconfig.debug

> @@ -1677,6 +1677,7 @@ config DEBUG_UART_PHYS

>  	default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4

>  	default 0xe8008000 if DEBUG_R7S72100_SCIF2

>  	default 0xf0000be0 if ARCH_EBSA110

> +	default 0xf0100000 if DEBUG_DIGICOLOR_UA0


Should be 0xf0000000 for the physical address.

>  	default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE

>  	default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE

>  	default 0xf7fc9000 if DEBUG_BERLIN_UART

> @@ -1784,6 +1785,7 @@ config DEBUG_UART_VIRT

>  	default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0

>  	default 0xfd883000 if DEBUG_ALPINE_UART0

>  	default 0xfde12000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_DOVE

> +	default 0xfe000000 if DEBUG_DIGICOLOR_UA0


Maybe you intended to change the virtual address to 0xf0100000?

>  	DEFAULT 0xfe012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_ORION5X

>  	default 0xfe017000 if DEBUG_MMP_UART2

>  	default 0xfe018000 if DEBUG_MMP_UART3


baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Arnd Bergmann April 17, 2019, 3:13 p.m. | #2
On Wed, Apr 17, 2019 at 4:18 PM Baruch Siach <baruch@tkos.co.il> wrote:
> On Wed, Apr 17 2019, Arnd Bergmann wrote:


> > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug

> > index 6d6e0330930b..12c0d29b75e3 100644

> > --- a/arch/arm/Kconfig.debug

> > +++ b/arch/arm/Kconfig.debug

> > @@ -1677,6 +1677,7 @@ config DEBUG_UART_PHYS

> >       default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4

> >       default 0xe8008000 if DEBUG_R7S72100_SCIF2

> >       default 0xf0000be0 if ARCH_EBSA110

> > +     default 0xf0100000 if DEBUG_DIGICOLOR_UA0

>

> Should be 0xf0000000 for the physical address.

>

> >       default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE

> >       default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE

> >       default 0xf7fc9000 if DEBUG_BERLIN_UART

> > @@ -1784,6 +1785,7 @@ config DEBUG_UART_VIRT

> >       default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0

> >       default 0xfd883000 if DEBUG_ALPINE_UART0

> >       default 0xfde12000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_DOVE

> > +     default 0xfe000000 if DEBUG_DIGICOLOR_UA0

>

> Maybe you intended to change the virtual address to 0xf0100000?


Ouch, sorry for messing it up again. Sending a v3 now.

       Arnd

Patch

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 6d6e0330930b..12c0d29b75e3 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1677,6 +1677,7 @@  config DEBUG_UART_PHYS
 	default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4
 	default 0xe8008000 if DEBUG_R7S72100_SCIF2
 	default 0xf0000be0 if ARCH_EBSA110
+	default 0xf0100000 if DEBUG_DIGICOLOR_UA0
 	default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
 	default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
 	default 0xf7fc9000 if DEBUG_BERLIN_UART
@@ -1784,6 +1785,7 @@  config DEBUG_UART_VIRT
 	default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0
 	default 0xfd883000 if DEBUG_ALPINE_UART0
 	default 0xfde12000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_DOVE
+	default 0xfe000000 if DEBUG_DIGICOLOR_UA0
 	default 0xfe012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_ORION5X
 	default 0xfe017000 if DEBUG_MMP_UART2
 	default 0xfe018000 if DEBUG_MMP_UART3