From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C0D012EBEA; Tue, 25 Jun 2024 09:42:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719308542; cv=none; b=AL/TbRBrbkIxhA7RsAoyehJm7fKptMtL6n8RJcHbuFOFZ1j6dWCLzl6j+QAO3AI/HMvEKKQcdMF//JQudD3fzJwweGdFFg5MPo5jINqAZXgdtvY5Px9AHBZ7/GL9Jpa0yQm/rnk9wLgtLLA7IUw+J+4JcCpbeiBgl8M1HBwyQtA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719308542; c=relaxed/simple; bh=5UhygooAb0VgqCdRdqAnDrQJqHRU2SrF4LP33d7jhps=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pEIXnBphxZfM67MHRaiyz7o1gUJX1QePE/dkm2SvoyIvuJNL5lmmVKHraITAlzIr5QjmgdQD5N/fG+ROb7FrOkLZYJJCvRvG+BZCuplFfZuN027aKDEKL00Phuqt31R1cqhwe3OOsK753vVBlEpfKONXYzbPceHeClWrDGhXm30= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ok1gkGwL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ok1gkGwL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 970C0C32781; Tue, 25 Jun 2024 09:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719308542; bh=5UhygooAb0VgqCdRdqAnDrQJqHRU2SrF4LP33d7jhps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ok1gkGwLQYfPGfnyJFuL5YlgiQ7F4NZhHbSiBZmZVzbP29lZtzW9pWsPctNTH8ie1 LVMwdkFSp2l/ayoXfPOoCqw2jz08oiwl+WSGCVJbDWURquYZ26bHaOb3Dop/mIbYya MHQmgO7BurSnswtvk9qOSkNeNN+vgEXK+KrubCBM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Peng Fan , Vinod Koul , Sasha Levin Subject: [PATCH 6.9 156/250] dmaengine: fsl-edma: avoid linking both modules Date: Tue, 25 Jun 2024 11:31:54 +0200 Message-ID: <20240625085554.050280324@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240625085548.033507125@linuxfoundation.org> References: <20240625085548.033507125@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit fa555b5026d0bf1ba7c9e645ff75e2725a982631 ] 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 Acked-by: Peng Fan Link: https://lore.kernel.org/r/20240528115440.2965975-1-arnd@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 002a5ec806207..9fc99cfbef08c 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -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.43.0