From: Michael Olbrich <m.olbrich@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [PATCH 3/3] state: support backend-diskuuid / backend-offset
Date: Mon, 24 Jan 2022 11:04:58 +0100 [thread overview]
Message-ID: <20220124100458.2924679-4-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220124100458.2924679-1-m.olbrich@pengutronix.de>
On some platforms (e.g. EFI on x86_64) the state backend can only be
selected by a partiton UUID. On existing devices with a DOS partition
table, there may be no spare partition available for state.
This makes it possible to select the disk via UUID. The exact position is
defined by an explicitly specified offset.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
I wasn't sure where to add the helper function. Is include/fs.h ok or
should I put it somewhere else?
I'll implement the same helper for dt-utils, so we can avoid additional
#ifdef here.
common/state/state.c | 55 +++++++++++++++++++++++++++++---------------
include/fs.h | 12 ++++++++++
2 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/common/state/state.c b/common/state/state.c
index 8c34ae83e52b..2a8b12d20c5a 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -592,6 +592,7 @@ struct state *state_new_from_node(struct device_node *node, bool readonly)
const char *backend_type;
const char *storage_type = NULL;
const char *alias;
+ const char *diskuuid;
uint32_t stridesize;
struct device_node *partition_node;
off_t offset = 0;
@@ -607,30 +608,48 @@ struct state *state_new_from_node(struct device_node *node, bool readonly)
if (IS_ERR(state))
return state;
- partition_node = of_parse_phandle(node, "backend", 0);
- if (!partition_node) {
- dev_err(&state->dev, "Cannot resolve \"backend\" phandle\n");
- ret = -EINVAL;
- goto out_release_state;
- }
+ ret = of_property_read_string(node, "backend-diskuuid", &diskuuid);
+ if (ret == 0) {
+ u64 off;
+
+ ret = devpath_from_diskuuid(diskuuid, &state->backend_path);
+ if (ret) {
+ dev_err(&state->dev, "state failed find backend device for diskuuid='%s'\n",
+ diskuuid);
+ goto out_release_state;
+ }
+ ret = of_property_read_u64(node, "backend-offset", &off);
+ if (ret) {
+ dev_err(&state->dev, "'backend-offset' property undefined\n");
+ goto out_release_state;
+ }
+ offset = off;
+ } else {
+ partition_node = of_parse_phandle(node, "backend", 0);
+ if (!partition_node) {
+ dev_err(&state->dev, "Cannot resolve \"backend\" phandle\n");
+ ret = -EINVAL;
+ goto out_release_state;
+ }
#ifdef __BAREBOX__
- ret = of_partition_ensure_probed(partition_node);
- if (ret)
- goto out_release_state;
+ ret = of_partition_ensure_probed(partition_node);
+ if (ret)
+ goto out_release_state;
- ret = of_find_path_by_node(partition_node, &state->backend_path, 0);
+ ret = of_find_path_by_node(partition_node, &state->backend_path, 0);
#else
- ret = of_get_devicepath(partition_node, &state->backend_path, &offset, &size);
+ ret = of_get_devicepath(partition_node, &state->backend_path, &offset, &size);
#endif
- if (ret) {
- if (ret != -EPROBE_DEFER)
- dev_err(&state->dev, "state failed to parse path to backend: %s\n",
- strerror(-ret));
- goto out_release_state;
- }
+ if (ret) {
+ if (ret != -EPROBE_DEFER)
+ dev_err(&state->dev, "state failed to parse path to backend: %s\n",
+ strerror(-ret));
+ goto out_release_state;
+ }
- state->backend_reproducible_name = of_get_reproducible_name(partition_node);
+ state->backend_reproducible_name = of_get_reproducible_name(partition_node);
+ }
ret = of_property_read_string(node, "backend-type", &backend_type);
if (ret) {
diff --git a/include/fs.h b/include/fs.h
index cd5eb571e08e..1a2f9c7f8e16 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -177,4 +177,16 @@ static inline const char *devpath_to_name(const char *devpath)
return devpath;
}
+static inline int devpath_from_diskuuid(const char *diskuuid, char **devpath)
+{
+ struct cdev *cdev;
+
+ cdev = cdev_by_diskuuid(diskuuid);
+ if (!cdev)
+ return -EINVAL;
+
+ *devpath = xasprintf("/dev/%s", cdev->name);
+ return 0;
+}
+
#endif /* __FS_H */
--
2.30.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-01-24 10:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 10:04 [PATCH 0/3] state: find backend with UUID but without a partition Michael Olbrich
2022-01-24 10:04 ` [PATCH 1/3] cdev: rename partuuid to uuid Michael Olbrich
2022-01-24 10:04 ` [PATCH 2/3] cdev: add diskuuid support Michael Olbrich
2022-01-24 10:04 ` Michael Olbrich [this message]
2022-01-26 7:57 ` [PATCH 3/3] state: support backend-diskuuid / backend-offset Sascha Hauer
2022-01-26 9:35 ` Michael Olbrich
2022-01-26 10:15 ` Sascha Hauer
2022-01-26 11:16 ` Michael Olbrich
2022-01-27 0:18 ` Trent Piepho
2022-01-27 12:39 ` Sascha Hauer
2022-01-27 18:53 ` Trent Piepho
2022-01-28 7:48 ` 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=20220124100458.2924679-4-m.olbrich@pengutronix.de \
--to=m.olbrich@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