From patchwork Tue May 10 15:20:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 620694 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 3r42zn2PnFz9t3n for ; Wed, 11 May 2016 01:22:13 +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=TO5ihtJP; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752018AbcEJPVk (ORCPT ); Tue, 10 May 2016 11:21:40 -0400 Received: from mail-lf0-f53.google.com ([209.85.215.53]:34594 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826AbcEJPUT (ORCPT ); Tue, 10 May 2016 11:20:19 -0400 Received: by mail-lf0-f53.google.com with SMTP id m64so18780947lfd.1 for ; Tue, 10 May 2016 08:20:18 -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=yZ4JIL4Uic8dOTI7UEnVgwY7vYJ05BbEeQB6Ht2kHe8=; b=TO5ihtJPYby7lhwua0czfqIYt5sWnh+2dW+oVTZLtllRzxot6ZZWWyL6kfolmu/fKr gswFi0lWNkP2Fi4EW3YjdayKnNSMz/E57EZj5ZymKMZxoLwJ7eJKt4JIcLl74DdSd4eh 63qbp5Io+hS+CU8XUuFjdbGmhwmkb8lyebvdE0UXkpNlrzNWEADZbjgYWmCF1mBKQSkP 8YPnsBvPqOSsH0gcPE/EBSVO1RNosARNHQMCPq7nQ/hR24Epg8WSg/XRmrCdbiEAFvot /7aaGdwEqnGu9YqaCw3EiUyda8NLT8xpzDyVvPm1EOiukg7v/g/Xg1AsnkmeUpMl66Py IFKA== 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=yZ4JIL4Uic8dOTI7UEnVgwY7vYJ05BbEeQB6Ht2kHe8=; b=lU1o6W/28IPRy7UMkHoiFbpRTucupcpNKtXNXs4FB3HDbrYcajoBBSX03c2vRpLAcu TbDH0mBhgespFvZ1KdrDsgVcjqrTtg+IU1p3lOP4crDv4fRRkuFX94wWmRsX1mLdUFEj kgMjZZoqJgxtTNmPx9rz3KNlM4LfVrdP5rYfp9jxiaJgREKR++YANZwMmhYCWEqfekmj ITNHfOACtG9znOQ/OYCuJWsnRmzZq5IsIfgQWNYuX9JKzivCeZZqLaaezDEGS6q/aGjr 3T0icoau3ZV3ZEvNqmGeBSMTHTq9cV07vX7W/2Md/8hK+KASyGHsPuarDUgLrx6UCJg+ nujA== X-Gm-Message-State: AOPr4FV9JX1wrogFU3sUvkneT/9VusllLKvmM3oT6dbMXcRwGqBviDaDeV5rkU5dax35sQ== X-Received: by 10.112.161.41 with SMTP id xp9mr16904919lbb.133.1462893617741; Tue, 10 May 2016 08:20:17 -0700 (PDT) Received: from tn-HP-4.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id s194sm468002lfs.40.2016.05.10.08.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 08:20:16 -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, 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, andrea.gallo@linaro.org, dhdang@apm.com, jeremy.linton@arm.com, liudongdong3@huawei.com, cov@codeaurora.org, Tomasz Nowicki Subject: [PATCH V7 11/11] arm64, pci, acpi: Start using ACPI based PCI host controller driver for ARM64. Date: Tue, 10 May 2016 17:20:01 +0200 Message-Id: <1462893601-8937-12-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462893601-8937-1-git-send-email-tn@semihalf.com> References: <1462893601-8937-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 --- 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 eeec5f6..e484c91 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -74,27 +74,3 @@ void pcibios_remove_bus(struct pci_bus *bus) { acpi_pci_remove_bus(bus); } - -/* - * 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