From patchwork Mon Mar 21 14:01:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 8633381 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 631CAC0553 for ; Mon, 21 Mar 2016 14:01:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 792D22024C for ; Mon, 21 Mar 2016 14:01:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96C5120251 for ; Mon, 21 Mar 2016 14:01:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755368AbcCUOBi (ORCPT ); Mon, 21 Mar 2016 10:01:38 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56151 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754861AbcCUOBh (ORCPT ); Mon, 21 Mar 2016 10:01:37 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 43F2B6159B; Mon, 21 Mar 2016 14:01:36 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 23E6A615B5; Mon, 21 Mar 2016 14:01:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from srichara (unknown [202.46.23.61]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: sricharan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 732F86021A; Mon, 21 Mar 2016 14:01:31 +0000 (UTC) From: "Sricharan" To: "'Wolfram Sang'" Cc: , , , , , , , , , , , References: <1456142895-32646-1-git-send-email-sricharan@codeaurora.org> <20160224101949.GB1391@katana> In-Reply-To: <20160224101949.GB1391@katana> Subject: RE: [RESEND PATCH V7 4/6] i2c: qup: Add bam dma capabilities Date: Mon, 21 Mar 2016 19:31:27 +0530 Message-ID: <004901d1837a$2df9f620$89ede260$@codeaurora.org> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQIyYzpQGhLr+G7w3Cnpze2mfxE5lQHMx/CqnpPE4sA= Content-Language: en-us X-Virus-Scanned: ClamAV using ClamSMTP Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi wolfram, > On Mon, Feb 22, 2016 at 05:38:15PM +0530, Sricharan R wrote: > > QUP cores can be attached to a BAM module, which acts as a dma engine > > for the QUP core. When DMA with BAM is enabled, the BAM consumer > pipe > > transmitted data is written to the output FIFO and the BAM producer > > pipe received data is read from the input FIFO. > > > > With BAM capabilities, qup-i2c core can transfer more than > > 256 bytes, without a 'stop' which is not possible otherwise. > > > > Signed-off-by: Sricharan R > > Reviewed-by: Andy Gross > > Tested-by: Archit Taneja > > Tested-by: Telkar Nagender > > Applied to for-next, thanks! There is a bug with only this patch which comes out when CONFIG_DEBUG_SG option gets enabled. I have patch like below to fix it, but wanted to ask you if it would correct to have this in the original patch or should I sent a separate fix ? Sorry for the mess on this. Not sure if the pull request is sent already. @@ -1268,6 +1265,8 @@ static int qup_i2c_xfer_v2(struct i2c_adapter *adap, } } + idx = 0; + do { if (msgs[idx].len == 0) { ret = -EINVAL; @@ -1407,27 +1406,21 @@ static int qup_i2c_probe(struct platform_device *pdev) /* 2 tag bytes for each block + 5 for start, stop tags */ size = blocks * 2 + 5; - qup->dpool = dma_pool_create("qup_i2c-dma-pool", &pdev->dev, - size, 4, 0); - qup->start_tag.start = dma_pool_alloc(qup->dpool, GFP_KERNEL, - &qup->start_tag.addr); + qup->start_tag.start = devm_kzalloc(&pdev->dev, + size, GFP_KERNEL); if (!qup->start_tag.start) { ret = -ENOMEM; goto fail_dma; } - qup->brx.tag.start = dma_pool_alloc(qup->dpool, - GFP_KERNEL, - &qup->brx.tag.addr); + qup->brx.tag.start = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); if (!qup->brx.tag.start) { ret = -ENOMEM; goto fail_dma; } - qup->btx.tag.start = dma_pool_alloc(qup->dpool, - GFP_KERNEL, - &qup->btx.tag.addr); + qup->btx.tag.start = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); if (!qup->btx.tag.start) { ret = -ENOMEM; goto fail_dma; @@ -1566,13 +1559,6 @@ static int qup_i2c_remove(struct platform_device *pdev) struct qup_i2c_dev *qup = platform_get_drvdata(pdev); if (qup->is_dma) { - dma_pool_free(qup->dpool, qup->start_tag.start, - qup->start_tag.addr); - dma_pool_free(qup->dpool, qup->brx.tag.start, - qup->brx.tag.addr); - dma_pool_free(qup->dpool, qup->btx.tag.start, - qup->btx.tag.addr); - dma_pool_destroy(qup->dpool); dma_release_channel(qup->btx.dma); dma_release_channel(qup->brx.dma); } --- Regards, Sricharan -- 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 diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 23eaabb..a1fae0c 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -595,9 +595,6 @@ static int qup_sg_set_buf(struct scatterlist *sg, void *buf, if (!ret) return -EINVAL; - if (!map) - sg_dma_address(sg) = tg->addr + ((u8 *)buf - tg->start); - return 0; }