From patchwork Tue Feb 14 21:42:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9572977 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3F53D60578 for ; Tue, 14 Feb 2017 21:44:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 313CD281E1 for ; Tue, 14 Feb 2017 21:44:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25762283F6; Tue, 14 Feb 2017 21:44:24 +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=-6.9 required=2.0 tests=BAYES_00,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 B07A3281E1 for ; Tue, 14 Feb 2017 21:44:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752896AbdBNVoW (ORCPT ); Tue, 14 Feb 2017 16:44:22 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:55618 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752589AbdBNVoV (ORCPT ); Tue, 14 Feb 2017 16:44:21 -0500 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LiCiR-1bzPzW3mrr-00nN0r; Tue, 14 Feb 2017 22:44:02 +0100 From: Arnd Bergmann To: Bjorn Helgaas Cc: Arnd Bergmann , David Daney , Rob Herring , Thomas Petazzoni , Tomasz Nowicki , Lorenzo Pieralisi , Christopher Covington , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: always build pci-host-common on ARM64 Date: Tue, 14 Feb 2017 22:42:56 +0100 Message-Id: <20170214214355.3101378-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:8SFDl9KXdsumA7bA4HXK74MLUBZTTh6Gk51dlGEeUMRfXZ24fdU wQvfdJ2JW3g/FPAPtTaYOvuL3D1pWiejtFJRZUpY/gE9XVHLt1SalZCyXThmF5tMDeviRTo A0NVFcQzaap7j6pvkJD8vRxRuzGNZrDGEbTqMn+v4KWPEcPSfRIXeyw0EzLF4Jg/3Z6KGf2 GNcJnYa1zhx1vnOb3Q9gQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZmHqrBVA890=:D6xGcAM7iYHzRwvfYpQ6o0 UDb0BySdDvB27Kw91DPckpdyEmQcvZrXoSUx7TBOW9sjHOOxd4ObQDdx9piZJn42eRIJym4OK d19VRomV1+bIph0ZhGmBPxlxaHvacoPcOyUdr7L0QZQYgcDkv7nd1btFq18ljPWsa+pVa+kHq mPOddTxvB8a8xT5VCrFQX/KMB0CLeYXDiT+H3ENdKix5TWOIa3qPyLTDb7jnJhWeA0iwu8VX/ aLxbAQ5rmE7PCUsdcLz8uT0Orhs26QkdEgTakkWrfr8nq02+GCDZ72wwI2/T0RzrfMcKLRa1Z OIogYb0PUq8dS+skBqkBPxkCxM9IHBMWU8UFzAwxUjJt6aoauuT3NOZVobzwNOdDfD4XQ33A/ 4HeHtT4CtG3efn79RriZqA4npjP2SoH1nvQhjZsoOpvYcFgyKeX3EGEV46zGItRfUi4AqNZw8 1uGBFkKSihtTU97VFuF3aSncj97Ofzv9GVqK7jNci61o0FTnGpiyCtrAixKkRomhNJA1dzTBq nIKuCAdg2hcW/WJ3tk9i0xcPf81ZJOuAyI9WRkS5dV3INDr+Hr4+zcjKKbvT/1ZShn1P+PTBX Tm28NSR1YkWAavCspbpM3PxbjRUzjoBAtULIgMToq0HWELfLq3wYVTtUeTpdACzwwjeqEo/Ep lruIvYaa7c2ktLJ0nSpaszitRauOPy4DoEcKZPZxmSrdF078IYtrX/8CCT8t6qP2O1Rw= Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Thunder PCI host driver is always built, but it relies on pci_host_common_probe, so we get a link error here: drivers/pci/host/pci-thunder-pem.c: In function 'thunder_pem_probe': drivers/pci/host/pci-thunder-pem.c:412:9: error: implicit declaration of function 'pci_host_common_probe';did you mean 'pci_host_bridge_priv'? [-Werror=implicit-function-declaration] This adds the common file to the existing hack. Fixes: ca5ab37b19df ("PCI: Explain ARM64 ACPI/MCFG quirk Kconfig and build strategy") Signed-off-by: Arnd Bergmann --- drivers/pci/host/Makefile | 2 +- include/linux/pci-ecam.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index bfe3179ae74c..e97d084f10ea 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -39,7 +39,7 @@ obj-$(CONFIG_VMD) += vmd.o # config options to be enabled, so we always build these drivers on # ARM64 and use internal ifdefs to only build the pieces we need # depending on whether ACPI, the DT driver, or both are enabled. - +obj-$(CONFIG_ARM64) += pci-host-common.o obj-$(CONFIG_ARM64) += pcie-hisi.o obj-$(CONFIG_ARM64) += pci-thunder-ecam.o obj-$(CONFIG_ARM64) += pci-thunder-pem.o diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h index f0d2b9451270..ab52692388d1 100644 --- a/include/linux/pci-ecam.h +++ b/include/linux/pci-ecam.h @@ -68,9 +68,8 @@ extern struct pci_ecam_ops xgene_v1_pcie_ecam_ops; /* APM X-Gene PCIe v1 */ extern struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */ #endif -#ifdef CONFIG_PCI_HOST_GENERIC /* for DT-based PCI controllers that support ECAM */ int pci_host_common_probe(struct platform_device *pdev, struct pci_ecam_ops *ops); -#endif + #endif