From: Boris Brezillon <boris.brezillon@collabora.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
linux-mtd@lists.infradead.org, Lubomir Rintel <lkundrak@v3.sk>
Cc: Richard Weinberger <richard@nod.at>,
Boris Brezillon <boris.brezillon@collabora.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>
Subject: [PATCH v2 14/19] mtd: rawnand: cafe: Add exec_op() support
Date: Tue, 5 May 2020 12:13:48 +0200 [thread overview]
Message-ID: <20200505101353.1776394-15-boris.brezillon@collabora.com> (raw)
In-Reply-To: <20200505101353.1776394-1-boris.brezillon@collabora.com>
Implementing exec_op() will help us get rid of the legacy interface and
should make drivers much cleaner too.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Lubomir Rintel <lkundrak@v3.sk>
Tested-by: Lubomir Rintel <lkundrak@v3.sk>
---
Changes in v2:
* Add R-b/T-b
* Drop WARN_ON()s
* Use nand_subop_get_xxx() where appropriate
* Write ADDR2 unconditionally
* Do not wait on CMD_DONE when the last instruction is a DATA
instruction and DMA is used
* s/CAFE_NAND_DMA_CTRL_DATA_IN/CAFE_NAND_CTRL1_HAS_DATA_IN/
---
drivers/mtd/nand/raw/cafe_nand.c | 140 ++++++++++++++++++++++++++++++-
1 file changed, 139 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c
index 36685bee9d83..2f35faf13805 100644
--- a/drivers/mtd/nand/raw/cafe_nand.c
+++ b/drivers/mtd/nand/raw/cafe_nand.c
@@ -21,7 +21,7 @@
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/io.h>
+#include <linux/iopoll.h>
#define CAFE_NAND_CTRL1 0x00
#define CAFE_NAND_CTRL1_HAS_CMD BIT(31)
@@ -773,9 +773,147 @@ static void cafe_nand_detach_chip(struct nand_chip *chip)
dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
}
+static int cafe_nand_exec_subop(struct nand_chip *chip,
+ const struct nand_subop *subop)
+{
+ struct cafe_priv *cafe = nand_get_controller_data(chip);
+ u32 ctrl1 = 0, ctrl2 = cafe->ctl2, addr1 = 0, addr2 = 0;
+ u32 status, wait = CAFE_NAND_IRQ_CMD_DONE;
+ int ret, data_instr = -1;
+ bool waitrdy = false;
+ unsigned int i, j;
+
+ cafe->datalen = 0;
+ ctrl1 |= CAFE_FIELD_PREP(NAND_CTRL1, CE, subop->cs);
+
+ for (i = 0; i < subop->ninstrs; i++) {
+ const struct nand_op_instr *instr = &subop->instrs[i];
+
+ switch (instr->type) {
+ case NAND_OP_CMD_INSTR:
+ if (!(ctrl1 & CAFE_NAND_CTRL1_HAS_CMD))
+ ctrl1 |= CAFE_NAND_CTRL1_HAS_CMD |
+ CAFE_FIELD_PREP(NAND_CTRL1, CMD,
+ instr->ctx.cmd.opcode);
+ else
+ ctrl2 |= CAFE_NAND_CTRL2_HAS_CMD2 |
+ CAFE_FIELD_PREP(NAND_CTRL2, CMD2,
+ instr->ctx.cmd.opcode);
+ break;
+
+ case NAND_OP_ADDR_INSTR:
+ for (j = nand_subop_get_addr_start_off(subop, i);
+ j < nand_subop_get_num_addr_cyc(subop, i); j++) {
+ u32 addr = instr->ctx.addr.addrs[j];
+
+ if (j < 2)
+ addr1 |= addr << (8 * j);
+ else
+ addr2 |= addr << (8 * (j - 2));
+ }
+
+ ctrl1 |= CAFE_NAND_CTRL1_HAS_ADDR |
+ CAFE_FIELD_PREP(NAND_CTRL1, NUM_ADDR_CYC,
+ instr->ctx.addr.naddrs - 1);
+ cafe_writel(cafe, addr1, NAND_ADDR1);
+ cafe_writel(cafe, addr2, NAND_ADDR2);
+ break;
+
+ case NAND_OP_DATA_IN_INSTR:
+ data_instr = i;
+ ctrl1 |= CAFE_NAND_CTRL1_HAS_DATA_IN;
+ break;
+
+ case NAND_OP_DATA_OUT_INSTR:
+ data_instr = i;
+ ctrl1 |= CAFE_NAND_CTRL1_HAS_DATA_OUT;
+ cafe_write_buf(chip,
+ instr->ctx.data.buf.out +
+ nand_subop_get_data_start_off(subop, i),
+ nand_subop_get_data_len(subop, i));
+ break;
+
+ case NAND_OP_WAITRDY_INSTR:
+ wait |= CAFE_NAND_IRQ_FLASH_RDY;
+ waitrdy = true;
+ break;
+ }
+ }
+
+ if (data_instr >= 0)
+ cafe_writel(cafe, nand_subop_get_data_len(subop, data_instr),
+ NAND_DATA_LEN);
+
+ if (cafe->usedma && data_instr >= 0) {
+ u32 dmactrl = CAFE_NAND_DMA_CTRL_ENABLE |
+ CAFE_NAND_DMA_CTRL_RESERVED;
+
+ dmactrl |= CAFE_FIELD_PREP(NAND_DMA_CTRL, DATA_LEN,
+ nand_subop_get_data_len(subop,
+ data_instr));
+ if (ctrl1 & CAFE_NAND_CTRL1_HAS_DATA_IN)
+ dmactrl |= CAFE_NAND_DMA_CTRL_DATA_IN;
+
+ cafe_writel(cafe, dmactrl, NAND_DMA_CTRL);
+
+ /*
+ * If the last instruction is a data transfer and we're using
+ * DMA, we should wait on DMA_DONE only, otherwise, keep
+ * waiting on CMD_DONE.
+ */
+ if (data_instr == subop->ninstrs - 1) {
+ wait &= ~CAFE_NAND_IRQ_CMD_DONE;
+ wait |= CAFE_NAND_IRQ_DMA_DONE;
+ }
+ }
+
+ /* Clear the pending interrupts before starting the operation. */
+ cafe_writel(cafe, wait, NAND_IRQ);
+
+ cafe_writel(cafe, ctrl2, NAND_CTRL2);
+ cafe_writel(cafe, ctrl1, NAND_CTRL1);
+
+ ret = readl_poll_timeout(cafe->mmio + CAFE_NAND_IRQ, status,
+ (status & wait) == wait, 1, USEC_PER_SEC);
+ if (ret)
+ return ret;
+
+ if (ctrl1 & CAFE_NAND_CTRL1_HAS_DATA_IN)
+ cafe_read_buf(chip,
+ subop->instrs[data_instr].ctx.data.buf.in +
+ nand_subop_get_data_start_off(subop, data_instr),
+ nand_subop_get_data_len(subop, data_instr));
+
+ return 0;
+}
+
+static const struct nand_op_parser cafe_nand_op_parser = NAND_OP_PARSER(
+ NAND_OP_PARSER_PATTERN(cafe_nand_exec_subop,
+ NAND_OP_PARSER_PAT_CMD_ELEM(true),
+ NAND_OP_PARSER_PAT_ADDR_ELEM(true, 5),
+ NAND_OP_PARSER_PAT_CMD_ELEM(true),
+ NAND_OP_PARSER_PAT_WAITRDY_ELEM(true),
+ NAND_OP_PARSER_PAT_DATA_IN_ELEM(true, 2112)),
+ NAND_OP_PARSER_PATTERN(cafe_nand_exec_subop,
+ NAND_OP_PARSER_PAT_CMD_ELEM(true),
+ NAND_OP_PARSER_PAT_ADDR_ELEM(true, 5),
+ NAND_OP_PARSER_PAT_CMD_ELEM(true),
+ NAND_OP_PARSER_PAT_DATA_IN_ELEM(true, 2112),
+ NAND_OP_PARSER_PAT_WAITRDY_ELEM(true))
+);
+
+static int cafe_nand_exec_op(struct nand_chip *chip,
+ const struct nand_operation *op,
+ bool check_only)
+{
+ return nand_op_parser_exec_op(chip, &cafe_nand_op_parser, op,
+ check_only);
+}
+
static const struct nand_controller_ops cafe_nand_controller_ops = {
.attach_chip = cafe_nand_attach_chip,
.detach_chip = cafe_nand_detach_chip,
+ .exec_op = cafe_nand_exec_op,
};
static void cafe_nand_init(struct cafe_priv *cafe)
--
2.25.3
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-05-05 10:19 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 10:13 [PATCH v2 00/19] mtd: rawnand: cafe: Convert to exec_op() (and more) Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 01/19] mtd: rawnand: Propage CS selection to sub operations Boris Brezillon
2020-05-24 19:17 ` Miquel Raynal
2020-05-05 10:13 ` [PATCH v2 02/19] mtd: rawnand: cafe: Get rid of an inaccurate kernel doc header Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 03/19] mtd: rawnand: cafe: Rename cafe_nand_write_page_lowlevel() Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 04/19] mtd: rawnand: cafe: Use a correct ECC mode and pass the ECC alg Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 05/19] mtd: rawnand: cafe: Include linux/io.h instead of asm/io.h Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 06/19] mtd: rawnand: cafe: Demistify register fields Boris Brezillon
[not found] ` <20200506204638.GB207924@furthur.local>
2020-05-06 20:53 ` Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 07/19] mtd: rawnand: cafe: Factor out the controller initialization logic Boris Brezillon
2020-05-10 21:49 ` Miquel Raynal
2020-05-05 10:13 ` [PATCH v2 08/19] mtd: rawnand: cafe: Get rid of the debug module param Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 09/19] mtd: rawnand: cafe: Use devm_kzalloc and devm_request_irq() Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 10/19] mtd: rawnand: cafe: Get rid of a useless label Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 11/19] mtd: rawnand: cafe: Explicitly inherit from nand_controller Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 12/19] mtd: rawnand: cafe: Don't leave ECC enabled in the write path Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 13/19] mtd: rawnand: cafe: Don't split things when reading/writing a page Boris Brezillon
2020-05-10 21:49 ` Miquel Raynal
2020-05-05 10:13 ` Boris Brezillon [this message]
2020-05-05 10:13 ` [PATCH v2 15/19] mtd: rawnand: cafe: Get rid of the legacy interface implementation Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 16/19] mtd: rawnand: cafe: Adjust the cafe_{read, write}_buf() prototypes Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 17/19] mtd: rawnand: cafe: s/uint{8,16,32}_t/u{8,16,32}/ Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 18/19] mtd: rawnand: cafe: Drop the cafe_{readl, writel}() wrappers Boris Brezillon
2020-05-10 21:45 ` [PATCH v2 18/19] mtd: rawnand: cafe: Drop the cafe_{readl,writel}() wrappers Miquel Raynal
2020-05-05 10:13 ` [PATCH v2 19/19] mtd: rawnand: cafe: Get rid of the last printk() Boris Brezillon
2020-05-10 21:43 ` Miquel Raynal
[not found] ` <20200505144639.GB1997@furthur.local>
[not found] ` <20200505220152.GA157445@furthur.local>
2020-05-06 6:32 ` [PATCH v2 00/19] mtd: rawnand: cafe: Convert to exec_op() (and more) Boris Brezillon
[not found] ` <20200506155359.GA183666@furthur.local>
2020-05-06 16:11 ` Boris Brezillon
[not found] ` <20200506203635.GA207924@furthur.local>
2020-05-06 20:58 ` Boris Brezillon
2020-05-06 21:35 ` Boris Brezillon
[not found] ` <20200507134708.GA303404@furthur.local>
2020-05-07 14:11 ` Boris Brezillon
2020-05-07 20:12 ` Boris Brezillon
[not found] ` <20200509193440.GA524772@furthur.local>
2020-05-09 20:01 ` Boris Brezillon
[not found] ` <20200509202855.GB524772@furthur.local>
2020-05-10 6:31 ` Boris Brezillon
2020-05-10 6:45 ` Boris Brezillon
[not found] ` <20200510072108.GA587379@furthur.local>
2020-05-10 7:35 ` Boris Brezillon
2020-05-11 8:23 ` Boris Brezillon
[not found] ` <20200512164057.GC604838@furthur.local>
2020-05-12 19:50 ` Boris Brezillon
2020-05-13 17:10 ` Boris Brezillon
[not found] ` <20200515144703.GA1245784@furthur.local>
[not found] ` <20200515192540.GB1245784@furthur.local>
[not found] ` <20200516145650.GA1433661@furthur.local>
2020-05-16 19:08 ` Boris Brezillon
2020-05-16 20:18 ` Boris Brezillon
[not found] ` <20200517164709.GA1651421@furthur.local>
2020-05-18 14:50 ` Boris Brezillon
[not found] ` <20200520072331.GJ1695525@furthur.local>
2020-05-20 7:55 ` Boris Brezillon
[not found] ` <20200524115246.GC2781@furthur.local>
2020-05-24 14:55 ` Boris Brezillon
2020-05-24 15:05 ` Boris Brezillon
2020-05-24 15:29 ` Boris Brezillon
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=20200505101353.1776394-15-boris.brezillon@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=linux-mtd@lists.infradead.org \
--cc=lkundrak@v3.sk \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=tudor.ambarus@microchip.com \
--cc=vigneshr@ti.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).