From patchwork Tue Apr 13 11:31:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Fix Oops with Atmel SPI Date: Tue, 13 Apr 2010 01:31:55 -0000 From: Anders Larsen X-Patchwork-Id: 50062 Message-Id: <1271158315l.25331l.9l@i-dmzi_al.realan.de> To: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy , Ian McDonnell , Nicolas Pitre , linux-kernel@vger.kernel.org, Matthias Kaehlcke , David Woodhouse 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 was found here: http://lists.infradead.org/pipermail/linux-mtd/2007-December/020184.html Signed-off-by: Anders Larsen Cc: Ian McDonnell Cc: David Woodhouse Cc: Matthias Kaehlcke Cc: Artem Bityutskiy Cc: Nicolas Pitre --- 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); }