From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 06 Jan 2026 09:17:36 +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 1vd2G0-001pL9-2J for lore@lore.pengutronix.de; Tue, 06 Jan 2026 09:17:36 +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 1vd2G0-0001dO-31 for lore@pengutronix.de; Tue, 06 Jan 2026 09:17:36 +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: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=l5PXyss5hJcAclRW0FCVX7h2heXA8TvmE0ksiej0FtE=; b=0Mti5aElwUcXvCd2n9L+Ro4k5g +lRcAOxojw4kOFvmnW4V4aaSEJJaNTMhWS0yzZFfwU1kNAokM6TZJjTDAiValbvLluBnujq7fIVNz jeN6YEUmCmU6rKT022QzTQ7ruSXKvi+z6x1plbPNV4aH96TdCEGMTWEMUuNUgdksUlZ228aC2tbsZ 0xqu8nmRDeEpW9pSx6wvqBpvYWNOLdK4TLlaUpjFbkxJeBjetGQ8qCOOnmuqWmzYMFOa+eiMb6MNg XysTlQUOO3CTWG1Fwx2Y5Hi0GwMMlyYX7QUzTb/T3NkkHdy16H6iGEpHSlg15Yir26sSHTftKos+R RAKQEHSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vd2FX-0000000Cb7A-0O1p; Tue, 06 Jan 2026 08:17:07 +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 1vd2FU-0000000Cb6O-1Vli for barebox@lists.infradead.org; Tue, 06 Jan 2026 08:17:06 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=geraet.lan) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vd2FR-0001Ua-5b; Tue, 06 Jan 2026 09:17:01 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Tue, 6 Jan 2026 09:16:57 +0100 Message-ID: <20260106081659.3491945-2-a.fatoum@barebox.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260106081659.3491945-1-a.fatoum@barebox.org> References: <20260106081659.3491945-1-a.fatoum@barebox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260106_001704_398543_62F43627 X-CRM114-Status: GOOD ( 14.21 ) 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=-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 2/2] ARM: cpu: common: define generic relocate_image 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) For use by the ELF loader in PBL to relocate barebox proper, export a new relocate_image capable of relocating barebox and implement relocate_to_current_adr() in terms of it. When doing ELF loading, the PT_DYNAMIC segment will contain the info needed to derive the arguments for relocate_image(): - dstart: DT_REL /DT_RELA - dend: DT_RELSZ/DT_RELASZ - dynsym: DT_SYMTAB dynend is optional and could in theory be generated by looking at DT_HASH or DT_GNU_HASH, but it's not required. Best guess is that the zeroing is there just to signify that we don't need this data anymore. Signed-off-by: Ahmad Fatoum --- arch/arm/cpu/common.c | 34 +++++++++++++++------------------- arch/arm/include/asm/reloc.h | 3 +++ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c index 5b65b0745b98..f4f3f8f6325b 100644 --- a/arch/arm/cpu/common.c +++ b/arch/arm/cpu/common.c @@ -60,22 +60,10 @@ void pbl_barebox_break(void) /* * relocate binary to the currently running address */ -void __prereloc relocate_to_current_adr(void) +void __prereloc relocate_image(unsigned long offset, + void *dstart, void *dend, + long *dynsym, long *dynend) { - unsigned long offset; - unsigned long __maybe_unused *dynsym, *dynend; - void *dstart, *dend; - - /* Get offset between linked address and runtime address */ - offset = get_runtime_offset(); - - /* - * We have yet to relocate, so using runtime_address - * to compute the relocated address - */ - dstart = runtime_address(__rel_dyn_start); - dend = runtime_address(__rel_dyn_end); - #if defined(CONFIG_CPU_64) while (dstart < dend) { struct elf64_rela *rel = dstart; @@ -105,8 +93,6 @@ void __prereloc relocate_to_current_adr(void) dstart += sizeof(*rel); } #elif defined(CONFIG_CPU_32) - dynsym = runtime_address(__dynsym_start); - dynend = runtime_address(__dynsym_end); while (dstart < dend) { struct elf32_rel *rel = dstart; @@ -141,10 +127,21 @@ void __prereloc relocate_to_current_adr(void) dstart += sizeof(*rel); } - __memset(dynsym, 0, (unsigned long)dynend - (unsigned long)dynsym); + /* Optional: not required for correctness */ + if (dynend) + __memset(dynsym, 0, (unsigned long)dynend - (unsigned long)dynsym); #else #error "Architecture not specified" #endif +} + +void __prereloc relocate_to_current_adr(void) +{ + relocate_image(get_runtime_offset(), + runtime_address(__rel_dyn_start), + runtime_address(__rel_dyn_end), + runtime_address(__dynsym_start), + runtime_address(__dynsym_end)); sync_caches_for_execution(); } @@ -196,4 +193,3 @@ void print_pbl_mem_layout(ulong membase, ulong endmem, ulong barebox_base) printf("membase = 0x%08lx+0x%08lx\n", membase, endmem - membase); } - diff --git a/arch/arm/include/asm/reloc.h b/arch/arm/include/asm/reloc.h index 2d7411ab5284..62c07932fad4 100644 --- a/arch/arm/include/asm/reloc.h +++ b/arch/arm/include/asm/reloc.h @@ -30,6 +30,9 @@ static inline __prereloc unsigned long global_variable_offset(void) } #define global_variable_offset() global_variable_offset() +void relocate_image(unsigned long offset, + void *dstart, void *dend, + long *dynsym, long *dynend); void relocate_to_current_adr(void); void relocate_to_adr(unsigned long target); void relocate_to_adr_full(unsigned long target); -- 2.47.3