From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v8,1/3] dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended) From: Angelo Dureghello Message-Id: <20180806204021.GC6092@jerusalem> Date: Mon, 6 Aug 2018 22:40:21 +0200 To: Krzysztof Kozlowski Cc: vinod.koul@linaro.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@vger.kernel.org, Stefan Agner List-ID: SGkgS3J6eXN6dG9mLAoKT24gTW9uLCBBdWcgMDYsIDIwMTggYXQgMDk6NDM6NDJBTSArMDIwMCwg S3J6eXN6dG9mIEtvemxvd3NraSB3cm90ZToKPiBPbiAzIEF1Z3VzdCAyMDE4IGF0IDIxOjMyLCBB bmdlbG8gRHVyZWdoZWxsbyA8YW5nZWxvQHN5c2FtLml0PiB3cm90ZToKPiA+IFRoaXMgcGF0Y2gg YWRkcyBhIG5ldyBmc2wtZWRtYS1jb21tb24gbW9kdWxlIHRvIGFsbG93IG5ldwo+ID4gbWNmLWVk bWEgbW9kdWxlIGNvZGUgdG8gdXNlIG1vc3Qgb2YgdGhlIGZzbC1lZG1hIGNvZGUuCj4gPgo+ID4g U2lnbmVkLW9mZi1ieTogQW5nZWxvIER1cmVnaGVsbG8gPGFuZ2Vsb0BzeXNhbS5pdD4KPiA+IC0t LQo+ID4gQ2hhbmdlcyBmb3IgdjI6Cj4gPiAtIHBhdGNoIHNwbGl0dGVkIGludG8gNAo+ID4gLSBh ZGQgbWNmLWVkbWEgYXMgbWluaW1hbCBkaWZmZXJlbnQgcGFydHMgZnJvbSBmc2wtZWRtYQo+ID4K PiA+IENoYW5nZXMgZm9yIHYzOgo+ID4gbm9uZQo+ID4KPiA+IENoYW5nZXMgZm9yIHY0Ogo+ID4g LSBwYXRjaCBzaW1wbGlmaWVkIGZyb20gNC80IGludG8gMi8yCj4gPiAtIGNvbGxlY3RpbmcgYWxs IHRoZSBtY2YtZWRtYS1yZWxhdGVkIGNoYW5nZXMKPiA+Cj4gPiBDaGFuZ2VzIGZvciB2NToKPiA+ IG5vbmUKPiA+Cj4gPiBDaGFuZ2VzIGZvciB2NjoKPiA+IC0gYWRqdXN0ZWQgY29tbWVudCBoZWFk ZXIKPiA+IC0gZml4ZWQgYml0IHNoaWZ0IHdpdGggQklUKCkKPiA+IC0gd2UgbmVlZCB0byBmcmVl IHRoZSBpbnRlcnJ1cHRzIGF0IHJlbW92ZSgpLCBzbyByZW1vdmVkIGFsbCBkZXZtXwo+ID4gICBp bnRlcnJ1cHQgcmVsYXRlZCBjYWxscwo+ID4KPiA+IENoYW5nZXMgZm9yIHY3Ogo+ID4gbm9uZQo+ ID4KPiA+IENoYW5nZXMgZm9yIHY4Ogo+ID4gLSBwYXRjaCByZXdyaXR0ZW4gZnJvbSBzY3JhdGNo LCBzcGxpdHRlZCBpbnRvIDMsIGNvbW1vbiBjb2RlIGlzb2xhdGVkLAo+ID4gICBtaW5pbWFsIGNo YW5nZXMgZnJvbSB0aGUgb3JpZ2luYWwgRnJlZXNjYWxlIGNvZGUgaGF2ZSBiZWVuIGRvbmUuCj4g PiAgIFRoZSBwYXRjaCBoYXMgYmVlbiB0ZXN0ZWQgd2l0aCBib3RoIElyaXMgKyBDb2xpYnJpIFZ5 YnJpZCBWRjUwIGFuZAo+ID4gICBzdG1hcmsyL21jZjU0NDE1IENvbGRmaXJlIGJvYXJkcy4KPiA+ IC0tLQo+ID4gIGRyaXZlcnMvZG1hL01ha2VmaWxlICAgICAgICAgIHwgICAyICstCj4gPiAgZHJp dmVycy9kbWEvZnNsLWVkbWEtY29tbW9uLmMgfCA1NzYgKysrKysrKysrKysrKysrKysrKysrKysr KysrKwo+ID4gIGRyaXZlcnMvZG1hL2ZzbC1lZG1hLWNvbW1vbi5oIHwgMTk2ICsrKysrKysrKysK PiA+ICBkcml2ZXJzL2RtYS9mc2wtZWRtYS5jICAgICAgICB8IDY5NyArLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCj4gPiAgNCBmaWxlcyBjaGFuZ2VkLCA3NzQgaW5zZXJ0aW9ucygr KSwgNjk3IGRlbGV0aW9ucygtKQo+ID4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2RtYS9m c2wtZWRtYS1jb21tb24uYwo+ID4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2RtYS9mc2wt ZWRtYS1jb21tb24uaAo+ID4KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS9NYWtlZmlsZSBi L2RyaXZlcnMvZG1hL01ha2VmaWxlCj4gPiBpbmRleCAyMDNhOTlkNjgzMTUuLjY2MDIyZjU5ZmNh NCAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZG1hL01ha2VmaWxlCj4gPiArKysgYi9kcml2ZXJz L2RtYS9NYWtlZmlsZQo+ID4gQEAgLTMxLDcgKzMxLDcgQEAgb2JqLSQoQ09ORklHX0RXX0FYSV9E TUFDKSArPSBkdy1heGktZG1hYy8KPiA+ICBvYmotJChDT05GSUdfRFdfRE1BQ19DT1JFKSArPSBk dy8KPiA+ICBvYmotJChDT05GSUdfRVA5M1hYX0RNQSkgKz0gZXA5M3h4X2RtYS5vCj4gPiAgb2Jq LSQoQ09ORklHX0ZTTF9ETUEpICs9IGZzbGRtYS5vCj4gPiAtb2JqLSQoQ09ORklHX0ZTTF9FRE1B KSArPSBmc2wtZWRtYS5vCj4gPiArb2JqLSQoQ09ORklHX0ZTTF9FRE1BKSArPSBmc2wtZWRtYS5v IGZzbC1lZG1hLWNvbW1vbi5vCj4gPiAgb2JqLSQoQ09ORklHX0ZTTF9SQUlEKSArPSBmc2xfcmFp ZC5vCj4gPiAgb2JqLSQoQ09ORklHX0hTVV9ETUEpICs9IGhzdS8KPiA+ICBvYmotJChDT05GSUdf SU1HX01EQ19ETUEpICs9IGltZy1tZGMtZG1hLm8KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2Rt YS9mc2wtZWRtYS1jb21tb24uYyBiL2RyaXZlcnMvZG1hL2ZzbC1lZG1hLWNvbW1vbi5jCj4gPiBu ZXcgZmlsZSBtb2RlIDEwMDY0NAo+ID4gaW5kZXggMDAwMDAwMDAwMDAwLi4wYWU3MDk0ZjQ3N2EK PiA+IC0tLSAvZGV2L251bGwKPiA+ICsrKyBiL2RyaXZlcnMvZG1hL2ZzbC1lZG1hLWNvbW1vbi5j Cj4gPiBAQCAtMCwwICsxLDU3NiBAQAo+ID4gKy8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBH UEwtMi4wCj4gCj4gWW91IG1vdmVkIGNvZGUgZnJvbSBmc2wtZWRtYS5jIHdoaWNoIGlzIGxpY2Vu c2VkIG9uIEdQTC0yLjArLiBJIHRoaW5rCj4gdGhhdCdzIG5vdCBhbGxvd2VkIGFzIHlvdSBlZmZl Y3RpdmVseSByZWxpY2Vuc2UgdGhlIHdvcmsgb24gbmV3Cj4gbGljZW5zZS4KPiAKT2ssIHNvIGlm IGkgdW5kZXN0cmFuZCwgaSBzaG91bGQgY2hhbmdlIHRoYXQgY29tbWVudCB0bwovLyBTUERYLUxp Y2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMCsKUmlnaHQgPwoKPiBUZXN0ZWQtYnk6IEtyenlzenRv ZiBLb3psb3dza2kgPGtyemtAa2VybmVsLm9yZz4KPiAKPiBCZXN0IHJlZ2FyZHMsCj4gS3J6eXN6 dG9mCj4KCkJlc3QgcmVnYXJkcywKQW5nZWxvCiAKPiA+ICsvLwo+ID4gKy8vIENvcHlyaWdodCAo YykgMjAxMy0yMDE0IEZyZWVzY2FsZSBTZW1pY29uZHVjdG9yLCBJbmMKPiA+ICsvLyBDb3B5cmln aHQgKGMpIDIwMTcgU3lzYW0sIEFuZ2VsbyBEdXJlZ2hlbGxvICA8YW5nZWxvQHN5c2FtLml0Pgo+ IC0tCj4gVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vi c2NyaWJlIGRtYWVuZ2luZSIgaW4KPiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21v QHZnZXIua2VybmVsLm9yZwo+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtl cm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAotLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlz IGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGRtYWVuZ2luZSIgaW4KdGhlIGJvZHkg b2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8g aW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Angelo Dureghello Subject: Re: [PATCH v8 1/3] dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended) Date: Mon, 6 Aug 2018 22:40:21 +0200 Message-ID: <20180806204021.GC6092@jerusalem> References: <20180803193244.12084-1-angelo@sysam.it> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, Stefan Agner , linux-m68k@vger.kernel.org, vinod.koul@linaro.org, linux-arm-kernel@lists.infradead.org List-Id: linux-m68k@vger.kernel.org Hi Krzysztof, On Mon, Aug 06, 2018 at 09:43:42AM +0200, Krzysztof Kozlowski wrote: > On 3 August 2018 at 21:32, Angelo Dureghello wrote: > > This patch adds a new fsl-edma-common module to allow new > > mcf-edma module code to use most of the fsl-edma code. > > > > Signed-off-by: Angelo Dureghello > > --- > > Changes for v2: > > - patch splitted into 4 > > - add mcf-edma as minimal different parts from fsl-edma > > > > Changes for v3: > > none > > > > Changes for v4: > > - patch simplified from 4/4 into 2/2 > > - collecting all the mcf-edma-related changes > > > > Changes for v5: > > none > > > > Changes for v6: > > - adjusted comment header > > - fixed bit shift with BIT() > > - we need to free the interrupts at remove(), so removed all devm_ > > interrupt related calls > > > > Changes for v7: > > none > > > > Changes for v8: > > - patch rewritten from scratch, splitted into 3, common code isolated, > > minimal changes from the original Freescale code have been done. > > The patch has been tested with both Iris + Colibri Vybrid VF50 and > > stmark2/mcf54415 Coldfire boards. > > --- > > drivers/dma/Makefile | 2 +- > > drivers/dma/fsl-edma-common.c | 576 ++++++++++++++++++++++++++++ > > drivers/dma/fsl-edma-common.h | 196 ++++++++++ > > drivers/dma/fsl-edma.c | 697 +--------------------------------- > > 4 files changed, 774 insertions(+), 697 deletions(-) > > create mode 100644 drivers/dma/fsl-edma-common.c > > create mode 100644 drivers/dma/fsl-edma-common.h > > > > diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile > > index 203a99d68315..66022f59fca4 100644 > > --- a/drivers/dma/Makefile > > +++ b/drivers/dma/Makefile > > @@ -31,7 +31,7 @@ obj-$(CONFIG_DW_AXI_DMAC) += dw-axi-dmac/ > > obj-$(CONFIG_DW_DMAC_CORE) += dw/ > > obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o > > obj-$(CONFIG_FSL_DMA) += fsldma.o > > -obj-$(CONFIG_FSL_EDMA) += fsl-edma.o > > +obj-$(CONFIG_FSL_EDMA) += fsl-edma.o fsl-edma-common.o > > obj-$(CONFIG_FSL_RAID) += fsl_raid.o > > obj-$(CONFIG_HSU_DMA) += hsu/ > > obj-$(CONFIG_IMG_MDC_DMA) += img-mdc-dma.o > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > > new file mode 100644 > > index 000000000000..0ae7094f477a > > --- /dev/null > > +++ b/drivers/dma/fsl-edma-common.c > > @@ -0,0 +1,576 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > You moved code from fsl-edma.c which is licensed on GPL-2.0+. I think > that's not allowed as you effectively relicense the work on new > license. > Ok, so if i undestrand, i should change that comment to // SPDX-License-Identifier: GPL-2.0+ Right ? > Tested-by: Krzysztof Kozlowski > > Best regards, > Krzysztof > Best regards, Angelo > > +// > > +// Copyright (c) 2013-2014 Freescale Semiconductor, Inc > > +// Copyright (c) 2017 Sysam, Angelo Dureghello > -- > To unsubscribe from this list: send the line "unsubscribe dmaengine" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: angelo@sysam.it (Angelo Dureghello) Date: Mon, 6 Aug 2018 22:40:21 +0200 Subject: [PATCH v8 1/3] dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended) In-Reply-To: References: <20180803193244.12084-1-angelo@sysam.it> Message-ID: <20180806204021.GC6092@jerusalem> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Krzysztof, On Mon, Aug 06, 2018 at 09:43:42AM +0200, Krzysztof Kozlowski wrote: > On 3 August 2018 at 21:32, Angelo Dureghello wrote: > > This patch adds a new fsl-edma-common module to allow new > > mcf-edma module code to use most of the fsl-edma code. > > > > Signed-off-by: Angelo Dureghello > > --- > > Changes for v2: > > - patch splitted into 4 > > - add mcf-edma as minimal different parts from fsl-edma > > > > Changes for v3: > > none > > > > Changes for v4: > > - patch simplified from 4/4 into 2/2 > > - collecting all the mcf-edma-related changes > > > > Changes for v5: > > none > > > > Changes for v6: > > - adjusted comment header > > - fixed bit shift with BIT() > > - we need to free the interrupts at remove(), so removed all devm_ > > interrupt related calls > > > > Changes for v7: > > none > > > > Changes for v8: > > - patch rewritten from scratch, splitted into 3, common code isolated, > > minimal changes from the original Freescale code have been done. > > The patch has been tested with both Iris + Colibri Vybrid VF50 and > > stmark2/mcf54415 Coldfire boards. > > --- > > drivers/dma/Makefile | 2 +- > > drivers/dma/fsl-edma-common.c | 576 ++++++++++++++++++++++++++++ > > drivers/dma/fsl-edma-common.h | 196 ++++++++++ > > drivers/dma/fsl-edma.c | 697 +--------------------------------- > > 4 files changed, 774 insertions(+), 697 deletions(-) > > create mode 100644 drivers/dma/fsl-edma-common.c > > create mode 100644 drivers/dma/fsl-edma-common.h > > > > diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile > > index 203a99d68315..66022f59fca4 100644 > > --- a/drivers/dma/Makefile > > +++ b/drivers/dma/Makefile > > @@ -31,7 +31,7 @@ obj-$(CONFIG_DW_AXI_DMAC) += dw-axi-dmac/ > > obj-$(CONFIG_DW_DMAC_CORE) += dw/ > > obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o > > obj-$(CONFIG_FSL_DMA) += fsldma.o > > -obj-$(CONFIG_FSL_EDMA) += fsl-edma.o > > +obj-$(CONFIG_FSL_EDMA) += fsl-edma.o fsl-edma-common.o > > obj-$(CONFIG_FSL_RAID) += fsl_raid.o > > obj-$(CONFIG_HSU_DMA) += hsu/ > > obj-$(CONFIG_IMG_MDC_DMA) += img-mdc-dma.o > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > > new file mode 100644 > > index 000000000000..0ae7094f477a > > --- /dev/null > > +++ b/drivers/dma/fsl-edma-common.c > > @@ -0,0 +1,576 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > You moved code from fsl-edma.c which is licensed on GPL-2.0+. I think > that's not allowed as you effectively relicense the work on new > license. > Ok, so if i undestrand, i should change that comment to // SPDX-License-Identifier: GPL-2.0+ Right ? > Tested-by: Krzysztof Kozlowski > > Best regards, > Krzysztof > Best regards, Angelo > > +// > > +// Copyright (c) 2013-2014 Freescale Semiconductor, Inc > > +// Copyright (c) 2017 Sysam, Angelo Dureghello > -- > To unsubscribe from this list: send the line "unsubscribe dmaengine" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html