* [PATCH v2 0/2] Fix COMPILE_TEST dependencies for CPM uart, TSA and QMC
@ 2023-05-23 8:59 Herve Codina
2023-05-23 8:59 ` [PATCH v2 1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST Herve Codina
2023-05-23 8:59 ` [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency Herve Codina
0 siblings, 2 replies; 6+ messages in thread
From: Herve Codina @ 2023-05-23 8:59 UTC (permalink / raw)
To: Herve Codina, Qiang Zhao, Li Yang, Greg Kroah-Hartman, Jiri Slaby
Cc: linuxppc-dev, linux-arm-kernel, linux-kernel, linux-serial,
Mark Brown, Christophe Leroy, Thomas Petazzoni
This series fixes issues raised by the kernel test robot
https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/
In COMPILE_TEST configurations, TSA and QMC need CONFIG_CPM to be set in
order to compile and CPM uart needs CONFIG_CPM2.
Compare to the previous iteration
https://lore.kernel.org/linux-kernel/20230522082048.21216-1-herve.codina@bootlin.com/
this v2 series fully removes COMPILE_TEST from the CPM uart
dependencies.
Best regards,
Hervé
Changes v1 -> v2
- Patch 2
Remove COMPILE_TEST dependency
Herve Codina (2):
soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST
serial: cpm_uart: Fix a COMPILE_TEST dependency
drivers/soc/fsl/qe/Kconfig | 4 ++--
drivers/tty/serial/Kconfig | 2 +-
drivers/tty/serial/cpm_uart/cpm_uart.h | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
--
2.40.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST
2023-05-23 8:59 [PATCH v2 0/2] Fix COMPILE_TEST dependencies for CPM uart, TSA and QMC Herve Codina
@ 2023-05-23 8:59 ` Herve Codina
2023-05-25 16:26 ` Randy Dunlap
2023-05-23 8:59 ` [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency Herve Codina
1 sibling, 1 reply; 6+ messages in thread
From: Herve Codina @ 2023-05-23 8:59 UTC (permalink / raw)
To: Herve Codina, Qiang Zhao, Li Yang, Greg Kroah-Hartman, Jiri Slaby
Cc: linuxppc-dev, linux-arm-kernel, linux-kernel, linux-serial,
Mark Brown, Christophe Leroy, Thomas Petazzoni,
kernel test robot
In order to compile tsa.c and qmc.c, CONFIG_CPM must be set.
Without this dependency, the linker fails with some missing
symbols for COMPILE_TEST configurations that need QMC without
enabling CPM.
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/
---
drivers/soc/fsl/qe/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig
index 7268c2fbcbc1..e0d096607fef 100644
--- a/drivers/soc/fsl/qe/Kconfig
+++ b/drivers/soc/fsl/qe/Kconfig
@@ -36,7 +36,7 @@ config UCC
config CPM_TSA
tristate "CPM TSA support"
depends on OF && HAS_IOMEM
- depends on CPM1 || COMPILE_TEST
+ depends on CPM1 || (CPM && COMPILE_TEST)
help
Freescale CPM Time Slot Assigner (TSA)
controller.
@@ -47,7 +47,7 @@ config CPM_TSA
config CPM_QMC
tristate "CPM QMC support"
depends on OF && HAS_IOMEM
- depends on CPM1 || (FSL_SOC && COMPILE_TEST)
+ depends on CPM1 || (FSL_SOC && CPM && COMPILE_TEST)
depends on CPM_TSA
help
Freescale CPM QUICC Multichannel Controller
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency
2023-05-23 8:59 [PATCH v2 0/2] Fix COMPILE_TEST dependencies for CPM uart, TSA and QMC Herve Codina
2023-05-23 8:59 ` [PATCH v2 1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST Herve Codina
@ 2023-05-23 8:59 ` Herve Codina
2023-05-23 9:13 ` Jiri Slaby
1 sibling, 1 reply; 6+ messages in thread
From: Herve Codina @ 2023-05-23 8:59 UTC (permalink / raw)
To: Herve Codina, Qiang Zhao, Li Yang, Greg Kroah-Hartman, Jiri Slaby
Cc: linuxppc-dev, linux-arm-kernel, linux-kernel, linux-serial,
Mark Brown, Christophe Leroy, Thomas Petazzoni,
kernel test robot
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.
This lead to:
depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST)
This dependency does not make sense anymore and can be simplified
removing all the COMPILE_TEST part.
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/
Fixes: e3e7b13bffae ("serial: allow COMPILE_TEST for some drivers")
---
drivers/tty/serial/Kconfig | 2 +-
drivers/tty/serial/cpm_uart/cpm_uart.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 625358f44419..de092bc1289e 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
select SERIAL_CORE
help
This driver supports the SCC and SMC serial ports on Motorola
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
index 0577618e78c0..46c03ed71c31 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart.h
+++ b/drivers/tty/serial/cpm_uart/cpm_uart.h
@@ -19,8 +19,6 @@ struct gpio_desc;
#include "cpm_uart_cpm2.h"
#elif defined(CONFIG_CPM1)
#include "cpm_uart_cpm1.h"
-#elif defined(CONFIG_COMPILE_TEST)
-#include "cpm_uart_cpm2.h"
#endif
#define SERIAL_CPM_MAJOR 204
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency
2023-05-23 8:59 ` [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency Herve Codina
@ 2023-05-23 9:13 ` Jiri Slaby
2023-05-23 9:27 ` Herve Codina
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Slaby @ 2023-05-23 9:13 UTC (permalink / raw)
To: Herve Codina, Qiang Zhao, Li Yang, Greg Kroah-Hartman
Cc: linuxppc-dev, linux-arm-kernel, linux-kernel, linux-serial,
Mark Brown, Christophe Leroy, Thomas Petazzoni,
kernel test robot
On 23. 05. 23, 10:59, 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.
>
> This lead to:
> depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST)
>
> This dependency does not make sense anymore and can be simplified
> removing all the COMPILE_TEST part.
Then it's the same as my revert:
https://lore.kernel.org/all/20230518055620.29957-1-jirislaby@kernel.org/
:D
But nevermind.
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/
> Fixes: e3e7b13bffae ("serial: allow COMPILE_TEST for some drivers")
> ---
> drivers/tty/serial/Kconfig | 2 +-
> drivers/tty/serial/cpm_uart/cpm_uart.h | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 625358f44419..de092bc1289e 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
> select SERIAL_CORE
> help
> This driver supports the SCC and SMC serial ports on Motorola
> diff --git a/drivers/tty/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
> index 0577618e78c0..46c03ed71c31 100644
> --- a/drivers/tty/serial/cpm_uart/cpm_uart.h
> +++ b/drivers/tty/serial/cpm_uart/cpm_uart.h
> @@ -19,8 +19,6 @@ struct gpio_desc;
> #include "cpm_uart_cpm2.h"
> #elif defined(CONFIG_CPM1)
> #include "cpm_uart_cpm1.h"
> -#elif defined(CONFIG_COMPILE_TEST)
> -#include "cpm_uart_cpm2.h"
> #endif
>
> #define SERIAL_CPM_MAJOR 204
--
js
suse labs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency
2023-05-23 9:13 ` Jiri Slaby
@ 2023-05-23 9:27 ` Herve Codina
0 siblings, 0 replies; 6+ messages in thread
From: Herve Codina @ 2023-05-23 9:27 UTC (permalink / raw)
To: Jiri Slaby
Cc: Qiang Zhao, Li Yang, Greg Kroah-Hartman, linuxppc-dev,
linux-arm-kernel, linux-kernel, linux-serial, Mark Brown,
Christophe Leroy, Thomas Petazzoni, kernel test robot
On Tue, 23 May 2023 11:13:02 +0200
Jiri Slaby <jirislaby@kernel.org> wrote:
> On 23. 05. 23, 10:59, 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.
> >
> > This lead to:
> > depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST)
> >
> > This dependency does not make sense anymore and can be simplified
> > removing all the COMPILE_TEST part.
>
> Then it's the same as my revert:
> https://lore.kernel.org/all/20230518055620.29957-1-jirislaby@kernel.org/
>
> :D
>
> But nevermind.
Sorry, I didn't look at your revert.
Do you want a new iteration adding (same as your revert) ?
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Best regards,
Hervé
>
> > Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> > Reported-by: kernel test robot <lkp@intel.com>
> > Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/
> > Fixes: e3e7b13bffae ("serial: allow COMPILE_TEST for some drivers")
> > ---
> > drivers/tty/serial/Kconfig | 2 +-
> > drivers/tty/serial/cpm_uart/cpm_uart.h | 2 --
> > 2 files changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> > index 625358f44419..de092bc1289e 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
> > select SERIAL_CORE
> > help
> > This driver supports the SCC and SMC serial ports on Motorola
> > diff --git a/drivers/tty/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
> > index 0577618e78c0..46c03ed71c31 100644
> > --- a/drivers/tty/serial/cpm_uart/cpm_uart.h
> > +++ b/drivers/tty/serial/cpm_uart/cpm_uart.h
> > @@ -19,8 +19,6 @@ struct gpio_desc;
> > #include "cpm_uart_cpm2.h"
> > #elif defined(CONFIG_CPM1)
> > #include "cpm_uart_cpm1.h"
> > -#elif defined(CONFIG_COMPILE_TEST)
> > -#include "cpm_uart_cpm2.h"
> > #endif
> >
> > #define SERIAL_CPM_MAJOR 204
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST
2023-05-23 8:59 ` [PATCH v2 1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST Herve Codina
@ 2023-05-25 16:26 ` Randy Dunlap
0 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2023-05-25 16:26 UTC (permalink / raw)
To: Herve Codina, Qiang Zhao, Li Yang, Greg Kroah-Hartman, Jiri Slaby
Cc: linuxppc-dev, linux-arm-kernel, linux-kernel, linux-serial,
Mark Brown, Christophe Leroy, Thomas Petazzoni,
kernel test robot
On 5/23/23 01:59, Herve Codina wrote:
> In order to compile tsa.c and qmc.c, CONFIG_CPM must be set.
>
> Without this dependency, the linker fails with some missing
> symbols for COMPILE_TEST configurations that need QMC without
> enabling CPM.
>
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/
Fixes all of my CPM build issues. (with patch 2/2 also applied)
Thanks.
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> ---
> drivers/soc/fsl/qe/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig
> index 7268c2fbcbc1..e0d096607fef 100644
> --- a/drivers/soc/fsl/qe/Kconfig
> +++ b/drivers/soc/fsl/qe/Kconfig
> @@ -36,7 +36,7 @@ config UCC
> config CPM_TSA
> tristate "CPM TSA support"
> depends on OF && HAS_IOMEM
> - depends on CPM1 || COMPILE_TEST
> + depends on CPM1 || (CPM && COMPILE_TEST)
> help
> Freescale CPM Time Slot Assigner (TSA)
> controller.
> @@ -47,7 +47,7 @@ config CPM_TSA
> config CPM_QMC
> tristate "CPM QMC support"
> depends on OF && HAS_IOMEM
> - depends on CPM1 || (FSL_SOC && COMPILE_TEST)
> + depends on CPM1 || (FSL_SOC && CPM && COMPILE_TEST)
> depends on CPM_TSA
> help
> Freescale CPM QUICC Multichannel Controller
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-25 16:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-23 8:59 [PATCH v2 0/2] Fix COMPILE_TEST dependencies for CPM uart, TSA and QMC Herve Codina
2023-05-23 8:59 ` [PATCH v2 1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST Herve Codina
2023-05-25 16:26 ` Randy Dunlap
2023-05-23 8:59 ` [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency Herve Codina
2023-05-23 9:13 ` Jiri Slaby
2023-05-23 9:27 ` Herve Codina
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).