linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Daney <ddaney.cavm@gmail.com>
To: linux-kernel@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
	linux-pci@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
	Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Ian Campbell <ijc+devicetree@hellion.org.uk>,
	Kumar Gala <galak@codeaurora.org>,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	Marc Zyngier <marc.zyngier@arm.com>
Cc: David Daney <david.daney@cavium.com>
Subject: [PATCH 2/3] PCI: Add quirks for devices found on Cavium ThunderX SoCs.
Date: Thu, 17 Sep 2015 15:41:33 -0700	[thread overview]
Message-ID: <1442529694-1792-3-git-send-email-ddaney.cavm@gmail.com> (raw)
In-Reply-To: <1442529694-1792-1-git-send-email-ddaney.cavm@gmail.com>

From: David Daney <david.daney@cavium.com>

The on-chip devices all have fixed bars.  So, fix them up.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 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 <linux/module.h>
+#include <linux/pci.h>
+
+#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");
-- 
1.9.1


  parent reply	other threads:[~2015-09-17 22:41 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-17 22:41 [PATCH 0/3] PCI: Add support for Cavium ThunderX RC and on-SoC devices David Daney
2015-09-17 22:41 ` [PATCH 1/3] PCI: Allow quirks to override SRIOV BARs David Daney
2015-09-17 22:41 ` David Daney [this message]
2015-09-18  7:19   ` [PATCH 2/3] PCI: Add quirks for devices found on Cavium ThunderX SoCs Arnd Bergmann
2015-09-18 17:00     ` David Daney
2015-09-18 19:45       ` Arnd Bergmann
2015-09-19  1:00         ` David Daney
2015-09-22 13:19           ` Bjorn Helgaas
2015-09-23 16:24             ` David Daney
2015-09-22 15:39         ` Lorenzo Pieralisi
2015-09-22 19:33           ` Arnd Bergmann
2015-09-17 22:41 ` [PATCH 3/3] PCI: generic: Add support for Cavium ThunderX PCIe root complexes David Daney
2015-09-22 16:05   ` Lorenzo Pieralisi
2015-09-22 16:13     ` David Daney
2015-09-22 16:40       ` Lorenzo Pieralisi
2015-09-22 16:56         ` David Daney
2015-09-22 18:52   ` Will Deacon
2015-09-22 19:02     ` David Daney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442529694-1792-3-git-send-email-ddaney.cavm@gmail.com \
    --to=ddaney.cavm@gmail.com \
    --cc=bhelgaas@google.com \
    --cc=david.daney@cavium.com \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).