From patchwork Wed Dec 16 15:16:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 7862341 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DE0C49F1C2 for ; Wed, 16 Dec 2015 15:18:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AC822035E for ; Wed, 16 Dec 2015 15:18:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DF4220396 for ; Wed, 16 Dec 2015 15:18:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965865AbbLPPSZ (ORCPT ); Wed, 16 Dec 2015 10:18:25 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:34676 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965898AbbLPPSW (ORCPT ); Wed, 16 Dec 2015 10:18:22 -0500 Received: by mail-wm0-f51.google.com with SMTP id l126so44190163wml.1 for ; Wed, 16 Dec 2015 07:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lGobGqtyvnSzJsyQvPEKcXwVd0CN86eVcKmVQRcBgOM=; b=FmpgRcX4QjQR6sxdOvHNKdLjFkEqoT/1r6hQKkvtwkZ7BePQoCnsON4X2uFy0Lj6Qo yItXOir2ZWq2UlbZ93Sdb8qMMqUfERntuSfKDhwbjPbWJ4tWPONfcbnhuLxCo7LGT/LS 7ZcFYWf8SDBiUmtO+EBvGN5n5LUiBlznS5v1Oqk+LnywJLAnfJl245y6AQRIcp4Y6nvN 36LACjVVjO/488n4RCqhQGDzkXYLk0wXXQEXP4/q4mecZaAY0Zhs6RACtJVlCIutXhYa etBXXs8Drsp8dQ94uc4vf1Mbj9Kc99q1iYlR4cE38Ls3Xa/6thxaDryHkekSaatuJg6T 6jLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lGobGqtyvnSzJsyQvPEKcXwVd0CN86eVcKmVQRcBgOM=; b=A2zojXpmU2qhnWB1l0T6+X7m+wLwzcqRB6gWf3WbzmQJH1BhJv6MDQahyj4GbC4XnF 0J+Oa0GiEoJpO/Hgb4TLzmkRU6drVuFAAf8enw8ViSfWegcjUqT79ozB0Yf8dKa60XYJ RgppF/ZDCo3NiRSAlbDrrwjVvvq58bO6X2s1B2rSyZ5o1fLftdIyQmhgfge7L2/1VxGD k0kILQl3+dHlyFJ6f6ed8UIN2sSd2Y3ZgeSJ7s0kRHqXNmO+xQxMLKE91CjiBVxzHQrM uRUeXg/mPwevXqPGo+siodKdnHTkz885uvhU04WZDHMC6FC7wCBGedXaNPlQ+FIeYyf5 foZw== X-Gm-Message-State: ALoCoQkXD6qasQeNJT2ILVDtijuvE8zKB5txbwZiaIBB+v0GgpDKcyO8dWPcwL6CGCPbQcxk7XpbL/18MTfSLexSeKs0aKB0EA== X-Received: by 10.194.11.66 with SMTP id o2mr25232385wjb.103.1450279100930; Wed, 16 Dec 2015 07:18:20 -0800 (PST) Received: from tn-HP-4.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id z17sm6438761wjq.1.2015.12.16.07.18.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:18:20 -0800 (PST) From: Tomasz Nowicki To: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jiang.liu@linux.intel.com, Stefano.Stabellini@eu.citrix.com Cc: robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, tglx@linutronix.de, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, jchandra@broadcom.com, jcm@redhat.com, Tomasz Nowicki Subject: [PATCH V2 23/23] arm64, pci, acpi: Start using ACPI based PCI host bridge driver for ARM64. Date: Wed, 16 Dec 2015 16:16:33 +0100 Message-Id: <1450278993-12664-24-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450278993-12664-1-git-send-email-tn@semihalf.com> References: <1450278993-12664-1-git-send-email-tn@semihalf.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Lets get rid of empty PCI init stub, related ACPI header and go with full-blown PCI host bridge driver. Signed-off-by: Tomasz Nowicki CC: Arnd Bergmann CC: Catalin Marinas CC: Liviu Dudau CC: Lorenzo Pieralisi CC: Will Deacon --- arch/arm64/Kconfig | 4 ++++ arch/arm64/kernel/pci.c | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d65d315..71032ed 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -86,6 +86,7 @@ config ARM64 select OF_EARLY_FLATTREE select OF_RESERVED_MEM select PERF_USE_VMALLOC + select PCI_HOST_GENERIC_ACPI if ACPI select POWER_RESET select POWER_SUPPLY select RTC_LIB @@ -213,6 +214,9 @@ config PCI_MMCONFIG select PCI_ECAM depends on ACPI +config ARCH_PCI_HOST_GENERIC_ACPI + def_bool ACPI + endmenu menu "Kernel Features" diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index f7948f5..e9cf58b 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -10,7 +10,6 @@ * */ -#include #include #include #include @@ -50,12 +49,3 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) return pci_enable_resources(dev, mask); } - -#ifdef CONFIG_ACPI -/* Root bridge scanning */ -struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) -{ - /* TODO: Should be revisited when implementing PCI on ACPI */ - return NULL; -} -#endif