From patchwork Mon Dec 14 13:30:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishnu Suresh X-Patchwork-Id: 41102 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id AB1C6B7C1D for ; Tue, 15 Dec 2009 00:30:57 +1100 (EST) Received: by ozlabs.org (Postfix) id 341E1B6F14; Tue, 15 Dec 2009 00:30:52 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from az33egw02.freescale.net (az33egw02.freescale.net [192.88.158.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "az33egw02.freescale.net", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id CCBA9B6EF5 for ; Tue, 15 Dec 2009 00:30:51 +1100 (EST) Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/az33egw02) with ESMTP id nBEDUVrg002031; Mon, 14 Dec 2009 06:30:32 -0700 (MST) Received: from lc1105.zin33.ap.freescale.net (lc1105.zin33.ap.freescale.net [10.232.3.105]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id nBEDYnwc007826; Mon, 14 Dec 2009 07:34:49 -0600 (CST) Received: by lc1105.zin33.ap.freescale.net (Postfix, from userid 4688) id C00C428065; Mon, 14 Dec 2009 19:00:27 +0530 (IST) From: Vishnu Suresh To: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, dan.j.williams@intel.com Subject: [PATCH v1] fsldma: Delete DMA_INTERRUPT capability Date: Mon, 14 Dec 2009 19:00:23 +0530 Message-Id: <1260797423-7352-1-git-send-email-Vishnu@freescale.com> X-Mailer: git-send-email 1.6.4.2 Cc: Vishnu Suresh , B04825@freescale.com, R58472@freescale.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org The DMA_INTERRUPT is a NULL transfer, triggering a Programming Error. Though this Error is handled in the driver with the fix given in "fsldma: Fix the DMA halt when using DMA_INTERRUPT async_tx transfer." , the RAID5 operation, which initiated the transaction via Async_tx, hangs. Hence, this patch removes the DMA_INTERRUPT capability and the associated code from the driver. Signed-off-by: Vishnu Suresh --- Changes with respect to v0 o. The functionality is removed instead of disabling as per comments o. Rebased to linux-next as of 20091214 drivers/dma/fsldma.c | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 296f9e7..272097a 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -449,35 +449,6 @@ static void fsl_dma_free_chan_resources(struct dma_chan *chan) fsl_chan->desc_pool = NULL; } -static struct dma_async_tx_descriptor * -fsl_dma_prep_interrupt(struct dma_chan *chan, unsigned long flags) -{ - struct fsl_dma_chan *fsl_chan; - struct fsl_desc_sw *new; - - if (!chan) - return NULL; - - fsl_chan = to_fsl_chan(chan); - - new = fsl_dma_alloc_descriptor(fsl_chan); - if (!new) { - dev_err(fsl_chan->dev, "No free memory for link descriptor\n"); - return NULL; - } - - new->async_tx.cookie = -EBUSY; - new->async_tx.flags = flags; - - /* Insert the link descriptor to the LD ring */ - list_add_tail(&new->node, &new->tx_list); - - /* Set End-of-link to the last link descriptor of new list*/ - set_ld_eol(fsl_chan, new); - - return &new->async_tx; -} - static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy( struct dma_chan *chan, dma_addr_t dma_dest, dma_addr_t dma_src, size_t len, unsigned long flags) @@ -1200,11 +1171,9 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev, - fdev->reg.start + 1); dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask); - dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask); dma_cap_set(DMA_SLAVE, fdev->common.cap_mask); fdev->common.device_alloc_chan_resources = fsl_dma_alloc_chan_resources; fdev->common.device_free_chan_resources = fsl_dma_free_chan_resources; - fdev->common.device_prep_dma_interrupt = fsl_dma_prep_interrupt; fdev->common.device_prep_dma_memcpy = fsl_dma_prep_memcpy; fdev->common.device_is_tx_complete = fsl_dma_is_complete; fdev->common.device_issue_pending = fsl_dma_memcpy_issue_pending;