[PATCH v2 2/5] x86: Set xen_phys_start and trampoline_xen_phys_start earlier

[Frediano Ziglio <frediano.ziglio@xxxxxxxxx>]

No reason to wait, if Xen image is loaded by EFI (not multiboot
EFI path) these are set in efi_arch_load_addr_check, but
not in the multiboot EFI code path.
This change makes the 2 EFI code paths more similar and allows
the usage of these variables if needed.

Signed-off-by: Frediano Ziglio <frediano.ziglio@xxxxxxxxx>
---
 xen/arch/x86/boot/head.S | 5 +++++
 1 file changed, 5 insertions(+)
---
Changes since v1:
- Do not remove other hunk, used for BIOS;
- Slightly improved commit message.

diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S
index 16830f636f..af598a60bf 100644
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -240,6 +240,11 @@ __efi64_mb2_start:
         jmp     x86_32_switch
 
 .Lefi_multiboot2_proto:
+        /* Save Xen image load base address for later use. */
+        lea     __image_base__(%rip), %esi
+        mov     %rsi, xen_phys_start(%rip)
+        mov     %esi, trampoline_xen_phys_start(%rip)
+
         /* Zero EFI SystemTable, EFI ImageHandle addresses and cmdline. */
         xor     %esi,%esi
         xor     %edi,%edi
-- 
2.45.2