mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 2/7] state: make first boot less verbose
Date: Thu, 25 Nov 2021 17:10:37 +0100
Message-ID: <20211125161042.3829996-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20211125161042.3829996-1-a.fatoum@pengutronix.de>

First boot with uninitialized state is needlessly verbose:

  state: New state registered 'state'
  state: Detected old on-storage format
  ERROR: state: Error, invalid header crc in raw format, calculated 0x7bd5c66f, found 0x00000000
  state: Ignoring broken bucket 0@0x00000000...
  state: Detected old on-storage format
  ERROR: state: Error, invalid header crc in raw format, calculated 0x7bd5c66f, found 0x00000000
  state: Ignoring broken bucket 1@0x00040000...
  state: Detected old on-storage format
  ERROR: state: Error, invalid header crc in raw format, calculated 0x7bd5c66f, found 0x00000000
  state: Ignoring broken bucket 2@0x00080000...
  ERROR: state: Failed to find any valid state copy in any bucket
  ERROR: state: Failed to read state with format raw, -2

This has confused barebox-state novices more than once. Let's handle
the zeroed state case specially and reduce output in that case, so
it now looks like this:

  state: New state registered 'state'
  state: Detected old on-storage format
  state: Detected old on-storage format
  state: Detected old on-storage format
  state state.of: Fresh state detected, continuing with defaults

This is only the output when CRC is zero (hinting at zeroed state
partition). If crc != zero, then output is a little more verbose than
before:

  state: New state registered 'state'
  state: Detected old on-storage format
  ERROR: state: init error: Invalid argument: header crc in raw format, calculated 0x7bd5c66f, found 0x00000000
  state: Ignoring broken bucket 0@0x00000000...
  state: Detected old on-storage format
  ERROR: state: init error: Invalid argument: header crc in raw format, calculated 0x7bd5c66f, found 0x00000000
  state: Ignoring broken bucket 1@0x00040000...
  state: Detected old on-storage format
  ERROR: state: init error: Invalid argument: header crc in raw format, calculated 0x7bd5c66f, found 0x00000000
  state: Ignoring broken bucket 2@0x00080000...
  ERROR: state: init error: No such file or directory: no valid state copy in any bucket
  ERROR: state: init error: No such file or directory: format raw read failed
  WARNING: state state.of: Failed to load persistent state, continuing with defaults, -2

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/state/backend_format_raw.c |  6 +++---
 common/state/backend_storage.c    | 12 +++++++++---
 common/state/state.h              |  9 ++++++++-
 drivers/misc/state.c              |  4 +++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c
index aeee41d07ce9..1fecdeb9cf57 100644
--- a/common/state/backend_format_raw.c
+++ b/common/state/backend_format_raw.c
@@ -115,10 +115,10 @@ static int backend_format_raw_verify(struct state_backend_format *format,
 
 	header = (struct backend_raw_header *)buf;
 	crc = crc32(0, header, sizeof(*header) - sizeof(uint32_t));
-	if (crc != header->header_crc) {
-		return dev_err_state_init(backend_raw->dev, -EINVAL, "header crc in raw format, calculated 0x%08x, found 0x%08x\n",
+	if (crc != header->header_crc)
+		return dev_err_state_init(backend_raw->dev, header->header_crc ? -EINVAL : -ENOMEDIUM,
+			"header crc in raw format, calculated 0x%08x, found 0x%08x\n",
 			crc, header->header_crc);
-	}
 
 	if (magic && magic != header->magic) {
 		dev_err(backend_raw->dev, "Error, invalid magic in raw format 0x%08x, should be 0x%08x\n",
diff --git a/common/state/backend_storage.c b/common/state/backend_storage.c
index 2d7d9a4a63c0..72f8bcf521ad 100644
--- a/common/state/backend_storage.c
+++ b/common/state/backend_storage.c
@@ -144,6 +144,7 @@ int state_storage_read(struct state_backend_storage *storage,
 		       enum state_flags flags)
 {
 	struct state_backend_storage_bucket *bucket, *bucket_used = NULL;
+	int zerobuckets = 0, totalbuckets = 0;
 	int ret;
 
 	dev_dbg(storage->dev, "Checking redundant buckets...\n");
@@ -152,6 +153,8 @@ int state_storage_read(struct state_backend_storage *storage,
 	 * one we want to use.
 	 */
 	list_for_each_entry(bucket, &storage->buckets, bucket_list) {
+		totalbuckets++;
+
 		ret = bucket->read(bucket, &bucket->buf, &bucket->len);
 		if (ret == -EUCLEAN)
 			bucket->needs_refresh = 1;
@@ -163,16 +166,19 @@ int state_storage_read(struct state_backend_storage *storage,
 		 * .verify overwrites it with the length actually used.
 		 */
 		ret = format->verify(format, magic, bucket->buf, &bucket->len, flags);
-		if (!ret && !bucket_used)
+		if (ret == -ENOMEDIUM)
+			zerobuckets++;
+		else if (!ret && !bucket_used)
 			bucket_used = bucket;
-		if (ret)
+		else if (ret)
 			dev_info(storage->dev, "Ignoring broken bucket %d@0x%08llx...\n", bucket->num, (long long) bucket->offset);
 	}
 
 	dev_dbg(storage->dev, "Checking redundant buckets finished.\n");
 
 	if (!bucket_used)
-		return dev_err_state_init(storage->dev, -ENOENT, "no valid state copy in any bucket\n");
+		return dev_err_state_init(storage->dev, zerobuckets == totalbuckets ? -ENOMEDIUM : -ENOENT,
+					  "no valid state copy in any bucket\n");
 
 	dev_info(storage->dev, "Using bucket %d@0x%08llx\n", bucket_used->num, (long long) bucket_used->offset);
 
diff --git a/common/state/state.h b/common/state/state.h
index d858c9e42735..48572c5d4137 100644
--- a/common/state/state.h
+++ b/common/state/state.h
@@ -268,8 +268,15 @@ static inline int state_string_copy_to_raw(struct state_string *string,
 	return 0;
 }
 
+#ifdef DEBUG
+#define MSG_STATE_ZERO_INIT	MSG_INFO
+#else
+#define MSG_STATE_ZERO_INIT	MSG_DEBUG
+#endif
+
 #define dev_err_state_init(dev, ret, fmt, ...) ({ \
 	int __ret = (ret); \
-	dev_err((dev), "init error: %pe: " fmt, ERR_PTR(__ret), ##__VA_ARGS__); \
+	__dev_printf(__ret == -ENOMEDIUM ? MSG_STATE_ZERO_INIT : MSG_ERR, \
+		     (dev), "init error: %pe: " fmt, ERR_PTR(__ret), ##__VA_ARGS__); \
 	__ret; \
 })
diff --git a/drivers/misc/state.c b/drivers/misc/state.c
index 5da8e4ef915a..cb0d9cf3ad09 100644
--- a/drivers/misc/state.c
+++ b/drivers/misc/state.c
@@ -28,7 +28,9 @@ static int state_probe(struct device_d *dev)
 	}
 
 	ret = state_load(state);
-	if (ret)
+	if (ret == -ENOMEDIUM)
+		dev_info(dev, "Fresh state detected, continuing with defaults\n");
+	else if (ret)
 		dev_warn(dev, "Failed to load persistent state, continuing with defaults, %d\n",
 			 ret);
 
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  parent reply	other threads:[~2021-11-25 16:13 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-25 16:10 [PATCH 0/7] ARM/RISC-V: qemu-virt: share common cleaned up state/env support Ahmad Fatoum
2021-11-25 16:10 ` [PATCH 1/7] state: mark state init errors specially Ahmad Fatoum
2021-11-25 16:10 ` Ahmad Fatoum [this message]
2021-11-30 10:47   ` [PATCH 2/7] state: make first boot less verbose Sascha Hauer
2021-11-30 13:52     ` Ahmad Fatoum
2021-11-25 16:10 ` [PATCH 3/7] of: overlay: rescan aliases calling of_overlay_apply_tree on live tree Ahmad Fatoum
2021-11-25 16:10 ` [PATCH 4/7] ARM: qemu: enable deep probe support Ahmad Fatoum
2021-11-25 16:10 ` [PATCH 5/7] ARM: qemu: move board code to central location Ahmad Fatoum
2021-11-25 16:10 ` [PATCH 6/7] common: boards: qemu-virt: genericize to support non-ARM architectures Ahmad Fatoum
2021-11-25 16:10 ` [PATCH 7/7] RISC-V: qemu-virt: add overlay for environment and state Ahmad Fatoum
2021-12-07 14:04 ` [PATCH 0/7] ARM/RISC-V: qemu-virt: share common cleaned up state/env support Sascha Hauer

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=20211125161042.3829996-3-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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

mail archive of the barebox mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.barebox.org/barebox/0 barebox/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 barebox barebox/ https://lore.barebox.org/barebox \
		barebox@lists.infradead.org barebox@lists.infradead.org
	public-inbox-index barebox

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git