From patchwork Tue Nov 15 09:14:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9429217 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F2E460484 for ; Tue, 15 Nov 2016 09:17:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27FF7287F8 for ; Tue, 15 Nov 2016 09:17:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1AA3D28806; Tue, 15 Nov 2016 09:17:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD141287ED for ; Tue, 15 Nov 2016 09:17:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966134AbcKOJRe (ORCPT ); Tue, 15 Nov 2016 04:17:34 -0500 Received: from mail-qt0-f176.google.com ([209.85.216.176]:33252 "EHLO mail-qt0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966136AbcKOJRD (ORCPT ); Tue, 15 Nov 2016 04:17:03 -0500 Received: by mail-qt0-f176.google.com with SMTP id p16so64441435qta.0 for ; Tue, 15 Nov 2016 01:17:03 -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=ghRZXJ045d1HMsv7+sFCAJjlN72S4qTjhPs0i88Lh1Q=; b=eIJDA3NFLjhrDY9WE2i4Dmelr5PNy1J/I2Qh+sspyz4EpldjSgmloBtALqFelqg2PF 88NRpgFtrKE9pmoJFj/sVD3PLAYQDSHFLJ0s18c7jmozllv17YaITy6AtvYlnfAyOTHe TZkJ3KHhetdZnII9xisOYvVQr4Y0GCBZvuMTlIsnQX6KTCvjOqHEXrIo4Ga7dwH2wvxr bMZMIchJ5hTS10V9CQSadeMB695xyV++Skwn16PfSk8BmHimix5ZI20grXXX3iuW0bAK 4O2qu2v2Bj8n4fqIGyl5BelQySzh3PbEORR5M/YjD803PR9dkjke56o1TJKDx+drxBcT CKHA== 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=ghRZXJ045d1HMsv7+sFCAJjlN72S4qTjhPs0i88Lh1Q=; b=UNhfVr7717Lvn9/OKLLxeyXpUSWa8CmYVW6s+wOsgIWRdumqIm42kWb34PhI2Q/oxw G468mRMEQ7IY9rxzd7Wz703eh9hfgH7EWJyQJsgBXtEDoUCJtDfPiPLqof2DqzoERRu9 lWt53sh9eEtu3vI2UOiURDSlO39mU/pL4qnQK+MRktsPWk90IXfmGljfTIaSpZ5lUa4N lPbwT8eWPXGHhNG+E6M7HUkbgfeuD3n3kM6kZgLXqUW2QrOSf1lUVFbv3+Kk2A7tb+Zp FFuQhR0WW/h5Rg2TkF1dTFwEwRQnzqoWuD45QxKJArRPPWXKikl0yXyhhd+OMbGaxfJn NXlg== X-Gm-Message-State: ABUngveorukVw2TMcmmEYR+hKoB9yFhum81QcBxBvzRLN/spzDKt3Ax0h6gFTfkeOTb6lg== X-Received: by 10.25.160.21 with SMTP id j21mr9482749lfe.166.1479201422379; Tue, 15 Nov 2016 01:17:02 -0800 (PST) Received: from tn-desktop.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id 31sm6128287lfv.21.2016.11.15.01.17.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Nov 2016 01:17:01 -0800 (PST) From: Tomasz Nowicki To: helgaas@kernel.org, will.deacon@arm.com, catalin.marinas@arm.com, rafael@kernel.org, Lorenzo.Pieralisi@arm.com Cc: arnd@arndb.de, jchandra@broadcom.com, ard.biesheuvel@linaro.org, robert.richter@caviumnetworks.com, mw@semihalf.com, ddaney@caviumnetworks.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-acpi@lists.linaro.org, andrea.gallo@linaro.org, jeremy.linton@arm.com, liudongdong3@huawei.com, gabriele.paoloni@huawei.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, jcm@redhat.com, msalter@redhat.com, Tomasz Nowicki Subject: [PATCH V1 2/2] PCI: thunder: Enable ACPI PCI controller for ThunderX pass1.x silicon version Date: Tue, 15 Nov 2016 10:14:58 +0100 Message-Id: <1479201298-25494-3-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479201298-25494-1-git-send-email-tn@semihalf.com> References: <1479201298-25494-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-Virus-Scanned: ClamAV using ClamSMTP ThunderX pass1.x requires to emulate the EA headers for on-chip devices hence it has to use custom pci_thunder_ecam_ops for accessing PCI config space (pci-thuner-ecam.c). Add new entries to MCFG quirk array where it can be applied while probing ACPI based PCI host controller. ThunderX pass1.x is using the same way for accessing off-chip devices (so-called PEM) as silicon pass-2.x so we need to add PEM quirk entries too. Quirk is considered for ThunderX silicon pass1.x only which is identified via MCFG revision 2. Signed-off-by: Tomasz Nowicki --- drivers/acpi/pci_mcfg.c | 15 +++++++++++++++ drivers/pci/host/pci-thunder-ecam.c | 2 +- include/linux/pci-ecam.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c index e4e2b9b..5e16211 100644 --- a/drivers/acpi/pci_mcfg.c +++ b/drivers/acpi/pci_mcfg.c @@ -76,6 +76,21 @@ static struct mcfg_fixup mcfg_quirks[] = { /* SoC pass2.x */ THUNDER_MCFG_QUIRK(1, 0UL), THUNDER_MCFG_QUIRK(1, 1UL), + + /* SoC pass1.x */ + THUNDER_MCFG_QUIRK(2, 0UL), + THUNDER_MCFG_QUIRK(2, 1UL), +#endif +#ifdef CONFIG_PCI_HOST_THUNDER_ECAM + /* SoC pass1.x */ + { "CAVIUM", "THUNDERX", 2, 0, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, + { "CAVIUM", "THUNDERX", 2, 1, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, + { "CAVIUM", "THUNDERX", 2, 2, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, + { "CAVIUM", "THUNDERX", 2, 3, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, + { "CAVIUM", "THUNDERX", 2, 10, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, + { "CAVIUM", "THUNDERX", 2, 11, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, + { "CAVIUM", "THUNDERX", 2, 12, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, + { "CAVIUM", "THUNDERX", 2, 13, MCFG_BUS_ANY, &pci_thunder_ecam_ops }, #endif }; diff --git a/drivers/pci/host/pci-thunder-ecam.c b/drivers/pci/host/pci-thunder-ecam.c index d50a3dc..b6c17e2 100644 --- a/drivers/pci/host/pci-thunder-ecam.c +++ b/drivers/pci/host/pci-thunder-ecam.c @@ -346,7 +346,7 @@ static int thunder_ecam_config_write(struct pci_bus *bus, unsigned int devfn, return pci_generic_config_write(bus, devfn, where, size, val); } -static struct pci_ecam_ops pci_thunder_ecam_ops = { +struct pci_ecam_ops pci_thunder_ecam_ops = { .bus_shift = 20, .pci_ops = { .map_bus = pci_ecam_map_bus, diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h index 3f2a98f..5a1f291 100644 --- a/include/linux/pci-ecam.h +++ b/include/linux/pci-ecam.h @@ -62,6 +62,9 @@ extern struct pci_ecam_ops pci_generic_ecam_ops; #ifdef CONFIG_PCI_HOST_THUNDER_PEM extern struct pci_ecam_ops pci_thunder_pem_ops; #endif +#ifdef CONFIG_PCI_HOST_THUNDER_ECAM +extern struct pci_ecam_ops pci_thunder_ecam_ops; +#endif /* ops for buggy ECAM that supports only 32-bit accesses */ extern struct pci_ecam_ops pci_32b_ops;