From patchwork Mon Nov 16 16:08:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7628621 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@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 0AE86BF90C for ; Mon, 16 Nov 2015 16:09:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0948D2053C for ; Mon, 16 Nov 2015 16:09:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E34C020450 for ; Mon, 16 Nov 2015 16:09:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751824AbbKPQJb (ORCPT ); Mon, 16 Nov 2015 11:09:31 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:58140 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751611AbbKPQJa (ORCPT ); Mon, 16 Nov 2015 11:09:30 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0Mhgu7-1ZlLWn2eqh-00MphL; Mon, 16 Nov 2015 17:08:46 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-sh@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Ulf Hansson , Kuninori Morimoto , Geert Uytterhoeven , Yoshihiro Kaneko , Laurent Pinchart , Kouichi Tomita , Simon Horman , Magnus Damm Subject: [PATCH] mmc: sh_mmcif: rework dma channel handling Date: Mon, 16 Nov 2015 17:08:41 +0100 Message-ID: <5324212.8m5CM0vuVo@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:VVN8qhvb8Pvkz3jXgTRM7z8ly+bKRak/otRgfq2vbFMMxq77ICG ZsoxfAlUpLXyiC8b4SgvDRNzNUMngdS4X6yf7ozS2f5NRAVfnAv6l3v/4j/cnKIbxO7xgT9 Z2vRDRuq2SAvpi8XgsKVGFtRX8SSSL/Pi15CrvOapixSF3kFN9hbTEIBBIvUBr0DbPtnP9e ZB8DflIR1yTqoVZ8kamhA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Y70A3Ru3Qcs=:T9R6t+oAUmqoPJdXQ3aAPF BpVU6Kxdo4l9xNKXN3KozIdO7AGDgijzmP+lwXD3e9f0l5DHPfyMTOUBN0/c3gxqXbPjFxYS6 uQ/FOb9senBPci+caBoA9BQ2vtZfjUGptyZ2HAaC1d8g4m9ZTRzTXEa+QQ957VfoNm19wYrkq Bo3Le7us93ilUzOh3UF6ldgRLR4oznWh+yMZm0cx5OJ9VwXSPkqfkmIUGprM9bzEyufDoSDaB +YJWnBnSWVEJH1yhsXENQ8WcUiGi/OMmlbmwACJgo5vNUW39ggnPH9K3vHOo/H2/084xzmU28 mSOX9KNbUbDgbXQMbHOj2pmYVsjlyaVe6okQWCouhJMrjcRV9s08xy2BctJeWryuNEJULU3dW d9e981eg8vC9APJE9PrdTo9GcKQHp6cPY55WdNndd+aEvpI75Is97VrvDnGLJFFhv18mRfV3t yB2tVxzlCdWWE+Be4U+ySP9FSuBckit+YzSvAE60j+0T0A9+1FLQFXsSfQwGBmD4koiBo2Tmo j3VJwMqVEzWOzwLW4WfdOUR6g4ngwQP7ZLHviUqQ3DcsVORjYcr+4kUhLmKhpYaZ/FU1e5X8Y j/oRhgiamBVGWHmfkLtlatfsvMudVKgp8qrcCqULEt3Bj1RK0kuW6ZsSiq1Kr0cL+OD9RX76V FgPsooERZKzgYdtWReM4Yo12VoFyQoGJJdc7oV7spADtHJSgjEOEJgj7m/cHBaCBXlldqZcET yRv9cgvJGV4WCl/K Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 When compiling the sh_mmcif driver for ARM64, we currently get a harmless build warning: ../drivers/mmc/host/sh_mmcif.c: In function 'sh_mmcif_request_dma_one': ../drivers/mmc/host/sh_mmcif.c:417:4: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] (void *)pdata->slave_id_tx : ^ ../drivers/mmc/host/sh_mmcif.c:418:4: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] (void *)pdata->slave_id_rx; This could be worked around by adding another cast to uintptr_t, but I decided to simplify the code a little more to avoid that. This splits out the platform data using code into a separate function and builds that only for CONFIG_SUPERH. This part still has a typecast but does not need a second one. The SH platform code could be further modified to pass a pointer directly as we do on other architectures when we have a filter function. The normal case is simplified further and now just calls dma_request_slave_channel() directly without going through the compat handling. Signed-off-by: Arnd Bergmann --- drivers/mmc/host/sh_mmcif.c | 80 +++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 46 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index ad9ffea7d659..d964c99f3a30 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -397,38 +397,26 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host) } static struct dma_chan * -sh_mmcif_request_dma_one(struct sh_mmcif_host *host, - struct sh_mmcif_plat_data *pdata, - enum dma_transfer_direction direction) +sh_mmcif_request_dma_pdata(struct sh_mmcif_host *host, uintptr_t slave_id) { - struct dma_slave_config cfg = { 0, }; - struct dma_chan *chan; - void *slave_data = NULL; - struct resource *res; - struct device *dev = sh_mmcif_host_to_dev(host); dma_cap_mask_t mask; - int ret; dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); + if (slave_id <= 0) + return NULL; - if (pdata) - slave_data = direction == DMA_MEM_TO_DEV ? - (void *)pdata->slave_id_tx : - (void *)pdata->slave_id_rx; - - chan = dma_request_slave_channel_compat(mask, shdma_chan_filter, - slave_data, dev, - direction == DMA_MEM_TO_DEV ? "tx" : "rx"); - - dev_dbg(dev, "%s: %s: got channel %p\n", __func__, - direction == DMA_MEM_TO_DEV ? "TX" : "RX", chan); + return dma_request_channel(mask, shdma_chan_filter, (void *)slave_id); +} - if (!chan) - return NULL; +static int sh_mmcif_dma_slave_config(struct sh_mmcif_host *host, + struct dma_chan *chan, + enum dma_transfer_direction direction) +{ + struct resource *res; + struct dma_slave_config cfg = { 0, }; res = platform_get_resource(host->pd, IORESOURCE_MEM, 0); - cfg.direction = direction; if (direction == DMA_DEV_TO_MEM) { @@ -439,38 +427,38 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host, cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; } - ret = dmaengine_slave_config(chan, &cfg); - if (ret < 0) { - dma_release_channel(chan); - return NULL; - } - - return chan; + return dmaengine_slave_config(chan, &cfg); } -static void sh_mmcif_request_dma(struct sh_mmcif_host *host, - struct sh_mmcif_plat_data *pdata) +static void sh_mmcif_request_dma(struct sh_mmcif_host *host) { struct device *dev = sh_mmcif_host_to_dev(host); host->dma_active = false; - if (pdata) { - if (pdata->slave_id_tx <= 0 || pdata->slave_id_rx <= 0) - return; - } else if (!dev->of_node) { - return; + /* We can only either use DMA for both Tx and Rx or not use it at all */ + if (IS_ENABLED(CONFIG_SUPERH) && dev->platform_data) { + struct sh_mmcif_plat_data *pdata = dev->platform_data; + host->chan_tx = sh_mmcif_request_dma_pdata(host, pdata->slave_id_tx); + host->chan_rx = sh_mmcif_request_dma_pdata(host, pdata->slave_id_rx); + } else { + host->chan_tx = dma_request_slave_channel(dev, "tx"); + host->chan_tx = dma_request_slave_channel(dev, "rx"); } + dev_dbg(dev, "%s: got channel TX %p RX %p\n", __func__, host->chan_tx, host->chan_rx); - /* We can only either use DMA for both Tx and Rx or not use it at all */ - host->chan_tx = sh_mmcif_request_dma_one(host, pdata, DMA_MEM_TO_DEV); - if (!host->chan_tx) - return; + if (!host->chan_tx || !host->chan_rx || + sh_mmcif_dma_slave_config(host, host->chan_tx, DMA_MEM_TO_DEV) || + sh_mmcif_dma_slave_config(host, host->chan_rx, DMA_DEV_TO_MEM)) + goto error; - host->chan_rx = sh_mmcif_request_dma_one(host, pdata, DMA_DEV_TO_MEM); - if (!host->chan_rx) { + return; + +error: + if (host->chan_tx) dma_release_channel(host->chan_tx); - host->chan_tx = NULL; - } + if (host->chan_rx) + dma_release_channel(host->chan_rx); + host->chan_tx = host->chan_rx = NULL; } static void sh_mmcif_release_dma(struct sh_mmcif_host *host) @@ -1102,7 +1090,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (ios->power_mode == MMC_POWER_UP) { if (!host->card_present) { /* See if we also get DMA */ - sh_mmcif_request_dma(host, dev->platform_data); + sh_mmcif_request_dma(host); host->card_present = true; } sh_mmcif_set_power(host, ios);