arch: x86: lib: Add support of legacy 64-bit entry point at 0x200

Support of legacy 64-bit entry point was already present when booting a bzimage
with 'zboot' but not supported with 'bootm' when the x86_64 Linux kernel is
embedded in a FIT image.

Signed-off-by: Paul HENRYS <[email protected]>
Reviewed-by: Simon Glass <[email protected]>

diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 0f79a5d54959fd50ffaadfefb3f7fedb841699c9..0cf3824d2031835399222ac3536daf30fd7562ea 100644 (file)
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -189,6 +189,12 @@ int boot_linux_kernel(ulong setup_base, ulong entry, bool image_64bit)
                if (CONFIG_IS_ENABLED(X86_64)) {
                        typedef void (*h_func)(ulong zero, ulong setup);
                        h_func func;
+                       struct setup_header *hdr = &(((struct boot_params *)(setup_base))->hdr);
+
+                       /* Handle kernel with legacy 64-bit entry point at 0x200 */
+                       if (hdr->xloadflags & XLF_KERNEL_64) {
+                               entry += 0x200;
+                       }
 
                        /* jump to Linux with rdi=0, rsi=setup_base */
                        func = (h_func)entry;

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 73a21bc8f03b650180d0fc42c03e30c0ea41118b..2eece34a073cda756bae94fb800470c7c3fff1ae 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -426,7 +426,6 @@ int zboot_go(void)
        image_64bit = false;
        if (IS_ENABLED(CONFIG_X86_RUN_64BIT) &&
            (hdr->xloadflags & XLF_KERNEL_64)) {
-               entry += 0x200;
                image_64bit = true;
        }