From 608ad4b6932f72995144bc72a31b1e0843a5bb28 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Tue, 11 Feb 2014 02:07:41 +0000 Subject: mvebu: backport mainline patches from kernel 3.12 This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb CC: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39565 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...mtd-nand-pxa3xx-Set-info-use_dma-properly.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 target/linux/mvebu/patches-3.10/0107-mtd-nand-pxa3xx-Set-info-use_dma-properly.patch (limited to 'target/linux/mvebu/patches-3.10/0107-mtd-nand-pxa3xx-Set-info-use_dma-properly.patch') diff --git a/target/linux/mvebu/patches-3.10/0107-mtd-nand-pxa3xx-Set-info-use_dma-properly.patch b/target/linux/mvebu/patches-3.10/0107-mtd-nand-pxa3xx-Set-info-use_dma-properly.patch new file mode 100644 index 0000000000..388b709de2 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0107-mtd-nand-pxa3xx-Set-info-use_dma-properly.patch @@ -0,0 +1,46 @@ +From c16f0b44984bc623621d26df22823b50f13f65d8 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia +Date: Tue, 14 May 2013 08:15:21 -0300 +Subject: [PATCH 107/203] mtd: nand: pxa3xx: Set info->use_dma properly + +Currently, the variable info->use_dma is never set and always +zero-valued which means the driver never does DMA transfers. +We fix this by simply setting info->use_dma to the module parameter, +also named 'use_dma'. Note that the module parameter has the same name, +but different semantics. + +This fixes a regression introduced by the below commit +which removed the info->use_dma variable set. + + commit 4eb2da8994042d68e84e31138788429a102da2ea + Author: Lei Wen + Date: Mon Feb 28 10:32:13 2011 +0800 + + mtd: pxa3xx_nand: unify prepare command + +Before the above commit, the driver had use_dma=1 on all NAND commands +except on CMD_STATUS. This behavior is long lost and we are not +recovering in this patch, either. + +This was spotted and verified by human inspection. + +Signed-off-by: Ezequiel Garcia +Tested-by: Nikita Kiryanov +Acked-by: Igor Grinberg +Reviewed-by: Haojian Zhuang +Signed-off-by: Artem Bityutskiy +Signed-off-by: David Woodhouse +--- + drivers/mtd/nand/pxa3xx_nand.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/mtd/nand/pxa3xx_nand.c ++++ b/drivers/mtd/nand/pxa3xx_nand.c +@@ -506,6 +506,7 @@ static int prepare_command_pool(struct p + info->buf_count = 0; + info->oob_size = 0; + info->use_ecc = 0; ++ info->use_dma = (use_dma) ? 1 : 0; + info->is_ready = 0; + info->retcode = ERR_NONE; + if (info->cs != 0) -- cgit v1.2.3