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: 8853221 Return-Path: X-Original-To: patchwork-linux-arm@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 95A939F36E for ; Fri, 15 Apr 2016 17:13:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA7E1203B4 for ; Fri, 15 Apr 2016 17:13:45 +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 CAC5820377 for ; Fri, 15 Apr 2016 17:13:44 +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 1ar7HP-0007zl-7a; Fri, 15 Apr 2016 17:11:39 +0000 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ar7Dm-0003Yj-1c for linux-arm-kernel@lists.infradead.org; Fri, 15 Apr 2016 17:07:56 +0000 Received: by mail-wm0-x232.google.com with SMTP id n3so41533755wmn.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=a4WcYdCao1b4YY5OuOPH+77VJQVRph8JmXrNH8poz2yNznaFc7vIo3FilX5Pfjgj0k 0LazHv1i/gAiBT8hBum9jiWd9jUgN2vbk41fCqURIQkZOg0JvPgYsRbo+l9TwGm9dFnS eRd/l4SCk3sTLOJxEDPo25Ylc76OHpSVk6gnZoi1e7wOrAmbZ6cQJhlFTcXqS58RMg7E Whepe0VpFPmmxvfBBX6xAc/4Tviqy1zuf5wvMvkCVNbWkkEJNrxYbeYOGOTvFN7O5Be3 T23m/JQenfAYF2utaRXIr04USgHvNtzPKGDyULzMo8CBT7V60XN1dvd4nxJs8Nt24fSM G83Q== X-Gm-Message-State: AOPr4FUm7Qt64P6Lmjml+WO/aww9+7tb3eFys6dIilltjCKqGAJi0x0CAeWeh57At5Sdpg== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160415_100754_442270_606D1585 X-CRM114-Status: GOOD ( 11.28 ) 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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 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