2023-05-22 08:38:41

by Herve Codina

Subject: [PATCH 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency

In a COMPILE_TEST configuration, the cpm_uart driver uses symbols from
the cpm_uart_cpm2.c file. This file is compiled only when CONFIG_CPM2 is
set.

Without this dependency, the linker fails with some missing symbols for
COMPILE_TEST configuration that needs SERIAL_CPM without enabling CPM2.

Signed-off-by: Herve Codina <[email protected]>
Reported-by: kernel test robot <[email protected]>
Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Fixes: e3e7b13bffae ("serial: allow COMPILE_TEST for some drivers")
---
drivers/tty/serial/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 625358f44419..68a9d9db9144 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -769,7 +769,7 @@ config SERIAL_PMACZILOG_CONSOLE

config SERIAL_CPM
tristate "CPM SCC/SMC serial port support"
- depends on CPM2 || CPM1 || (PPC32 && COMPILE_TEST)
+ depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST)
select SERIAL_CORE
help
This driver supports the SCC and SMC serial ports on Motorola
--
2.40.1

2023-05-23 08:14:45

by Jiri Slaby

Subject: Re: [PATCH 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency

On 22. 05. 23, 10:20, Herve Codina wrote:
> In a COMPILE_TEST configuration, the cpm_uart driver uses symbols from
> the cpm_uart_cpm2.c file. This file is compiled only when CONFIG_CPM2 is
> set.
>
> Without this dependency, the linker fails with some missing symbols for
> COMPILE_TEST configuration that needs SERIAL_CPM without enabling CPM2.
>
> Signed-off-by: Herve Codina <[email protected]>
> Reported-by: kernel test robot <[email protected]>
> Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> Fixes: e3e7b13bffae ("serial: allow COMPILE_TEST for some drivers")
> ---
> drivers/tty/serial/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 625358f44419..68a9d9db9144 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -769,7 +769,7 @@ config SERIAL_PMACZILOG_CONSOLE
>
> config SERIAL_CPM
> tristate "CPM SCC/SMC serial port support"
> - depends on CPM2 || CPM1 || (PPC32 && COMPILE_TEST)
> + depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST)

Actually, does this makes sense? I mean, the last part after "||" is now
superfluous and doesn't help anything, right?

> select SERIAL_CORE
> help
> This driver supports the SCC and SMC serial ports on Motorola

--
js

2023-05-23 09:05:48

by Herve Codina

Subject: Re: [PATCH 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency

On Tue, 23 May 2023 09:52:00 +0200
Jiri Slaby <[email protected]> wrote:

> On 22. 05. 23, 10:20, Herve Codina wrote:
> > In a COMPILE_TEST configuration, the cpm_uart driver uses symbols from
> > the cpm_uart_cpm2.c file. This file is compiled only when CONFIG_CPM2 is
> > set.
> >
> > Without this dependency, the linker fails with some missing symbols for
> > COMPILE_TEST configuration that needs SERIAL_CPM without enabling CPM2.
> >
> > Signed-off-by: Herve Codina <[email protected]>
> > Reported-by: kernel test robot <[email protected]>
> > Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> > Fixes: e3e7b13bffae ("serial: allow COMPILE_TEST for some drivers")
> > ---
> > drivers/tty/serial/Kconfig | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> > index 625358f44419..68a9d9db9144 100644
> > --- a/drivers/tty/serial/Kconfig
> > +++ b/drivers/tty/serial/Kconfig
> > @@ -769,7 +769,7 @@ config SERIAL_PMACZILOG_CONSOLE
> >
> > config SERIAL_CPM
> > tristate "CPM SCC/SMC serial port support"
> > - depends on CPM2 || CPM1 || (PPC32 && COMPILE_TEST)
> > + depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST)
>
> Actually, does this makes sense? I mean, the last part after "||" is now
> superfluous and doesn't help anything, right?

Indeed, I will remove all the (PPC32 && CPM2 && COMPILE_TEST) in the next
iteration.
I will also remove the '#elif defined(CONFIG_COMPILE_TEST)' case in the
cpm_uart.h file.

Best regards,
Hervé

>
> > select SERIAL_CORE
> > help
> > This driver supports the SCC and SMC serial ports on Motorola
>