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: Peng Ma Message-Id: <20190419084629.41742-1-peng.ma@nxp.com> Date: Fri, 19 Apr 2019 08:46:29 +0000 To: dan.j.williams@intel.com, vkoul@kernel.org Cc: leoyang.li@nxp.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Peng Ma List-ID: Q01EIG9mIFNvdXJjZS9EZXN0aW5hdGlvbiBkZXNjcmlwdGlvciBmb3JtYXQgc2hvdWxkIGJlIGxv d2VyIG9mCnN0cnVjdCBmc2xfcWRtYV9lbmdpbmUgbnVtYmVyIGRhdGEgYWRkcmVzcy4KClNpZ25l ZC1vZmYtYnk6IFBlbmcgTWEgPHBlbmcubWFAbnhwLmNvbT4KLS0tCiBkcml2ZXJzL2RtYS9mc2wt cWRtYS5jIHwgICAyOSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlcyBjaGFu Z2VkLCAxOCBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2RtYS9mc2wtcWRtYS5jIGIvZHJpdmVycy9kbWEvZnNsLXFkbWEuYwppbmRleCBhYTFkMGFl Li41NDI3NjVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2RtYS9mc2wtcWRtYS5jCisrKyBiL2RyaXZl cnMvZG1hL2ZzbC1xZG1hLmMKQEAgLTExMyw2ICsxMTMsNyBAQAogLyogRmllbGQgZGVmaW5pdGlv biBmb3IgRGVzY3JpcHRvciBvZmZzZXQgKi8KICNkZWZpbmUgUURNQV9DQ0RGX1NUQVRVUwkJMjAK ICNkZWZpbmUgUURNQV9DQ0RGX09GRlNFVAkJMjAKKyNkZWZpbmUgUURNQV9TRERGX0NNRCh4KQkJ KCgodTY0KSh4KSkgPDwgMzIpCiAKIC8qIEZpZWxkIGRlZmluaXRpb24gZm9yIHNhZmUgbG9vcCBj b3VudCovCiAjZGVmaW5lIEZTTF9RRE1BX0hBTFRfQ09VTlQJCTE1MDAKQEAgLTIxNCw2ICsyMTUs MTIgQEAgc3RydWN0IGZzbF9xZG1hX2VuZ2luZSB7CiAKIH07CiAKK3N0YXRpYyBpbmxpbmUgdm9p ZAorcWRtYV9zZGRmX3NldF9jbWQoc3RydWN0IGZzbF9xZG1hX2Zvcm1hdCAqc2RkZiwgdTMyIHZh bCkKK3sKKwlzZGRmLT5kYXRhID0gUURNQV9TRERGX0NNRCh2YWwpOworfQorCiBzdGF0aWMgaW5s aW5lIHU2NAogcWRtYV9jY2RmX2FkZHJfZ2V0NjQoY29uc3Qgc3RydWN0IGZzbF9xZG1hX2Zvcm1h dCAqY2NkZikKIHsKQEAgLTM0MSw2ICszNDgsNyBAQCBzdGF0aWMgdm9pZCBmc2xfcWRtYV9mcmVl X2NoYW5fcmVzb3VyY2VzKHN0cnVjdCBkbWFfY2hhbiAqY2hhbikKIHN0YXRpYyB2b2lkIGZzbF9x ZG1hX2NvbXBfZmlsbF9tZW1jcHkoc3RydWN0IGZzbF9xZG1hX2NvbXAgKmZzbF9jb21wLAogCQkJ CSAgICAgIGRtYV9hZGRyX3QgZHN0LCBkbWFfYWRkcl90IHNyYywgdTMyIGxlbikKIHsKKwl1MzIg Y21kOwogCXN0cnVjdCBmc2xfcWRtYV9mb3JtYXQgKnNkZiwgKmRkZjsKIAlzdHJ1Y3QgZnNsX3Fk bWFfZm9ybWF0ICpjY2RmLCAqY3NnZl9kZXNjLCAqY3NnZl9zcmMsICpjc2dmX2Rlc3Q7CiAKQEAg LTM1Myw2ICszNjEsNyBAQCBzdGF0aWMgdm9pZCBmc2xfcWRtYV9jb21wX2ZpbGxfbWVtY3B5KHN0 cnVjdCBmc2xfcWRtYV9jb21wICpmc2xfY29tcCwKIAogCW1lbXNldChmc2xfY29tcC0+dmlydF9h ZGRyLCAwLCBGU0xfUURNQV9DT01NQU5EX0JVRkZFUl9TSVpFKTsKIAltZW1zZXQoZnNsX2NvbXAt PmRlc2NfdmlydF9hZGRyLCAwLCBGU0xfUURNQV9ERVNDUklQVE9SX0JVRkZFUl9TSVpFKTsKKwog CS8qIEhlYWQgQ29tbWFuZCBEZXNjcmlwdG9yKEZyYW1lIERlc2NyaXB0b3IpICovCiAJcWRtYV9k ZXNjX2FkZHJfc2V0NjQoY2NkZiwgZnNsX2NvbXAtPmJ1c19hZGRyICsgMTYpOwogCXFkbWFfY2Nk Zl9zZXRfZm9ybWF0KGNjZGYsIHFkbWFfY2NkZl9nZXRfb2Zmc2V0KGNjZGYpKTsKQEAgLTM2OSwx NCArMzc4LDE0IEBAIHN0YXRpYyB2b2lkIGZzbF9xZG1hX2NvbXBfZmlsbF9tZW1jcHkoc3RydWN0 IGZzbF9xZG1hX2NvbXAgKmZzbF9jb21wLAogCS8qIFRoaXMgZW50cnkgaXMgdGhlIGxhc3QgZW50 cnkuICovCiAJcWRtYV9jc2dmX3NldF9mKGNzZ2ZfZGVzdCwgbGVuKTsKIAkvKiBEZXNjcmlwdG9y IEJ1ZmZlciAqLwotCXNkZi0+ZGF0YSA9Ci0JCWNwdV90b19sZTY0KEZTTF9RRE1BX0NNRF9SV1RU WVBFIDw8Ci0JCQkgICAgRlNMX1FETUFfQ01EX1JXVFRZUEVfT0ZGU0VUKTsKLQlkZGYtPmRhdGEg PQotCQljcHVfdG9fbGU2NChGU0xfUURNQV9DTURfUldUVFlQRSA8PAotCQkJICAgIEZTTF9RRE1B X0NNRF9SV1RUWVBFX09GRlNFVCk7Ci0JZGRmLT5kYXRhIHw9Ci0JCWNwdV90b19sZTY0KEZTTF9R RE1BX0NNRF9MV0MgPDwgRlNMX1FETUFfQ01EX0xXQ19PRkZTRVQpOworCWNtZCA9IGNwdV90b19s ZTMyKEZTTF9RRE1BX0NNRF9SV1RUWVBFIDw8CisJCQkgIEZTTF9RRE1BX0NNRF9SV1RUWVBFX09G RlNFVCk7CisJcWRtYV9zZGRmX3NldF9jbWQoc2RmLCBjbWQpOworCisJY21kID0gY3B1X3RvX2xl MzIoRlNMX1FETUFfQ01EX1JXVFRZUEUgPDwKKwkJCSAgRlNMX1FETUFfQ01EX1JXVFRZUEVfT0ZG U0VUKTsKKwljbWQgfD0gY3B1X3RvX2xlMzIoRlNMX1FETUFfQ01EX0xXQyA8PCBGU0xfUURNQV9D TURfTFdDX09GRlNFVCk7CisJcWRtYV9zZGRmX3NldF9jbWQoZGRmLCBjbWQpOwogfQogCiAvKgpA QCAtNzAxLDEwICs3MTAsOCBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZnNsX3FkbWFfZXJyb3JfaGFu ZGxlcihpbnQgaXJxLCB2b2lkICpkZXZfaWQpCiAKIAlpbnRyID0gcWRtYV9yZWFkbChmc2xfcWRt YSwgc3RhdHVzICsgRlNMX1FETUFfREVEUik7CiAKLQlpZiAoaW50cikgeworCWlmIChpbnRyKQog CQlkZXZfZXJyKGZzbF9xZG1hLT5kbWFfZGV2LmRldiwgIkRNQSB0cmFuc2FjdGlvbiBlcnJvciFc biIpOwotCQlyZXR1cm4gSVJRX05PTkU7Ci0JfQogCiAJcWRtYV93cml0ZWwoZnNsX3FkbWEsIEZT TF9RRE1BX0RFRFJfQ0xFQVIsIHN0YXR1cyArIEZTTF9RRE1BX0RFRFIpOwogCXJldHVybiBJUlFf SEFORExFRDsK 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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 36136C282DF for ; Fri, 19 Apr 2019 18:21:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12486222AF for ; Fri, 19 Apr 2019 18:21:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726977AbfDSSVF (ORCPT ); Fri, 19 Apr 2019 14:21:05 -0400 Received: from inva021.nxp.com ([92.121.34.21]:58650 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727371AbfDSSVF (ORCPT ); Fri, 19 Apr 2019 14:21:05 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id ED4D0200176; Fri, 19 Apr 2019 10:53:32 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id C3C572000D0; Fri, 19 Apr 2019 10:53:29 +0200 (CEST) Received: from titan.ap.freescale.net (TITAN.ap.freescale.net [10.192.208.233]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 857E9402BB; Fri, 19 Apr 2019 16:53:25 +0800 (SGT) From: Peng Ma To: dan.j.williams@intel.com, vkoul@kernel.org Cc: leoyang.li@nxp.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Peng Ma Subject: [PATCH] dmaengine: fsl-qdma: fixed the source/destination descriptior format Date: Fri, 19 Apr 2019 08:46:29 +0000 Message-Id: <20190419084629.41742-1-peng.ma@nxp.com> X-Mailer: git-send-email 2.14.1 X-Virus-Scanned: ClamAV using ClamSMTP Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190419084629.wU3vEP6XQ8h6OuxkalyJ4Y6B2yyH_6iAPHEQR_VZ-oY@z> CMD of Source/Destination descriptior format should be lower of 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; - } qdma_writel(fsl_qdma, FSL_QDMA_DEDR_CLEAR, status + FSL_QDMA_DEDR); return IRQ_HANDLED; -- 1.7.1