From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 23 Jun 2021 07:18:10 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lvvH8-0005Dr-KW for lore@lore.pengutronix.de; Wed, 23 Jun 2021 07:18:10 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lvvH7-0007KZ-GJ for lore@pengutronix.de; Wed, 23 Jun 2021 07:18:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vyhL6cvGfHurcikPBUn0xEj64HNj7aJDxnJStJREjZQ=; b=QjY6W35Y/jdKtD MBWBBBPYzTEUMKnqA0+iWynhO8J9yaPS1VoDt7/6u7m/NOXZa7hh4er45/rghzOTvBKFijlKFCWBn eU6B8ymSLyihCTRk7xl0nQwufPlonppiPBtbU0UkMYWASl03yudqSktS19N0RirXDnovt+JbSBJbn FMpFqgFNGT9nBtUCbhDglss4mfi71H/epGyfuK8eZKHU3/ZUcXUjBS/ZeMKF5bruytcQIjAkWQ/yo a+9ktjEUrnhDNnHSLGzCRam1sssUCn7u8YxEWXvVc/YSunAQcJQPKvxcXxTxfrPuRFD9LYbJDzXyd SWi2upDDMsL5wrhvteZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lvvFt-009MWb-HZ; Wed, 23 Jun 2021 05:16:53 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lvvFd-009MQB-EF for barebox@lists.infradead.org; Wed, 23 Jun 2021 05:16:40 +0000 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lvvFc-0006rO-38; Wed, 23 Jun 2021 07:16:36 +0200 Received: from sha by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lvvFa-0000Ux-Vj; Wed, 23 Jun 2021 07:16:34 +0200 From: Sascha Hauer To: Barebox List Date: Wed, 23 Jun 2021 07:16:28 +0200 Message-Id: <20210623051632.30253-14-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210623051632.30253-1-s.hauer@pengutronix.de> References: <20210623051632.30253-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210622_221637_625141_E21ED385 X-CRM114-Status: GOOD ( 17.71 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 13/17] of_overlay: apply overlays during booting X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) This offers the possibility to load dt overlays on the kernel device tree during booting. Several globalvars control which device trees are used. global.of_overlay_dir specifies the directory where overlay files are expected. global.of_overlay_filepattern specifies file patterns which the overlay files must match. It is a colon separated list for multiple file patterns. The patterns may contain '*' and '?' wildcards. When this variable is empty then no overlays are applied. global.of_overlay_compatible is used to apply only compatible overlays. This is also a colon separated list which contains compatible strings. An overlay is only applied when it's compatible to one of the strings. Signed-off-by: Sascha Hauer --- drivers/of/overlay.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ include/of.h | 17 ++++++++++++ 2 files changed, 83 insertions(+) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index c7f640f15f..4362ab2f35 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -16,6 +16,7 @@ #include #include #include +#include static struct device_node *find_target(struct device_node *root, struct device_node *fragment) @@ -327,12 +328,77 @@ int of_register_overlay(struct device_node *overlay) return of_register_fixup(of_overlay_fixup, overlay); } +static char *of_overlay_filepattern; +static char *of_overlay_dir; + +const char *of_overlay_get_dir(void) +{ + return of_overlay_dir; +} + +void of_overlay_set_dir(const char *path) +{ + free(of_overlay_dir); + of_overlay_dir = strdup(path); +} + +int of_overlay_apply_dir(struct device_node *root, const char *dir) +{ + char *p, *path, *n, *str; + int ret = 0, i; + glob_t g = {}; + int globflags = GLOB_NOCHECK; + + if (!dir || !*dir) + return 0; + + p = path = strdup(of_overlay_filepattern); + + while ((n = strsep_unescaped(&p, " "))) { + str = basprintf("%s/%s", dir, n); + if (!str) { + ret = -ENOMEM; + goto out; + } + + ret = glob(str, globflags, NULL, &g); + + free(str); + + if (ret) + goto out; + + globflags |= GLOB_APPEND; + } + + for (i = 0; i < g.gl_pathc; i++) + of_overlay_apply_file(root, g.gl_pathv[i]); + +out: + globfree(&g); + + free(path); + + return ret; +} + +static int of_overlay_global_fixup(struct device_node *root, void *data) +{ + return of_overlay_apply_dir(root, of_overlay_dir); +} + static int of_overlay_init(void) { globalvar_add_simple_string("of_overlay_compatible", &of_overlay_compatible); + globalvar_add_simple_string("of_overlay_filepattern", &of_overlay_filepattern); + globalvar_add_simple_string("of_overlay_dir", &of_overlay_dir); + + of_register_fixup(of_overlay_global_fixup, NULL); return 0; } device_initcall(of_overlay_init); BAREBOX_MAGICVAR(global.of_overlay_compatible, "space separated list of compatibles an overlay must match"); +BAREBOX_MAGICVAR(global.of_overlay_filepattern, "space separated list of filepatterns an overlay must match"); +BAREBOX_MAGICVAR(global.of_overlay_dir, "Directory to look for dt overlays"); diff --git a/include/of.h b/include/of.h index 9457fed9c0..4be6af8f4b 100644 --- a/include/of.h +++ b/include/of.h @@ -1037,6 +1037,9 @@ int of_process_overlay(struct device_node *root, int of_overlay_pre_load_firmware(struct device_node *root, struct device_node *overlay); int of_overlay_load_firmware(void); void of_overlay_load_firmware_clear(void); +int of_overlay_apply_dir(struct device_node *root, const char *dir); +const char *of_overlay_get_dir(void); +void of_overlay_set_dir(const char *path); #else static inline struct device_node *of_resolve_phandles(struct device_node *root, const struct device_node *overlay) @@ -1085,6 +1088,20 @@ static inline void of_overlay_load_firmware_clear(void) { } +static inline int of_overlay_apply_dir(struct device_node *root, const char *dir) +{ + return 0; +} + +static inline const char *of_overlay_get_dir(void) +{ + return NULL; +} + +static inline void of_overlay_set_dir(const char *path) +{ +} + #endif #endif /* __OF_H */ -- 2.29.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox