From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 16 Jan 2026 09:13:11 +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 1vgexD-001tTr-2X for lore@lore.pengutronix.de; Fri, 16 Jan 2026 09:13:11 +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 1vgexC-0004Ir-A3 for lore@pengutronix.de; Fri, 16 Jan 2026 09:13:11 +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=EpB0Lho7f7lqjHruhBENKlQGhJ8mBNIKhnbilsR6VKE=; b=ECmvC3ogmMEYvyM2senFNa+rjS WSrCSI3BWLNAgpanCBYrPW9W+P/xL1RYyW2efJjZIPGPkGmHV/Qz0rgHIhDzjw9pAdmOU16YO/Mo8 JlbOMobBEKXLO3IivdiczZHWfDo8R6AGMCbKUXj5i/+Hna5oYSH4j99fwBf+DhEk2i9/rJnliSxYU 2Bqnin8goAk6jTbd22qx4TeBr3ocxGsrUNxdWoCSa5wlVNr9Ff/ayPzkYrCabe3AAZpTklEvZ9eBv 7zHcIWbziJHG4mqgnSgYrV3M92Zubs6bT7t6f5IlBHcLzDIBH3CQ0qxFTpMB9ryJsfvl4152LLB3J IvT/b36Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vgewk-0000000DjdW-10kn; Fri, 16 Jan 2026 08:12:42 +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 1vgewh-0000000DjbF-3Civ for barebox@lists.infradead.org; Fri, 16 Jan 2026 08:12:40 +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 1vgewH-0003jN-Us; Fri, 16 Jan 2026 09:12:13 +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 1vgewI-000t5J-0d; Fri, 16 Jan 2026 09:12:13 +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 1vgewH-00000005hOg-1cjr; Fri, 16 Jan 2026 09:12:13 +0100 From: Sascha Hauer Date: Fri, 16 Jan 2026 09:12:17 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260116-pbl-load-elf-v5-6-51d042021c5a@pengutronix.de> References: <20260116-pbl-load-elf-v5-0-51d042021c5a@pengutronix.de> In-Reply-To: <20260116-pbl-load-elf-v5-0-51d042021c5a@pengutronix.de> To: BAREBOX X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1768551133; l=2737; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=Sl6QPqNpsFtIoiqAgXeTvPkqM0Q1hS631Drfr/pv3QQ=; b=M26bW1ILzwklaSXbBwHHhgjqaMv4nmaWUvSrx7ipdmf90U/Ny2ZPVWLlMIJLM6nez7vZYypPI lpSN8Smv5i5Dwqv92yZtB8EtAyZkvG24XmXZuRDBLr0kUBvVL3+gDvM 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-20260116_001239_808516_2E76271B X-CRM114-Status: GOOD ( 13.48 ) 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 v5 06/22] ARM: implement elf_apply_relocations() for ELF relocation support 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) Implement architecture-specific ELF relocation handlers for ARM32 and ARM64. The implementation reuses the existing relocate_image(). Co-Authored-By: Claude Sonnet 4.5 Reviewed-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/include/asm/elf.h | 7 +++++++ arch/arm/lib32/reloc.c | 19 +++++++++++++++++++ arch/arm/lib64/reloc.c | 21 +++++++++++++++++++-- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index 0b4704a4a5..630c85f2b4 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h @@ -36,6 +36,13 @@ typedef struct user_fp elf_fpregset_t; #define R_ARM_THM_CALL 10 #define R_ARM_THM_JUMP24 30 +/* Additional relocation types for dynamic linking */ +#define R_ARM_RELATIVE 23 + +#define R_AARCH64_NONE 0 +#define R_AARCH64_ABS64 257 +#define R_AARCH64_RELATIVE 1027 + /* * These are used to set parameters in the core dumps. */ diff --git a/arch/arm/lib32/reloc.c b/arch/arm/lib32/reloc.c index 378ba95b2f..edd3d7eb48 100644 --- a/arch/arm/lib32/reloc.c +++ b/arch/arm/lib32/reloc.c @@ -54,3 +54,22 @@ void __prereloc relocate_image(unsigned long offset, if (dynend) __memset(dynsym, 0, (unsigned long)dynend - (unsigned long)dynsym); } + +/* + * Apply ARM32 ELF relocations + */ +int elf_apply_relocations(struct elf_image *elf, const void *dyn_seg) +{ + void *rel_ptr = NULL, *symtab = NULL; + u64 relsz; + phys_addr_t base = (phys_addr_t)elf->reloc_offset; + int ret; + + ret = elf_parse_dynamic_section_rel(elf, dyn_seg, &rel_ptr, &relsz, &symtab); + if (ret) + return ret; + + relocate_image(base, rel_ptr, rel_ptr + relsz, symtab, NULL); + + return 0; +} diff --git a/arch/arm/lib64/reloc.c b/arch/arm/lib64/reloc.c index 2288f9e2e3..b498157874 100644 --- a/arch/arm/lib64/reloc.c +++ b/arch/arm/lib64/reloc.c @@ -8,8 +8,6 @@ #include #include -#define R_AARCH64_RELATIVE 1027 - /* * relocate binary to the currently running address */ @@ -45,3 +43,22 @@ void __prereloc relocate_image(unsigned long offset, dstart += sizeof(*rel); } } + +/* + * Apply ARM64 ELF relocations + */ +int elf_apply_relocations(struct elf_image *elf, const void *dyn_seg) +{ + void *rela_ptr = NULL, *symtab = NULL; + u64 relasz; + phys_addr_t base = (phys_addr_t)elf->reloc_offset; + int ret; + + ret = elf_parse_dynamic_section_rela(elf, dyn_seg, &rela_ptr, &relasz, &symtab); + if (ret) + return ret; + + relocate_image(base, rela_ptr, rela_ptr + relasz, symtab, NULL); + + return 0; +} -- 2.47.3