summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/denali.c
diff options
context:
space:
mode:
authorChuanxiao Dong2010-08-11 12:19:23 +0200
committerDavid Woodhouse2010-08-12 12:10:40 +0200
commit7d8a26fd22c6944cb18a67c5b8d8255608a3ba98 (patch)
tree51291248a39228cb7bd097fb2402c177e5d48bfb /drivers/mtd/nand/denali.c
parentnand/denali: use cpu_relax() while waiting for hardware interrupt (diff)
downloadkernel-qcow2-linux-7d8a26fd22c6944cb18a67c5b8d8255608a3ba98.tar.gz
kernel-qcow2-linux-7d8a26fd22c6944cb18a67c5b8d8255608a3ba98.tar.xz
kernel-qcow2-linux-7d8a26fd22c6944cb18a67c5b8d8255608a3ba98.zip
nand/denali: Add a page check in denali_read_page & denali_read_page_raw
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/denali.c')
-rw-r--r--drivers/mtd/nand/denali.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 5f7c8c8b8b67..017cde48f75d 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1149,6 +1149,13 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
INTR_STATUS0__ECC_ERR;
bool check_erased_page = false;
+ if (page != denali->page) {
+ dev_err(&denali->dev->dev, "IN %s: page %d is not"
+ " equal to denali->page %d, investigate!!",
+ __func__, page, denali->page);
+ BUG();
+ }
+
setup_ecc_for_xfer(denali, true, false);
denali_enable_dma(denali, true);
@@ -1193,6 +1200,13 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
uint32_t irq_status = 0;
uint32_t irq_mask = INTR_STATUS0__DMA_CMD_COMP;
+ if (page != denali->page) {
+ dev_err(&denali->dev->dev, "IN %s: page %d is not"
+ " equal to denali->page %d, investigate!!",
+ __func__, page, denali->page);
+ BUG();
+ }
+
setup_ecc_for_xfer(denali, false, true);
denali_enable_dma(denali, true);