]> git.sur5r.net Git - u-boot/blobdiff - drivers/mtd/nand/nand_util.c
Merge branch 'master' of git://git.denx.de/u-boot-spi
[u-boot] / drivers / mtd / nand / nand_util.c
index d81972ca27baa9f851af9aa872da262386f31d2c..1ded7aa9207d04486d32dd1c42a58081d82348f2 100644 (file)
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/mtd/nand/nand_util.c
  *
  * Copyright (C) 2008 Nokia Corporation: drop_ffs() function by
  * Artem Bityutskiy <dedekind1@gmail.com> from mtd-utils
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * Copyright 2010 Freescale Semiconductor
- * The portions of this file whose copyright is held by Freescale and which
- * are not considered a derived work of GPL v2-only code may be distributed
- * and/or modified under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
  */
 
 #include <common.h>
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <div64.h>
 
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <nand.h>
 #include <jffs2/jffs2.h>
@@ -61,26 +41,26 @@ typedef struct mtd_info             mtd_info_t;
  * nand_erase_opts: - erase NAND flash with support for various options
  *                   (jffs2 formatting)
  *
- * @param meminfo      NAND device to erase
+ * @param mtd          nand mtd instance to erase
  * @param opts         options,  @see struct nand_erase_options
  * @return             0 in case of success
  *
  * This code is ported from flash_eraseall.c from Linux mtd utils by
  * Arcom Control System Ltd.
  */
-int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
+int nand_erase_opts(struct mtd_info *mtd,
+                   const nand_erase_options_t *opts)
 {
        struct jffs2_unknown_node cleanmarker;
        erase_info_t erase;
        unsigned long erase_length, erased_length; /* in blocks */
-       int bbtest = 1;
        int result;
        int percent_complete = -1;
-       const char *mtd_device = meminfo->name;
+       const char *mtd_device = mtd->name;
        struct mtd_oob_ops oob_opts;
-       struct nand_chip *chip = meminfo->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
-       if ((opts->offset & (meminfo->erasesize - 1)) != 0) {
+       if ((opts->offset & (mtd->erasesize - 1)) != 0) {
                printf("Attempt to erase non block-aligned data\n");
                return -1;
        }
@@ -88,11 +68,11 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
        memset(&erase, 0, sizeof(erase));
        memset(&oob_opts, 0, sizeof(oob_opts));
 
-       erase.mtd = meminfo;
-       erase.len  = meminfo->erasesize;
+       erase.mtd = mtd;
+       erase.len = mtd->erasesize;
        erase.addr = opts->offset;
-       erase_length = lldiv(opts->length + meminfo->erasesize - 1,
-                            meminfo->erasesize);
+       erase_length = lldiv(opts->length + mtd->erasesize - 1,
+                            mtd->erasesize);
 
        cleanmarker.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
        cleanmarker.nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER);
@@ -112,16 +92,21 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
                        kfree(chip->bbt);
                }
                chip->bbt = NULL;
+               chip->options &= ~NAND_BBT_SCANNED;
        }
 
        for (erased_length = 0;
             erased_length < erase_length;
-            erase.addr += meminfo->erasesize) {
+            erase.addr += mtd->erasesize) {
 
                WATCHDOG_RESET();
 
-               if (!opts->scrub && bbtest) {
-                       int ret = mtd_block_isbad(meminfo, erase.addr);
+               if (opts->lim && (erase.addr >= (opts->offset + opts->lim))) {
+                       puts("Size of erase exceeds limit\n");
+                       return -EFBIG;
+               }
+               if (!opts->scrub) {
+                       int ret = mtd_block_isbad(mtd, erase.addr);
                        if (ret > 0) {
                                if (!opts->quiet)
                                        printf("\rSkipping bad block at  "
@@ -144,7 +129,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
 
                erased_length++;
 
-               result = mtd_erase(meminfo, &erase);
+               result = mtd_erase(mtd, &erase);
                if (result != 0) {
                        printf("\n%s: MTD Erase failure: %d\n",
                               mtd_device, result);
@@ -160,9 +145,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
                        ops.ooboffs = 0;
                        ops.mode = MTD_OPS_AUTO_OOB;
 
-                       result = mtd_write_oob(meminfo,
-                                                   erase.addr,
-                                                   &ops);
+                       result = mtd_write_oob(mtd, erase.addr, &ops);
                        if (result != 0) {
                                printf("\n%s: MTD writeoob failure: %d\n",
                                       mtd_device, result);
@@ -196,14 +179,14 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
        if (!opts->quiet)
                printf("\n");
 
-       if (opts->scrub)
-               chip->scan_bbt(meminfo);
-
        return 0;
 }
 
 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
 
+#define NAND_CMD_LOCK_TIGHT     0x2c
+#define NAND_CMD_LOCK_STATUS    0x7a
 /******************************************************************************
  * Support for locking / unlocking operations of some NAND devices
  *****************************************************************************/
@@ -233,7 +216,7 @@ int nand_lock(struct mtd_info *mtd, int tight)
 {
        int ret = 0;
        int status;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
        /* select the NAND device */
        chip->select_chip(mtd, 0);
@@ -283,7 +266,7 @@ int nand_get_lock_status(struct mtd_info *mtd, loff_t offset)
        int ret = 0;
        int chipnr;
        int page;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
        /* select the NAND device */
        chipnr = (int)(offset >> chip->chip_shift);
@@ -318,7 +301,7 @@ int nand_get_lock_status(struct mtd_info *mtd, loff_t offset)
  * @param mtd          nand mtd instance
  * @param start                start byte address
  * @param length       number of bytes to unlock (must be a multiple of
- *                     page size nand->writesize)
+ *                     page size mtd->writesize)
  * @param allexcept    if set, unlock everything not selected
  *
  * @return             0 on success, -1 in case of error
@@ -330,9 +313,9 @@ int nand_unlock(struct mtd_info *mtd, loff_t start, size_t length,
        int chipnr;
        int status;
        int page;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
-       debug("nand_unlock%s: start: %08llx, length: %d!\n",
+       debug("nand_unlock%s: start: %08llx, length: %zd!\n",
                allexcept ? " (allexcept)" : "", start, length);
 
        /* select the NAND device */
@@ -414,7 +397,7 @@ int nand_unlock(struct mtd_info *mtd, loff_t start, size_t length,
  * Check if there are any bad blocks, and whether length including bad
  * blocks fits into device
  *
- * @param nand NAND device
+ * @param mtd nand mtd instance
  * @param offset offset in flash
  * @param length image length
  * @param used length of flash needed for the requested length
@@ -422,8 +405,8 @@ int nand_unlock(struct mtd_info *mtd, loff_t start, size_t length,
  *         1 if the image fits, but there are bad blocks
  *        -1 if the image does not fit
  */
-static int check_skip_len(nand_info_t *nand, loff_t offset, size_t length,
-               size_t *used)
+static int check_skip_len(struct mtd_info *mtd, loff_t offset, size_t length,
+                         size_t *used)
 {
        size_t len_excl_bad = 0;
        int ret = 0;
@@ -432,14 +415,14 @@ static int check_skip_len(nand_info_t *nand, loff_t offset, size_t length,
                size_t block_len, block_off;
                loff_t block_start;
 
-               if (offset >= nand->size)
+               if (offset >= mtd->size)
                        return -1;
 
-               block_start = offset & ~(loff_t)(nand->erasesize - 1);
-               block_off = offset & (nand->erasesize - 1);
-               block_len = nand->erasesize - block_off;
+               block_start = offset & ~(loff_t)(mtd->erasesize - 1);
+               block_off = offset & (mtd->erasesize - 1);
+               block_len = mtd->erasesize - block_off;
 
-               if (!nand_block_isbad(nand, block_start))
+               if (!nand_block_isbad(mtd, block_start))
                        len_excl_bad += block_len;
                else
                        ret = 1;
@@ -456,7 +439,7 @@ static int check_skip_len(nand_info_t *nand, loff_t offset, size_t length,
 }
 
 #ifdef CONFIG_CMD_NAND_TRIMFFS
-static size_t drop_ffs(const nand_info_t *nand, const u_char *buf,
+static size_t drop_ffs(const struct mtd_info *mtd, const u_char *buf,
                        const size_t *len)
 {
        size_t l = *len;
@@ -468,8 +451,8 @@ static size_t drop_ffs(const nand_info_t *nand, const u_char *buf,
 
        /* The resulting length must be aligned to the minimum flash I/O size */
        l = i + 1;
-       l = (l + nand->writesize - 1) / nand->writesize;
-       l *=  nand->writesize;
+       l = (l + mtd->writesize - 1) / mtd->writesize;
+       l *=  mtd->writesize;
 
        /*
         * since the input length may be unaligned, prevent access past the end
@@ -479,6 +462,88 @@ static size_t drop_ffs(const nand_info_t *nand, const u_char *buf,
 }
 #endif
 
+/**
+ * nand_verify_page_oob:
+ *
+ * Verify a page of NAND flash, including the OOB.
+ * Reads page of NAND and verifies the contents and OOB against the
+ * values in ops.
+ *
+ * @param mtd          nand mtd instance
+ * @param ops          MTD operations, including data to verify
+ * @param ofs          offset in flash
+ * @return             0 in case of success
+ */
+int nand_verify_page_oob(struct mtd_info *mtd, struct mtd_oob_ops *ops,
+                        loff_t ofs)
+{
+       int rval;
+       struct mtd_oob_ops vops;
+       size_t verlen = mtd->writesize + mtd->oobsize;
+
+       memcpy(&vops, ops, sizeof(vops));
+
+       vops.datbuf = memalign(ARCH_DMA_MINALIGN, verlen);
+
+       if (!vops.datbuf)
+               return -ENOMEM;
+
+       vops.oobbuf = vops.datbuf + mtd->writesize;
+
+       rval = mtd_read_oob(mtd, ofs, &vops);
+       if (!rval)
+               rval = memcmp(ops->datbuf, vops.datbuf, vops.len);
+       if (!rval)
+               rval = memcmp(ops->oobbuf, vops.oobbuf, vops.ooblen);
+
+       free(vops.datbuf);
+
+       return rval ? -EIO : 0;
+}
+
+/**
+ * nand_verify:
+ *
+ * Verify a region of NAND flash.
+ * Reads NAND in page-sized chunks and verifies the contents against
+ * the contents of a buffer.  The offset into the NAND must be
+ * page-aligned, and the function doesn't handle skipping bad blocks.
+ *
+ * @param mtd          nand mtd instance
+ * @param ofs          offset in flash
+ * @param len          buffer length
+ * @param buf          buffer to read from
+ * @return             0 in case of success
+ */
+int nand_verify(struct mtd_info *mtd, loff_t ofs, size_t len, u_char *buf)
+{
+       int rval = 0;
+       size_t verofs;
+       size_t verlen = mtd->writesize;
+       uint8_t *verbuf = memalign(ARCH_DMA_MINALIGN, verlen);
+
+       if (!verbuf)
+               return -ENOMEM;
+
+       /* Read the NAND back in page-size groups to limit malloc size */
+       for (verofs = ofs; verofs < ofs + len;
+            verofs += verlen, buf += verlen) {
+               verlen = min(mtd->writesize, (uint32_t)(ofs + len - verofs));
+               rval = nand_read(mtd, verofs, &verlen, verbuf);
+               if (!rval || (rval == -EUCLEAN))
+                       rval = memcmp(buf, verbuf, verlen);
+
+               if (rval)
+                       break;
+       }
+
+       free(verbuf);
+
+       return rval ? -EIO : 0;
+}
+
+
+
 /**
  * nand_write_skip_bad:
  *
@@ -492,7 +557,7 @@ static size_t drop_ffs(const nand_info_t *nand, const u_char *buf,
  * beyond the limit we are passed, length is set to 0 and actual is set
  * to the required length.
  *
- * @param nand         NAND device
+ * @param mtd          nand mtd instance
  * @param offset       offset in flash
  * @param length       buffer length
  * @param actual       set to size required to write length worth of
@@ -503,8 +568,8 @@ static size_t drop_ffs(const nand_info_t *nand, const u_char *buf,
  * @param flags                flags modifying the behaviour of the write to NAND
  * @return             0 in case of success
  */
-int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
-               size_t *actual, loff_t lim, u_char *buffer, int flags)
+int nand_write_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length,
+                       size_t *actual, loff_t lim, u_char *buffer, int flags)
 {
        int rval = 0, blocksize;
        size_t left_to_write = *length;
@@ -515,24 +580,7 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
        if (actual)
                *actual = 0;
 
-#ifdef CONFIG_CMD_NAND_YAFFS
-       if (flags & WITH_YAFFS_OOB) {
-               if (flags & ~WITH_YAFFS_OOB)
-                       return -EINVAL;
-
-               int pages;
-               pages = nand->erasesize / nand->writesize;
-               blocksize = (pages * nand->oobsize) + nand->erasesize;
-               if (*length % (nand->writesize + nand->oobsize)) {
-                       printf("Attempt to write incomplete page"
-                               " in yaffs mode\n");
-                       return -EINVAL;
-               }
-       } else
-#endif
-       {
-               blocksize = nand->erasesize;
-       }
+       blocksize = mtd->erasesize;
 
        /*
         * nand_write() handles unaligned, partial page writes.
@@ -545,13 +593,13 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
         * you should only start a block skipping access at a
         * partition boundary).  So don't try to handle that.
         */
-       if ((offset & (nand->writesize - 1)) != 0) {
+       if ((offset & (mtd->writesize - 1)) != 0) {
                printf("Attempt to write non page-aligned data\n");
                *length = 0;
                return -EINVAL;
        }
 
-       need_skip = check_skip_len(nand, offset, *length, &used_for_write);
+       need_skip = check_skip_len(mtd, offset, *length, &used_for_write);
 
        if (actual)
                *actual = used_for_write;
@@ -569,7 +617,11 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
        }
 
        if (!need_skip && !(flags & WITH_DROP_FFS)) {
-               rval = nand_write(nand, offset, length, buffer);
+               rval = nand_write(mtd, offset, length, buffer);
+
+               if ((flags & WITH_WR_VERIFY) && !rval)
+                       rval = nand_verify(mtd, offset, *length, buffer);
+
                if (rval == 0)
                        return 0;
 
@@ -580,15 +632,15 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
        }
 
        while (left_to_write > 0) {
-               size_t block_offset = offset & (nand->erasesize - 1);
+               size_t block_offset = offset & (mtd->erasesize - 1);
                size_t write_size, truncated_write_size;
 
                WATCHDOG_RESET();
 
-               if (nand_block_isbad(nand, offset & ~(nand->erasesize - 1))) {
+               if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1))) {
                        printf("Skip bad block 0x%08llx\n",
-                               offset & ~(nand->erasesize - 1));
-                       offset += nand->erasesize - block_offset;
+                               offset & ~(mtd->erasesize - 1));
+                       offset += mtd->erasesize - block_offset;
                        continue;
                }
 
@@ -597,48 +649,22 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
                else
                        write_size = blocksize - block_offset;
 
-#ifdef CONFIG_CMD_NAND_YAFFS
-               if (flags & WITH_YAFFS_OOB) {
-                       int page, pages;
-                       size_t pagesize = nand->writesize;
-                       size_t pagesize_oob = pagesize + nand->oobsize;
-                       struct mtd_oob_ops ops;
-
-                       ops.len = pagesize;
-                       ops.ooblen = nand->oobsize;
-                       ops.mode = MTD_OPS_AUTO_OOB;
-                       ops.ooboffs = 0;
-
-                       pages = write_size / pagesize_oob;
-                       for (page = 0; page < pages; page++) {
-                               WATCHDOG_RESET();
-
-                               ops.datbuf = p_buffer;
-                               ops.oobbuf = ops.datbuf + pagesize;
-
-                               rval = mtd_write_oob(nand, offset, &ops);
-                               if (rval != 0)
-                                       break;
-
-                               offset += pagesize;
-                               p_buffer += pagesize_oob;
-                       }
-               }
-               else
-#endif
-               {
-                       truncated_write_size = write_size;
+               truncated_write_size = write_size;
 #ifdef CONFIG_CMD_NAND_TRIMFFS
-                       if (flags & WITH_DROP_FFS)
-                               truncated_write_size = drop_ffs(nand, p_buffer,
-                                               &write_size);
+               if (flags & WITH_DROP_FFS)
+                       truncated_write_size = drop_ffs(mtd, p_buffer,
+                                       &write_size);
 #endif
 
-                       rval = nand_write(nand, offset, &truncated_write_size,
-                                       p_buffer);
-                       offset += write_size;
-                       p_buffer += write_size;
-               }
+               rval = nand_write(mtd, offset, &truncated_write_size,
+                               p_buffer);
+
+               if ((flags & WITH_WR_VERIFY) && !rval)
+                       rval = nand_verify(mtd, offset,
+                               truncated_write_size, p_buffer);
+
+               offset += write_size;
+               p_buffer += write_size;
 
                if (rval != 0) {
                        printf("NAND write to offset %llx failed %d\n",
@@ -666,7 +692,7 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
  * the limit we are passed, length is set to 0 and actual is set to the
  * required length.
  *
- * @param nand NAND device
+ * @param mtd nand mtd instance
  * @param offset offset in flash
  * @param length buffer length, on return holds number of read bytes
  * @param actual set to size required to read length worth of buffer or 0
@@ -676,8 +702,8 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
  * @param buffer buffer to write to
  * @return 0 in case of success
  */
-int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
-               size_t *actual, loff_t lim, u_char *buffer)
+int nand_read_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length,
+                      size_t *actual, loff_t lim, u_char *buffer)
 {
        int rval;
        size_t left_to_read = *length;
@@ -685,7 +711,7 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
        u_char *p_buffer = buffer;
        int need_skip;
 
-       if ((offset & (nand->writesize - 1)) != 0) {
+       if ((offset & (mtd->writesize - 1)) != 0) {
                printf("Attempt to read non page-aligned data\n");
                *length = 0;
                if (actual)
@@ -693,7 +719,7 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
                return -EINVAL;
        }
 
-       need_skip = check_skip_len(nand, offset, *length, &used_for_read);
+       need_skip = check_skip_len(mtd, offset, *length, &used_for_read);
 
        if (actual)
                *actual = used_for_read;
@@ -711,7 +737,7 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
        }
 
        if (!need_skip) {
-               rval = nand_read(nand, offset, length, buffer);
+               rval = nand_read(mtd, offset, length, buffer);
                if (!rval || rval == -EUCLEAN)
                        return 0;
 
@@ -722,24 +748,24 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
        }
 
        while (left_to_read > 0) {
-               size_t block_offset = offset & (nand->erasesize - 1);
+               size_t block_offset = offset & (mtd->erasesize - 1);
                size_t read_length;
 
                WATCHDOG_RESET();
 
-               if (nand_block_isbad(nand, offset & ~(nand->erasesize - 1))) {
+               if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1))) {
                        printf("Skipping bad block 0x%08llx\n",
-                               offset & ~(nand->erasesize - 1));
-                       offset += nand->erasesize - block_offset;
+                               offset & ~(mtd->erasesize - 1));
+                       offset += mtd->erasesize - block_offset;
                        continue;
                }
 
-               if (left_to_read < (nand->erasesize - block_offset))
+               if (left_to_read < (mtd->erasesize - block_offset))
                        read_length = left_to_read;
                else
-                       read_length = nand->erasesize - block_offset;
+                       read_length = mtd->erasesize - block_offset;
 
-               rval = nand_read(nand, offset, &read_length, p_buffer);
+               rval = nand_read(mtd, offset, &read_length, p_buffer);
                if (rval && rval != -EUCLEAN) {
                        printf("NAND read from offset %llx failed %d\n",
                                offset, rval);
@@ -785,57 +811,57 @@ static int check_pattern(const u_char *buf, u_char patt, int size)
  * This is useful to determine if a block that caused a write error is still
  * good or should be marked as bad.
  *
- * @param nand NAND device
+ * @param mtd nand mtd instance
  * @param offset offset in flash
  * @return 0 if the block is still good
  */
-int nand_torture(nand_info_t *nand, loff_t offset)
+int nand_torture(struct mtd_info *mtd, loff_t offset)
 {
        u_char patterns[] = {0xa5, 0x5a, 0x00};
        struct erase_info instr = {
-               .mtd = nand,
+               .mtd = mtd,
                .addr = offset,
-               .len = nand->erasesize,
+               .len = mtd->erasesize,
        };
        size_t retlen;
        int err, ret = -1, i, patt_count;
        u_char *buf;
 
-       if ((offset & (nand->erasesize - 1)) != 0) {
+       if ((offset & (mtd->erasesize - 1)) != 0) {
                puts("Attempt to torture a block at a non block-aligned offset\n");
                return -EINVAL;
        }
 
-       if (offset + nand->erasesize > nand->size) {
+       if (offset + mtd->erasesize > mtd->size) {
                puts("Attempt to torture a block outside the flash area\n");
                return -EINVAL;
        }
 
        patt_count = ARRAY_SIZE(patterns);
 
-       buf = malloc(nand->erasesize);
+       buf = malloc_cache_aligned(mtd->erasesize);
        if (buf == NULL) {
                puts("Out of memory for erase block buffer\n");
                return -ENOMEM;
        }
 
        for (i = 0; i < patt_count; i++) {
-               err = nand->erase(nand, &instr);
+               err = mtd_erase(mtd, &instr);
                if (err) {
                        printf("%s: erase() failed for block at 0x%llx: %d\n",
-                               nand->name, instr.addr, err);
+                               mtd->name, instr.addr, err);
                        goto out;
                }
 
                /* Make sure the block contains only 0xff bytes */
-               err = nand->read(nand, offset, nand->erasesize, &retlen, buf);
-               if ((err && err != -EUCLEAN) || retlen != nand->erasesize) {
+               err = mtd_read(mtd, offset, mtd->erasesize, &retlen, buf);
+               if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) {
                        printf("%s: read() failed for block at 0x%llx: %d\n",
-                               nand->name, instr.addr, err);
+                               mtd->name, instr.addr, err);
                        goto out;
                }
 
-               err = check_pattern(buf, 0xff, nand->erasesize);
+               err = check_pattern(buf, 0xff, mtd->erasesize);
                if (!err) {
                        printf("Erased block at 0x%llx, but a non-0xff byte was found\n",
                                offset);
@@ -844,22 +870,22 @@ int nand_torture(nand_info_t *nand, loff_t offset)
                }
 
                /* Write a pattern and check it */
-               memset(buf, patterns[i], nand->erasesize);
-               err = nand->write(nand, offset, nand->erasesize, &retlen, buf);
-               if (err || retlen != nand->erasesize) {
+               memset(buf, patterns[i], mtd->erasesize);
+               err = mtd_write(mtd, offset, mtd->erasesize, &retlen, buf);
+               if (err || retlen != mtd->erasesize) {
                        printf("%s: write() failed for block at 0x%llx: %d\n",
-                               nand->name, instr.addr, err);
+                               mtd->name, instr.addr, err);
                        goto out;
                }
 
-               err = nand->read(nand, offset, nand->erasesize, &retlen, buf);
-               if ((err && err != -EUCLEAN) || retlen != nand->erasesize) {
+               err = mtd_read(mtd, offset, mtd->erasesize, &retlen, buf);
+               if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) {
                        printf("%s: read() failed for block at 0x%llx: %d\n",
-                               nand->name, instr.addr, err);
+                               mtd->name, instr.addr, err);
                        goto out;
                }
 
-               err = check_pattern(buf, patterns[i], nand->erasesize);
+               err = check_pattern(buf, patterns[i], mtd->erasesize);
                if (!err) {
                        printf("Pattern 0x%.2x checking failed for block at "
                                        "0x%llx\n", patterns[i], offset);