From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Steffen Trumtrar <str@pengutronix.de>, barebox@lists.infradead.org
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: Re: [PATCH v2 3/5] ARM: socfpga: achilles: use ENTRY_FUNCTION_WITHSTACK
Date: Fri, 8 Jul 2022 10:24:44 +0200 [thread overview]
Message-ID: <b3c4ab3e-59d9-6fbc-1a3e-85161ef9a8c1@pengutronix.de> (raw)
In-Reply-To: <20220708062411.711639-3-str@pengutronix.de>
On 08.07.22 08:24, Steffen Trumtrar wrote:
> From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>
> Use the newer function ENTRY_FUNCTION_WITHSTACK.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
> arch/arm/boards/reflex-achilles/lowlevel.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boards/reflex-achilles/lowlevel.c b/arch/arm/boards/reflex-achilles/lowlevel.c
> index 162cd58c58..0fc94fc2b1 100644
> --- a/arch/arm/boards/reflex-achilles/lowlevel.c
> +++ b/arch/arm/boards/reflex-achilles/lowlevel.c
> @@ -31,12 +31,16 @@
>
> extern char __dtb_z_socfpga_arria10_achilles_start[];
>
> -static noinline void achilles_start(void)
> +#define ARRIA10_STACKTOP ARRIA10_OCRAM_ADDR + SZ_256K
> +
> +ENTRY_FUNCTION_WITHSTACK(start_socfpga_achilles_xload, ARRIA10_STACKTOP, r0, r1, r2)
> {
> int pbl_index = 0;
> int barebox = 0;
> int bitstream = 0;
>
> + arm_cpu_lowlevel_init();
> + arm_setup_stack(ARRIA10_OCRAM_ADDR + SZ_256K);
Only safe to call in a naked function. Drop it as you are now using
ENTRY_FUNCTION_WITHSTACK, which does setup for you.
>
> relocate_to_current_adr();
> setup_c();
> @@ -75,13 +79,6 @@ static noinline void achilles_start(void)
> arria10_start_image(barebox);
> }
>
> -ENTRY_FUNCTION(start_socfpga_achilles_xload, r0, r1, r2)
> -{
> - arm_cpu_lowlevel_init();
> - arm_setup_stack(ARRIA10_OCRAM_ADDR + SZ_256K);
> - achilles_start();
> -}
> -
> ENTRY_FUNCTION(start_socfpga_achilles, r0, r1, r2)
> {
> void *fdt;
> @@ -91,7 +88,7 @@ ENTRY_FUNCTION(start_socfpga_achilles, r0, r1, r2)
> barebox_arm_entry(0x0, SZ_2G + SZ_1G, fdt);
> }
>
> -ENTRY_FUNCTION(start_socfpga_achilles_bringup, r0, r1, r2)
> +ENTRY_FUNCTION_WITHSTACK(start_socfpga_achilles_bringup, ARRIA10_STACKTOP, r0, r1, r2)
> {
> void *fdt;
>
--
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 |
next prev parent reply other threads:[~2022-07-08 8:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 6:24 [PATCH v2 1/5] ARM: socfpga: achilles: remove cargo-cult Steffen Trumtrar
2022-07-08 6:24 ` [PATCH v2 2/5] ARM: socfpga: achilles: use dtbz instead of dtb Steffen Trumtrar
2022-07-08 6:24 ` [PATCH v2 3/5] ARM: socfpga: achilles: use ENTRY_FUNCTION_WITHSTACK Steffen Trumtrar
2022-07-08 8:13 ` Lucas Stach
2022-07-08 8:24 ` Ahmad Fatoum [this message]
2022-07-11 7:33 ` Steffen Trumtrar
2022-07-08 6:24 ` [PATCH v2 4/5] ARM: socfpga: add support for Enclustra AA1 Steffen Trumtrar
2022-07-08 6:24 ` [PATCH v2 5/5] ARM: socfpga: defconfig: add aa1 Steffen Trumtrar
2022-07-08 8:25 ` 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=b3c4ab3e-59d9-6fbc-1a3e-85161ef9a8c1@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=s.trumtrar@pengutronix.de \
--cc=str@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