From: Vignesh Raghavendra <vigneshr@ti.com>
To: <Tudor.Ambarus@microchip.com>, <boris.brezillon@collabora.com>
Cc: richard@nod.at, linux-mtd@lists.infradead.org,
linux-kernel@vger.kernel.org, miquel.raynal@bootlin.com
Subject: Re: [PATCH v4 03/20] mtd: spi-nor: Check for errors after each Register Operation
Date: Wed, 6 Nov 2019 14:49:10 +0530 [thread overview]
Message-ID: <f25eab6d-4ccd-09c2-6ce1-fa6f00ca9367@ti.com> (raw)
In-Reply-To: <20191102112316.20715-4-tudor.ambarus@microchip.com>
On 02/11/19 4:53 PM, Tudor.Ambarus@microchip.com wrote:
> From: Tudor Ambarus <tudor.ambarus@microchip.com>
>
> Check for the return vales of each Register Operation.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
Reviewed-by: Vignesh Raghavendra <vigneshr@ti.com>
Regards
Vignesh
> drivers/mtd/spi-nor/spi-nor.c | 81 ++++++++++++++++++++++++++++++++-----------
> 1 file changed, 60 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 0cb3122e74ad..5debb0f7ca13 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -595,11 +595,15 @@ static int st_micron_set_4byte(struct spi_nor *nor, bool enable)
> {
> int ret;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + return ret;
> +
> ret = macronix_set_4byte(nor, enable);
> - spi_nor_write_disable(nor);
> + if (ret)
> + return ret;
>
> - return ret;
> + return spi_nor_write_disable(nor);
> }
>
> static int spansion_set_4byte(struct spi_nor *nor, bool enable)
> @@ -665,11 +669,15 @@ static int winbond_set_4byte(struct spi_nor *nor, bool enable)
> * Register to be set to 1, so all 3-byte-address reads come from the
> * second 16M. We must clear the register to enable normal behavior.
> */
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + return ret;
> +
> ret = spi_nor_write_ear(nor, 0);
> - spi_nor_write_disable(nor);
> + if (ret)
> + return ret;
>
> - return ret;
> + return spi_nor_write_disable(nor);
> }
>
> static int spi_nor_xread_sr(struct spi_nor *nor, u8 *sr)
> @@ -859,7 +867,9 @@ static int spi_nor_write_sr_cr(struct spi_nor *nor, const u8 *sr_cr)
> {
> int ret;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + return ret;
>
> if (nor->spimem) {
> struct spi_mem_op op =
> @@ -889,7 +899,10 @@ static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new,
> {
> int ret;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + return ret;
> +
> ret = spi_nor_write_sr(nor, status_new);
> if (ret)
> return ret;
> @@ -1397,7 +1410,9 @@ static int spi_nor_erase_multi_sectors(struct spi_nor *nor, u64 addr, u32 len)
> list_for_each_entry_safe(cmd, next, &erase_list, list) {
> nor->erase_opcode = cmd->opcode;
> while (cmd->count) {
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + goto destroy_erase_cmd_list;
>
> ret = spi_nor_erase_sector(nor, addr);
> if (ret)
> @@ -1452,7 +1467,9 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
> if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) {
> unsigned long timeout;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + goto erase_err;
>
> ret = spi_nor_erase_chip(nor);
> if (ret)
> @@ -1479,7 +1496,9 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
> /* "sector"-at-a-time erase */
> } else if (spi_nor_has_uniform_erase(nor)) {
> while (len) {
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + goto erase_err;
>
> ret = spi_nor_erase_sector(nor, addr);
> if (ret)
> @@ -1500,7 +1519,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
> goto erase_err;
> }
>
> - spi_nor_write_disable(nor);
> + ret = spi_nor_write_disable(nor);
>
> erase_err:
> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
> @@ -1849,9 +1868,13 @@ static int macronix_quad_enable(struct spi_nor *nor)
> if (nor->bouncebuf[0] & SR_QUAD_EN_MX)
> return 0;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + return ret;
>
> - spi_nor_write_sr(nor, nor->bouncebuf[0] | SR_QUAD_EN_MX);
> + ret = spi_nor_write_sr(nor, nor->bouncebuf[0] | SR_QUAD_EN_MX);
> + if (ret)
> + return ret;
>
> ret = spi_nor_wait_till_ready(nor);
> if (ret)
> @@ -2022,7 +2045,9 @@ static int sr2_bit7_quad_enable(struct spi_nor *nor)
> /* Update the Quad Enable bit. */
> *sr2 |= SR2_QUAD_EN_BIT7;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + return ret;
>
> ret = spi_nor_write_sr2(nor, sr2);
> if (ret)
> @@ -2063,7 +2088,9 @@ static int spi_nor_clear_sr_bp(struct spi_nor *nor)
> if (ret)
> return ret;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + return ret;
>
> ret = spi_nor_write_sr(nor, nor->bouncebuf[0] & ~mask);
> if (ret)
> @@ -2680,7 +2707,9 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
> if (ret)
> return ret;
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + goto sst_write_err;
>
> nor->sst_write_second = false;
>
> @@ -2718,14 +2747,19 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
> }
> nor->sst_write_second = false;
>
> - spi_nor_write_disable(nor);
> + ret = spi_nor_write_disable(nor);
> + if (ret)
> + goto sst_write_err;
> +
> ret = spi_nor_wait_till_ready(nor);
> if (ret)
> goto sst_write_err;
>
> /* Write out trailing byte if it exists. */
> if (actual != len) {
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + goto sst_write_err;
>
> nor->program_opcode = SPINOR_OP_BP;
> ret = spi_nor_write_data(nor, to, 1, buf + actual);
> @@ -2735,8 +2769,10 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
> ret = spi_nor_wait_till_ready(nor);
> if (ret)
> goto sst_write_err;
> - spi_nor_write_disable(nor);
> +
> actual += 1;
> +
> + ret = spi_nor_write_disable(nor);
> }
> sst_write_err:
> *retlen += actual;
> @@ -2787,7 +2823,10 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
>
> addr = spi_nor_convert_addr(nor, addr);
>
> - spi_nor_write_enable(nor);
> + ret = spi_nor_write_enable(nor);
> + if (ret)
> + goto write_err;
> +
> ret = spi_nor_write_data(nor, addr, page_remain, buf + i);
> if (ret < 0)
> goto write_err;
>
--
Regards
Vignesh
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-11-06 9:19 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-02 11:23 [PATCH v4 00/20] mtd: spi-nor: Quad Enable and (un)lock methods Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 01/20] mtd: spi-nor: Use dev_dbg insted of dev_err for low level info Tudor.Ambarus
2019-11-05 12:12 ` Vignesh Raghavendra
2019-11-06 7:07 ` Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 02/20] mtd: spi-nor: Print debug info inside Reg Ops methods Tudor.Ambarus
2019-11-05 12:13 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 03/20] mtd: spi-nor: Check for errors after each Register Operation Tudor.Ambarus
2019-11-06 9:19 ` Vignesh Raghavendra [this message]
2019-11-02 11:23 ` [PATCH v4 04/20] mtd: spi-nor: Rename label as it is no longer generic Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 05/20] mtd: spi-nor: Void return type for spi_nor_clear_sr/fsr() Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 06/20] mtd: spi-nor: Move the WE and wait calls inside Write SR methods Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 07/20] mtd: spi-nor: Merge spi_nor_write_sr() and spi_nor_write_sr_cr() Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 08/20] mtd: spi-nor: Describe all the Reg Ops Tudor.Ambarus
2019-11-05 12:21 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 09/20] mtd: spi-nor: Drop spansion_quad_enable() Tudor.Ambarus
2019-11-05 12:35 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 10/20] mtd: spi-nor: Fix errno on Quad Enable methods Tudor.Ambarus
2019-11-05 12:36 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 11/20] mtd: spi-nor: Check all the bits written, not just the BP ones Tudor.Ambarus
2019-11-05 12:21 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 12/20] mtd: spi-nor: Print debug message when the read back test fails Tudor.Ambarus
2019-11-05 12:37 ` Vignesh Raghavendra
2019-11-06 7:24 ` Tudor.Ambarus
2019-11-06 7:39 ` Vignesh Raghavendra
2019-11-07 5:58 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 13/20] mtd: spi-nor: Fix clearing of QE bit on lock()/unlock() Tudor.Ambarus
2019-11-05 17:07 ` Vignesh Raghavendra
2019-11-06 8:33 ` Tudor.Ambarus
2019-11-06 16:26 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 14/20] mtd: spi-nor: Extend the QE Read Back test to the entire SR byte Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 15/20] mtd: spi-nor: Extend the QE Read Back test to both SR1 and SR2 Tudor.Ambarus
2019-11-05 16:06 ` Vignesh Raghavendra
2019-11-06 8:41 ` Tudor.Ambarus
2019-11-02 11:23 ` [PATCH v4 16/20] mtd: spi-nor: Rename CR_QUAD_EN_SPAN to SR2_QUAD_EN_BIT1 Tudor.Ambarus
2019-11-06 5:45 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 17/20] mtd: spi-nor: Merge spansion Quad Enable methods Tudor.Ambarus
2019-11-06 5:46 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 18/20] mtd: spi-nor: Rename macronix_quad_enable to spi_nor_sr1_bit6_quad_enable Tudor.Ambarus
2019-11-06 6:00 ` Vignesh Raghavendra
2019-11-02 11:23 ` [PATCH v4 19/20] mtd: spi-nor: Prepend "spi_nor_" to "sr2_bit7_quad_enable" Tudor.Ambarus
2019-11-02 11:24 ` [PATCH v4 20/20] mtd: spi-nor: Rework the disabling of block write protection Tudor.Ambarus
2019-11-07 6:27 ` [PATCH v4 00/20] mtd: spi-nor: Quad Enable and (un)lock methods Tudor.Ambarus
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=f25eab6d-4ccd-09c2-6ce1-fa6f00ca9367@ti.com \
--to=vigneshr@ti.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=boris.brezillon@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
/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