summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHong Xu <hong.xu@atmel.com>2011-03-31 18:33:15 +0800
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-01 17:25:24 +0300
commit80b4f81a49809774f1b123c456fb179e472dbd0e (patch)
tree397325b8cdcd269109d65063853cdd77b989ff10
parent9d51567e47a0d84f6b6e7751a4ea4f710cdcbbdf (diff)
downloadop-kernel-dev-80b4f81a49809774f1b123c456fb179e472dbd0e.zip
op-kernel-dev-80b4f81a49809774f1b123c456fb179e472dbd0e.tar.gz
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: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Hong Xu <hong.xu@atmel.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/nand/atmel_nand.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index e9fdbe4..950646a 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -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");
- goto err_buf;
- }
- p = page_address(pg) + ((size_t)buf & ~PAGE_MASK);
- }
+ if (buf >= high_memory)
+ goto err_buf;
dma_dev = host->dma_chan->device;
OpenPOWER on IntegriCloud