[PATCH v2 1/2] mmc: sdhci: Set DMA mask

From	Alexandre Courbot <acourbot@nvidia.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/2] mmc: sdhci: Set DMA mask
Date	2016-03-01 05:50 +0100
Message-ID	<r7KpX-4hl-3@gated-at.bofh.it> (permalink)
References	<r7KpX-4hl-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/2] mmc: sdhci: Set DMA mask Alexandre Courbot <acourbot@nvidia.com> - 2016-03-01 05:50 +0100
  Re: [PATCH v2 1/2] mmc: sdhci: Set DMA mask Arnd Bergmann <arnd@arndb.de> - 2016-03-01 22:40 +0100
    Re: [PATCH v2 1/2] mmc: sdhci: Set DMA mask Alexandre Courbot <gnurou@gmail.com> - 2016-03-04 07:20 +0100

csiph-web