From: Ludovic Desroches <ludovic.desroches@atmel.com> To: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: ulf.hansson@linaro.org, nicolas.ferre@atmel.com, arnd@arndb.de, Ludovic Desroches <ludovic.desroches@atmel.com> Subject: [PATCH v4 4/4] mmc: atmel-mci: use probe deferring if dma controller is not ready yet Date: Mon, 1 Dec 2014 15:35:09 +0100 [thread overview] Message-ID: <1417444509-15501-5-git-send-email-ludovic.desroches@atmel.com> (raw) In-Reply-To: <1417444509-15501-1-git-send-email-ludovic.desroches@atmel.com> Return probe defer if requesting a dma channel without a dma controller probed. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> --- drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 00f6088..1a8e30c 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -2272,29 +2272,24 @@ static void atmci_cleanup_slot(struct atmel_mci_slot *slot, mmc_free_host(slot->mmc); } -static bool atmci_configure_dma(struct atmel_mci *host) +static int atmci_configure_dma(struct atmel_mci *host) { - if (host == NULL) - return false; + host->dma.chan = dma_request_slave_channel_reason(&host->pdev->dev, "rxtx"); + if (IS_ERR(host->dma.chan)) + return PTR_ERR(host->dma.chan); - host->dma.chan = dma_request_slave_channel(&host->pdev->dev, "rxtx"); - if (!host->dma.chan) { - dev_warn(&host->pdev->dev, "no DMA channel available\n"); - return false; - } else { - dev_info(&host->pdev->dev, - "using %s for DMA transfers\n", - dma_chan_name(host->dma.chan)); - - host->dma_conf.src_addr = host->mapbase + ATMCI_RDR; - host->dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - host->dma_conf.src_maxburst = 1; - host->dma_conf.dst_addr = host->mapbase + ATMCI_TDR; - host->dma_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - host->dma_conf.dst_maxburst = 1; - host->dma_conf.device_fc = false; - return true; - } + dev_info(&host->pdev->dev, "using %s for DMA transfers\n", + dma_chan_name(host->dma.chan)); + + host->dma_conf.src_addr = host->mapbase + ATMCI_RDR; + host->dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + host->dma_conf.src_maxburst = 1; + host->dma_conf.dst_addr = host->mapbase + ATMCI_TDR; + host->dma_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + host->dma_conf.dst_maxburst = 1; + host->dma_conf.device_fc = false; + + return 0; } /* @@ -2411,7 +2406,10 @@ static int atmci_probe(struct platform_device *pdev) /* Get MCI capabilities and set operations according to it */ atmci_get_cap(host); - if (atmci_configure_dma(host)) { + ret = atmci_configure_dma(host); + if (ret == -EPROBE_DEFER) + goto err_dma_probe_defer; + if (ret == 0) { host->prepare_data = &atmci_prepare_data_dma; host->submit_data = &atmci_submit_data_dma; host->stop_transfer = &atmci_stop_transfer_dma; @@ -2496,8 +2494,9 @@ err_init_slot: pm_runtime_put_noidle(&pdev->dev); del_timer_sync(&host->timer); - if (host->dma.chan) + if (!IS_ERR(host->dma.chan)) dma_release_channel(host->dma.chan); +err_dma_probe_defer: free_irq(irq, host); return ret; } @@ -2523,7 +2522,7 @@ static int atmci_remove(struct platform_device *pdev) atmci_readl(host, ATMCI_SR); del_timer_sync(&host->timer); - if (host->dma.chan) + if (!IS_ERR(host->dma.chan)) dma_release_channel(host->dma.chan); free_irq(platform_get_irq(pdev, 0), host); -- 2.0.3
WARNING: multiple messages have this Message-ID (diff)
From: ludovic.desroches@atmel.com (Ludovic Desroches) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 4/4] mmc: atmel-mci: use probe deferring if dma controller is not ready yet Date: Mon, 1 Dec 2014 15:35:09 +0100 [thread overview] Message-ID: <1417444509-15501-5-git-send-email-ludovic.desroches@atmel.com> (raw) In-Reply-To: <1417444509-15501-1-git-send-email-ludovic.desroches@atmel.com> Return probe defer if requesting a dma channel without a dma controller probed. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> --- drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 00f6088..1a8e30c 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -2272,29 +2272,24 @@ static void atmci_cleanup_slot(struct atmel_mci_slot *slot, mmc_free_host(slot->mmc); } -static bool atmci_configure_dma(struct atmel_mci *host) +static int atmci_configure_dma(struct atmel_mci *host) { - if (host == NULL) - return false; + host->dma.chan = dma_request_slave_channel_reason(&host->pdev->dev, "rxtx"); + if (IS_ERR(host->dma.chan)) + return PTR_ERR(host->dma.chan); - host->dma.chan = dma_request_slave_channel(&host->pdev->dev, "rxtx"); - if (!host->dma.chan) { - dev_warn(&host->pdev->dev, "no DMA channel available\n"); - return false; - } else { - dev_info(&host->pdev->dev, - "using %s for DMA transfers\n", - dma_chan_name(host->dma.chan)); - - host->dma_conf.src_addr = host->mapbase + ATMCI_RDR; - host->dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - host->dma_conf.src_maxburst = 1; - host->dma_conf.dst_addr = host->mapbase + ATMCI_TDR; - host->dma_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - host->dma_conf.dst_maxburst = 1; - host->dma_conf.device_fc = false; - return true; - } + dev_info(&host->pdev->dev, "using %s for DMA transfers\n", + dma_chan_name(host->dma.chan)); + + host->dma_conf.src_addr = host->mapbase + ATMCI_RDR; + host->dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + host->dma_conf.src_maxburst = 1; + host->dma_conf.dst_addr = host->mapbase + ATMCI_TDR; + host->dma_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + host->dma_conf.dst_maxburst = 1; + host->dma_conf.device_fc = false; + + return 0; } /* @@ -2411,7 +2406,10 @@ static int atmci_probe(struct platform_device *pdev) /* Get MCI capabilities and set operations according to it */ atmci_get_cap(host); - if (atmci_configure_dma(host)) { + ret = atmci_configure_dma(host); + if (ret == -EPROBE_DEFER) + goto err_dma_probe_defer; + if (ret == 0) { host->prepare_data = &atmci_prepare_data_dma; host->submit_data = &atmci_submit_data_dma; host->stop_transfer = &atmci_stop_transfer_dma; @@ -2496,8 +2494,9 @@ err_init_slot: pm_runtime_put_noidle(&pdev->dev); del_timer_sync(&host->timer); - if (host->dma.chan) + if (!IS_ERR(host->dma.chan)) dma_release_channel(host->dma.chan); +err_dma_probe_defer: free_irq(irq, host); return ret; } @@ -2523,7 +2522,7 @@ static int atmci_remove(struct platform_device *pdev) atmci_readl(host, ATMCI_SR); del_timer_sync(&host->timer); - if (host->dma.chan) + if (!IS_ERR(host->dma.chan)) dma_release_channel(host->dma.chan); free_irq(platform_get_irq(pdev, 0), host); -- 2.0.3
next prev parent reply other threads:[~2014-12-01 14:36 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-01 14:35 [PATCH v4 0/4] mmc: atmel-mci: cleanup and probe deferring Ludovic Desroches 2014-12-01 14:35 ` Ludovic Desroches 2014-12-01 14:35 ` [PATCH v4 1/4] mmc: atmel-mci: remove useless DMA stuff for non-dt devices Ludovic Desroches 2014-12-01 14:35 ` Ludovic Desroches 2014-12-01 14:35 ` [PATCH v4 2/4] mmc: atmel-mci: remove __init/__exit attributes Ludovic Desroches 2014-12-01 14:35 ` Ludovic Desroches 2014-12-01 14:35 ` [PATCH v4 3/4] mmc: atmel-mci: stop using specific initcall Ludovic Desroches 2014-12-01 14:35 ` Ludovic Desroches 2014-12-01 14:35 ` Ludovic Desroches [this message] 2014-12-01 14:35 ` [PATCH v4 4/4] mmc: atmel-mci: use probe deferring if dma controller is not ready yet Ludovic Desroches 2014-12-02 10:10 ` [PATCH v4 0/4] mmc: atmel-mci: cleanup and probe deferring Ulf Hansson 2014-12-02 10:10 ` Ulf Hansson 2014-12-03 8:22 ` Ludovic Desroches 2014-12-03 8:22 ` Ludovic Desroches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1417444509-15501-5-git-send-email-ludovic.desroches@atmel.com \ --to=ludovic.desroches@atmel.com \ --cc=arnd@arndb.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mmc@vger.kernel.org \ --cc=nicolas.ferre@atmel.com \ --cc=ulf.hansson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.