From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: ore@pengutronix.de
Subject: Re: [PATCH master v2 1/3] ARM: asm: fix miscompilation of 32-bit ENTRY_FUNCTION_WITHSTACK
Date: Mon, 25 Apr 2022 10:16:23 +0200 [thread overview]
Message-ID: <695bcc60-9083-02a2-515d-b7ee8f46e916@pengutronix.de> (raw)
In-Reply-To: <20220425062523.17478-2-a.fatoum@pengutronix.de>
On 25.04.22 08:25, Ahmad Fatoum wrote:
> gcc-11.1.1 shipped with OSELAS.Toolchain-2021.07.0 hoists a single
> instruction from __ARM_SETUP_STACK in front of __barebox_arm_head
> breaking the barebox header format for the Raspberry Pi 3. This can't
> happen with ARM64 and the Raspberry Pi entry points are currently the
> only 32-bit users.
>
> While the resulting barebox image was still bootable, header detection
> would fail. Add an intermediate naked function to work around this.
>
> This is not required for plain ENTRY_FUNCTION, because the
> board-supplied entry point is already NAKED. For
> ENTRY_FUNCTION_WITH_FUNCTION, that same entry point is intentionally
> non-naked to reduce pitfalls for board code authors..
>
> Fixes: 880c9803b95a ("ARM: implement ENTRY_FUNCTION_WITHSTACK")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> arch/arm/include/asm/barebox-arm.h | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
> index d915cde294a4..8b0c00633277 100644
> --- a/arch/arm/include/asm/barebox-arm.h
> +++ b/arch/arm/include/asm/barebox-arm.h
> @@ -194,15 +194,21 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase,
> void name(ulong r0, ulong r1, ulong r2); \
> \
> static void __##name(ulong, ulong, ulong); \
> + static void ____##name(ulong, ulong, ulong); \
> \
> void NAKED __section(.text_head_entry_##name) name \
> (ulong r0, ulong r1, ulong r2) \
> { \
> __barebox_arm_head(); \
> - __ARM_SETUP_STACK(stack_top); \
> __##name(r0, r1, r2); \
> } \
> - static void noinline __##name \
> + static void NAKED noinline __##name \
> + (ulong r0, ulong r1, ulong r2) \
> + { \
> + __ARM_SETUP_STACK(stack_top); \
> + ____##name(r0, r1, r2); \
> + } \
> + static void noinline ____##name \
I see now I could just make it call ENTRY_FUNCTION on arm32 with stack setup
and leave it unchanged for ARM64. Will do so for v3.
> (ulong arg0, ulong arg1, ulong arg2)
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-04-25 8:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-25 6:25 [PATCH master v2 0/3] ARM: rpi3: fix misc recent breakage Ahmad Fatoum
2022-04-25 6:25 ` [PATCH master v2 1/3] ARM: asm: fix miscompilation of 32-bit ENTRY_FUNCTION_WITHSTACK Ahmad Fatoum
2022-04-25 8:16 ` Ahmad Fatoum [this message]
2022-04-25 6:25 ` [PATCH master v2 2/3] clk: add BCM2835 auxiliary peripheral clock driver Ahmad Fatoum
2022-04-25 6:25 ` [PATCH master v2 3/3] clocksource: assign non-zero priorities to all clocksources Ahmad Fatoum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=695bcc60-9083-02a2-515d-b7ee8f46e916@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=ore@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox