Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933279AbXJRBGG (ORCPT ); Wed, 17 Oct 2007 21:06:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758570AbXJRBFz (ORCPT ); Wed, 17 Oct 2007 21:05:55 -0400 Received: from mga02.intel.com ([134.134.136.20]:10008 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758258AbXJRBFy (ORCPT ); Wed, 17 Oct 2007 21:05:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.21,292,1188802800"; d="scan'208";a="249652260" From: Shannon Nelson Subject: [PATCH] I/OAT: Add completion callback for async_tx interface use (take 2) To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: shannon.nelson@intel.com, dan.j.williams@intel.com, davem@davemloft.net Date: Wed, 17 Oct 2007 18:04:11 -0700 Message-ID: <20071018010411.32210.82661.stgit@localhost.localdomain> User-Agent: StGIT/0.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2613 Lines: 75 The async_tx interface includes a completion callback. This adds support for using that callback, including using interrupts on completion. This second try does better at defining the callback prototype. Cc: David Miller Signed-off-by: Shannon Nelson --- drivers/dma/ioat_dma.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index 117ac38..517bfa1 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c @@ -212,6 +212,18 @@ static dma_cookie_t ioat_tx_submit(struct dma_async_tx_descriptor *tx) } while (len && (new = ioat_dma_get_next_descriptor(ioat_chan))); hw->ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS; + if (new->async_tx.callback) { + hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN; + if (first != new) { + /* move callback into to last desc */ + new->async_tx.callback = first->async_tx.callback; + new->async_tx.callback_param + = first->async_tx.callback_param; + first->async_tx.callback = NULL; + first->async_tx.callback_param = NULL; + } + } + new->tx_cnt = desc_count; new->async_tx.ack = orig_ack; /* client is in control of this ack */ @@ -516,6 +528,11 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan) pci_unmap_addr(desc, src), pci_unmap_len(desc, len), PCI_DMA_TODEVICE); + if (desc->async_tx.callback) { + desc->async_tx.callback( + desc->async_tx.callback_param); + desc->async_tx.callback = NULL; + } } if (desc->async_tx.phys != phys_complete) { @@ -637,6 +654,12 @@ static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan) */ #define IOAT_TEST_SIZE 2000 +static void ioat_dma_test_callback(void *dma_async_param) +{ + printk(KERN_ERR "ioatdma: ioat_dma_test_callback(%p)\n", + dma_async_param); +} + /** * ioat_dma_self_test - Perform a IOAT transaction to verify the HW works. * @device: device to be tested @@ -691,6 +714,8 @@ static int ioat_dma_self_test(struct ioatdma_device *device) addr = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE); ioat_set_dest(addr, tx, 0); + tx->callback = ioat_dma_test_callback; + tx->callback_param = (void *)0x8086; cookie = ioat_tx_submit(tx); if (cookie < 0) { dev_err(&device->pdev->dev, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/