From: Sascha Hauer <s.hauer@pengutronix.de> To: Barebox List <barebox@lists.infradead.org> Subject: [PATCH 09/17] overlay: only apply compatible trees Date: Wed, 23 Jun 2021 07:16:24 +0200 [thread overview] Message-ID: <20210623051632.30253-10-s.hauer@pengutronix.de> (raw) In-Reply-To: <20210623051632.30253-1-s.hauer@pengutronix.de> This adds support for a global.of_overlay_compatible variable which is a space separated list of compatible strings. Device tree overlays not matching any won't be applied (unless the overlay doesn't have a compatible property at all). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/of/overlay.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 8f4ee3f0a2..d7738c08a0 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -11,6 +11,9 @@ #include <common.h> #include <of.h> #include <errno.h> +#include <globalvar.h> +#include <magicvar.h> +#include <string.h> static struct device_node *find_target(struct device_node *root, struct device_node *fragment) @@ -160,6 +163,36 @@ static int of_overlay_apply_fragment(struct device_node *root, return of_overlay_apply(target, overlay); } +static char *of_overlay_compatible; + +static bool of_overlay_is_compatible(struct device_node *ovl) +{ + char *p, *n, *compatibles; + bool res = false; + + if (!of_overlay_compatible || !*of_overlay_compatible) + return true; + if (!of_find_property(ovl, "compatible", NULL)) + return true; + + p = compatibles = xstrdup(of_overlay_compatible); + + while ((n = strsep_unescaped(&p, " "))) { + if (!*n) + continue; + + if (of_device_is_compatible(ovl, n)) { + res = true; + break; + } + } + + free(compatibles); + + return res; +} + + /** * Apply the overlay on the passed devicetree root * @root: the devicetree onto which the overlay will be applied @@ -172,6 +205,9 @@ int of_overlay_apply_tree(struct device_node *root, struct device_node *fragment; int err = 0; + if (!of_overlay_is_compatible(overlay)) + return -ENODEV; + resolved = of_resolve_phandles(root, overlay); if (!resolved) return -EINVAL; @@ -250,3 +286,13 @@ int of_register_overlay(struct device_node *overlay) { return of_register_fixup(of_overlay_fixup, overlay); } + +static int of_overlay_init(void) +{ + globalvar_add_simple_string("of_overlay_compatible", &of_overlay_compatible); + + return 0; +} +device_initcall(of_overlay_init); + +BAREBOX_MAGICVAR(global.of_overlay_compatible, "space separated list of compatibles an overlay must match"); -- 2.29.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-06-23 5:19 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-23 5:16 [PATCH v2 00/17] Apply device tree overlays to kernel tree Sascha Hauer 2021-06-23 5:16 ` [PATCH 01/17] fdt: Check blob size during unflattening Sascha Hauer 2021-06-23 5:16 ` [PATCH 02/17] firmware: make device_node argument non const Sascha Hauer 2021-06-23 5:16 ` [PATCH 03/17] libbb: Add find_path function Sascha Hauer 2021-06-23 5:16 ` [PATCH 04/17] firmware: consolidate ifdefs Sascha Hauer 2021-06-23 5:16 ` [PATCH 05/17] firmware: Add search path Sascha Hauer 2021-06-23 5:16 ` [PATCH 06/17] firmware: Fix device_node matching Sascha Hauer 2021-06-23 5:16 ` [PATCH 07/17] firmware: recognize by reproducible name Sascha Hauer 2021-06-23 5:16 ` [PATCH 08/17] blspec: Set firmware searchpath Sascha Hauer 2021-06-23 5:16 ` Sascha Hauer [this message] 2021-06-23 5:16 ` [PATCH 10/17] overlay: Add of_overlay_apply_file() Sascha Hauer 2021-06-23 5:16 ` [PATCH 11/17] firmware: Load from global search path Sascha Hauer 2021-06-23 5:16 ` [PATCH 12/17] blspec: Rework firmware load Sascha Hauer 2021-06-23 5:16 ` [PATCH 13/17] of_overlay: apply overlays during booting Sascha Hauer 2021-06-23 5:16 ` [PATCH 14/17] blspec: Apply overlays from rootfs Sascha Hauer 2021-06-23 5:16 ` [PATCH 15/17] doc: devicetree: Refer to internal device tree also as live tree Sascha Hauer 2021-06-23 5:16 ` [PATCH 16/17] Documentation: Add documentation for device tree overlays Sascha Hauer 2021-06-23 6:13 ` Ahmad Fatoum 2021-06-23 19:37 ` Trent Piepho 2021-06-24 8:48 ` Sascha Hauer 2021-06-23 5:16 ` [PATCH 17/17] of_firmware: Fix handling of firmware-name property Sascha Hauer -- strict thread matches above, loose matches on Subject: below -- 2021-03-10 13:28 [PATCH 00/17] Apply device tree overlays to kernel tree Sascha Hauer 2021-03-10 13:28 ` [PATCH 09/17] overlay: only apply compatible trees Sascha Hauer 2021-03-10 14:34 ` Ahmad Fatoum
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=20210623051632.30253-10-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH 09/17] overlay: only apply compatible trees' \ /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