| Message ID | 1456806764-16467-2-git-send-email-acourbot@nvidia.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Tuesday 01 March 2016 13:32:43 Alexandre Courbot wrote: > */ > - 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)); > Looks good, Acked-by: Arnd Bergmann <arnd@arndb.de> -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Mar 2, 2016 at 6:30 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 01 March 2016 13:32:43 Alexandre Courbot wrote: >> */ >> - 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)); >> > > Looks good, > > Acked-by: Arnd Bergmann <arnd@arndb.de> Withdrawing this patch after discussing with Arnd. The test detects devices that are not capable of DMA, so it makes no sense to call a DMA function right after that. A better solution to the problem this patch tried to solve is on the way. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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(-)