[PATCH] [SUBMITTED 20180724] arm64: fix ACPI dependencies

[PATCH] [SUBMITTED 20180724] arm64: fix ACPI dependencies

[Arnd Bergmann]

Kconfig reports a warning on x86 builds after the ARM64 dependency
was added.

drivers/acpi/Kconfig:6:error: recursive dependency detected!
drivers/acpi/Kconfig:6:       symbol ACPI depends on EFI

This rephrases the dependency to keep the ARM64 details out of the
shared Kconfig file, so Kconfig no longer gets confused by it.

For consistency, all three architectures that support ACPI now
select ARCH_SUPPORTS_ACPI in exactly the configuration in which
they allow it. We still need the 'default x86', as each one
wants a different default: default-y on x86, default-n on arm64,
and always-y on ia64.

Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
v2: use 'select ARCH_SUPPORTS_ACPI' for all three.
---
 arch/arm64/Kconfig   | 1 +
 arch/ia64/Kconfig    | 1 +
 arch/x86/Kconfig     | 1 +
 drivers/acpi/Kconfig | 8 +++++---
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index cdcaa6a798b2..2f987a938405 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1267,6 +1267,7 @@ config EFI
 	bool "UEFI runtime support"
 	depends on OF && !CPU_BIG_ENDIAN
 	depends on KERNEL_MODE_NEON
+	select ARCH_SUPPORTS_ACPI
 	select LIBFDT
 	select UCS2_STRING
 	select EFI_PARAMS_FROM_FDT
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ff861420b8f5..02eb68d5d1c0 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -16,6 +16,7 @@ config IA64
 	select ARCH_MIGHT_HAVE_PC_SERIO
 	select PCI if (!IA64_HP_SIM)
 	select ACPI if (!IA64_HP_SIM)
+	select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM)
 	select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
 	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
 	select HAVE_UNSTABLE_SCHED_CLOCK
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 088b719bc5d1..442575220708 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -76,6 +76,7 @@ config X86
 	select ARCH_MIGHT_HAVE_ACPI_PDC		if ACPI
 	select ARCH_MIGHT_HAVE_PC_PARPORT
 	select ARCH_MIGHT_HAVE_PC_SERIO
+	select ARCH_SUPPORTS_ACPI
 	select ARCH_SUPPORTS_ATOMIC_RMW
 	select ARCH_SUPPORTS_NUMA_BALANCING	if X86_64
 	select ARCH_USE_BUILTIN_BSWAP
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index a8da730fabc6..1edca05ee0ae 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -5,11 +5,10 @@
 
 menuconfig ACPI
 	bool "ACPI (Advanced Configuration and Power Interface) Support"
-	depends on !IA64_HP_SIM
-	depends on IA64 || X86 || (ARM64 && EFI)
+	depends on ARCH_SUPPORTS_ACPI
 	depends on PCI
 	select PNP
-	default y if (IA64 || X86)
+	default y if X86
 	help
 	  Advanced Configuration and Power Interface (ACPI) support for 
 	  Linux requires an ACPI-compliant platform (hardware/firmware),
@@ -41,6 +40,9 @@ menuconfig ACPI
 	  <http://www.acpi.info>
 	  <http://www.uefi.org/acpi/specs>
 
+config ARCH_SUPPORTS_ACPI
+	bool
+
 if ACPI
 
 config ACPI_LEGACY_TABLES_LOOKUP
-- 
2.18.0

Re: [PATCH] [SUBMITTED 20180724] arm64: fix ACPI dependencies

[Rafael J. Wysocki]

On Tue, Jul 24, 2018 at 11:48 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> Kconfig reports a warning on x86 builds after the ARM64 dependency
> was added.
>
> drivers/acpi/Kconfig:6:error: recursive dependency detected!
> drivers/acpi/Kconfig:6:       symbol ACPI depends on EFI
>
> This rephrases the dependency to keep the ARM64 details out of the
> shared Kconfig file, so Kconfig no longer gets confused by it.
>
> For consistency, all three architectures that support ACPI now
> select ARCH_SUPPORTS_ACPI in exactly the configuration in which
> they allow it. We still need the 'default x86', as each one
> wants a different default: default-y on x86, default-n on arm64,
> and always-y on ia64.
>
> Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> v2: use 'select ARCH_SUPPORTS_ACPI' for all three.

LGTM

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>  arch/arm64/Kconfig   | 1 +
>  arch/ia64/Kconfig    | 1 +
>  arch/x86/Kconfig     | 1 +
>  drivers/acpi/Kconfig | 8 +++++---
>  4 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index cdcaa6a798b2..2f987a938405 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -1267,6 +1267,7 @@ config EFI
>         bool "UEFI runtime support"
>         depends on OF && !CPU_BIG_ENDIAN
>         depends on KERNEL_MODE_NEON
> +       select ARCH_SUPPORTS_ACPI
>         select LIBFDT
>         select UCS2_STRING
>         select EFI_PARAMS_FROM_FDT
> diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> index ff861420b8f5..02eb68d5d1c0 100644
> --- a/arch/ia64/Kconfig
> +++ b/arch/ia64/Kconfig
> @@ -16,6 +16,7 @@ config IA64
>         select ARCH_MIGHT_HAVE_PC_SERIO
>         select PCI if (!IA64_HP_SIM)
>         select ACPI if (!IA64_HP_SIM)
> +       select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM)
>         select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
>         select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
>         select HAVE_UNSTABLE_SCHED_CLOCK
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 088b719bc5d1..442575220708 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -76,6 +76,7 @@ config X86
>         select ARCH_MIGHT_HAVE_ACPI_PDC         if ACPI
>         select ARCH_MIGHT_HAVE_PC_PARPORT
>         select ARCH_MIGHT_HAVE_PC_SERIO
> +       select ARCH_SUPPORTS_ACPI
>         select ARCH_SUPPORTS_ATOMIC_RMW
>         select ARCH_SUPPORTS_NUMA_BALANCING     if X86_64
>         select ARCH_USE_BUILTIN_BSWAP
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index a8da730fabc6..1edca05ee0ae 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -5,11 +5,10 @@
>
>  menuconfig ACPI
>         bool "ACPI (Advanced Configuration and Power Interface) Support"
> -       depends on !IA64_HP_SIM
> -       depends on IA64 || X86 || (ARM64 && EFI)
> +       depends on ARCH_SUPPORTS_ACPI
>         depends on PCI
>         select PNP
> -       default y if (IA64 || X86)
> +       default y if X86
>         help
>           Advanced Configuration and Power Interface (ACPI) support for
>           Linux requires an ACPI-compliant platform (hardware/firmware),
> @@ -41,6 +40,9 @@ menuconfig ACPI
>           <http://www.acpi.info>
>           <http://www.uefi.org/acpi/specs>
>
> +config ARCH_SUPPORTS_ACPI
> +       bool
> +
>  if ACPI
>
>  config ACPI_LEGACY_TABLES_LOOKUP
> --
> 2.18.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] [SUBMITTED 20180724] arm64: fix ACPI dependencies

[Will Deacon]

On Tue, Jul 24, 2018 at 11:54:25AM +0200, Rafael J. Wysocki wrote:
> On Tue, Jul 24, 2018 at 11:48 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > Kconfig reports a warning on x86 builds after the ARM64 dependency
> > was added.
> >
> > drivers/acpi/Kconfig:6:error: recursive dependency detected!
> > drivers/acpi/Kconfig:6:       symbol ACPI depends on EFI
> >
> > This rephrases the dependency to keep the ARM64 details out of the
> > shared Kconfig file, so Kconfig no longer gets confused by it.
> >
> > For consistency, all three architectures that support ACPI now
> > select ARCH_SUPPORTS_ACPI in exactly the configuration in which
> > they allow it. We still need the 'default x86', as each one
> > wants a different default: default-y on x86, default-n on arm64,
> > and always-y on ia64.
> >
> > Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > v2: use 'select ARCH_SUPPORTS_ACPI' for all three.
> 
> LGTM
> 
> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Same here:

Acked-by: Will Deacon <will.deacon@arm.com>

Would it be ok if I take this via the arm64 tree, since that's where the
warning was introduced?

Will

Re: [PATCH] [SUBMITTED 20180724] arm64: fix ACPI dependencies

[Rafael J. Wysocki]

On Tue, Jul 24, 2018 at 12:21 PM, Will Deacon <will.deacon@arm.com> wrote:
> On Tue, Jul 24, 2018 at 11:54:25AM +0200, Rafael J. Wysocki wrote:
>> On Tue, Jul 24, 2018 at 11:48 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> > Kconfig reports a warning on x86 builds after the ARM64 dependency
>> > was added.
>> >
>> > drivers/acpi/Kconfig:6:error: recursive dependency detected!
>> > drivers/acpi/Kconfig:6:       symbol ACPI depends on EFI
>> >
>> > This rephrases the dependency to keep the ARM64 details out of the
>> > shared Kconfig file, so Kconfig no longer gets confused by it.
>> >
>> > For consistency, all three architectures that support ACPI now
>> > select ARCH_SUPPORTS_ACPI in exactly the configuration in which
>> > they allow it. We still need the 'default x86', as each one
>> > wants a different default: default-y on x86, default-n on arm64,
>> > and always-y on ia64.
>> >
>> > Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64")
>> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> > ---
>> > v2: use 'select ARCH_SUPPORTS_ACPI' for all three.
>>
>> LGTM
>>
>> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Same here:
>
> Acked-by: Will Deacon <will.deacon@arm.com>
>
> Would it be ok if I take this via the arm64 tree, since that's where the
> warning was introduced?

Yes, it would, from the ACPI side.

Re: [PATCH] [SUBMITTED 20180724] arm64: fix ACPI dependencies

[Will Deacon]

On Tue, Jul 24, 2018 at 12:23:48PM +0200, Rafael J. Wysocki wrote:
> On Tue, Jul 24, 2018 at 12:21 PM, Will Deacon <will.deacon@arm.com> wrote:
> > On Tue, Jul 24, 2018 at 11:54:25AM +0200, Rafael J. Wysocki wrote:
> >> On Tue, Jul 24, 2018 at 11:48 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> >> > Kconfig reports a warning on x86 builds after the ARM64 dependency
> >> > was added.
> >> >
> >> > drivers/acpi/Kconfig:6:error: recursive dependency detected!
> >> > drivers/acpi/Kconfig:6:       symbol ACPI depends on EFI
> >> >
> >> > This rephrases the dependency to keep the ARM64 details out of the
> >> > shared Kconfig file, so Kconfig no longer gets confused by it.
> >> >
> >> > For consistency, all three architectures that support ACPI now
> >> > select ARCH_SUPPORTS_ACPI in exactly the configuration in which
> >> > they allow it. We still need the 'default x86', as each one
> >> > wants a different default: default-y on x86, default-n on arm64,
> >> > and always-y on ia64.
> >> >
> >> > Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64")
> >> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >> > ---
> >> > v2: use 'select ARCH_SUPPORTS_ACPI' for all three.
> >>
> >> LGTM
> >>
> >> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > Same here:
> >
> > Acked-by: Will Deacon <will.deacon@arm.com>
> >
> > Would it be ok if I take this via the arm64 tree, since that's where the
> > warning was introduced?
> 
> Yes, it would, from the ACPI side.

Ok, I'll stick this into next tomorrow pending any objections from the x86
maintainers.

Will