mtd: Blackfin NFC: fix raw page write/read handling

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=085d45fb5216c25b69103e5d861fabdc4389e221
Commit:     085d45fb5216c25b69103e5d861fabdc4389e221
Parent:     7ee064c90b3a65aa0c8d8cd87681177645db494e
Author:     Barry Song <barry.song at analog.com>
AuthorDate: Thu Aug 5 11:07:44 2010 -0400
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Thu Aug 5 16:14:04 2010 +0100

    mtd: Blackfin NFC: fix raw page write/read handling
    
    Our write_buf/read_buf funcs always do ECC in HW ECC mode.  That is not
    needed for raw funcs.  In fact, write_buf/read_buf should be a pure func
    for data input/output while chip->ecc.hwctl controls ECC.  Unfortunately,
    we can't separate ECC from normal data input/output in our NFC, so our DMA
    write_buf/read_buf entries are coupled with ECC operations closely.
    
    Thus we need to provide dedicated read_page_raw/write_page_raw funcs where
    we do non-DMA transactions so as to avoid automatic ECC.
    
    Signed-off-by: Barry Song <barry.song at analog.com>
    Signed-off-by: Mike Frysinger <vapier at gentoo.org>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/bf5xx_nand.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 524cf5f..ca39819 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -571,6 +571,22 @@ static void bf5xx_nand_dma_write_buf(struct mtd_info *mtd,
 		bf5xx_nand_write_buf(mtd, buf, len);
 }
 
+static int bf5xx_nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+		uint8_t *buf, int page)
+{
+	bf5xx_nand_read_buf(mtd, buf, mtd->writesize);
+	bf5xx_nand_read_buf(mtd, chip->oob_poi, mtd->oobsize);
+
+	return 0;
+}
+
+static void bf5xx_nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+		const uint8_t *buf)
+{
+	bf5xx_nand_write_buf(mtd, buf, mtd->writesize);
+	bf5xx_nand_write_buf(mtd, chip->oob_poi, mtd->oobsize);
+}
+
 /*
  * System initialization functions
  */
@@ -795,6 +811,8 @@ static int __devinit bf5xx_nand_probe(struct platform_device *pdev)
 		chip->ecc.correct   = bf5xx_nand_correct_data;
 		chip->ecc.mode	    = NAND_ECC_HW;
 		chip->ecc.hwctl	    = bf5xx_nand_enable_hwecc;
+		chip->ecc.read_page_raw = bf5xx_nand_read_page_raw;
+		chip->ecc.write_page_raw = bf5xx_nand_write_page_raw;
 	} else {
 		chip->ecc.mode	    = NAND_ECC_SOFT;
 	}