async_tx/dmaengine fixes for 2.6.25-rc
Subsystems (4)
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/djbw/async_tx.git fixes
to receive:
Dan Williams (1):
async_tx: checkpatch says s/__FUNCTION__/__func__/g
Harvey Harrison (1):
iop-adma.c: replace remaining __FUNCTION__ occurrences
Zhang Wei (4):
fsldma: Fix fsldma.c warning messages when it's compiled under PPC64.
dmaengine: Fix a bug about BUG_ON() on DMA engine capability DMA_INTERRUPT.
fsldma: Add device_prep_dma_interrupt support to fsldma.c
fsldma: Add a completed cookie updated action in DMA finish interrupt.
crypto/async_tx/async_memcpy.c | 6 ++-- crypto/async_tx/async_memset.c | 6 ++-- crypto/async_tx/async_tx.c | 6 ++-- crypto/async_tx/async_xor.c | 12 ++++---- drivers/dma/dmaengine.c | 2 +- drivers/dma/fsldma.c | 58 ++++++++++++++++++++++++++++++--------- drivers/dma/iop-adma.c | 32 +++++++++++----------- 7 files changed, 76 insertions(+), 46 deletions(-)
This addresses a few issues with the recently merged fsldma driver, fixes a buglet in dmaengine, and the rest are simple cleanups.
Regards,
Dan
crypto/async_tx/async_memcpy.c +3 -3
@@ -66,11 +66,11 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, }if (tx) { -pr_debug ("%s: (async) len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: (async) len: %zu\n" , __func__, len);async_tx_submit (chan, tx, flags, depend_tx, cb_fn, cb_param); }else {void *dest_buf, *src_buf; -pr_debug ("%s: (sync) len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: (sync) len: %zu\n" , __func__, len);/* wait for any prerequisite operations */ if (depend_tx) {
@@ -80,7 +80,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,BUG_ON (depend_tx->ack);if (dma_wait_for_async_tx (depend_tx) ==DMA_ERROR )panic ("%s: DMA_ERROR waiting for depend_tx\n" , - __FUNCTION__); + __func__); } dest_buf =kmap_atomic (dest,KM_USER0 ) + dest_offset;
crypto/async_tx/async_memset.c +3 -3
@@ -63,11 +63,11 @@ async_memset(struct page *dest, int val, unsigned int offset, }if (tx) { -pr_debug ("%s: (async) len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: (async) len: %zu\n" , __func__, len);async_tx_submit (chan, tx, flags, depend_tx, cb_fn, cb_param); }else {/* run the memset synchronously */ void *dest_buf; -pr_debug ("%s: (sync) len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: (sync) len: %zu\n" , __func__, len); dest_buf = (void *) (((char *)page_address (dest)) + offset);
@@ -79,7 +79,7 @@ async_memset(struct page *dest, int val, unsigned int offset,BUG_ON (depend_tx->ack);if (dma_wait_for_async_tx (depend_tx) ==DMA_ERROR )panic ("%s: DMA_ERROR waiting for depend_tx\n" , - __FUNCTION__); + __func__); }memset (dest_buf, val, len);
crypto/async_tx/async_tx.c +3 -3
@@ -472,11 +472,11 @@ async_trigger_callback(enum async_tx_flags flags, tx =NULL ;if (tx) { -pr_debug ("%s: (async)\n" , __FUNCTION__); +pr_debug ("%s: (async)\n" , __func__);async_tx_submit (chan, tx, flags, depend_tx, cb_fn, cb_param); }else { -pr_debug ("%s: (sync)\n" , __FUNCTION__); +pr_debug ("%s: (sync)\n" , __func__);/* wait for any prerequisite operations */ if (depend_tx) {
@@ -486,7 +486,7 @@ async_trigger_callback(enum async_tx_flags flags,BUG_ON (depend_tx->ack);if (dma_wait_for_async_tx (depend_tx) ==DMA_ERROR )panic ("%s: DMA_ERROR waiting for depend_tx\n" , - __FUNCTION__); + __func__); }async_tx_sync_epilog (flags, depend_tx, cb_fn, cb_param);
crypto/async_tx/async_xor.c +6 -6
@@ -47,7 +47,7 @@ do_async_xor(struct dma_device *device,int i;unsigned long dma_prep_flags = cb_fn ?DMA_PREP_INTERRUPT :0 ; -pr_debug ("%s: len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: len: %zu\n" , __func__, len); dma_dest =dma_map_page (device->dev, dest, offset, len,DMA_FROM_DEVICE );
@@ -86,7 +86,7 @@ do_sync_xor(struct page *dest, struct page **src_list, unsigned int offset,void *_dest;int i; -pr_debug ("%s: len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: len: %zu\n" , __func__, len);/* reuse the 'src_list' array to convert to buffer pointers */ for (i =0 ; i < src_cnt; i++)
@@ -196,7 +196,7 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset, DMA_ERROR) panic("%s: DMA_ERROR waiting for ""depend_tx\n" , - __FUNCTION__); + __func__); } do_sync_xor(dest, &src_list[src_off], offset,
@@ -276,7 +276,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list,unsigned long dma_prep_flags = cb_fn ?DMA_PREP_INTERRUPT :0 ;int i; -pr_debug ("%s: (async) len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: (async) len: %zu\n" , __func__, len);for (i =0 ; i < src_cnt; i++) dma_src[i] = dma_map_page(device->dev, src_list[i],
@@ -299,7 +299,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, }else {unsigned long xor_flags = flags; -pr_debug ("%s: (sync) len: %zu\n" , __FUNCTION__, len); +pr_debug ("%s: (sync) len: %zu\n" , __func__, len); xor_flags |=ASYNC_TX_XOR_DROP_DST ; xor_flags &= ~ASYNC_TX_ACK ;
@@ -310,7 +310,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list,if (tx) {if (dma_wait_for_async_tx (tx) ==DMA_ERROR )panic ("%s: DMA_ERROR waiting for tx\n" , - __FUNCTION__); + __func__);async_tx_ack (tx); }
drivers/dma/dmaengine.c +1 -1
@@ -357,7 +357,7 @@ int dma_async_device_register(struct dma_device *device) !device->device_prep_dma_zero_sum);BUG_ON (dma_has_cap (DMA_MEMSET , device->cap_mask) && !device->device_prep_dma_memset); -BUG_ON (dma_has_cap (DMA_ZERO_SUM , device->cap_mask) && +BUG_ON (dma_has_cap (DMA_INTERRUPT , device->cap_mask) && !device->device_prep_dma_interrupt);BUG_ON (!device->device_alloc_chan_resources);
drivers/dma/fsldma.c +44 -14
142 lines not on this page · raw message
drivers/dma/iop-adma.c +16 -16
@@ -140,7 +140,7 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)int busy =iop_chan_is_busy (iop_chan);int seen_current =0 , slot_cnt =0 , slots_per_op =0 ; -dev_dbg (iop_chan->device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (iop_chan->device->common.dev,"%s\n" , __func__);/* free completed slots from the chain starting with * the oldest descriptor */
@@ -438,7 +438,7 @@ iop_adma_tx_submit(struct dma_async_tx_descriptor *tx)spin_unlock_bh (&iop_chan->lock);dev_dbg (iop_chan->device->common.dev,"%s cookie: %d slot: %d\n" , - __FUNCTION__, sw_desc->async_tx.cookie, sw_desc->idx); + __func__, sw_desc->async_tx.cookie, sw_desc->idx);return cookie; }
@@ -520,7 +520,7 @@ iop_adma_prep_dma_interrupt(struct dma_chan *chan)struct iop_adma_desc_slot *sw_desc, *grp_start;int slot_cnt, slots_per_op; -dev_dbg (iop_chan->device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (iop_chan->device->common.dev,"%s\n" , __func__);spin_lock_bh (&iop_chan->lock); slot_cnt =iop_chan_interrupt_slot_count (&slots_per_op, iop_chan);
@@ -548,7 +548,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,BUG_ON (unlikely (len >IOP_ADMA_MAX_BYTE_COUNT ));dev_dbg (iop_chan->device->common.dev,"%s len: %u\n" , - __FUNCTION__, len); + __func__, len);spin_lock_bh (&iop_chan->lock); slot_cnt =iop_chan_memcpy_slot_count (len, &slots_per_op);
@@ -580,7 +580,7 @@ iop_adma_prep_dma_memset(struct dma_chan *chan, dma_addr_t dma_dest,BUG_ON (unlikely (len >IOP_ADMA_MAX_BYTE_COUNT ));dev_dbg (iop_chan->device->common.dev,"%s len: %u\n" , - __FUNCTION__, len); + __func__, len);spin_lock_bh (&iop_chan->lock); slot_cnt =iop_chan_memset_slot_count (len, &slots_per_op);
@@ -614,7 +614,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u flags: %lx\n" , - __FUNCTION__, src_cnt, len, flags); + __func__, src_cnt, len, flags);spin_lock_bh (&iop_chan->lock); slot_cnt =iop_chan_xor_slot_count (len, src_cnt, &slots_per_op);
@@ -648,7 +648,7 @@ iop_adma_prep_dma_zero_sum(struct dma_chan *chan, dma_addr_t *dma_src,return NULL ;dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , - __FUNCTION__, src_cnt, len); + __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock); slot_cnt =iop_chan_zero_sum_slot_count (len, src_cnt, &slots_per_op);
@@ -659,7 +659,7 @@ iop_adma_prep_dma_zero_sum(struct dma_chan *chan, dma_addr_t *dma_src,iop_desc_set_zero_sum_byte_count (grp_start, len); grp_start->xor_check_result = result;pr_debug ("\t%s: grp_start->xor_check_result: %p\n" , - __FUNCTION__, grp_start->xor_check_result); + __func__, grp_start->xor_check_result); sw_desc->unmap_src_cnt = src_cnt; sw_desc->unmap_len = len;while (src_cnt--)
@@ -700,7 +700,7 @@ static void iop_adma_free_chan_resources(struct dma_chan *chan) iop_chan->last_used =NULL ;dev_dbg (iop_chan->device->common.dev,"%s slots_allocated %d\n" , - __FUNCTION__, iop_chan->slots_allocated); + __func__, iop_chan->slots_allocated);spin_unlock_bh (&iop_chan->lock);/* one is ok since we left it on there on purpose */
@@ -753,7 +753,7 @@ static irqreturn_t iop_adma_eot_handler(int irq, void *data) {struct iop_adma_chan *chan = data; -dev_dbg (chan->device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (chan->device->common.dev,"%s\n" , __func__);tasklet_schedule (&chan->irq_tasklet);
@@ -766,7 +766,7 @@ static irqreturn_t iop_adma_eoc_handler(int irq, void *data) {struct iop_adma_chan *chan = data; -dev_dbg (chan->device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (chan->device->common.dev,"%s\n" , __func__);tasklet_schedule (&chan->irq_tasklet);
@@ -823,7 +823,7 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)int err =0 ;struct iop_adma_chan *iop_chan; -dev_dbg (device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (device->common.dev,"%s\n" , __func__); src =kzalloc (sizeof (u8) *IOP_ADMA_TEST_SIZE ,GFP_KERNEL );if (!src)
@@ -906,7 +906,7 @@ iop_adma_xor_zero_sum_self_test(struct iop_adma_device *device)int err =0 ;struct iop_adma_chan *iop_chan; -dev_dbg (device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (device->common.dev,"%s\n" , __func__);for (src_idx =0 ; src_idx <IOP_ADMA_NUM_SRC_TEST ; src_idx++) { xor_srcs[src_idx] =alloc_page (GFP_KERNEL );
@@ -1159,7 +1159,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev) }dev_dbg (&pdev->dev,"%s: allocted descriptor pool virt %p phys %p\n" , - __FUNCTION__, adev->dma_desc_pool_virt, + __func__, adev->dma_desc_pool_virt, (void *) adev->dma_desc_pool); adev->id = plat_data->hw_id;
@@ -1289,7 +1289,7 @@ static void iop_chan_start_null_memcpy(struct iop_adma_chan *iop_chan)dma_cookie_t cookie;int slot_cnt, slots_per_op; -dev_dbg (iop_chan->device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (iop_chan->device->common.dev,"%s\n" , __func__);spin_lock_bh (&iop_chan->lock); slot_cnt =iop_chan_memcpy_slot_count (0 , &slots_per_op);
@@ -1346,7 +1346,7 @@ static void iop_chan_start_null_xor(struct iop_adma_chan *iop_chan)dma_cookie_t cookie;int slot_cnt, slots_per_op; -dev_dbg (iop_chan->device->common.dev,"%s\n" , __FUNCTION__); +dev_dbg (iop_chan->device->common.dev,"%s\n" , __func__);spin_lock_bh (&iop_chan->lock); slot_cnt =iop_chan_xor_slot_count (0 ,2 , &slots_per_op);