[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1271158315l.25331l.9l@i-dmzi_al.realan.de>
Date: Tue, 13 Apr 2010 13:31:55 +0200
From: Anders Larsen <al@...rsen.net>
To: linux-mtd@...ts.infradead.org
Cc: Ian McDonnell <ian@...ghtstareng.com>,
David Woodhouse <dwmw2@...radead.org>,
Matthias Kaehlcke <matthias@...hlcke.net>,
Artem Bityutskiy <Artem.Bityutskiy@...ia.com>,
Nicolas Pitre <nico@...xnic.net>, linux-kernel@...r.kernel.org
Subject: [PATCH] Fix Oops with Atmel SPI
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@...ghtstareng.com> was found here:
http://lists.infradead.org/pipermail/linux-mtd/2007-December/020184.html
Signed-off-by: Anders Larsen <al@...rsen.net>
Cc: Ian McDonnell <ian@...ghtstareng.com>
Cc: David Woodhouse <dwmw2@...radead.org>
Cc: Matthias Kaehlcke <matthias@...hlcke.net>
Cc: Artem Bityutskiy <Artem.Bityutskiy@...ia.com>
Cc: Nicolas Pitre <nico@...xnic.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);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists