Received-SPF: pass (google.com: domain of linux-kernel+bounces-178938-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 14 May 2024 12:16:09 -0400
From: Frank Li <Frank.li@nxp.com>
To: Angelo Dureghello <angelo@kernel-space.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
	Vinod Koul <vkoul@kernel.org>,
	"open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM" <dmaengine@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>,
	"open list:FREESCALE eDMA DRIVER" <imx@lists.linux.dev>,
	Greg Ungerer <gerg@linux-m68k.org>,
	linux-m68k <linux-m68k@lists.linux-m68k.org>
Subject: Re: [PATCH 1/1] dmaengine: fsl-edma: merge mcf-edma into fsl-edma
 driver
Message-ID: <ZkOOSRMxX8MAO/3W@lizhi-Precision-Tower-5810>
References: <20240509193517.3571694-1-Frank.Li@nxp.com>
 <CAMuHMdVB2PrkxDMoo0y1y6SLj-yuW5o+PJ+sQn2VtB2yrXzkbw@mail.gmail.com>
 <bd538260-2403-4912-961c-549c74aead76@kernel-space.org>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <bd538260-2403-4912-961c-549c74aead76@kernel-space.org>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?M1o3L3NEUEpML0l0Z0Npd2xpanZGR1dkb25lRVpRcHc1cm1md0FmMEFvd0N0?=
 =?utf-8?B?anBrVlpENHRIQ1ZmRncvU05xUXhiK1lTSEdBZEZvdkl1TEN5UjE3eVE4aTF6?=
 =?utf-8?B?T1BYZG9RT2xzUUFOeElveExac3Mvd2JscjBXU3JXdzNyUGVveWh1Q3Bsc0ds?=
 =?utf-8?B?VW10bkJEMW40czZFWlJDVkdkK2ROZWx3TGQwMEE1WWpSUWk5UmxkSVpubXlV?=
 =?utf-8?B?ZmdZZEY4SmxjaEVRRTFRLzhSYUVCMFpITjJmdVZxWkUvZ1NZaG9LMk5yOUtq?=
 =?utf-8?B?TGVTZWVlRW90TmtxZkRiTGJ2MFE4SVdqZ3hSU0JoRlM3QyttLzFkbStNdG16?=
 =?utf-8?B?M2xZQUhmQnZNekNUd2pMd2dHcWhSNklib0J5dEdWYW5QdmJSOU1JYmVWMlJD?=
 =?utf-8?B?QVhrQVd4Zmx4Q3dGdTBtUUhaNmcyNm5lSS82WjhncEVHUEI4ZW1kUlZ5V1Zi?=
 =?utf-8?B?eTdvMktJejFuMzJYTTdYNisvY0FObS84YlFkOHRIajFreGVZN2FUZzNSZzRV?=
 =?utf-8?B?QWpNcjZSNVNncno3MEJqSUFSblEyam1QWFRaL3VjV0xVc3BaTi85VDU4NXNJ?=
 =?utf-8?B?MExuR0RpY21MTjVOdHlkcFNrMmwrZXNJNHVnS25wcnhDaFU4dFo3Z1JuVkJC?=
 =?utf-8?B?TmF4MXp2cXlFNlgraVdHaUY4Yit1QWQvUDRaWHpncW9JNjlJTWdQUFpNWTJM?=
 =?utf-8?B?WWlxb1o1aEpRTzJvMnZUTTlVMHlySEF4RjVrVCtld2pkZFNYN0FzdVdsR3dj?=
 =?utf-8?B?eXI1d2hFOXZVendmR3BzUktHdUZxTWpRRHljQU8waVdVRFpzMzRGdWVqcUJD?=
 =?utf-8?B?a2VwU2I4UktrTzZ4dEhjaEhuTkRDUUpaYm9lUEhrQ2l5c0Jzd3h1M0swMUwz?=
 =?utf-8?B?d3NibERVZWVSTE5LZHBGakM0NW5sQnFDMzNiRENTUUJGb1o1YmNCWktYTnIx?=
 =?utf-8?B?dVZPK054SjMvNnMxVGN5ZXhJQUgvUTM5VWNYckt6TFBvRnlsM0tjNlpyVGJL?=
 =?utf-8?B?cjhyVEdzK3pGQ1lPeCt5Z3lCOXpvclVTTjQ5SGVnREpISWZGdE1iYVRaYjJz?=
 =?utf-8?B?WUNxR0sxVmJlRTdVS2RRbXRkQnNra2pudFpqeWZadjF6N0VHclFMcVdrcGN5?=
 =?utf-8?B?dXZ3RksxNW15ZzA2L0l1cHYzeGU5dHBFUk1ROTJmQ3p2MURzVGFTZUlXeE44?=
 =?utf-8?B?TXhxakdsZ3h5dzdScWFqVjEvK2c5aExvRDZEcUEybC9QaGZJSnpMWnRXY04y?=
 =?utf-8?B?SFlGNDYrVTM2MlZoV3RJNi9MbFY2Sk1LeVEyNE9tckJ4N2pKdHZwaTdKamww?=
 =?utf-8?B?eEFRbG1KYXBJV3c0WHVKZ1RmL3R0SkUzNnlGQ1RwYjNZK3RlL2RqWmduTjU3?=
 =?utf-8?B?SHN2ODlFcFNCUDJ6aDRYQWxJVHNvRDRoQ3p3Z0Y3L2h6QTl1NHZnRGxUbHNB?=
 =?utf-8?B?L1N2STlwVjZJQlZ3UGZ1cW1Nb21DZjJ4aWh1ZytWWGY2TnRrNFBNSGJYWlgx?=
 =?utf-8?B?aElCbzFkKy9xLy96Z2VVTDMrU3pPZitEY1NWb2s0clZNanZMeGNnSGdQblkz?=
 =?utf-8?B?YW5INERlWjdvdDdHSERmUzMwbld0V2JwZXRtUG1wZXZsbUtWVCtJQ1NzRWsv?=
 =?utf-8?B?djlBdUhNbVpMeTBoZzhha2pKMldkcnpxSUxveXlURER5SVVOUWFhblVYekRX?=
 =?utf-8?B?NXJXOEpRN2lINnBnOFNoYVFENFZ2ZWFrbXI4K0RNRjcrYllmWnNIZSthTTla?=
 =?utf-8?B?N0JqdEVYNU54OW9lL0lQUnBwS0xIZ0lJb0JXaWV0RlZId3dLY2dpb0pNcHlZ?=
 =?utf-8?B?bjRnUDlPVFBzUk94cThpa2taSzdVTG0xUjhYR3VFd2NyUGxXTVU3bkV3NWZi?=
 =?utf-8?B?SjRObkV2NVRBNmY4Smd2ZUphRFZXM0p4Y0ZNanNGUlRPdUZ0OVQzYVF3dk8r?=
 =?utf-8?B?dHNXREtjRllQaDA2Q1BJK294KzRJbkFFZk5objFGekRnMnJISnFmWVBTUzg3?=
 =?utf-8?B?NmExMzZLU0VBdU81V0podS82RXdCYzU0Y0NiUThYaUxSMGxEc29ndTRsdDdl?=
 =?utf-8?B?WUN4T0pzcWRYb1RiTTBzM0lYUzd1NjU4TjJ3ZnhuUlVlRlcvYWYyK25sWnFi?=
 =?utf-8?Q?0RJyP1yYvVKrB5FaYzxPU1+23?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 096aa94e-5152-4610-e98e-08dc74312ec8
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2024 16:16:17.6372
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jcNLYK2GTP7GT3hmp68/6m9iUYcXCmdeEjnYYi27vvdw8anv3soC1mjPE8jzTd7D84Hn3UDJRjP/qG9tptjeQA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR04MB10887

On Tue, May 14, 2024 at 09:57:09AM +0200, Angelo Dureghello wrote:
> Hi,
> 
> On 13/05/24 8:12 PM, Geert Uytterhoeven wrote:
> > CC coldfire
> > 
> > On Thu, May 9, 2024 at 9:35 PM Frank Li <Frank.Li@nxp.com> wrote:
> > > MCF eDMA are almost the same as FSL eDMA driver. Previously link to two
> > > kernel modules, fsl-edma.ko and mcf-edma.ko. These are not problem because
> > > mcf-edma is for m68k ARCH and FSL eDMA is for arm/arm64 ARCH. But often
> > > build both at PPC ARCH. It also makes sense to build two drivers at the
> > > same time. It causes many build warning because share a fsl-edma-common.o.
> > > such as:
> > > 
> > >     powerpc64le-linux-ld: warning: orphan section `.stubs' from `drivers/dma/fsl-edma-common.o' being placed in section `.stubs'
> > >     powerpc64le-linux-ld: warning: orphan section `.stubs' from `drivers/dma/fsl-edma-trace.o' being placed in section `.stubs'
> > > 
> > > Merge mcf-edma into fsl-edma driver. So use one driver (fsl-edma.ko) for
> > > MCF and FSL eDMA.
> > > 
> > > mcf-edma.ko should be replaced by fsl-edma.ko in modules, minimizing user
> > > space impact because MCF eDMA remains confined to legacy ColdFire mcf5441x
> > > production and mcf5441x has been in production for at least a decade and
> > > NXP has long ceased ColdFire development.
> 
> when i developed mcf-edma, i tried to modify fsl-edma first. Modules are
> similar but there are various edma IP versions, and i remember minimal
> differences in the CF version too, some register bits and, of course,
> endianness.
> 
> If a merge is possible, welcome, i have here mcf5441x, can give a try to
> this patch as soon as i can.

Thanks. I am not sure if recent eDMAv3 and eDMAv5 patch impact mcf5441.
eDMAv3 is quite big change. If you can test on mcf5441x, can I send to you
a futher clean up for mcf5441x? This patch are just simple glue two
driver together to avoid a build warning. 

> 
> 
> > > Update Kconfig to make MCF_EDMA as feature of FSL_EDMA and change Makefile
> > > to link mcl-edma-main.o to fsl-edma.o.
> > > 
> > > Create a common module init/exit functions, which call original's
> > > fsl-edma-init[exit]() and mcf-edma-init[exit]().
> > > 
> > > Reported-by: kernel test robot <lkp@intel.com>
> > > Closes: https://lore.kernel.org/oe-kbuild-all/202405082029.Es9umH7n-lkp@intel.com/
> > > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> > > ---
> > >   drivers/dma/Kconfig           |  8 ++++----
> > >   drivers/dma/Makefile          |  5 ++---
> > >   drivers/dma/fsl-edma-common.c | 28 ++++++++++++++++++++++++++++
> > >   drivers/dma/fsl-edma-common.h |  5 +++++
> > >   drivers/dma/fsl-edma-main.c   |  6 ++----
> > >   drivers/dma/mcf-edma-main.c   |  6 ++----
> > >   6 files changed, 43 insertions(+), 15 deletions(-)
> > > 
> > > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> > > index 002a5ec806207..45110520f6e68 100644
> > > --- a/drivers/dma/Kconfig
> > > +++ b/drivers/dma/Kconfig
> > > @@ -393,14 +393,14 @@ config LS2X_APB_DMA
> > >            It does not support memory to memory data transfer.
> > > 
> > >   config MCF_EDMA
> > > -       tristate "Freescale eDMA engine support, ColdFire mcf5441x SoCs"
> > > +       bool "Freescale eDMA engine support, ColdFire mcf5441x SoCs"
> > >          depends on M5441x || COMPILE_TEST
> > >          select DMA_ENGINE
> > >          select DMA_VIRTUAL_CHANNELS
> > >          help
> > > -         Support the Freescale ColdFire eDMA engine, 64-channel
> > > -         implementation that performs complex data transfers with
> > > -         minimal intervention from a host processor.
> > > +         Support the Freescale ColdFire eDMA engine in FSL_EDMA driver,
> > > +         64-channel implementation that performs complex data transfers
> > > +         with minimal intervention from a host processor.
> > >            This module can be found on Freescale ColdFire mcf5441x SoCs.
> > > 
> > >   config MILBEAUT_HDMAC
> > > diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
> > > index 802ca916f05f5..0000922c7cbfe 100644
> > > --- a/drivers/dma/Makefile
> > > +++ b/drivers/dma/Makefile
> > > @@ -33,11 +33,10 @@ obj-$(CONFIG_DW_EDMA) += dw-edma/
> > >   obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o
> > >   fsl-edma-trace-$(CONFIG_TRACING) := fsl-edma-trace.o
> > >   CFLAGS_fsl-edma-trace.o := -I$(src)
> > > +mcf-edma-main-$(CONFIG_MCF_EDMA) := mcf-edma-main.o
> > >   obj-$(CONFIG_FSL_DMA) += fsldma.o
> > > -fsl-edma-objs := fsl-edma-main.o fsl-edma-common.o ${fsl-edma-trace-y}
> > > +fsl-edma-objs := fsl-edma-main.o fsl-edma-common.o ${fsl-edma-trace-y} ${mcf-edma-main-y}
> > >   obj-$(CONFIG_FSL_EDMA) += fsl-edma.o
> > > -mcf-edma-objs := mcf-edma-main.o fsl-edma-common.o ${fsl-edma-trace-y}
> > > -obj-$(CONFIG_MCF_EDMA) += mcf-edma.o
> > >   obj-$(CONFIG_FSL_QDMA) += fsl-qdma.o
> > >   obj-$(CONFIG_FSL_RAID) += fsl_raid.o
> > >   obj-$(CONFIG_HISI_DMA) += hisi_dma.o
> > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
> > > index 3af4307873157..ac04a2ce4fa1f 100644
> > > --- a/drivers/dma/fsl-edma-common.c
> > > +++ b/drivers/dma/fsl-edma-common.c
> > > @@ -888,4 +888,32 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma)
> > >          }
> > >   }
> > > 
> > > +static int __init fsl_edma_common_init(void)
> > > +{
> > > +       int ret;
> > > +
> > > +       ret = fsl_edma_init();
> > > +       if (ret)
> > > +               return ret;
> > > +
> > > +#ifdef CONFIG_MCF_EDMA
> > > +       ret = mcf_edma_init();
> > > +       if (ret)
> > > +               return ret;
> > > +#endif
> > > +       return 0;
> > > +}
> > > +
> > > +subsys_initcall(fsl_edma_common_init);
> > > +
> > > +static void __exit fsl_edma_common_exit(void)
> > > +{
> > > +       fsl_edma_exit();
> > > +
> > > +#ifdef CONFIG_MCF_EDMA
> > > +       mcf_edma_exit();
> > > +#endif
> > > +}
> > > +module_exit(fsl_edma_common_exit);
> > > +
> > >   MODULE_LICENSE("GPL v2");
> > > diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
> > > index ac66222c16040..dfbdcc922ceea 100644
> > > --- a/drivers/dma/fsl-edma-common.h
> > > +++ b/drivers/dma/fsl-edma-common.h
> > > @@ -488,4 +488,9 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan);
> > >   void fsl_edma_cleanup_vchan(struct dma_device *dmadev);
> > >   void fsl_edma_setup_regs(struct fsl_edma_engine *edma);
> > > 
> > > +int __init fsl_edma_init(void);
> > > +void __exit fsl_edma_exit(void);
> > > +int __init mcf_edma_init(void);
> > > +void __exit mcf_edma_exit(void);
> > > +
> > >   #endif /* _FSL_EDMA_COMMON_H_ */
> > > diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
> > > index 391e4f13dfeb0..a1c3c4ed869c5 100644
> > > --- a/drivers/dma/fsl-edma-main.c
> > > +++ b/drivers/dma/fsl-edma-main.c
> > > @@ -724,17 +724,15 @@ static struct platform_driver fsl_edma_driver = {
> > >          .remove_new     = fsl_edma_remove,
> > >   };
> > > 
> > > -static int __init fsl_edma_init(void)
> > > +int __init fsl_edma_init(void)
> > >   {
> > >          return platform_driver_register(&fsl_edma_driver);
> > >   }
> > > -subsys_initcall(fsl_edma_init);
> > > 
> > > -static void __exit fsl_edma_exit(void)
> > > +void __exit fsl_edma_exit(void)
> > >   {
> > >          platform_driver_unregister(&fsl_edma_driver);
> > >   }
> > > -module_exit(fsl_edma_exit);
> > > 
> > >   MODULE_ALIAS("platform:fsl-edma");
> > >   MODULE_DESCRIPTION("Freescale eDMA engine driver");
> > > diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c
> > > index 78c606f6d0026..d97991a1e9518 100644
> > > --- a/drivers/dma/mcf-edma-main.c
> > > +++ b/drivers/dma/mcf-edma-main.c
> > > @@ -284,17 +284,15 @@ bool mcf_edma_filter_fn(struct dma_chan *chan, void *param)
> > >   }
> > >   EXPORT_SYMBOL(mcf_edma_filter_fn);
> > > 
> > > -static int __init mcf_edma_init(void)
> > > +int __init mcf_edma_init(void)
> > >   {
> > >          return platform_driver_register(&mcf_edma_driver);
> > >   }
> > > -subsys_initcall(mcf_edma_init);
> > > 
> > > -static void __exit mcf_edma_exit(void)
> > > +void __exit mcf_edma_exit(void)
> > >   {
> > >          platform_driver_unregister(&mcf_edma_driver);
> > >   }
> > > -module_exit(mcf_edma_exit);
> > > 
> > >   MODULE_ALIAS("platform:mcf-edma");
> > >   MODULE_DESCRIPTION("Freescale eDMA engine driver, ColdFire family");
> > > --
> > > 2.34.1
> 
> Regards,
> angelo
> 
>