* [RESEND][PATCH] arm64: Add missing GD_FLG_SKIP_RELOC handling
@ 2021-11-13 17:34 marek.vasut
2021-11-18 23:27 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: marek.vasut @ 2021-11-13 17:34 UTC (permalink / raw)
To: u-boot; +Cc: Marek Vasut, Simon Glass, Tom Rini
From: Marek Vasut <marek.vasut+renesas@gmail.com>
In case U-Boot enters relocation with GD_FLG_SKIP_RELOC, skip the
relocation. The code still has to set up new_gd pointer and new
stack pointer.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
---
arch/arm/lib/crt0_64.S | 4 ++++
lib/asm-offsets.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S
index 680e674fa3..28c8356aee 100644
--- a/arch/arm/lib/crt0_64.S
+++ b/arch/arm/lib/crt0_64.S
@@ -104,6 +104,10 @@ ENTRY(_main)
bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */
ldr x18, [x18, #GD_NEW_GD] /* x18 <- gd->new_gd */
+ /* Skip relocation in case gd->gd_flags & GD_FLG_SKIP_RELOC */
+ ldr x0, [x18, #GD_FLAGS] /* x0 <- gd->flags */
+ tbnz x0, 11, relocation_return /* GD_FLG_SKIP_RELOC is bit 11 */
+
adr lr, relocation_return
#if CONFIG_POSITION_INDEPENDENT
/* Add in link-vs-runtime offset */
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index c691066332..0808cd4b0c 100644
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -29,6 +29,9 @@ int main(void)
DEFINE(GD_SIZE, sizeof(struct global_data));
DEFINE(GD_BD, offsetof(struct global_data, bd));
+
+ DEFINE(GD_FLAGS, offsetof(struct global_data, flags));
+
#if CONFIG_VAL(SYS_MALLOC_F_LEN)
DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base));
#endif
--
2.33.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RESEND][PATCH] arm64: Add missing GD_FLG_SKIP_RELOC handling
2021-11-13 17:34 [RESEND][PATCH] arm64: Add missing GD_FLG_SKIP_RELOC handling marek.vasut
@ 2021-11-18 23:27 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2021-11-18 23:27 UTC (permalink / raw)
To: marek.vasut; +Cc: u-boot, Marek Vasut, Simon Glass
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
On Sat, Nov 13, 2021 at 06:34:59PM +0100, marek.vasut@gmail.com wrote:
> From: Marek Vasut <marek.vasut+renesas@gmail.com>
>
> In case U-Boot enters relocation with GD_FLG_SKIP_RELOC, skip the
> relocation. The code still has to set up new_gd pointer and new
> stack pointer.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-18 23:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-13 17:34 [RESEND][PATCH] arm64: Add missing GD_FLG_SKIP_RELOC handling marek.vasut
2021-11-18 23:27 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.