Linux-EFI Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/1] efi/libstub/x86: simplify efi_is_native()
@ 2020-10-03  6:03 Heinrich Schuchardt
  2020-10-03 17:28 ` Brian Gerst
  0 siblings, 1 reply; 5+ messages in thread
From: Heinrich Schuchardt @ 2020-10-03  6:03 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: Thomas Gleixner, Ingo Molnar, Borislav Petkov, x86,
	H . Peter Anvin, linux-efi, linux-kernel, Heinrich Schuchardt

CONFIG_EFI_MIXED depends on CONFIG_X86_64=y.
There is no need to check CONFIG_X86_64 again.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 arch/x86/include/asm/efi.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index b9c2667ac46c..ab28bf1c74cf 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -223,8 +223,6 @@ static inline bool efi_is_64bit(void)

 static inline bool efi_is_native(void)
 {
-	if (!IS_ENABLED(CONFIG_X86_64))
-		return true;
 	return efi_is_64bit();
 }

--
2.28.0


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] efi/libstub/x86: simplify efi_is_native()
  2020-10-03  6:03 [PATCH 1/1] efi/libstub/x86: simplify efi_is_native() Heinrich Schuchardt
@ 2020-10-03 17:28 ` Brian Gerst
  2020-10-03 19:44   ` Arvind Sankar
  0 siblings, 1 reply; 5+ messages in thread
From: Brian Gerst @ 2020-10-03 17:28 UTC (permalink / raw)
  To: Heinrich Schuchardt
  Cc: Ard Biesheuvel, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
	the arch/x86 maintainers, H . Peter Anvin, linux-efi,
	Linux Kernel Mailing List

On Sat, Oct 3, 2020 at 2:05 AM Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> CONFIG_EFI_MIXED depends on CONFIG_X86_64=y.
> There is no need to check CONFIG_X86_64 again.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  arch/x86/include/asm/efi.h | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> index b9c2667ac46c..ab28bf1c74cf 100644
> --- a/arch/x86/include/asm/efi.h
> +++ b/arch/x86/include/asm/efi.h
> @@ -223,8 +223,6 @@ static inline bool efi_is_64bit(void)
>
>  static inline bool efi_is_native(void)
>  {
> -       if (!IS_ENABLED(CONFIG_X86_64))
> -               return true;
>         return efi_is_64bit();
>  }

This would then return false for native 32-bit.

--
Brian Gerst

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] efi/libstub/x86: simplify efi_is_native()
  2020-10-03 17:28 ` Brian Gerst
@ 2020-10-03 19:44   ` Arvind Sankar
  2020-10-04 14:14     ` Ard Biesheuvel
  0 siblings, 1 reply; 5+ messages in thread
From: Arvind Sankar @ 2020-10-03 19:44 UTC (permalink / raw)
  To: Brian Gerst
  Cc: Heinrich Schuchardt, Ard Biesheuvel, Thomas Gleixner,
	Ingo Molnar, Borislav Petkov, the arch/x86 maintainers,
	H . Peter Anvin, linux-efi, Linux Kernel Mailing List

On Sat, Oct 03, 2020 at 01:28:18PM -0400, Brian Gerst wrote:
> On Sat, Oct 3, 2020 at 2:05 AM Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> >
> > CONFIG_EFI_MIXED depends on CONFIG_X86_64=y.
> > There is no need to check CONFIG_X86_64 again.
> >
> > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> > ---
> >  arch/x86/include/asm/efi.h | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> > index b9c2667ac46c..ab28bf1c74cf 100644
> > --- a/arch/x86/include/asm/efi.h
> > +++ b/arch/x86/include/asm/efi.h
> > @@ -223,8 +223,6 @@ static inline bool efi_is_64bit(void)
> >
> >  static inline bool efi_is_native(void)
> >  {
> > -       if (!IS_ENABLED(CONFIG_X86_64))
> > -               return true;
> >         return efi_is_64bit();
> >  }
> 
> This would then return false for native 32-bit.
> 
> --
> Brian Gerst

32-bit doesn't use this implementation: it's #define'd to true in
drivers/firmware/efi/libstub/efistub.h.

Thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] efi/libstub/x86: simplify efi_is_native()
  2020-10-03 19:44   ` Arvind Sankar
@ 2020-10-04 14:14     ` Ard Biesheuvel
  2020-10-04 14:40       ` Arvind Sankar
  0 siblings, 1 reply; 5+ messages in thread
From: Ard Biesheuvel @ 2020-10-04 14:14 UTC (permalink / raw)
  To: Arvind Sankar
  Cc: Brian Gerst, Heinrich Schuchardt, Thomas Gleixner, Ingo Molnar,
	Borislav Petkov, the arch/x86 maintainers, H . Peter Anvin,
	linux-efi, Linux Kernel Mailing List

On Sat, 3 Oct 2020 at 21:44, Arvind Sankar <nivedita@alum.mit.edu> wrote:
>
> On Sat, Oct 03, 2020 at 01:28:18PM -0400, Brian Gerst wrote:
> > On Sat, Oct 3, 2020 at 2:05 AM Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> > >
> > > CONFIG_EFI_MIXED depends on CONFIG_X86_64=y.
> > > There is no need to check CONFIG_X86_64 again.
> > >
> > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> > > ---
> > >  arch/x86/include/asm/efi.h | 2 --
> > >  1 file changed, 2 deletions(-)
> > >
> > > diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> > > index b9c2667ac46c..ab28bf1c74cf 100644
> > > --- a/arch/x86/include/asm/efi.h
> > > +++ b/arch/x86/include/asm/efi.h
> > > @@ -223,8 +223,6 @@ static inline bool efi_is_64bit(void)
> > >
> > >  static inline bool efi_is_native(void)
> > >  {
> > > -       if (!IS_ENABLED(CONFIG_X86_64))
> > > -               return true;
> > >         return efi_is_64bit();
> > >  }
> >
> > This would then return false for native 32-bit.
> >
> > --
> > Brian Gerst
>
> 32-bit doesn't use this implementation: it's #define'd to true in
> drivers/firmware/efi/libstub/efistub.h.
>

Yes, and the reason this [now redundant] test exists is because this
did not use to be the case before

de8c55208c386 efi/libstub: Fix mixed mode boot issue after macro refactor

So for this patch

Acked-by: Ard Biesheuvel <ardb@kernel.org>

I'll queue this up

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] efi/libstub/x86: simplify efi_is_native()
  2020-10-04 14:14     ` Ard Biesheuvel
@ 2020-10-04 14:40       ` Arvind Sankar
  0 siblings, 0 replies; 5+ messages in thread
From: Arvind Sankar @ 2020-10-04 14:40 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: Arvind Sankar, Brian Gerst, Heinrich Schuchardt, Thomas Gleixner,
	Ingo Molnar, Borislav Petkov, the arch/x86 maintainers,
	H . Peter Anvin, linux-efi, Linux Kernel Mailing List

On Sun, Oct 04, 2020 at 04:14:11PM +0200, Ard Biesheuvel wrote:
> On Sat, 3 Oct 2020 at 21:44, Arvind Sankar <nivedita@alum.mit.edu> wrote:
> >
> > On Sat, Oct 03, 2020 at 01:28:18PM -0400, Brian Gerst wrote:
> > > On Sat, Oct 3, 2020 at 2:05 AM Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> > > >
> > > > CONFIG_EFI_MIXED depends on CONFIG_X86_64=y.
> > > > There is no need to check CONFIG_X86_64 again.
> > > >
> > > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> > > > ---
> > > >  arch/x86/include/asm/efi.h | 2 --
> > > >  1 file changed, 2 deletions(-)
> > > >
> > > > diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> > > > index b9c2667ac46c..ab28bf1c74cf 100644
> > > > --- a/arch/x86/include/asm/efi.h
> > > > +++ b/arch/x86/include/asm/efi.h
> > > > @@ -223,8 +223,6 @@ static inline bool efi_is_64bit(void)
> > > >
> > > >  static inline bool efi_is_native(void)
> > > >  {
> > > > -       if (!IS_ENABLED(CONFIG_X86_64))
> > > > -               return true;
> > > >         return efi_is_64bit();
> > > >  }
> > >
> > > This would then return false for native 32-bit.
> > >
> > > --
> > > Brian Gerst
> >
> > 32-bit doesn't use this implementation: it's #define'd to true in
> > drivers/firmware/efi/libstub/efistub.h.
> >
> 
> Yes, and the reason this [now redundant] test exists is because this
> did not use to be the case before
> 
> de8c55208c386 efi/libstub: Fix mixed mode boot issue after macro refactor

Heh, my fault for not cleaning it up then :)

> 
> So for this patch
> 
> Acked-by: Ard Biesheuvel <ardb@kernel.org>
> 
> I'll queue this up

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-03  6:03 [PATCH 1/1] efi/libstub/x86: simplify efi_is_native() Heinrich Schuchardt
2020-10-03 17:28 ` Brian Gerst
2020-10-03 19:44   ` Arvind Sankar
2020-10-04 14:14     ` Ard Biesheuvel
2020-10-04 14:40       ` Arvind Sankar

Linux-EFI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-efi/0 linux-efi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-efi linux-efi/ https://lore.kernel.org/linux-efi \
		linux-efi@vger.kernel.org
	public-inbox-index linux-efi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-efi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git