From patchwork Wed Apr 17 15:04:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2454041 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 6888D3FC64 for ; Wed, 17 Apr 2013 15:04:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966594Ab3DQPEo (ORCPT ); Wed, 17 Apr 2013 11:04:44 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:57356 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966522Ab3DQPEn (ORCPT ); Wed, 17 Apr 2013 11:04:43 -0400 Received: by mail-wg0-f47.google.com with SMTP id j13so1723153wgh.14 for ; Wed, 17 Apr 2013 08:04:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent:x-gm-message-state; bh=YZzOEmN/1oMBbRoM2vvP8PwayB7cnxfTON86v0D3x6s=; b=g4Ht41DePLCrW3T928+xJMCUlsZ69+H0IPOZvU4lqrfs/tPjVF89oBzn6wUxVjQzoy biKIUi4ktAEMwrorzIWEC4r+ru82UWKQ27kNfnXy5KcLYs/RKVPEsmHYqZAGGzk996tA ezcSC1TOlL6ATIp2h6IoUPLMiTkcdF9dYJJzqivI+ozoZGNgej5QMGCyVhsCrh/gW3zV 3lta+dzoTC8vxe22R3DXyS4o9LxfK4hdYJCrMA5ckIFvzgoW6Wkzlt+VSP2a7QsRdlkr TNDKLsEpUV4MtdYMo4wA4nLvITkQisekd+Y7PtfHXcX6nBwiU/+hS1Hz2iTCiaiAWiwq Dv/g== X-Received: by 10.180.97.233 with SMTP id ed9mr26747047wib.32.1366211081952; Wed, 17 Apr 2013 08:04:41 -0700 (PDT) Received: from gmail.com (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id fz3sm10241381wib.0.2013.04.17.08.04.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 08:04:40 -0700 (PDT) Date: Wed, 17 Apr 2013 16:04:37 +0100 From: Lee Jones To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linus.walleij@stericsson.com, Russell King , Chris Ball , linux-mmc@vger.kernel.org Subject: Re: [PATCH] mmc: mmci: Allow MMCI to request channels with information acquired from DT Message-ID: <20130417150437.GA3137@gmail.com> References: <1366205534-25079-1-git-send-email-lee.jones@linaro.org> <201304171550.56037.arnd@arndb.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201304171550.56037.arnd@arndb.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQn4VAH2cEyCLs/GB0CKTaODJ/zZN4nPzbN0hz1MlhmL2iIFXeR91ref3WizLfVLW+516fl5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org > This looks unnecessarily complex. That thought did cross my mind. > Why not just do dma_request_slave_channel_compat() unconditionally here? So how about something like this instead, as it keeps the current semantics, and only differs in the case of DT. diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 372e921..1fd212a 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -298,14 +298,16 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data) * no custom DMA interfaces are supported. */ #ifdef CONFIG_DMA_ENGINE -static void mmci_dma_setup(struct mmci_host *host) +static void mmci_dma_setup(struct amba_device *dev, + struct mmci_host *host) { + struct device_node *np = dev->dev.of_node; struct mmci_platform_data *plat = host->plat; const char *rxname, *txname; dma_cap_mask_t mask; - if (!plat || !plat->dma_filter) { - dev_info(mmc_dev(host->mmc), "no DMA platform data\n"); + if (!(plat && plat->dma_filter) && !np) { + dev_info(mmc_dev(host->mmc), "no DMA platform data or DT\n"); return; } @@ -321,19 +323,21 @@ static void mmci_dma_setup(struct mmci_host *host) * attempt to use it bidirectionally, however if it is * is specified but cannot be located, DMA will be disabled. */ - if (plat->dma_rx_param) { - host->dma_rx_channel = dma_request_channel(mask, - plat->dma_filter, - plat->dma_rx_param); + if ((plat && plat->dma_rx_param) || np) { + host->dma_rx_channel = dma_request_slave_channel_compat(mask, + (plat) ? plat->dma_filter : NULL, + (plat) ? plat->dma_rx_param : NULL, + &dev->dev, "rx"); /* E.g if no DMA hardware is present */ if (!host->dma_rx_channel) dev_err(mmc_dev(host->mmc), "no RX DMA channel\n"); } - if (plat->dma_tx_param) { - host->dma_tx_channel = dma_request_channel(mask, - plat->dma_filter, - plat->dma_tx_param); + if ((plat && plat->dma_tx_param) || np) { + host->dma_tx_channel = dma_request_slave_channel_compat(mask, + (plat) ? plat->dma_filter : NULL, + (plat) ? plat->dma_tx_param : NULL, + &dev->dev, "tx"); if (!host->dma_tx_channel) dev_warn(mmc_dev(host->mmc), "no TX DMA channel\n"); } else { @@ -1538,7 +1542,7 @@ static int mmci_probe(struct amba_device *dev, amba_rev(dev), (unsigned long long)dev->res.start, dev->irq[0], dev->irq[1]); - mmci_dma_setup(host); + mmci_dma_setup(dev, host); pm_runtime_set_autosuspend_delay(&dev->dev, 50); pm_runtime_use_autosuspend(&dev->dev);