From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jul 2025 17:35:12 +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 1ugmMC-004y3U-1k for lore@lore.pengutronix.de; Tue, 29 Jul 2025 17:35:12 +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 1ugmMA-0008Sv-6M for lore@pengutronix.de; Tue, 29 Jul 2025 17:35:12 +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=EuIAK5Q6vvQS6WYUQoqxxcCovzi5drNJwulaOr9orUY=; b=cXUqbwJd1HuVnIRBpF5PRqAbeB Z1pc0BO3nAv29jWVDrV2X0AANmBepVpknMoq/z93ZLc2bSuphYvHTbcIHmvqF1LrmRz1G8r5kidLN BwY0oUaFRSm8ITnUsxPD4zeoKlhcROhhO3Aht+FU95oaF9ZH5yOSF6S1tdQzzTuRJjHW1blr5J4PS JUsVaj0tc3ds3wtJrLGT/Roe+QSLp+FL7FpSQMfDiMuj/Ly6vg2pV8g/A+zEoxFREfQPAkZsBmIPC BmdYsQf2EGnnJVskznCl+MPwBjlc5H82U72EWZbQI/aA7jT+ekJTmMUM1SYS8icT40aE2C7VOXlyO bzg5Jmsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ugmLZ-0000000H8zm-2aua; Tue, 29 Jul 2025 15:34:33 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ugmLW-0000000H8vp-0mdp for barebox@lists.infradead.org; Tue, 29 Jul 2025 15:34:32 +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 1ugmLT-0007q6-Jg; Tue, 29 Jul 2025 17:34:27 +0200 From: Marco Felsch Date: Tue, 29 Jul 2025 17:34:28 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250729-v2024-05-0-topic-fit-overlay-v4-3-af3ad99acde2@pengutronix.de> References: <20250729-v2024-05-0-topic-fit-overlay-v4-0-af3ad99acde2@pengutronix.de> In-Reply-To: <20250729-v2024-05-0-topic-fit-overlay-v4-0-af3ad99acde2@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-20250729_083430_229819_8F6C8835 X-CRM114-Status: GOOD ( 14.31 ) 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 v4 03/11] of: overlay: make the pattern match function more generic 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) The current overlay mechanism can handle files only, so filepattern was an obvious name. Drop the "file" prefix to prepare the codebase to handle overlays supplied via a FIT images as well. Keep the backward compatibility by still providing the filepattern filter and the global of.overlay.filepattern variable, but mark them as deprecated. Signed-off-by: Marco Felsch --- Documentation/user/devicetree.rst | 6 +++--- drivers/of/overlay.c | 37 ++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Documentation/user/devicetree.rst b/Documentation/user/devicetree.rst index ea2945ab2b564a10a780ba0055daa37ed0c85581..ef04e14f7c0dde579493425073f1ee01395f0d8c 100644 --- a/Documentation/user/devicetree.rst +++ b/Documentation/user/devicetree.rst @@ -118,15 +118,15 @@ the kernel. The behaviour is controlled by different variables: these compatibles will be applied. When this list is empty then all overlays will be applied. Overlays that don't have a compatible are considered being always compatible. -``global.of.overlay.filepattern`` +``global.of.overlay.pattern`` This is a space separated list of file patterns. An overlay is only applied when its filename matches one of the patterns. The patterns can contain ``*`` and ``?`` as wildcards. The default is ``*`` which means all files are applied. ``global.of.overlay.filter`` This is a space separated list of filters to apply. There are two generic filters: - ``filepattern`` matches ``global.of.overlay.filepattern`` above, ``compatible`` matches - ``global.of.overlay.compatible`` above. The default is ``filepattern compatible`` + ``pattern`` matches ``global.of.overlay.pattern`` above, ``compatible`` matches + ``global.of.overlay.compatible`` above. The default is ``pattern compatible`` which means the two generic filters are active. This list may be replaced or supplemented by board specific filters. diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 6944dd4a744de909c89622322c99b81fc046e43b..a63cca1b47e74615d4453a27a55fb15d1f706fae 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -407,7 +407,7 @@ 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_pattern; static char *of_overlay_dir; static char *of_overlay_basedir; @@ -504,10 +504,10 @@ int of_overlay_register_filter(struct of_overlay_filter *filter) } /** - * of_overlay_filter_filename - A filter that matches on the filename of + * of_overlay_filter_pattern - A filter that matches on the filename or * an overlay * @f: The filter - * @filename: The filename of the overlay + * @pattern: The filename of the overlay * * This filter matches when the filename matches one of the patterns given * in global.of.overlay.filepattern. global.of.overlay.filepattern shall @@ -515,20 +515,20 @@ int of_overlay_register_filter(struct of_overlay_filter *filter) * * @return: True when the overlay shall be applied, false otherwise. */ -static bool of_overlay_filter_filename(struct of_overlay_filter *f, - const char *filename) +static bool of_overlay_filter_pattern(struct of_overlay_filter *f, + const char *pattern) { char *p, *path, *n; int ret; bool apply; - p = path = strdup(of_overlay_filepattern); + p = path = strdup(of_overlay_pattern); while ((n = strsep_unescaped(&p, " ", NULL))) { if (!*n) continue; - ret = fnmatch(n, filename, 0); + ret = fnmatch(n, pattern, 0); if (!ret) { apply = true; @@ -543,6 +543,18 @@ static bool of_overlay_filter_filename(struct of_overlay_filter *f, return apply; } +static struct of_overlay_filter of_overlay_pattern_filter = { + .name = "pattern", + .filter_filename = of_overlay_filter_pattern, +}; + +static bool of_overlay_filter_filename(struct of_overlay_filter *f, + const char *filename) +{ + pr_warn("'filepattern' filter is marked as deprecated, convert to 'pattern' filter\n"); + return of_overlay_filter_pattern(f, filename); +} + static struct of_overlay_filter of_overlay_filepattern_filter = { .name = "filepattern", .filter_filename = of_overlay_filter_filename, @@ -597,15 +609,18 @@ static struct of_overlay_filter of_overlay_compatible_filter = { static int of_overlay_init(void) { - of_overlay_filepattern = strdup("*"); - of_overlay_filter = strdup("filepattern compatible"); + of_overlay_pattern = strdup("*"); + of_overlay_filter = strdup("pattern compatible"); of_overlay_set_basedir("/"); 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.pattern", &of_overlay_pattern); globalvar_add_simple_string("of.overlay.filter", &of_overlay_filter); globalvar_add_simple_string("of.overlay.dir", &of_overlay_dir); + globalvar_alias_deprecated("of.overlay.filepattern", "of.overlay.pattern"); + + of_overlay_register_filter(&of_overlay_pattern_filter); of_overlay_register_filter(&of_overlay_filepattern_filter); of_overlay_register_filter(&of_overlay_compatible_filter); @@ -616,6 +631,6 @@ static int of_overlay_init(void) 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.pattern, "space separated list of filepatterns an overlay must match"); BAREBOX_MAGICVAR(global.of.overlay.dir, "Directory to look for dt overlays"); BAREBOX_MAGICVAR(global.of.overlay.filter, "space separated list of filters"); -- 2.39.5