public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH v4] sf: Query write-protection status before operating the flash
@ 2022-02-02  6:35 Jan Kiszka
  2022-02-02  8:21 ` Michael Walle
  0 siblings, 1 reply; 7+ messages in thread
From: Jan Kiszka @ 2022-02-02  6:35 UTC (permalink / raw)
  To: Tom Rini
  Cc: Jagan Teki, Michael Walle, chaochao2021666, Tudor.Ambarus,
	vigneshr, baocheng.su, le.jin, u-boot, chao zeng

From: Jan Kiszka <jan.kiszka@siemens.com>

Do not suggest successful operation if a flash area to be changed is
actually locked, thus will not execute the request. Rather report an
error and bail out. That's way more user-friendly than asking them to
manually check for this case.

Derived from original patch by Chao Zeng.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

This is the successor of "[PATCH V3] sf: Querying write-protect status 
before operating the flash", moving the test into the CLI API, see
https://lore.kernel.org/u-boot/20220117175628.GQ2631111@bill-the-cat/.

 cmd/sf.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cmd/sf.c b/cmd/sf.c
index 8bdebd9fd8f..a24e04c690b 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -287,6 +287,12 @@ static int do_spi_flash_read_write(int argc, char *const argv[])
 		return 1;
 	}
 
+	if (strncmp(argv[0], "read", 4) != 0 && flash->flash_is_locked &&
+	    flash->flash_is_locked(flash, offset, len)) {
+		printf("ERROR: flash area is locked\n");
+		return 1;
+	}
+
 	buf = map_physmem(addr, len, MAP_WRBACK);
 	if (!buf && addr) {
 		puts("Failed to map physical memory\n");
@@ -343,6 +349,12 @@ static int do_spi_flash_erase(int argc, char *const argv[])
 		return 1;
 	}
 
+	if (flash->flash_is_locked &&
+	    flash->flash_is_locked(flash, offset, len)) {
+		printf("ERROR: flash area is locked\n");
+		return 1;
+	}
+
 	ret = spi_flash_erase(flash, offset, size);
 	printf("SF: %zu bytes @ %#x Erased: ", (size_t)size, (u32)offset);
 	if (ret)
-- 
2.34.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-02-07 12:43 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-02  6:35 [PATCH v4] sf: Query write-protection status before operating the flash Jan Kiszka
2022-02-02  8:21 ` Michael Walle
2022-02-02  9:38   ` Jan Kiszka
2022-02-02  9:55     ` Michael Walle
2022-02-02  9:57     ` Jan Kiszka
2022-02-04 12:55       ` Jan Kiszka
2022-02-07 12:43         ` Michael Walle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox