[PATCH v2 03/12] PCI: iproc: Add BCMA type

From	Ray Jui <ray.jui@broadcom.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 03/12] PCI: iproc: Add BCMA type
Date	2016-11-01 01:50 +0100
Message-ID	<syvr3-1lH-21@gated-at.bofh.it> (permalink)
References	<syvhn-1ij-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The iProc PCIe driver is currently using type IPROC_PCIE_PAXB for
the following SoCs: NS, NSP, Cygnus, NS2, and Pegasus. In fact, the BCMA
based NS uses a legacy PAXB controller that is slightly different from
the PAXB controller used in the rest of SoCs, e.g., some registers are
missing and it does not require software configuration of
outbound/inbound address mapping

A new type IPROC_PCIE_PAXB_BCMA is added in this patch to allow us to
properly support the BCMA based NS along with other iProc based SoCs
going forward

Signed-off-by: Ray Jui <ray.jui@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
---
 drivers/pci/host/pcie-iproc-bcma.c |  1 +
 drivers/pci/host/pcie-iproc-msi.c  |  1 +
 drivers/pci/host/pcie-iproc.c      | 14 ++++++++++++++
 drivers/pci/host/pcie-iproc.h      |  3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/host/pcie-iproc-bcma.c b/drivers/pci/host/pcie-iproc-bcma.c
index 8ce0890..bd4c9ec 100644
--- a/drivers/pci/host/pcie-iproc-bcma.c
+++ b/drivers/pci/host/pcie-iproc-bcma.c
@@ -54,6 +54,7 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
 
 	pcie->dev = dev;
 
+	pcie->type = IPROC_PCIE_PAXB_BCMA;
 	pcie->base = bdev->io_addr;
 	if (!pcie->base) {
 		dev_err(dev, "no controller registers\n");
diff --git a/drivers/pci/host/pcie-iproc-msi.c b/drivers/pci/host/pcie-iproc-msi.c
index 9a2973b..9fad791 100644
--- a/drivers/pci/host/pcie-iproc-msi.c
+++ b/drivers/pci/host/pcie-iproc-msi.c
@@ -563,6 +563,7 @@ int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node)
 	}
 
 	switch (pcie->type) {
+	case IPROC_PCIE_PAXB_BCMA:
 	case IPROC_PCIE_PAXB:
 		msi->reg_offsets = iproc_msi_reg_paxb;
 		msi->nr_eq_region = 1;
diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
index 3f4884a..f3b3340 100644
--- a/drivers/pci/host/pcie-iproc.c
+++ b/drivers/pci/host/pcie-iproc.c
@@ -100,6 +100,17 @@ enum iproc_pcie_reg {
 	IPROC_PCIE_MAX_NUM_REG,
 };
 
+/* iProc PCIe PAXB BCMA registers */
+static const u16 iproc_pcie_reg_paxb_bcma[] = {
+	[IPROC_PCIE_CLK_CTRL]         = 0x000,
+	[IPROC_PCIE_CFG_IND_ADDR]     = 0x120,
+	[IPROC_PCIE_CFG_IND_DATA]     = 0x124,
+	[IPROC_PCIE_CFG_ADDR]         = 0x1f8,
+	[IPROC_PCIE_CFG_DATA]         = 0x1fc,
+	[IPROC_PCIE_INTX_EN]          = 0x330,
+	[IPROC_PCIE_LINK_STATUS]      = 0xf0c,
+};
+
 /* iProc PCIe PAXB registers */
 static const u16 iproc_pcie_reg_paxb[] = {
 	[IPROC_PCIE_CLK_CTRL]     = 0x000,
@@ -469,6 +480,9 @@ static int iproc_pcie_rev_init(struct iproc_pcie *pcie)
 	const u16 *regs;
 
 	switch (pcie->type) {
+	case IPROC_PCIE_PAXB_BCMA:
+		regs = iproc_pcie_reg_paxb_bcma;
+		break;
 	case IPROC_PCIE_PAXB:
 		regs = iproc_pcie_reg_paxb;
 		break;
diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h
index 83643d5..768be05 100644
--- a/drivers/pci/host/pcie-iproc.h
+++ b/drivers/pci/host/pcie-iproc.h
@@ -24,7 +24,8 @@
  * endpoint devices.
  */
 enum iproc_pcie_type {
-	IPROC_PCIE_PAXB = 0,
+	IPROC_PCIE_PAXB_BCMA = 0,
+	IPROC_PCIE_PAXB,
 	IPROC_PCIE_PAXC,
 };
 
-- 
2.1.4

Thread

[PATCH v2 00/12] Additional iProc PCIe host support/fixes Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:40 +0100
  [PATCH v2 01/12] PCI: iproc: Improve core register population Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:40 +0100
  [PATCH v2 04/12] PCI: iproc: Fix exception with multi-function devices Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:40 +0100
  [PATCH v2 12/12] PCI: iproc: Add support for the next-gen PAXB controller Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:40 +0100
  [PATCH v2 11/12] PCI: iproc: Add PAXBv2 binding info Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:40 +0100
  [PATCH v2 05/12] PCI: iproc: Added PAXCv2 related binding Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:40 +0100
  [PATCH v2 08/12] PCI: iproc: Making outbound mapping code more generic Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:40 +0100
  [PATCH v2 10/12] PCI: iproc: Add inbound DMA mapping support Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:50 +0100
  [PATCH v2 09/12] PCI: iproc: Add optional dma-ranges Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:50 +0100
  [PATCH v2 07/12] PCI: iproc: Remove redundant outbound properties Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:50 +0100
  [PATCH v2 02/12] PCI: iproc: Do not reset PAXC when initializing the driver Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:50 +0100
  [PATCH v2 03/12] PCI: iproc: Add BCMA type Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:50 +0100
  [PATCH v2 06/12] PCI: iproc: Add PAXC v2 support Ray Jui <ray.jui@broadcom.com> - 2016-11-01 01:50 +0100

csiph-web