From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 23 Jan 2026 14:20: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 1vjH59-004UXl-1a for lore@lore.pengutronix.de; Fri, 23 Jan 2026 14:20: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 1vjH58-0003xx-EB for lore@pengutronix.de; Fri, 23 Jan 2026 14:20:10 +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=9IuiG5TW8c0+aOtkMGSztAwLyol9PWfhdYFQ5gGoHnY=; b=ygTpbARzY0thouT7GDuReQn23B HDd6aBmFNGMPdhh3hhK9fme2n2dEmI6B33AAo1qDMOdiOY23/rSqqMXkgjxZftBOnD7bM7Hugm1PT v2h8TyhfrsN2KEaMQ1BR1SJH8k0B1ILqsdvEbc00ptounwJtTWmYSFKH4EbWSSM0pXtpA8DVeAFbx +W5/+BI0NY4v6offVX+NGpVkrw/WAkegiZi6Lr9VjzOkb4D+RqG0QX+6drXSuXSWl9ygzDAqY2C0u Ciz8HNMJIgnzrFoCeSMA2iYR0vdAQHHl4TCZiR4SR57poSZaI38Y22G61/XkB7kXENYbKItNRoTym U5NnGtMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vjH4Z-00000008x0K-3ppx; Fri, 23 Jan 2026 13:19:35 +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 1vjH4V-00000008wt3-3SvO for barebox@lists.infradead.org; Fri, 23 Jan 2026 13:19:34 +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 1vjH4S-0003lS-Ap; Fri, 23 Jan 2026 14:19:28 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) 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 1vjH4S-0026Bu-2b; Fri, 23 Jan 2026 14:19:28 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1vjH4S-0000000DmY8-31Bn; Fri, 23 Jan 2026 14:19:28 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Fri, 23 Jan 2026 14:17:13 +0100 Message-ID: <20260123131922.2663665-4-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260123131922.2663665-1-a.fatoum@pengutronix.de> References: <20260123131922.2663665-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260123_051931_870353_188C81CF X-CRM114-Status: GOOD ( 15.22 ) 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.0 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 master 3/3] common: elf: reorganize barebox proper parts in struct elf_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) To make it clearer which parts of struct elf_image are used only in barebox proper, reorganize the struct. Also .base_load_addr is assigned and never used outside the function that sets it, so turn it into a local variable instead. Signed-off-by: Ahmad Fatoum --- common/elf.c | 13 +++++++------ include/lib/elf.h | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/common/elf.c b/common/elf.c index 296ff3ec7d4c..0df40c13a3a6 100644 --- a/common/elf.c +++ b/common/elf.c @@ -65,6 +65,7 @@ static int elf_compute_load_offset(struct elf_image *elf) void *phdr = buf + elf_hdr_e_phoff(elf, buf); u64 min_vaddr = (u64)-1; u64 min_paddr = (u64)-1; + unsigned long base_load_addr; /* Find lowest p_vaddr and p_paddr in PT_LOAD segments */ elf_for_each_segment(phdr, elf, buf) { @@ -86,11 +87,11 @@ static int elf_compute_load_offset(struct elf_image *elf) * 3. For ET_DYN, use lowest p_paddr */ if (elf->load_address) - elf->base_load_addr = elf->load_address; + base_load_addr = (unsigned long)elf->load_address; else if (elf->type == ET_EXEC) - elf->base_load_addr = NULL; + base_load_addr = 0; else - elf->base_load_addr = (void *)(phys_addr_t)min_paddr; + base_load_addr = min_paddr; /* * Calculate relocation offset: @@ -100,11 +101,11 @@ static int elf_compute_load_offset(struct elf_image *elf) if (elf->type == ET_EXEC && !elf->load_address) elf->reloc_offset = 0; else - elf->reloc_offset = ((unsigned long)elf->base_load_addr - min_vaddr); + elf->reloc_offset = base_load_addr - min_vaddr; - pr_debug("ELF load: type=%s, base=%p, offset=%08lx\n", + pr_debug("ELF load: type=%s, base=%08lx, offset=%08lx\n", elf->type == ET_EXEC ? "ET_EXEC" : "ET_DYN", - elf->base_load_addr, elf->reloc_offset); + base_load_addr, elf->reloc_offset); return 0; } diff --git a/include/lib/elf.h b/include/lib/elf.h index 1521c81df6a7..c62d8f791273 100644 --- a/include/lib/elf.h +++ b/include/lib/elf.h @@ -7,17 +7,18 @@ #include struct elf_image { - struct list_head list; u8 class; u16 type; /* ET_EXEC or ET_DYN */ u64 entry; + void *hdr_buf; + void *load_address; /* User-specified load address (NULL = use p_paddr) */ + unsigned long reloc_offset; /* Offset between p_vaddr and actual load address */ + + /* Only used in barebox proper */ + struct list_head list; void *low_addr; void *high_addr; - void *hdr_buf; const char *filename; - void *load_address; /* User-specified load address (NULL = use p_paddr) */ - void *base_load_addr; /* Calculated base address for ET_DYN */ - unsigned long reloc_offset; /* Offset between p_vaddr and actual load address */ }; static inline void elf_init_struct(struct elf_image *elf) -- 2.47.3