Skip to contentSkip to conversation

dmaengine: fsl-edma: avoid linking both modules

PATCH Applied Arnd Bergmann 3 participants 3 messages May 28, 2024 – Jun 11, 2024 dmaengine

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 dmaengine: fsl-edma: avoid linking both modules

From: Arnd Bergmann <[email protected]>

Kbuild does not support having a source file compiled multiple times and linked into distinct modules, or built-in and modular at the same time. For fs-edma, there are two common components that are linked into the fsl-edma.ko for Arm and PowerPC, plus the mcf-edma.ko module on Coldfire. This violates the rule for compile-testing:

scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-common.o is added to multiple modules: fsl-edma mcf-edma scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-trace.o is added to multiple modules: fsl-edma mcf-edma

I tried splitting out the common parts into a separate modules, but that adds back the complexity that a cleanup patch removed, and it gets harder with the addition of the tracepoints.

As a minimal workaround, address it at the Kconfig level, by disallowing the broken configurations.

Link https://lore.kernel.org/lkml/[email protected]/ open here
Fixes 66aac8ea0a6c ("dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL in fsl-edma-common.c")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/dma/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/Kconfig +1 -1
index 965fa49668ff..b3873d01a2ab 100644
@@ -394,7 +394,7 @@ config LS2X_APB_DMA
 
 config MCF_EDMA
 	tristate "Freescale eDMA engine support, ColdFire mcf5441x SoCs"
-	depends on M5441x || COMPILE_TEST
+	depends on M5441x || (COMPILE_TEST && FSL_EDMA=n)
 	select DMA_ENGINE
 	select DMA_VIRTUAL_CHANNELS
 	help
Signature · 1 line
2.39.2
Acked-by on v1 1/1
#1 lore raw
Quoted 31 lines

Subject: [PATCH] dmaengine: fsl-edma: avoid linking both modules

From: Arnd Bergmann <[email protected]>

Kbuild does not support having a source file compiled multiple times and linked into distinct modules, or built-in and modular at the same time. For fs- edma, there are two common components that are linked into the fsl- edma.ko for Arm and PowerPC, plus the mcf-edma.ko module on Coldfire. This violates the rule for compile-testing:

scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-common.o is added to multiple modules: fsl-edma mcf-edma scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-trace.o is added to multiple modules: fsl-edma mcf-edma

I tried splitting out the common parts into a separate modules, but that adds back the complexity that a cleanup patch removed, and it gets harder with the addition of the tracepoints.

As a minimal workaround, address it at the Kconfig level, by disallowing the broken configurations.

Link:
https://lore.ke/
rnel.org%2Flkml%2F20240110232255.1099757-1- arnd%40kernel.org%2F&data=05%7C02%7Cpeng.fan%40nxp.com%7Cfb9b0e 6533054fee3d0d08dc7f0cfbe4%7C686ea1d3bc2b4c6fa92cd99c5c301635%7 C0%7C0%7C638524940949353893%7CUnknown%7CTWFpbGZsb3d8eyJWIj oiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0 %7C%7C%7C&sdata=88jDqMK7okvOsZaMXT02p7coSRTr2r%2FArF1rbAp9P4 w%3D&reserved=0

Quoted 3 lines
Fixes 66aac8ea0a6c ("dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL

in fsl-edma-common.c")

Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Peng Fan <[email protected]>
Quoted 19 lines
---
 drivers/dma/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/Kconfig index renamed from drivers/dma/Kconfig +0 -0

965fa49668ff..b3873d01a2ab 100644

drivers/dma/Kconfig +1 -2
@@ -394,7 +394,7 @@ config LS2X_APB_DMA
 
 config MCF_EDMA
      tristate "Freescale eDMA engine support, ColdFire mcf5441x SoCs"
-     depends on M5441x || COMPILE_TEST
+     depends on M5441x || (COMPILE_TEST && FSL_EDMA=n)
      select DMA_ENGINE
      select DMA_VIRTUAL_CHANNELS
      help
--

2.39.2

maintainer Applied
#2 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

Kbuild does not support having a source file compiled multiple times and linked into distinct modules, or built-in and modular at the same time. For fs-edma, there are two common components that are linked into the fsl-edma.ko for Arm and PowerPC, plus the mcf-edma.ko module on Coldfire. This violates the rule for compile-testing:

scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-common.o is added to multiple modules: fsl-edma mcf-edma scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-trace.o is added to multiple modules: fsl-edma mcf-edma

[...]

Applied, thanks!

[1/1] dmaengine: fsl-edma: avoid linking both modules

      commit: fa555b5026d0bf1ba7c9e645ff75e2725a982631

Best regards,

Signature · 1 line
Vinod Koul <[email protected]>