From: Franklin S Cooper Jr <fcooper@ti.com>
To: nsekhar@ti.com, dwmw2@infradead.org, computersforpeace@gmail.com,
rogerq@ti.com, tony@atomide.com, devicetree@vger.kernel.org,
linux-omap@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Franklin S Cooper Jr <fcooper@ti.com>
Subject: [PATCH v3 5/6] mtd: nand: omap2: Fix high memory dma prefetch transfer
Date: Wed, 9 Mar 2016 22:07:40 -0600 [thread overview]
Message-ID: <1457582861-20619-6-git-send-email-fcooper@ti.com> (raw)
In-Reply-To: <1457582861-20619-1-git-send-email-fcooper@ti.com>
Based on DMA documentation and testing using high memory buffer when
doing dma transfers can lead to various issues including kernel
panics.
To workaround this simply use cpu copy. The amount of high memory
buffers used are very uncommon so no noticeable performance hit should
be seen.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
drivers/mtd/nand/omap2.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index f7110d1..a174376 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -467,17 +467,8 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
int ret;
u32 val;
- if (addr >= high_memory) {
- struct page *p1;
-
- if (((size_t)addr & PAGE_MASK) !=
- ((size_t)(addr + len - 1) & PAGE_MASK))
- goto out_copy;
- p1 = vmalloc_to_page(addr);
- if (!p1)
- goto out_copy;
- addr = page_address(p1) + ((size_t)addr & ~PAGE_MASK);
- }
+ if (addr >= high_memory)
+ goto out_copy;
sg_init_one(&sg, addr, len);
n = dma_map_sg(info->dma->device->dev, &sg, 1, dir);
@@ -534,6 +525,7 @@ out_copy:
else
is_write == 0 ? omap_read_buf8(mtd, (u_char *) addr, len)
: omap_write_buf8(mtd, (u_char *) addr, len);
+
return 0;
}
--
2.7.0
next prev parent reply other threads:[~2016-03-10 4:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-10 4:07 [PATCH v3 0/6] mtd: nand: Fix support for NAND DMA prefetch Franklin S Cooper Jr
2016-03-10 4:07 ` [PATCH v3 1/6] memory: omap-gpmc: Store handle to GPMC dev Franklin S Cooper Jr
[not found] ` <1457582861-20619-2-git-send-email-fcooper-l0cyMroinI0@public.gmane.org>
2016-03-10 12:40 ` Roger Quadros
[not found] ` <56E16B20.5070001-l0cyMroinI0@public.gmane.org>
2016-03-10 13:18 ` Franklin S Cooper Jr.
2016-03-10 13:40 ` Franklin S Cooper Jr.
[not found] ` <56E17932.6090304-l0cyMroinI0@public.gmane.org>
2016-03-10 15:22 ` Roger Quadros
2016-03-10 15:24 ` Franklin S Cooper Jr.
2016-03-10 4:07 ` [PATCH v3 2/6] ARM: dts: am437x/am33xx: Fix GPMC dma properties Franklin S Cooper Jr
2016-03-10 12:51 ` Roger Quadros
[not found] ` <56E16DBF.40409-l0cyMroinI0@public.gmane.org>
2016-03-10 13:21 ` Franklin S Cooper Jr.
[not found] ` <1457582861-20619-1-git-send-email-fcooper-l0cyMroinI0@public.gmane.org>
2016-03-10 4:07 ` [PATCH v3 3/6] mtd: nand: omap2: Support parsing dma channel information from DT Franklin S Cooper Jr
2016-03-10 4:07 ` [PATCH v3 4/6] mtd: nand: omap2: Start dma request before enabling prefetch Franklin S Cooper Jr
2016-03-10 4:07 ` Franklin S Cooper Jr [this message]
2016-03-10 4:07 ` [PATCH v3 6/6] ARM: OMAP2+: Update GPMC and NAND DT binding documentation Franklin S Cooper Jr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457582861-20619-6-git-send-email-fcooper@ti.com \
--to=fcooper@ti.com \
--cc=computersforpeace@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=rogerq@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).