From: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
To: "u-boot@lists.denx.de" <u-boot@lists.denx.de>,
"joe.hershberger@ni.com" <joe.hershberger@ni.com>,
"fr0st61te@gmail.com" <fr0st61te@gmail.com>
Subject: Re: [PATCH] fw_setenv: Unbreak fw_setenv caused by buggy MEMISLOCKED use
Date: Sat, 18 Dec 2021 18:23:18 +0000 [thread overview]
Message-ID: <PH0PR10MB461566CC542691E148B6F8DCF4799@PH0PR10MB4615.namprd10.prod.outlook.com> (raw)
In-Reply-To: <737669d5049da1341a4705d8d88b3b75e3bcb5d7.camel@infinera.com>
Ping?
Maybe just revert commit 8a726b852502 ("fw_setenv: lock the flash only if it was locked before") ?
________________________________________
From: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Sent: 13 December 2021 18:22
To: u-boot@lists.denx.de; joe.hershberger@ni.com; fr0st61te@gmail.com
Subject: Re: [PATCH] fw_setenv: Unbreak fw_setenv caused by buggy MEMISLOCKED use
+Joe Hershberger
Jocke
On Wed, 2021-12-08 at 15:33 +0100, Joakim Tjernlund wrote:
> Commit "fw_setenv: lock the flash only if it was locked before"
> checks for Locked status with uninitialized erase data.
> Address by moving the test for MEMISLOCKED.
>
> Fixes: 8a726b852502 ("fw_setenv: lock the flash only if it was locked before")
> Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
> ---
> tools/env/fw_env.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
> index e39c39e23a..3da75be783 100644
> --- a/tools/env/fw_env.c
> +++ b/tools/env/fw_env.c
> @@ -1083,12 +1083,6 @@ static int flash_write_buf(int dev, int fd, void *buf, size_t count)
> }
>
> erase.length = erasesize;
> - if (DEVTYPE(dev) != MTD_ABSENT) {
> - was_locked = ioctl(fd, MEMISLOCKED, &erase);
> - /* treat any errors as unlocked flash */
> - if (was_locked < 0)
> - was_locked = 0;
> - }
>
> /* This only runs once on NOR flash and SPI-dataflash */
> while (processed < write_total) {
> @@ -1108,6 +1102,10 @@ static int flash_write_buf(int dev, int fd, void *buf, size_t count)
>
> if (DEVTYPE(dev) != MTD_ABSENT) {
> erase.start = blockstart;
> + was_locked = ioctl(fd, MEMISLOCKED, &erase);
> + /* treat any errors as unlocked flash */
> + if (was_locked < 0)
> + was_locked = 0;
> if (was_locked)
> ioctl(fd, MEMUNLOCK, &erase);
> /* These do not need an explicit erase cycle */
> @@ -1163,7 +1161,6 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset)
> char tmp = ENV_REDUND_OBSOLETE;
> int was_locked; /* flash lock flag */
>
> - was_locked = ioctl(fd, MEMISLOCKED, &erase);
> erase.start = DEVOFFSET(dev);
> erase.length = DEVESIZE(dev);
> /* This relies on the fact, that ENV_REDUND_OBSOLETE == 0 */
> @@ -1173,6 +1170,10 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset)
> DEVNAME(dev));
> return rc;
> }
> + was_locked = ioctl(fd, MEMISLOCKED, &erase);
> + /* treat any errors as unlocked flash */
> + if (was_locked < 0)
> + was_locked = 0;
> if (was_locked)
> ioctl(fd, MEMUNLOCK, &erase);
> rc = write(fd, &tmp, sizeof(tmp));
next prev parent reply other threads:[~2021-12-18 18:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 14:33 [PATCH] fw_setenv: Unbreak fw_setenv caused by buggy MEMISLOCKED use Joakim Tjernlund
2021-12-13 17:22 ` Joakim Tjernlund
2021-12-18 18:23 ` Joakim Tjernlund [this message]
2021-12-19 14:20 ` Ivan Mikhaylov
2021-12-19 15:28 ` Joakim Tjernlund
2021-12-20 16:16 ` Tom Rini
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=PH0PR10MB461566CC542691E148B6F8DCF4799@PH0PR10MB4615.namprd10.prod.outlook.com \
--to=joakim.tjernlund@infinera.com \
--cc=fr0st61te@gmail.com \
--cc=joe.hershberger@ni.com \
--cc=u-boot@lists.denx.de \
/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 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.