mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 12/17] blspec: Rework firmware load
Date: Wed, 10 Mar 2021 14:28:24 +0100	[thread overview]
Message-ID: <20210310132829.7662-13-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210310132829.7662-1-s.hauer@pengutronix.de>

Applying overlays in blspec currently works in two steps. First
of_firmware_load_overlay() is called which doesn't load an overlay,
but instead loads firmware when one is needed by the overlay. This
is done on the live tree, because that was needed to find the firmware
manager. The second step is to call of_register_overlay() to apply
the overlay to the kernel device tree when the fixups are executed.

Instead of using a separate step to load the firmware, load the firmware
as part of the of_fixups.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/of_overlay.c    |  4 ---
 common/blspec.c          | 73 +++++++++++-----------------------------
 drivers/of/of_firmware.c | 24 ++-----------
 drivers/of/overlay.c     |  2 ++
 include/of.h             |  4 +--
 5 files changed, 25 insertions(+), 82 deletions(-)

diff --git a/commands/of_overlay.c b/commands/of_overlay.c
index 9b1cc6e8c7..17b0c9f4cb 100644
--- a/commands/of_overlay.c
+++ b/commands/of_overlay.c
@@ -42,10 +42,6 @@ static int do_of_overlay(int argc, char *argv[])
 	if (IS_ERR(overlay))
 		return PTR_ERR(overlay);
 
-	ret = of_firmware_load_overlay(overlay);
-	if (ret)
-		goto err;
-
 	ret = of_register_overlay(overlay);
 	if (ret) {
 		printf("cannot apply oftree overlay: %s\n", strerror(-ret));
diff --git a/common/blspec.c b/common/blspec.c
index d771176a45..fd3e088920 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -32,71 +32,33 @@ int blspec_entry_var_set(struct blspec_entry *entry, const char *name,
 			val ? strlen(val) + 1 : 0, 1);
 }
 
-static int blspec_apply_oftree_overlay(char *file, const char *abspath,
-				       int dryrun)
-{
-	int ret = 0;
-	struct fdt_header *fdt;
-	struct device_node *overlay;
-	char *path;
-	size_t size;
-
-	path = basprintf("%s/%s", abspath, file);
-
-	fdt = read_file(path, &size);
-	if (!fdt) {
-		pr_warn("unable to read \"%s\"\n", path);
-		ret = -EINVAL;
-		goto out;
-	}
-
-	overlay = of_unflatten_dtb(fdt, size);
-	free(fdt);
-	if (IS_ERR(overlay)) {
-		ret = PTR_ERR(overlay);
-		goto out;
-	}
-
-	if (dryrun) {
-		pr_info("dry run: skip overlay %s\n", path);
-		of_delete_node(overlay);
-		goto out;
-	}
-
-	ret = of_firmware_load_overlay(overlay);
-	if (ret) {
-		pr_warn("failed to load firmware: skip overlay \"%s\"\n", path);
-		of_delete_node(overlay);
-		goto out;
-	}
-
-	ret = of_register_overlay(overlay);
-	if (ret) {
-		pr_warn("cannot register devicetree overlay \"%s\"\n", path);
-		of_delete_node(overlay);
-	}
-
-out:
-	free(path);
-
-	return ret;
-}
-
-static void blspec_apply_oftree_overlays(const char *overlays,
-					 const char *abspath, int dryrun)
+static int blspec_overlay_fixup(struct device_node *root, void *ctx)
 {
+	struct blspec_entry *entry = ctx;
+	const char *overlays;
 	char *overlay;
 	char *sep, *freep;
 
+	overlays = blspec_entry_var_get(entry, "devicetree-overlay");
+
 	sep = freep = xstrdup(overlays);
 
 	while ((overlay = strsep(&sep, " "))) {
+		char *path;
+
 		if (!*overlay)
 			continue;
-		blspec_apply_oftree_overlay(overlay, abspath, dryrun);
+
+		path = basprintf("%s/%s", entry->rootpath, overlay);
+
+		of_overlay_apply_file(root, path);
+
+		free(path);
 	}
 
 	free(freep);
+
+	return 0;
 }
 
 /*
@@ -153,7 +115,7 @@ static int blspec_boot(struct bootentry *be, int verbose, int dryrun)
 	}
 
 	if (overlays)
-		blspec_apply_oftree_overlays(overlays, abspath, dryrun);
+		of_register_fixup(blspec_overlay_fixup, entry);
 
 	if (initrd)
 		data.initrd_file = basprintf("%s/%s", abspath, initrd);
@@ -186,6 +148,9 @@ static int blspec_boot(struct bootentry *be, int verbose, int dryrun)
 	if (ret)
 		pr_err("Booting failed\n");
 
+	if (overlays)
+		of_unregister_fixup(blspec_overlay_fixup, entry);
+
 	firmware_set_searchpath(old_fws);
 
 err_out:
diff --git a/drivers/of/of_firmware.c b/drivers/of/of_firmware.c
index 12ce1d95d0..d66f0ae7ce 100644
--- a/drivers/of/of_firmware.c
+++ b/drivers/of/of_firmware.c
@@ -48,27 +48,7 @@ static int load_firmware(struct device_node *target,
 	return err;
 }
 
-int of_firmware_load_overlay(struct device_node *overlay)
+int of_overlay_load_firmware(struct device_node *root, struct device_node *overlay)
 {
-	int err;
-	struct device_node *root;
-	struct device_node *resolved;
-	struct device_node *ovl;
-
-	root = of_get_root_node();
-	resolved = of_resolve_phandles(root, overlay);
-	/*
-	 * If the overlay cannot be resolved, use the load_firmware callback
-	 * with the unresolved overlay to verify that the overlay does not
-	 * depend on a firmware to be loaded. If a required firmware cannot be
-	 * loaded, the overlay must not be applied.
-	 */
-	ovl = resolved ? resolved : overlay;
-
-	err = of_process_overlay(root, ovl, load_firmware, NULL);
-
-	if (resolved)
-		of_delete_node(resolved);
-
-	return err;
+	return of_process_overlay(root, overlay, load_firmware, NULL);
 }
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index c9ede614a6..d42e15ed1c 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -221,6 +221,8 @@ int of_overlay_apply_tree(struct device_node *root,
 			pr_warn("failed to apply %s\n", fragment->name);
 	}
 
+	err = of_overlay_load_firmware(root, resolved);
+
 	of_delete_node(resolved);
 
 	return err;
diff --git a/include/of.h b/include/of.h
index 56291b9801..ecc5f5101a 100644
--- a/include/of.h
+++ b/include/of.h
@@ -1033,7 +1033,7 @@ int of_process_overlay(struct device_node *root,
 				   struct device_node *overlay, void *data),
 		    void *data);
 
-int of_firmware_load_overlay(struct device_node *overlay);
+int of_overlay_load_firmware(struct device_node *root, struct device_node *overlay);
 #else
 static inline struct device_node *of_resolve_phandles(struct device_node *root,
 					const struct device_node *overlay)
@@ -1067,7 +1067,7 @@ static inline int of_process_overlay(struct device_node *root,
 	return -ENOSYS;
 }
 
-static inline int of_firmware_load_overlay(struct device_node *overlay)
+static inline int of_overlay_load_firmware(struct device_node *root, struct device_node *overlay)
 {
 	return -ENOSYS;
 }
-- 
2.29.2


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


  parent reply	other threads:[~2021-03-10 13:31 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-10 13:28 [PATCH 00/17] Apply device tree overlays to kernel tree Sascha Hauer
2021-03-10 13:28 ` [PATCH 01/17] fdt: Check blob size during unflattening Sascha Hauer
2021-03-10 13:28 ` [PATCH 02/17] firmware: make device_node argument non const Sascha Hauer
2021-03-10 13:28 ` [PATCH 03/17] libbb: Add find_path function Sascha Hauer
2021-03-10 13:28 ` [PATCH 04/17] firmware: consolidate ifdefs Sascha Hauer
2021-03-10 13:28 ` [PATCH 05/17] firmware: Add search path Sascha Hauer
2021-03-10 13:28 ` [PATCH 06/17] firmware: Fix device_node matching Sascha Hauer
2021-03-10 13:28 ` [PATCH 07/17] firmware: recognize by reproducible name Sascha Hauer
2021-03-10 13:28 ` [PATCH 08/17] blspec: Set firmware searchpath Sascha Hauer
2021-03-10 13:28 ` [PATCH 09/17] overlay: only apply compatible trees Sascha Hauer
2021-03-10 14:34   ` Ahmad Fatoum
2021-03-10 13:28 ` [PATCH 10/17] overlay: Add of_overlay_apply_file() Sascha Hauer
2021-03-10 13:28 ` [PATCH 11/17] firmware: Load from global search path Sascha Hauer
2021-03-10 14:59   ` Ahmad Fatoum
2021-03-10 13:28 ` Sascha Hauer [this message]
2021-03-12 11:15   ` [PATCH 12/17] blspec: Rework firmware load Michael Tretter
2021-03-15 10:25     ` Sascha Hauer
2021-03-10 13:28 ` [PATCH 13/17] of_overlay: apply overlays during booting Sascha Hauer
2021-03-10 13:28 ` [PATCH 14/17] blspec: Apply overlays from rootfs Sascha Hauer
2021-03-10 13:28 ` [PATCH 15/17] doc: devicetree: Refer to internal device tree also as live tree Sascha Hauer
2021-03-10 13:28 ` [PATCH 16/17] Documentation: Add documentation for device tree overlays Sascha Hauer
2021-03-10 13:28 ` [PATCH 17/17] of_firmware: Fix handling of firmware-name property Sascha Hauer
2021-06-23  5:16 [PATCH v2 00/17] Apply device tree overlays to kernel tree Sascha Hauer
2021-06-23  5:16 ` [PATCH 12/17] blspec: Rework firmware load 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=20210310132829.7662-13-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH 12/17] blspec: Rework firmware load' \
    /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