From: Thierry Reding <thierry.reding@gmail.com>
To: Jens Axboe <axboe@kernel.dk>,
Ulf Hansson <ulf.hansson@linaro.org>,
Adrian Hunter <adrian.hunter@intel.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Christoph Hellwig <hch@lst.de>,
Simon Horman <horms+renesas@verge.net.au>,
Jon Hunter <jonathanh@nvidia.com>,
linux-block@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-tegra@vger.kernel.org
Subject: [PATCH 3/3] mmc: sdhci: Set DMA maximum segment size to 64 KiB
Date: Mon, 9 Sep 2019 14:56:58 +0200 [thread overview]
Message-ID: <20190909125658.30559-4-thierry.reding@gmail.com> (raw)
In-Reply-To: <20190909125658.30559-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
DMA descriptors used with SDHCI have a 16-bit field that specifies the
number of bytes to transfer per segment. A segment's size may therefore
never exceed 64 KiB.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/mmc/host/sdhci.c | 5 +++++
drivers/mmc/host/sdhci.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index d814dc004bad..b59d063646bf 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3555,6 +3555,10 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev,
*/
host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1;
+ /* ADMA supports a maximum of 64 KiB per descriptor */
+ dev->dma_parms = &host->dma_params;
+ dma_set_max_seg_size(dev, SZ_64K);
+
return host;
}
@@ -4410,6 +4414,7 @@ EXPORT_SYMBOL_GPL(sdhci_remove_host);
void sdhci_free_host(struct sdhci_host *host)
{
+ host->mmc->parent->dma_parms = NULL;
mmc_free_host(host->mmc);
}
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index cf3d1ed91909..b543d31bbcdb 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -494,6 +494,7 @@ struct sdhci_host {
/* Internal data */
struct mmc_host *mmc; /* MMC structure */
struct mmc_host_ops mmc_host_ops; /* MMC host ops */
+ struct device_dma_parameters dma_params; /* DMA parameters */
u64 dma_mask; /* custom DMA mask */
#if IS_ENABLED(CONFIG_LEDS_CLASS)
--
2.23.0
prev parent reply other threads:[~2019-09-09 12:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 12:56 [PATCH 0/3] mmc: Fix scatter/gather on SDHCI Thierry Reding
2019-09-09 12:56 ` [PATCH 1/3] block: Respect the device's maximum segment size Thierry Reding
2019-09-09 16:13 ` Christoph Hellwig
2019-09-09 19:19 ` Thierry Reding
2019-09-10 2:03 ` Yoshihiro Shimoda
2019-09-10 6:13 ` Christoph Hellwig
2019-09-10 7:37 ` Thierry Reding
2019-09-11 10:36 ` Christoph Hellwig
2019-09-10 7:30 ` Thierry Reding
2019-09-11 7:23 ` Yoshihiro Shimoda
2019-09-11 10:37 ` Christoph Hellwig
2019-09-12 0:57 ` Ming Lei
2019-09-12 8:19 ` Christoph Hellwig
2019-09-09 12:56 ` [PATCH 2/3] mmc: core: Respect MMC host's " Thierry Reding
2019-09-09 12:56 ` Thierry Reding [this message]
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=20190909125658.30559-4-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=horms+renesas@verge.net.au \
--cc=jonathanh@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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).