From patchwork Tue Jul 24 09:33:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10541729 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 A23461805 for ; Tue, 24 Jul 2018 09:34:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86CF12867F for ; Tue, 24 Jul 2018 09:34:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B048286AE; Tue, 24 Jul 2018 09:34:15 +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=ham 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 14E2C2867F for ; Tue, 24 Jul 2018 09:34:14 +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=446eLQ+5sq6maTcrDxZe2mjq7r4sAmJniXLuZNl41No=; b=e8S sbzgyaABDX2cuIblZdu3zfeBdyiw8d0rWhptWg80796cPmWTdpO0mc5mdOwhujA1iV/tHn4GmdV8S Hle+aXTBZKlbFSmBxVcYX0cJoMtBa5780PvYOcqiDM7zVx5W1Pj8rK+3BGaRSI7gV/1v7hWzJELuA JimBHnUbJRRMT+v2L+yneHCdYPDH49urDJJgmZ7iWeN10v0kYxTkYgPRrHmNOZvJowf1M8ZpOo6Ev kd5EBw6TMmxlzK2ufpbKZahgcsqkRslHHMsUDISDxZGW8kiFnlZy/TNVmRGOLNBwfEge+yRK0+z/y 0MWcjENmFx8L+B0JgJvDSt0b2uAhdCQ==; 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 1fhths-0001dd-A6; Tue, 24 Jul 2018 09:34:12 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhtho-0001XB-Q1 for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 09:34:10 +0000 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LiKeS-1gI4Sh1oz6-00cepX; Tue, 24 Jul 2018 11:33:51 +0200 From: Arnd Bergmann To: Catalin Marinas , Will Deacon , "Rafael J. Wysocki" , Len Brown Subject: [PATCH] arm64: fix ACPI dependencies Date: Tue, 24 Jul 2018 11:33:17 +0200 Message-Id: <20180724093345.1575921-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:lxUzFc7sR6yJC32kpT3pWzkuxp+Kyt5K+PKKQcF8zJ5bA6wpgPH YQOM/DtKd7TApN0sZvpeUx564o91EBzKfX2e0wv5xGp8sHOZmjWEgpa8WuWhfeDoYUoEemm iwAZwEXquUeKlmN75RjaxgrFaUzeI3dUqEsygWSWIqIX9Fnmr3jWR9r8HV1RD9k8KP1RSEQ UufECWIYrtqFs5d04ffpw== X-UI-Out-Filterresults: notjunk:1;V01:K0:EZq7+gkXU30=:lu94alJQnJCA9XUAxdZwxY 3nBvpbJ3HHNauWUjem7I2PPrkeJnMWcFK0BMewO2bgldh2EML7b6OlaStlM/HS0NepNs0v7o3 qV7nP6xkbID/S1JBMr4cereschpIW72UVeWf1xn8N/p6OL5QC3PKpf74MitoryPbifWPDg8tX X2tbnq0IMOlAAkSKD6jQT7rCf7JE/9JJRrKqJx/lAF/JJauSOabr9iCQkQycipfRwYmWlCtlm yU1+6d3N0vVbQwF7MLvbPULqXHukQaQgV6cIB/a75jqc+sTnZbSZslJA5NUZWFG6yeKKx/UvB KW63rnnawIXutkWH9iI55ODQN7KA+LAuNFKm3xFZxH5Ly5Ywhud/U4yyofLAUt4UbkqqIs3tQ EJ/s2VH7QuUhP4Al18TcVw21qW+zY3GY2CKcATbnt6ltOdhbRI/JISzxFNrwrnp70ter6tlsG ojFbd+JnPDrUZiIa9Ch47Te/DEXd+mKUsHD8P1EIz0+JptJr/9PEJTxr/49PD3uNk5MGpABBR f+zGAfrVI6+oWaLQuHiTjt7AbWCewK6wBtcZW7Es+2JRMtw1eZuu9yf/+CYjVXQH1xmsDnrzG Ho/OVdVZB9DEe/lOyLvlwPyWuw/eiZvDMXs8bOh7bT2SCHdFZ0CheZLlWLi15FDYGykQjEr6v ZS7WzyHPlk8aQI045DdeP0LVemiwQX8okul9J6CwB4ErEufcOtuOz9Wt9T1yYShmDTfw= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180724_023409_145695_4B26C5E0 X-CRM114-Status: GOOD ( 12.50 ) 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 , linux-acpi@vger.kernel.org, Arnd Bergmann , Ard Biesheuvel , Marc Zyngier , linux-kernel@vger.kernel.org, AKASHI Takahiro , linux-arm-kernel@lists.infradead.org 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. Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64") Signed-off-by: Arnd Bergmann --- arch/arm64/Kconfig | 1 + drivers/acpi/Kconfig | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) 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/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index a8da730fabc6..0cda51c5d433 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -6,7 +6,7 @@ menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on !IA64_HP_SIM - depends on IA64 || X86 || (ARM64 && EFI) + depends on IA64 || X86 || ARCH_SUPPORTS_ACPI depends on PCI select PNP default y if (IA64 || X86) @@ -41,6 +41,9 @@ menuconfig ACPI +config ARCH_SUPPORTS_ACPI + bool + if ACPI config ACPI_LEGACY_TABLES_LOOKUP