From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 20 Aug 2025 12:30:24 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uog5J-002aRo-0e for lore@lore.pengutronix.de; Wed, 20 Aug 2025 12:30:24 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uog5H-0007YP-5H for lore@pengutronix.de; Wed, 20 Aug 2025 12:30:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=053Abqzm4pXJT/wel23qFXZs3caQxSc/X1TmQi92dvE=; b=R8l4EQPqzZRDYMJeSW5SoYdOgU nLhDlfE/k0DZefVpsyC+IF/sWT3l7BXSt21K+sMX/Hs0hfNPoxjdg2wF03M1vfscg9TwMSGa1IG83 ReI/y1dLXYR8CXIhCffhKpBML48pL9v/505yN2sdBzqe0xd2etgfiUifQ4lax5oGyvzeIMM8SRJJx FX41cXqu9wZlU+V4KC/yE6qDmzVKZa1E22bT+B8H04JanC06b458PWVxwCcAOH0pALxkYFnGAPS/n RoeK9lCDeJycAKcT2H8KG8tQ+ojX32bhU998nONrkKgTsCBQgzzDcXaPEvtWRAyTCBec1sdOrbUnF BLTaIUgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uog4g-0000000D9FR-0qqZ; Wed, 20 Aug 2025 10:29:46 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uofQu-0000000D0pB-32Js for barebox@bombadil.infradead.org; Wed, 20 Aug 2025 09:48:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=053Abqzm4pXJT/wel23qFXZs3caQxSc/X1TmQi92dvE=; b=mDIj+752QTJVTeTE3EeCwG78ia wN3KlF+ka9V59H2ciT7wqUtuuDfyx5tCGL9+hl2acf4MtHT5MTHa5YeL/KDmymjBvb5khtr4dIq2B 5lKagYdkRC4LdLW8v9IJBSXsY7TBbzaAx7PF18JJXOAasT7U7GXEHPNFEmc37bf05gjwdVl6vhyBY 6fKhaty0AwmknNqME3ErNeOe1rLhr0lfpfAKgNesHITnJ+65xbrSGrOKc+v0RslY4mV2u3rSFkV4g VCc6e3/Q2cAUb4NMdBoncTmhUyxU6QqLWSEzgPgx1EbwsYblx8YA7W4ZfvNt7pkw2eip28ENkBhHC 1GpCPfCw==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uofQr-00000000HWc-3roM for barebox@lists.infradead.org; Wed, 20 Aug 2025 09:48:39 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uofQq-0000DY-Is; Wed, 20 Aug 2025 11:48:36 +0200 From: Marco Felsch Date: Wed, 20 Aug 2025 11:48:40 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250820-v2024-05-0-topic-fit-overlay-v6-8-9d1b3bab2ee2@pengutronix.de> References: <20250820-v2024-05-0-topic-fit-overlay-v6-0-9d1b3bab2ee2@pengutronix.de> In-Reply-To: <20250820-v2024-05-0-topic-fit-overlay-v6-0-9d1b3bab2ee2@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Marco Felsch X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250820_104838_120490_908993F4 X-CRM114-Status: GOOD ( 16.17 ) 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: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::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.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 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 v6 08/12] of: overlay: replace filename with an more unique name X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Since FIT image overlays and file/dir based overlays are supported, 'filename' based variables or function hooks are no longer sufficient. Rename them to 'pattern' based variables or function hooks. The filter_filename function hook is still supported, to keep the backward compatibility, but marked as deprecated. Signed-off-by: Marco Felsch --- drivers/of/overlay.c | 39 +++++++++++++++++++++------------------ include/of.h | 3 ++- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index b15a0f1fab8f729a1ba48da8d5bd5041cd519acc..6b19c7c88ea5e99040bddca172c47251e8ddda84 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -234,12 +234,12 @@ static struct of_overlay_filter *of_overlay_find_filter(const char *name) return NULL; } -static bool of_overlay_matches_filter(const char *filename, struct device_node *ovl) +static bool of_overlay_matches_filter(const char *pattern, struct device_node *ovl) { struct of_overlay_filter *filter; char *p, *path, *n; bool apply = false; - bool have_filename_filter = false; + bool have_pattern_filter = false; bool have_content_filter = false; p = path = strdup(of_overlay_filter); @@ -256,14 +256,16 @@ static bool of_overlay_matches_filter(const char *filename, struct device_node * continue; } - if (filter->filter_filename) - have_filename_filter = true; + if (filter->filter_pattern || filter->filter_filename) + have_pattern_filter = true; if (filter->filter_content) have_content_filter = true; - if (filename) { - if (filter->filter_filename && - filter->filter_filename(filter, kbasename(filename))) + if (pattern) { + if ((filter->filter_pattern && + filter->filter_pattern(filter, kbasename(pattern))) || + (filter->filter_filename && + filter->filter_filename(filter, kbasename(pattern)))) score++; } else { score++; @@ -286,11 +288,11 @@ static bool of_overlay_matches_filter(const char *filename, struct device_node * free(path); /* No filter found at all, no match */ - if (!have_filename_filter && !have_content_filter) + if (!have_pattern_filter && !have_content_filter) return false; - /* Want to match filename, but we do not have a filename_filter */ - if (filename && !have_filename_filter) + /* Want to match pattern, but we do not have a filename_filter */ + if (pattern && !have_pattern_filter) return true; /* Want to match content, but we do not have a content_filter */ @@ -298,12 +300,12 @@ static bool of_overlay_matches_filter(const char *filename, struct device_node * return true; if (apply) - pr_debug("filename %s, overlay %p: match against filter %s\n", - filename ?: "", + pr_debug("pattern %s, overlay %p: match against filter %s\n", + pattern ?: "", ovl, filter->name); else - pr_debug("filename %s, overlay %p: no match\n", - filename ?: "", ovl); + pr_debug("pattern %s, overlay %p: no match\n", + pattern ?: "", ovl); return apply; } @@ -599,14 +601,15 @@ static int of_overlay_global_fixup(struct device_node *root, void *data) * @filter: The new filter * * Register a new overlay filter. A filter can either match on - * the filename or on the content of an overlay, but not on both. + * a pattern or on the content of an overlay, but not on both. * If that's desired two filters have to be registered. * * @return: 0 for success, negative error code otherwise */ int of_overlay_register_filter(struct of_overlay_filter *filter) { - if (filter->filter_filename && filter->filter_content) + if ((filter->filter_pattern || filter->filter_filename) && + filter->filter_content) return -EINVAL; list_add_tail(&filter->list, &of_overlay_filters); @@ -656,7 +659,7 @@ static bool of_overlay_filter_pattern(struct of_overlay_filter *f, static struct of_overlay_filter of_overlay_pattern_filter = { .name = "pattern", - .filter_filename = of_overlay_filter_pattern, + .filter_pattern = of_overlay_filter_pattern, }; static bool of_overlay_filter_filename(struct of_overlay_filter *f, @@ -668,7 +671,7 @@ static bool of_overlay_filter_filename(struct of_overlay_filter *f, static struct of_overlay_filter of_overlay_filepattern_filter = { .name = "filepattern", - .filter_filename = of_overlay_filter_filename, + .filter_pattern = of_overlay_filter_filename, }; /** diff --git a/include/of.h b/include/of.h index 2258cd501b727797ac00fc4cce1a6fdcfc529d44..1c7c0c867700fcf1aa2316ed1e1702b93aa13011 100644 --- a/include/of.h +++ b/include/of.h @@ -1384,7 +1384,8 @@ static inline struct device_node *of_dup_root_node_for_boot(void) } struct of_overlay_filter { - bool (*filter_filename)(struct of_overlay_filter *, const char *filename); + bool (*filter_filename)(struct of_overlay_filter *, const char *filename); /* deprecated */ + bool (*filter_pattern)(struct of_overlay_filter *, const char *pattern); bool (*filter_content)(struct of_overlay_filter *, struct device_node *); const char *name; struct list_head list; -- 2.39.5