Commit e90e8da7 authored Oct 20, 2017 by Yoshihiro Shimoda Committed by Ulf Hansson Oct 20, 2017

mmc: tmio: fix swiotlb buffer is full



Since the commit de3ee99b ("mmc: Delete bounce buffer handling")
deletes the bounce buffer handling, a request data size will be referred
to max_{req,seg}_size instead of MMC_QUEUE_BOUNCESZ (64k bytes).

In other hand, renesas_sdhi_internal_dmac.c will set very big value of
max_{req,seg}_size because the max_blk_count is set to 0xffffffff.
And then, "swiotlb buffer is full" happens because swiotlb can handle
a memory size up to 256k bytes only (IO_TLB_SEGSIZE = 128 and
IO_TLB_SHIFT = 11).

So, as a workaround, this patch avoids the issue by setting
the max_{req,seg}_size up to 256k bytes if swiotlb is running.

Reported-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent eb701ce1

drivers/mmc/host/tmio_mmc_core.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@
		#include <linux/mmc/sdio.h>
		#include <linux/scatterlist.h>
		#include <linux/spinlock.h>
		#include <linux/swiotlb.h>
		#include <linux/workqueue.h>

		#include "tmio_mmc.h"
		@@ -1215,6 +1216,18 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
		mmc->max_blk_count = pdata->max_blk_count ? :
		(PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs;
		mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
		/*
		* Since swiotlb has memory size limitation, this will calculate
		* the maximum size locally (because we don't have any APIs for it now)
		* and check the current max_req_size. And then, this will update
		* the max_req_size if needed as a workaround.
		*/
		if (swiotlb_max_segment()) {
		unsigned int max_size = (1 << IO_TLB_SHIFT) * IO_TLB_SEGSIZE;

		if (mmc->max_req_size > max_size)
		mmc->max_req_size = max_size;
		}
		mmc->max_seg_size = mmc->max_req_size;

		_host->native_hotplug = !(pdata->flags & TMIO_MMC_USE_GPIO_CD \|\|