aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Shijie <b32955@freescale.com>2013-11-14 01:25:44 -0500
committerBrian Norris <computersforpeace@gmail.com>2014-01-03 14:22:18 -0500
commitdf877fb3f51980e60f785bb85ab841a5df01dc26 (patch)
tree6367c9853be88ca7332fd93d8a21d9eacee9544e
parent6033a949b2c466a13e84daebd99fdca5960b4db5 (diff)
mtd: gpmi: do not use the local array to do the DMA transfer
The local array feature[] is in the stack. We can see the warning when we enable the CONFIG_DMA_API_DEBUG: ---------------------------------------------------------- WARNING: at lib/dma-debug.c:950 check_for_stack+0xac/0xf8() gpmi-nand 112000.gpmi-nand: DMA-API: device driver maps memory fromstack [addr=dc05be34] Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.17-16851-g2414a73 #1324 [<80014cbc>] (unwind_backtrace+0x0/0x138) from [<8001251c>] (show_stack+0x10/0x14) [<8001251c>] (show_stack+0x10/0x14) from [<8002699c>] (warn_slowpath_common+0x4c/0x68) [<8002699c>] (warn_slowpath_common+0x4c/0x68) from [<80026a4c>] (warn_slowpath_fmt+0x30/0x40) [<80026a4c>] (warn_slowpath_fmt+0x30/0x40) from [<8028e2f8>] (check_for_stack+0xac/0xf8) [<8028e2f8>] (check_for_stack+0xac/0xf8) from [<8028e438>] (debug_dma_map_sg+0xf4/0x188) [<8028e438>] (debug_dma_map_sg+0xf4/0x188) from [<803968d0>] (prepare_data_dma+0xb8/0x1a8) [<803968d0>] (prepare_data_dma+0xb8/0x1a8) from [<80397b20>] (gpmi_send_data+0x84/0xfc) [<80397b20>] (gpmi_send_data+0x84/0xfc) from [<8038c2b4>] (nand_onfi_set_features+0x50/0x74) [<8038c2b4>] (nand_onfi_set_features+0x50/0x74) from [<80397198>] (gpmi_extra_init+0x90/0x170) [<80397198>] (gpmi_extra_init+0x90/0x170) from [<8039520c>] (gpmi_nand_probe+0x2f8/0xb3c) [<8039520c>] (gpmi_nand_probe+0x2f8/0xb3c) from [<8031b974>] (platform_drv_probe+0x18/0x1c) ---------------------------------------------------------- The patch uses the kzalloc to allocate the buffer, and free it when we do not use it anymore. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r--drivers/mtd/nand/gpmi-nand/gpmi-lib.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index c7a578c954fb..10a6f07eec7f 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -20,6 +20,7 @@
20 */ 20 */
21#include <linux/delay.h> 21#include <linux/delay.h>
22#include <linux/clk.h> 22#include <linux/clk.h>
23#include <linux/slab.h>
23 24
24#include "gpmi-nand.h" 25#include "gpmi-nand.h"
25#include "gpmi-regs.h" 26#include "gpmi-regs.h"
@@ -911,10 +912,14 @@ static int enable_edo_mode(struct gpmi_nand_data *this, int mode)
911 struct resources *r = &this->resources; 912 struct resources *r = &this->resources;
912 struct nand_chip *nand = &this->nand; 913 struct nand_chip *nand = &this->nand;
913 struct mtd_info *mtd = &this->mtd; 914 struct mtd_info *mtd = &this->mtd;
914 uint8_t feature[ONFI_SUBFEATURE_PARAM_LEN] = {}; 915 uint8_t *feature;
915 unsigned long rate; 916 unsigned long rate;
916 int ret; 917 int ret;
917 918
919 feature = kzalloc(ONFI_SUBFEATURE_PARAM_LEN, GFP_KERNEL);
920 if (!feature)
921 return -ENOMEM;
922
918 nand->select_chip(mtd, 0); 923 nand->select_chip(mtd, 0);
919 924
920 /* [1] send SET FEATURE commond to NAND */ 925 /* [1] send SET FEATURE commond to NAND */
@@ -942,11 +947,13 @@ static int enable_edo_mode(struct gpmi_nand_data *this, int mode)
942 947
943 this->flags |= GPMI_ASYNC_EDO_ENABLED; 948 this->flags |= GPMI_ASYNC_EDO_ENABLED;
944 this->timing_mode = mode; 949 this->timing_mode = mode;
950 kfree(feature);
945 dev_info(this->dev, "enable the asynchronous EDO mode %d\n", mode); 951 dev_info(this->dev, "enable the asynchronous EDO mode %d\n", mode);
946 return 0; 952 return 0;
947 953
948err_out: 954err_out:
949 nand->select_chip(mtd, -1); 955 nand->select_chip(mtd, -1);
956 kfree(feature);
950 dev_err(this->dev, "mode:%d ,failed in set feature.\n", mode); 957 dev_err(this->dev, "mode:%d ,failed in set feature.\n", mode);
951 return -EINVAL; 958 return -EINVAL;
952} 959}