From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 08 Jan 2026 17:02:35 +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 1vdsT5-002fcy-0R for lore@lore.pengutronix.de; Thu, 08 Jan 2026 17:02:35 +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 1vdsT4-00015y-Db for lore@pengutronix.de; Thu, 08 Jan 2026 17:02:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=su4V0LD9bL2fAho+jeLk28KOj2hFvk4sn1vmaA4rv+Q=; b=yEGC9xsy1hx7PXPoSQ1EUnXyfr V24tJ/k8Feg7Dy4DAoqmTzmM9P7SIy0OezHVPWNcthfTtQA2NsOl8yA0o1ZSvlDQXutyl1+jCs3dE eX6FKE+0moRcp/ObhjZgQdJUCXEFS5WfBCv60NQvrbXsqTgroye/yXJv5gZpGK4WcTXezR9INS5eT Pbxn2hawdEWmax94XPv9C7aHLCSWJy/6HyRBYFUxzWkTa0smHAgdfP6+36r7XfQRbtSL0schzWH1V 0y0EbSW6n9YAYHiP60KGqpR9jwGeahYRPvsT906JoOnnWkhcgwIHiRZni8I6+mbgD4I2E4Ql3Lczb SpD0d0tg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vdsSI-000000001we-1Nag; Thu, 08 Jan 2026 16:01: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 1vdsS5-000000001sL-0HUx for barebox@bombadil.infradead.org; Thu, 08 Jan 2026 16:01:35 +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=su4V0LD9bL2fAho+jeLk28KOj2hFvk4sn1vmaA4rv+Q=; b=ZaCKOwlqXb93KTqEeeqEoX0Sx4 6qEoKmuEpQq/TTxRBAlW2ufcJkKZZ4VXrpxEWfjwr5x78/vllNzbQx3GJLzK4bAZUqeHEI3oy5caV cb9wwBh1LiPoI6AuaS64lmkz4gt5QWfM/XJRIyfF3imui1q7jnx1bPrgtHbT7sUexHe+r6tEGkIQp Z3kERmHIIp/LYdxUE4OcHlNpBQFoOwGJMCqco61Qi5CCV7LYLYDFDZlLbuIUPdq7pZd/yWlUpOROB WUgtNA14L9QTkOds5R/Y3aVgt8uYHaHzK6iBVIWVNwEoFA5bXMvp8jLXGvRucH3DHcpjBnyO0hQJe pYVo6wrw==; 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 1vdsS2-0000000DaTk-1bsm for barebox@lists.infradead.org; Thu, 08 Jan 2026 16:01:31 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vdsS1-0000R0-Sg; Thu, 08 Jan 2026 17:01:29 +0100 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vdsS1-009hX6-2A; Thu, 08 Jan 2026 17:01:29 +0100 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1vdsGv-0000000AN2q-1aF2; Thu, 08 Jan 2026 16:50:01 +0100 From: Sascha Hauer Date: Thu, 08 Jan 2026 16:50:13 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260108-pbl-load-elf-v3-16-e28c931fc179@pengutronix.de> References: <20260108-pbl-load-elf-v3-0-e28c931fc179@pengutronix.de> In-Reply-To: <20260108-pbl-load-elf-v3-0-e28c931fc179@pengutronix.de> To: BAREBOX X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1767887401; l=4521; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=cNs3cLIbz4fhBbMubmQreCTjm5e8+ONDEoMvok9Qo7A=; b=ghjmd0SQuccIAEQPPjHYc258zS5OUc2UbXeFOWBckD/n6wAsp3L4JGXOZz3JG9lLEwtAmGqrG YW8slp6f3t+CdO4zjRKuvR9uZ4sSo56Xq6iaJOSdn0b8MAck9xw1CoD X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260108_160130_464985_7EEE4FF7 X-CRM114-Status: GOOD ( 13.96 ) 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: , Cc: "Claude Sonnet 4.5" , Ahmad Fatoum 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=-3.9 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: [PATCH v3 16/23] ARM: link ELF image into PBL 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) Instead of linking the raw binary barebox proper image into the PBL link the ELF image into the PBL. With this barebox proper starts with a properly linked and fully initialized C environment, so the calls to relocate_to_adr() and setup_c() can be removed from barebox proper. Reviewed-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/Kconfig | 1 + arch/arm/cpu/start.c | 13 ++++--------- arch/arm/cpu/uncompress.c | 26 +++++++++++++++++++------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5123e9b1402c56db94df6a7a33ae993c61d51fbc..65856977ab41298be36b78c64de857570d575744 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM select HW_HAS_PCI select ARCH_HAS_DMA_WRITE_COMBINE select HAVE_EFI_LOADER if MMU # for payload unaligned accesses + select PBL_IMAGE_ELF default y config ARCH_LINUX_NAME diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index f7d4507e71588ba5e241b24b952d55e2a4b0f794..2498bdb894c261f587af6542ea4574c497a6edc0 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -127,8 +127,9 @@ static int barebox_memory_areas_init(void) } device_initcall(barebox_memory_areas_init); -__noreturn __prereloc void barebox_non_pbl_start(unsigned long membase, - unsigned long memsize, struct handoff_data *hd) +__noreturn void barebox_non_pbl_start(unsigned long membase, + unsigned long memsize, + struct handoff_data *hd) { unsigned long endmem = membase + memsize; unsigned long malloc_start, malloc_end; @@ -139,12 +140,6 @@ __noreturn __prereloc void barebox_non_pbl_start(unsigned long membase, if (IS_ENABLED(CONFIG_CPU_V7)) armv7_hyp_install(); - relocate_to_adr(barebox_base); - - setup_c(); - - barrier(); - pbl_barebox_break(); pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize); @@ -200,7 +195,7 @@ void start(unsigned long membase, unsigned long memsize, struct handoff_data *hd * First function in the uncompressed image. We get here from * the pbl. The stack already has been set up by the pbl. */ -void NAKED __prereloc __section(.text_entry) start(unsigned long membase, +void __section(.text_entry) start(unsigned long membase, unsigned long memsize, struct handoff_data *hd) { barebox_non_pbl_start(membase, memsize, hd); diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index b9fc1d04db96e77c8fcd7fd1930798ea1d9294d7..8cc7102290986e71d2f3a2f34df1a9f946c56ced 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -41,6 +42,8 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, void *pg_start, *pg_end; unsigned long pc = get_pc(); void *handoff_data; + struct elf_image elf; + int ret; /* piggy data is not relocated, so determine the bounds now */ pg_start = runtime_address(input_data); @@ -85,21 +88,30 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, else if (IS_ENABLED(CONFIG_ARMV7R_MPU)) set_cr(get_cr() | CR_C); - pr_debug("uncompressing barebox binary at 0x%p (size 0x%08x) to 0x%08lx (uncompressed size: 0x%08x)\n", + pr_debug("uncompressing barebox ELF at 0x%p (size 0x%08x) to 0x%08lx (uncompressed size: 0x%08x)\n", pg_start, pg_len, barebox_base, uncompressed_len); pbl_barebox_uncompress((void*)barebox_base, pg_start, pg_len); + pr_debug("relocating ELF in place\n"); + + ret = elf_open_binary_into(&elf, (void *)barebox_base); + if (ret) + panic("Failed to open ELF binary: %d\n", ret); + + ret = elf_load_inplace(&elf); + if (ret) + panic("Failed to relocate ELF: %d\n", ret); + + pr_debug("ELF entry point: 0x%llx\n", elf.entry); + + barebox = (void *)(unsigned long)elf.entry; + handoff_data_move(handoff_data); sync_caches_for_execution(); - if (IS_ENABLED(CONFIG_THUMB2_BAREBOX)) - barebox = (void *)(barebox_base + 1); - else - barebox = (void *)barebox_base; - - pr_debug("jumping to uncompressed image at 0x%p\n", barebox); + pr_debug("jumping to ELF entry point at 0x%p\n", barebox); if (IS_ENABLED(CONFIG_CPU_V7) && boot_cpu_mode() == HYP_MODE) armv7_switch_to_hyp(); -- 2.47.3