From: Boris Brezillon <boris.brezillon@collabora.com> To: Apurva Nandan <a-nandan@ti.com> Cc: Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Mark Brown <broonie@kernel.org>, Patrice Chotard <patrice.chotard@foss.st.com>, Christophe Kerello <christophe.kerello@foss.st.com>, <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <linux-spi@vger.kernel.org>, <p.yadav@ti.com> Subject: Re: [PATCH v2 03/14] mtd: spinand: Patch spi_mem_op for the SPI IO protocol using reg_proto Date: Tue, 12 Oct 2021 08:40:47 +0200 [thread overview] Message-ID: <20211012084047.6381ddce@collabora.com> (raw) In-Reply-To: <20211011204619.81893-4-a-nandan@ti.com> On Tue, 12 Oct 2021 02:16:08 +0530 Apurva Nandan <a-nandan@ti.com> wrote: > Currently, the op macros in spinand.h don't give the option to setup > any non-array access instructions for Dual/Quad/Octal DTR SPI bus. > Having a function that patches the op based on reg_proto would be > better than trying to write all the setup logic in op macros. > > Create a spimem_patch_op() that would patch cmd, addr, dummy and data > phase of the spi_mem op, for the given spinand->reg_proto. And hence, > call the spimem_patch_op() before executing any spi_mem op. I'm honestly not sure this rule will stand over time, and patching operations at submission time has a cost (ok, it's negligible compared to the IO duration, but still), so I'd rather see this done statically with all relevant macros taking an extra dtr argument. > > Note: In this commit, spimem_patch_op() isn't called in the > read_reg_op(), write_reg_op() and wait() functions, as they need > modifications in address value and data nbytes when in Octal DTR mode. > This will be fixed in a later commit. See, that's what I'm talking about. > > Signed-off-by: Apurva Nandan <a-nandan@ti.com> > --- > drivers/mtd/nand/spi/core.c | 49 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c > index d82a3e6d9bb5..11746d858f87 100644 > --- a/drivers/mtd/nand/spi/core.c > +++ b/drivers/mtd/nand/spi/core.c > @@ -20,6 +20,49 @@ > #include <linux/spi/spi.h> > #include <linux/spi/spi-mem.h> > > +/** > + * spinand_patch_op() - Helper function to patch the spi_mem op based on the > + * spinand->reg_proto > + * @spinand: the spinand device > + * @op: the spi_mem op to patch > + * > + * Set up buswidth and dtr fields for cmd, addr, dummy and data phase. Also > + * adjust cmd opcode and dummy nbytes. This function doesn't make any changes > + * to addr val or data buf. > + */ > +static void spinand_patch_op(const struct spinand_device *spinand, > + struct spi_mem_op *op) > +{ > + u8 op_buswidth = SPINAND_PROTO_BUSWIDTH(spinand->reg_proto); > + u8 op_is_dtr = SPINAND_PROTO_IS_DTR(spinand->reg_proto); > + > + if (spinand->reg_proto == SPINAND_SINGLE_STR) > + return; > + > + op->cmd.buswidth = op_buswidth; > + op->cmd.dtr = op_is_dtr; > + if (spinand->reg_proto == SPINAND_OCTAL_DTR) { > + op->cmd.opcode = (op->cmd.opcode << 8) | op->cmd.opcode; > + op->cmd.nbytes = 2; > + } > + > + if (op->addr.nbytes) { > + op->addr.buswidth = op_buswidth; > + op->addr.dtr = op_is_dtr; > + } > + > + if (op->dummy.nbytes) { > + op->dummy.buswidth = op_buswidth; > + op->dummy.dtr = op_is_dtr; > + op->dummy.nbytes <<= op_is_dtr; > + } > + > + if (op->data.nbytes) { > + op->data.buswidth = op_buswidth; > + op->data.dtr = op_is_dtr; > + } > +} > + > static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) > { > struct spi_mem_op op = SPINAND_GET_FEATURE_OP(reg, > @@ -343,6 +386,7 @@ static int spinand_write_enable_op(struct spinand_device *spinand) > { > struct spi_mem_op op = SPINAND_WR_EN_DIS_OP(true); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -353,6 +397,7 @@ static int spinand_load_page_op(struct spinand_device *spinand, > unsigned int row = nanddev_pos_to_row(nand, &req->pos); > struct spi_mem_op op = SPINAND_PAGE_READ_OP(row); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -477,6 +522,7 @@ static int spinand_program_op(struct spinand_device *spinand, > unsigned int row = nanddev_pos_to_row(nand, &req->pos); > struct spi_mem_op op = SPINAND_PROG_EXEC_OP(row); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -487,6 +533,7 @@ static int spinand_erase_op(struct spinand_device *spinand, > unsigned int row = nanddev_pos_to_row(nand, pos); > struct spi_mem_op op = SPINAND_BLK_ERASE_OP(row); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -533,6 +580,7 @@ static int spinand_read_id_op(struct spinand_device *spinand, u8 naddr, > naddr, ndummy, spinand->scratchbuf, SPINAND_MAX_ID_LEN); > int ret; > > + spinand_patch_op(spinand, &op); > ret = spi_mem_exec_op(spinand->spimem, &op); > if (!ret) > memcpy(buf, spinand->scratchbuf, SPINAND_MAX_ID_LEN); > @@ -545,6 +593,7 @@ static int spinand_reset_op(struct spinand_device *spinand) > struct spi_mem_op op = SPINAND_RESET_OP; > int ret; > > + spinand_patch_op(spinand, &op); > ret = spi_mem_exec_op(spinand->spimem, &op); > if (ret) > return ret;
WARNING: multiple messages have this Message-ID (diff)
From: Boris Brezillon <boris.brezillon@collabora.com> To: Apurva Nandan <a-nandan@ti.com> Cc: Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Mark Brown <broonie@kernel.org>, Patrice Chotard <patrice.chotard@foss.st.com>, Christophe Kerello <christophe.kerello@foss.st.com>, <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <linux-spi@vger.kernel.org>, <p.yadav@ti.com> Subject: Re: [PATCH v2 03/14] mtd: spinand: Patch spi_mem_op for the SPI IO protocol using reg_proto Date: Tue, 12 Oct 2021 08:40:47 +0200 [thread overview] Message-ID: <20211012084047.6381ddce@collabora.com> (raw) In-Reply-To: <20211011204619.81893-4-a-nandan@ti.com> On Tue, 12 Oct 2021 02:16:08 +0530 Apurva Nandan <a-nandan@ti.com> wrote: > Currently, the op macros in spinand.h don't give the option to setup > any non-array access instructions for Dual/Quad/Octal DTR SPI bus. > Having a function that patches the op based on reg_proto would be > better than trying to write all the setup logic in op macros. > > Create a spimem_patch_op() that would patch cmd, addr, dummy and data > phase of the spi_mem op, for the given spinand->reg_proto. And hence, > call the spimem_patch_op() before executing any spi_mem op. I'm honestly not sure this rule will stand over time, and patching operations at submission time has a cost (ok, it's negligible compared to the IO duration, but still), so I'd rather see this done statically with all relevant macros taking an extra dtr argument. > > Note: In this commit, spimem_patch_op() isn't called in the > read_reg_op(), write_reg_op() and wait() functions, as they need > modifications in address value and data nbytes when in Octal DTR mode. > This will be fixed in a later commit. See, that's what I'm talking about. > > Signed-off-by: Apurva Nandan <a-nandan@ti.com> > --- > drivers/mtd/nand/spi/core.c | 49 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c > index d82a3e6d9bb5..11746d858f87 100644 > --- a/drivers/mtd/nand/spi/core.c > +++ b/drivers/mtd/nand/spi/core.c > @@ -20,6 +20,49 @@ > #include <linux/spi/spi.h> > #include <linux/spi/spi-mem.h> > > +/** > + * spinand_patch_op() - Helper function to patch the spi_mem op based on the > + * spinand->reg_proto > + * @spinand: the spinand device > + * @op: the spi_mem op to patch > + * > + * Set up buswidth and dtr fields for cmd, addr, dummy and data phase. Also > + * adjust cmd opcode and dummy nbytes. This function doesn't make any changes > + * to addr val or data buf. > + */ > +static void spinand_patch_op(const struct spinand_device *spinand, > + struct spi_mem_op *op) > +{ > + u8 op_buswidth = SPINAND_PROTO_BUSWIDTH(spinand->reg_proto); > + u8 op_is_dtr = SPINAND_PROTO_IS_DTR(spinand->reg_proto); > + > + if (spinand->reg_proto == SPINAND_SINGLE_STR) > + return; > + > + op->cmd.buswidth = op_buswidth; > + op->cmd.dtr = op_is_dtr; > + if (spinand->reg_proto == SPINAND_OCTAL_DTR) { > + op->cmd.opcode = (op->cmd.opcode << 8) | op->cmd.opcode; > + op->cmd.nbytes = 2; > + } > + > + if (op->addr.nbytes) { > + op->addr.buswidth = op_buswidth; > + op->addr.dtr = op_is_dtr; > + } > + > + if (op->dummy.nbytes) { > + op->dummy.buswidth = op_buswidth; > + op->dummy.dtr = op_is_dtr; > + op->dummy.nbytes <<= op_is_dtr; > + } > + > + if (op->data.nbytes) { > + op->data.buswidth = op_buswidth; > + op->data.dtr = op_is_dtr; > + } > +} > + > static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) > { > struct spi_mem_op op = SPINAND_GET_FEATURE_OP(reg, > @@ -343,6 +386,7 @@ static int spinand_write_enable_op(struct spinand_device *spinand) > { > struct spi_mem_op op = SPINAND_WR_EN_DIS_OP(true); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -353,6 +397,7 @@ static int spinand_load_page_op(struct spinand_device *spinand, > unsigned int row = nanddev_pos_to_row(nand, &req->pos); > struct spi_mem_op op = SPINAND_PAGE_READ_OP(row); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -477,6 +522,7 @@ static int spinand_program_op(struct spinand_device *spinand, > unsigned int row = nanddev_pos_to_row(nand, &req->pos); > struct spi_mem_op op = SPINAND_PROG_EXEC_OP(row); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -487,6 +533,7 @@ static int spinand_erase_op(struct spinand_device *spinand, > unsigned int row = nanddev_pos_to_row(nand, pos); > struct spi_mem_op op = SPINAND_BLK_ERASE_OP(row); > > + spinand_patch_op(spinand, &op); > return spi_mem_exec_op(spinand->spimem, &op); > } > > @@ -533,6 +580,7 @@ static int spinand_read_id_op(struct spinand_device *spinand, u8 naddr, > naddr, ndummy, spinand->scratchbuf, SPINAND_MAX_ID_LEN); > int ret; > > + spinand_patch_op(spinand, &op); > ret = spi_mem_exec_op(spinand->spimem, &op); > if (!ret) > memcpy(buf, spinand->scratchbuf, SPINAND_MAX_ID_LEN); > @@ -545,6 +593,7 @@ static int spinand_reset_op(struct spinand_device *spinand) > struct spi_mem_op op = SPINAND_RESET_OP; > int ret; > > + spinand_patch_op(spinand, &op); > ret = spi_mem_exec_op(spinand->spimem, &op); > if (ret) > return ret; ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2021-10-12 6:40 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-11 20:46 [PATCH v2 00/14] mtd: spinand: Add Octal DTR SPI (8D-8D-8D) mode support Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 01/14] spi: spi-mem: Add DTR templates for cmd, address, dummy and data phase Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 02/14] mtd: spinand: Add enum spinand_proto to indicate current SPI IO mode Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-12 6:39 ` Boris Brezillon 2021-10-12 6:39 ` Boris Brezillon 2021-10-11 20:46 ` [PATCH v2 03/14] mtd: spinand: Patch spi_mem_op for the SPI IO protocol using reg_proto Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-12 6:40 ` Boris Brezillon [this message] 2021-10-12 6:40 ` Boris Brezillon 2021-10-11 20:46 ` [PATCH v2 04/14] mtd: spinand: Fix odd byte addr and data phase in read and write reg op for Octal DTR mode Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 05/14] mtd: spinand: Add adjust_op() in manufacturer_ops to modify the ops for manufacturer specific changes Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-12 6:54 ` Boris Brezillon 2021-10-12 6:54 ` Boris Brezillon 2021-10-11 20:46 ` [PATCH v2 06/14] mtd: spinand: Add macros for Octal DTR page read and write operations Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 07/14] mtd: spinand: Allow enabling Octal DTR mode in the core Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-12 7:14 ` Boris Brezillon 2021-10-12 7:14 ` Boris Brezillon 2021-10-11 20:46 ` [PATCH v2 08/14] mtd: spinand: winbond: Add support for write volatile configuration register op Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 09/14] mtd: spinand: winbond: Add octal_dtr_enable() for manufacturer_ops Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 10/14] mtd: spinand: Add support for Power-on-Reset (PoR) instruction Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 11/14] mtd: spinand: Perform Power-on-Reset on the flash in mtd_suspend() Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-12 7:25 ` Boris Brezillon 2021-10-12 7:25 ` Boris Brezillon 2021-10-11 20:46 ` [PATCH v2 12/14] mtd: spinand: Add adjust_op() in Winbond manufacturer_ops Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 13/14] mtd: spinand: winbond: Rename cache op_variants struct variable Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan 2021-10-11 20:46 ` [PATCH v2 14/14] mtd: spinand: winbond: Add support for Winbond W35N01JW SPI NAND flash Apurva Nandan 2021-10-11 20:46 ` Apurva Nandan
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=20211012084047.6381ddce@collabora.com \ --to=boris.brezillon@collabora.com \ --cc=a-nandan@ti.com \ --cc=broonie@kernel.org \ --cc=christophe.kerello@foss.st.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-spi@vger.kernel.org \ --cc=miquel.raynal@bootlin.com \ --cc=p.yadav@ti.com \ --cc=patrice.chotard@foss.st.com \ --cc=richard@nod.at \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.