[4/6] ARM: sunxi: Add earlyprintk support

Message ID	1353019586-21043-5-git-send-email-maxime.ripard@free-electrons.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> From: Maxime Ripard <maxime.ripard@free-electrons.com> To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net> Subject: [PATCH 4/6] ARM: sunxi: Add earlyprintk support Date: Thu, 15 Nov 2012 23:46:23 +0100 Message-Id: <1353019586-21043-5-git-send-email-maxime.ripard@free-electrons.com> In-Reply-To: <1353019586-21043-1-git-send-email-maxime.ripard@free-electrons.com> References: <1353019586-21043-1-git-send-email-maxime.ripard@free-electrons.com> summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Message ID

1353019586-21043-5-git-send-email-maxime.ripard@free-electrons.com (mailing list archive)

State

New, archived

Headers

From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Arnd Bergmann <arnd@arndb.de>,
	Olof Johansson <olof@lixom.net>
Subject: [PATCH 4/6] ARM: sunxi: Add earlyprintk support
Date: Thu, 15 Nov 2012 23:46:23 +0100
Message-Id: <1353019586-21043-5-git-send-email-maxime.ripard@free-electrons.com>
In-Reply-To: <1353019586-21043-1-git-send-email-maxime.ripard@free-electrons.com>
References: <1353019586-21043-1-git-send-email-maxime.ripard@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: linux-arm-kernel-bounces@lists.infradead.org
Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Commit Message

Maxime Ripard Nov. 15, 2012, 10:46 p.m. UTC

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/Kconfig.debug         |    8 ++++++++
 arch/arm/include/debug/sunxi.S |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 arch/arm/include/debug/sunxi.S

Comments

Stefan Roese Nov. 16, 2012, 7:47 a.m. UTC | #1

On 11/15/2012 11:46 PM, Maxime Ripard wrote:
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  arch/arm/Kconfig.debug         |    8 ++++++++
>  arch/arm/include/debug/sunxi.S |   22 ++++++++++++++++++++++
>  2 files changed, 30 insertions(+)
>  create mode 100644 arch/arm/include/debug/sunxi.S
> 
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index b0f3857..6672b02 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -345,6 +345,13 @@ choice
>  		  Say Y here if you want kernel low-level debugging support
>  		  on SOCFPGA based platforms.
>  
> +	config DEBUG_SUNXI_UART
> +		bool "Kernel low-level debugging messages via sunXi UART"
> +		depends on ARCH_SUNXI
> +		help
> +		  Say Y here if you want kernel low-level debugging support
> +		  on Allwinner A1X based platforms.
>
>  	config DEBUG_VEXPRESS_UART0_DETECT
>  		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
>  		depends on ARCH_VEXPRESS && CPU_CP15_MMU
> @@ -416,6 +423,7 @@ config DEBUG_LL_INCLUDE
>  	default "debug/mvebu.S" if DEBUG_MVEBU_UART
>  	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
>  	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
> +	default "debug/sunxi.S" if DEBUG_SUNXI_UART
>  	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
>  		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
>  	default "mach/debug-macro.S"
> diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
> new file mode 100644
> index 0000000..ffd101f
> --- /dev/null
> +++ b/arch/arm/include/debug/sunxi.S
> @@ -0,0 +1,22 @@
> +/*
> + * Early serial output macro for Allwinner A1X SoCs
> + *
> + * Copyright (C) 2012 Maxime Ripard
> + *
> + * Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * 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.
> +*/
> +
> +#define SUNXI_UART1_PHYS_BASE	0x01c28400
> +#define SUNXI_UART1_VIRT_BASE	0xf1c28400
> +
> +	.macro	addruart, rp, rv, tmp
> +	ldr	\rp, =SUNXI_UART1_PHYS_BASE
> +	ldr	\rv, =SUNXI_UART1_VIRT_BASE
> +	.endm
> +
> +#define UART_SHIFT	2
> +#include <asm/hardware/debug-8250.S>

A10 (cubieboard) has debug the UART on UART0 instead of UART1 as on A13.
So we need support this here as well. I suggest that I add support debug
on UART0 with my cubieboard patches.

So:

Acked-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

Maxime Ripard Nov. 16, 2012, 9:20 a.m. UTC | #2

Le 16/11/2012 08:47, Stefan Roese a écrit :
> On 11/15/2012 11:46 PM, Maxime Ripard wrote:
>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>> ---
>>  arch/arm/Kconfig.debug         |    8 ++++++++
>>  arch/arm/include/debug/sunxi.S |   22 ++++++++++++++++++++++
>>  2 files changed, 30 insertions(+)
>>  create mode 100644 arch/arm/include/debug/sunxi.S
>>
>> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
>> index b0f3857..6672b02 100644
>> --- a/arch/arm/Kconfig.debug
>> +++ b/arch/arm/Kconfig.debug
>> @@ -345,6 +345,13 @@ choice
>>  		  Say Y here if you want kernel low-level debugging support
>>  		  on SOCFPGA based platforms.
>>  
>> +	config DEBUG_SUNXI_UART
>> +		bool "Kernel low-level debugging messages via sunXi UART"
>> +		depends on ARCH_SUNXI
>> +		help
>> +		  Say Y here if you want kernel low-level debugging support
>> +		  on Allwinner A1X based platforms.
>>
>>  	config DEBUG_VEXPRESS_UART0_DETECT
>>  		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
>>  		depends on ARCH_VEXPRESS && CPU_CP15_MMU
>> @@ -416,6 +423,7 @@ config DEBUG_LL_INCLUDE
>>  	default "debug/mvebu.S" if DEBUG_MVEBU_UART
>>  	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
>>  	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
>> +	default "debug/sunxi.S" if DEBUG_SUNXI_UART
>>  	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
>>  		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
>>  	default "mach/debug-macro.S"
>> diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
>> new file mode 100644
>> index 0000000..ffd101f
>> --- /dev/null
>> +++ b/arch/arm/include/debug/sunxi.S
>> @@ -0,0 +1,22 @@
>> +/*
>> + * Early serial output macro for Allwinner A1X SoCs
>> + *
>> + * Copyright (C) 2012 Maxime Ripard
>> + *
>> + * Maxime Ripard <maxime.ripard@free-electrons.com>
>> + *
>> + * 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.
>> +*/
>> +
>> +#define SUNXI_UART1_PHYS_BASE	0x01c28400
>> +#define SUNXI_UART1_VIRT_BASE	0xf1c28400
>> +
>> +	.macro	addruart, rp, rv, tmp
>> +	ldr	\rp, =SUNXI_UART1_PHYS_BASE
>> +	ldr	\rv, =SUNXI_UART1_VIRT_BASE
>> +	.endm
>> +
>> +#define UART_SHIFT	2
>> +#include <asm/hardware/debug-8250.S>
> 
> A10 (cubieboard) has debug the UART on UART0 instead of UART1 as on A13.
> So we need support this here as well. I suggest that I add support debug
> on UART0 with my cubieboard patches.

Ok, we'll do it that way then. Thanks!

Maxime

Thomas Petazzoni Nov. 16, 2012, 10:41 a.m. UTC | #3

Dear Maxime Ripard,

On Thu, 15 Nov 2012 23:46:23 +0100, Maxime Ripard wrote:
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  arch/arm/Kconfig.debug         |    8 ++++++++
>  arch/arm/include/debug/sunxi.S |   22 ++++++++++++++++++++++
>  2 files changed, 30 insertions(+)
>  create mode 100644 arch/arm/include/debug/sunxi.S
> 
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index b0f3857..6672b02 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -345,6 +345,13 @@ choice
>  		  Say Y here if you want kernel low-level debugging support
>  		  on SOCFPGA based platforms.
>  
> +	config DEBUG_SUNXI_UART

Should be DEBUG_SUNXI_UART1

> +		bool "Kernel low-level debugging messages via sunXi UART"

UART1.

> +		depends on ARCH_SUNXI
> +		help
> +		  Say Y here if you want kernel low-level debugging support
> +		  on Allwinner A1X based platforms.

Say a few words about UART1 here.

> +
>  	config DEBUG_VEXPRESS_UART0_DETECT
>  		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
>  		depends on ARCH_VEXPRESS && CPU_CP15_MMU
> @@ -416,6 +423,7 @@ config DEBUG_LL_INCLUDE
>  	default "debug/mvebu.S" if DEBUG_MVEBU_UART
>  	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
>  	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
> +	default "debug/sunxi.S" if DEBUG_SUNXI_UART

UART1

>  	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
>  		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
>  	default "mach/debug-macro.S"
> diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
> new file mode 100644
> index 0000000..ffd101f
> --- /dev/null
> +++ b/arch/arm/include/debug/sunxi.S
> @@ -0,0 +1,22 @@
> +/*
> + * Early serial output macro for Allwinner A1X SoCs
> + *
> + * Copyright (C) 2012 Maxime Ripard
> + *
> + * Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * 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.
> +*/
> +
> +#define SUNXI_UART1_PHYS_BASE	0x01c28400
> +#define SUNXI_UART1_VIRT_BASE	0xf1c28400

Maybe:

#ifdef CONFIG_DEBUG_SUNXI_UART1
#define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28400
#define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28400
#endif

> +	.macro	addruart, rp, rv, tmp
> +	ldr	\rp, =SUNXI_UART1_PHYS_BASE
> +	ldr	\rv, =SUNXI_UART1_VIRT_BASE

And use SUNXI_UART_DEBUG_{VIRT,PHYS}_BASE here.

So that people can come and add CONFIG_DEBUG_SUNXI_UART0 for the
Cubieboard a bit more easily. Or you can even provision the code for
the UART0 as well.

Best regards,

Thomas

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index b0f3857..6672b02 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -345,6 +345,13 @@  choice
 		  Say Y here if you want kernel low-level debugging support
 		  on SOCFPGA based platforms.
 
+	config DEBUG_SUNXI_UART
+		bool "Kernel low-level debugging messages via sunXi UART"
+		depends on ARCH_SUNXI
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on Allwinner A1X based platforms.
+
 	config DEBUG_VEXPRESS_UART0_DETECT
 		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
 		depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -416,6 +423,7 @@  config DEBUG_LL_INCLUDE
 	default "debug/mvebu.S" if DEBUG_MVEBU_UART
 	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
 	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
+	default "debug/sunxi.S" if DEBUG_SUNXI_UART
 	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
 		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
 	default "mach/debug-macro.S"
diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
new file mode 100644
index 0000000..ffd101f
--- /dev/null
+++ b/arch/arm/include/debug/sunxi.S
@@ -0,0 +1,22 @@ 
+/*
+ * Early serial output macro for Allwinner A1X SoCs
+ *
+ * Copyright (C) 2012 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * 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.
+*/
+
+#define SUNXI_UART1_PHYS_BASE	0x01c28400
+#define SUNXI_UART1_VIRT_BASE	0xf1c28400
+
+	.macro	addruart, rp, rv, tmp
+	ldr	\rp, =SUNXI_UART1_PHYS_BASE
+	ldr	\rv, =SUNXI_UART1_VIRT_BASE
+	.endm
+
+#define UART_SHIFT	2
+#include <asm/hardware/debug-8250.S>

[4/6] ARM: sunxi: Add earlyprintk support

Commit Message

Comments

Patch