From patchwork Fri Apr 15 17:06: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: 611060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qmkYM2KVvz9sBX for ; Sat, 16 Apr 2016 03:09:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b=oY7aSIks; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753181AbcDORHk (ORCPT ); Fri, 15 Apr 2016 13:07:40 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:32952 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752537AbcDORHd (ORCPT ); Fri, 15 Apr 2016 13:07:33 -0400 Received: by mail-wm0-f52.google.com with SMTP id f198so10621513wme.0 for ; Fri, 15 Apr 2016 10:07:33 -0700 (PDT) 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=WLzNNUHN3P/dEg0Sr2hnedyjjwsT4iE2J/FOxaAAZ2g=; b=oY7aSIksOlCo7CtNmrQfoH+Z9lbZaj5QgLfAqMcviyIN3fBqnV9vfw6dUQ8z/04TD2 yrJQPecDK/fukHMU6wZCuQTdvj9JkoxFqKn91huSqYLOm+5wg5G9n+lXM67EVpVDhZVS zIQb1nxdZ8ZKh0JSvBvJyb5GgMIMd/ZuVeT0kkIV8T+C+w544TFEkjMMT7mJdhUAYOa0 taUbGn/eNkVo6Q+YTkLY6BOMEMXKkKBAfn9vU3mJj5B6krUf1z503p22q7zJ+ktSUJ71 UEp1O9eK8vEdqF+Rqjkdmc5uYYeWq0LvBATUJqgP3ps3tTCZ76UtZU5P9t7qMa6Vukh+ AQuQ== 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=WLzNNUHN3P/dEg0Sr2hnedyjjwsT4iE2J/FOxaAAZ2g=; b=cQG2Om+KZYDd58tLAxwX0mNmW13kXXLubqb4UkQoizV4mDuPhXe9oMkm53a73EB5mI b7opEFA8k2YIl2LQQrJlJ/zpyLR7EcmbaksQL+KhwregtoKDPae+dIWhMN10Eq+z3O+2 n7wh9XYM/AqBpCpQzMcSA99znB4qcmj5B8CwSR2Xs+e/KpNC85NgSztc20sOCrqLpJa3 ga7en53/mOnmEvxv/mFiVxpdWNsE8rxEZunBnJxN8TY3tdT1qfCYh8ls+rC4lIKGlRiz uyRd5lKYH3RXo+1wNNspwzqzzSjHkPqGBFMBQlppOGEpgXfw3HgbBCgLbSKXnCajwsEz kcxg== X-Gm-Message-State: AOPr4FXWWCvbGRBdelF2cAjeOcZXQvZ3THSAyizGhXXitYOc/+Hvo2JjFd1EMS8s9wqMfA== X-Received: by 10.28.23.70 with SMTP id 67mr5453541wmx.70.1460740052402; Fri, 15 Apr 2016 10:07:32 -0700 (PDT) Received: from tn-HP-4.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id gr4sm14282723wjd.23.2016.04.15.10.07.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Apr 2016 10:07:31 -0700 (PDT) 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 Cc: robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, 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, jcm@redhat.com, Tomasz Nowicki Subject: [PATCH V6 10/13] arm64, pci, acpi: Start using ACPI based PCI host controller driver for ARM64. Date: Fri, 15 Apr 2016 19:06:45 +0200 Message-Id: <1460740008-19489-11-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460740008-19489-1-git-send-email-tn@semihalf.com> References: <1460740008-19489-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 It is perfectly fine to use ACPI_PCI_HOST_GENERIC for ARM64, so lets get rid of PCI init and RAW ACPI accessor empty stubs 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 --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/pci.c | 24 ------------------------ 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4f43622..1bded87 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 15109c11..9a8e6f7 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -63,27 +63,3 @@ int pcibios_alloc_irq(struct pci_dev *dev) return 0; } - -/* - * raw_pci_read/write - Platform-specific PCI config space access. - */ -int raw_pci_read(unsigned int domain, unsigned int bus, - unsigned int devfn, int reg, int len, u32 *val) -{ - return -ENXIO; -} - -int raw_pci_write(unsigned int domain, unsigned int bus, - unsigned int devfn, int reg, int len, u32 val) -{ - return -ENXIO; -} - -#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