Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (59 commits)
  mtd: mtdpart: disallow reading OOB past the end of the partition
  mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
  UBI: use mtd->writebufsize to set minimal I/O unit size
  mtd: initialize writebufsize in the MTD object of a partition
  mtd: onenand: add mtd->writebufsize initialization
  mtd: nand: add mtd->writebufsize initialization
  mtd: cfi: add writebufsize initialization
  mtd: add writebufsize field to mtd_info struct
  mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
  mtd: OneNAND: add enable / disable methods to onenand_chip
  mtd: m25p80: Fix JEDEC ID for AT26DF321
  mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
  mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
  mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
  mtd: nand: ams-delta: drop omap_read/write, use ioremap
  mtd: m25p80: add debugging trace in sst_write
  mtd: nand: ams-delta: select for built-in by default
  mtd: OneNAND: lighten scary initial bad block messages
  mtd: OneNAND: OMAP2/3: add support for command line partitioning
  mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
  ...

Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.

4 files changed, 126 insertions, 52 deletions

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index d0894ca7798..ac31f461cc1 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -35,6 +35,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/regulator/consumer.h>
 
 #include <asm/mach/flash.h>
 #include <plat/gpmc.h>
@@ -63,8 +64,13 @@ struct omap2_onenand {
         int dma_channel;
         int freq;
         int (*setup)(void __iomem *base, int freq);
+        struct regulator *regulator;
 };
 
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probes[] = { "cmdlinepart", NULL,  };
+#endif
+
 static void omap2_onenand_dma_cb(int lch, u16 ch_status, void *data)
 {
         struct omap2_onenand *c = data;
@@ -108,8 +114,9 @@ static void wait_warn(char *msg, int state, unsigned int ctrl,
 static int omap2_onenand_wait(struct mtd_info *mtd, int state)
 {
         struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);
+        struct onenand_chip *this = mtd->priv;
         unsigned int intr = 0;
-        unsigned int ctrl;
+        unsigned int ctrl, ctrl_mask;
         unsigned long timeout;
         u32 syscfg;
 
@@ -180,7 +187,8 @@ retry:
                         if (result == 0) {
                                 /* Timeout after 20ms */
                                 ctrl = read_reg(c, ONENAND_REG_CTRL_STATUS);
-                                if (ctrl & ONENAND_CTRL_ONGO) {
+                                if (ctrl & ONENAND_CTRL_ONGO &&
+                                    !this->ongoing) {
                                         /*
                                          * The operation seems to be still going
                                          * so give it some more time.
@@ -269,7 +277,11 @@ retry:
                 return -EIO;
         }
 
-        if (ctrl & 0xFE9F)
+        ctrl_mask = 0xFE9F;
+        if (this->ongoing)
+                ctrl_mask &= ~0x8000;
+
+        if (ctrl & ctrl_mask)
                 wait_warn("unexpected controller status", state, ctrl, intr);
 
         return 0;
@@ -591,6 +603,30 @@ static void omap2_onenand_shutdown(struct platform_device *pdev)
         memset((__force void *)c->onenand.base, 0, ONENAND_BUFRAM_SIZE);
 }
 
+static int omap2_onenand_enable(struct mtd_info *mtd)
+{
+        int ret;
+        struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);
+
+        ret = regulator_enable(c->regulator);
+        if (ret != 0)
+                dev_err(&c->pdev->dev, "cant enable regulator\n");
+
+        return ret;
+}
+
+static int omap2_onenand_disable(struct mtd_info *mtd)
+{
+        int ret;
+        struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);
+
+        ret = regulator_disable(c->regulator);
+        if (ret != 0)
+                dev_err(&c->pdev->dev, "cant disable regulator\n");
+
+        return ret;
+}
+
 static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 {
         struct omap_onenand_platform_data *pdata;
@@ -705,8 +741,18 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
                 }
         }
 
+        if (pdata->regulator_can_sleep) {
+                c->regulator = regulator_get(&pdev->dev, "vonenand");
+                if (IS_ERR(c->regulator)) {
+                        dev_err(&pdev->dev,  "Failed to get regulator\n");
+                        goto err_release_dma;
+                }
+                c->onenand.enable = omap2_onenand_enable;
+                c->onenand.disable = omap2_onenand_disable;
+        }
+
         if ((r = onenand_scan(&c->mtd, 1)) < 0)
-                goto err_release_dma;
+                goto err_release_regulator;
 
         switch ((c->onenand.version_id >> 4) & 0xf) {
         case 0:
@@ -727,13 +773,15 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
         }
 
 #ifdef CONFIG_MTD_PARTITIONS
-        if (pdata->parts != NULL)
-                r = add_mtd_partitions(&c->mtd, pdata->parts,
-                                       pdata->nr_parts);
+        r = parse_mtd_partitions(&c->mtd, part_probes, &c->parts, 0);
+        if (r > 0)
+                r = add_mtd_partitions(&c->mtd, c->parts, r);
+        else if (pdata->parts != NULL)
+                r = add_mtd_partitions(&c->mtd, pdata->parts, pdata->nr_parts);
         else
 #endif
                 r = add_mtd_device(&c->mtd);
-        if (r < 0)
+        if (r)
                 goto err_release_onenand;
 
         platform_set_drvdata(pdev, c);
@@ -742,6 +790,8 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 
 err_release_onenand:
         onenand_release(&c->mtd);
+err_release_regulator:
+        regulator_put(c->regulator);
 err_release_dma:
         if (c->dma_channel != -1)
                 omap_free_dma(c->dma_channel);
@@ -757,6 +807,7 @@ err_release_mem_region:
 err_free_cs:
         gpmc_cs_free(c->gpmc_cs);
 err_kfree:
+        kfree(c->parts);
         kfree(c);
 
         return r;
@@ -766,18 +817,8 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
 {
         struct omap2_onenand *c = dev_get_drvdata(&pdev->dev);
 
-        BUG_ON(c == NULL);
-
-#ifdef CONFIG_MTD_PARTITIONS
-        if (c->parts)
-                del_mtd_partitions(&c->mtd);
-        else
-                del_mtd_device(&c->mtd);
-#else
-        del_mtd_device(&c->mtd);
-#endif
-
         onenand_release(&c->mtd);
+        regulator_put(c->regulator);
         if (c->dma_channel != -1)
                 omap_free_dma(c->dma_channel);
         omap2_onenand_shutdown(pdev);
@@ -789,6 +830,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
         iounmap(c->onenand.base);
         release_mem_region(c->phys_base, ONENAND_IO_SIZE);
         gpmc_cs_free(c->gpmc_cs);
+        kfree(c->parts);
         kfree(c);
 
         return 0;
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 6b3a875647c..bac41caa8df 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -400,8 +400,7 @@ 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) ||
-                    ONENAND_IS_4KB_PAGE(this))
+                if (ONENAND_IS_2PLANE(this) || ONENAND_IS_4KB_PAGE(this))
                         /* It is always BufferRAM0 */
                         ONENAND_SET_BUFFERRAM0(this);
                 else
@@ -430,7 +429,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) || ONENAND_IS_4KB_PAGE(this))
+                        if (ONENAND_IS_4KB_PAGE(this))
                                 /* It is always BufferRAM0 */
                                 dataram = ONENAND_SET_BUFFERRAM0(this);
                         else
@@ -949,6 +948,8 @@ static int onenand_get_device(struct mtd_info *mtd, int new_state)
                 if (this->state == FL_READY) {
                         this->state = new_state;
                         spin_unlock(&this->chip_lock);
+                        if (new_state != FL_PM_SUSPENDED && this->enable)
+                                this->enable(mtd);
                         break;
                 }
                 if (new_state == FL_PM_SUSPENDED) {
@@ -975,6 +976,8 @@ static void onenand_release_device(struct mtd_info *mtd)
 {
         struct onenand_chip *this = mtd->priv;
 
+        if (this->state != FL_PM_SUSPENDED && this->disable)
+                this->disable(mtd);
         /* Release the chip */
         spin_lock(&this->chip_lock);
         this->state = FL_READY;
@@ -1353,7 +1356,7 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
 
         stats = mtd->ecc_stats;
 
-        readcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
+        readcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
 
         while (read < len) {
                 cond_resched();
@@ -1429,7 +1432,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) || ONENAND_IS_4KB_PAGE(this) ?
+        ret = ONENAND_IS_4KB_PAGE(this) ?
                 onenand_mlc_read_ops_nolock(mtd, from, &ops) :
                 onenand_read_ops_nolock(mtd, from, &ops);
         onenand_release_device(mtd);
@@ -1464,7 +1467,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) || ONENAND_IS_4KB_PAGE(this) ?
+                ret = ONENAND_IS_4KB_PAGE(this) ?
                         onenand_mlc_read_ops_nolock(mtd, from, ops) :
                         onenand_read_ops_nolock(mtd, from, ops);
         else
@@ -1485,8 +1488,7 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
 {
         struct onenand_chip *this = mtd->priv;
         unsigned long timeout;
-        unsigned int interrupt;
-        unsigned int ctrl;
+        unsigned int interrupt, ctrl, ecc, addr1, addr8;
 
         /* The 20 msec is enough */
         timeout = jiffies + msecs_to_jiffies(20);
@@ -1498,25 +1500,28 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
         /* To get correct interrupt status in timeout case */
         interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
         ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
+        addr1 = this->read_word(this->base + ONENAND_REG_START_ADDRESS1);
+        addr8 = this->read_word(this->base + ONENAND_REG_START_ADDRESS8);
 
         if (interrupt & ONENAND_INT_READ) {
-                int ecc = onenand_read_ecc(this);
+                ecc = onenand_read_ecc(this);
                 if (ecc & ONENAND_ECC_2BIT_ALL) {
-                        printk(KERN_WARNING "%s: ecc error = 0x%04x, "
-                                "controller error 0x%04x\n",
-                                __func__, ecc, ctrl);
+                        printk(KERN_DEBUG "%s: ecc 0x%04x ctrl 0x%04x "
+                               "intr 0x%04x addr1 %#x addr8 %#x\n",
+                               __func__, ecc, ctrl, interrupt, addr1, addr8);
                         return ONENAND_BBT_READ_ECC_ERROR;
                 }
         } else {
-                printk(KERN_ERR "%s: read timeout! ctrl=0x%04x intr=0x%04x\n",
-                        __func__, ctrl, interrupt);
+                printk(KERN_ERR "%s: read timeout! ctrl 0x%04x "
+                       "intr 0x%04x addr1 %#x addr8 %#x\n",
+                       __func__, ctrl, interrupt, addr1, addr8);
                 return ONENAND_BBT_READ_FATAL_ERROR;
         }
 
         /* Initial bad block case: 0x2400 or 0x0400 */
         if (ctrl & ONENAND_CTRL_ERROR) {
-                printk(KERN_DEBUG "%s: controller error = 0x%04x\n",
-                        __func__, ctrl);
+                printk(KERN_DEBUG "%s: ctrl 0x%04x intr 0x%04x addr1 %#x "
+                       "addr8 %#x\n", __func__, ctrl, interrupt, addr1, addr8);
                 return ONENAND_BBT_READ_ERROR;
         }
 
@@ -1558,7 +1563,7 @@ int onenand_bbt_read_oob(struct mtd_info *mtd, loff_t from,
 
         column = from & (mtd->oobsize - 1);
 
-        readcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
+        readcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
 
         while (read < len) {
                 cond_resched();
@@ -1612,7 +1617,7 @@ static int onenand_verify_oob(struct mtd_info *mtd, const u_char *buf, loff_t to
         u_char *oob_buf = this->oob_buf;
         int status, i, readcmd;
 
-        readcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
+        readcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
 
         this->command(mtd, readcmd, to, mtd->oobsize);
         onenand_update_bufferram(mtd, to, 0);
@@ -1845,7 +1850,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
         const u_char *buf = ops->datbuf;
         const u_char *oob = ops->oobbuf;
         u_char *oobbuf;
-        int ret = 0;
+        int ret = 0, cmd;
 
         DEBUG(MTD_DEBUG_LEVEL3, "%s: to = 0x%08x, len = %i\n",
                 __func__, (unsigned int) to, (int) len);
@@ -1954,7 +1959,19 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                         ONENAND_SET_NEXT_BUFFERRAM(this);
                 }
 
-                this->command(mtd, ONENAND_CMD_PROG, to, mtd->writesize);
+                this->ongoing = 0;
+                cmd = ONENAND_CMD_PROG;
+
+                /* Exclude 1st OTP and OTP blocks for cache program feature */
+                if (ONENAND_IS_CACHE_PROGRAM(this) &&
+                    likely(onenand_block(this, to) != 0) &&
+                    ONENAND_IS_4KB_PAGE(this) &&
+                    ((written + thislen) < len)) {
+                        cmd = ONENAND_CMD_2X_CACHE_PROG;
+                        this->ongoing = 1;
+                }
+
+                this->command(mtd, cmd, to, mtd->writesize);
 
                 /*
                  * 2 PLANE, MLC, and Flex-OneNAND wait here
@@ -2067,7 +2084,7 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
 
         oobbuf = this->oob_buf;
 
-        oobcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_PROG : ONENAND_CMD_PROGOOB;
+        oobcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_PROG : ONENAND_CMD_PROGOOB;
 
         /* Loop until all data write */
         while (written < len) {
@@ -2086,7 +2103,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) || ONENAND_IS_4KB_PAGE(this)) {
+                if (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,
@@ -2481,7 +2498,8 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
         /* Grab the lock and see if the device is available */
         onenand_get_device(mtd, FL_ERASING);
 
-        if (region || instr->len < MB_ERASE_MIN_BLK_COUNT * block_size) {
+        if (ONENAND_IS_4KB_PAGE(this) || region ||
+            instr->len < MB_ERASE_MIN_BLK_COUNT * block_size) {
                 /* region is set for Flex-OneNAND (no mb erase) */
                 ret = onenand_block_by_block_erase(mtd, instr,
                                                    region, block_size);
@@ -3029,7 +3047,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) || ONENAND_IS_4KB_PAGE(this) ?
+        ret = ONENAND_IS_4KB_PAGE(this) ?
                 onenand_mlc_read_ops_nolock(mtd, from, &ops) :
                 onenand_read_ops_nolock(mtd, from, &ops);
 
@@ -3377,8 +3395,10 @@ static void onenand_check_features(struct mtd_info *mtd)
         case ONENAND_DEVICE_DENSITY_4Gb:
                 if (ONENAND_IS_DDP(this))
                         this->options |= ONENAND_HAS_2PLANE;
-                else if (numbufs == 1)
+                else if (numbufs == 1) {
                         this->options |= ONENAND_HAS_4KB_PAGE;
+                        this->options |= ONENAND_HAS_CACHE_PROGRAM;
+                }
 
         case ONENAND_DEVICE_DENSITY_2Gb:
                 /* 2Gb DDP does not have 2 plane */
@@ -3399,7 +3419,11 @@ static void onenand_check_features(struct mtd_info *mtd)
                 break;
         }
 
-        if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this))
+        /* The MLC has 4KiB pagesize. */
+        if (ONENAND_IS_MLC(this))
+                this->options |= ONENAND_HAS_4KB_PAGE;
+
+        if (ONENAND_IS_4KB_PAGE(this))
                 this->options &= ~ONENAND_HAS_2PLANE;
 
         if (FLEXONENAND(this)) {
@@ -3415,6 +3439,8 @@ static void onenand_check_features(struct mtd_info *mtd)
                 printk(KERN_DEBUG "Chip has 2 plane\n");
         if (this->options & ONENAND_HAS_4KB_PAGE)
                 printk(KERN_DEBUG "Chip has 4KiB pagesize\n");
+        if (this->options & ONENAND_HAS_CACHE_PROGRAM)
+                printk(KERN_DEBUG "Chip has cache program feature\n");
 }
 
 /**
@@ -3831,7 +3857,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) || ONENAND_IS_4KB_PAGE(this))
+        if (ONENAND_IS_4KB_PAGE(this))
                 mtd->writesize <<= 1;
 
         mtd->oobsize = mtd->writesize >> 5;
@@ -4054,6 +4080,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         mtd->block_isbad = onenand_block_isbad;
         mtd->block_markbad = onenand_block_markbad;
         mtd->owner = THIS_MODULE;
+        mtd->writebufsize = mtd->writesize;
 
         /* Unlock whole block */
         this->unlock_all(mtd);
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 01ab5b3c453..fc2c16a0fd1 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -91,16 +91,18 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 for (j = 0; j < len; j++) {
                         /* No need to read pages fully,
                          * just read required OOB bytes */
-                        ret = onenand_bbt_read_oob(mtd, from + j * mtd->writesize + bd->offs, &ops);
+                        ret = onenand_bbt_read_oob(mtd,
+                                from + j * this->writesize + bd->offs, &ops);
 
                         /* If it is a initial bad block, just ignore it */
                         if (ret == ONENAND_BBT_READ_FATAL_ERROR)
                                 return -EIO;
 
-                        if (ret || check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {
+                        if (ret || check_short_pattern(&buf[j * scanlen],
+                                               scanlen, this->writesize, bd)) {
                                 bbm->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                                printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
-                                        i >> 1, (unsigned int) from);
+                                printk(KERN_INFO "OneNAND eraseblock %d is an "
+                                        "initial bad block\n", i >> 1);
                                 mtd->ecc_stats.badblocks++;
                                 break;
                         }
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 0de7a05e6de..a4c74a9ba43 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -651,7 +651,7 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
         void __iomem *p;
         void *buf = (void *) buffer;
         dma_addr_t dma_src, dma_dst;
-        int err, page_dma = 0;
+        int err, ofs, page_dma = 0;
         struct device *dev = &onenand->pdev->dev;
 
         p = this->base + area;
@@ -677,10 +677,13 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
                 if (!page)
                         goto normal;
 
+                /* Page offset */
+                ofs = ((size_t) buf & ~PAGE_MASK);
                 page_dma = 1;
+
                 /* DMA routine */
                 dma_src = onenand->phys_base + (p - this->base);
-                dma_dst = dma_map_page(dev, page, 0, count, DMA_FROM_DEVICE);
+                dma_dst = dma_map_page(dev, page, ofs, count, DMA_FROM_DEVICE);
         } else {
                 /* DMA routine */
                 dma_src = onenand->phys_base + (p - this->base);