On 26.09.2024 11:21, Frediano Ziglio wrote:
> @@ -243,7 +234,7 @@ __efi64_mb2_start:
>          /*
>           * Initialize BSS (no nasty surprises!).
>           * It must be done earlier than in BIOS case
> -         * because efi_multiboot2() touches it.
> +         * because efi_multiboot2_prelude() touches it.
>           */
>          mov     %eax, %edx

I think this MOV wants to gain a comment, now that ...

>          lea     __bss_start(%rip), %edi
> @@ -252,36 +243,30 @@ __efi64_mb2_start:
>          shr     $3, %ecx
>          xor     %eax, %eax
>          rep stosq
> -        mov     %edx, %eax

... this one's going away.

> --- a/xen/arch/x86/efi/stub.c
> +++ b/xen/arch/x86/efi/stub.c
> @@ -17,7 +17,8 @@
>   */
>  
>  void __init noreturn efi_multiboot2(EFI_HANDLE ImageHandle,
> -                                    EFI_SYSTEM_TABLE *SystemTable)
> +                                    EFI_SYSTEM_TABLE *SystemTable,
> +                                    const char *cmdline)

While with ...

> --- /dev/null
> +++ b/xen/arch/x86/include/asm/efi.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +
> +#ifndef X86_ASM_EFI_H
> +#define X86_ASM_EFI_H
> +
> +#include <xen/types.h>
> +#include <asm/x86_64/efibind.h>
> +#include <efi/efidef.h>
> +#include <efi/eficapsule.h>
> +#include <efi/eficon.h>
> +#include <efi/efidevp.h>
> +#include <efi/efiapi.h>
> +
> +void efi_multiboot2(EFI_HANDLE ImageHandle,
> +                    EFI_SYSTEM_TABLE *SystemTable,
> +                    const char *cmdline);

... the declaration now (supposedly) in scope the need for that earlier
adjustment may be a little more obvious, you still ought to mention it
in the description. If you did, you'd might have noticed that stub.c now
also needs to include the new asm/efi.h, for the declaration to actually
have its full intended effect.

Jan

Reply via email to