From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 24/42] state: backend_circular: default to circular storage
Date: Fri, 31 Mar 2017 09:03:28 +0200 [thread overview]
Message-ID: <20170331070346.26878-25-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20170331070346.26878-1-s.hauer@pengutronix.de>
Default to the new circular storage format which saves erase
cycles. The old format can still be selected with
backend-storage-type = "noncircular".
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
.../devicetree/bindings/barebox/barebox,state.rst | 6 +++---
common/state/backend_storage.c | 14 ++++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/barebox/barebox,state.rst b/Documentation/devicetree/bindings/barebox/barebox,state.rst
index e9daa65f1a..00fb592614 100644
--- a/Documentation/devicetree/bindings/barebox/barebox,state.rst
+++ b/Documentation/devicetree/bindings/barebox/barebox,state.rst
@@ -40,9 +40,9 @@ Optional properties:
e.g. ``hmac(sha256)``. Only used for ``raw``.
* ``backend-stridesize``: Maximum size per copy of the data. Only important for
non-MTD devices
-* ``backend-storage-type``: Type of the storage. This has two options at the
- moment. For MTD with erasing the correct type is ``circular``. For all other
- devices and files, ``direct`` is the needed type.
+* ``backend-storage-type``: Normally the correct storage type is detected auto-
+ matically. The circular backend supports the option ``noncircular`` to fall
+ back to an old storage format.
Variable nodes
--------------
diff --git a/common/state/backend_storage.c b/common/state/backend_storage.c
index f9e8151670..036204c188 100644
--- a/common/state/backend_storage.c
+++ b/common/state/backend_storage.c
@@ -376,13 +376,15 @@ int state_storage_init(struct state *state, const char *path,
ret = mtd_get_meminfo(path, &meminfo);
if (!ret && !(meminfo.flags & MTD_NO_ERASE)) {
- bool circular = true;
- if (!storagetype) {
- circular = false;
- } else if (strcmp(storagetype, "circular")) {
- dev_warn(storage->dev, "Unknown storagetype '%s', falling back to old format circular storage type.\n",
- storagetype);
+ bool circular;
+ if (!storagetype || !strcmp(storagetype, "circular")) {
+ circular = true;
+ } else if (!strcmp(storagetype, "noncircular")) {
+ dev_warn(storage->dev, "using old format circular storage type.\n");
circular = false;
+ } else {
+ dev_warn(storage->dev, "unknown storage type '%s'\n", storagetype);
+ return -EINVAL;
}
return state_storage_mtd_buckets_init(storage, &meminfo, circular);
} else {
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-03-31 7:04 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 7:03 State patches Sascha Hauer
2017-03-31 7:03 ` [PATCH 01/42] state: Make pointing to the backend using a phandle the only supported method Sascha Hauer
2017-05-15 9:18 ` Jan Remmet
2017-05-15 10:14 ` Jan Remmet
2017-05-16 5:33 ` Sascha Hauer
2017-05-17 9:13 ` Jan Remmet
2017-03-31 7:03 ` [PATCH 02/42] state: Use positive logic Sascha Hauer
2017-03-31 7:03 ` [PATCH 03/42] state: backend: remove .get_packed_len Sascha Hauer
2017-03-31 7:03 ` [PATCH 04/42] state: backend: remove len_hint argument from state_storage_read Sascha Hauer
2017-03-31 7:03 ` [PATCH 05/42] state: Drop backend as extra struct type Sascha Hauer
2017-03-31 7:03 ` [PATCH 06/42] state: merge backend.c into state.c Sascha Hauer
2017-03-31 7:03 ` [PATCH 07/42] state: open code state_backend_init in caller Sascha Hauer
2017-03-31 7:03 ` [PATCH 08/42] state: remove unnecessary argument from state_format_init Sascha Hauer
2017-03-31 7:03 ` [PATCH 09/42] state: pass struct state * to storage functions Sascha Hauer
2017-03-31 7:03 ` [PATCH 10/42] state: storage: initialize variable once outside loop Sascha Hauer
2017-03-31 7:03 ` [PATCH 11/42] state: backend_circular: Read whole PEB Sascha Hauer
2017-04-15 8:40 ` Sam Ravnborg
2017-03-31 7:03 ` [PATCH 12/42] state: drop lazy_init Sascha Hauer
2017-03-31 7:03 ` [PATCH 13/42] state: simplify direct backend Sascha Hauer
2017-03-31 7:03 ` [PATCH 14/42] state: replace len_hint logic Sascha Hauer
2017-03-31 7:03 ` [PATCH 15/42] state: Convert all bufs to void * Sascha Hauer
2017-03-31 7:03 ` [PATCH 16/42] state: Drop cache bucket Sascha Hauer
2017-04-15 8:53 ` Sam Ravnborg
2017-04-19 8:22 ` Sascha Hauer
2017-03-31 7:03 ` [PATCH 17/42] state: backend-direct: Fix max_size Sascha Hauer
2017-03-31 7:03 ` [PATCH 18/42] state: bucket: Make output more informative Sascha Hauer
2017-03-31 7:03 ` [PATCH 19/42] state: backend_bucket_direct: max_size is always given Sascha Hauer
2017-03-31 7:03 ` [PATCH 20/42] state: backend: Add more fields to struct state_backend_storage Sascha Hauer
2017-03-31 7:03 ` [PATCH 21/42] state: backend_circular: remove unnecessary warning Sascha Hauer
2017-03-31 7:03 ` [PATCH 22/42] state: storage: direct: do not close file that is not opened Sascha Hauer
2017-03-31 7:03 ` [PATCH 23/42] state: backend: Add some documentation Sascha Hauer
2017-03-31 7:03 ` Sascha Hauer [this message]
2017-03-31 7:03 ` [PATCH 25/42] state: backend_circular: rewrite function doc Sascha Hauer
2017-03-31 7:03 ` [PATCH 26/42] state: backend_storage: Rename variable nr_copies to n_buckets Sascha Hauer
2017-03-31 7:03 ` [PATCH 27/42] state: backend_storage: Rename variable desired_copies to desired_buckets Sascha Hauer
2017-03-31 7:03 ` [PATCH 28/42] state: backend_storage: rewrite function doc Sascha Hauer
2017-03-31 7:03 ` [PATCH 29/42] state: backend_storage: make locally used variable static Sascha Hauer
2017-03-31 7:03 ` [PATCH 30/42] state: backend_storage: rename more variables Sascha Hauer
2017-03-31 7:03 ` [PATCH 31/42] keystore: implement forgetting secrets Sascha Hauer
2017-03-31 7:03 ` [PATCH 32/42] commands: implement keystore command Sascha Hauer
2017-03-31 7:03 ` [PATCH 33/42] commands: state: allow loading state with -l Sascha Hauer
2017-03-31 7:03 ` [PATCH 34/42] crypto: digest: initialize earlier Sascha Hauer
2017-03-31 7:03 ` [PATCH 35/42] state: backend_raw: alloc digest only when needed Sascha Hauer
2017-03-31 7:03 ` [PATCH 36/42] state: backend_circular: Set minumum writesize to 8 Sascha Hauer
2017-03-31 7:03 ` [PATCH 37/42] state: backend bucket circular: Explain metadata Sascha Hauer
2017-03-31 7:03 ` [PATCH 38/42] state: Allow to load without authentification Sascha Hauer
2017-03-31 7:03 ` [PATCH 39/42] state: Update documentation Sascha Hauer
2017-03-31 7:03 ` [PATCH 40/42] state: Do not load state during state_new_from_node Sascha Hauer
2017-03-31 7:03 ` [PATCH 41/42] state: Remove -EUCLEAN check from userspace tool Sascha Hauer
2017-03-31 7:03 ` [PATCH 42/42] state: find device node from device path, not from device node path Sascha Hauer
2017-04-03 20:15 ` State patches Sam Ravnborg
2017-04-04 6:19 ` 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=20170331070346.26878-25-s.hauer@pengutronix.de \
--to=s.hauer@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
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