[PATCH] Fix Oops with Atmel SPI

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Anders Larsen
Date: Tuesday, April 13, 2010 - 4:31 am

Tweak MTD's cache allocation to make it work with the atmel DMA'ed SPI.
Substitute kmalloc for vmalloc so the cache buffer is mappable as per
the Atmel SPI driver's requirements, otherwise an Oops would occur.

The original patch by Ian McDonnell <ian@brightstareng.com> was found here:
http://lists.infradead.org/pipermail/linux-mtd/2007-December/020184.html

Signed-off-by: Anders Larsen <al@alarsen.net>
Cc: Ian McDonnell <ian@brightstareng.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Matthias Kaehlcke <matthias@kaehlcke.net>
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
---
 drivers/mtd/mtdblock.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Index: b/drivers/mtd/mtdblock.c
===================================================================
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -253,7 +253,11 @@ static int mtdblock_writesect(struct mtd
 {
 	struct mtdblk_dev *mtdblk = mtdblks[dev->devnum];
 	if (unlikely(!mtdblk->cache_data && mtdblk->cache_size)) {
+#ifdef CONFIG_SPI_ATMEL
+		mtdblk->cache_data = kmalloc(mtdblk->mtd->erasesize, GFP_KERNEL);
+#else
 		mtdblk->cache_data = vmalloc(mtdblk->mtd->erasesize);
+#endif
 		if (!mtdblk->cache_data)
 			return -EINTR;
 		/* -EINTR is not really correct, but it is the best match
@@ -322,7 +326,11 @@ static int mtdblock_release(struct mtd_b
 		mtdblks[dev] = NULL;
 		if (mtdblk->mtd->sync)
 			mtdblk->mtd->sync(mtdblk->mtd);
+#ifdef CONFIG_SPI_ATMEL
+		kfree(mtdblk->cache_data);
+#else
 		vfree(mtdblk->cache_data);
+#endif
 		kfree(mtdblk);
 	}
 

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] Fix Oops with Atmel SPI, Anders Larsen, (Tue Apr 13, 4:31 am)
Re: [PATCH] Fix Oops with Atmel SPI, Iwo Mergler, (Wed Apr 14, 12:30 am)
Re: [PATCH] Fix Oops with Atmel SPI, Anders Larsen, (Wed Apr 14, 12:57 am)
Re: [PATCH] Fix Oops with Atmel SPI, Kevin Cernekee, (Wed Apr 14, 11:13 am)
Re: [PATCH] Fix Oops with Atmel SPI, Iwo Mergler, (Thu Apr 15, 12:32 am)
Re: [PATCH] Fix Oops with Atmel SPI, Andrew Morton, (Wed Apr 21, 3:24 pm)
Re: [PATCH] Fix Oops with Atmel SPI, Artem Bityutskiy, (Tue Apr 27, 5:57 am)
Re: [PATCH] Fix Oops with Atmel SPI, Anders Larsen, (Wed May 19, 4:05 am)
Re: [PATCH] Fix Oops with Atmel SPI, Andrew Morton, (Fri May 21, 12:01 pm)
Re: [PATCH] Fix Oops with Atmel SPI, Ian McDonnell, (Mon May 24, 8:09 am)
Re: [PATCH] Fix Oops with Atmel SPI, Haavard Skinnemoen, (Fri May 28, 2:27 am)