From patchwork Fri Aug 25 20:59:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 9922835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C74E460349 for ; Fri, 25 Aug 2017 21:00:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B68D22847A for ; Fri, 25 Aug 2017 21:00:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9739284C4; Fri, 25 Aug 2017 21:00:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 552C22847A for ; Fri, 25 Aug 2017 21:00:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934396AbdHYVAA (ORCPT ); Fri, 25 Aug 2017 17:00:00 -0400 Received: from mga09.intel.com ([134.134.136.24]:54600 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932319AbdHYU77 (ORCPT ); Fri, 25 Aug 2017 16:59:59 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Aug 2017 13:59:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,426,1498546800"; d="scan'208";a="144645510" Received: from djiang5-desk3.ch.intel.com ([143.182.137.38]) by fmsmga006.fm.intel.com with ESMTP; 25 Aug 2017 13:59:58 -0700 Subject: [PATCH v6 6/8] dmaengine: add SG support to dmaengine_unmap From: Dave Jiang To: vinod.koul@intel.com, dan.j.williams@intel.com Cc: dmaengine@vger.kernel.org, hch@infradead.org, ross.zwisler@linux.intel.com, elliott@hpe.com, linux-nvdimm@lists.01.org Date: Fri, 25 Aug 2017 13:59:58 -0700 Message-ID: <150369479793.6962.653231190950920402.stgit@djiang5-desk3.ch.intel.com> In-Reply-To: <150369446130.6962.4195769527575520889.stgit@djiang5-desk3.ch.intel.com> References: <150369446130.6962.4195769527575520889.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This provides support to unmap scatterlist with the dmaengine_unmap_data. We will support only 1 scatterlist per direction. Signed-off-by: Dave Jiang --- drivers/dma/dmaengine.c | 27 +++++++++++++++++++++++++++ include/linux/dmaengine.h | 13 ++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) -- 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/dma/dmaengine.c b/drivers/dma/dmaengine.c index 40a035e..09ee03d 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -1124,12 +1124,39 @@ static struct dmaengine_unmap_pool *__get_unmap_pool(int nr) } } +static void dmaengine_unmap_sg(struct dmaengine_unmap_data *unmap) +{ + struct device *dev = unmap->dev; + + if (unmap->to_sg) { + dma_unmap_sg(dev, unmap->unmap_sg.sg, + unmap->sg_nents, DMA_TO_DEVICE); + + dma_unmap_page(dev, unmap->unmap_sg.buf_phys, unmap->len, + DMA_FROM_DEVICE); + } + + if (unmap->from_sg) { + dma_unmap_page(dev, unmap->unmap_sg.buf_phys, unmap->len, + DMA_TO_DEVICE); + dma_unmap_sg(dev, unmap->unmap_sg.sg, + unmap->sg_nents, DMA_FROM_DEVICE); + } + + mempool_free(unmap, __get_unmap_pool(unmap->map_cnt)->pool); +} + static void dmaengine_unmap(struct kref *kref) { struct dmaengine_unmap_data *unmap = container_of(kref, typeof(*unmap), kref); struct device *dev = unmap->dev; int cnt, i; + if (unmap->to_sg || unmap->from_sg) { + dmaengine_unmap_sg(unmap); + return; + } + cnt = unmap->to_cnt; for (i = 0; i < cnt; i++) dma_unmap_page(dev, unmap->addr[i], unmap->len, diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 53356c4..fc53854 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -464,15 +464,26 @@ struct dmaengine_result { typedef void (*dma_async_tx_callback_result)(void *dma_async_param, const struct dmaengine_result *result); +struct dmaengine_unmap_sg { + struct scatterlist *sg; + dma_addr_t buf_phys; +}; + struct dmaengine_unmap_data { u8 map_cnt; u8 to_cnt; + u8 to_sg; u8 from_cnt; + u8 from_sg; u8 bidi_cnt; + int sg_nents; struct device *dev; struct kref kref; size_t len; - dma_addr_t addr[0]; + union { + struct dmaengine_unmap_sg unmap_sg; + dma_addr_t addr[0]; + }; }; /**