From patchwork Thu Sep 17 22:41:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 519056 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 1C6FF140180 for ; Fri, 18 Sep 2015 08:43:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ZHFYV6yB; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752505AbbIQWmj (ORCPT ); Thu, 17 Sep 2015 18:42:39 -0400 Received: from mail-ig0-f171.google.com ([209.85.213.171]:38536 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751855AbbIQWln (ORCPT ); Thu, 17 Sep 2015 18:41:43 -0400 Received: by igxx6 with SMTP id x6so5902863igx.1; Thu, 17 Sep 2015 15:41:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aKGH7hMWuXlGeLOQz5ZW0O/vRfVtrlSR3fP+v7kg0rY=; b=ZHFYV6yBXZROX7nB8ZX0g1Gtq3tKPjsWA0nQfdOWWcAgPtzl0fB8XHNq5FoNYg1i1V Y5GFXIBwSWZOsDCnq8RExN1C21Uvcymt79MsB16lRdFUZEzKfyBHfBR+fFQMg4obZKRC KelLsnxKan5C5tcVvqBeEfzOb5v+pJrY2BZYprLQ8vF1F3xka/TMsF3tkR0IWgpKLuce FKRfEzZorkmGWjMLCEciX1jwCq0Plbc0CICRxrzbtXaIPUut84ShpvmlW2Zxv2RYDQCL sHMUInJ7jRHJFm4o6SHK3y1yrxsy1GQOFBE4Mw0dOehcCooT3zsy41JT962Hf7v0+bB4 jycA== X-Received: by 10.50.41.71 with SMTP id d7mr10729309igl.79.1442529703141; Thu, 17 Sep 2015 15:41:43 -0700 (PDT) Received: from dl.caveonetworks.com (64.2.3.194.ptr.us.xo.net. [64.2.3.194]) by smtp.gmail.com with ESMTPSA id u4sm5187909igz.8.2015.09.17.15.41.40 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Sep 2015 15:41:41 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id t8HMfdXl001837; Thu, 17 Sep 2015 15:41:39 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t8HMfdOS001836; Thu, 17 Sep 2015 15:41:39 -0700 From: David Daney To: linux-kernel@vger.kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Will Deacon , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Marc Zyngier Cc: David Daney Subject: [PATCH 2/3] PCI: Add quirks for devices found on Cavium ThunderX SoCs. Date: Thu, 17 Sep 2015 15:41:33 -0700 Message-Id: <1442529694-1792-3-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1442529694-1792-1-git-send-email-ddaney.cavm@gmail.com> References: <1442529694-1792-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: David Daney The on-chip devices all have fixed bars. So, fix them up. Signed-off-by: David Daney --- drivers/pci/host/Kconfig | 6 +++ drivers/pci/host/Makefile | 1 + drivers/pci/host/quirks-thunder.c | 95 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 drivers/pci/host/quirks-thunder.c diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index d5e58ba..20d700d 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -145,4 +145,10 @@ config PCIE_IPROC_BCMA Say Y here if you want to use the Broadcom iProc PCIe controller through the BCMA bus interface +config PCI_QUIRKS_THUNDER + bool "PCI quirks for Cavium ThunderX SoCs" + depends on ARM64 + help + Say Y here to support ThunderX SoCs + endmenu diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index 140d66f..3ce7456 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -17,3 +17,4 @@ obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o +obj-$(CONFIG_PCI_QUIRKS_THUNDER) += quirks-thunder.o diff --git a/drivers/pci/host/quirks-thunder.c b/drivers/pci/host/quirks-thunder.c new file mode 100644 index 0000000..d615fd8 --- /dev/null +++ b/drivers/pci/host/quirks-thunder.c @@ -0,0 +1,95 @@ +/* + * PCIe quirks for Cavium Thunder SOC + * + * Copyright (C) 2014, 2015 Cavium Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + */ + +#include +#include + +#define PCI_DEVICE_ID_THUNDER_BRIDGE 0xa002 + +/* + * All PCIe devices in Thunder have fixed resources, shouldn't be + * reassigned. + */ +static void thunder_pci_fixup_header(struct pci_dev *dev) +{ + int resno; + + /* Only fixup Thunder on-chip devices. */ + if ((dev->device & 0xff00) != 0xa000) + return; + + for (resno = 0; resno < PCI_NUM_RESOURCES; resno++) + if (dev->resource[resno].flags) + dev->resource[resno].flags |= IORESOURCE_PCI_FIXED; +#ifdef CONFIG_PCI_IOV + if (dev->device == 0xa01e) { + dev->resource[PCI_IOV_RESOURCES + 0] = dev->resource[0]; + dev->resource[PCI_IOV_RESOURCES + 0].start += 0xa0000000; + dev->resource[PCI_IOV_RESOURCES + 0].end = + dev->resource[PCI_IOV_RESOURCES + 0].start + 0x200000 - 1; + dev->resource[PCI_IOV_RESOURCES + 4] = dev->resource[0]; + dev->resource[PCI_IOV_RESOURCES + 4].start += 0xe0000000; + dev->resource[PCI_IOV_RESOURCES + 4].end = + dev->resource[PCI_IOV_RESOURCES + 4].start + 0x200000 - 1; + } +#endif +} +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, thunder_pci_fixup_header); + +static void thunder_pci_fixup_final(struct pci_dev *dev) +{ + struct resource *res; + int resno; + + /* Only fixup Thunder on-chip devices. */ + if ((dev->device & 0xff00) != 0xa000) + return; + + if (dev->device == PCI_DEVICE_ID_THUNDER_BRIDGE) { + /* + * This bridge is just for the sake of supporting ARI + * for downstream devices. No resources are attached + * to it. Copy upstream root bus resources to bridge + * which aide in resource claiming for downstream + * devices + */ + + struct pci_bus *bus; + int resno; + + bus = dev->subordinate; + for (resno = 0; resno < PCI_BRIDGE_RESOURCE_NUM; resno++) { + bus->resource[resno] = pci_bus_resource_n(bus->parent, + PCI_BRIDGE_RESOURCE_NUM + resno); + } + + for (resno = PCI_BRIDGE_RESOURCES; + resno <= PCI_BRIDGE_RESOURCE_END; resno++) { + dev->resource[resno].start = dev->resource[resno].end = 0; + dev->resource[resno].flags = 0; + } + } else { + /* + * Claim the device's valid resources to set + * 'res->parent' hierarchy. + */ + for (resno = 0; resno < PCI_BRIDGE_RESOURCES; resno++) { + res = &dev->resource[resno]; + if (res->parent || !(res->flags & IORESOURCE_MEM)) + continue; + pci_claim_resource(dev, resno); + } + } +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, thunder_pci_fixup_final); + +MODULE_DESCRIPTION("PCI quirks for Cavium Thunder ECAM based devices"); +MODULE_LICENSE("GPL v2");