Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

arm64: fix ACPI dependencies

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")
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Arnd Bergmann 7 years ago
parent
b965746306
commit
2c870e6113
4 changed files with 8 additions and 3 deletions
Unified View Show Diff Stats
  1. 1 0
      arch/arm64/Kconfig
  2. 1 0
      arch/ia64/Kconfig
  3. 1 0
      arch/x86/Kconfig
  4. 5 3
      drivers/acpi/Kconfig

+ 1 - 0
arch/arm64/Kconfig
View File 

@@ -1262,6 +1262,7 @@ config EFI
 
 	bool "UEFI runtime support"
 
 	bool "UEFI runtime support"
 
 	depends on OF && !CPU_BIG_ENDIAN
 
 	depends on OF && !CPU_BIG_ENDIAN
 
 	depends on KERNEL_MODE_NEON
 
 	depends on KERNEL_MODE_NEON
 
+	select ARCH_SUPPORTS_ACPI
 
 	select LIBFDT
 
 	select LIBFDT
 
 	select UCS2_STRING
 
 	select UCS2_STRING
 
 	select EFI_PARAMS_FROM_FDT
 
 	select EFI_PARAMS_FROM_FDT

+ 1 - 0
arch/ia64/Kconfig
View File 

@@ -16,6 +16,7 @@ config IA64
 
 	select ARCH_MIGHT_HAVE_PC_SERIO
 
 	select ARCH_MIGHT_HAVE_PC_SERIO
 
 	select PCI if (!IA64_HP_SIM)
 
 	select PCI if (!IA64_HP_SIM)
 
 	select ACPI 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 ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
 
 	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
 
 	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
 
 	select HAVE_UNSTABLE_SCHED_CLOCK
 
 	select HAVE_UNSTABLE_SCHED_CLOCK

+ 1 - 0
arch/x86/Kconfig
View File 

@@ -75,6 +75,7 @@ config X86
 
 	select ARCH_MIGHT_HAVE_ACPI_PDC		if ACPI
 
 	select ARCH_MIGHT_HAVE_ACPI_PDC		if ACPI
 
 	select ARCH_MIGHT_HAVE_PC_PARPORT
 
 	select ARCH_MIGHT_HAVE_PC_PARPORT
 
 	select ARCH_MIGHT_HAVE_PC_SERIO
 
 	select ARCH_MIGHT_HAVE_PC_SERIO
 
+	select ARCH_SUPPORTS_ACPI
 
 	select ARCH_SUPPORTS_ATOMIC_RMW
 
 	select ARCH_SUPPORTS_ATOMIC_RMW
 
 	select ARCH_SUPPORTS_NUMA_BALANCING	if X86_64
 
 	select ARCH_SUPPORTS_NUMA_BALANCING	if X86_64
 
 	select ARCH_USE_BUILTIN_BSWAP
 
 	select ARCH_USE_BUILTIN_BSWAP

+ 5 - 3
drivers/acpi/Kconfig
View File 

@@ -5,11 +5,10 @@
 
 
 
 menuconfig ACPI
 
 menuconfig ACPI
 
 	bool "ACPI (Advanced Configuration and Power Interface) Support"
 
 	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
 
 	depends on PCI
 
 	select PNP
 
 	select PNP
 
-	default y if (IA64 || X86)
 
+	default y if X86
 
 	help
 
 	help
 
 	  Advanced Configuration and Power Interface (ACPI) support for 
 	  Advanced Configuration and Power Interface (ACPI) support for 
 	  Linux requires an ACPI-compliant platform (hardware/firmware),
 
 	  Linux requires an ACPI-compliant platform (hardware/firmware),
 
@@ -41,6 +40,9 @@ menuconfig ACPI
 
 	  <http://www.acpi.info>
 
 	  <http://www.acpi.info>
 
 	  <http://www.uefi.org/acpi/specs>
 
 	  <http://www.uefi.org/acpi/specs>
 
 
 
+config ARCH_SUPPORTS_ACPI
 
+	bool
 
+
 
 if ACPI
 
 if ACPI
 
 
 
 config ACPI_LEGACY_TABLES_LOOKUP
 
 config ACPI_LEGACY_TABLES_LOOKUP