From patchwork Tue Jul 24 09:48:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 142748 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp7062928ljj; Tue, 24 Jul 2018 02:50:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfNiYarjIz89Syp6c6SNZ0Siv5SE3Ov8V/bAEVvQbo6Sm6kM56fSQjr3kBgZV/i/OK+xp5E X-Received: by 2002:a63:4703:: with SMTP id u3-v6mr15080955pga.405.1532425859452; Tue, 24 Jul 2018 02:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532425859; cv=none; d=google.com; s=arc-20160816; b=g8EY4Wxv3VFKoXNJvuet25HVqErpnb39qF4vWYc2IePxC+VgYrpKYk9+rqHdF4+oLt ylNkk8COlWtGX+u9WxaJLV+2tD7Un00FDqwr1wTED73T4aEbX0DPFE24H9+Rzk+wndXB VIoB4NNnGzvla8aRQlbj2SjkIUT4GBWSNvls+riDveQ3y1TwHn98A3SKBXvkMkNR3Kym T8uIXgfYzOg8tv8iirmZUaGrWSzdbEe+fumyVY1bfbUX/b3wEDD+ae5OsUzatSr9fBKy oiS1fZMfZ0sdVaXw1LHD+tVHEMdi2l7qARR6FOr6VpdAG/rqGjhrVaDYetPrGFFDopJ7 ABoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=9CvuIiINpY5SsG2IxwDYF1lJQuuCk7NYmyCOjtfQhFM=; b=JJQF/rC4dMfE2kk6FUrH0Ut+3Vibhlw46eyb+7/PdRG5Xght2E2vMxUdWekAwoWNg6 Tv5cd4I3JsNgk7Fvk3uvtJPR94zKi5ZuMfOqYw0fkur+mvwZdAC1Mo2/dJf5ZreHzFud AfdUxEqev0/OsdA/pyKL3l46uzrTY8XX5j34qjWRlTJaIHOG+Pw63jfbBV+8SWx/18+H H/OoVIOhVKsofIfMEmI2LrXFV4Vc483KSyRHIFKw6xaOP6odCeusnFg7zXBDcvb4grJ7 tM9S15x6wJkYx6kE5hAqVnNkVusq+2YzWtwfrs3beUrRrBBMFwFe83azQJwWRqsQVXb7 EGbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l1-v6si11553792pfd.139.2018.07.24.02.50.59; Tue, 24 Jul 2018 02:50:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726479AbeGXK4g (ORCPT + 9 others); Tue, 24 Jul 2018 06:56:36 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:41720 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726457AbeGXK4g (ORCPT ); Tue, 24 Jul 2018 06:56:36 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MbtgI-1fOZqu1l6U-00JH3X; Tue, 24 Jul 2018 11:50:02 +0200 From: Arnd Bergmann To: Will Deacon Cc: AKASHI Takahiro , Ard Biesheuvel , Arnd Bergmann , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Mark Rutland , Marc Zyngier , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH] [SUBMITTED 20180724] arm64: fix ACPI dependencies Date: Tue, 24 Jul 2018 11:48:45 +0200 Message-Id: <20180724094957.1967541-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:yfLeV5ksPZGStHZPAZnTLlx/uNVqewNHwK+Q0iYxCKPZallPThV 7GacXVPYOVy1Ck+ef4m7MgnZ/VllpZrdugDgFWgGHjL60uOBci0p3RbDkfUjvqwJ+Sk23nD 2r4uVYTIBtGrC2nu1VLeK88ynJ58c+JT9fnUsx+bE+DuJuE5rI2WXG20h/V8rFPP1cSZ/bK hymY+8fSIn8oLJv9vEUiA== X-UI-Out-Filterresults: notjunk:1; V01:K0:nWCLyOBv998=:n4eks7N3+ELf/E9vKhWJW5 2YuMQj0uyPrqWBn7nj3Huis5RFuc+nAcEA2nbaoSnVa2amYK0oc2RPD1fQKVP+9AOOEknOwQ0 EqIAULhkYVKjNlqDPdIhowPyvwGOiZYJX+llaZBhaceFtIEOjsUZFgXbuzFnj7HNNkPX4VfxN pBDGEYA3HhjYJBhB8FhERFENXeQ3cTOplJoa76h2rViQtOdXpMtBEL+fqDxXsdLOK525Z3iW1 GTGD657Bz8hrufJngRnlL18C9kCxOQ0Cn5M4dXLFwCniGwe6Nd4Veb/tFEcF5X+Wt2bCJnGGc E7LVz2K+34g5IztomsDzIvG47tQD5OmTZ+r72WR5S29/8h2QLRhAWOJKjkG9GsdcZEVFbCbyl pOWSBeXaJ7CBC7cg8ECNSOdEEXg13FSakbAZDMjExCgzwOuxqpbRCrTaQOCLdRE9gsR7Q9Wod AjOCO0lLW1Sgx0aIEI/QOFQ4QYK2ZjXvKPAAqrFotWmohom6YeRGLVLFSoad3QiJzM0UuNlqN FkJoPr/CNzCA3KOovZ0gHC8fY/3yNs5+MLA1LWPWNh0sNuQ+xPErqzjtoj8PHBQm0J4ky3Cn2 8tzM5As8JZGBA7BLGpSSNWrg/ZPOVO9Mdsh/6pPgNGlEnZEBF3p2FH/SHlja6y9/mt007f3Ix 6hDmkvT4CckpXp+Pt8C9v89exq4cNIBYnGvK9/jpy7nni4jyPIkH06wBkqvmG7okkd8Q= Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- 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(-) -- 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 Reviewed-by: Rafael J. Wysocki Acked-by: Will Deacon 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 +config ARCH_SUPPORTS_ACPI + bool + if ACPI config ACPI_LEGACY_TABLES_LOOKUP