From: Faiz Abbas <faiz_abbas@ti.com> To: <linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-mmc@vger.kernel.org> Cc: <kishon@ti.com>, <adrian.hunter@intel.com>, <mark.rutland@arm.com>, <robh+dt@kernel.org>, <ulf.hansson@linaro.org>, <tony@atomide.com>, <faiz_abbas@ti.com> Subject: [PATCH v4 04/11] mmc: sdhci-omap: Add using external dma Date: Mon, 6 Jan 2020 16:31:26 +0530 [thread overview] Message-ID: <20200106110133.13791-5-faiz_abbas@ti.com> (raw) In-Reply-To: <20200106110133.13791-1-faiz_abbas@ti.com> From: Chunyan Zhang <zhang.chunyan@linaro.org> sdhci-omap can support both external dma controller via dmaengine framework as well as ADMA which standard SD host controller provides. Fixes by Faiz Abbas <fazi_abbas@ti.com>: 1. Switch to DMA slave mode when using external DMA 2. Add offset to mapbase Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> --- drivers/mmc/host/Kconfig | 1 + drivers/mmc/host/sdhci-omap.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index adef971582a1..2c0d90b9383e 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -1010,6 +1010,7 @@ config MMC_SDHCI_OMAP depends on MMC_SDHCI_PLTFM && OF select THERMAL imply TI_SOC_THERMAL + select MMC_SDHCI_EXTERNAL_DMA if DMA_ENGINE help This selects the Secure Digital Host Controller Interface (SDHCI) support present in TI's DRA7 SOCs. The controller supports diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c index 083e7e053c95..84d85aa743da 100644 --- a/drivers/mmc/host/sdhci-omap.c +++ b/drivers/mmc/host/sdhci-omap.c @@ -685,7 +685,11 @@ static int sdhci_omap_enable_dma(struct sdhci_host *host) struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host); reg = sdhci_omap_readl(omap_host, SDHCI_OMAP_CON); - reg |= CON_DMA_MASTER; + reg &= ~CON_DMA_MASTER; + /* Switch to DMA slave mode when using external DMA */ + if (!host->use_external_dma) + reg |= CON_DMA_MASTER; + sdhci_omap_writel(omap_host, SDHCI_OMAP_CON, reg); return 0; @@ -1037,6 +1041,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) const struct of_device_id *match; struct sdhci_omap_data *data; const struct soc_device_attribute *soc; + struct resource *regs; match = of_match_device(omap_sdhci_match, dev); if (!match) @@ -1049,6 +1054,10 @@ static int sdhci_omap_probe(struct platform_device *pdev) } offset = data->offset; + regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!regs) + return -ENXIO; + host = sdhci_pltfm_init(pdev, &sdhci_omap_pdata, sizeof(*omap_host)); if (IS_ERR(host)) { @@ -1065,6 +1074,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) omap_host->timing = MMC_TIMING_LEGACY; omap_host->flags = data->flags; host->ioaddr += offset; + host->mapbase = regs->start + offset; mmc = host->mmc; sdhci_get_of_property(pdev); @@ -1134,6 +1144,10 @@ static int sdhci_omap_probe(struct platform_device *pdev) host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning; host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq; + /* Switch to external DMA only if there is the "dmas" property */ + if (of_find_property(dev->of_node, "dmas", NULL)) + sdhci_switch_external_dma(host, true); + ret = sdhci_setup_host(host); if (ret) goto err_put_sync; -- 2.19.2
WARNING: multiple messages have this Message-ID (diff)
From: Faiz Abbas <faiz_abbas@ti.com> To: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mmc@vger.kernel.org Cc: kishon@ti.com, adrian.hunter@intel.com, mark.rutland@arm.com, robh+dt@kernel.org, ulf.hansson@linaro.org, tony@atomide.com, faiz_abbas@ti.com Subject: [PATCH v4 04/11] mmc: sdhci-omap: Add using external dma Date: Mon, 6 Jan 2020 16:31:26 +0530 [thread overview] Message-ID: <20200106110133.13791-5-faiz_abbas@ti.com> (raw) In-Reply-To: <20200106110133.13791-1-faiz_abbas@ti.com> From: Chunyan Zhang <zhang.chunyan@linaro.org> sdhci-omap can support both external dma controller via dmaengine framework as well as ADMA which standard SD host controller provides. Fixes by Faiz Abbas <fazi_abbas@ti.com>: 1. Switch to DMA slave mode when using external DMA 2. Add offset to mapbase Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> --- drivers/mmc/host/Kconfig | 1 + drivers/mmc/host/sdhci-omap.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index adef971582a1..2c0d90b9383e 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -1010,6 +1010,7 @@ config MMC_SDHCI_OMAP depends on MMC_SDHCI_PLTFM && OF select THERMAL imply TI_SOC_THERMAL + select MMC_SDHCI_EXTERNAL_DMA if DMA_ENGINE help This selects the Secure Digital Host Controller Interface (SDHCI) support present in TI's DRA7 SOCs. The controller supports diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c index 083e7e053c95..84d85aa743da 100644 --- a/drivers/mmc/host/sdhci-omap.c +++ b/drivers/mmc/host/sdhci-omap.c @@ -685,7 +685,11 @@ static int sdhci_omap_enable_dma(struct sdhci_host *host) struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host); reg = sdhci_omap_readl(omap_host, SDHCI_OMAP_CON); - reg |= CON_DMA_MASTER; + reg &= ~CON_DMA_MASTER; + /* Switch to DMA slave mode when using external DMA */ + if (!host->use_external_dma) + reg |= CON_DMA_MASTER; + sdhci_omap_writel(omap_host, SDHCI_OMAP_CON, reg); return 0; @@ -1037,6 +1041,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) const struct of_device_id *match; struct sdhci_omap_data *data; const struct soc_device_attribute *soc; + struct resource *regs; match = of_match_device(omap_sdhci_match, dev); if (!match) @@ -1049,6 +1054,10 @@ static int sdhci_omap_probe(struct platform_device *pdev) } offset = data->offset; + regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!regs) + return -ENXIO; + host = sdhci_pltfm_init(pdev, &sdhci_omap_pdata, sizeof(*omap_host)); if (IS_ERR(host)) { @@ -1065,6 +1074,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) omap_host->timing = MMC_TIMING_LEGACY; omap_host->flags = data->flags; host->ioaddr += offset; + host->mapbase = regs->start + offset; mmc = host->mmc; sdhci_get_of_property(pdev); @@ -1134,6 +1144,10 @@ static int sdhci_omap_probe(struct platform_device *pdev) host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning; host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq; + /* Switch to external DMA only if there is the "dmas" property */ + if (of_find_property(dev->of_node, "dmas", NULL)) + sdhci_switch_external_dma(host, true); + ret = sdhci_setup_host(host); if (ret) goto err_put_sync; -- 2.19.2
next prev parent reply other threads:[~2020-01-06 11:00 UTC|newest] Thread overview: 50+ 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 ` 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 ` 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-06 11:01 ` Faiz Abbas 2020-01-07 6:34 ` Baolin Wang 2020-01-07 7:22 ` Faiz Abbas 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-06 11:01 ` Faiz Abbas 2020-01-08 1:28 ` Baolin Wang 2020-01-08 9:20 ` Faiz Abbas 2020-01-08 9:20 ` Faiz Abbas 2020-01-08 9:29 ` Baolin Wang 2020-01-08 13:35 ` Peter Ujfalusi 2020-01-08 13:35 ` Peter Ujfalusi 2020-01-10 13:16 ` Faiz Abbas 2020-01-10 13:16 ` Faiz Abbas 2020-01-15 12:01 ` Adrian Hunter 2020-01-15 12:01 ` Adrian Hunter 2020-01-06 11:01 ` Faiz Abbas [this message] 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-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-06 11:01 ` 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-06 11:01 ` 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-06 11:01 ` 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 11:01 ` Faiz Abbas 2020-01-06 22:03 ` Rob Herring 2020-01-07 11:18 ` Faiz Abbas 2020-01-07 11:18 ` Faiz Abbas 2020-01-06 11:01 ` [PATCH v4 09/11] mmc: sdhci-omap: Add " Faiz Abbas 2020-01-06 11:01 ` Faiz Abbas 2020-01-15 12:14 ` Adrian Hunter 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 ` Faiz Abbas 2020-01-06 11:01 ` [PATCH v4 11/11] mmc: sdhci-omap: Add am335x and am437x specific compatibles Faiz Abbas 2020-01-06 11:01 ` 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=20200106110133.13791-5-faiz_abbas@ti.com \ --to=faiz_abbas@ti.com \ --cc=adrian.hunter@intel.com \ --cc=devicetree@vger.kernel.org \ --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: 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.