linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Baolin Wang <baolin.wang7@gmail.com>
To: Faiz Abbas <faiz_abbas@ti.com>
Cc: linux-omap@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	devicetree@vger.kernel.org, linux-mmc <linux-mmc@vger.kernel.org>,
	kishon@ti.com, Adrian Hunter <adrian.hunter@intel.com>,
	mark.rutland@arm.com, robh+dt@kernel.org,
	Ulf Hansson <ulf.hansson@linaro.org>,
	tony@atomide.com
Subject: Re: [PATCH v4 03/11] mmc: sdhci: add support for using external DMA devices
Date: Wed, 8 Jan 2020 09:28:35 +0800	[thread overview]
Message-ID: <CADBw62onwxPmn=HmdL05hz+FOUe9crRPDO+CB5hDmaVeYMSTsQ@mail.gmail.com> (raw)
In-Reply-To: <20200106110133.13791-4-faiz_abbas@ti.com>

Hi Faiz,

On Mon, Jan 6, 2020 at 7:01 PM Faiz Abbas <faiz_abbas@ti.com> wrote:
>
> From: Chunyan Zhang <zhang.chunyan@linaro.org>
>
> Some standard SD host controllers can support both external dma
> controllers as well as ADMA/SDMA in which the SD host controller
> acts as DMA master. TI's omap controller is the case as an example.
>
> Currently the generic SDHCI code supports ADMA/SDMA integrated in
> the host controller but does not have any support for external DMA
> controllers implemented using dmaengine, meaning that custom code is
> needed for any systems that use an external DMA controller with SDHCI.
>
> Fixes by Faiz Abbas <faiz_abbas@ti.com>:
> 1. Map scatterlists before dmaengine_prep_slave_sg()
> 2. Use dma_async() functions inside of the send_command() path and call
> terminate_sync() in non-atomic context in case of an error.
>
> Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
> ---
>  drivers/mmc/host/Kconfig |   3 +
>  drivers/mmc/host/sdhci.c | 228 ++++++++++++++++++++++++++++++++++++++-
>  drivers/mmc/host/sdhci.h |   8 ++
>  3 files changed, 237 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index d06b2dfe3c95..adef971582a1 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -1040,3 +1040,6 @@ config MMC_OWL
>         help
>           This selects support for the SD/MMC Host Controller on
>           Actions Semi Owl SoCs.
> +
> +config MMC_SDHCI_EXTERNAL_DMA
> +       bool
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index f6999054abcf..8cc78c76bc3d 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <linux/delay.h>
> +#include <linux/dmaengine.h>
>  #include <linux/ktime.h>
>  #include <linux/highmem.h>
>  #include <linux/io.h>
> @@ -1157,6 +1158,188 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
>         sdhci_set_block_info(host, data);
>  }
>
> +#if IS_ENABLED(CONFIG_MMC_SDHCI_EXTERNAL_DMA)
> +
> +static int sdhci_external_dma_init(struct sdhci_host *host)
> +{
> +       int ret = 0;
> +       struct mmc_host *mmc = host->mmc;
> +
> +       host->tx_chan = dma_request_chan(mmc->parent, "tx");
> +       if (IS_ERR(host->tx_chan)) {
> +               ret = PTR_ERR(host->tx_chan);
> +               if (ret != -EPROBE_DEFER)
> +                       pr_warn("Failed to request TX DMA channel.\n");
> +               host->tx_chan = NULL;
> +               return ret;
> +       }
> +
> +       host->rx_chan = dma_request_chan(mmc->parent, "rx");
> +       if (IS_ERR(host->rx_chan)) {
> +               if (host->tx_chan) {
> +                       dma_release_channel(host->tx_chan);
> +                       host->tx_chan = NULL;
> +               }
> +
> +               ret = PTR_ERR(host->rx_chan);
> +               if (ret != -EPROBE_DEFER)
> +                       pr_warn("Failed to request RX DMA channel.\n");
> +               host->rx_chan = NULL;
> +       }
> +
> +       return ret;
> +}
> +
> +static struct dma_chan *sdhci_external_dma_channel(struct sdhci_host *host,
> +                                                  struct mmc_data *data)
> +{
> +       return data->flags & MMC_DATA_WRITE ? host->tx_chan : host->rx_chan;
> +}
> +
> +static int sdhci_external_dma_setup(struct sdhci_host *host,
> +                                   struct mmc_command *cmd)
> +{
> +       int ret, i;
> +       struct dma_async_tx_descriptor *desc;
> +       struct mmc_data *data = cmd->data;
> +       struct dma_chan *chan;
> +       struct dma_slave_config cfg;
> +       dma_cookie_t cookie;
> +       int sg_cnt;
> +
> +       if (!host->mapbase)
> +               return -EINVAL;
> +
> +       cfg.src_addr = host->mapbase + SDHCI_BUFFER;
> +       cfg.dst_addr = host->mapbase + SDHCI_BUFFER;
> +       cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
> +       cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
> +       cfg.src_maxburst = data->blksz / 4;
> +       cfg.dst_maxburst = data->blksz / 4;
> +
> +       /* Sanity check: all the SG entries must be aligned by block size. */
> +       for (i = 0; i < data->sg_len; i++) {
> +               if ((data->sg + i)->length % data->blksz)
> +                       return -EINVAL;
> +       }
> +
> +       chan = sdhci_external_dma_channel(host, data);
> +
> +       ret = dmaengine_slave_config(chan, &cfg);
> +       if (ret)
> +               return ret;
> +
> +       sg_cnt = sdhci_pre_dma_transfer(host, data, COOKIE_MAPPED);
> +       if (sg_cnt <= 0)
> +               return -EINVAL;
> +
> +       desc = dmaengine_prep_slave_sg(chan, data->sg, data->sg_len,
> +                                      mmc_get_dma_dir(data),
> +                                      DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
> +       if (!desc)
> +               return -EINVAL;
> +
> +       desc->callback = NULL;
> +       desc->callback_param = NULL;
> +
> +       cookie = dmaengine_submit(desc);
> +       if (cookie < 0)

We usually use the DMA engine standard API: dma_submit_error() to
validate the cookie.

  reply	other threads:[~2020-01-08  1:28 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-06 11:01 [PATCH v4 00/11] Port am335x and am437x devices to sdhci-omap Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 01/11] dt-bindings: sdhci-omap: Add properties for using external dma Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 02/11] mmc: sdhci: Factor out some operations set to their own functions Faiz Abbas
2020-01-07  6:34   ` Baolin Wang
2020-01-07  7:22     ` Faiz Abbas
2020-01-08  1:32       ` Baolin Wang
2020-01-15 10:55   ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 03/11] mmc: sdhci: add support for using external DMA devices Faiz Abbas
2020-01-08  1:28   ` Baolin Wang [this message]
2020-01-08  9:20     ` Faiz Abbas
2020-01-08  9:29       ` Baolin Wang
2020-01-08 13:35         ` Peter Ujfalusi
2020-01-10 13:16           ` Faiz Abbas
2020-01-15 12:01   ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 04/11] mmc: sdhci-omap: Add using external dma Faiz Abbas
2020-01-15 12:02   ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 05/11] mmc: sdhci: Convert sdhci_set_timeout_irq() to non-static Faiz Abbas
2020-01-15 12:03   ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 06/11] mmc: sdhci: Refactor sdhci_set_timeout() Faiz Abbas
2020-01-15 12:04   ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 07/11] mmc: sdhci-omap: Disable data timeout interrupt during erase Faiz Abbas
2020-01-15 12:05   ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 08/11] dt-bindings: sdhci-omap: Add documentation for ti,needs-special-reset property Faiz Abbas
2020-01-06 22:03   ` Rob Herring
2020-01-07 11:18     ` Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 09/11] mmc: sdhci-omap: Add " Faiz Abbas
2020-01-15 12:14   ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 10/11] dt-bindings: sdhci-omap: Add am335x and am437x specific bindings Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 11/11] mmc: sdhci-omap: Add am335x and am437x specific compatibles Faiz Abbas
2020-01-15 12:14   ` Adrian Hunter

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='CADBw62onwxPmn=HmdL05hz+FOUe9crRPDO+CB5hDmaVeYMSTsQ@mail.gmail.com' \
    --to=baolin.wang7@gmail.com \
    --cc=adrian.hunter@intel.com \
    --cc=devicetree@vger.kernel.org \
    --cc=faiz_abbas@ti.com \
    --cc=kishon@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=tony@atomide.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).