Re: [PATCH -next] efi/libstub/x86: fix an EFI server boot failure

[Ingo Molnar <mingo@kernel.org>]

* Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:

> On Wed, 22 Jan 2020 at 20:17, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> >
> > On Wed, 22 Jan 2020 at 20:15, Qian Cai <cai@lca.pw> wrote:
> > >
> > > x86_64 EFI systems are unable to boot due to a typo in the recent commit.
> > >
> > > EFI config tables not found.
> > >  -- System halted
> > >
> > > Fixes: 796eb8d26a57 ("efi/libstub/x86: Use const attribute for efi_is_64bit()")
> > > Signed-off-by: Qian Cai <cai@lca.pw>
> > > ---
> > >  arch/x86/boot/compressed/eboot.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
> > > index 82e26d0ff075..287393d725f0 100644
> > > --- a/arch/x86/boot/compressed/eboot.c
> > > +++ b/arch/x86/boot/compressed/eboot.c
> > > @@ -32,7 +32,7 @@ __attribute_const__ bool efi_is_64bit(void)
> > >  {
> > >         if (IS_ENABLED(CONFIG_EFI_MIXED))
> > >                 return efi_is64;
> > > -       return IS_ENABLED(CONFIG_X64_64);
> > > +       return IS_ENABLED(CONFIG_X86_64);
> > >  }
> > >
> > >  static efi_status_t
> >
> > Apologies for the breakage - your fix is obviously correct. But I did
> > test this code, so I am curious why I didn't see this problem. Are you
> > booting via GRUB or from the UEFI shell? Can you share your .config
> > please?
> 
> Hmm, I guess it is simply the absence of CONFIG_EFI_MIXED=y ...
> 
> Acked-by: Ard Biesheuvel <ardb@kernel.org>
> 
> Ingo, Thomas, could you drop this into efi/core directly please? Thanks.

Sure, done!

Thanks,

	Ingo