In IOMMU environment, since it's possible to merge scatter gather
buffers of memory requests to one iova, this patch changes
the max_segs value when init_card of mmc_host timing. Notes that
an sdio card may be possible to use scatter gather buffers with
non page aligned size, so that this driver will not use multiple
segments to avoid any trouble.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>
---
drivers/mmc/host/renesas_sdhi_core.c | 8 ++++++++
drivers/mmc/host/renesas_sdhi_internal_dmac.c | 12 ++++++++++++
2 files changed, 20 insertions(+)
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 5e9e36e..e27cc24 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -601,6 +601,13 @@ static int renesas_sdhi_multi_io_quirk(struct mmc_card *card,
return blk_size;
}
+static void renesas_sdhi_init_card(struct tmio_mmc_host *host,
+ struct mmc_card *card)
+{
+ if (host->dma_ops->init_card)
+ host->dma_ops->init_card(host, card);
+}
+
static void renesas_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable)
{
/* Iff regs are 8 byte apart, sdbuf is 64 bit. Otherwise always 32. */
@@ -712,6 +719,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
host->clk_disable = renesas_sdhi_clk_disable;
host->set_clock = renesas_sdhi_set_clock;
host->multi_io_quirk = renesas_sdhi_multi_io_quirk;
+ host->init_card = renesas_sdhi_init_card;
host->dma_ops = dma_ops;
if (quirks && quirks->hs400_disabled)
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index 751fe91..0cf14c9 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -285,6 +285,17 @@ renesas_sdhi_internal_dmac_release_dma(struct tmio_mmc_host *host)
host->chan_rx = host->chan_tx = NULL;
}
+static void
+renesas_sdhi_internal_dmac_init_card(struct tmio_mmc_host *host,
+ struct mmc_card *card)
+{
+ if (host->pdev->dev.iommu_group &&
+ (mmc_card_mmc(card) || mmc_card_sd(card)))
+ host->mmc->max_segs = 512;
+ else
+ host->mmc->max_segs = host->pdata->max_segs;
+}
+
static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = {
.start = renesas_sdhi_internal_dmac_start_dma,
.enable = renesas_sdhi_internal_dmac_enable_dma,
@@ -292,6 +303,7 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = {
.release = renesas_sdhi_internal_dmac_release_dma,
.abort = renesas_sdhi_internal_dmac_abort_dma,
.dataend = renesas_sdhi_internal_dmac_dataend_dma,
+ .init_card = renesas_sdhi_internal_dmac_init_card,
};
/*
--
2.7.4
