|
@@ -125,9 +125,9 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)
|
|
|
list_for_each_entry_safe(iter, _iter, &iop_chan->chain,
|
|
list_for_each_entry_safe(iter, _iter, &iop_chan->chain,
|
|
|
chain_node) {
|
|
chain_node) {
|
|
|
pr_debug("\tcookie: %d slot: %d busy: %d "
|
|
pr_debug("\tcookie: %d slot: %d busy: %d "
|
|
|
- "this_desc: %#x next_desc: %#x ack: %d\n",
|
|
|
|
|
|
|
+ "this_desc: %#x next_desc: %#llx ack: %d\n",
|
|
|
iter->async_tx.cookie, iter->idx, busy,
|
|
iter->async_tx.cookie, iter->idx, busy,
|
|
|
- iter->async_tx.phys, iop_desc_get_next_desc(iter),
|
|
|
|
|
|
|
+ iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
|
|
|
async_tx_test_ack(&iter->async_tx));
|
|
async_tx_test_ack(&iter->async_tx));
|
|
|
prefetch(_iter);
|
|
prefetch(_iter);
|
|
|
prefetch(&_iter->async_tx);
|
|
prefetch(&_iter->async_tx);
|
|
@@ -315,9 +315,9 @@ retry:
|
|
|
int i;
|
|
int i;
|
|
|
dev_dbg(iop_chan->device->common.dev,
|
|
dev_dbg(iop_chan->device->common.dev,
|
|
|
"allocated slot: %d "
|
|
"allocated slot: %d "
|
|
|
- "(desc %p phys: %#x) slots_per_op %d\n",
|
|
|
|
|
|
|
+ "(desc %p phys: %#llx) slots_per_op %d\n",
|
|
|
iter->idx, iter->hw_desc,
|
|
iter->idx, iter->hw_desc,
|
|
|
- iter->async_tx.phys, slots_per_op);
|
|
|
|
|
|
|
+ (u64)iter->async_tx.phys, slots_per_op);
|
|
|
|
|
|
|
|
/* pre-ack all but the last descriptor */
|
|
/* pre-ack all but the last descriptor */
|
|
|
if (num_slots != slots_per_op)
|
|
if (num_slots != slots_per_op)
|
|
@@ -525,7 +525,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,
|
|
|
return NULL;
|
|
return NULL;
|
|
|
BUG_ON(len > IOP_ADMA_MAX_BYTE_COUNT);
|
|
BUG_ON(len > IOP_ADMA_MAX_BYTE_COUNT);
|
|
|
|
|
|
|
|
- dev_dbg(iop_chan->device->common.dev, "%s len: %u\n",
|
|
|
|
|
|
|
+ dev_dbg(iop_chan->device->common.dev, "%s len: %zu\n",
|
|
|
__func__, len);
|
|
__func__, len);
|
|
|
|
|
|
|
|
spin_lock_bh(&iop_chan->lock);
|
|
spin_lock_bh(&iop_chan->lock);
|
|
@@ -558,7 +558,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,
|
|
|
BUG_ON(len > IOP_ADMA_XOR_MAX_BYTE_COUNT);
|
|
BUG_ON(len > IOP_ADMA_XOR_MAX_BYTE_COUNT);
|
|
|
|
|
|
|
|
dev_dbg(iop_chan->device->common.dev,
|
|
dev_dbg(iop_chan->device->common.dev,
|
|
|
- "%s src_cnt: %d len: %u flags: %lx\n",
|
|
|
|
|
|
|
+ "%s src_cnt: %d len: %zu flags: %lx\n",
|
|
|
__func__, src_cnt, len, flags);
|
|
__func__, src_cnt, len, flags);
|
|
|
|
|
|
|
|
spin_lock_bh(&iop_chan->lock);
|
|
spin_lock_bh(&iop_chan->lock);
|
|
@@ -591,7 +591,7 @@ iop_adma_prep_dma_xor_val(struct dma_chan *chan, dma_addr_t *dma_src,
|
|
|
if (unlikely(!len))
|
|
if (unlikely(!len))
|
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
|
|
- dev_dbg(iop_chan->device->common.dev, "%s src_cnt: %d len: %u\n",
|
|
|
|
|
|
|
+ dev_dbg(iop_chan->device->common.dev, "%s src_cnt: %d len: %zu\n",
|
|
|
__func__, src_cnt, len);
|
|
__func__, src_cnt, len);
|
|
|
|
|
|
|
|
spin_lock_bh(&iop_chan->lock);
|
|
spin_lock_bh(&iop_chan->lock);
|
|
@@ -629,7 +629,7 @@ iop_adma_prep_dma_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src,
|
|
|
BUG_ON(len > IOP_ADMA_XOR_MAX_BYTE_COUNT);
|
|
BUG_ON(len > IOP_ADMA_XOR_MAX_BYTE_COUNT);
|
|
|
|
|
|
|
|
dev_dbg(iop_chan->device->common.dev,
|
|
dev_dbg(iop_chan->device->common.dev,
|
|
|
- "%s src_cnt: %d len: %u flags: %lx\n",
|
|
|
|
|
|
|
+ "%s src_cnt: %d len: %zu flags: %lx\n",
|
|
|
__func__, src_cnt, len, flags);
|
|
__func__, src_cnt, len, flags);
|
|
|
|
|
|
|
|
if (dmaf_p_disabled_continue(flags))
|
|
if (dmaf_p_disabled_continue(flags))
|
|
@@ -692,7 +692,7 @@ iop_adma_prep_dma_pq_val(struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src,
|
|
|
return NULL;
|
|
return NULL;
|
|
|
BUG_ON(len > IOP_ADMA_XOR_MAX_BYTE_COUNT);
|
|
BUG_ON(len > IOP_ADMA_XOR_MAX_BYTE_COUNT);
|
|
|
|
|
|
|
|
- dev_dbg(iop_chan->device->common.dev, "%s src_cnt: %d len: %u\n",
|
|
|
|
|
|
|
+ dev_dbg(iop_chan->device->common.dev, "%s src_cnt: %d len: %zu\n",
|
|
|
__func__, src_cnt, len);
|
|
__func__, src_cnt, len);
|
|
|
|
|
|
|
|
spin_lock_bh(&iop_chan->lock);
|
|
spin_lock_bh(&iop_chan->lock);
|