linux-kernel - Re: [PATCH] m68k: coldfire/device.c: only build FEC when HW macros are defined

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <c767306e-e248-4395-b4ec-2bdfec56ef49@linux-m68k.org>
Date: Mon, 4 Nov 2024 23:39:08 +1000
From: Greg Ungerer <gerg@...ux-m68k.org>
To: Antonio Quartulli <antonio@...delbit.com>
Cc: geert@...ux-m68k.org, linux-m68k@...ts.linux-m68k.org,
 linux-kernel@...r.kernel.org
Subject: Re: [PATCH] m68k: coldfire/device.c: only build FEC when HW macros
 are defined

Hi Antonio,

On 30/10/24 07:43, Antonio Quartulli wrote:
> When CONFIG_FEC is set (due to COMPILE_TEST) along with
> CONFIG_M54xx, coldfire/device.c has compile errors due to
> missing MCFEC_* and MCF_IRQ_FEC_* symbols.
> 
> Make the whole FEC blocks dependent on having the HW macros
> defined, rather than on CONFIG_FEC itself.
> 
> This fix is very similar to commit e6e1e7b19fa1 ("m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined")
> 
> Fixes: b7ce7f0d0efc ("m68knommu: merge common ColdFire FEC platform setup code")
> To: Greg Ungerer <gerg@...ux-m68k.org>
> To: Geert Uytterhoeven <geert@...ux-m68k.org>
> Cc: linux-m68k@...ts.linux-m68k.org
> Cc: linux-kernel@...r.kernel.org
> Signed-off-by: Antonio Quartulli <antonio@...delbit.com>

Thanks, looks good. Applied to the m68knommu git tree, for-next branch.

Regards
Greg


> ---
>   arch/m68k/coldfire/device.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c
> index 7dab46728aed..b6958ec2a220 100644
> --- a/arch/m68k/coldfire/device.c
> +++ b/arch/m68k/coldfire/device.c
> @@ -93,7 +93,7 @@ static struct platform_device mcf_uart = {
>   	.dev.platform_data	= mcf_uart_platform_data,
>   };
>   
> -#if IS_ENABLED(CONFIG_FEC)
> +#ifdef MCFFEC_BASE0
>   
>   #ifdef CONFIG_M5441x
>   #define FEC_NAME	"enet-fec"
> @@ -145,6 +145,7 @@ static struct platform_device mcf_fec0 = {
>   		.platform_data		= FEC_PDATA,
>   	}
>   };
> +#endif /* MCFFEC_BASE0 */
>   
>   #ifdef MCFFEC_BASE1
>   static struct resource mcf_fec1_resources[] = {
> @@ -182,7 +183,6 @@ static struct platform_device mcf_fec1 = {
>   	}
>   };
>   #endif /* MCFFEC_BASE1 */
> -#endif /* CONFIG_FEC */
>   
>   #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
>   /*
> @@ -624,12 +624,12 @@ static struct platform_device mcf_flexcan0 = {
>   
>   static struct platform_device *mcf_devices[] __initdata = {
>   	&mcf_uart,
> -#if IS_ENABLED(CONFIG_FEC)
> +#ifdef MCFFEC_BASE0
>   	&mcf_fec0,
> +#endif
>   #ifdef MCFFEC_BASE1
>   	&mcf_fec1,
>   #endif
> -#endif
>   #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
>   	&mcf_qspi,
>   #endif