From: Dave Jiang <dave.jiang@intel.com>
To: vinod.koul@intel.com, dan.j.williams@intel.com
Cc: dmaengine@vger.kernel.org, hch@infradead.org, linux-nvdimm@lists.01.org
Subject: [PATCH v7 5/9] dmaengine: add SG support to dmaengine_unmap
Date: Wed, 30 Aug 2017 13:56:01 -0700 [thread overview]
Message-ID: <150412656104.69288.632868014431025281.stgit@djiang5-desk3.ch.intel.com> (raw)
In-Reply-To: <150412628764.69288.12074115435918322858.stgit@djiang5-desk3.ch.intel.com>
This provides support to unmap scatterlist with the
dmaengine_unmap_data. We will support only 1 scatterlist per
direction.
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/dma/dmaengine.c | 27 +++++++++++++++++++++++++++
include/linux/dmaengine.h | 13 ++++++++++++-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 428b141..b4fd81a 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -1120,12 +1120,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];
+ };
};
/**
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2017-08-30 20:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 20:55 [PATCH v7 0/9] libnvdimm: add DMA supported blk-mq pmem driver Dave Jiang
2017-08-30 20:55 ` [PATCH v7 1/9] dmaengine: ioatdma: revert 7618d035 to allow sharing of DMA channels Dave Jiang
2017-08-30 20:55 ` [PATCH v7 2/9] dmaengine: Add DMA_MEMCPY_SG transaction op Dave Jiang
2017-08-30 20:55 ` [PATCH v7 3/9] dmaengine: ioatdma: dma_prep_memcpy_sg support Dave Jiang
2017-08-30 20:55 ` [PATCH v7 4/9] dmaengine: add function to provide per descriptor xfercap for dma engine Dave Jiang
2017-08-30 20:56 ` Dave Jiang [this message]
2017-08-30 20:56 ` [PATCH v7 6/9] dmaengine: provide number of available channels Dave Jiang
2017-08-30 20:56 ` [PATCH v7 7/9] libnvdimm: remove definition of REQ_FLUSH Dave Jiang
2017-08-30 20:56 ` [PATCH v7 8/9] libnvdimm: move common function for pmem to pmem_core Dave Jiang
2017-08-30 20:56 ` [PATCH v7 9/9] libnvdimm: Add DMA based blk-mq pmem driver Dave Jiang
2017-08-31 22:13 ` Kani, Toshimitsu
2017-08-31 23:37 ` Dave Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=150412656104.69288.632868014431025281.stgit@djiang5-desk3.ch.intel.com \
--to=dave.jiang@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=hch@infradead.org \
--cc=linux-nvdimm@lists.01.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.