Revert "serial: allow COMPILE_TEST for some drivers" partially

[PATCH] Revert "serial: allow COMPILE_TEST for some drivers" partially

Posted by Jiri Slaby (SUSE) 2 years, 8 months ago

This reverts commit e3e7b13bffae85e2806c73e3ccacd4447bcb19ed partially.
It turns out, the image does not link for CPM:
  powerpc-linux-ld: drivers/tty/serial/cpm_uart/cpm_uart_core.o: in function `cpm_uart_release_port':
  cpm_uart_core.c:(.text+0x598): undefined reference to `cpm_uart_freebuf'

So do not allow compile testing on this driver.

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>
---
 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 398e5aac2e77..3e3fb377d90d 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -762,7 +762,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

Re: [PATCH] Revert "serial: allow COMPILE_TEST for some drivers" partially

Posted by Jiri Slaby 2 years, 8 months ago

Please take these fixes instead:
https://lore.kernel.org/all/20230522082048.21216-1-herve.codina@bootlin.com/

On 18. 05. 23, 7:56, Jiri Slaby (SUSE) wrote:
> This reverts commit e3e7b13bffae85e2806c73e3ccacd4447bcb19ed partially.
> It turns out, the image does not link for CPM:
>    powerpc-linux-ld: drivers/tty/serial/cpm_uart/cpm_uart_core.o: in function `cpm_uart_release_port':
>    cpm_uart_core.c:(.text+0x598): undefined reference to `cpm_uart_freebuf'
> 
> So do not allow compile testing on this driver.
> 
> 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>
> ---
>   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 398e5aac2e77..3e3fb377d90d 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -762,7 +762,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

Re: [PATCH] Revert "serial: allow COMPILE_TEST for some drivers" partially

Posted by Greg KH 2 years, 8 months ago

On Tue, May 23, 2023 at 09:49:30AM +0200, Jiri Slaby wrote:
> Please take these fixes instead:
> https://lore.kernel.org/all/20230522082048.21216-1-herve.codina@bootlin.com/

Will do, thanks.

greg k-h

Re: [PATCH] Revert "serial: allow COMPILE_TEST for some drivers" partially

Posted by Randy Dunlap 2 years, 8 months ago


On 5/17/23 22:56, Jiri Slaby (SUSE) wrote:
> This reverts commit e3e7b13bffae85e2806c73e3ccacd4447bcb19ed partially.
> It turns out, the image does not link for CPM:
>   powerpc-linux-ld: drivers/tty/serial/cpm_uart/cpm_uart_core.o: in function `cpm_uart_release_port':
>   cpm_uart_core.c:(.text+0x598): undefined reference to `cpm_uart_freebuf'
> 
> So do not allow compile testing on this driver.
> 
> 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>

Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Thanks.

> ---
>  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 398e5aac2e77..3e3fb377d90d 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -762,7 +762,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

-- 
~Randy