mailarchive of the pengutronix oss-tools mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: oss-tools@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [OSS-Tools] [PATCH v4 3/3] state: automatically find state.dtb in the ESP
Date: Wed, 11 May 2022 10:21:25 +0200	[thread overview]
Message-ID: <20220511082125.4187531-4-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220511082125.4187531-1-m.olbrich@pengutronix.de>

Systemd mounts the EFI System Partition (ESP) to /boot or /efi.
So look there for the state.dtb when the devicetree in sysfs/procfs is
not available.

This way barebox-state can be used on EFI systems without manually
specifying the devicetree file.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---

changes in v4:
add /boot/efi/EFI/BAREBOX/state.dtb to the seach list.

 src/barebox-state.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/barebox-state.c b/src/barebox-state.c
index 334aed6f3d43..c5acd1f7780a 100644
--- a/src/barebox-state.c
+++ b/src/barebox-state.c
@@ -342,6 +342,31 @@ struct state *state_get(const char *name, const char *filename, bool readonly, b
 		}
 	} else {
 		root = of_read_proc_devicetree();
+
+		/* No device-tree in procfs / sysfs, try dtb file in the ESP */
+		if (-PTR_ERR(root) == ENOENT) {
+			const char *paths[] = {
+				/* default mount paths used by systemd */
+				"/boot/EFI/BAREBOX/state.dtb",
+				"/boot/efi/EFI/BAREBOX/state.dtb",
+				"/efi/EFI/BAREBOX/state.dtb",
+				NULL
+			};
+			void *fdt;
+			int i;
+
+			for (i = 0; paths[i]; ++i) {
+				fdt = read_file(paths[i], NULL);
+				if (fdt)
+					break;
+			}
+			if (fdt) {
+				root = of_unflatten_dtb(fdt);
+				free(fdt);
+			}
+			else
+				root = ERR_PTR(-ENOENT);
+		}
 		if (IS_ERR(root)) {
 			pr_err("Unable to read devicetree. %s\n",
 			       strerror(-PTR_ERR(root)));
-- 
2.30.2




  parent reply	other threads:[~2022-05-11  8:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-11  8:21 [OSS-Tools] [PATCH v4 0/3] improve barebox-state support on EFI system Michael Olbrich
2022-05-11  8:21 ` [OSS-Tools] [PATCH v4 1/3] libdt: only requires a partname for mtd Michael Olbrich
2022-05-11  8:21 ` [OSS-Tools] [PATCH v4 2/3] libdt: add support for barebox, storage-by-uuid Michael Olbrich
2022-05-15 20:40   ` Roland Hieber
2022-05-16  7:56     ` Michael Olbrich
2022-05-11  8:21 ` Michael Olbrich [this message]
2022-05-15 21:04 ` [OSS-Tools] [PATCH v4 0/3] improve barebox-state support on EFI system Roland Hieber
2022-05-16  7:58   ` Michael Olbrich

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=20220511082125.4187531-4-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=oss-tools@pengutronix.de \
    --subject='Re: [OSS-Tools] [PATCH v4 3/3] state: automatically find state.dtb in the ESP' \
    /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

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