From patchwork Wed Jul 4 16:17:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1157001 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id ED11C3FE4F for ; Wed, 4 Jul 2012 16:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754852Ab2GDQST (ORCPT ); Wed, 4 Jul 2012 12:18:19 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:54448 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754810Ab2GDQSA (ORCPT ); Wed, 4 Jul 2012 12:18:00 -0400 Received: from axis700.grange (dslb-188-109-038-248.pools.arcor-ip.net [188.109.38.248]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0M47AF-1RwYTT2nT9-00rrMJ; Wed, 04 Jul 2012 18:17:45 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 36ACC18B070; Wed, 4 Jul 2012 18:17:44 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1SmSGu-0006Mm-0U; Wed, 04 Jul 2012 18:17:44 +0200 From: Guennadi Liakhovetski To: Vinod Koul Cc: Magnus Damm , linux-sh@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] mmc: sh_mmcif: switch to the new DMA channel allocation and configuration Date: Wed, 4 Jul 2012 18:17:43 +0200 Message-Id: <1341418663-24432-5-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1341418663-24432-1-git-send-email-g.liakhovetski@gmx.de> References: <1341418663-24432-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:dqOGd7EcSUBKsY/67o3iFFV0Lb906QZ2nDd9+B4Tclf YcmaN0/ZxmI1CZU/VYgjEuG5+R7lVfFTfN6dnqf5nwNQQsgvhM n6+m40rYjBZazm0fcNYgzzF92cxvl9VaZt6PtFvB814ZHClOXC Xz+ve+SOnf/d7x4hVQ9S1HPYM6L60AbVtxABTCpmcQ5NG4hgQY y2ADYXT4ctsS+ar4SrZFy7+UHdxcczA9DAS7z5Xkct8a9if13d zlfqVWhDlG/yy4PYpf4s7xa0wuWzLDbqodA1q+gK6bEFH7/9vj mf3YrsW3RlA+Zaq/4m9xjyulbpA5p4cwoEfrPyBp1llcEfn7ld ecCCuQpxj6kmgO8+JnX1ftJo6FqLK4tQ2dKV1ZLMtJaw6iVlDG zF3oIbPjVPhQg== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Using the "private" field from struct dma_chan is deprecated. The sh dmaengine driver now also supports the preferred DMA channel allocation and configuration method, using a standard filter function and a channel configuration operation. This patch updates sh_mmcif to use this new method. Signed-off-by: Guennadi Liakhovetski --- drivers/mmc/host/sh_mmcif.c | 90 ++++++++++++++++++++++++------------------ 1 files changed, 51 insertions(+), 39 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 9e3b9b1..0f07d28 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -211,8 +211,6 @@ struct sh_mmcif_host { struct mmc_host *mmc; struct mmc_request *mrq; struct platform_device *pd; - struct sh_dmae_slave dma_slave_tx; - struct sh_dmae_slave dma_slave_rx; struct clk *hclk; unsigned int clk; int bus_width; @@ -371,52 +369,66 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host) desc, cookie); } -static bool sh_mmcif_filter(struct dma_chan *chan, void *arg) -{ - dev_dbg(chan->device->dev, "%s: slave data %p\n", __func__, arg); - chan->private = arg; - return true; -} - static void sh_mmcif_request_dma(struct sh_mmcif_host *host, struct sh_mmcif_plat_data *pdata) { - struct sh_dmae_slave *tx, *rx; + struct resource *res = platform_get_resource(host->pd, IORESOURCE_MEM, 0); + struct dma_slave_config cfg; + dma_cap_mask_t mask; + int ret; + host->dma_active = false; + if (pdata->slave_id_tx <= 0 || pdata->slave_id_rx <= 0) + return; + /* We can only either use DMA for both Tx and Rx or not use it at all */ - tx = &host->dma_slave_tx; - tx->shdma_slave.slave_id = pdata->slave_id_tx; - rx = &host->dma_slave_rx; - rx->shdma_slave.slave_id = pdata->slave_id_rx; + dma_cap_zero(mask); + dma_cap_set(DMA_SLAVE, mask); + + host->chan_tx = dma_request_channel(mask, shdma_chan_filter, + (void *)pdata->slave_id_tx); + dev_dbg(&host->pd->dev, "%s: TX: got channel %p\n", __func__, + host->chan_tx); - if (tx->shdma_slave.slave_id > 0 && rx->shdma_slave.slave_id > 0) { - dma_cap_mask_t mask; + if (!host->chan_tx) + return; - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); + cfg.slave_id = pdata->slave_id_tx; + cfg.direction = DMA_MEM_TO_DEV; + cfg.dst_addr = res->start + MMCIF_CE_DATA; + cfg.src_addr = 0; + ret = dmaengine_slave_config(host->chan_tx, &cfg); + if (ret < 0) + goto ecfgtx; - host->chan_tx = dma_request_channel(mask, sh_mmcif_filter, - &tx->shdma_slave); - dev_dbg(&host->pd->dev, "%s: TX: got channel %p\n", __func__, - host->chan_tx); + host->chan_rx = dma_request_channel(mask, shdma_chan_filter, + (void *)pdata->slave_id_rx); + dev_dbg(&host->pd->dev, "%s: RX: got channel %p\n", __func__, + host->chan_rx); - if (!host->chan_tx) - return; + if (!host->chan_rx) + goto erqrx; - host->chan_rx = dma_request_channel(mask, sh_mmcif_filter, - &rx->shdma_slave); - dev_dbg(&host->pd->dev, "%s: RX: got channel %p\n", __func__, - host->chan_rx); + cfg.slave_id = pdata->slave_id_rx; + cfg.direction = DMA_DEV_TO_MEM; + cfg.dst_addr = 0; + cfg.src_addr = res->start + MMCIF_CE_DATA; + ret = dmaengine_slave_config(host->chan_rx, &cfg); + if (ret < 0) + goto ecfgrx; - if (!host->chan_rx) { - dma_release_channel(host->chan_tx); - host->chan_tx = NULL; - return; - } + init_completion(&host->dma_complete); - init_completion(&host->dma_complete); - } + return; + +ecfgrx: + dma_release_channel(host->chan_rx); + host->chan_rx = NULL; +erqrx: +ecfgtx: + dma_release_channel(host->chan_tx); + host->chan_tx = NULL; } static void sh_mmcif_release_dma(struct sh_mmcif_host *host)