From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <Tudor.Ambarus@microchip.com>,
<linux-mtd@lists.infradead.org>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, <devicetree@vger.kernel.org>
Cc: Julien Su <juliensu@mxic.com.tw>,
Weijie Gao <weijie.gao@mediatek.com>,
Paul Cercueil <paul@crapouillou.net>,
Boris Brezillon <boris.brezillon@collabora.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Mason Yang <masonccyang@mxic.com.tw>,
Chuanhong Guo <gch981213@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 12/20] mtd: nand: Add a NAND page I/O request type
Date: Fri, 29 May 2020 02:25:09 +0200 [thread overview]
Message-ID: <20200529002517.3546-13-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20200529002517.3546-1-miquel.raynal@bootlin.com>
Use an enum to differentiate the type of I/O (reading or writing a
page). Also update the request iterator.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
---
drivers/mtd/nand/spi/core.c | 4 ++--
include/linux/mtd/nand.h | 18 ++++++++++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 4b2619d853e2..6f6ec8aa143d 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -497,7 +497,7 @@ static int spinand_mtd_read(struct mtd_info *mtd, loff_t from,
mutex_lock(&spinand->lock);
- nanddev_io_for_each_page(nand, from, ops, &iter) {
+ nanddev_io_for_each_page(nand, NAND_PAGE_READ, from, ops, &iter) {
ret = spinand_select_target(spinand, iter.req.pos.target);
if (ret)
break;
@@ -545,7 +545,7 @@ static int spinand_mtd_write(struct mtd_info *mtd, loff_t to,
mutex_lock(&spinand->lock);
- nanddev_io_for_each_page(nand, to, ops, &iter) {
+ nanddev_io_for_each_page(nand, NAND_PAGE_WRITE, to, ops, &iter) {
ret = spinand_select_target(spinand, iter.req.pos.target);
if (ret)
break;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index a1f38c778d0e..60d158e183ce 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -82,8 +82,19 @@ struct nand_pos {
unsigned int page;
};
+/**
+ * enum nand_page_io_req_type - Direction of an I/O request
+ * @NAND_PAGE_READ: from the chip, to the controller
+ * @NAND_PAGE_WRITE: from the controller, to the chip
+ */
+enum nand_page_io_req_type {
+ NAND_PAGE_READ = 0,
+ NAND_PAGE_WRITE,
+};
+
/**
* struct nand_page_io_req - NAND I/O request object
+ * @type: the type of page I/O: read or write
* @pos: the position this I/O request is targeting
* @dataoffs: the offset within the page
* @datalen: number of data bytes to read from/write to this page
@@ -99,6 +110,7 @@ struct nand_pos {
* specific commands/operations.
*/
struct nand_page_io_req {
+ enum nand_page_io_req_type type;
struct nand_pos pos;
unsigned int dataoffs;
unsigned int datalen;
@@ -624,11 +636,13 @@ static inline void nanddev_pos_next_page(struct nand_device *nand,
* layer.
*/
static inline void nanddev_io_iter_init(struct nand_device *nand,
+ enum nand_page_io_req_type reqtype,
loff_t offs, struct mtd_oob_ops *req,
struct nand_io_iter *iter)
{
struct mtd_info *mtd = nanddev_to_mtd(nand);
+ iter->req.type = reqtype;
iter->req.mode = req->mode;
iter->req.dataoffs = nanddev_offs_to_pos(nand, offs, &iter->req.pos);
iter->req.ooboffs = req->ooboffs;
@@ -698,8 +712,8 @@ static inline bool nanddev_io_iter_end(struct nand_device *nand,
*
* Should be used for iterate over pages that are contained in an MTD request.
*/
-#define nanddev_io_for_each_page(nand, start, req, iter) \
- for (nanddev_io_iter_init(nand, start, req, iter); \
+#define nanddev_io_for_each_page(nand, type, start, req, iter) \
+ for (nanddev_io_iter_init(nand, type, start, req, iter); \
!nanddev_io_iter_end(nand, iter); \
nanddev_io_iter_next_page(nand, iter))
--
2.20.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-05-29 0:33 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 0:24 [PATCH v7 00/20] Introduce the generic ECC engine abstraction Miquel Raynal
2020-05-29 0:24 ` [PATCH v7 01/20] dt-bindings: mtd: Document nand-ecc-placement Miquel Raynal
2020-05-29 22:21 ` Rob Herring
2020-05-29 0:24 ` [PATCH v7 02/20] mtd: rawnand: Create a new enumeration to describe ECC bytes placement Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 03/20] mtd: rawnand: Separate the ECC engine type and the ECC byte placement Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 04/20] mtd: rawnand: Create a helper to retrieve the ECC placement Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 05/20] mtd: rawnand: Add a kernel doc to the ECC algorithm enumeration Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 06/20] mtd: rawnand: Rename the ECC algorithm enumeration items Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 07/20] mtd: rawnand: Create a new enumeration to describe properly ECC types Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 08/20] mtd: rawnand: Use the new ECC engine type enumeration Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 09/20] mtd: nand: Move nand_device forward declaration to the top Miquel Raynal
2020-06-15 9:08 ` Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 10/20] mtd: nand: Add an extra level in the Kconfig hierarchy Miquel Raynal
2020-06-15 9:07 ` Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 11/20] mtd: nand: Drop useless 'depends on' in Kconfig Miquel Raynal
2020-06-15 9:07 ` Miquel Raynal
2020-05-29 0:25 ` Miquel Raynal [this message]
2020-05-29 0:25 ` [PATCH v7 13/20] mtd: nand: Rename a core structure Miquel Raynal
2020-06-15 9:07 ` Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 14/20] mtd: nand: Add more parameters to the nand_ecc_props structure Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 15/20] mtd: nand: Introduce the ECC engine abstraction Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 16/20] mtd: nand: Convert generic NAND bits to use the ECC framework Miquel Raynal
2020-05-29 8:32 ` Boris Brezillon
2020-05-29 9:25 ` Miquel Raynal
2020-05-29 8:35 ` Boris Brezillon
2020-05-29 0:25 ` [PATCH v7 17/20] mtd: rawnand: Hide the generic OOB layout objects behind helpers Miquel Raynal
2020-05-29 8:45 ` Boris Brezillon
2020-05-29 8:46 ` Boris Brezillon
2020-05-29 9:17 ` Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 18/20] mtd: rawnand: Write a compatibility layer Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 19/20] mtd: rawnand: Move generic OOB layouts to the ECC framework Miquel Raynal
2020-05-29 0:25 ` [PATCH v7 20/20] mtd: rawnand: Move the user input parsing bits " Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200529002517.3546-13-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=boris.brezillon@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=gch981213@gmail.com \
--cc=juliensu@mxic.com.tw \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=masonccyang@mxic.com.tw \
--cc=paul@crapouillou.net \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=vigneshr@ti.com \
--cc=weijie.gao@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).