From patchwork Mon Aug 7 16:39:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 9885821 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 766C2603B4 for ; Mon, 7 Aug 2017 16:39:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6763428689 for ; Mon, 7 Aug 2017 16:39:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C422286AB; Mon, 7 Aug 2017 16:39:50 +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=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0FCA928689 for ; Mon, 7 Aug 2017 16:39:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B4EBF21DF9681; Mon, 7 Aug 2017 09:37:33 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C118221DF9661 for ; Mon, 7 Aug 2017 09:37:32 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Aug 2017 09:39:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.41,339,1498546800"; d="scan'208"; a="1179906030" Received: from djiang5-desk3.ch.intel.com ([143.182.137.38]) by fmsmga001.fm.intel.com with ESMTP; 07 Aug 2017 09:39:48 -0700 Subject: [PATCH v4 6/8] dmaengine: add SG support to dmaengine_unmap From: Dave Jiang To: vinod.koul@intel.com, dan.j.williams@intel.com Date: Mon, 07 Aug 2017 09:39:48 -0700 Message-ID: <150212398819.23722.8426106632424986011.stgit@djiang5-desk3.ch.intel.com> In-Reply-To: <150212381454.23722.1549806704988615279.stgit@djiang5-desk3.ch.intel.com> References: <150212381454.23722.1549806704988615279.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP This should provide support to unmap scatterlist with the dmaengine_unmap_data. We will support only 1 scatterlist per direction. The DMA addresses array has been overloaded for the 2 or less entries DMA unmap data structure in order to store the SG pointer(s). Signed-off-by: Dave Jiang --- drivers/dma/dmaengine.c | 45 ++++++++++++++++++++++++++++++++++++--------- include/linux/dmaengine.h | 22 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index d9a71f0..7d1f7ad 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -1130,16 +1130,35 @@ 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; + int cnt, i, sg_nents; + struct scatterlist *sg; + + sg_nents = dma_unmap_data_sg_to_nents(unmap, unmap->map_cnt); + if (sg_nents) { + i = 0; + cnt = 1; + dma_unmap_data_get_virt(unmap, sg, i); + dma_unmap_sg(dev, sg, sg_nents, DMA_TO_DEVICE); + } else { + cnt = unmap->to_cnt; + for (i = 0; i < cnt; i++) + dma_unmap_page(dev, unmap->addr[i], unmap->len, + DMA_TO_DEVICE); + } + + sg_nents = dma_unmap_data_sg_from_nents(unmap, unmap->map_cnt); + if (sg_nents) { + dma_unmap_data_get_virt(unmap, sg, i); + dma_unmap_sg(dev, sg, sg_nents, DMA_FROM_DEVICE); + cnt++; + i++; + } else { + cnt += unmap->from_cnt; + for (; i < cnt; i++) + dma_unmap_page(dev, unmap->addr[i], unmap->len, + DMA_FROM_DEVICE); + } - cnt = unmap->to_cnt; - for (i = 0; i < cnt; i++) - dma_unmap_page(dev, unmap->addr[i], unmap->len, - DMA_TO_DEVICE); - cnt += unmap->from_cnt; - for (; i < cnt; i++) - dma_unmap_page(dev, unmap->addr[i], unmap->len, - DMA_FROM_DEVICE); cnt += unmap->bidi_cnt; for (; i < cnt; i++) { if (unmap->addr[i] == 0) @@ -1183,6 +1202,10 @@ static int __init dmaengine_init_unmap_pool(void) size = sizeof(struct dmaengine_unmap_data) + sizeof(dma_addr_t) * p->size; + /* add 2 more entries for SG nents overload */ + if (i == 0) + size += sizeof(dma_addr_t) * 2; + p->cache = kmem_cache_create(p->name, size, 0, SLAB_HWCACHE_ALIGN, NULL); if (!p->cache) @@ -1209,6 +1232,10 @@ dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags) return NULL; memset(unmap, 0, sizeof(*unmap)); + /* clear the overloaded sg nents entries */ + if (nr < 3) + memset(&unmap->addr[nr], 0, + DMA_UNMAP_SG_ENTS * sizeof(dma_addr_t)); kref_init(&unmap->kref); unmap->dev = dev; unmap->map_cnt = nr; diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index fc25475..3a7fc68 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -476,6 +476,28 @@ struct dmaengine_unmap_data { dma_addr_t addr[0]; }; +#define DMA_UNMAP_SG_ENTS 2 +#define dma_unmap_data_sg_to_nents(x, n) x->addr[n] +#define dma_unmap_data_sg_from_nents(x, n) x->addr[n+1] + +#if !defined(CONFIG_64BIT) && defined(CONFIG_PCI_BUS_ADDR_T_64BIT) +/* 32bit CPU, 64bit DMA */ +#define dma_unmap_data_set_virt(u, virt, idx) \ + do {\ + u32 tmp = (u32)virt; \ + u->addr[idx] = tmp; \ + } while (0); + +#define dma_unmap_data_get_virt(u, ptr, idx) \ + do {\ + u32 tmp = u->addr[idx]; \ + ptr = (void *)tmp; \ + } while (0); +#else +#define dma_unmap_data_set_virt(u, virt, idx) u->addr[idx] = (dma_addr_t)virt; +#define dma_unmap_data_get_virt(u, ptr, idx) ptr = (void *)u->addr[idx] +#endif + /** * struct dma_async_tx_descriptor - async transaction descriptor * ---dma generic offload fields---