From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 03 Nov 2025 07:40:55 +0100 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 1vFoFL-00ElKh-2v for lore@lore.pengutronix.de; Mon, 03 Nov 2025 07:40:55 +0100 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 1vFoFL-0004XK-AP for lore@pengutronix.de; Mon, 03 Nov 2025 07:40:55 +0100 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:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=r0y3J4HCrqMhsIWS16xG9Kueq2DILaHGR4rqlGf1y3c=; b=QGI/4iGo1JHPnqhRl7d685Fc0+ fK3lCnQ8oRiahJfLTlj8V+YYb3rtsdehw6Tle1yZC8rei/K2XPGpYL+z76GiVzQ9NFMhNWJkSiFUN 8DFs788fTnjdZjDdmj6ge4fvIQGkcK+3bnLi4yrZf90cnNyFKKTpzZHyhVVFJDvh71wuLVMLqaaL0 IZx+AMaB562y5ZG0dMEiCIu2El2bIvjkOv6Z/1WV97yqz7Mj+RumHsvjtDVjwK97Z0PniJGxATOVT DXe5KDiQtlpTTpMmedkAxKivXLhDXQgExJY9Rnu+mV9vQq8ptHxNVAIc2kPK8i4q/J2OB2mLA8LyV 8fw/f4fQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vFoEn-00000009JPH-47W6; Mon, 03 Nov 2025 06:40:21 +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 1vFoEk-00000009JOh-1xHn for barebox@lists.infradead.org; Mon, 03 Nov 2025 06:40:20 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vFoEg-0004Sz-4c; Mon, 03 Nov 2025 07:40:14 +0100 Message-ID: Date: Mon, 3 Nov 2025 07:40:13 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: chalianis1@gmail.com, s.hauer@pengutronix.de Cc: barebox@lists.infradead.org References: <20251103043833.149013-1-chalianis1@gmail.com> <20251103043833.149013-2-chalianis1@gmail.com> Content-Language: en-US From: Ahmad Fatoum In-Reply-To: <20251103043833.149013-2-chalianis1@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251102_224018_516044_E8298728 X-CRM114-Status: GOOD ( 19.10 ) 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=-4.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 2/2] efi: payload: refactor to use the external barebox state driver. 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) Hi, On 03.11.25 05:38, chalianis1@gmail.com wrote: > From: Chali Anis > > use the external state config to pass the barebox state. > > Signed-off-by: Chali Anis > --- > arch/arm/configs/efi_v8_defconfig | 2 ++ > efi/payload/init.c | 50 ------------------------------- This breaks state for x86-efi, the original user of efi_late_init(). > 2 files changed, 2 insertions(+), 50 deletions(-) > > diff --git a/arch/arm/configs/efi_v8_defconfig b/arch/arm/configs/efi_v8_defconfig > index 5f946dd51d4a..26682aab304a 100644 > --- a/arch/arm/configs/efi_v8_defconfig > +++ b/arch/arm/configs/efi_v8_defconfig > @@ -21,6 +21,8 @@ CONFIG_CONSOLE_RATP=y > CONFIG_PARTITION_DISK_EFI=y > CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y > CONFIG_STATE=y > +CONFIG_EXTERNAL_STATE=y > +CONFIG_EXTERNAL_STATE_DTB_PATH="/boot/EFI/barebox/state.dtb" > CONFIG_BOOTCHOOSER=y > CONFIG_RESET_SOURCE=y > CONFIG_MACHINE_ID=y > diff --git a/efi/payload/init.c b/efi/payload/init.c > index 5b827c57ed1f..63d62395cf3f 100644 > --- a/efi/payload/init.c > +++ b/efi/payload/init.c > @@ -376,56 +376,6 @@ static int efi_postcore_init(void) > } > postcore_efi_initcall(efi_postcore_init); > > -static int efi_late_init(void) > -{ > - const char *state_desc = "/boot/EFI/barebox/state.dtb"; > - struct device_node *state_root = NULL; > - size_t size; > - void *fdt; > - int ret; > - > - if (!IS_ENABLED(CONFIG_STATE)) > - return 0; > - > - if (!get_mounted_path("/boot")) { > - pr_warn("boot device couldn't be determined%s\n", > - IS_ENABLED(CONFIG_FS_EFI) ? "" : " without CONFIG_FS_EFI"); > - return 0; > - } > - > - fdt = read_file(state_desc, &size); > - if (!fdt) { > - pr_info("unable to read %s: %m\n", state_desc); > - return 0; > - } > - > - state_root = of_unflatten_dtb(fdt, size); > - if (!IS_ERR(state_root)) { > - struct device_node *np = NULL; > - struct state *state; > - > - ret = barebox_register_of(state_root); > - if (ret) > - pr_warn("Failed to register device-tree: %pe\n", ERR_PTR(ret)); > - > - np = of_find_node_by_alias(state_root, "state"); > - > - state = state_new_from_node(np, false); > - if (IS_ERR(state)) > - return PTR_ERR(state); > - > - ret = state_load(state); > - if (ret != -ENOMEDIUM) > - pr_warn("Failed to load persistent state, continuing with defaults, %d\n", > - ret); > - > - return 0; > - } > - > - return 0; > -} > -late_efi_initcall(efi_late_init); > - > static int do_efiexit(int argc, char *argv[]) > { > if (!BS) -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |