]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
dmaengine: fsl-edma: avoid linking both modules
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 May 2024 11:54:22 +0000 (13:54 +0200)
committerVinod Koul <vkoul@kernel.org>
Tue, 11 Jun 2024 17:59:23 +0000 (23:29 +0530)
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/20240110232255.1099757-1-arnd@kernel.org/
Fixes: 66aac8ea0a6c ("dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL in fsl-edma-common.c")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20240528115440.2965975-1-arnd@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/Kconfig

index 002a5ec806207ca2614615b37eb1e38303292728..9fc99cfbef08c5bc0fb0218fd8d8ada564daa203 100644 (file)
@@ -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