On Wed, 19 Jun 2019 at 06:55, Yoshihiro Shimoda
<yoshihiro.shimoda.uh@xxxxxxxxxxx> wrote:
>
> Since the commit 133d624b1cee ("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: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>
> Acked-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> This patch is from other patch series [1]. Since this patch can be
> applied right now because this patch is independent with other subsystems
> on the patch series.
>
> [1]
> https://patchwork.kernel.org/patch/10992401/
>
> Changes from the [1] above:
> - Use size_t instead of "unsigned int" on min_t.
> - Remove #include directive of swiotlb.h.
> - Add Acked-by and Reviewed-by.
>
> drivers/mmc/host/tmio_mmc_core.c | 18 ++++--------------
> 1 file changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> index 83fd943..2cb3f95 100644
> --- a/drivers/mmc/host/tmio_mmc_core.c
> +++ b/drivers/mmc/host/tmio_mmc_core.c
> @@ -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))
> --
> 2.7.4
>
