[PATCH v2 11/12] async_tx: convert to dmaengine_is_*_aligned() helpers
From: Frank . Li
Date: Wed Sep 23 2026 - 12:29:11 EST
From: Frank Li <Frank.Li@xxxxxxx>
Replace is_dma_{copy,xor,pq}_aligned() calls with the new
dmaengine_is_{copy,xor,pq}_aligned() helpers that take a struct
dma_chan * instead of struct dma_device *. Also update the internal
helpers dma_xor_aligned_offsets() and is_dma_pq_aligned_offs() to
take struct dma_chan * accordingly.
Also use dmaengine_get_max_xor() to get max_xor.
Signed-off-by: Frank Li <Frank.Li@xxxxxxx>
---
crypto/async_tx/async_memcpy.c | 3 +--
crypto/async_tx/async_pq.c | 12 +++++-------
crypto/async_tx/async_xor.c | 23 ++++++++++-------------
3 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index 49ee66759c7e9..972670094be0a 100644
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -35,14 +35,13 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
{
struct dma_chan *chan = async_tx_find_channel(submit, DMA_MEMCPY,
&dest, 1, &src, 1, len);
- struct dma_device *device = chan ? chan->device : NULL;
struct dma_async_tx_descriptor *tx = NULL;
struct dmaengine_unmap_data *unmap = NULL;
if (chan)
unmap = dmaengine_get_unmap_data(chan, 2, GFP_NOWAIT);
- if (unmap && is_dma_copy_aligned(device, src_offset, dest_offset, len)) {
+ if (unmap && dmaengine_is_copy_aligned(chan, src_offset, dest_offset, len)) {
unsigned long dma_prep_flags = 0;
struct device *dma_dev = dmaengine_get_dma_device(chan);
diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c
index 6ccc1073c5ace..30d6ee676dd44 100644
--- a/crypto/async_tx/async_pq.c
+++ b/crypto/async_tx/async_pq.c
@@ -140,13 +140,13 @@ do_sync_gen_syndrome(struct page **blocks, unsigned int *offsets, int disks,
}
static inline bool
-is_dma_pq_aligned_offs(struct dma_device *dev, unsigned int *offs,
- int src_cnt, size_t len)
+is_dma_pq_aligned_offs(struct dma_chan *chan, unsigned int *offs,
+ int src_cnt, size_t len)
{
int i;
for (i = 0; i < src_cnt; i++) {
- if (!is_dma_pq_aligned(dev, offs[i], 0, len))
+ if (!dmaengine_is_pq_aligned(chan, offs[i], 0, len))
return false;
}
return true;
@@ -181,7 +181,6 @@ async_gen_syndrome(struct page **blocks, unsigned int *offsets, int disks,
struct dma_chan *chan = async_tx_find_channel(submit, DMA_PQ,
&P(blocks, disks), 2,
blocks, src_cnt, len);
- struct dma_device *device = chan ? chan->device : NULL;
struct dmaengine_unmap_data *unmap = NULL;
BUG_ON(disks > MAX_DISKS || !(P(blocks, disks) || Q(blocks, disks)));
@@ -193,7 +192,7 @@ async_gen_syndrome(struct page **blocks, unsigned int *offsets, int disks,
if (unmap && !(submit->flags & ASYNC_TX_PQ_XOR_DST) &&
(src_cnt <= dmaengine_maxpq(chan, 0) ||
dmaengine_maxpq(chan, DMA_PREP_CONTINUE) > 0) &&
- is_dma_pq_aligned_offs(device, offsets, disks, len)) {
+ is_dma_pq_aligned_offs(chan, offsets, disks, len)) {
struct dma_async_tx_descriptor *tx;
struct device *dma_dev = dmaengine_get_dma_device(chan);
enum dma_ctrl_flags dma_flags = 0;
@@ -301,7 +300,6 @@ async_syndrome_val(struct page **blocks, unsigned int *offsets, int disks,
unsigned int s_off, struct async_submit_ctl *submit)
{
struct dma_chan *chan = pq_val_chan(submit, blocks, disks, len);
- struct dma_device *device = chan ? chan->device : NULL;
struct dma_async_tx_descriptor *tx;
unsigned char coefs[MAX_DISKS];
enum dma_ctrl_flags dma_flags = submit->cb_fn ? DMA_PREP_INTERRUPT : 0;
@@ -313,7 +311,7 @@ async_syndrome_val(struct page **blocks, unsigned int *offsets, int disks,
unmap = dmaengine_get_unmap_data(chan, disks, GFP_NOWAIT);
if (unmap && disks <= dmaengine_maxpq(chan, 0) &&
- is_dma_pq_aligned_offs(device, offsets, disks, len)) {
+ is_dma_pq_aligned_offs(chan, offsets, disks, len)) {
struct device *dev = dmaengine_get_dma_device(chan);
dma_addr_t pq[2];
int i, j = 0, src_cnt = 0;
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 3cbe08883085b..cf3eedaf2a75b 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -23,7 +23,6 @@ static __async_inline struct dma_async_tx_descriptor *
do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap,
struct async_submit_ctl *submit)
{
- struct dma_device *dma = chan->device;
struct dma_async_tx_descriptor *tx = NULL;
dma_async_tx_callback cb_fn_orig = submit->cb_fn;
void *cb_param_orig = submit->cb_param;
@@ -38,7 +37,7 @@ do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap,
dma_addr_t tmp;
submit->flags = flags_orig;
- xor_src_cnt = min(src_cnt, (int)dma->max_xor);
+ xor_src_cnt = min_t(int, src_cnt, dmaengine_get_max_xor(chan));
/* if we are submitting additional xors, leave the chain open
* and clear the callback parameters
*/
@@ -124,19 +123,19 @@ do_sync_xor_offs(struct page *dest, unsigned int offset,
}
static inline bool
-dma_xor_aligned_offsets(struct dma_device *device, unsigned int offset,
- unsigned int *src_offs, int src_cnt, int len)
+dma_xor_aligned_offsets(struct dma_chan *chan, unsigned int offset,
+ unsigned int *src_offs, int src_cnt, int len)
{
int i;
- if (!is_dma_xor_aligned(device, offset, 0, len))
+ if (!dmaengine_is_xor_aligned(chan, offset, 0, len))
return false;
if (!src_offs)
return true;
for (i = 0; i < src_cnt; i++) {
- if (!is_dma_xor_aligned(device, src_offs[i], 0, len))
+ if (!dmaengine_is_xor_aligned(chan, src_offs[i], 0, len))
return false;
}
return true;
@@ -171,7 +170,6 @@ async_xor_offs(struct page *dest, unsigned int offset,
struct dma_chan *chan = async_tx_find_channel(submit, DMA_XOR,
&dest, 1, src_list,
src_cnt, len);
- struct dma_device *device = chan ? chan->device : NULL;
struct dmaengine_unmap_data *unmap = NULL;
BUG_ON(src_cnt <= 1);
@@ -179,8 +177,8 @@ async_xor_offs(struct page *dest, unsigned int offset,
if (chan)
unmap = dmaengine_get_unmap_data(chan, src_cnt + 1, GFP_NOWAIT);
- if (unmap && dma_xor_aligned_offsets(device, offset,
- src_offs, src_cnt, len)) {
+ if (unmap && dma_xor_aligned_offsets(chan, offset, src_offs,
+ src_cnt, len)) {
struct device *dma_dev = dmaengine_get_dma_device(chan);
struct dma_async_tx_descriptor *tx;
int i, j;
@@ -303,7 +301,6 @@ async_xor_val_offs(struct page *dest, unsigned int offset,
struct async_submit_ctl *submit)
{
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;
struct dmaengine_unmap_data *unmap = NULL;
@@ -312,8 +309,8 @@ async_xor_val_offs(struct page *dest, unsigned int offset,
if (chan)
unmap = dmaengine_get_unmap_data(chan, src_cnt, GFP_NOWAIT);
- if (unmap && src_cnt <= device->max_xor &&
- dma_xor_aligned_offsets(device, offset, src_offs, src_cnt, len)) {
+ if (unmap && src_cnt <= dmaengine_get_max_xor(chan) &&
+ dma_xor_aligned_offsets(chan, offset, src_offs, src_cnt, len)) {
unsigned long dma_prep_flags = 0;
struct device *dma_dev = dmaengine_get_dma_device(chan);
int i;
@@ -351,7 +348,7 @@ async_xor_val_offs(struct page *dest, unsigned int offset,
enum async_tx_flags flags_orig = submit->flags;
pr_debug("%s: (sync) len: %zu\n", __func__, len);
- WARN_ONCE(device && src_cnt <= device->max_xor,
+ WARN_ONCE(chan && src_cnt <= dmaengine_get_max_xor(chan),
"%s: no space for dma address conversion\n",
__func__);
--
2.43.0