From patchwork Tue Jul 16 04:04:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 11045205 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 4F8D06C5 for ; Tue, 16 Jul 2019 04:04:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A5F328508 for ; Tue, 16 Jul 2019 04:04:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B67F28563; Tue, 16 Jul 2019 04:04:55 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B566228508 for ; Tue, 16 Jul 2019 04:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726506AbfGPEEy (ORCPT ); Tue, 16 Jul 2019 00:04:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:44114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726465AbfGPEEy (ORCPT ); Tue, 16 Jul 2019 00:04:54 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 013E420693; Tue, 16 Jul 2019 04:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563249893; bh=++dKw1lhK39CNSlaPfQ8Gyeqk+cayF8swOEw8Z7CrnY=; h=From:To:Cc:Subject:Date:From; b=t0t5BeCHM4C3Lfmt0dzv+pEsJ5EI11b9O5FBD/eGQ1sA/24H+h3lZnYU8Ob8ELmpw mKeg+yNLzvyGiq7K6N+N63kYGFGr/ZQnr1cT5UHtZyDoEczSx07FfNhYFUA6VuKXe1 n/+999HZed+RZqlwqRzBbfckAirxfkVVc50H+MzY= From: Sasha Levin To: marc.zyngier@arm.com, will.deacon@arm.com, julien.thierry@arm.com, catalin.marinas@arm.com Cc: okaya@kernel.org, linux-kernel@vger.kernel.org, linux-kernel@microsoft.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sasha Levin , stable@kernel.org Subject: [PATCH] ARM64/irqchip: Make ACPI_IORT depend on PCI again Date: Tue, 16 Jul 2019 00:04:41 -0400 Message-Id: <20190716040441.12101-1-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ACPI_IORT lost it's explicit dependency on PCI in c6bb8f89fa6df ("ARM64/irqchip: Update ACPI_IORT symbol selection logic") where the author has relied on the general dependency of ACPI on PCI. However, that dependency was finally removed in 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set") and now ACPI_IORT breaks when we try and build it without PCI support. This patch brings back the explicit dependency of ACPI_IORT on PCI. Fixes: 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set") Cc: stable@kernel.org Signed-off-by: Sasha Levin --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a36ff61321ce..d6d93027196b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -4,7 +4,7 @@ config ARM64 select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI select ACPI_GTDT if ACPI - select ACPI_IORT if ACPI + select ACPI_IORT if (ACPI && PCI) select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ACPI_MCFG if (ACPI && PCI) select ACPI_SPCR_TABLE if ACPI