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: 10541753 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E9D7112B for ; Tue, 24 Jul 2018 09:51:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BDAB28748 for ; Tue, 24 Jul 2018 09:51:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3338287AE; Tue, 24 Jul 2018 09:51:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A1DA228748 for ; Tue, 24 Jul 2018 09:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=cS+AeuxZqLzz59K0aMvQf+u9Y5raubL6+9hkBIgFDsc=; b=mQz Hfw8Xj1Q71nMbbcDTfRkjVw0g28Ghqadx7ER14IEbPjZGpgAB5Ofmoao5sJWszGS9XdQNTqWKuuFv 1B5N4TaliimWI57v0FbUhmG4IFyolTVkIV0BRS7ko2yNzxJlnfcE4sqNdyT2YxTbCbG/BCckh2Bhn 5oJgRaYawLO+31t7Dt1OgWaThePC0JsT9tl4bNAxSPqXqhlnVJmY+lLs9HNX6LwUpCBATyOzAzdCr ftWS3GeyOe6Q2bqCNH7jZ2k7/dbm0rmpWc+cmP4wdyiWE6ITNNyV5MTM0l1QjsW28QbbTeSaUt74Q 3CU8W2K9w8VZWXncjuRU+OUa6r28pwQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhty3-0003L8-Vc; Tue, 24 Jul 2018 09:50:55 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhty0-0003Jv-8G for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 09:50:54 +0000 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 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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180724_025052_591220_833431FA X-CRM114-Status: GOOD ( 13.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Fenghua Yu , Tony Luck , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, Arnd Bergmann , Ard Biesheuvel , Marc Zyngier , Catalin Marinas , x86@kernel.org, "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, AKASHI Takahiro , Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Len Brown MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Rafael J. Wysocki Acked-by: Will Deacon --- 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 +config ARCH_SUPPORTS_ACPI + bool + if ACPI config ACPI_LEGACY_TABLES_LOOKUP