From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 09 Sep 2022 09:31:09 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oWYTk-00BdJy-5E for lore@lore.pengutronix.de; Fri, 09 Sep 2022 09:31:09 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oWYTk-0002oF-QD for lore@pengutronix.de; Fri, 09 Sep 2022 09:31:09 +0200 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:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=q8OXW38hTsd7D5TWM9R3wQDn4x3ZzWxC7J3c1XB1bN8=; b=f8Y/hFoJscaVvUMHJ3AD9bIBsC Zlr5FJmlnbA3aICXIlvAQAyaMhzf0hVmcsIIeNB7+m3e8yp4uOqrXyou5ltWyi15RccjLmIAfe0Va MbI+JiiRXUVPgZCBxIdwbmg+v0CcHMXent09T3y473AwJDYKaG13tg4LD0BK1QFHeMPpSzEBsq6FE 0ZvLj4A27oytq/eCW0xRoYsXBWP/TTk8OsCuuLx6vRZf9ZGu2E2bPVoGxSsPidGd7QNdjsP6o9wQO pV5xeIXOdficpm1lP1MzlpY20FmS64nd8F8EHRleNjUMJuRGQOplvp/3Z9zx/qwmSRW4tmPBNUYa4 Jrx9LW7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWYS0-00Dvc8-Oc; Fri, 09 Sep 2022 07:29:20 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWYRv-00DvOy-G5 for barebox@lists.infradead.org; Fri, 09 Sep 2022 07:29:17 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oWYRk-0002ZH-Ul; Fri, 09 Sep 2022 09:29:04 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oWYRi-004mAy-CM; Fri, 09 Sep 2022 09:29:04 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oWYRj-00Dg62-E1; Fri, 09 Sep 2022 09:29:03 +0200 From: Sascha Hauer To: Barebox List Date: Fri, 9 Sep 2022 09:29:02 +0200 Message-Id: <20220909072902.3260039-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_002915_553307_90A7BD67 X-CRM114-Status: GOOD ( 13.03 ) 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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] ARM: Fix barebox header generation on arm64 X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) When using multiple ENTRY_FUNCTION_WITH_STACK an entry_prologue is emitted for each usage. The entry_proloues end up in the same section and thus can't be discarded with the effect that the barebox magic is at the wrong place. To fix this put the entry_prologues in function specific sections so that the linker can discard the unused ones. Signed-off-by: Sascha Hauer --- arch/arm/include/asm/barebox-arm.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 16f9882b5a..a34f77f2ab 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -21,6 +21,7 @@ #include #include #include +#include /* * We have a 4GiB address space split into 1MiB sections, with each @@ -137,23 +138,23 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase, #ifdef CONFIG_CPU_64 -#define ____emit_entry_prologue(instr, ...) do { \ - static __attribute__ ((unused,section(".text_head_prologue"))) \ +#define ____emit_entry_prologue(name, instr, ...) do { \ + static __attribute__ ((unused,section(".text_head_prologue_" __stringify(name)))) \ const u32 __entry_prologue[] = {(instr), ##__VA_ARGS__}; \ barrier_data(__entry_prologue); \ } while(0) -#define __emit_entry_prologue(instr1, instr2, instr3, instr4, instr5) \ - ____emit_entry_prologue(instr1, instr2, instr3, instr4, instr5) +#define __emit_entry_prologue(name, instr1, instr2, instr3, instr4, instr5) \ + ____emit_entry_prologue(name, instr1, instr2, instr3, instr4, instr5) -#define __ARM_SETUP_STACK(stack_top) \ - __emit_entry_prologue(0x14000002 /* b pc+0x8 */, \ +#define __ARM_SETUP_STACK(name, stack_top) \ + __emit_entry_prologue(name, 0x14000002 /* b pc+0x8 */, \ stack_top /* 32-bit literal */, \ 0x18ffffe9 /* ldr w9, top */, \ 0xb4000049 /* cbz x9, pc+0x8 */, \ 0x9100013f /* mov sp, x9 */) #else -#define __ARM_SETUP_STACK(stack_top) if (stack_top) arm_setup_stack(stack_top) +#define __ARM_SETUP_STACK(name, stack_top) if (stack_top) arm_setup_stack(stack_top) #endif /* @@ -174,7 +175,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase, (ulong r0, ulong r1, ulong r2) \ { \ __barebox_arm_head(); \ - __ARM_SETUP_STACK(stack_top); \ + __ARM_SETUP_STACK(name, stack_top); \ __##name(r0, r1, r2); \ } \ static void noinline __##name \ @@ -184,7 +185,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase, static void ____##name(ulong, ulong, ulong); \ ENTRY_FUNCTION(name, arg0, arg1, arg2) \ { \ - __ARM_SETUP_STACK(stack_top); \ + __ARM_SETUP_STACK(name, stack_top); \ ____##name(arg0, arg1, arg2); \ } \ static void noinline ____##name \ @@ -201,7 +202,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase, (ulong r0, ulong r1, ulong r2) \ { \ __barebox_arm_head(); \ - __ARM_SETUP_STACK(0); \ + __ARM_SETUP_STACK(name, 0); \ __##name(r0, r1, r2); \ } \ static void NAKED noinline __##name \ -- 2.30.2