Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 165851
b: refs/heads/master
c: cdef57d
h: refs/heads/master
i:
  165849: a7f632e
  165847: 06df6be
v: v3
  • Loading branch information
Dan Williams committed Sep 21, 2009
1 parent 8855e2b commit 96ba36c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f477f5b3316f39c841aa121a219b82b3a56e7da7
refs/heads/master: cdef57dbb618608bfffda2fc32c8d0a4012a1d3a
15 changes: 9 additions & 6 deletions trunk/drivers/dma/ioat/dma_v3.c
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@ ioat3_prep_memset_lock(struct dma_chan *c, dma_addr_t dest, int value,
/* pass */;
else
return NULL;
for (i = 0; i < num_descs; i++) {
i = 0;
do {
size_t xfer_size = min_t(size_t, len, 1 << ioat->xfercap_log);

desc = ioat2_get_ring_ent(ioat, idx + i);
Expand All @@ -463,7 +464,7 @@ ioat3_prep_memset_lock(struct dma_chan *c, dma_addr_t dest, int value,
len -= xfer_size;
dest += xfer_size;
dump_desc_dbg(ioat, desc);
}
} while (++i < num_descs);

desc->txd.flags = flags;
desc->len = total_len;
Expand Down Expand Up @@ -518,7 +519,8 @@ __ioat3_prep_xor_lock(struct dma_chan *c, enum sum_check_flags *result,
/* pass */;
else
return NULL;
for (i = 0; i < num_descs; i += 1 + with_ext) {
i = 0;
do {
struct ioat_raw_descriptor *descs[2];
size_t xfer_size = min_t(size_t, len, 1 << ioat->xfercap_log);
int s;
Expand Down Expand Up @@ -546,7 +548,7 @@ __ioat3_prep_xor_lock(struct dma_chan *c, enum sum_check_flags *result,
len -= xfer_size;
offset += xfer_size;
dump_desc_dbg(ioat, desc);
}
} while ((i += 1 + with_ext) < num_descs);

/* last xor descriptor carries the unmap parameters and fence bit */
desc->txd.flags = flags;
Expand Down Expand Up @@ -664,7 +666,8 @@ __ioat3_prep_pq_lock(struct dma_chan *c, enum sum_check_flags *result,
/* pass */;
else
return NULL;
for (i = 0; i < num_descs; i += 1 + with_ext) {
i = 0;
do {
struct ioat_raw_descriptor *descs[2];
size_t xfer_size = min_t(size_t, len, 1 << ioat->xfercap_log);

Expand Down Expand Up @@ -703,7 +706,7 @@ __ioat3_prep_pq_lock(struct dma_chan *c, enum sum_check_flags *result,

len -= xfer_size;
offset += xfer_size;
}
} while ((i += 1 + with_ext) < num_descs);

/* last pq descriptor carries the unmap parameters and fence bit */
desc->txd.flags = flags;
Expand Down

0 comments on commit 96ba36c

Please sign in to comment.