From: Alexandre Courbot <acourbot@nvidia.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Arnd Bergmann <arnd@arndb.de>,
Stephen Warren <swarren@wwwdotorg.org>,
Thierry Reding <thierry.reding@gmail.com>
Cc: linux-mmc@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org, gnurou@gmail.com,
Alexandre Courbot <acourbot@nvidia.com>
Subject: [PATCH v2 1/2] mmc: sdhci: Set DMA mask
Date: Tue, 1 Mar 2016 13:32:43 +0900 [thread overview]
Message-ID: <1456806764-16467-2-git-send-email-acourbot@nvidia.com> (raw)
In-Reply-To: <1456806764-16467-1-git-send-email-acourbot@nvidia.com>
Set the DMA mask if specified by the host's dma_mask member, and
not only if the DMA flags are set.
Use dma_set_mask_and_coherent() to set it instead of messing directly
with the device's dma_mask.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
drivers/mmc/host/sdhci.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index fd9139947fa3..0693f52d238a 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2997,10 +2997,12 @@ int sdhci_add_host(struct sdhci_host *host)
* mask, but PIO does not need the hw shim so we set a new
* mask here in that case.
*/
- if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA))) {
+ if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)))
host->dma_mask = DMA_BIT_MASK(64);
- mmc_dev(mmc)->dma_mask = &host->dma_mask;
- }
+
+ if (host->dma_mask &&
+ dma_set_mask_and_coherent(mmc_dev(mmc), host->dma_mask))
+ pr_warn("%s: cannot set DMA mask\n", mmc_hostname(mmc));
if (host->version >= SDHCI_SPEC_300)
host->max_clk = (caps[0] & SDHCI_CLOCK_V3_BASE_MASK)
--
2.7.2
next prev parent reply other threads:[~2016-03-01 4:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 4:32 [PATCH v2 0/2] mmc: sdhci: Set DMA mask if specified Alexandre Courbot
2016-03-01 4:32 ` Alexandre Courbot [this message]
2016-03-01 21:30 ` [PATCH v2 1/2] mmc: sdhci: Set DMA mask Arnd Bergmann
2016-03-04 6:09 ` Alexandre Courbot
2016-03-01 4:32 ` [PATCH v2 2/2] mmc: sdhci-tegra: Specify valid " Alexandre Courbot
2016-03-01 21:34 ` Arnd Bergmann
2016-03-02 10:36 ` Alexandre Courbot
2016-03-02 11:25 ` Arnd Bergmann
2016-03-04 6:08 ` Alexandre Courbot
2016-03-04 6:43 ` Alexandre Courbot
2016-03-04 8:38 ` Arnd Bergmann
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=1456806764-16467-2-git-send-email-acourbot@nvidia.com \
--to=acourbot@nvidia.com \
--cc=arnd@arndb.de \
--cc=gnurou@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.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).