From: <Tudor.Ambarus@microchip.com>
To: <michael@walle.cc>, <linux-mtd@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <p.yadav@ti.com>, <miquel.raynal@bootlin.com>, <richard@nod.at>,
<vigneshr@ti.com>
Subject: Re: [PATCH v5 4/5] mtd: spi-nor: otp: simplify length check
Date: Fri, 4 Jun 2021 13:06:18 +0000 [thread overview]
Message-ID: <e613133f-87c8-6374-66ff-1b674990cc90@microchip.com> (raw)
In-Reply-To: <20210604100252.9975-5-michael@walle.cc>
On 6/4/21 1:02 PM, Michael Walle wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> By moving the code around a bit, we can just check the length before
> calling spi_nor_mtd_otp_range_is_locked() and drop the length check
> there. This way we don't need to take the lock. This will also skip the
> "*retlen = 0" assignment if the length is zero. But mtdcore already does
> that for us. Thus we can drop that, too.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
> drivers/mtd/spi-nor/otp.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/otp.c b/drivers/mtd/spi-nor/otp.c
> index 063f8fb68649..89fe52e3851a 100644
> --- a/drivers/mtd/spi-nor/otp.c
> +++ b/drivers/mtd/spi-nor/otp.c
> @@ -256,9 +256,6 @@ static int spi_nor_mtd_otp_range_is_locked(struct spi_nor *nor, loff_t ofs,
> unsigned int region;
> int locked;
>
> - if (!len)
> - return 0;
these lines were just introduced in the previous patch. Can you please reorder 4 with 3,
so that we don't touch this twice? With that:
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> -
> /*
> * If any of the affected OTP regions are locked the entire range is
> * considered locked.
> @@ -290,13 +287,16 @@ static int spi_nor_mtd_otp_read_write(struct mtd_info *mtd, loff_t ofs,
> if (ofs < 0 || ofs >= spi_nor_otp_size(nor))
> return 0;
>
> + /* don't access beyond the end */
> + total_len = min_t(size_t, total_len, spi_nor_otp_size(nor) - ofs);
> +
> + if (!total_len)
> + return 0;
> +
> ret = spi_nor_lock_and_prep(nor);
> if (ret)
> return ret;
>
> - /* don't access beyond the end */
> - total_len = min_t(size_t, total_len, spi_nor_otp_size(nor) - ofs);
> -
> if (is_write) {
> ret = spi_nor_mtd_otp_range_is_locked(nor, ofs, total_len);
> if (ret < 0) {
> @@ -307,7 +307,6 @@ static int spi_nor_mtd_otp_read_write(struct mtd_info *mtd, loff_t ofs,
> }
> }
>
> - *retlen = 0;
> while (total_len) {
> /*
> * The OTP regions are mapped into a contiguous area starting
> --
> 2.20.1
>
next prev parent reply other threads:[~2021-06-04 13:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 10:02 [PATCH v5 0/5] mtd: spi-nor: otp: 4 byte mode fix and erase support Michael Walle
2021-06-04 10:02 ` [PATCH v5 1/5] mtd: spi-nor: otp: fix access to security registers in 4 byte mode Michael Walle
2021-06-04 10:02 ` [PATCH v5 2/5] mtd: spi-nor: otp: use more consistent wording Michael Walle
2021-06-04 10:02 ` [PATCH v5 3/5] mtd: spi-nor: otp: return -EROFS if region is read-only Michael Walle
2021-06-04 13:07 ` Tudor.Ambarus
2021-06-04 13:15 ` Michael Walle
2021-06-07 5:46 ` Vignesh Raghavendra
2021-06-07 6:08 ` Michael Walle
2021-06-07 6:47 ` Vignesh Raghavendra
2021-06-07 9:56 ` Michael Walle
2021-06-07 10:30 ` Vignesh Raghavendra
2021-06-07 10:45 ` Michael Walle
2021-06-04 10:02 ` [PATCH v5 4/5] mtd: spi-nor: otp: simplify length check Michael Walle
2021-06-04 13:06 ` Tudor.Ambarus [this message]
2021-06-04 10:02 ` [PATCH v5 5/5] mtd: spi-nor: otp: implement erase for Winbond and similar flashes Michael Walle
2021-06-04 12:51 ` 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=e613133f-87c8-6374-66ff-1b674990cc90@microchip.com \
--to=tudor.ambarus@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=michael@walle.cc \
--cc=miquel.raynal@bootlin.com \
--cc=p.yadav@ti.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: 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).