From: Dan Williams <djbw@fb.com>
To: linux-kernel@vger.kernel.org
Cc: linux@arm.linux.org.uk,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
vinod.koul@intel.com, Tomasz Figa <t.figa@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
dave.jiang@intel.com
Subject: [PATCH 07/12] async_xor_val: convert to dmaengine_unmap_data
Date: Thu, 06 Dec 2012 01:25:48 -0800 [thread overview]
Message-ID: <20121206092548.17085.19899.stgit@dev279.prn1.facebook.com> (raw)
In-Reply-To: <20121206091055.17085.47979.stgit@dev279.prn1.facebook.com>
Use the generic unmap object to unmap dma buffers.
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Reported-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Dan Williams <djbw@fb.com>
---
crypto/async_tx/async_xor.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 46bbdb3..d6e1dc0 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -278,18 +278,17 @@ async_xor_val(struct page *dest, struct page **src_list, unsigned int offset,
struct dma_chan *chan = xor_val_chan(submit, dest, src_list, src_cnt, len);
struct dma_device *device = chan ? chan->device : NULL;
struct dma_async_tx_descriptor *tx = NULL;
- dma_addr_t *dma_src = NULL;
+ struct dmaengine_unmap_data *unmap = NULL;
BUG_ON(src_cnt <= 1);
- if (submit->scribble)
- dma_src = submit->scribble;
- else if (sizeof(dma_addr_t) <= sizeof(struct page *))
- dma_src = (dma_addr_t *) src_list;
+ if (device)
+ unmap = dmaengine_get_unmap_data(device->dev, src_cnt, GFP_NOIO);
- if (dma_src && device && src_cnt <= device->max_xor &&
+ if (unmap && src_cnt <= device->max_xor &&
is_dma_xor_aligned(device, offset, 0, len)) {
- unsigned long dma_prep_flags = 0;
+ unsigned long dma_prep_flags = DMA_COMPL_SKIP_SRC_UNMAP |
+ DMA_COMPL_SKIP_DEST_UNMAP;
int i;
pr_debug("%s: (async) len: %zu\n", __func__, len);
@@ -298,11 +297,15 @@ async_xor_val(struct page *dest, struct page **src_list, unsigned int offset,
dma_prep_flags |= DMA_PREP_INTERRUPT;
if (submit->flags & ASYNC_TX_FENCE)
dma_prep_flags |= DMA_PREP_FENCE;
- for (i = 0; i < src_cnt; i++)
- dma_src[i] = dma_map_page(device->dev, src_list[i],
- offset, len, DMA_TO_DEVICE);
- tx = device->device_prep_dma_xor_val(chan, dma_src, src_cnt,
+ for (i = 0; i < src_cnt; i++) {
+ unmap->addr[i] = dma_map_page(device->dev, src_list[i],
+ offset, len, DMA_TO_DEVICE);
+ unmap->to_cnt++;
+ }
+ unmap->len = len;
+
+ tx = device->device_prep_dma_xor_val(chan, unmap->addr, src_cnt,
len, result,
dma_prep_flags);
if (unlikely(!tx)) {
@@ -311,11 +314,11 @@ async_xor_val(struct page *dest, struct page **src_list, unsigned int offset,
while (!tx) {
dma_async_issue_pending(chan);
tx = device->device_prep_dma_xor_val(chan,
- dma_src, src_cnt, len, result,
+ unmap->addr, src_cnt, len, result,
dma_prep_flags);
}
}
-
+ dma_set_unmap(tx, unmap);
async_tx_submit(chan, tx, submit);
} else {
enum async_tx_flags flags_orig = submit->flags;
@@ -337,6 +340,7 @@ async_xor_val(struct page *dest, struct page **src_list, unsigned int offset,
async_tx_sync_epilog(submit);
submit->flags = flags_orig;
}
+ dmaengine_unmap_put(unmap);
return tx;
}
next prev parent reply other threads:[~2012-12-06 9:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-06 9:25 [PATCH 00/12] dmaengine_unmap_data Dan Williams
2012-12-06 9:25 ` [PATCH 01/12] dmaengine: consolidate memcpy apis Dan Williams
2012-12-06 9:25 ` [PATCH 02/12] dmaengine: prepare for generic 'unmap' data Dan Williams
2012-12-06 15:47 ` Bartlomiej Zolnierkiewicz
2013-06-26 10:44 ` dmaengine_unmap_data patches (was: Re: Re: [PATCH 02/12] dmaengine: prepare for generic 'unmap' data) Bartlomiej Zolnierkiewicz
2013-06-28 17:35 ` Dan Williams
2012-12-06 9:25 ` [PATCH 03/12] dmaengine: reference counted unmap data Dan Williams
2012-12-06 15:47 ` Bartlomiej Zolnierkiewicz
2012-12-06 9:25 ` [PATCH 04/12] async_memcpy: convert to dmaengine_unmap_data Dan Williams
2012-12-06 15:47 ` Bartlomiej Zolnierkiewicz
2012-12-06 9:25 ` [PATCH 05/12] async_memset: " Dan Williams
2012-12-06 15:48 ` Bartlomiej Zolnierkiewicz
2012-12-06 9:25 ` [PATCH 06/12] async_xor: " Dan Williams
2012-12-06 15:48 ` Bartlomiej Zolnierkiewicz
2012-12-06 9:25 ` Dan Williams [this message]
2012-12-06 15:48 ` [PATCH 07/12] async_xor_val: " Bartlomiej Zolnierkiewicz
2012-12-06 9:25 ` [PATCH 08/12] async_raid6_recov: " Dan Williams
2012-12-06 15:48 ` Bartlomiej Zolnierkiewicz
2012-12-06 9:25 ` [PATCH 09/12] async_pq: " Dan Williams
2012-12-06 15:48 ` Bartlomiej Zolnierkiewicz
2012-12-06 9:26 ` [PATCH 10/12] async_pq_val: " Dan Williams
2012-12-06 15:48 ` Bartlomiej Zolnierkiewicz
2012-12-06 9:26 ` [PATCH 11/12] dmaengine: remove DMA unmap from drivers Dan Williams
2012-12-06 9:26 ` [PATCH 12/12] dmaengine: remove DMA unmap flags Dan Williams
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=20121206092548.17085.19899.stgit@dev279.prn1.facebook.com \
--to=djbw@fb.com \
--cc=b.zolnierkie@samsung.com \
--cc=dave.jiang@intel.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=t.figa@samsung.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).