serial: fix Kconfig for Freescale 16550

PATCH In review Michael Neuling 3 participants 5 messages Dec 13, 2011

Subsystems (2)

Linux-next tree TTY layer and serial drivers

lore

Share & tools

lore

Michael Neuling

author

2011-12-13 00:31 UTC #0 lore raw

PATCH 1/1 serial: fix Kconfig for Freescale 16550

next-20111212 breaks with linking a pmac32_defconfig with:
drivers/built-in.o: In function `fsl8250_handle_irq':
(.text+0x7ba74): undefined reference to serial8250_modem_status' drivers/built-in.o: In function fsl8250_handle_irq':
(.text+0x7baa4): undefined reference to serial8250_tx_chars' drivers/built-in.o: In function fsl8250_handle_irq':
(.text+0x7bab4): undefined reference to `serial8250_rx_chars'

Caused by:
9deaa53 serial: add irq handler for Freescale 16550 errata.

pmac32_defconfig results in SERIAL_8250_FSL=y but SERIAL_8250=m so 8250_fsl.c doesn't link properly.

This explicitly makes SERIAL_8250_FSL depends on SERIAL_8250=y.

Signed-off-by Michael Neuling <[email protected]>

---
I'm not sure this is the right fix as it seems like a Kconfig bug.

drivers/tty/serial/Kconfig +1 -1

index a1d55c3..c9046de 100644
@@ -99,7 +99,7 @@ config SERIAL_8250_PNP
 
 config SERIAL_8250_FSL
 	bool
-	depends on SERIAL_8250 && PPC
+	depends on SERIAL_8250=y && PPC
 	default PPC
 
 config SERIAL_8250_HP300

Greg KH

2011-12-13 00:56 UTC #1 lore raw

Quoted 25 lines · Michael Neuling

next-20111212 breaks with linking a pmac32_defconfig with:
drivers/built-in.o: In function `fsl8250_handle_irq':
(.text+0x7ba74): undefined reference to serial8250_modem_status' drivers/built-in.o: In function fsl8250_handle_irq':
(.text+0x7baa4): undefined reference to serial8250_tx_chars' drivers/built-in.o: In function fsl8250_handle_irq':
(.text+0x7bab4): undefined reference to `serial8250_rx_chars'
Caused by:
9deaa53 serial: add irq handler for Freescale 16550 errata.
pmac32_defconfig results in SERIAL_8250_FSL=y but SERIAL_8250=m so 8250_fsl.c doesn't link properly.
This explicitly makes SERIAL_8250_FSL depends on SERIAL_8250=y.
Signed-off-by Michael Neuling <[email protected]>
---
I'm not sure this is the right fix as it seems like a Kconfig bug.
drivers/tty/serial/Kconfig +0 -0
index a1d55c3..c9046de 100644

drivers/tty/serial/Kconfig config SERIAL_8250_PNP · line 102

Quoted 5 lines

drivers/tty/serial/Kconfig +1 -1

@@ -99,7 +99,7 @@ config SERIAL_8250_PNP
 
 config SERIAL_8250_FSL
 	bool
-	depends on SERIAL_8250 && PPC
+	depends on SERIAL_8250=y && PPC

Then you can't select SERIAL_8250 as a module at all, right? Perhaps you should allow SERIAL_8250_FSL to be a module as well here? So changing the bool to a tristate should be the correct option? Can you try that?

greg k-h

Michael Neuling

author

2011-12-13 01:53 UTC #2 lore raw

Quoted 27 lines · In message <[email protected]> you wrote:

Quoted 26 lines · Michael Neuling
next-20111212 breaks with linking a pmac32_defconfig with:
drivers/built-in.o: In function `fsl8250_handle_irq':
(.text+0x7ba74): undefined reference to serial8250_modem_status' drivers/built-in.o: In function fsl8250_handle_irq':
(.text+0x7baa4): undefined reference to serial8250_tx_chars' drivers/built-in.o: In function fsl8250_handle_irq':
(.text+0x7bab4): undefined reference to `serial8250_rx_chars'
Caused by:
9deaa53 serial: add irq handler for Freescale 16550 errata.
pmac32_defconfig results in SERIAL_8250_FSL=y but SERIAL_8250=m so 8250_fsl.c doesn't link properly.
This explicitly makes SERIAL_8250_FSL depends on SERIAL_8250=y.
Signed-off-by Michael Neuling <[email protected]>
---
I'm not sure this is the right fix as it seems like a Kconfig bug.
drivers/tty/serial/Kconfig +0 -0
index a1d55c3..c9046de 100644
@@ -99,7 +99,7 @@ config SERIAL_8250_PNP
 

Quoted 6 lines

drivers/tty/serial/Kconfig config SERIAL_8250_PNP · line 102
Quoted 4 lines
drivers/tty/serial/Kconfig +1 -1
 config SERIAL_8250_FSL
 	bool
-	depends on SERIAL_8250 && PPC
+	depends on SERIAL_8250=y && PPC
Then you can't select SERIAL_8250 as a module at all, right?

Correct, unless SERIAL_8250_FOL=n of course.

Quoted 3 lines

Perhaps you should allow SERIAL_8250_FSL to be a module as well here? So changing the bool to a tristate should be the correct option? Can you try that?

Yep, that works also. New patch below.

This should probably be aced by Paul to ensure he's cool with it being a module now.

Mikey

From: Michael Neuling <[email protected]>

serial: fix Kconfig for Freescale 16550

Caused by:
9deaa53 serial: add irq handler for Freescale 16550 errata.

pmac32_defconfig results in SERIAL_8250_FSL=y but SERIAL_8250=m so 8250_fsl.c doesn't link properly for the kernel.

This makes SERIAL_8250_FSL tristate.

Signed-off-by Michael Neuling <[email protected]>

Suggested-by Greg KH <[email protected]>

drivers/tty/serial/Kconfig +1 -1

index a1d55c3..d8832a4 100644
@@ -98,7 +98,7 @@ config SERIAL_8250_PNP
 	  disable this feature if you only need legacy serial support.
 
 config SERIAL_8250_FSL
-	bool
+	tristate
 	depends on SERIAL_8250 && PPC
 	default PPC

Paul Gortmaker

2011-12-13 02:48 UTC #3 lore raw

Quoted 1 line · [Re: [PATCH] serial: fix Kconfig for Freescale 16550] On 13/12/2011 (Tue…

In message <[email protected]> you wrote:

[...]

Quoted 4 lines

Quoted 1 line
Then you can't select SERIAL_8250 as a module at all, right?
Correct, unless SERIAL_8250_FOL=n of course.

Quoted 8 lines

Quoted 3 lines
Perhaps you should allow SERIAL_8250_FSL to be a module as well here? So changing the bool to a tristate should be the correct option? Can you try that?
Yep, that works also. New patch below.
This should probably be aced by Paul to ensure he's cool with it being a module now.

This will still be broken, but in a different place and for different boards. [The legacy_serial.c won't link for 8250=m on FSL boards.]

I think your original fix was closer to the right one. Let me expand
on that. This thing isn't a real stand alone driver. It is an errata
fix that is specific to Freescale boards, and only is relevant in fixing
magic SysRQ functionality on the serial console. The Freescale boards
are almost exclusively headless, with a serial console interface to u-boot as the only way to do initial interaction with the board at bootup. So having serial as a module on these boards is largely academic. (But if you want modular serial, you still can, and you dont need the errata fix for that.)

So, with all that in mind, I think this is the right fix. I'll launch some build coverage against it, but it seems straightforward. Thanks for the report, and sorry for catching pmac in the fallout.

Paul.
---

From 675520f2d175bd71bf857b75a5a9b5a08ee0ee54 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <[email protected]>
Date: Mon, 12 Dec 2011 21:18:15 -0500
Subject: [PATCH] serial: make FSL errata depend on 8250_CONSOLE, not just
8250

The recent commit "serial: add irq handler for Freescale 16550 errata" would allow Kconfig choices that had 8250 support as a module and yet still try and build in the errata fix non-modular, resulting in build failures for some non-embedded PPC targets.

Since we hook in the errata fix from legacy_serial.c, which is built only for PPC_UDBG_16550, and since the errata is only really relevant for SysRQ on serial console, tighten up the dependencies to be exactly that.

We'll get coverage on the relevant Freescale boards because the Kconfig for their CPU types all select the PPC_UDBG_16550 option, and the defconfigs also all select the 8250_CONSOLE option. Also, the 8250_CONSOLE option has a strict dependency on "SERIAL_8250=y" which resolves the reported problem for non Freescale targets.

Reported-by Michael Neuling <[email protected]>

Signed-off-by Paul Gortmaker <[email protected]>

drivers/tty/serial/Kconfig +1 -1

index aa46993..5c46e90 100644
@@ -99,7 +99,7 @@ config SERIAL_8250_PNP
 
 config SERIAL_8250_FSL
 	bool
-	depends on SERIAL_8250 && PPC
+	depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
 	default PPC
 
 config SERIAL_8250_HP300

Signature · 1 line

1.7.7

Michael Neuling

author Tested-by

2011-12-13 02:58 UTC #4 lore raw

Quoted 1 line · In message <[email protected]> you wrote:

[Re: [PATCH] serial: fix Kconfig for Freescale 16550] On 13/12/2011 (Tue 12:5

Quoted 54 lines · 3) Michael Neuling wrote:

Quoted 2 lines
In message <[email protected]> you wrote:
[...]
Quoted 4 lines
Quoted 1 line
Then you can't select SERIAL_8250 as a module at all, right?
Correct, unless SERIAL_8250_FOL=n of course.
Quoted 8 lines
Quoted 3 lines
Perhaps you should allow SERIAL_8250_FSL to be a module as well here? So changing the bool to a tristate should be the correct option? Can you try that?
Yep, that works also. New patch below.
This should probably be aced by Paul to ensure he's cool with it being a module now.
This will still be broken, but in a different place and for different boards. [The legacy_serial.c won't link for 8250=m on FSL boards.]
I think your original fix was closer to the right one. Let me expand
on that. This thing isn't a real stand alone driver. It is an errata
fix that is specific to Freescale boards, and only is relevant in fixing
magic SysRQ functionality on the serial console. The Freescale boards
are almost exclusively headless, with a serial console interface to u-boot as the only way to do initial interaction with the board at bootup. So having serial as a module on these boards is largely academic. (But if you want modular serial, you still can, and you dont need the errata fix for that.)
So, with all that in mind, I think this is the right fix. I'll launch some build coverage against it, but it seems straightforward. Thanks for the report, and sorry for catching pmac in the fallout.
Paul.
---
From 675520f2d175bd71bf857b75a5a9b5a08ee0ee54 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <[email protected]>
Date: Mon, 12 Dec 2011 21:18:15 -0500
Subject: [PATCH] serial: make FSL errata depend on 8250_CONSOLE, not just
8250
The recent commit "serial: add irq handler for Freescale 16550 errata" would allow Kconfig choices that had 8250 support as a module and yet still try and build in the errata fix non-modular, resulting in build failures for some non-embedded PPC targets.
Since we hook in the errata fix from legacy_serial.c, which is built only for PPC_UDBG_16550, and since the errata is only really relevant for SysRQ on serial console, tighten up the dependencies to be exactly that.

Quoted 8 lines

We'll get coverage on the relevant Freescale boards because the Kconfig for their CPU types all select the PPC_UDBG_16550 option, and the defconfigs also all select the 8250_CONSOLE option. Also, the 8250_CONSOLE option has a strict dependency on "SERIAL_8250=y" which resolves the reported problem for non Freescale targets.
Reported-by Michael Neuling <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>

Works here for me (although it still seems like a Kconfig bug).

Tested-by Michael Neuling <[email protected]>

Quoted 17 lines

drivers/tty/serial/Kconfig +1 -1

index aa46993..5c46e90 100644
@@ -99,7 +99,7 @@ config SERIAL_8250_PNP
 
 config SERIAL_8250_FSL
 	bool
-	depends on SERIAL_8250 && PPC
+	depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
 	default PPC
 
 config SERIAL_8250_HP300

Signature · 1 line

1.7.7