1 files changed, 42 insertions, 21 deletions

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 32f0ed33afe0..26caf2590dae 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -397,7 +397,8 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
                 value = onenand_bufferram_address(this, block);
                 this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
 
-                if (ONENAND_IS_MLC(this) || ONENAND_IS_2PLANE(this))
+                if (ONENAND_IS_MLC(this) || ONENAND_IS_2PLANE(this) ||
+                    ONENAND_IS_4KB_PAGE(this))
                         /* It is always BufferRAM0 */
                         ONENAND_SET_BUFFERRAM0(this);
                 else
@@ -426,7 +427,7 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
                 case FLEXONENAND_CMD_RECOVER_LSB:
                 case ONENAND_CMD_READ:
                 case ONENAND_CMD_READOOB:
-                        if (ONENAND_IS_MLC(this))
+                        if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this))
                                 /* It is always BufferRAM0 */
                                 dataram = ONENAND_SET_BUFFERRAM0(this);
                         else
@@ -466,11 +467,11 @@ static inline int onenand_read_ecc(struct onenand_chip *this)
 {
         int ecc, i, result = 0;
 
-        if (!FLEXONENAND(this))
+        if (!FLEXONENAND(this) && !ONENAND_IS_4KB_PAGE(this))
                 return this->read_word(this->base + ONENAND_REG_ECC_STATUS);
 
         for (i = 0; i < 4; i++) {
-                ecc = this->read_word(this->base + ONENAND_REG_ECC_STATUS + i);
+                ecc = this->read_word(this->base + ONENAND_REG_ECC_STATUS + i*2);
                 if (likely(!ecc))
                         continue;
                 if (ecc & FLEXONENAND_UNCORRECTABLE_ERROR)
@@ -1425,7 +1426,7 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
         int ret;
 
         onenand_get_device(mtd, FL_READING);
-        ret = ONENAND_IS_MLC(this) ?
+        ret = ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this) ?
                 onenand_mlc_read_ops_nolock(mtd, from, &ops) :
                 onenand_read_ops_nolock(mtd, from, &ops);
         onenand_release_device(mtd);
@@ -1460,7 +1461,7 @@ static int onenand_read_oob(struct mtd_info *mtd, loff_t from,
 
         onenand_get_device(mtd, FL_READING);
         if (ops->datbuf)
-                ret = ONENAND_IS_MLC(this) ?
+                ret = ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this) ?
                         onenand_mlc_read_ops_nolock(mtd, from, ops) :
                         onenand_read_ops_nolock(mtd, from, ops);
         else
@@ -1634,7 +1635,6 @@ static int onenand_verify_oob(struct mtd_info *mtd, const u_char *buf, loff_t to
 static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr, size_t len)
 {
         struct onenand_chip *this = mtd->priv;
-        void __iomem *dataram;
         int ret = 0;
         int thislen, column;
 
@@ -1654,10 +1654,9 @@ static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr,
 
                 onenand_update_bufferram(mtd, addr, 1);
 
-                dataram = this->base + ONENAND_DATARAM;
-                dataram += onenand_bufferram_offset(mtd, ONENAND_DATARAM);
+                this->read_bufferram(mtd, ONENAND_DATARAM, this->verify_buf, 0, mtd->writesize);
 
-                if (memcmp(buf, dataram + column, thislen))
+                if (memcmp(buf, this->verify_buf, thislen))
                         return -EBADMSG;
 
                 len -= thislen;
@@ -1926,7 +1925,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                  * 2 PLANE, MLC, and Flex-OneNAND do not support
                  * write-while-program feature.
                  */
-                if (!ONENAND_IS_2PLANE(this) && !first) {
+                if (!ONENAND_IS_2PLANE(this) && !ONENAND_IS_4KB_PAGE(this) && !first) {
                         ONENAND_SET_PREV_BUFFERRAM(this);
 
                         ret = this->wait(mtd, FL_WRITING);
@@ -1957,7 +1956,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                 /*
                  * 2 PLANE, MLC, and Flex-OneNAND wait here
                  */
-                if (ONENAND_IS_2PLANE(this)) {
+                if (ONENAND_IS_2PLANE(this) || ONENAND_IS_4KB_PAGE(this)) {
                         ret = this->wait(mtd, FL_WRITING);
 
                         /* In partial page write we don't update bufferram */
@@ -2084,7 +2083,7 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
                         memcpy(oobbuf + column, buf, thislen);
                 this->write_bufferram(mtd, ONENAND_SPARERAM, oobbuf, 0, mtd->oobsize);
 
-                if (ONENAND_IS_MLC(this)) {
+                if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this)) {
                         /* Set main area of DataRAM to 0xff*/
                         memset(this->page_buf, 0xff, mtd->writesize);
                         this->write_bufferram(mtd, ONENAND_DATARAM,
@@ -3027,7 +3026,7 @@ static int do_otp_read(struct mtd_info *mtd, loff_t from, size_t len,
         this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
         this->wait(mtd, FL_OTPING);
 
-        ret = ONENAND_IS_MLC(this) ?
+        ret = ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this) ?
                 onenand_mlc_read_ops_nolock(mtd, from, &ops) :
                 onenand_read_ops_nolock(mtd, from, &ops);
 
@@ -3372,7 +3371,10 @@ static void onenand_check_features(struct mtd_info *mtd)
         /* Lock scheme */
         switch (density) {
         case ONENAND_DEVICE_DENSITY_4Gb:
-                this->options |= ONENAND_HAS_2PLANE;
+                if (ONENAND_IS_DDP(this))
+                        this->options |= ONENAND_HAS_2PLANE;
+                else
+                        this->options |= ONENAND_HAS_4KB_PAGE;
 
         case ONENAND_DEVICE_DENSITY_2Gb:
                 /* 2Gb DDP does not have 2 plane */
@@ -3393,7 +3395,7 @@ static void onenand_check_features(struct mtd_info *mtd)
                 break;
         }
 
-        if (ONENAND_IS_MLC(this))
+        if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this))
                 this->options &= ~ONENAND_HAS_2PLANE;
 
         if (FLEXONENAND(this)) {
@@ -3407,6 +3409,8 @@ static void onenand_check_features(struct mtd_info *mtd)
                 printk(KERN_DEBUG "Chip support all block unlock\n");
         if (this->options & ONENAND_HAS_2PLANE)
                 printk(KERN_DEBUG "Chip has 2 plane\n");
+        if (this->options & ONENAND_HAS_4KB_PAGE)
+                printk(KERN_DEBUG "Chip has 4KiB pagesize\n");
 }
 
 /**
@@ -3759,6 +3763,12 @@ static int onenand_probe(struct mtd_info *mtd)
         /* Restore system configuration 1 */
         this->write_word(syscfg, this->base + ONENAND_REG_SYS_CFG1);
 
+        /* Workaround */
+        if (syscfg & ONENAND_SYS_CFG1_SYNC_WRITE) {
+                bram_maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID);
+                bram_dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);
+        }
+
         /* Check manufacturer ID */
         if (onenand_check_maf(bram_maf_id))
                 return -ENXIO;
@@ -3778,6 +3788,9 @@ static int onenand_probe(struct mtd_info *mtd)
         this->device_id = dev_id;
         this->version_id = ver_id;
 
+        /* Check OneNAND features */
+        onenand_check_features(mtd);
+
         density = onenand_get_density(dev_id);
         if (FLEXONENAND(this)) {
                 this->dies = ONENAND_IS_DDP(this) ? 2 : 1;
@@ -3799,7 +3812,7 @@ static int onenand_probe(struct mtd_info *mtd)
         /* The data buffer size is equal to page size */
         mtd->writesize = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE);
         /* We use the full BufferRAM */
-        if (ONENAND_IS_MLC(this))
+        if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this))
                 mtd->writesize <<= 1;
 
         mtd->oobsize = mtd->writesize >> 5;
@@ -3829,9 +3842,6 @@ static int onenand_probe(struct mtd_info *mtd)
         else
                 mtd->size = this->chipsize;
 
-        /* Check OneNAND features */
-        onenand_check_features(mtd);
-
         /*
          * We emulate the 4KiB page and 256KiB erase block size
          * But oobsize is still 64 bytes.
@@ -3926,6 +3936,13 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
                                 __func__);
                         return -ENOMEM;
                 }
+#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
+                this->verify_buf = kzalloc(mtd->writesize, GFP_KERNEL);
+                if (!this->verify_buf) {
+                        kfree(this->page_buf);
+                        return -ENOMEM;
+                }
+#endif
                 this->options |= ONENAND_PAGEBUF_ALLOC;
         }
         if (!this->oob_buf) {
@@ -4053,8 +4070,12 @@ void onenand_release(struct mtd_info *mtd)
                 kfree(this->bbm);
         }
         /* Buffers allocated by onenand_scan */
-        if (this->options & ONENAND_PAGEBUF_ALLOC)
+        if (this->options & ONENAND_PAGEBUF_ALLOC) {
                 kfree(this->page_buf);
+#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
+                kfree(this->verify_buf);
+#endif
+        }
         if (this->options & ONENAND_OOBBUF_ALLOC)
                 kfree(this->oob_buf);
         kfree(mtd->eraseregions);