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: dmaengine: fsl-qdma: fixed the source/destination descriptior format From: Vinod Koul Message-Id: <20190426115047.GW28103@vkoul-mobl> Date: Fri, 26 Apr 2019 17:20:47 +0530 To: Peng Ma Cc: dan.j.williams@intel.com, leoyang.li@nxp.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: T24gMTktMDQtMTksIDA4OjQ2LCBQZW5nIE1hIHdyb3RlOgo+IENNRCBvZiBTb3VyY2UvRGVzdGlu YXRpb24gZGVzY3JpcHRpb3IgZm9ybWF0IHNob3VsZCBiZSBsb3dlciBvZgoKcy9kZXNjcmlwdGlv ci9kZXNjcmlwdG9yCgo+IHN0cnVjdCBmc2xfcWRtYV9lbmdpbmUgbnVtYmVyIGRhdGEgYWRkcmVz cy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBQZW5nIE1hIDxwZW5nLm1hQG54cC5jb20+Cj4gLS0tCj4g IGRyaXZlcnMvZG1hL2ZzbC1xZG1hLmMgfCAgIDI5ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tCj4gIDEgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0p Cj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hL2ZzbC1xZG1hLmMgYi9kcml2ZXJzL2RtYS9m c2wtcWRtYS5jCj4gaW5kZXggYWExZDBhZS4uNTQyNzY1YSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2RtYS9mc2wtcWRtYS5jCj4gKysrIGIvZHJpdmVycy9kbWEvZnNsLXFkbWEuYwo+IEBAIC0xMTMs NiArMTEzLDcgQEAKPiAgLyogRmllbGQgZGVmaW5pdGlvbiBmb3IgRGVzY3JpcHRvciBvZmZzZXQg Ki8KPiAgI2RlZmluZSBRRE1BX0NDREZfU1RBVFVTCQkyMAo+ICAjZGVmaW5lIFFETUFfQ0NERl9P RkZTRVQJCTIwCj4gKyNkZWZpbmUgUURNQV9TRERGX0NNRCh4KQkJKCgodTY0KSh4KSkgPDwgMzIp Cj4gIAo+ICAvKiBGaWVsZCBkZWZpbml0aW9uIGZvciBzYWZlIGxvb3AgY291bnQqLwo+ICAjZGVm aW5lIEZTTF9RRE1BX0hBTFRfQ09VTlQJCTE1MDAKPiBAQCAtMjE0LDYgKzIxNSwxMiBAQCBzdHJ1 Y3QgZnNsX3FkbWFfZW5naW5lIHsKPiAgCj4gIH07Cj4gIAo+ICtzdGF0aWMgaW5saW5lIHZvaWQK PiArcWRtYV9zZGRmX3NldF9jbWQoc3RydWN0IGZzbF9xZG1hX2Zvcm1hdCAqc2RkZiwgdTMyIHZh bCkKPiArewo+ICsJc2RkZi0+ZGF0YSA9IFFETUFfU0RERl9DTUQodmFsKTsKPiArfQo+ICsKPiAg c3RhdGljIGlubGluZSB1NjQKPiAgcWRtYV9jY2RmX2FkZHJfZ2V0NjQoY29uc3Qgc3RydWN0IGZz bF9xZG1hX2Zvcm1hdCAqY2NkZikKPiAgewo+IEBAIC0zNDEsNiArMzQ4LDcgQEAgc3RhdGljIHZv aWQgZnNsX3FkbWFfZnJlZV9jaGFuX3Jlc291cmNlcyhzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4pCj4g IHN0YXRpYyB2b2lkIGZzbF9xZG1hX2NvbXBfZmlsbF9tZW1jcHkoc3RydWN0IGZzbF9xZG1hX2Nv bXAgKmZzbF9jb21wLAo+ICAJCQkJICAgICAgZG1hX2FkZHJfdCBkc3QsIGRtYV9hZGRyX3Qgc3Jj LCB1MzIgbGVuKQo+ICB7Cj4gKwl1MzIgY21kOwo+ICAJc3RydWN0IGZzbF9xZG1hX2Zvcm1hdCAq c2RmLCAqZGRmOwo+ICAJc3RydWN0IGZzbF9xZG1hX2Zvcm1hdCAqY2NkZiwgKmNzZ2ZfZGVzYywg KmNzZ2Zfc3JjLCAqY3NnZl9kZXN0Owo+ICAKPiBAQCAtMzUzLDYgKzM2MSw3IEBAIHN0YXRpYyB2 b2lkIGZzbF9xZG1hX2NvbXBfZmlsbF9tZW1jcHkoc3RydWN0IGZzbF9xZG1hX2NvbXAgKmZzbF9j b21wLAo+ICAKPiAgCW1lbXNldChmc2xfY29tcC0+dmlydF9hZGRyLCAwLCBGU0xfUURNQV9DT01N QU5EX0JVRkZFUl9TSVpFKTsKPiAgCW1lbXNldChmc2xfY29tcC0+ZGVzY192aXJ0X2FkZHIsIDAs IEZTTF9RRE1BX0RFU0NSSVBUT1JfQlVGRkVSX1NJWkUpOwo+ICsKPiAgCS8qIEhlYWQgQ29tbWFu ZCBEZXNjcmlwdG9yKEZyYW1lIERlc2NyaXB0b3IpICovCj4gIAlxZG1hX2Rlc2NfYWRkcl9zZXQ2 NChjY2RmLCBmc2xfY29tcC0+YnVzX2FkZHIgKyAxNik7Cj4gIAlxZG1hX2NjZGZfc2V0X2Zvcm1h dChjY2RmLCBxZG1hX2NjZGZfZ2V0X29mZnNldChjY2RmKSk7Cj4gQEAgLTM2OSwxNCArMzc4LDE0 IEBAIHN0YXRpYyB2b2lkIGZzbF9xZG1hX2NvbXBfZmlsbF9tZW1jcHkoc3RydWN0IGZzbF9xZG1h X2NvbXAgKmZzbF9jb21wLAo+ICAJLyogVGhpcyBlbnRyeSBpcyB0aGUgbGFzdCBlbnRyeS4gKi8K PiAgCXFkbWFfY3NnZl9zZXRfZihjc2dmX2Rlc3QsIGxlbik7Cj4gIAkvKiBEZXNjcmlwdG9yIEJ1 ZmZlciAqLwo+IC0Jc2RmLT5kYXRhID0KPiAtCQljcHVfdG9fbGU2NChGU0xfUURNQV9DTURfUldU VFlQRSA8PAo+IC0JCQkgICAgRlNMX1FETUFfQ01EX1JXVFRZUEVfT0ZGU0VUKTsKPiAtCWRkZi0+ ZGF0YSA9Cj4gLQkJY3B1X3RvX2xlNjQoRlNMX1FETUFfQ01EX1JXVFRZUEUgPDwKPiAtCQkJICAg IEZTTF9RRE1BX0NNRF9SV1RUWVBFX09GRlNFVCk7Cj4gLQlkZGYtPmRhdGEgfD0KPiAtCQljcHVf dG9fbGU2NChGU0xfUURNQV9DTURfTFdDIDw8IEZTTF9RRE1BX0NNRF9MV0NfT0ZGU0VUKTsKPiAr CWNtZCA9IGNwdV90b19sZTMyKEZTTF9RRE1BX0NNRF9SV1RUWVBFIDw8Cj4gKwkJCSAgRlNMX1FE TUFfQ01EX1JXVFRZUEVfT0ZGU0VUKTsKPiArCXFkbWFfc2RkZl9zZXRfY21kKHNkZiwgY21kKTsK PiArCj4gKwljbWQgPSBjcHVfdG9fbGUzMihGU0xfUURNQV9DTURfUldUVFlQRSA8PAo+ICsJCQkg IEZTTF9RRE1BX0NNRF9SV1RUWVBFX09GRlNFVCk7Cj4gKwljbWQgfD0gY3B1X3RvX2xlMzIoRlNM X1FETUFfQ01EX0xXQyA8PCBGU0xfUURNQV9DTURfTFdDX09GRlNFVCk7Cj4gKwlxZG1hX3NkZGZf c2V0X2NtZChkZGYsIGNtZCk7Cj4gIH0KPiAgCj4gIC8qCj4gQEAgLTcwMSwxMCArNzEwLDggQEAg c3RhdGljIGlycXJldHVybl90IGZzbF9xZG1hX2Vycm9yX2hhbmRsZXIoaW50IGlycSwgdm9pZCAq ZGV2X2lkKQo+ICAKPiAgCWludHIgPSBxZG1hX3JlYWRsKGZzbF9xZG1hLCBzdGF0dXMgKyBGU0xf UURNQV9ERURSKTsKPiAgCj4gLQlpZiAoaW50cikgewo+ICsJaWYgKGludHIpCj4gIAkJZGV2X2Vy cihmc2xfcWRtYS0+ZG1hX2Rldi5kZXYsICJETUEgdHJhbnNhY3Rpb24gZXJyb3IhXG4iKTsKPiAt CQlyZXR1cm4gSVJRX05PTkU7Cj4gLQl9Cgp0aGlzIHNlZW1zIHVucmVsYXRlZCBjYW4geW91IGV4 cGxhaW4/Cgo+ICAKPiAgCXFkbWFfd3JpdGVsKGZzbF9xZG1hLCBGU0xfUURNQV9ERURSX0NMRUFS LCBzdGF0dXMgKyBGU0xfUURNQV9ERURSKTsKPiAgCXJldHVybiBJUlFfSEFORExFRDsKPiAtLSAK PiAxLjcuMQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E32AC43219 for ; Fri, 26 Apr 2019 11:50:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C1B6208C3 for ; Fri, 26 Apr 2019 11:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556279456; bh=Lwhq3yGTLwZBXZG7d5cZPZUNHsm6dVmKEROQ8WGGliM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=y5iLHV9qjw2Tr/vWdCSJ3bbua1QigAFTPhWW5tyZox2cxC4RAMlfevAQmfHntvQYX p/owypMpOxciI7RHYgQdkvSfde7yQJN6LSiknEhJyySQAhEmHovQuV4w30QwHvbFqL mvLmu7yiAUTC5KdL3QumgE6Tun4OrqpVG9nTLlQM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726026AbfDZLu4 (ORCPT ); Fri, 26 Apr 2019 07:50:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:43630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbfDZLuz (ORCPT ); Fri, 26 Apr 2019 07:50:55 -0400 Received: from localhost (unknown [171.76.113.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F40FA2084F; Fri, 26 Apr 2019 11:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556279454; bh=Lwhq3yGTLwZBXZG7d5cZPZUNHsm6dVmKEROQ8WGGliM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OE7X96wLJ7r/44OQU/ONgLqbtBQX7QoV3QL1ig4fkpoXr7iI9ywW2ec1D04l93k/o qEsS92zXBO446tnIdei/yZe7BrE6iVH4dpvvqCqm9Owdwl+33QHhP+Hj059DB0P8U1 TRQHEwHFiJULFK9HMQ55/A1W3iZRkSIxmrbBO9Ks= Date: Fri, 26 Apr 2019 17:20:47 +0530 From: Vinod Koul To: Peng Ma Cc: dan.j.williams@intel.com, leoyang.li@nxp.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] dmaengine: fsl-qdma: fixed the source/destination descriptior format Message-ID: <20190426115047.GW28103@vkoul-mobl> References: <20190419084629.41742-1-peng.ma@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190419084629.41742-1-peng.ma@nxp.com> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Message-ID: <20190426115047.6j7Fo-zoXV5BF37nrjadWsnyzWqLCFYKT87HLty-1Ik@z> On 19-04-19, 08:46, Peng Ma wrote: > CMD of Source/Destination descriptior format should be lower of s/descriptior/descriptor > struct fsl_qdma_engine number data address. > > Signed-off-by: Peng Ma > --- > drivers/dma/fsl-qdma.c | 29 ++++++++++++++++++----------- > 1 files changed, 18 insertions(+), 11 deletions(-) > > diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c > index aa1d0ae..542765a 100644 > --- a/drivers/dma/fsl-qdma.c > +++ b/drivers/dma/fsl-qdma.c > @@ -113,6 +113,7 @@ > /* Field definition for Descriptor offset */ > #define QDMA_CCDF_STATUS 20 > #define QDMA_CCDF_OFFSET 20 > +#define QDMA_SDDF_CMD(x) (((u64)(x)) << 32) > > /* Field definition for safe loop count*/ > #define FSL_QDMA_HALT_COUNT 1500 > @@ -214,6 +215,12 @@ struct fsl_qdma_engine { > > }; > > +static inline void > +qdma_sddf_set_cmd(struct fsl_qdma_format *sddf, u32 val) > +{ > + sddf->data = QDMA_SDDF_CMD(val); > +} > + > static inline u64 > qdma_ccdf_addr_get64(const struct fsl_qdma_format *ccdf) > { > @@ -341,6 +348,7 @@ static void fsl_qdma_free_chan_resources(struct dma_chan *chan) > static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp, > dma_addr_t dst, dma_addr_t src, u32 len) > { > + u32 cmd; > struct fsl_qdma_format *sdf, *ddf; > struct fsl_qdma_format *ccdf, *csgf_desc, *csgf_src, *csgf_dest; > > @@ -353,6 +361,7 @@ static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp, > > memset(fsl_comp->virt_addr, 0, FSL_QDMA_COMMAND_BUFFER_SIZE); > memset(fsl_comp->desc_virt_addr, 0, FSL_QDMA_DESCRIPTOR_BUFFER_SIZE); > + > /* Head Command Descriptor(Frame Descriptor) */ > qdma_desc_addr_set64(ccdf, fsl_comp->bus_addr + 16); > qdma_ccdf_set_format(ccdf, qdma_ccdf_get_offset(ccdf)); > @@ -369,14 +378,14 @@ static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp, > /* This entry is the last entry. */ > qdma_csgf_set_f(csgf_dest, len); > /* Descriptor Buffer */ > - sdf->data = > - cpu_to_le64(FSL_QDMA_CMD_RWTTYPE << > - FSL_QDMA_CMD_RWTTYPE_OFFSET); > - ddf->data = > - cpu_to_le64(FSL_QDMA_CMD_RWTTYPE << > - FSL_QDMA_CMD_RWTTYPE_OFFSET); > - ddf->data |= > - cpu_to_le64(FSL_QDMA_CMD_LWC << FSL_QDMA_CMD_LWC_OFFSET); > + cmd = cpu_to_le32(FSL_QDMA_CMD_RWTTYPE << > + FSL_QDMA_CMD_RWTTYPE_OFFSET); > + qdma_sddf_set_cmd(sdf, cmd); > + > + cmd = cpu_to_le32(FSL_QDMA_CMD_RWTTYPE << > + FSL_QDMA_CMD_RWTTYPE_OFFSET); > + cmd |= cpu_to_le32(FSL_QDMA_CMD_LWC << FSL_QDMA_CMD_LWC_OFFSET); > + qdma_sddf_set_cmd(ddf, cmd); > } > > /* > @@ -701,10 +710,8 @@ static irqreturn_t fsl_qdma_error_handler(int irq, void *dev_id) > > intr = qdma_readl(fsl_qdma, status + FSL_QDMA_DEDR); > > - if (intr) { > + if (intr) > dev_err(fsl_qdma->dma_dev.dev, "DMA transaction error!\n"); > - return IRQ_NONE; > - } this seems unrelated can you explain? > > qdma_writel(fsl_qdma, FSL_QDMA_DEDR_CLEAR, status + FSL_QDMA_DEDR); > return IRQ_HANDLED; > -- > 1.7.1 -- ~Vinod