@@ -386,6 +386,10 @@ static int spinand_read_from_cache_op(struct spinand_device *spinand,
if (req->datalen) {
buf = spinand->databuf;
nbytes = nanddev_page_size(nand);
+ if (spinand->use_continuous_read) {
+ buf = req->databuf.in;
+ nbytes = req->datalen;
+ }
column = 0;
}
@@ -415,6 +419,9 @@ static int spinand_read_from_cache_op(struct spinand_device *spinand,
buf += ret;
}
+ if (spinand->use_continuous_read)
+ goto finish;
+
if (req->datalen)
memcpy(req->databuf.in, spinand->databuf + req->dataoffs,
req->datalen);
@@ -430,6 +437,7 @@ static int spinand_read_from_cache_op(struct spinand_device *spinand,
req->ooblen);
}
+finish:
return 0;
}
@@ -646,6 +654,92 @@ static int spinand_write_page(struct spinand_device *spinand,
return nand_ecc_finish_io_req(nand, (struct nand_page_io_req *)req);
}
+static int spinand_mtd_continuous_read(struct mtd_info *mtd, loff_t from,
+ struct mtd_oob_ops *ops,
+ struct nand_io_iter *iter)
+{
+ struct spinand_device *spinand = mtd_to_spinand(mtd);
+ struct nand_device *nand = mtd_to_nanddev(mtd);
+ int ret = 0;
+
+ /*
+ * Prevent data length bigger than controller limitation, create
+ * a temperate operation for checking.
+ */
+ struct spi_mem_op op = SPINAND_READID_OP(0, 0, spinand->scratchbuf, ops->len);
+ ret = spi_mem_adjust_op_size(spinand->spimem, &op);
+ if (ret) {
+ return ret;
+ }
+
+ if (op.data.nbytes != ops->len) {
+ pr_debug("%s: data length bigger than controller limitation\n", __func__);
+ return -ENOTSUPP;
+ }
+
+ if (from & (nanddev_page_size(nand) - 1)) {
+ pr_debug("%s: unaligned address\n", __func__);
+ return -ENOTSUPP;
+ }
+
+ /*
+ * Continuous read mode could reduce some operation in On-die ECC free
+ * flash when read page sequentially.
+ */
+ iter->req.type = NAND_PAGE_READ;
+ iter->req.mode = MTD_OPS_RAW;
+ iter->req.dataoffs = nanddev_offs_to_pos(nand, from, &iter->req.pos);
+ iter->req.databuf.in = ops->datbuf;
+ iter->req.datalen = ops->len;
+
+ ret = spinand_continuous_read_enable(spinand);
+ if (ret)
+ return ret;
+
+ spinand->use_continuous_read = true;
+
+ ret = spinand_select_target(spinand, iter->req.pos.target);
+ if (ret)
+ return ret;
+
+ /*
+ * The continuous read operation including: firstly, starting with the
+ * page read command and the 1 st page data will be read into the cache
+ * after the read latency tRD. Secondly, Issuing the Read From Cache
+ * commands (03h/0Bh/3Bh/6Bh/BBh/EBh) to read out the data from cache
+ * continuously.
+ *
+ * The cache is divided into two halves, while one half of the cache is
+ * outputting the data, the other half will be loaded for the new data;
+ * therefore, the host can read out the data continuously from page to
+ * page. Multiple of Read From Cache commands can be issued in one
+ * continuous read operation, each Read From Cache command is required
+ * to read multiple 4-byte data exactly; otherwise, the data output will
+ * be out of sequence from one Read From Cache command to another Read
+ * From Cache command.
+ *
+ * After all the data is read out, the host should pull CS# high to
+ * terminate this continuous read operation and wait a 6us of tRST for
+ * the NAND device resets read operation. The data output for each page
+ * will always start from byte 0 and a full page data should be read out
+ * for each page.
+ */
+ ret = spinand_read_page(spinand, &iter->req);
+ if (ret)
+ goto continuous_read_error;
+
+ ret = spinand_reset_op(spinand);
+ if (ret)
+ goto continuous_read_error;
+
+continuous_read_error:
+ spinand->use_continuous_read = false;
+ ops->retlen = iter->req.datalen;
+
+ ret = spinand_continuous_read_disable(spinand);
+ return ret;
+}
+
static int spinand_mtd_read(struct mtd_info *mtd, loff_t from,
struct mtd_oob_ops *ops)
{
@@ -665,6 +759,28 @@ static int spinand_mtd_read(struct mtd_info *mtd, loff_t from,
old_stats = mtd->ecc_stats;
+ /*
+ * If the device support continuous read mode and read length larger
+ * than one page size will enter the continuous read mode. This mode
+ * helps avoid issuing a page read command and read from cache command
+ * again, and improves read performance for continuous addresses.
+ */
+ if ((spinand->flags & SPINAND_HAS_CONT_READ_BIT) &&
+ (ops->len > nanddev_page_size(nand))) {
+ ret = spinand_mtd_continuous_read(mtd, from, ops, &iter);
+
+ mutex_unlock(&spinand->lock);
+
+ if (ret == -ENOTSUPP)
+ goto read_each_page;
+
+ if (ecc_failed && !ret)
+ ret = -EBADMSG;
+
+ return ret ? ret : max_bitflips;
+ }
+
+read_each_page:
nanddev_io_for_each_page(nand, NAND_PAGE_READ, from, ops, &iter) {
if (disable_ecc)
iter.req.mode = MTD_OPS_RAW;
@@ -313,6 +313,7 @@ struct spinand_ecc_info {
#define SPINAND_HAS_QE_BIT BIT(0)
#define SPINAND_HAS_CR_FEAT_BIT BIT(1)
+#define SPINAND_HAS_CONT_READ_BIT BIT(2)
/**
* struct spinand_ondie_ecc_conf - private SPI-NAND on-die ECC engine structure
The continuous read operation includes three phases: Firstly, starting with the page read command and the 1st page data will be read into the cache after the read latency tRD. Secondly, Issuing the Read From Cache commands (03h/0Bh/3Bh/6Bh/BBh/EBh) to read out the data from cache continuously. After all the data is read out, the host should pull CS# high to terminate this continuous read operation and wait tRST for the NAND device resets read operation. To prevent read data length bigger than controller limitation, create a temperate operation for checking controller limitation and read data length. Exit continuous read mode and back to original read page method if data length bigger than controller limitation. Continuous reads have a positive impact when reading more than one page and the column address is don't care in this operation, a full page data will be read out for each page. The performance of continuous read mode is as follows. Set the flash to QUAD mode and run 25MHz direct mapping mode on the SPI bus and use the MTD test module to show the performance of continuous reads. As below is the test result on two cases. We could reduce time on continuous read when multiple page read. ===============Continuous====================== mtd_speedtest: MTD device: 0 count: 100 mtd_speedtest: MTD device size 268435456, eraseblock size 131072, page size 2048, count of eraseblocks 2048, pages per eraseblock 64, OOB size 64 mtd_test: scanning for bad eraseblocks mtd_test: scanned 100 eraseblocks, 0 are bad mtd_speedtest: testing eraseblock write speed mtd_speedtest: eraseblock write speed is 1298 KiB/s mtd_speedtest: testing eraseblock read speed mtd_speedtest: eraseblock read speed is 11053 KiB/s mtd_speedtest: testing page write speed mtd_speedtest: page write speed is 1291 KiB/s mtd_speedtest: testing page read speed mtd_speedtest: page read speed is 3240 KiB/s mtd_speedtest: testing 2 page write speed mtd_speedtest: 2 page write speed is 1289 KiB/s mtd_speedtest: testing 2 page read speed mtd_speedtest: 2 page read speed is 2909 KiB/s mtd_speedtest: Testing erase speed mtd_speedtest: erase speed is 45229 KiB/s mtd_speedtest: Testing 2x multi-block erase speed mtd_speedtest: 2x multi-block erase speed is 62135 KiB/s mtd_speedtest: Testing 4x multi-block erase speed mtd_speedtest: 4x multi-block erase speed is 60093 KiB/s mtd_speedtest: Testing 8x multi-block erase speed mtd_speedtest: 8x multi-block erase speed is 61244 KiB/s mtd_speedtest: Testing 16x multi-block erase speed mtd_speedtest: 16x multi-block erase speed is 61538 KiB/s mtd_speedtest: Testing 32x multi-block erase speed mtd_speedtest: 32x multi-block erase speed is 61835 KiB/s mtd_speedtest: Testing 64x multi-block erase speed mtd_speedtest: 64x multi-block erase speed is 60663 KiB/s mtd_speedtest: finished ================================================= ===============Normal============================ mtd_speedtest: MTD device: 0 count: 100 mtd_speedtest: MTD device size 268435456, eraseblock size 131072, page size 2048, count of eraseblocks 2048, pages per eraseblock 64, OOB size 128 mtd_test: scanning for bad eraseblocks mtd_test: scanned 100 eraseblocks, 0 are bad mtd_speedtest: testing eraseblock write speed mtd_speedtest: eraseblock write speed is 4467 KiB/s mtd_speedtest: testing eraseblock read speed mtd_speedtest: eraseblock read speed is 2278 KiB/s mtd_speedtest: testing page write speed mtd_speedtest: page write speed is 4447 KiB/s mtd_speedtest: testing page read speed mtd_speedtest: page read speed is 2204 KiB/s mtd_speedtest: testing 2 page write speed mtd_speedtest: 2 page write speed is 4479 KiB/s mtd_speedtest: testing 2 page read speed mtd_speedtest: 2 page read speed is 2274 KiB/s mtd_speedtest: Testing erase speed mtd_speedtest: erase speed is 44982 KiB/s mtd_speedtest: Testing 2x multi-block erase speed mtd_speedtest: 2x multi-block erase speed is 33766 KiB/s mtd_speedtest: Testing 4x multi-block erase speed mtd_speedtest: 4x multi-block erase speed is 66876 KiB/s mtd_speedtest: Testing 8x multi-block erase speed mtd_speedtest: 8x multi-block erase speed is 67518 KiB/s mtd_speedtest: Testing 16x multi-block erase speed mtd_speedtest: 16x multi-block erase speed is 67792 KiB/s mtd_speedtest: Testing 32x multi-block erase speed mtd_speedtest: 32x multi-block erase speed is 67964 KiB/s mtd_speedtest: Testing 64x multi-block erase speed mtd_speedtest: 64x multi-block erase speed is 68101 KiB/s mtd_speedtest: finished ================================================= Signed-off-by: JaimeLiao <jaimeliao@mxic.com.tw> --- drivers/mtd/nand/spi/core.c | 116 ++++++++++++++++++++++++++++++++++++ include/linux/mtd/spinand.h | 1 + 2 files changed, 117 insertions(+)