From patchwork Tue Feb 16 13:53:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 8326381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C169C02AA for ; Tue, 16 Feb 2016 14:02:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E3782026D for ; Tue, 16 Feb 2016 14:02:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B28AF202A1 for ; Tue, 16 Feb 2016 14:02:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVgAv-0000it-IV; Tue, 16 Feb 2016 14:00:21 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVg5T-0002F2-46 for linux-arm-kernel@lists.infradead.org; Tue, 16 Feb 2016 13:54:46 +0000 Received: by mail-wm0-x231.google.com with SMTP id a4so101181984wme.1 for ; Tue, 16 Feb 2016 05:54:22 -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=ifi46dF6ShlNyyKMwhRwCNK+APdTY+7dGl5zEJGdFCM=; b=oMKw1M8Z/FEC7jqjhW2c9Uc0lXPYjoN+a8tbBv+V8fTetqqJm0+hoMD7ILjfMUCLCQ FfgcSGrRV/Af7qk91qT2mfMBq/oiYnSUNTZslH1RfeU3mvnHVbGguWtQIWyHXfrj9tNB WB1t2F+7RBtesrVU0EJazWq1HNzoNIAA6L4KSAbfieq2TYOlTHBdLSn5SYwzJ1I6y+iK kFK5ADepxa0snIKpi925bmkCtbiigmJoD44ffKpTKDIMksTos+cumoQhoSyfFNoI+tQw EczzPyO5h1bvx5h0l4fUNCxMKgkmQi2ok0cJnNCNmauEPZjyWRVxCIFPRkDwL8ZXAqxK E3sA== 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=ifi46dF6ShlNyyKMwhRwCNK+APdTY+7dGl5zEJGdFCM=; b=BFPh0veTKjWITPM+apyHSXJ9bXMBpcc9BRQTveHpfivsbOrtuB8UpL5H7+ZT8SLWAj nSRB0Jgi1gxr6Z4TmeFmBANb/R5BR7xzu4Fk1zLO6QU2dM5jB+BQsIrWP0II7reNvx5N zjwEQ10nJ7Ng9vX0y3/N+r4rxo0aOnU/8vjUaJDL0kbgK70vEMMuyo2YiD4JyP3PhWQa /2Sb5x+Cq0grsbM8o5Y8RZM2q7lOrK/CRsujo+DW4J/GZxfXyCvzK2lFR78lTLVlsCcP d4FIBcz9bBF6VZrGxzrNNdj6uB7LYCcJ6sIxJ07FNmK9lgRkMPsE7KwsrhFCpE18chAq 4YJA== X-Gm-Message-State: AG10YOTrx9ZSEf2wQP0xoGF0GkQJrZ+tWmenPZXvNbuFcTdYtHv33gs5D0YTHBoEQ/523Q== X-Received: by 10.28.182.136 with SMTP id g130mr19628478wmf.10.1455630861446; Tue, 16 Feb 2016 05:54:21 -0800 (PST) Received: from tn-HP-4.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id q129sm20833462wmd.14.2016.02.16.05.54.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Feb 2016 05:54:20 -0800 (PST) From: Tomasz Nowicki To: helgaas@kernel.org, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rafael@kernel.org, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jiang.liu@linux.intel.com, jchandra@broadcom.com, Stefano.Stabellini@eu.citrix.com Subject: [PATCH V5 15/15] arm64, pci, acpi: Start using ACPI based PCI host bridge driver for ARM64. Date: Tue, 16 Feb 2016 14:53:45 +0100 Message-Id: <1455630825-27253-16-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455630825-27253-1-git-send-email-tn@semihalf.com> References: <1455630825-27253-1-git-send-email-tn@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160216_055443_545245_FD700D2D X-CRM114-Status: GOOD ( 11.00 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcm@redhat.com, linaro-acpi@lists.linaro.org, linux-pci@vger.kernel.org, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, robert.richter@caviumnetworks.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, wangyijing@huawei.com, Tomasz Nowicki , mw@semihalf.com, 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 It is perfectly fine to use ACPI_PCI_HOST_GENERIC for ARM64, so lets get rid of PCI init empty stub, related ACPI header and go with full-blown PCI host controller driver. Signed-off-by: Tomasz Nowicki TO: Catalin Marinas TO: Lorenzo Pieralisi TO: Will Deacon TO: Arnd Bergmann CC: Liviu Dudau Tested-by: Duc Dang Tested-by: Dongdong Liu Tested-by: Hanjun Guo Tested-by: Graeme Gregory Tested-by: Sinan Kaya --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/pci.c | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 552e996..09c49ea 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -2,6 +2,7 @@ config ARM64 def_bool y select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI + select ACPI_PCI_HOST_GENERIC if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index 6e77e1b..1de0168 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -65,12 +65,3 @@ int pcibios_alloc_irq(struct pci_dev *dev) return 0; } - -#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