* [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform
@ 2016-01-18 9:51 Arnd Bergmann
2016-01-18 9:59 ` Russell King - ARM Linux
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Arnd Bergmann @ 2016-01-18 9:51 UTC (permalink / raw)
To: Florian Fainelli; +Cc: arm, linux-arm-kernel, linux-kernel
During my randconfig build testing, I found that a kernel with
DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:
arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
It turns out that the DEBUG_UART_BCM63XX option is enabled whenever
the ARCH_BCM_63XX is, and that breaks multiplatform kernels because
we then end up using the UART address from BCM63XX rather than the
one we actually configured (if any).
This changes the BCM63XX options to only have one Kconfig option,
and only enable that if the user explicitly turns it on.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support")
Cc: stable@vger.kernel.org
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index c57cbb7e8179..4a2c6a3bc90a 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -153,10 +153,10 @@ choice
mobile SoCs in the Kona family of chips (e.g. bcm28155,
bcm11351, etc...)
- config DEBUG_BCM63XX
+ config DEBUG_BCM63XX_UART
bool "Kernel low-level debugging on BCM63XX UART"
depends on ARCH_BCM_63XX
- select DEBUG_UART_BCM63XX
+ help
config DEBUG_BERLIN_UART
bool "Marvell Berlin SoC Debug UART"
@@ -1414,7 +1414,7 @@ config DEBUG_LL_INCLUDE
default "debug/vf.S" if DEBUG_VF_UART
default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
- default "debug/bcm63xx.S" if DEBUG_UART_BCM63XX
+ default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART
default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0
default "mach/debug-macro.S"
@@ -1428,10 +1428,6 @@ config DEBUG_UART_8250
ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \
ARCH_RPC
-# Compatibility options for BCM63xx
-config DEBUG_UART_BCM63XX
- def_bool ARCH_BCM_63XX
-
config DEBUG_UART_PHYS
hex "Physical base address of debug UART"
default 0x00100a00 if DEBUG_NETX_UART
@@ -1529,7 +1525,7 @@ config DEBUG_UART_PHYS
default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
- default 0xfffe8600 if DEBUG_UART_BCM63XX
+ default 0xfffe8600 if DEBUG_BCM63XX_UART
default 0xfffff700 if ARCH_IOP33X
default 0
depends on ARCH_EP93XX || \
@@ -1543,7 +1539,7 @@ config DEBUG_UART_PHYS
DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
DEBUG_S3C64XX_UART || \
- DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
+ DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
DEBUG_AT91_UART
@@ -1589,7 +1585,7 @@ config DEBUG_UART_VIRT
default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
default 0xfc40ab00 if DEBUG_BRCMSTB_UART
default 0xfc705000 if DEBUG_ZTE_ZX
- default 0xfcfe8600 if DEBUG_UART_BCM63XX
+ default 0xfcfe8600 if DEBUG_BCM63XX_UART
default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
default 0xfd883000 if DEBUG_ALPINE_UART0
default 0xfe017000 if DEBUG_MMP_UART2
@@ -1637,7 +1633,7 @@ config DEBUG_UART_VIRT
DEBUG_NETX_UART || \
DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
DEBUG_S3C64XX_UART || \
- DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
+ DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0
config DEBUG_UART_8250_SHIFT
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform
2016-01-18 9:51 [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform Arnd Bergmann
@ 2016-01-18 9:59 ` Russell King - ARM Linux
2016-01-18 10:42 ` Arnd Bergmann
2016-01-18 17:41 ` Randy Dunlap
2016-01-18 19:07 ` Florian Fainelli
2 siblings, 1 reply; 6+ messages in thread
From: Russell King - ARM Linux @ 2016-01-18 9:59 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Florian Fainelli, arm, linux-arm-kernel, linux-kernel
On Mon, Jan 18, 2016 at 10:51:00AM +0100, Arnd Bergmann wrote:
> During my randconfig build testing, I found that a kernel with
> DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:
>
> arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
Why do we have files defining CONFIG_* symbols? This is the real error
here - no source file should be defining this.
--
RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform
2016-01-18 9:59 ` Russell King - ARM Linux
@ 2016-01-18 10:42 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2016-01-18 10:42 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Florian Fainelli, arm, linux-arm-kernel, linux-kernel
On Monday 18 January 2016 09:59:19 Russell King - ARM Linux wrote:
> On Mon, Jan 18, 2016 at 10:51:00AM +0100, Arnd Bergmann wrote:
> > During my randconfig build testing, I found that a kernel with
> > DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:
> >
> > arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
>
> Why do we have files defining CONFIG_* symbols? This is the real error
> here - no source file should be defining this.
I agree that we should change that too, I'll send a patch for it as well.
However, this just let me stumble on the problem, without AT91 getting this
wrong, I would not have noticed that bcm63xx breaks other platforms.
The AT91 thing is just confusing but otherwise harmless, and I wouldn't
mark that fix for stable.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform
2016-01-18 9:51 [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform Arnd Bergmann
2016-01-18 9:59 ` Russell King - ARM Linux
@ 2016-01-18 17:41 ` Randy Dunlap
2016-01-18 19:38 ` Arnd Bergmann
2016-01-18 19:07 ` Florian Fainelli
2 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2016-01-18 17:41 UTC (permalink / raw)
To: Arnd Bergmann, Florian Fainelli; +Cc: arm, linux-arm-kernel, linux-kernel
On 01/18/16 01:51, Arnd Bergmann wrote:
> During my randconfig build testing, I found that a kernel with
> DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:
>
> arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
>
> It turns out that the DEBUG_UART_BCM63XX option is enabled whenever
> the ARCH_BCM_63XX is, and that breaks multiplatform kernels because
> we then end up using the UART address from BCM63XX rather than the
> one we actually configured (if any).
>
> This changes the BCM63XX options to only have one Kconfig option,
> and only enable that if the user explicitly turns it on.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support")
> Cc: stable@vger.kernel.org
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index c57cbb7e8179..4a2c6a3bc90a 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -153,10 +153,10 @@ choice
> mobile SoCs in the Kona family of chips (e.g. bcm28155,
> bcm11351, etc...)
>
> - config DEBUG_BCM63XX
> + config DEBUG_BCM63XX_UART
> bool "Kernel low-level debugging on BCM63XX UART"
> depends on ARCH_BCM_63XX
> - select DEBUG_UART_BCM63XX
> + help
What's with the empty help message (and lots of trailing whitespace)?
>
> config DEBUG_BERLIN_UART
> bool "Marvell Berlin SoC Debug UART"
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform
2016-01-18 9:51 [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform Arnd Bergmann
2016-01-18 9:59 ` Russell King - ARM Linux
2016-01-18 17:41 ` Randy Dunlap
@ 2016-01-18 19:07 ` Florian Fainelli
2 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2016-01-18 19:07 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: arm, linux-arm-kernel, linux-kernel
Le 18/01/2016 01:51, Arnd Bergmann a écrit :
> During my randconfig build testing, I found that a kernel with
> DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:
>
> arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
>
> It turns out that the DEBUG_UART_BCM63XX option is enabled whenever
> the ARCH_BCM_63XX is, and that breaks multiplatform kernels because
> we then end up using the UART address from BCM63XX rather than the
> one we actually configured (if any).
>
> This changes the BCM63XX options to only have one Kconfig option,
> and only enable that if the user explicitly turns it on.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support")
> Cc: stable@vger.kernel.org
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Thanks for spotting this.
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform
2016-01-18 17:41 ` Randy Dunlap
@ 2016-01-18 19:38 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2016-01-18 19:38 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Florian Fainelli, arm, linux-arm-kernel, linux-kernel
On Monday 18 January 2016 09:41:17 Randy Dunlap wrote:
> On 01/18/16 01:51, Arnd Bergmann wrote:
> > During my randconfig build testing, I found that a kernel with
> > DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:
> >
> > arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
> >
> > It turns out that the DEBUG_UART_BCM63XX option is enabled whenever
> > the ARCH_BCM_63XX is, and that breaks multiplatform kernels because
> > we then end up using the UART address from BCM63XX rather than the
> > one we actually configured (if any).
> >
> > This changes the BCM63XX options to only have one Kconfig option,
> > and only enable that if the user explicitly turns it on.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support")
> > Cc: stable@vger.kernel.org
> >
> > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> > index c57cbb7e8179..4a2c6a3bc90a 100644
> > --- a/arch/arm/Kconfig.debug
> > +++ b/arch/arm/Kconfig.debug
> > @@ -153,10 +153,10 @@ choice
> > mobile SoCs in the Kona family of chips (e.g. bcm28155,
> > bcm11351, etc...)
> >
> > - config DEBUG_BCM63XX
> > + config DEBUG_BCM63XX_UART
> > bool "Kernel low-level debugging on BCM63XX UART"
> > depends on ARCH_BCM_63XX
> > - select DEBUG_UART_BCM63XX
> > + help
>
> What's with the empty help message (and lots of trailing whitespace)?
>
>
Sorry about that. I was planning to add some text at first and then
saw that most others didn't have one either in this list, so I dropped
it again.
Curiously, the empty help text actually caused some serious problems
later on in my build testing, so this patch creates a regression unless
I remove that line again (as I should anyway).
Thanks for spotting this as well!
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-18 19:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-18 9:51 [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform Arnd Bergmann
2016-01-18 9:59 ` Russell King - ARM Linux
2016-01-18 10:42 ` Arnd Bergmann
2016-01-18 17:41 ` Randy Dunlap
2016-01-18 19:38 ` Arnd Bergmann
2016-01-18 19:07 ` Florian Fainelli
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).