From patchwork Tue Mar 15 08:54:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 8586371 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C421EC0553 for ; Tue, 15 Mar 2016 09:05:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EDC620219 for ; Tue, 15 Mar 2016 09:05:54 +0000 (UTC) Received: from bombadil.infradead.org (unknown [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD21520212 for ; Tue, 15 Mar 2016 09:05:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1afklf-0008Fr-HE; Tue, 15 Mar 2016 08:55:55 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1afkla-0006mE-Sv for linux-arm-kernel@lists.infradead.org; Tue, 15 Mar 2016 08:55:52 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id u2F8s8Ql018584; Tue, 15 Mar 2016 03:54:08 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u2F8s81G028117; Tue, 15 Mar 2016 03:54:08 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Tue, 15 Mar 2016 03:54:07 -0500 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u2F8s5RC018882; Tue, 15 Mar 2016 03:54:05 -0500 Subject: Re: [PATCH v2 4/5] mmc: davinci: don't use dma platform resources To: David Lechner , References: <56E6BF7E.7020401@ti.com> <1457996081-21975-1-git-send-email-david@lechnology.com> <1457996081-21975-5-git-send-email-david@lechnology.com> From: Peter Ujfalusi Message-ID: <56E7CDAC.1090907@ti.com> Date: Tue, 15 Mar 2016 10:54:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <1457996081-21975-5-git-send-email-david@lechnology.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160315_015551_118076_79C121E4 X-CRM114-Status: GOOD ( 21.85 ) X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, khilman@kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RDNS_NONE,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 03/15/16 00:54, David Lechner wrote: > The davinci arch now has dma_slave_map tables for dma resources, so it is > no longer necessary to pass dma resources through the platform device. > > Signed-off-by: David Lechner > --- > > v2 changes: Remove platform_get_resource completly instead of just ignoring it. > > > drivers/mmc/host/davinci_mmc.c | 19 ++----------------- > 1 file changed, 2 insertions(+), 17 deletions(-) > > diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c > index 8d10a92..dc96401 100644 > --- a/drivers/mmc/host/davinci_mmc.c > +++ b/drivers/mmc/host/davinci_mmc.c > @@ -202,7 +202,6 @@ struct mmc_davinci_host { > u32 buffer_bytes_left; > u32 bytes_left; > > - u32 rxdma, txdma; > struct dma_chan *dma_tx; > struct dma_chan *dma_rx; > bool use_dma; > @@ -520,16 +519,14 @@ static int __init davinci_acquire_dma_channels(struct mmc_davinci_host *host) > dma_cap_set(DMA_SLAVE, mask); > > host->dma_tx = > - dma_request_slave_channel_compat(mask, edma_filter_fn, > - &host->txdma, mmc_dev(host->mmc), "tx"); > + dma_request_slave_channel(mmc_dev(host->mmc), "tx"); you would need to use dma_request_chan() to be able to rely on the legacy channel mapping. I have staged commits for converting all daVinci and OMAP drivers, I'll attach the patch I have for davinci-mmc for reference. When we convert to use the dma_request_chan() we can handle deferred probing also... > if (!host->dma_tx) { > dev_err(mmc_dev(host->mmc), "Can't get dma_tx channel\n"); > return -ENODEV; > } > > host->dma_rx = > - dma_request_slave_channel_compat(mask, edma_filter_fn, > - &host->rxdma, mmc_dev(host->mmc), "rx"); > + dma_request_slave_channel(mmc_dev(host->mmc), "rx"); > if (!host->dma_rx) { > dev_err(mmc_dev(host->mmc), "Can't get dma_rx channel\n"); > r = -ENODEV; > @@ -1251,18 +1248,6 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) > host = mmc_priv(mmc); > host->mmc = mmc; /* Important */ > > - r = platform_get_resource(pdev, IORESOURCE_DMA, 0); > - if (!r) > - dev_warn(&pdev->dev, "RX DMA resource not specified\n"); > - else > - host->rxdma = r->start; > - > - r = platform_get_resource(pdev, IORESOURCE_DMA, 1); > - if (!r) > - dev_warn(&pdev->dev, "TX DMA resource not specified\n"); > - else > - host->txdma = r->start; > - > host->mem_res = mem; > host->base = devm_ioremap(&pdev->dev, mem->start, mem_size); > if (!host->base) > From c349c76720ffa6e203eff3865de2da8e4c0b415c Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Mon, 21 Dec 2015 12:47:07 +0200 Subject: [PATCH] mmc: davinci_mmc: Use dma_request_chan() to requesting DMA channel With the new dma_request_chan() the client driver does not need to look for the DMA resource and it does not need to pass filter_fn anymore. By switching to the new API the driver can now support deferred probing against DMA. Signed-off-by: Peter Ujfalusi --- drivers/mmc/host/davinci_mmc.c | 52 ++++++++++++------------------------------ 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 693144e7427b..9edc37d207d2 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -32,12 +32,10 @@ #include #include #include -#include #include #include #include -#include #include /* @@ -513,35 +511,20 @@ davinci_release_dma_channels(struct mmc_davinci_host *host) static int __init davinci_acquire_dma_channels(struct mmc_davinci_host *host) { - int r; - dma_cap_mask_t mask; - - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - - host->dma_tx = - dma_request_slave_channel_compat(mask, edma_filter_fn, - &host->txdma, mmc_dev(host->mmc), "tx"); - if (!host->dma_tx) { + host->dma_tx = dma_request_chan(mmc_dev(host->mmc), "tx"); + if (IS_ERR(host->dma_tx)) { dev_err(mmc_dev(host->mmc), "Can't get dma_tx channel\n"); - return -ENODEV; + return PTR_ERR(host->dma_tx); } - host->dma_rx = - dma_request_slave_channel_compat(mask, edma_filter_fn, - &host->rxdma, mmc_dev(host->mmc), "rx"); - if (!host->dma_rx) { + host->dma_rx = dma_request_chan(mmc_dev(host->mmc), "rx"); + if (IS_ERR(host->dma_rx)) { dev_err(mmc_dev(host->mmc), "Can't get dma_rx channel\n"); - r = -ENODEV; - goto free_master_write; + dma_release_channel(host->dma_tx); + return PTR_ERR(host->dma_rx); } return 0; - -free_master_write: - dma_release_channel(host->dma_tx); - - return r; } /*----------------------------------------------------------------------*/ @@ -1253,18 +1236,6 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) host = mmc_priv(mmc); host->mmc = mmc; /* Important */ - r = platform_get_resource(pdev, IORESOURCE_DMA, 0); - if (!r) - dev_warn(&pdev->dev, "RX DMA resource not specified\n"); - else - host->rxdma = r->start; - - r = platform_get_resource(pdev, IORESOURCE_DMA, 1); - if (!r) - dev_warn(&pdev->dev, "TX DMA resource not specified\n"); - else - host->txdma = r->start; - host->mem_res = mem; host->base = ioremap(mem->start, mem_size); if (!host->base) @@ -1291,8 +1262,13 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) host->mmc_irq = irq; host->sdio_irq = platform_get_irq(pdev, 1); - if (host->use_dma && davinci_acquire_dma_channels(host) != 0) - host->use_dma = 0; + if (host->use_dma) { + ret = davinci_acquire_dma_channels(host); + if (ret == -EPROBE_DEFER) + goto out; + else if (ret) + host->use_dma = 0; + } /* REVISIT: someday, support IRQ-driven card detection. */ mmc->caps |= MMC_CAP_NEEDS_POLL; -- 2.7.3