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

Commit 80b4f81a authored by Hong Xu's avatar Hong Xu Committed by Artem Bityutskiy
Browse files

mtd: atmel_nand: use CPU I/O when buffer is in vmalloc(ed) region 



The previous way of dealing with vmalloc(ed) region by walking
though the pages can not work well actually. We just fall back
to CPU I/O when the buffer address is higher than `high_memory'.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarHong Xu <hong.xu@atmel.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 9d51567e

drivers/mtd/nand/atmel_nand.c

+2 −16
Original line number Diff line number Diff line
@@ -209,22 +209,8 @@ static int atmel_nand_dma_op(struct mtd_info *mtd, void *buf, int len, 
	int err = -EIO;

	enum dma_data_direction dir = is_read ? DMA_FROM_DEVICE : DMA_TO_DEVICE;



	if (buf >= high_memory) {

		struct page *pg;



		if (((size_t)buf & PAGE_MASK) !=

		    ((size_t)(buf + len - 1) & PAGE_MASK)) {

			dev_warn(host->dev, "Buffer not fit in one page\n");

			goto err_buf;

		}



		pg = vmalloc_to_page(buf);

		if (pg == 0) {

			dev_err(host->dev, "Failed to vmalloc_to_page\n");

	if (buf >= high_memory)

		goto err_buf;

		}

		p = page_address(pg) + ((size_t)buf & ~PAGE_MASK);

	}



	dma_dev = host->dma_chan->device;