* [PATCH v2 0/5] Convert DEBUG_LL UART selection to a Kconfig choice
@ 2011-08-23 21:30 Will Deacon
2011-08-23 21:30 ` [PATCH v2 1/5] ARM: debug: use kconfig choice for selecting DEBUG_LL UART Will Deacon
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Will Deacon @ 2011-08-23 21:30 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
This is version 2 of the series originally posted here:
http://lists.infradead.org/pipermail/linux-arm-kernel/2011-August/061477.html
Changes since v1 include:
- Support for imx (thanks Shawn)
- Improvements to the Kconfig help text (thanks Sascha)
This generated some controversy on the mailing list so I thought it was
in need of a repost anyway. This series is based on the premise that DEBUG_LL
is not an option that should be left enabled in distribution kernels and
instead is an option that should only be enabled when debugging early
failures during boot.
Feedback welcome.
Will
Shawn Guo (1):
arm/imx: use Kconfig choice for low-level debug UART selection
Will Deacon (4):
ARM: debug: use kconfig choice for selecting DEBUG_LL UART
ARM: debug: augment DEBUG_LL Kconfig help to clarify behaviour
ARM: plat-samsung: use Kconfig choice for debug UART selection
ARM: realview: use Kconfig choice for debug UART selection
arch/arm/Kconfig.debug | 165 +++++++++++++++++----
arch/arm/mach-mxs/include/mach/debug-macro.S | 12 +--
arch/arm/mach-realview/include/mach/debug-macro.S | 17 +--
arch/arm/plat-mxc/include/mach/debug-macro.S | 38 +----
arch/arm/plat-samsung/Kconfig | 7 +
5 files changed, 152 insertions(+), 87 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/5] ARM: debug: use kconfig choice for selecting DEBUG_LL UART
2011-08-23 21:30 [PATCH v2 0/5] Convert DEBUG_LL UART selection to a Kconfig choice Will Deacon
@ 2011-08-23 21:30 ` Will Deacon
2011-08-23 21:30 ` [PATCH v2 2/5] ARM: debug: augment DEBUG_LL Kconfig help to clarify behaviour Will Deacon
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2011-08-23 21:30 UTC (permalink / raw)
To: linux-arm-kernel
Enabling CONFIG_DEBUG_LL (which is required for earlyprintk) hardwires
the debug UART address into the kernel, so that we can print before the
platform is initialised.
If the user inadvertently selects multiple platforms with DEBUG_LL
enabled, the UART address may not be correct and will likely cause the
kernel to hang in the very early stages of boot.
This patch, based on a skeleton from Russell, uses a Kconfig choice for
selecting the DEBUG_LL UART, therefore allowing the user to make a
choice about the supported platform when DEBUG_LL is enabled.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/Kconfig.debug | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 81cbe40..11604c9 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -72,6 +72,30 @@ config DEBUG_LL
in the kernel. This is helpful if you are debugging code that
executes before the console is initialized.
+choice
+ prompt "Kernel low-level debugging port"
+ depends on DEBUG_LL
+
+ config DEBUG_DC21285_PORT
+ bool "Kernel low-level debugging messages via footbridge serial port"
+ depends on FOOTBRIDGE
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to the serial port in the DC21285 (Footbridge).
+ Saying N will cause the debug messages to appear on the first
+ 16550 serial port.
+
+ config DEBUG_CLPS711X_UART2
+ bool "Kernel low-level debugging messages via UART2"
+ depends on ARCH_CLPS711X
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to the second serial port on these devices.
+ Saying N will cause the debug messages to appear on the first
+ serial port.
+
+endchoice
+
config EARLY_PRINTK
bool "Early printk"
depends on DEBUG_LL
@@ -100,23 +124,6 @@ config OC_ETM
buffer driver that will allow you to collect traces of the
kernel code.
-config DEBUG_DC21285_PORT
- bool "Kernel low-level debugging messages via footbridge serial port"
- depends on DEBUG_LL && FOOTBRIDGE
- help
- Say Y here if you want the debug print routines to direct their
- output to the serial port in the DC21285 (Footbridge). Saying N
- will cause the debug messages to appear on the first 16550
- serial port.
-
-config DEBUG_CLPS711X_UART2
- bool "Kernel low-level debugging messages via UART2"
- depends on DEBUG_LL && ARCH_CLPS711X
- help
- Say Y here if you want the debug print routines to direct their
- output to the second serial port on these devices. Saying N will
- cause the debug messages to appear on the first serial port.
-
config DEBUG_S3C_UART
depends on PLAT_SAMSUNG
int "S3C UART to use for low-level debug"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/5] ARM: debug: augment DEBUG_LL Kconfig help to clarify behaviour
2011-08-23 21:30 [PATCH v2 0/5] Convert DEBUG_LL UART selection to a Kconfig choice Will Deacon
2011-08-23 21:30 ` [PATCH v2 1/5] ARM: debug: use kconfig choice for selecting DEBUG_LL UART Will Deacon
@ 2011-08-23 21:30 ` Will Deacon
2011-08-23 21:30 ` [PATCH v2 3/5] ARM: plat-samsung: use Kconfig choice for debug UART selection Will Deacon
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2011-08-23 21:30 UTC (permalink / raw)
To: linux-arm-kernel
Enabled DEBUG_LL hardcodes the UART address into the kernel and results
in a non-portable kernel image. Since this option is only intended for
use when debugging early boot failures, supporting multiple platforms
in such a configuration is not the intended use-case.
This patch documents this limitation in the DEBUG_LL Kconfig help text,
so that users are aware of the portability restrictions that are associated
with enabling low-level debugging support.
Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/Kconfig.debug | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 11604c9..60d1846 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -65,13 +65,18 @@ config DEBUG_USER
# These options are only for real kernel hackers who want to get their hands dirty.
config DEBUG_LL
- bool "Kernel low-level debugging functions"
+ bool "Kernel low-level debugging functions (read help!)"
depends on DEBUG_KERNEL
help
Say Y here to include definitions of printascii, printch, printhex
in the kernel. This is helpful if you are debugging code that
executes before the console is initialized.
+ Note that selecting this option will limit the kernel to a single
+ UART definition, as specified below. Attempting to boot the kernel
+ image on a different platform *will not work*, so this option should
+ not be enabled for kernels that are intended to be portable.
+
choice
prompt "Kernel low-level debugging port"
depends on DEBUG_LL
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/5] ARM: plat-samsung: use Kconfig choice for debug UART selection
2011-08-23 21:30 [PATCH v2 0/5] Convert DEBUG_LL UART selection to a Kconfig choice Will Deacon
2011-08-23 21:30 ` [PATCH v2 1/5] ARM: debug: use kconfig choice for selecting DEBUG_LL UART Will Deacon
2011-08-23 21:30 ` [PATCH v2 2/5] ARM: debug: augment DEBUG_LL Kconfig help to clarify behaviour Will Deacon
@ 2011-08-23 21:30 ` Will Deacon
2011-08-23 21:30 ` [PATCH v2 4/5] ARM: realview: " Will Deacon
2011-08-23 21:30 ` [PATCH v2 5/5] arm/imx: use Kconfig choice for low-level " Will Deacon
4 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2011-08-23 21:30 UTC (permalink / raw)
To: linux-arm-kernel
Now that the DEBUG_LL UART can be selected by a Kconfig choice, convert
the Samsung UART selection to use a set of bools rather than an int.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/Kconfig.debug | 45 ++++++++++++++++++++++++++++++-----------
arch/arm/plat-samsung/Kconfig | 7 ++++++
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 60d1846..875bd34 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -99,6 +99,39 @@ choice
Saying N will cause the debug messages to appear on the first
serial port.
+ config DEBUG_S3C_UART0
+ depends on PLAT_SAMSUNG
+ bool "Use S3C UART 0 for low-level debug"
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to UART 0. The port must have been initialised
+ by the boot-loader before use.
+
+ The uncompressor code port configuration is now handled
+ by CONFIG_S3C_LOWLEVEL_UART_PORT.
+
+ config DEBUG_S3C_UART1
+ depends on PLAT_SAMSUNG
+ bool "Use S3C UART 1 for low-level debug"
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to UART 1. The port must have been initialised
+ by the boot-loader before use.
+
+ The uncompressor code port configuration is now handled
+ by CONFIG_S3C_LOWLEVEL_UART_PORT.
+
+ config DEBUG_S3C_UART2
+ depends on PLAT_SAMSUNG
+ bool "Use S3C UART 2 for low-level debug"
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to UART 2. The port must have been initialised
+ by the boot-loader before use.
+
+ The uncompressor code port configuration is now handled
+ by CONFIG_S3C_LOWLEVEL_UART_PORT.
+
endchoice
config EARLY_PRINTK
@@ -129,16 +162,4 @@ config OC_ETM
buffer driver that will allow you to collect traces of the
kernel code.
-config DEBUG_S3C_UART
- depends on PLAT_SAMSUNG
- int "S3C UART to use for low-level debug"
- default "0"
- help
- Choice for UART for kernel low-level using S3C UARTS,
- should be between zero and two. The port must have been
- initialised by the boot-loader before use.
-
- The uncompressor code port configuration is now handled
- by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
endmenu
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index b3e1065..49b14b1 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -367,4 +367,11 @@ config SAMSUNG_PD
help
Say Y here if you want to control Power Domain by Runtime PM.
+config DEBUG_S3C_UART
+ depends on PLAT_SAMSUNG
+ int
+ default "0" if DEBUG_S3C_UART0
+ default "1" if DEBUG_S3C_UART1
+ default "2" if DEBUG_S3C_UART2
+
endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/5] ARM: realview: use Kconfig choice for debug UART selection
2011-08-23 21:30 [PATCH v2 0/5] Convert DEBUG_LL UART selection to a Kconfig choice Will Deacon
` (2 preceding siblings ...)
2011-08-23 21:30 ` [PATCH v2 3/5] ARM: plat-samsung: use Kconfig choice for debug UART selection Will Deacon
@ 2011-08-23 21:30 ` Will Deacon
2011-08-23 21:30 ` [PATCH v2 5/5] arm/imx: use Kconfig choice for low-level " Will Deacon
4 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2011-08-23 21:30 UTC (permalink / raw)
To: linux-arm-kernel
Now that the DEBUG_LL UART can be selected by a Kconfig choice, simplify
the #ifdefery in debug-macro.S and add entries to the top-level
Kconfig.debug instead.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/Kconfig.debug | 16 ++++++++++++++++
arch/arm/mach-realview/include/mach/debug-macro.S | 17 ++---------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 875bd34..007cf85 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -132,6 +132,22 @@ choice
The uncompressor code port configuration is now handled
by CONFIG_S3C_LOWLEVEL_UART_PORT.
+ config DEBUG_REALVIEW_STD_PORT
+ bool "RealView Default UART"
+ depends on ARCH_REALVIEW
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to the serial port on RealView EB, PB11MP, PBA8
+ and PBX platforms.
+
+ config DEBUG_REALVIEW_PB1176_PORT
+ bool "RealView PB1176 UART"
+ depends on MACH_REALVIEW_PB1176
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to the standard serial port on the RealView
+ PB1176 platform.
+
endchoice
config EARLY_PRINTK
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
index 90b687c..0f38722 100644
--- a/arch/arm/mach-realview/include/mach/debug-macro.S
+++ b/arch/arm/mach-realview/include/mach/debug-macro.S
@@ -10,23 +10,10 @@
* published by the Free Software Foundation.
*/
-#if defined(CONFIG_MACH_REALVIEW_EB) || \
- defined(CONFIG_MACH_REALVIEW_PB11MP) || \
- defined(CONFIG_MACH_REALVIEW_PBA8) || \
- defined(CONFIG_MACH_REALVIEW_PBX)
-#ifndef DEBUG_LL_UART_OFFSET
+#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT
#define DEBUG_LL_UART_OFFSET 0x00009000
-#elif DEBUG_LL_UART_OFFSET != 0x00009000
-#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
-#endif
-#endif
-
-#ifdef CONFIG_MACH_REALVIEW_PB1176
-#ifndef DEBUG_LL_UART_OFFSET
+#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)
#define DEBUG_LL_UART_OFFSET 0x0010c000
-#elif DEBUG_LL_UART_OFFSET != 0x0010c000
-#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
-#endif
#endif
#ifndef DEBUG_LL_UART_OFFSET
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 5/5] arm/imx: use Kconfig choice for low-level debug UART selection
2011-08-23 21:30 [PATCH v2 0/5] Convert DEBUG_LL UART selection to a Kconfig choice Will Deacon
` (3 preceding siblings ...)
2011-08-23 21:30 ` [PATCH v2 4/5] ARM: realview: " Will Deacon
@ 2011-08-23 21:30 ` Will Deacon
4 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2011-08-23 21:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Shawn Guo <shawn.guo@linaro.org>
Now that the DEBUG_LL UART can be selected by a Kconfig choice,
simplify the #ifdefery in debug-macro.S and add entries to the
top-level Kconfig.debug instead.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/Kconfig.debug | 56 ++++++++++++++++++++++++++
arch/arm/mach-mxs/include/mach/debug-macro.S | 12 +-----
arch/arm/plat-mxc/include/mach/debug-macro.S | 38 +++---------------
3 files changed, 64 insertions(+), 42 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 007cf85..965d59a 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -99,6 +99,62 @@ choice
Saying N will cause the debug messages to appear on the first
serial port.
+ config DEBUG_IMX1_UART
+ bool "i.MX1 Debug UART"
+ depends on SOC_IMX1
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX1.
+
+ config DEBUG_IMX23_UART
+ bool "i.MX23 Debug UART"
+ depends on SOC_IMX23
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX23.
+
+ config DEBUG_IMX25_UART
+ bool "i.MX25 Debug UART"
+ depends on SOC_IMX25
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX25.
+
+ config DEBUG_IMX21_IMX27_UART
+ bool "i.MX21 and i.MX27 Debug UART"
+ depends on SOC_IMX21 || SOC_IMX27
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX21 or i.MX27.
+
+ config DEBUG_IMX28_UART
+ bool "i.MX28 Debug UART"
+ depends on SOC_IMX28
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX28.
+
+ config DEBUG_IMX31_IMX35_UART
+ bool "i.MX31 and i.MX35 Debug UART"
+ depends on SOC_IMX31 || SOC_IMX35
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX31 or i.MX35.
+
+ config DEBUG_IMX51_UART
+ bool "i.MX51 Debug UART"
+ depends on SOC_IMX51
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX51.
+
+ config DEBUG_IMX50_IMX53_UART
+ bool "i.MX50 and i.MX53 Debug UART"
+ depends on SOC_IMX50 || SOC_IMX53
+ help
+ Say Y here if you want kernel low-level debugging support
+ on i.MX50 or i.MX53.
+
config DEBUG_S3C_UART0
depends on PLAT_SAMSUNG
bool "Use S3C UART 0 for low-level debug"
diff --git a/arch/arm/mach-mxs/include/mach/debug-macro.S b/arch/arm/mach-mxs/include/mach/debug-macro.S
index 79650a1..6d98704 100644
--- a/arch/arm/mach-mxs/include/mach/debug-macro.S
+++ b/arch/arm/mach-mxs/include/mach/debug-macro.S
@@ -14,17 +14,9 @@
#include <mach/mx23.h>
#include <mach/mx28.h>
-#ifdef CONFIG_SOC_IMX23
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
+#ifdef CONFIG_DEBUG_IMX23_UART
#define UART_PADDR MX23_DUART_BASE_ADDR
-#endif
-
-#ifdef CONFIG_SOC_IMX28
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
+#elif defined (CONFIG_DEBUG_IMX28_UART)
#define UART_PADDR MX28_DUART_BASE_ADDR
#endif
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
index e4dde91..07cfdbe 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -12,43 +12,17 @@
*/
#include <mach/hardware.h>
-#ifdef CONFIG_SOC_IMX1
+#ifdef CONFIG_DEBUG_IMX1_UART
#define UART_PADDR MX1_UART1_BASE_ADDR
-#endif
-
-#ifdef CONFIG_SOC_IMX25
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
+#elif defined (CONFIG_DEBUG_IMX25_UART)
#define UART_PADDR MX25_UART1_BASE_ADDR
-#endif
-
-#if defined(CONFIG_SOC_IMX21) || defined (CONFIG_SOC_IMX27)
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
+#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)
#define UART_PADDR MX2x_UART1_BASE_ADDR
-#endif
-
-#if defined(CONFIG_SOC_IMX31) || defined(CONFIG_SOC_IMX35)
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
+#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)
#define UART_PADDR MX3x_UART1_BASE_ADDR
-#endif
-
-#ifdef CONFIG_SOC_IMX51
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
+#elif defined (CONFIG_DEBUG_IMX51_UART)
#define UART_PADDR MX51_UART1_BASE_ADDR
-#endif
-
-/* iMX50/53 have same addresses, but not iMX51 */
-#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53)
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
+#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)
#define UART_PADDR MX53_UART1_BASE_ADDR
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-23 21:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-23 21:30 [PATCH v2 0/5] Convert DEBUG_LL UART selection to a Kconfig choice Will Deacon
2011-08-23 21:30 ` [PATCH v2 1/5] ARM: debug: use kconfig choice for selecting DEBUG_LL UART Will Deacon
2011-08-23 21:30 ` [PATCH v2 2/5] ARM: debug: augment DEBUG_LL Kconfig help to clarify behaviour Will Deacon
2011-08-23 21:30 ` [PATCH v2 3/5] ARM: plat-samsung: use Kconfig choice for debug UART selection Will Deacon
2011-08-23 21:30 ` [PATCH v2 4/5] ARM: realview: " Will Deacon
2011-08-23 21:30 ` [PATCH v2 5/5] arm/imx: use Kconfig choice for low-level " Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).