Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63624d13 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Ulf Hansson
Browse files

mmc: tmio: Use dma_max_mapping_size() instead of a workaround 



Since the commit 133d624b ("dma: Introduce dma_max_mapping_size()")
provides a helper function to get the max mapping size, we can use
the function instead of the workaround code for swiotlb.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 4aaaf3ab

drivers/mmc/host/tmio_mmc_core.c

+4 −14
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <linux/delay.h>

#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/highmem.h>

#include <linux/interrupt.h>

#include <linux/io.h>
@@ -45,7 +46,6 @@ 
#include <linux/scatterlist.h>

#include <linux/sizes.h>

#include <linux/spinlock.h>

#include <linux/swiotlb.h>

#include <linux/workqueue.h>



#include "tmio_mmc.h"
@@ -1199,19 +1199,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) 
	mmc->max_blk_size = TMIO_MAX_BLK_SIZE;

	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_req_size = min_t(size_t,

				  mmc->max_blk_size * mmc->max_blk_count,

				  dma_max_mapping_size(&pdev->dev));

	mmc->max_seg_size = mmc->max_req_size;



	if (mmc_can_gpio_ro(mmc))