linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Make it possible to disable efivar_ssdt entirely
@ 2020-06-15 20:24 Peter Jones
  2020-06-15 22:47 ` Ard Biesheuvel
  2020-06-19 16:45 ` [tip: efi/urgent] efi: " tip-bot2 for Peter Jones
  0 siblings, 2 replies; 4+ messages in thread
From: Peter Jones @ 2020-06-15 20:24 UTC (permalink / raw)
  To: Ard Biesheuvel; +Cc: linux-efi, linux-kernel, Peter Jones

In most cases, such as CONFIG_ACPI_CUSTOM_DSDT and
CONFIG_ACPI_TABLE_UPGRADE, boot-time modifications to firmware tables
are tied to specific Kconfig options.  Currently this is not the case
for modifying the ACPI SSDT via the efivar_ssdt kernel command line
option and associated EFI variable.

This patch adds CONFIG_EFI_CUSTOM_SSDT_OVERLAYS, which defaults
disabled, in order to allow enabling or disabling that feature during
the build.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 drivers/firmware/efi/efi.c   |  2 +-
 drivers/firmware/efi/Kconfig | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 48d0188936c..4b12a598ccf 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -192,7 +192,7 @@ static void generic_ops_unregister(void)
 	efivars_unregister(&generic_efivars);
 }
 
-#if IS_ENABLED(CONFIG_ACPI)
+#if IS_ENABLED(CONFIG_EFI_CUSTOM_SSDT_OVERLAYS)
 #define EFIVAR_SSDT_NAME_MAX	16
 static char efivar_ssdt[EFIVAR_SSDT_NAME_MAX] __initdata;
 static int __init efivar_ssdt_setup(char *str)
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 6b38f9e5d20..fe433f76b03 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -278,3 +278,14 @@ config EFI_EARLYCON
 	depends on SERIAL_EARLYCON && !ARM && !IA64
 	select FONT_SUPPORT
 	select ARCH_USE_MEMREMAP_PROT
+
+config EFI_CUSTOM_SSDT_OVERLAYS
+	bool "Load custom ACPI SSDT overlay from an EFI variable"
+	depends on EFI_VARS
+	default ACPI_TABLE_UPGRADE
+	help
+	  Allow loading of an ACPI SSDT overlay from an EFI variable specified
+	  by a kernel command line option.
+
+	  See Documentation/admin-guide/acpi/ssdt-overlays.rst for more
+	  information.
-- 
2.26.2


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

* Re: [PATCH] Make it possible to disable efivar_ssdt entirely
  2020-06-15 20:24 [PATCH] Make it possible to disable efivar_ssdt entirely Peter Jones
@ 2020-06-15 22:47 ` Ard Biesheuvel
  2020-06-17  9:01   ` Ard Biesheuvel
  2020-06-19 16:45 ` [tip: efi/urgent] efi: " tip-bot2 for Peter Jones
  1 sibling, 1 reply; 4+ messages in thread
From: Ard Biesheuvel @ 2020-06-15 22:47 UTC (permalink / raw)
  To: Peter Jones; +Cc: linux-efi, Linux Kernel Mailing List

On Mon, 15 Jun 2020 at 22:24, Peter Jones <pjones@redhat.com> wrote:
>
> In most cases, such as CONFIG_ACPI_CUSTOM_DSDT and
> CONFIG_ACPI_TABLE_UPGRADE, boot-time modifications to firmware tables
> are tied to specific Kconfig options.  Currently this is not the case
> for modifying the ACPI SSDT via the efivar_ssdt kernel command line
> option and associated EFI variable.
>
> This patch adds CONFIG_EFI_CUSTOM_SSDT_OVERLAYS, which defaults
> disabled, in order to allow enabling or disabling that feature during
> the build.
>
> Signed-off-by: Peter Jones <pjones@redhat.com>

Thanks Peter.

> ---
>  drivers/firmware/efi/efi.c   |  2 +-
>  drivers/firmware/efi/Kconfig | 11 +++++++++++
>  2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> index 48d0188936c..4b12a598ccf 100644
> --- a/drivers/firmware/efi/efi.c
> +++ b/drivers/firmware/efi/efi.c
> @@ -192,7 +192,7 @@ static void generic_ops_unregister(void)
>         efivars_unregister(&generic_efivars);
>  }
>
> -#if IS_ENABLED(CONFIG_ACPI)
> +#if IS_ENABLED(CONFIG_EFI_CUSTOM_SSDT_OVERLAYS)
>  #define EFIVAR_SSDT_NAME_MAX   16
>  static char efivar_ssdt[EFIVAR_SSDT_NAME_MAX] __initdata;
>  static int __init efivar_ssdt_setup(char *str)
> diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
> index 6b38f9e5d20..fe433f76b03 100644
> --- a/drivers/firmware/efi/Kconfig
> +++ b/drivers/firmware/efi/Kconfig
> @@ -278,3 +278,14 @@ config EFI_EARLYCON
>         depends on SERIAL_EARLYCON && !ARM && !IA64
>         select FONT_SUPPORT
>         select ARCH_USE_MEMREMAP_PROT
> +
> +config EFI_CUSTOM_SSDT_OVERLAYS
> +       bool "Load custom ACPI SSDT overlay from an EFI variable"
> +       depends on EFI_VARS

Shouldn't this depend on ACPI too?

> +       default ACPI_TABLE_UPGRADE
> +       help
> +         Allow loading of an ACPI SSDT overlay from an EFI variable specified
> +         by a kernel command line option.
> +
> +         See Documentation/admin-guide/acpi/ssdt-overlays.rst for more
> +         information.
> --
> 2.26.2
>

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

* Re: [PATCH] Make it possible to disable efivar_ssdt entirely
  2020-06-15 22:47 ` Ard Biesheuvel
@ 2020-06-17  9:01   ` Ard Biesheuvel
  0 siblings, 0 replies; 4+ messages in thread
From: Ard Biesheuvel @ 2020-06-17  9:01 UTC (permalink / raw)
  To: Peter Jones; +Cc: linux-efi, Linux Kernel Mailing List

On Tue, 16 Jun 2020 at 00:47, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> On Mon, 15 Jun 2020 at 22:24, Peter Jones <pjones@redhat.com> wrote:
> >
> > In most cases, such as CONFIG_ACPI_CUSTOM_DSDT and
> > CONFIG_ACPI_TABLE_UPGRADE, boot-time modifications to firmware tables
> > are tied to specific Kconfig options.  Currently this is not the case
> > for modifying the ACPI SSDT via the efivar_ssdt kernel command line
> > option and associated EFI variable.
> >
> > This patch adds CONFIG_EFI_CUSTOM_SSDT_OVERLAYS, which defaults
> > disabled, in order to allow enabling or disabling that feature during
> > the build.
> >
> > Signed-off-by: Peter Jones <pjones@redhat.com>
>
> Thanks Peter.
>
> > ---
> >  drivers/firmware/efi/efi.c   |  2 +-
> >  drivers/firmware/efi/Kconfig | 11 +++++++++++
> >  2 files changed, 12 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> > index 48d0188936c..4b12a598ccf 100644
> > --- a/drivers/firmware/efi/efi.c
> > +++ b/drivers/firmware/efi/efi.c
> > @@ -192,7 +192,7 @@ static void generic_ops_unregister(void)
> >         efivars_unregister(&generic_efivars);
> >  }
> >
> > -#if IS_ENABLED(CONFIG_ACPI)
> > +#if IS_ENABLED(CONFIG_EFI_CUSTOM_SSDT_OVERLAYS)
> >  #define EFIVAR_SSDT_NAME_MAX   16
> >  static char efivar_ssdt[EFIVAR_SSDT_NAME_MAX] __initdata;
> >  static int __init efivar_ssdt_setup(char *str)
> > diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
> > index 6b38f9e5d20..fe433f76b03 100644
> > --- a/drivers/firmware/efi/Kconfig
> > +++ b/drivers/firmware/efi/Kconfig
> > @@ -278,3 +278,14 @@ config EFI_EARLYCON
> >         depends on SERIAL_EARLYCON && !ARM && !IA64
> >         select FONT_SUPPORT
> >         select ARCH_USE_MEMREMAP_PROT
> > +
> > +config EFI_CUSTOM_SSDT_OVERLAYS
> > +       bool "Load custom ACPI SSDT overlay from an EFI variable"
> > +       depends on EFI_VARS
>
> Shouldn't this depend on ACPI too?
>

I'll pick this up as a fix (with the ACPI dependency added)

> > +       default ACPI_TABLE_UPGRADE
> > +       help
> > +         Allow loading of an ACPI SSDT overlay from an EFI variable specified
> > +         by a kernel command line option.
> > +
> > +         See Documentation/admin-guide/acpi/ssdt-overlays.rst for more
> > +         information.
> > --
> > 2.26.2
> >

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

* [tip: efi/urgent] efi: Make it possible to disable efivar_ssdt entirely
  2020-06-15 20:24 [PATCH] Make it possible to disable efivar_ssdt entirely Peter Jones
  2020-06-15 22:47 ` Ard Biesheuvel
@ 2020-06-19 16:45 ` tip-bot2 for Peter Jones
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Peter Jones @ 2020-06-19 16:45 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: stable, Peter Jones, Ard Biesheuvel, x86, LKML

The following commit has been merged into the efi/urgent branch of tip:

Commit-ID:     435d1a471598752446a72ad1201b3c980526d869
Gitweb:        https://git.kernel.org/tip/435d1a471598752446a72ad1201b3c980526d869
Author:        Peter Jones <pjones@redhat.com>
AuthorDate:    Mon, 15 Jun 2020 16:24:08 -04:00
Committer:     Ard Biesheuvel <ardb@kernel.org>
CommitterDate: Tue, 16 Jun 2020 11:01:07 +02:00

efi: Make it possible to disable efivar_ssdt entirely

In most cases, such as CONFIG_ACPI_CUSTOM_DSDT and
CONFIG_ACPI_TABLE_UPGRADE, boot-time modifications to firmware tables
are tied to specific Kconfig options.  Currently this is not the case
for modifying the ACPI SSDT via the efivar_ssdt kernel command line
option and associated EFI variable.

This patch adds CONFIG_EFI_CUSTOM_SSDT_OVERLAYS, which defaults
disabled, in order to allow enabling or disabling that feature during
the build.

Cc: <stable@vger.kernel.org>
Signed-off-by: Peter Jones <pjones@redhat.com>
Link: https://lore.kernel.org/r/20200615202408.2242614-1-pjones@redhat.com
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 drivers/firmware/efi/Kconfig | 11 +++++++++++
 drivers/firmware/efi/efi.c   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index e6fc022..3939699 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -278,3 +278,14 @@ config EFI_EARLYCON
 	depends on SERIAL_EARLYCON && !ARM && !IA64
 	select FONT_SUPPORT
 	select ARCH_USE_MEMREMAP_PROT
+
+config EFI_CUSTOM_SSDT_OVERLAYS
+	bool "Load custom ACPI SSDT overlay from an EFI variable"
+	depends on EFI_VARS && ACPI
+	default ACPI_TABLE_UPGRADE
+	help
+	  Allow loading of an ACPI SSDT overlay from an EFI variable specified
+	  by a kernel command line option.
+
+	  See Documentation/admin-guide/acpi/ssdt-overlays.rst for more
+	  information.
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index edc5d36..5114cae 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -189,7 +189,7 @@ static void generic_ops_unregister(void)
 	efivars_unregister(&generic_efivars);
 }
 
-#if IS_ENABLED(CONFIG_ACPI)
+#ifdef CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
 #define EFIVAR_SSDT_NAME_MAX	16
 static char efivar_ssdt[EFIVAR_SSDT_NAME_MAX] __initdata;
 static int __init efivar_ssdt_setup(char *str)

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

end of thread, other threads:[~2020-06-19 16:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15 20:24 [PATCH] Make it possible to disable efivar_ssdt entirely Peter Jones
2020-06-15 22:47 ` Ard Biesheuvel
2020-06-17  9:01   ` Ard Biesheuvel
2020-06-19 16:45 ` [tip: efi/urgent] efi: " tip-bot2 for Peter Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).