Skip to contentSkip to conversation

rockchip: Add PCIe host support

PATCH Superseded Jagan Teki 6 participants 20 messages Apr 25, 2020 – Apr 28, 2020 5 messages not in the archive

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

cover rockchip: Add PCIe host support

Thanks to Patrick for initial work done on this.

This series support PCIe host controller support
on rockchip rk3399 platform.

Works well on rk3399 boards like rock960, nanopc-t4 and roc-kr3399-pc-mezzanine board as Gen1 configurable host.

It has dependency with v5.7-rc1 dts(i) sync series[1]

[1] https://patchwork.ozlabs.org/project/uboot/cover/20200425105319.12009-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org/

Any inputs?
Jagan.

Jagan Teki (8):
iopoll: Add dealy to read poll
iopoll: Add readl_poll_sleep_timeout
clk: rk3399: Enable PCIE_PHY clock
clk: rk3399: Disable PCIE_PHY clock
pci: Add Rockchip PCIe controller driver
pci: Add Rockchip PCIe PHY controller driver
rockchip: Enable PCIe/M.2 on rk3399 board w/ M.2
rockchip: Enable PCIe/M.2 on rock960 board

 arch/arm/dts/rk3399-u-boot.dtsi             |   1 +
 board/vamrs/rock960_rk3399/rock960-rk3399.c |  20 +
 configs/nanopc-t4-rk3399_defconfig          |   4 +
 configs/roc-pc-mezzanine-rk3399_defconfig   |   4 +
 configs/rock960-rk3399_defconfig            |   5 +
 drivers/clk/rockchip/clk_rk3399.c           |  32 ++
 drivers/pci/Kconfig                         |   8 +
 drivers/pci/Makefile                        |   1 +
 drivers/pci/pcie_rockchip.c                 | 484 ++++++++++++++++++++
 drivers/pci/pcie_rockchip.h                 | 142 ++++++
 drivers/pci/pcie_rockchip_phy.c             | 205 +++++++++
 include/linux/iopoll.h                      |  23 +-
 12 files changed, 920 insertions(+), 9 deletions(-)
 create mode 100644 drivers/pci/pcie_rockchip.c
 create mode 100644 drivers/pci/pcie_rockchip.h
 create mode 100644 drivers/pci/pcie_rockchip_phy.c
Signature · 1 line
2.17.1

A message that is not in the archive (sent off-list or not yet received): 20200425110354.12381-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

author
#2 lore raw

PATCH 1/8 iopoll: Add dealy to read poll

Some drivers and other bsp code not only poll the register with timeout but also required to delay on each transaction.

This patch add that requirement by adding sleep_us variable so-that read_poll_timeout now support delay as well.

---
 include/linux/iopoll.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/iopoll.h +12 -10
index ab0ae1969a..0bbd757939 100644
@@ -16,6 +16,7 @@
  * @addr: Address to poll
  * @val: Variable to read the value into
  * @cond: Break condition (usually involving @val)
+ * @sleep_us: Maximum time to sleep in us
  * @timeout_us: Timeout in us, 0 means never timeout
  *
  * Returns 0 on success and -ETIMEDOUT upon a timeout. In either
@@ -24,7 +25,7 @@
  * When available, you'll probably want to use one of the specialized
  * macros defined below rather than this macro directly.
  */
-#define readx_poll_timeout(op, addr, val, cond, timeout_us)	\
+#define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us)	\
 ({ \
 	unsigned long timeout = timer_get_us() + timeout_us; \
 	for (;;) { \
@@ -35,33 +36,34 @@
 			(val) = op(addr); \
 			break; \
 		} \
+		if (sleep_us) \
+			udelay(sleep_us); \
 	} \
 	(cond) ? 0 : -ETIMEDOUT; \
 })
 
-
 #define readb_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readb, addr, val, cond, timeout_us)
+	readx_poll_timeout(readb, addr, val, cond, false, timeout_us)
 
 #define readw_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readw, addr, val, cond, timeout_us)
+	readx_poll_timeout(readw, addr, val, cond, false, timeout_us)
 
 #define readl_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readl, addr, val, cond, timeout_us)
+	readx_poll_timeout(readl, addr, val, cond, false, timeout_us)
 
 #define readq_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readq, addr, val, cond, timeout_us)
+	readx_poll_timeout(readq, addr, val, cond, false, timeout_us)
 
 #define readb_relaxed_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readb_relaxed, addr, val, cond, timeout_us)
+	readx_poll_timeout(readb_relaxed, addr, val, cond, false, timeout_us)
 
 #define readw_relaxed_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readw_relaxed, addr, val, cond, timeout_us)
+	readx_poll_timeout(readw_relaxed, addr, val, cond, false, timeout_us)
 
 #define readl_relaxed_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readl_relaxed, addr, val, cond, timeout_us)
+	readx_poll_timeout(readl_relaxed, addr, val, cond, false, timeout_us)
 
 #define readq_relaxed_poll_timeout(addr, val, cond, timeout_us) \
-	readx_poll_timeout(readq_relaxed, addr, val, cond, timeout_us)
+	readx_poll_timeout(readq_relaxed, addr, val, cond, false, timeout_us)
 
 #endif /* _LINUX_IOPOLL_H */
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 2/8 iopoll: Add readl_poll_sleep_timeout

In reply to a message not in the archive

Add readl poll API with sleep and timeout support.

---
 include/linux/iopoll.h | 3 +++
 1 file changed, 3 insertions(+)
include/linux/iopoll.h +3 -0
index 0bbd757939..e087f23271 100644
@@ -42,6 +42,9 @@
 	(cond) ? 0 : -ETIMEDOUT; \
 })
 
+#define readl_poll_sleep_timeout(addr, val, cond, sleep_us, timeout_us) \
+	readx_poll_timeout(readl, addr, val, cond, sleep_us, timeout_us)
+
 #define readb_poll_timeout(addr, val, cond, timeout_us) \
 	readx_poll_timeout(readb, addr, val, cond, false, timeout_us)
 
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 3/8 clk: rk3399: Enable PCIE_PHY clock

In reply to a message not in the archive

Add PCIE_PHY clock enablement support on rk3399
clock driver.

This clock is enabled by default, so do nothing
if it triggers during the PCIe PHY probe other
PHY users on this clock will simply fail.

---
 drivers/clk/rockchip/clk_rk3399.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
drivers/clk/rockchip/clk_rk3399.c +15 -0
index d822acace1..8e069fbade 100644
@@ -1071,12 +1071,27 @@ static int __maybe_unused rk3399_clk_set_parent(struct clk *clk,
 	return -ENOENT;
 }
 
+static int rk3399_clk_enable(struct clk *clk)
+{
+	switch (clk->id) {
+	case SCLK_PCIEPHY_REF:
+		/* do nothing, clk is enabled by default */
+		break;
+	default:
+		debug("%s: unsupported clk %ld\n", __func__, clk->id);
+		return -ENOENT;
+	}
+
+	return 0;
+}
+
 static struct clk_ops rk3399_clk_ops = {
 	.get_rate = rk3399_clk_get_rate,
 	.set_rate = rk3399_clk_set_rate,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.set_parent = rk3399_clk_set_parent,
 #endif
+	.enable = rk3399_clk_enable,
 };
 
 #ifdef CONFIG_SPL_BUILD
Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH 3/8] clk: rk3399: Enable PCIE_PHY clock

Quoted 9 lines

From: Jagan Teki <[email protected]>
Date: Sat, 25 Apr 2020 16:33:49 +0530

Add PCIE_PHY clock enablement support on rk3399 clock driver.

This clock is enabled by default, so do nothing if it triggers during the PCIe PHY probe other PHY users on this clock will simply fail.

This breaks Ethernet on my firefly-rk3399, and I suspect it does the same on other boards:

  In:    serial@ff1a0000
  Out:   serial@ff1a0000
  Err:   serial@ff1a0000

Model: Firefly-RK3399 Board
Net: failed to enable clock 0
No ethernet found.

Looking at the px30 clock driver, I think you need to add a few more clocks here:

SCLK_MAC,
SCLK_MAC_RX,
SCLK_MAC_TX,
SCLK_MACREF,
SCLK_MACREF_OUT,
ACLK_GMAC,
PCLK_GMAC

That makes it work again for me.

Cheers,

Mark

Quoted 41 lines
---
 drivers/clk/rockchip/clk_rk3399.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
drivers/clk/rockchip/clk_rk3399.c +15 -0
index d822acace1..8e069fbade 100644
@@ -1071,12 +1071,27 @@ static int __maybe_unused rk3399_clk_set_parent(struct clk *clk,
 	return -ENOENT;
 }
 
+static int rk3399_clk_enable(struct clk *clk)
+{
+	switch (clk->id) {
+	case SCLK_PCIEPHY_REF:
+		/* do nothing, clk is enabled by default */
+		break;
+	default:
+		debug("%s: unsupported clk %ld\n", __func__, clk->id);
+		return -ENOENT;
+	}
+
+	return 0;
+}
+
 static struct clk_ops rk3399_clk_ops = {
 	.get_rate = rk3399_clk_get_rate,
 	.set_rate = rk3399_clk_set_rate,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.set_parent = rk3399_clk_set_parent,
 #endif
+	.enable = rk3399_clk_enable,
 };
 
 #ifdef CONFIG_SPL_BUILD
Signature · 1 line
2.17.1

A message that is not in the archive (sent off-list or not yet received): 016196395ae8077b-Sse5TxTiDWuxJFhkpKByzTXZidJgq2Oi@public.gmane.org

author
#7 lore raw

Re: [PATCH 3/8] clk: rk3399: Enable PCIE_PHY clock

Quoted 7 lines · Mark Kettenis
Quoted 7 lines

From: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
Date: Sat, 25 Apr 2020 16:33:49 +0530

Add PCIE_PHY clock enablement support on rk3399
clock driver.

Quoted 6 lines
Quoted 3 lines

This clock is enabled by default, so do nothing
if it triggers during the PCIe PHY probe other
PHY users on this clock will simply fail.

This breaks Ethernet on my firefly-rk3399, and I suspect it does the same on other boards:

Yes it does. It's affected by the v5.7-rc1 sync series. Will update the fixes on that series, thanks!

author
#8 lore raw

PATCH 4/8 clk: rk3399: Disable PCIE_PHY clock

In reply to a message not in the archive

Add PCIE_PHY clock disablement support on rk3399
clock driver.

This would trigger if the PCIe PHY driver failed to initialize or power on the PHY.

---
 drivers/clk/rockchip/clk_rk3399.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/clk/rockchip/clk_rk3399.c +17 -0
index 8e069fbade..2d447f96f7 100644
@@ -1085,6 +1085,22 @@ static int rk3399_clk_enable(struct clk *clk)
 	return 0;
 }
 
+static int rk3399_clk_disable(struct clk *clk)
+{
+	struct rk3399_clk_priv *priv = dev_get_priv(clk->dev);
+
+	switch (clk->id) {
+	case SCLK_PCIEPHY_REF:
+		rk_clrreg(&priv->cru->clksel_con[18], BIT(7));
+		break;
+	default:
+		debug("%s: unsupported clk %ld\n", __func__, clk->id);
+		return -ENOENT;
+	}
+
+	return 0;
+}
+
 static struct clk_ops rk3399_clk_ops = {
 	.get_rate = rk3399_clk_get_rate,
 	.set_rate = rk3399_clk_set_rate,
@@ -1092,6 +1108,7 @@ static struct clk_ops rk3399_clk_ops = {
 	.set_parent = rk3399_clk_set_parent,
 #endif
 	.enable = rk3399_clk_enable,
+	.disable = rk3399_clk_disable,
 };
 
 #ifdef CONFIG_SPL_BUILD
Signature · 1 line
2.17.1

A message that is not in the archive (sent off-list or not yet received): 20200425110354.12381-5-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

Reviewed-by
#10 lore raw

Re: [PATCH 4/8] clk: rk3399: Disable PCIE_PHY clock【请注意,邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】

Quoted 7 lines · Jagan Teki

Add PCIE_PHY clock disablement support on rk3399
clock driver.

This would trigger if the PCIe PHY driver failed to initialize or power on the PHY.

Thanks,
- Kever

Quoted 32 lines
---
  drivers/clk/rockchip/clk_rk3399.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
drivers/clk/rockchip/clk_rk3399.c +16 -0
index 8e069fbade..2d447f96f7 100644
@@ -1085,6 +1085,22 @@ static int rk3399_clk_enable(struct clk *clk)
  	return 0;
  }
 
+static int rk3399_clk_disable(struct clk *clk)
+{
+	struct rk3399_clk_priv *priv = dev_get_priv(clk->dev);
+
+	switch (clk->id) {
+	case SCLK_PCIEPHY_REF:
+		rk_clrreg(&priv->cru->clksel_con[18], BIT(7));
+		break;
+	default:
+		debug("%s: unsupported clk %ld\n", __func__, clk->id);
+		return -ENOENT;
+	}
+
+	return 0;
+}
+
  static struct clk_ops rk3399_clk_ops = {
  	.get_rate = rk3399_clk_get_rate,
  	.set_rate = rk3399_clk_set_rate,

drivers/clk/rockchip/clk_rk3399.c static struct clk_ops rk3399_clk_ops = { · line 1114

Quoted 7 lines
drivers/clk/rockchip/clk_rk3399.c +1 -0
@@ -1092,6 +1108,7 @@ static struct clk_ops rk3399_clk_ops = {
  	.set_parent = rk3399_clk_set_parent,
  #endif
  	.enable = rk3399_clk_enable,
+	.disable = rk3399_clk_disable,
  };
 
  #ifdef CONFIG_SPL_BUILD

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#11 lore raw

PATCH 5/8 pci: Add Rockchip PCIe controller driver

In reply to a message not in the archive

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

---
 drivers/pci/Kconfig         |   8 +
 drivers/pci/Makefile        |   1 +
 drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
 drivers/pci/pcie_rockchip.h |  79 +++++++
 4 files changed, 548 insertions(+)
 create mode 100644 drivers/pci/pcie_rockchip.c
 create mode 100644 drivers/pci/pcie_rockchip.h
drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
 	  Say Y here if you want to enable Gen2 PCIe controller,
 	  which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+	bool "Enable Rockchip PCIe driver"
+	select DM_PCI
+	default y if ROCKCHIP_RK3399
+	help
+	  Say Y here if you want to enable PCIe controller support on
+	  Rockchip SoCs.
+
 endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
 obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
 obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +460 -0

460 lines not on this page · raw message

drivers/pci/pcie_rockchip.h new file +79 -0

79 lines not on this page · raw message

Signature · 1 line
2.17.1
#12 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver

Quoted 8 lines

From: Jagan Teki <[email protected]>
Date: Sat, 25 Apr 2020 16:33:51 +0530

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

Tried to get this to work on my firefly-rk3399 which made me notice some shortcomings:

1. The vpcie1v8 and vpcie0v9 supplies are optional, just like the vpcie3v3 supply.

2. The vpcie3v3 regulator check doesn't quite work.

See below for suggestions on how to fix this.

Sadly the NVME SSD doesn't seem to be happy and shows up as only 1023 MB. But that is probably not caused by this diff.

Quoted 331 lines
---
 drivers/pci/Kconfig         |   8 +
 drivers/pci/Makefile        |   1 +
 drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
 drivers/pci/pcie_rockchip.h |  79 +++++++
 4 files changed, 548 insertions(+)
 create mode 100644 drivers/pci/pcie_rockchip.c
 create mode 100644 drivers/pci/pcie_rockchip.h
drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
 	  Say Y here if you want to enable Gen2 PCIe controller,
 	  which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+	bool "Enable Rockchip PCIe driver"
+	select DM_PCI
+	default y if ROCKCHIP_RK3399
+	help
+	  Say Y here if you want to enable PCIe controller support on
+	  Rockchip SoCs.
+
 endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
 obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
 obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +288 -0
new file mode 100644
index 0000000000..adc64aedf5
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Rockchip AXI PCIe host controller driver
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ * Copyright (c) 2018 Mark Kettenis <[email protected]>
+ *
+ * Bits taken from Linux Rockchip PCIe host controller.
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <pci.h>
+#include <power-domain.h>
+#include <power/regulator.h>
+#include <reset.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <asm/arch-rockchip/clock.h>
+#include <linux/iopoll.h>
+
+#include "pcie_rockchip.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int rockchip_pcie_rd_conf(const struct udevice *bus, pci_dev_t bdf,
+				 uint offset, ulong *valuep,
+				 enum pci_size_t size)
+{
+	struct rockchip_pcie *priv = dev_get_priv(bus);
+	ulong value;
+	u32 off;
+
+	off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+	      (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+	if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+		value = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		*valuep = pci_conv_32_to_size(value, offset, size);
+		return 0;
+	}
+
+	if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+		value = readl(priv->axi_base + off);
+		*valuep = pci_conv_32_to_size(value, offset, size);
+		return 0;
+	}
+
+	*valuep = pci_get_ff(size);
+
+	return 0;
+}
+
+static int rockchip_pcie_wr_conf(struct udevice *bus, pci_dev_t bdf,
+				 uint offset, ulong value,
+				 enum pci_size_t size)
+{
+	struct rockchip_pcie *priv = dev_get_priv(bus);
+	ulong old;
+	u32 off;
+
+	off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+	      (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+	if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+		old = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		value = pci_conv_size_to_32(old, value, offset, size);
+		writel(value, priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		return 0;
+	}
+
+	if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+		old = readl(priv->axi_base + off);
+		value = pci_conv_size_to_32(old, value, offset, size);
+		writel(value, priv->axi_base + off);
+		return 0;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_atr_init(struct rockchip_pcie *priv)
+{
+	struct udevice *ctlr = pci_get_controller(priv->dev);
+	struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+	u64 addr, size, offset;
+	u32 type;
+	int i, region;
+
+	/* Use region 0 to map PCI configuration space. */
+	writel(25 - 1, priv->apb_base + PCIE_ATR_OB_ADDR0(0));
+	writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(0));
+	writel(PCIE_ATR_HDR_CFG_TYPE0 | PCIE_ATR_HDR_RID,
+	       priv->apb_base + PCIE_ATR_OB_DESC0(0));
+	writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(0));
+
+	for (i = 0; i < hose->region_count; i++) {
+		if (hose->regions[i].flags == PCI_REGION_SYS_MEMORY)
+			continue;
+
+		if (hose->regions[i].flags == PCI_REGION_IO)
+			type = PCIE_ATR_HDR_IO;
+		else
+			type = PCIE_ATR_HDR_MEM;
+
+		/* Only support identity mappings. */
+		if (hose->regions[i].bus_start !=
+		    hose->regions[i].phys_start)
+			return -EINVAL;
+
+		/* Only support mappings aligned on a region boundary. */
+		addr = hose->regions[i].bus_start;
+		if (addr & (PCIE_ATR_OB_REGION_SIZE - 1))
+			return -EINVAL;
+
+		/* Mappings should lie between AXI and APB regions. */
+		size = hose->regions[i].size;
+		if (addr < (u64)priv->axi_base + PCIE_ATR_OB_REGION0_SIZE)
+			return -EINVAL;
+		if (addr + size > (u64)priv->apb_base)
+			return -EINVAL;
+
+		offset = addr - (u64)priv->axi_base - PCIE_ATR_OB_REGION0_SIZE;
+		region = 1 + (offset / PCIE_ATR_OB_REGION_SIZE);
+		while (size > 0) {
+			writel(32 - 1,
+			       priv->apb_base + PCIE_ATR_OB_ADDR0(region));
+			writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(region));
+			writel(type | PCIE_ATR_HDR_RID,
+			       priv->apb_base + PCIE_ATR_OB_DESC0(region));
+			writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(region));
+
+			addr += PCIE_ATR_OB_REGION_SIZE;
+			size -= PCIE_ATR_OB_REGION_SIZE;
+			region++;
+		}
+	}
+
+	/* Passthrough inbound translations unmodified. */
+	writel(32 - 1, priv->apb_base + PCIE_ATR_IB_ADDR0(2));
+	writel(0, priv->apb_base + PCIE_ATR_IB_ADDR1(2));
+
+	return 0;
+}
+
+static int rockchip_pcie_init_port(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	u32 cr, val, status;
+	int ret;
+
+	if (dm_gpio_is_valid(&priv->ep_gpio))
+		dm_gpio_set_value(&priv->ep_gpio, 0);
+
+	ret = reset_assert(&priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert mgmt-sticky reset (ret=%d)\n",
+			ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	udelay(10);
+
+	ret = reset_deassert(&priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	/* Select GEN1 for now */
+	cr = PCIE_CLIENT_GEN_SEL_1;
+	/* Set Root complex mode */
+	cr |= PCIE_CLIENT_CONF_ENABLE | PCIE_CLIENT_MODE_RC;
+	writel(cr, priv->apb_base + PCIE_CLIENT_CONFIG);
+
+	ret = reset_deassert(&priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert mgmt-sticky reset (ret=%d)\n",
+			ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	/* Enable Gen1 training */
+	writel(PCIE_CLIENT_LINK_TRAIN_ENABLE,
+	       priv->apb_base + PCIE_CLIENT_CONFIG);
+
+	if (dm_gpio_is_valid(&priv->ep_gpio))
+		dm_gpio_set_value(&priv->ep_gpio, 1);
+
+	ret = readl_poll_sleep_timeout
+			(priv->apb_base + PCIE_CLIENT_BASIC_STATUS1,
+			status, PCIE_LINK_UP(status), 20, 500 * 1000);
+	if (ret) {
+		dev_err(dev, "PCIe link training gen1 timeout!\n");
+		return ret;
+	}
+
+	/* Initialize Root Complex registers. */
+	writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
+	writel(PCI_CLASS_BRIDGE_PCI << 16,
+	       priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
+	writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
+	       priv->apb_base + PCIE_LM_RCBAR);
+
+	if (dev_read_bool(dev, "aspm-no-l0s")) {
+		val = readl(priv->apb_base + PCIE_RC_PCIE_LCAP);
+		val &= ~PCIE_RC_PCIE_LCAP_APMS_L0S;
+		writel(val, priv->apb_base + PCIE_RC_PCIE_LCAP);
+	}
+
+	/* Configure Address Translation. */
+	ret = rockchip_pcie_atr_init(priv);
+	if (ret) {
+		dev_err(dev, "PCIE-%d: ATR init failed\n", dev->seq);
+		return ret;
+	}

drivers/pci/pcie_rockchip.c line 298

Quoted 10 lines
drivers/pci/pcie_rockchip.c new file +10 -0
+
+	return 0;
+}
+
+static int rockchip_pcie_set_vpcie(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	int ret;
+
+	if (!IS_ERR(priv->vpcie3v3)) {

I think this should be:

        if (priv->vpcie3v3) {

drivers/pci/pcie_rockchip.c line 306

Quoted 8 lines
drivers/pci/pcie_rockchip.c new file +8 -0
+		ret = regulator_set_enable(priv->vpcie3v3, true);
+		if (ret) {
+			dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n",
+				ret);
+			return ret;
+		}
+	}
+

And to make this regulator optional, it needs an

        if (priv->vpcie1v8) {

here.

drivers/pci/pcie_rockchip.c line 312

Quoted 6 lines
drivers/pci/pcie_rockchip.c new file +6 -0
+	ret = regulator_set_enable(priv->vpcie1v8, true);
+	if (ret) {
+		dev_err(dev, "failed to enable vpcie1v8 (ret=%d)\n", ret);
+		goto err_disable_3v3;
+	}
+
       }

        if (priv->vpcie0v9) {

drivers/pci/pcie_rockchip.c line 317

Quoted 5 lines
drivers/pci/pcie_rockchip.c new file +5 -0
+	ret = regulator_set_enable(priv->vpcie0v9, true);
+	if (ret) {
+		dev_err(dev, "failed to enable vpcie0v9 (ret=%d)\n", ret);
+		goto err_disable_1v8;
+	}
        }

drivers/pci/pcie_rockchip.c line 321

Quoted 4 lines
drivers/pci/pcie_rockchip.c new file +4 -0
+
+	return 0;
+
+err_disable_1v8:
        if (priv->vpcie1v8)

drivers/pci/pcie_rockchip.c line 324

Quoted 3 lines
drivers/pci/pcie_rockchip.c new file +3 -0
+	regulator_set_enable(priv->vpcie1v8, false);
+err_disable_3v3:
+	if (!IS_ERR(priv->vpcie3v3))
        if (priv->vpcie3v3)
Quoted 66 lines
drivers/pci/pcie_rockchip.c new file +66 -0
+		regulator_set_enable(priv->vpcie3v3, false);
+	return ret;
+}
+
+static int rockchip_pcie_parse_dt(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	int ret;
+
+	priv->axi_base = dev_read_addr_name(dev, "axi-base");
+	if (!priv->axi_base)
+		return -ENODEV;
+
+	priv->apb_base = dev_read_addr_name(dev, "apb-base");
+	if (!priv->axi_base)
+		return -ENODEV;
+
+	ret = gpio_request_by_name(dev, "ep-gpios", 0,
+				   &priv->ep_gpio, GPIOD_IS_OUT);
+	if (ret) {
+		dev_err(dev, "failed to find ep-gpios property\n");
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "core", &priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to get core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "mgmt", &priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to get mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "mgmt-sticky", &priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to get mgmt-sticky reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pipe", &priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pm", &priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pclk", &priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "aclk", &priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to get aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+

drivers/pci/pcie_rockchip.c line 400

Quoted 10 lines
drivers/pci/pcie_rockchip.c new file +10 -0
+	ret = device_get_supply_regulator(dev, "vpcie3v3-supply",
+					  &priv->vpcie3v3);
+	if (ret && ret != -ENOENT) {
+		dev_err(dev, "failed to get vpcie3v3 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie1v8-supply",
+					  &priv->vpcie1v8);
+	if (ret) {

To make this optional, make this

        if (ret && ret != -ENOENT) {

drivers/pci/pcie_rockchip.c line 407

Quoted 7 lines
drivers/pci/pcie_rockchip.c new file +7 -0
+		dev_err(dev, "failed to get vpcie1v8 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie0v9-supply",
+					  &priv->vpcie0v9);
+	if (ret) {

The same here.

Quoted 142 lines
drivers/pci/pcie_rockchip.c new file +53 -0
+		dev_err(dev, "failed to get vpcie0v9 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_probe(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	struct udevice *ctlr = pci_get_controller(dev);
+	struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+	int ret;
+
+	priv->first_busno = dev->seq;
+	priv->dev = dev;
+
+	ret = rockchip_pcie_parse_dt(dev);
+	if (ret)
+		return ret;
+
+	ret = rockchip_pcie_set_vpcie(dev);
+	if (ret)
+		return ret;
+
+	ret = rockchip_pcie_init_port(dev);
+	if (ret)
+		return ret;
+
+	dev_info(dev, "PCIE-%d: Link up (Bus%d)\n",
+		 dev->seq, hose->first_busno);
+
+	return 0;
+}
+
+static const struct dm_pci_ops rockchip_pcie_ops = {
+	.read_config	= rockchip_pcie_rd_conf,
+	.write_config	= rockchip_pcie_wr_conf,
+};
+
+static const struct udevice_id rockchip_pcie_ids[] = {
+	{ .compatible = "rockchip,rk3399-pcie" },
+	{ }
+};
+
+U_BOOT_DRIVER(rockchip_pcie) = {
+	.name			= "rockchip_pcie",
+	.id			= UCLASS_PCI,
+	.of_match		= rockchip_pcie_ids,
+	.ops			= &rockchip_pcie_ops,
+	.probe			= rockchip_pcie_probe,
+	.priv_auto_alloc_size	= sizeof(struct rockchip_pcie),
+};
drivers/pci/pcie_rockchip.h new file +79 -0
new file mode 100644
index 0000000000..6ded5c9553
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Rockchip PCIe Headers
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ *
+ */
+
+#define HIWORD_UPDATE(mask, val)        (((mask) << 16) | (val))
+#define HIWORD_UPDATE_BIT(val)          HIWORD_UPDATE(val, val)
+
+#define ENCODE_LANES(x)                 ((((x) >> 1) & 3) << 4)
+#define PCIE_CLIENT_BASE                0x0
+#define PCIE_CLIENT_CONFIG              (PCIE_CLIENT_BASE + 0x00)
+#define PCIE_CLIENT_CONF_ENABLE         HIWORD_UPDATE_BIT(0x0001)
+#define PCIE_CLIENT_LINK_TRAIN_ENABLE   HIWORD_UPDATE_BIT(0x0002)
+#define PCIE_CLIENT_MODE_RC             HIWORD_UPDATE_BIT(0x0040)
+#define PCIE_CLIENT_GEN_SEL_1           HIWORD_UPDATE(0x0080, 0)
+#define PCIE_CLIENT_BASIC_STATUS1	0x0048
+#define PCIE_CLIENT_LINK_STATUS_UP	GENMASK(21, 20)
+#define PCIE_CLIENT_LINK_STATUS_MASK	GENMASK(21, 20)
+#define PCIE_LINK_UP(x) \
+	(((x) & PCIE_CLIENT_LINK_STATUS_MASK) == PCIE_CLIENT_LINK_STATUS_UP)
+#define PCIE_RC_NORMAL_BASE		0x800000
+#define PCIE_LM_BASE			0x900000
+#define PCIE_LM_VENDOR_ID              (PCIE_LM_BASE + 0x44)
+#define PCIE_LM_VENDOR_ROCKCHIP		0x1d87
+#define PCIE_LM_RCBAR			(PCIE_LM_BASE + 0x300)
+#define PCIE_LM_RCBARPIE		BIT(19)
+#define PCIE_LM_RCBARPIS		BIT(20)
+#define PCIE_RC_BASE			0xa00000
+#define PCIE_RC_CONFIG_DCR		(PCIE_RC_BASE + 0x0c4)
+#define PCIE_RC_CONFIG_DCR_CSPL_SHIFT	18
+#define PCIE_RC_CONFIG_DCR_CPLS_SHIFT	26
+#define PCIE_RC_PCIE_LCAP		(PCIE_RC_BASE + 0x0cc)
+#define PCIE_RC_PCIE_LCAP_APMS_L0S	BIT(10)
+#define PCIE_ATR_BASE			0xc00000
+#define PCIE_ATR_OB_ADDR0(i)		(PCIE_ATR_BASE + 0x000 + (i) * 0x20)
+#define PCIE_ATR_OB_ADDR1(i)		(PCIE_ATR_BASE + 0x004 + (i) * 0x20)
+#define PCIE_ATR_OB_DESC0(i)		(PCIE_ATR_BASE + 0x008 + (i) * 0x20)
+#define PCIE_ATR_OB_DESC1(i)		(PCIE_ATR_BASE + 0x00c + (i) * 0x20)
+#define PCIE_ATR_IB_ADDR0(i)		(PCIE_ATR_BASE + 0x800 + (i) * 0x8)
+#define PCIE_ATR_IB_ADDR1(i)		(PCIE_ATR_BASE + 0x804 + (i) * 0x8)
+#define PCIE_ATR_HDR_MEM		0x2
+#define PCIE_ATR_HDR_IO			0x6
+#define PCIE_ATR_HDR_CFG_TYPE0		0xa
+#define PCIE_ATR_HDR_CFG_TYPE1		0xb
+#define PCIE_ATR_HDR_RID		BIT(23)
+
+#define PCIE_ATR_OB_REGION0_SIZE	(32 * 1024 * 1024)
+#define PCIE_ATR_OB_REGION_SIZE		(1 * 1024 * 1024)
+
+struct rockchip_pcie {
+	fdt_addr_t axi_base;
+	fdt_addr_t apb_base;
+	int first_busno;
+	struct udevice *dev;
+
+	/* resets */
+	struct reset_ctl core_rst;
+	struct reset_ctl mgmt_rst;
+	struct reset_ctl mgmt_sticky_rst;
+	struct reset_ctl pipe_rst;
+	struct reset_ctl pm_rst;
+	struct reset_ctl pclk_rst;
+	struct reset_ctl aclk_rst;
+
+	/* gpio */
+	struct gpio_desc ep_gpio;
+
+	/* vpcie regulators */
+	struct udevice *vpcie12v;
+	struct udevice *vpcie3v3;
+	struct udevice *vpcie1v8;
+	struct udevice *vpcie0v9;
+};
Signature · 1 line
2.17.1
#13 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver

Quoted 10 lines · Mark Kettenis
Quoted 9 lines

From: Jagan Teki <[email protected]>
Date: Sat, 25 Apr 2020 16:33:51 +0530

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

Quoted 7 lines

Tried to get this to work on my firefly-rk3399 which made me notice some shortcomings:

1. The vpcie1v8 and vpcie0v9 supplies are optional, just like the vpcie3v3 supply.

2. The vpcie3v3 regulator check doesn't quite work.

You mean the regulator check?

Quoted 350 lines

See below for suggestions on how to fix this.

Sadly the NVME SSD doesn't seem to be happy and shows up as only 1023 MB. But that is probably not caused by this diff.

Quoted 331 lines
---
 drivers/pci/Kconfig         |   8 +
 drivers/pci/Makefile        |   1 +
 drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
 drivers/pci/pcie_rockchip.h |  79 +++++++
 4 files changed, 548 insertions(+)
 create mode 100644 drivers/pci/pcie_rockchip.c
 create mode 100644 drivers/pci/pcie_rockchip.h
drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
        Say Y here if you want to enable Gen2 PCIe controller,
        which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+     bool "Enable Rockchip PCIe driver"
+     select DM_PCI
+     default y if ROCKCHIP_RK3399
+     help
+       Say Y here if you want to enable PCIe controller support on
+       Rockchip SoCs.
+
 endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
 obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
 obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +288 -0
new file mode 100644
index 0000000000..adc64aedf5
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Rockchip AXI PCIe host controller driver
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ * Copyright (c) 2018 Mark Kettenis <[email protected]>
+ *
+ * Bits taken from Linux Rockchip PCIe host controller.
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <pci.h>
+#include <power-domain.h>
+#include <power/regulator.h>
+#include <reset.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <asm/arch-rockchip/clock.h>
+#include <linux/iopoll.h>
+
+#include "pcie_rockchip.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int rockchip_pcie_rd_conf(const struct udevice *bus, pci_dev_t bdf,
+                              uint offset, ulong *valuep,
+                              enum pci_size_t size)
+{
+     struct rockchip_pcie *priv = dev_get_priv(bus);
+     ulong value;
+     u32 off;
+
+     off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+           (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+     if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;
+     }
+
+     if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->axi_base + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;
+     }
+
+     *valuep = pci_get_ff(size);
+
+     return 0;
+}
+
+static int rockchip_pcie_wr_conf(struct udevice *bus, pci_dev_t bdf,
+                              uint offset, ulong value,
+                              enum pci_size_t size)
+{
+     struct rockchip_pcie *priv = dev_get_priv(bus);
+     ulong old;
+     u32 off;
+
+     off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+           (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+     if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+             old = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             value = pci_conv_size_to_32(old, value, offset, size);
+             writel(value, priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             return 0;
+     }
+
+     if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+             old = readl(priv->axi_base + off);
+             value = pci_conv_size_to_32(old, value, offset, size);
+             writel(value, priv->axi_base + off);
+             return 0;
+     }
+
+     return 0;
+}
+
+static int rockchip_pcie_atr_init(struct rockchip_pcie *priv)
+{
+     struct udevice *ctlr = pci_get_controller(priv->dev);
+     struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+     u64 addr, size, offset;
+     u32 type;
+     int i, region;
+
+     /* Use region 0 to map PCI configuration space. */
+     writel(25 - 1, priv->apb_base + PCIE_ATR_OB_ADDR0(0));
+     writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(0));
+     writel(PCIE_ATR_HDR_CFG_TYPE0 | PCIE_ATR_HDR_RID,
+            priv->apb_base + PCIE_ATR_OB_DESC0(0));
+     writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(0));
+
+     for (i = 0; i < hose->region_count; i++) {
+             if (hose->regions[i].flags == PCI_REGION_SYS_MEMORY)
+                     continue;
+
+             if (hose->regions[i].flags == PCI_REGION_IO)
+                     type = PCIE_ATR_HDR_IO;
+             else
+                     type = PCIE_ATR_HDR_MEM;
+
+             /* Only support identity mappings. */
+             if (hose->regions[i].bus_start !=
+                 hose->regions[i].phys_start)
+                     return -EINVAL;
+
+             /* Only support mappings aligned on a region boundary. */
+             addr = hose->regions[i].bus_start;
+             if (addr & (PCIE_ATR_OB_REGION_SIZE - 1))
+                     return -EINVAL;
+
+             /* Mappings should lie between AXI and APB regions. */
+             size = hose->regions[i].size;
+             if (addr < (u64)priv->axi_base + PCIE_ATR_OB_REGION0_SIZE)
+                     return -EINVAL;
+             if (addr + size > (u64)priv->apb_base)
+                     return -EINVAL;
+
+             offset = addr - (u64)priv->axi_base - PCIE_ATR_OB_REGION0_SIZE;
+             region = 1 + (offset / PCIE_ATR_OB_REGION_SIZE);
+             while (size > 0) {
+                     writel(32 - 1,
+                            priv->apb_base + PCIE_ATR_OB_ADDR0(region));
+                     writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(region));
+                     writel(type | PCIE_ATR_HDR_RID,
+                            priv->apb_base + PCIE_ATR_OB_DESC0(region));
+                     writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(region));
+
+                     addr += PCIE_ATR_OB_REGION_SIZE;
+                     size -= PCIE_ATR_OB_REGION_SIZE;
+                     region++;
+             }
+     }
+
+     /* Passthrough inbound translations unmodified. */
+     writel(32 - 1, priv->apb_base + PCIE_ATR_IB_ADDR0(2));
+     writel(0, priv->apb_base + PCIE_ATR_IB_ADDR1(2));
+
+     return 0;
+}
+
+static int rockchip_pcie_init_port(struct udevice *dev)
+{
+     struct rockchip_pcie *priv = dev_get_priv(dev);
+     u32 cr, val, status;
+     int ret;
+
+     if (dm_gpio_is_valid(&priv->ep_gpio))
+             dm_gpio_set_value(&priv->ep_gpio, 0);
+
+     ret = reset_assert(&priv->aclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert aclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pm_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pm reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->core_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert core reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->mgmt_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert mgmt reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->mgmt_sticky_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert mgmt-sticky reset (ret=%d)\n",
+                     ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pipe_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pipe reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     udelay(10);
+
+     ret = reset_deassert(&priv->pm_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pm reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->aclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert aclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->pclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     /* Select GEN1 for now */
+     cr = PCIE_CLIENT_GEN_SEL_1;
+     /* Set Root complex mode */
+     cr |= PCIE_CLIENT_CONF_ENABLE | PCIE_CLIENT_MODE_RC;
+     writel(cr, priv->apb_base + PCIE_CLIENT_CONFIG);
+
+     ret = reset_deassert(&priv->mgmt_sticky_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert mgmt-sticky reset (ret=%d)\n",
+                     ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->core_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert core reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->mgmt_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert mgmt reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->pipe_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pipe reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     /* Enable Gen1 training */
+     writel(PCIE_CLIENT_LINK_TRAIN_ENABLE,
+            priv->apb_base + PCIE_CLIENT_CONFIG);
+
+     if (dm_gpio_is_valid(&priv->ep_gpio))
+             dm_gpio_set_value(&priv->ep_gpio, 1);
+
+     ret = readl_poll_sleep_timeout
+                     (priv->apb_base + PCIE_CLIENT_BASIC_STATUS1,
+                     status, PCIE_LINK_UP(status), 20, 500 * 1000);
+     if (ret) {
+             dev_err(dev, "PCIe link training gen1 timeout!\n");
+             return ret;
+     }
+
+     /* Initialize Root Complex registers. */
+     writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
+     writel(PCI_CLASS_BRIDGE_PCI << 16,
+            priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
+     writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
+            priv->apb_base + PCIE_LM_RCBAR);
+
+     if (dev_read_bool(dev, "aspm-no-l0s")) {
+             val = readl(priv->apb_base + PCIE_RC_PCIE_LCAP);
+             val &= ~PCIE_RC_PCIE_LCAP_APMS_L0S;
+             writel(val, priv->apb_base + PCIE_RC_PCIE_LCAP);
+     }
+
+     /* Configure Address Translation. */
+     ret = rockchip_pcie_atr_init(priv);
+     if (ret) {
+             dev_err(dev, "PCIE-%d: ATR init failed\n", dev->seq);
+             return ret;
+     }

drivers/pci/pcie_rockchip.c line 298

Quoted 10 lines
drivers/pci/pcie_rockchip.c new file +10 -0
+
+     return 0;
+}
+
+static int rockchip_pcie_set_vpcie(struct udevice *dev)
+{
+     struct rockchip_pcie *priv = dev_get_priv(dev);
+     int ret;
+
+     if (!IS_ERR(priv->vpcie3v3)) {

I think this should be:

Quoted 1 line
        if (priv->vpcie3v3) {

I didn't find any issue with the board I have optional of this, but will check it.

Quoted 10 lines

drivers/pci/pcie_rockchip.c line 306

Quoted 9 lines
drivers/pci/pcie_rockchip.c new file +8 -0
+             ret = regulator_set_enable(priv->vpcie3v3, true);
+             if (ret) {
+                     dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n",
+                             ret);
+                     return ret;
+             }
+     }
+
Quoted 3 lines

And to make this regulator optional, it needs an

        if (priv->vpcie1v8) {

I can see from v5.7-rc1, 12v, 3v3 are optional and rest not If I'm not wrong.

Jagan.

#14 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver

Quoted 17 lines

From: Jagan Teki <[email protected]>
Date: Sun, 26 Apr 2020 01:06:56 +0530

Quoted 13 lines · Mark Kettenis
Quoted 9 lines

From: Jagan Teki <[email protected]>
Date: Sat, 25 Apr 2020 16:33:51 +0530

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

Tried to get this to work on my firefly-rk3399 which made me notice some shortcomings:

Quoted 6 lines
Quoted 4 lines

1. The vpcie1v8 and vpcie0v9 supplies are optional, just like the vpcie3v3 supply.

2. The vpcie3v3 regulator check doesn't quite work.

You mean the regulator check?

I mean the check wether the regulator is actually there in rockchip_pcie_set_vpcie(). See my suggested changes below.

Quoted 365 lines
Quoted 350 lines

See below for suggestions on how to fix this.

Sadly the NVME SSD doesn't seem to be happy and shows up as only 1023 MB. But that is probably not caused by this diff.

Quoted 331 lines
---
 drivers/pci/Kconfig         |   8 +
 drivers/pci/Makefile        |   1 +
 drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
 drivers/pci/pcie_rockchip.h |  79 +++++++
 4 files changed, 548 insertions(+)
 create mode 100644 drivers/pci/pcie_rockchip.c
 create mode 100644 drivers/pci/pcie_rockchip.h
drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
        Say Y here if you want to enable Gen2 PCIe controller,
        which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+     bool "Enable Rockchip PCIe driver"
+     select DM_PCI
+     default y if ROCKCHIP_RK3399
+     help
+       Say Y here if you want to enable PCIe controller support on
+       Rockchip SoCs.
+
 endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
 obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
 obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +288 -0
new file mode 100644
index 0000000000..adc64aedf5
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Rockchip AXI PCIe host controller driver
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ * Copyright (c) 2018 Mark Kettenis <[email protected]>
+ *
+ * Bits taken from Linux Rockchip PCIe host controller.
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <pci.h>
+#include <power-domain.h>
+#include <power/regulator.h>
+#include <reset.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <asm/arch-rockchip/clock.h>
+#include <linux/iopoll.h>
+
+#include "pcie_rockchip.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int rockchip_pcie_rd_conf(const struct udevice *bus, pci_dev_t bdf,
+                              uint offset, ulong *valuep,
+                              enum pci_size_t size)
+{
+     struct rockchip_pcie *priv = dev_get_priv(bus);
+     ulong value;
+     u32 off;
+
+     off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+           (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+     if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;
+     }
+
+     if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->axi_base + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;
+     }
+
+     *valuep = pci_get_ff(size);
+
+     return 0;
+}
+
+static int rockchip_pcie_wr_conf(struct udevice *bus, pci_dev_t bdf,
+                              uint offset, ulong value,
+                              enum pci_size_t size)
+{
+     struct rockchip_pcie *priv = dev_get_priv(bus);
+     ulong old;
+     u32 off;
+
+     off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+           (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+     if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+             old = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             value = pci_conv_size_to_32(old, value, offset, size);
+             writel(value, priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             return 0;
+     }
+
+     if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+             old = readl(priv->axi_base + off);
+             value = pci_conv_size_to_32(old, value, offset, size);
+             writel(value, priv->axi_base + off);
+             return 0;
+     }
+
+     return 0;
+}
+
+static int rockchip_pcie_atr_init(struct rockchip_pcie *priv)
+{
+     struct udevice *ctlr = pci_get_controller(priv->dev);
+     struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+     u64 addr, size, offset;
+     u32 type;
+     int i, region;
+
+     /* Use region 0 to map PCI configuration space. */
+     writel(25 - 1, priv->apb_base + PCIE_ATR_OB_ADDR0(0));
+     writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(0));
+     writel(PCIE_ATR_HDR_CFG_TYPE0 | PCIE_ATR_HDR_RID,
+            priv->apb_base + PCIE_ATR_OB_DESC0(0));
+     writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(0));
+
+     for (i = 0; i < hose->region_count; i++) {
+             if (hose->regions[i].flags == PCI_REGION_SYS_MEMORY)
+                     continue;
+
+             if (hose->regions[i].flags == PCI_REGION_IO)
+                     type = PCIE_ATR_HDR_IO;
+             else
+                     type = PCIE_ATR_HDR_MEM;
+
+             /* Only support identity mappings. */
+             if (hose->regions[i].bus_start !=
+                 hose->regions[i].phys_start)
+                     return -EINVAL;
+
+             /* Only support mappings aligned on a region boundary. */
+             addr = hose->regions[i].bus_start;
+             if (addr & (PCIE_ATR_OB_REGION_SIZE - 1))
+                     return -EINVAL;
+
+             /* Mappings should lie between AXI and APB regions. */
+             size = hose->regions[i].size;
+             if (addr < (u64)priv->axi_base + PCIE_ATR_OB_REGION0_SIZE)
+                     return -EINVAL;
+             if (addr + size > (u64)priv->apb_base)
+                     return -EINVAL;
+
+             offset = addr - (u64)priv->axi_base - PCIE_ATR_OB_REGION0_SIZE;
+             region = 1 + (offset / PCIE_ATR_OB_REGION_SIZE);
+             while (size > 0) {
+                     writel(32 - 1,
+                            priv->apb_base + PCIE_ATR_OB_ADDR0(region));
+                     writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(region));
+                     writel(type | PCIE_ATR_HDR_RID,
+                            priv->apb_base + PCIE_ATR_OB_DESC0(region));
+                     writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(region));
+
+                     addr += PCIE_ATR_OB_REGION_SIZE;
+                     size -= PCIE_ATR_OB_REGION_SIZE;
+                     region++;
+             }
+     }
+
+     /* Passthrough inbound translations unmodified. */
+     writel(32 - 1, priv->apb_base + PCIE_ATR_IB_ADDR0(2));
+     writel(0, priv->apb_base + PCIE_ATR_IB_ADDR1(2));
+
+     return 0;
+}
+
+static int rockchip_pcie_init_port(struct udevice *dev)
+{
+     struct rockchip_pcie *priv = dev_get_priv(dev);
+     u32 cr, val, status;
+     int ret;
+
+     if (dm_gpio_is_valid(&priv->ep_gpio))
+             dm_gpio_set_value(&priv->ep_gpio, 0);
+
+     ret = reset_assert(&priv->aclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert aclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pm_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pm reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->core_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert core reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->mgmt_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert mgmt reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->mgmt_sticky_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert mgmt-sticky reset (ret=%d)\n",
+                     ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pipe_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pipe reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     udelay(10);
+
+     ret = reset_deassert(&priv->pm_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pm reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->aclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert aclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->pclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     /* Select GEN1 for now */
+     cr = PCIE_CLIENT_GEN_SEL_1;
+     /* Set Root complex mode */
+     cr |= PCIE_CLIENT_CONF_ENABLE | PCIE_CLIENT_MODE_RC;
+     writel(cr, priv->apb_base + PCIE_CLIENT_CONFIG);
+
+     ret = reset_deassert(&priv->mgmt_sticky_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert mgmt-sticky reset (ret=%d)\n",
+                     ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->core_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert core reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->mgmt_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert mgmt reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->pipe_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pipe reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     /* Enable Gen1 training */
+     writel(PCIE_CLIENT_LINK_TRAIN_ENABLE,
+            priv->apb_base + PCIE_CLIENT_CONFIG);
+
+     if (dm_gpio_is_valid(&priv->ep_gpio))
+             dm_gpio_set_value(&priv->ep_gpio, 1);
+
+     ret = readl_poll_sleep_timeout
+                     (priv->apb_base + PCIE_CLIENT_BASIC_STATUS1,
+                     status, PCIE_LINK_UP(status), 20, 500 * 1000);
+     if (ret) {
+             dev_err(dev, "PCIe link training gen1 timeout!\n");
+             return ret;
+     }
+
+     /* Initialize Root Complex registers. */
+     writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
+     writel(PCI_CLASS_BRIDGE_PCI << 16,
+            priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
+     writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
+            priv->apb_base + PCIE_LM_RCBAR);
+
+     if (dev_read_bool(dev, "aspm-no-l0s")) {
+             val = readl(priv->apb_base + PCIE_RC_PCIE_LCAP);
+             val &= ~PCIE_RC_PCIE_LCAP_APMS_L0S;
+             writel(val, priv->apb_base + PCIE_RC_PCIE_LCAP);
+     }
+
+     /* Configure Address Translation. */
+     ret = rockchip_pcie_atr_init(priv);
+     if (ret) {
+             dev_err(dev, "PCIE-%d: ATR init failed\n", dev->seq);
+             return ret;
+     }

drivers/pci/pcie_rockchip.c line 298

Quoted 10 lines
drivers/pci/pcie_rockchip.c new file +10 -0
+
+     return 0;
+}
+
+static int rockchip_pcie_set_vpcie(struct udevice *dev)
+{
+     struct rockchip_pcie *priv = dev_get_priv(dev);
+     int ret;
+
+     if (!IS_ERR(priv->vpcie3v3)) {

I think this should be:

Quoted 1 line
        if (priv->vpcie3v3) {

I didn't find any issue with the board I have optional of this, but will check it.

Quoted 10 lines
Quoted 9 lines
drivers/pci/pcie_rockchip.c new file +8 -0
+             ret = regulator_set_enable(priv->vpcie3v3, true);
+             if (ret) {
+                     dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n",
+                             ret);
+                     return ret;
+             }
+     }
+
Quoted 5 lines
Quoted 3 lines

And to make this regulator optional, it needs an

        if (priv->vpcie1v8) {

I can see from v5.7-rc1, 12v, 3v3 are optional and rest not If I'm not wrong.

The devicetree binding is clear about it. See Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt.

And rk3399-firefly.dts doesn't add the properties.

#15 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver

Quoted 395 lines · Mark Kettenis
Quoted 18 lines

From: Jagan Teki <[email protected]>
Date: Sun, 26 Apr 2020 01:06:56 +0530

Quoted 13 lines · Mark Kettenis
Quoted 9 lines

From: Jagan Teki <[email protected]>
Date: Sat, 25 Apr 2020 16:33:51 +0530

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

Tried to get this to work on my firefly-rk3399 which made me notice some shortcomings:

Quoted 6 lines
Quoted 4 lines

1. The vpcie1v8 and vpcie0v9 supplies are optional, just like the vpcie3v3 supply.

2. The vpcie3v3 regulator check doesn't quite work.

You mean the regulator check?

I mean the check wether the regulator is actually there in rockchip_pcie_set_vpcie(). See my suggested changes below.

Quoted 367 lines
Quoted 350 lines

See below for suggestions on how to fix this.

Sadly the NVME SSD doesn't seem to be happy and shows up as only 1023 MB. But that is probably not caused by this diff.

Quoted 331 lines
---
 drivers/pci/Kconfig         |   8 +
 drivers/pci/Makefile        |   1 +
 drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
 drivers/pci/pcie_rockchip.h |  79 +++++++
 4 files changed, 548 insertions(+)
 create mode 100644 drivers/pci/pcie_rockchip.c
 create mode 100644 drivers/pci/pcie_rockchip.h
drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
        Say Y here if you want to enable Gen2 PCIe controller,
        which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+     bool "Enable Rockchip PCIe driver"
+     select DM_PCI
+     default y if ROCKCHIP_RK3399
+     help
+       Say Y here if you want to enable PCIe controller support on
+       Rockchip SoCs.
+
 endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
 obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
 obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +288 -0
new file mode 100644
index 0000000000..adc64aedf5
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Rockchip AXI PCIe host controller driver
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ * Copyright (c) 2018 Mark Kettenis <[email protected]>
+ *
+ * Bits taken from Linux Rockchip PCIe host controller.
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <pci.h>
+#include <power-domain.h>
+#include <power/regulator.h>
+#include <reset.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <asm/arch-rockchip/clock.h>
+#include <linux/iopoll.h>
+
+#include "pcie_rockchip.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int rockchip_pcie_rd_conf(const struct udevice *bus, pci_dev_t bdf,
+                              uint offset, ulong *valuep,
+                              enum pci_size_t size)
+{
+     struct rockchip_pcie *priv = dev_get_priv(bus);
+     ulong value;
+     u32 off;
+
+     off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+           (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+     if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;
+     }
+
+     if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->axi_base + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;
+     }
+
+     *valuep = pci_get_ff(size);
+
+     return 0;
+}
+
+static int rockchip_pcie_wr_conf(struct udevice *bus, pci_dev_t bdf,
+                              uint offset, ulong value,
+                              enum pci_size_t size)
+{
+     struct rockchip_pcie *priv = dev_get_priv(bus);
+     ulong old;
+     u32 off;
+
+     off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+           (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+     if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+             old = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             value = pci_conv_size_to_32(old, value, offset, size);
+             writel(value, priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             return 0;
+     }
+
+     if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+             old = readl(priv->axi_base + off);
+             value = pci_conv_size_to_32(old, value, offset, size);
+             writel(value, priv->axi_base + off);
+             return 0;
+     }
+
+     return 0;
+}
+
+static int rockchip_pcie_atr_init(struct rockchip_pcie *priv)
+{
+     struct udevice *ctlr = pci_get_controller(priv->dev);
+     struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+     u64 addr, size, offset;
+     u32 type;
+     int i, region;
+
+     /* Use region 0 to map PCI configuration space. */
+     writel(25 - 1, priv->apb_base + PCIE_ATR_OB_ADDR0(0));
+     writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(0));
+     writel(PCIE_ATR_HDR_CFG_TYPE0 | PCIE_ATR_HDR_RID,
+            priv->apb_base + PCIE_ATR_OB_DESC0(0));
+     writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(0));
+
+     for (i = 0; i < hose->region_count; i++) {
+             if (hose->regions[i].flags == PCI_REGION_SYS_MEMORY)
+                     continue;
+
+             if (hose->regions[i].flags == PCI_REGION_IO)
+                     type = PCIE_ATR_HDR_IO;
+             else
+                     type = PCIE_ATR_HDR_MEM;
+
+             /* Only support identity mappings. */
+             if (hose->regions[i].bus_start !=
+                 hose->regions[i].phys_start)
+                     return -EINVAL;
+
+             /* Only support mappings aligned on a region boundary. */
+             addr = hose->regions[i].bus_start;
+             if (addr & (PCIE_ATR_OB_REGION_SIZE - 1))
+                     return -EINVAL;
+
+             /* Mappings should lie between AXI and APB regions. */
+             size = hose->regions[i].size;
+             if (addr < (u64)priv->axi_base + PCIE_ATR_OB_REGION0_SIZE)
+                     return -EINVAL;
+             if (addr + size > (u64)priv->apb_base)
+                     return -EINVAL;
+
+             offset = addr - (u64)priv->axi_base - PCIE_ATR_OB_REGION0_SIZE;
+             region = 1 + (offset / PCIE_ATR_OB_REGION_SIZE);
+             while (size > 0) {
+                     writel(32 - 1,
+                            priv->apb_base + PCIE_ATR_OB_ADDR0(region));
+                     writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(region));
+                     writel(type | PCIE_ATR_HDR_RID,
+                            priv->apb_base + PCIE_ATR_OB_DESC0(region));
+                     writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(region));
+
+                     addr += PCIE_ATR_OB_REGION_SIZE;
+                     size -= PCIE_ATR_OB_REGION_SIZE;
+                     region++;
+             }
+     }
+
+     /* Passthrough inbound translations unmodified. */
+     writel(32 - 1, priv->apb_base + PCIE_ATR_IB_ADDR0(2));
+     writel(0, priv->apb_base + PCIE_ATR_IB_ADDR1(2));
+
+     return 0;
+}
+
+static int rockchip_pcie_init_port(struct udevice *dev)
+{
+     struct rockchip_pcie *priv = dev_get_priv(dev);
+     u32 cr, val, status;
+     int ret;
+
+     if (dm_gpio_is_valid(&priv->ep_gpio))
+             dm_gpio_set_value(&priv->ep_gpio, 0);
+
+     ret = reset_assert(&priv->aclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert aclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pm_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pm reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->core_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert core reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->mgmt_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert mgmt reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->mgmt_sticky_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert mgmt-sticky reset (ret=%d)\n",
+                     ret);
+             return ret;
+     }
+
+     ret = reset_assert(&priv->pipe_rst);
+     if (ret) {
+             dev_err(dev, "failed to assert pipe reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     udelay(10);
+
+     ret = reset_deassert(&priv->pm_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pm reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->aclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert aclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->pclk_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pclk reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     /* Select GEN1 for now */
+     cr = PCIE_CLIENT_GEN_SEL_1;
+     /* Set Root complex mode */
+     cr |= PCIE_CLIENT_CONF_ENABLE | PCIE_CLIENT_MODE_RC;
+     writel(cr, priv->apb_base + PCIE_CLIENT_CONFIG);
+
+     ret = reset_deassert(&priv->mgmt_sticky_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert mgmt-sticky reset (ret=%d)\n",
+                     ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->core_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert core reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->mgmt_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert mgmt reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     ret = reset_deassert(&priv->pipe_rst);
+     if (ret) {
+             dev_err(dev, "failed to deassert pipe reset (ret=%d)\n", ret);
+             return ret;
+     }
+
+     /* Enable Gen1 training */
+     writel(PCIE_CLIENT_LINK_TRAIN_ENABLE,
+            priv->apb_base + PCIE_CLIENT_CONFIG);
+
+     if (dm_gpio_is_valid(&priv->ep_gpio))
+             dm_gpio_set_value(&priv->ep_gpio, 1);
+
+     ret = readl_poll_sleep_timeout
+                     (priv->apb_base + PCIE_CLIENT_BASIC_STATUS1,
+                     status, PCIE_LINK_UP(status), 20, 500 * 1000);
+     if (ret) {
+             dev_err(dev, "PCIe link training gen1 timeout!\n");
+             return ret;
+     }
+
+     /* Initialize Root Complex registers. */
+     writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
+     writel(PCI_CLASS_BRIDGE_PCI << 16,
+            priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
+     writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
+            priv->apb_base + PCIE_LM_RCBAR);
+
+     if (dev_read_bool(dev, "aspm-no-l0s")) {
+             val = readl(priv->apb_base + PCIE_RC_PCIE_LCAP);
+             val &= ~PCIE_RC_PCIE_LCAP_APMS_L0S;
+             writel(val, priv->apb_base + PCIE_RC_PCIE_LCAP);
+     }
+
+     /* Configure Address Translation. */
+     ret = rockchip_pcie_atr_init(priv);
+     if (ret) {
+             dev_err(dev, "PCIE-%d: ATR init failed\n", dev->seq);
+             return ret;
+     }

drivers/pci/pcie_rockchip.c line 298

Quoted 10 lines
drivers/pci/pcie_rockchip.c new file +10 -0
+
+     return 0;
+}
+
+static int rockchip_pcie_set_vpcie(struct udevice *dev)
+{
+     struct rockchip_pcie *priv = dev_get_priv(dev);
+     int ret;
+
+     if (!IS_ERR(priv->vpcie3v3)) {

I think this should be:

Quoted 1 line
        if (priv->vpcie3v3) {

I didn't find any issue with the board I have optional of this, but will check it.

Quoted 12 lines

drivers/pci/pcie_rockchip.c line 306

Quoted 9 lines
drivers/pci/pcie_rockchip.c new file +8 -0
+             ret = regulator_set_enable(priv->vpcie3v3, true);
+             if (ret) {
+                     dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n",
+                             ret);
+                     return ret;
+             }
+     }
+

And to make this regulator optional, it needs an

Quoted 8 lines
Quoted 3 lines
Quoted 1 line
        if (priv->vpcie1v8) {

I can see from v5.7-rc1, 12v, 3v3 are optional and rest not If I'm not wrong.

The devicetree binding is clear about it. See Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt.

And rk3399-firefly.dts doesn't add the properties.

But, at least I can see these two are supplied from SoC Page 12 [1]?

[1] http://download.t-firefly.com/product/RK3399/Docs/Hardware/Schematic%20&%20Components%20Position%20&%20CAD/Firefly-RK3399%20SCH%20&%20POS/Firefly-RK3399_V10_SCH_(2017-2-8).pdf

A message that is not in the archive (sent off-list or not yet received): CAMty3ZC+DiW2gGjN3rWcrwHPXZfxuGhjJN-1caUXW-Ry7VNR+A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#17 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver

Quoted 9 lines · Jagan Teki
Quoted 8 lines · Mark Kettenis
Quoted 8 lines

From: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
Date: Sat, 25 Apr 2020 16:33:51 +0530

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Quoted 7 lines
Quoted 7 lines
Quoted 1 line

Thanks to Patrick for initial work.

Tried to get this to work on my firefly-rk3399 which made me notice some shortcomings:

1. The vpcie1v8 and vpcie0v9 supplies are optional, just like the vpcie3v3 supply.

FWIW those are "non-optional" in Linux in the sense that supplies to the PCIE_AVDD_0V9 and PCIE_AVDD_1V8 pins of the SoC must physically exist, even if they aren't described. If U-Boot doesn't have the same "create a dummy regulator if none is specified" behaviour then you might need some slightly different logic there.

The 3.3V and 12V supplies on the other hand may legitimately not be part of the board at all, depending on whether it implements a full-size slot, a mini-PCI/M.2 socket, a hard-wired endpoint chip, or just the data and clock signal pairs exposed on some non-standard connector.

Robin.

A message that is not in the archive (sent off-list or not yet received): 20200425110354.12381-6-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

#19 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver【请注意,邮件由linux-rockchip-bounces+shawn.lin=rock-chips.com@lists.infradead.org代发】

Quoted 6 lines · Jagan Teki

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

Thanks for your patches!

Quoted 89 lines
---
  drivers/pci/Kconfig         |   8 +
  drivers/pci/Makefile        |   1 +
  drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
  drivers/pci/pcie_rockchip.h |  79 +++++++
  4 files changed, 548 insertions(+)

create mode 100644 drivers/pci/pcie_rockchip.c
create mode 100644 drivers/pci/pcie_rockchip.h

drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
  	  Say Y here if you want to enable Gen2 PCIe controller,
  	  which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+	bool "Enable Rockchip PCIe driver"
+	select DM_PCI
+	default y if ROCKCHIP_RK3399
+	help
+	  Say Y here if you want to enable PCIe controller support on
+	  Rockchip SoCs.
+
  endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
  obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
  obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
  obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +46 -0
new file mode 100644
index 0000000000..adc64aedf5
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Rockchip AXI PCIe host controller driver
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ * Copyright (c) 2018 Mark Kettenis <[email protected]>
+ *
+ * Bits taken from Linux Rockchip PCIe host controller.
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <pci.h>
+#include <power-domain.h>
+#include <power/regulator.h>
+#include <reset.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <asm/arch-rockchip/clock.h>
+#include <linux/iopoll.h>
+
+#include "pcie_rockchip.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int rockchip_pcie_rd_conf(const struct udevice *bus, pci_dev_t bdf,
+				 uint offset, ulong *valuep,
+				 enum pci_size_t size)
+{
+	struct rockchip_pcie *priv = dev_get_priv(bus);
+	ulong value;
+	u32 off;
+
+	off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+	      (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+	if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+		value = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		*valuep = pci_conv_32_to_size(value, offset, size);
+		return 0;

drivers/pci/pcie_rockchip.c line 56

Quoted 10 lines
drivers/pci/pcie_rockchip.c new file +10 -0
+	}
+
+	if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+		value = readl(priv->axi_base + off);
+		*valuep = pci_conv_32_to_size(value, offset, size);
+		return 0;
+	}
+
+	*valuep = pci_get_ff(size);
+

PCIe cfg accessors, for instance, rockchip_pcie_rd_config,is supposed to configure TLP type to PCIE_ATR_HDR_CFG_TYPE1 if scanning the downstream buses, as it possiblely is a pcie-switch which should need forward the type1 header packets.

Linux driver is a good example for reference:
https://elixir.bootlin.com/linux/latest/source/drivers/pci/controller/pcie-rockchip-host.c#L177

Quoted 480 lines
drivers/pci/pcie_rockchip.c new file +404 -0
+	return 0;
+}
+
+static int rockchip_pcie_wr_conf(struct udevice *bus, pci_dev_t bdf,
+				 uint offset, ulong value,
+				 enum pci_size_t size)
+{
+	struct rockchip_pcie *priv = dev_get_priv(bus);
+	ulong old;
+	u32 off;
+
+	off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+	      (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+	if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+		old = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		value = pci_conv_size_to_32(old, value, offset, size);
+		writel(value, priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		return 0;
+	}
+
+	if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+		old = readl(priv->axi_base + off);
+		value = pci_conv_size_to_32(old, value, offset, size);
+		writel(value, priv->axi_base + off);
+		return 0;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_atr_init(struct rockchip_pcie *priv)
+{
+	struct udevice *ctlr = pci_get_controller(priv->dev);
+	struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+	u64 addr, size, offset;
+	u32 type;
+	int i, region;
+
+	/* Use region 0 to map PCI configuration space. */
+	writel(25 - 1, priv->apb_base + PCIE_ATR_OB_ADDR0(0));
+	writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(0));
+	writel(PCIE_ATR_HDR_CFG_TYPE0 | PCIE_ATR_HDR_RID,
+	       priv->apb_base + PCIE_ATR_OB_DESC0(0));
+	writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(0));
+
+	for (i = 0; i < hose->region_count; i++) {
+		if (hose->regions[i].flags == PCI_REGION_SYS_MEMORY)
+			continue;
+
+		if (hose->regions[i].flags == PCI_REGION_IO)
+			type = PCIE_ATR_HDR_IO;
+		else
+			type = PCIE_ATR_HDR_MEM;
+
+		/* Only support identity mappings. */
+		if (hose->regions[i].bus_start !=
+		    hose->regions[i].phys_start)
+			return -EINVAL;
+
+		/* Only support mappings aligned on a region boundary. */
+		addr = hose->regions[i].bus_start;
+		if (addr & (PCIE_ATR_OB_REGION_SIZE - 1))
+			return -EINVAL;
+
+		/* Mappings should lie between AXI and APB regions. */
+		size = hose->regions[i].size;
+		if (addr < (u64)priv->axi_base + PCIE_ATR_OB_REGION0_SIZE)
+			return -EINVAL;
+		if (addr + size > (u64)priv->apb_base)
+			return -EINVAL;
+
+		offset = addr - (u64)priv->axi_base - PCIE_ATR_OB_REGION0_SIZE;
+		region = 1 + (offset / PCIE_ATR_OB_REGION_SIZE);
+		while (size > 0) {
+			writel(32 - 1,
+			       priv->apb_base + PCIE_ATR_OB_ADDR0(region));
+			writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(region));
+			writel(type | PCIE_ATR_HDR_RID,
+			       priv->apb_base + PCIE_ATR_OB_DESC0(region));
+			writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(region));
+
+			addr += PCIE_ATR_OB_REGION_SIZE;
+			size -= PCIE_ATR_OB_REGION_SIZE;
+			region++;
+		}
+	}
+
+	/* Passthrough inbound translations unmodified. */
+	writel(32 - 1, priv->apb_base + PCIE_ATR_IB_ADDR0(2));
+	writel(0, priv->apb_base + PCIE_ATR_IB_ADDR1(2));
+
+	return 0;
+}
+
+static int rockchip_pcie_init_port(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	u32 cr, val, status;
+	int ret;
+
+	if (dm_gpio_is_valid(&priv->ep_gpio))
+		dm_gpio_set_value(&priv->ep_gpio, 0);
+
+	ret = reset_assert(&priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert mgmt-sticky reset (ret=%d)\n",
+			ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	udelay(10);
+
+	ret = reset_deassert(&priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	/* Select GEN1 for now */
+	cr = PCIE_CLIENT_GEN_SEL_1;
+	/* Set Root complex mode */
+	cr |= PCIE_CLIENT_CONF_ENABLE | PCIE_CLIENT_MODE_RC;
+	writel(cr, priv->apb_base + PCIE_CLIENT_CONFIG);
+
+	ret = reset_deassert(&priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert mgmt-sticky reset (ret=%d)\n",
+			ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	/* Enable Gen1 training */
+	writel(PCIE_CLIENT_LINK_TRAIN_ENABLE,
+	       priv->apb_base + PCIE_CLIENT_CONFIG);
+
+	if (dm_gpio_is_valid(&priv->ep_gpio))
+		dm_gpio_set_value(&priv->ep_gpio, 1);
+
+	ret = readl_poll_sleep_timeout
+			(priv->apb_base + PCIE_CLIENT_BASIC_STATUS1,
+			status, PCIE_LINK_UP(status), 20, 500 * 1000);
+	if (ret) {
+		dev_err(dev, "PCIe link training gen1 timeout!\n");
+		return ret;
+	}
+
+	/* Initialize Root Complex registers. */
+	writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
+	writel(PCI_CLASS_BRIDGE_PCI << 16,
+	       priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
+	writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
+	       priv->apb_base + PCIE_LM_RCBAR);
+
+	if (dev_read_bool(dev, "aspm-no-l0s")) {
+		val = readl(priv->apb_base + PCIE_RC_PCIE_LCAP);
+		val &= ~PCIE_RC_PCIE_LCAP_APMS_L0S;
+		writel(val, priv->apb_base + PCIE_RC_PCIE_LCAP);
+	}
+
+	/* Configure Address Translation. */
+	ret = rockchip_pcie_atr_init(priv);
+	if (ret) {
+		dev_err(dev, "PCIE-%d: ATR init failed\n", dev->seq);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_set_vpcie(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	int ret;
+
+	if (!IS_ERR(priv->vpcie3v3)) {
+		ret = regulator_set_enable(priv->vpcie3v3, true);
+		if (ret) {
+			dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n",
+				ret);
+			return ret;
+		}
+	}
+
+	ret = regulator_set_enable(priv->vpcie1v8, true);
+	if (ret) {
+		dev_err(dev, "failed to enable vpcie1v8 (ret=%d)\n", ret);
+		goto err_disable_3v3;
+	}
+
+	ret = regulator_set_enable(priv->vpcie0v9, true);
+	if (ret) {
+		dev_err(dev, "failed to enable vpcie0v9 (ret=%d)\n", ret);
+		goto err_disable_1v8;
+	}
+
+	return 0;
+
+err_disable_1v8:
+	regulator_set_enable(priv->vpcie1v8, false);
+err_disable_3v3:
+	if (!IS_ERR(priv->vpcie3v3))
+		regulator_set_enable(priv->vpcie3v3, false);
+	return ret;
+}
+
+static int rockchip_pcie_parse_dt(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	int ret;
+
+	priv->axi_base = dev_read_addr_name(dev, "axi-base");
+	if (!priv->axi_base)
+		return -ENODEV;
+
+	priv->apb_base = dev_read_addr_name(dev, "apb-base");
+	if (!priv->axi_base)
+		return -ENODEV;
+
+	ret = gpio_request_by_name(dev, "ep-gpios", 0,
+				   &priv->ep_gpio, GPIOD_IS_OUT);
+	if (ret) {
+		dev_err(dev, "failed to find ep-gpios property\n");
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "core", &priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to get core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "mgmt", &priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to get mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "mgmt-sticky", &priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to get mgmt-sticky reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pipe", &priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pm", &priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pclk", &priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "aclk", &priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to get aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie3v3-supply",
+					  &priv->vpcie3v3);
+	if (ret && ret != -ENOENT) {
+		dev_err(dev, "failed to get vpcie3v3 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie1v8-supply",
+					  &priv->vpcie1v8);
+	if (ret) {
+		dev_err(dev, "failed to get vpcie1v8 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie0v9-supply",
+					  &priv->vpcie0v9);
+	if (ret) {
+		dev_err(dev, "failed to get vpcie0v9 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_probe(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	struct udevice *ctlr = pci_get_controller(dev);
+	struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+	int ret;
+
+	priv->first_busno = dev->seq;
+	priv->dev = dev;
+
+	ret = rockchip_pcie_parse_dt(dev);
+	if (ret)
+		return ret;
+
+	ret = rockchip_pcie_set_vpcie(dev);
+	if (ret)
+		return ret;
+
+	ret = rockchip_pcie_init_port(dev);
+	if (ret)
+		return ret;
+
+	dev_info(dev, "PCIE-%d: Link up (Bus%d)\n",
+		 dev->seq, hose->first_busno);
+
+	return 0;
+}
+
+static const struct dm_pci_ops rockchip_pcie_ops = {
+	.read_config	= rockchip_pcie_rd_conf,
+	.write_config	= rockchip_pcie_wr_conf,
+};
+
+static const struct udevice_id rockchip_pcie_ids[] = {
+	{ .compatible = "rockchip,rk3399-pcie" },
+	{ }
+};
+
+U_BOOT_DRIVER(rockchip_pcie) = {
+	.name			= "rockchip_pcie",
+	.id			= UCLASS_PCI,
+	.of_match		= rockchip_pcie_ids,
+	.ops			= &rockchip_pcie_ops,
+	.probe			= rockchip_pcie_probe,
+	.priv_auto_alloc_size	= sizeof(struct rockchip_pcie),
+};
drivers/pci/pcie_rockchip.h new file +69 -0
new file mode 100644
index 0000000000..6ded5c9553
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Rockchip PCIe Headers
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ *
+ */
+
+#define HIWORD_UPDATE(mask, val)        (((mask) << 16) | (val))
+#define HIWORD_UPDATE_BIT(val)          HIWORD_UPDATE(val, val)
+
+#define ENCODE_LANES(x)                 ((((x) >> 1) & 3) << 4)
+#define PCIE_CLIENT_BASE                0x0
+#define PCIE_CLIENT_CONFIG              (PCIE_CLIENT_BASE + 0x00)
+#define PCIE_CLIENT_CONF_ENABLE         HIWORD_UPDATE_BIT(0x0001)
+#define PCIE_CLIENT_LINK_TRAIN_ENABLE   HIWORD_UPDATE_BIT(0x0002)
+#define PCIE_CLIENT_MODE_RC             HIWORD_UPDATE_BIT(0x0040)
+#define PCIE_CLIENT_GEN_SEL_1           HIWORD_UPDATE(0x0080, 0)
+#define PCIE_CLIENT_BASIC_STATUS1	0x0048
+#define PCIE_CLIENT_LINK_STATUS_UP	GENMASK(21, 20)
+#define PCIE_CLIENT_LINK_STATUS_MASK	GENMASK(21, 20)
+#define PCIE_LINK_UP(x) \
+	(((x) & PCIE_CLIENT_LINK_STATUS_MASK) == PCIE_CLIENT_LINK_STATUS_UP)
+#define PCIE_RC_NORMAL_BASE		0x800000
+#define PCIE_LM_BASE			0x900000
+#define PCIE_LM_VENDOR_ID              (PCIE_LM_BASE + 0x44)
+#define PCIE_LM_VENDOR_ROCKCHIP		0x1d87
+#define PCIE_LM_RCBAR			(PCIE_LM_BASE + 0x300)
+#define PCIE_LM_RCBARPIE		BIT(19)
+#define PCIE_LM_RCBARPIS		BIT(20)
+#define PCIE_RC_BASE			0xa00000
+#define PCIE_RC_CONFIG_DCR		(PCIE_RC_BASE + 0x0c4)
+#define PCIE_RC_CONFIG_DCR_CSPL_SHIFT	18
+#define PCIE_RC_CONFIG_DCR_CPLS_SHIFT	26
+#define PCIE_RC_PCIE_LCAP		(PCIE_RC_BASE + 0x0cc)
+#define PCIE_RC_PCIE_LCAP_APMS_L0S	BIT(10)
+#define PCIE_ATR_BASE			0xc00000
+#define PCIE_ATR_OB_ADDR0(i)		(PCIE_ATR_BASE + 0x000 + (i) * 0x20)
+#define PCIE_ATR_OB_ADDR1(i)		(PCIE_ATR_BASE + 0x004 + (i) * 0x20)
+#define PCIE_ATR_OB_DESC0(i)		(PCIE_ATR_BASE + 0x008 + (i) * 0x20)
+#define PCIE_ATR_OB_DESC1(i)		(PCIE_ATR_BASE + 0x00c + (i) * 0x20)
+#define PCIE_ATR_IB_ADDR0(i)		(PCIE_ATR_BASE + 0x800 + (i) * 0x8)
+#define PCIE_ATR_IB_ADDR1(i)		(PCIE_ATR_BASE + 0x804 + (i) * 0x8)
+#define PCIE_ATR_HDR_MEM		0x2
+#define PCIE_ATR_HDR_IO			0x6
+#define PCIE_ATR_HDR_CFG_TYPE0		0xa
+#define PCIE_ATR_HDR_CFG_TYPE1		0xb
+#define PCIE_ATR_HDR_RID		BIT(23)
+
+#define PCIE_ATR_OB_REGION0_SIZE	(32 * 1024 * 1024)
+#define PCIE_ATR_OB_REGION_SIZE		(1 * 1024 * 1024)
+
+struct rockchip_pcie {
+	fdt_addr_t axi_base;
+	fdt_addr_t apb_base;
+	int first_busno;
+	struct udevice *dev;
+
+	/* resets */
+	struct reset_ctl core_rst;
+	struct reset_ctl mgmt_rst;
+	struct reset_ctl mgmt_sticky_rst;
+	struct reset_ctl pipe_rst;
+	struct reset_ctl pm_rst;
+	struct reset_ctl pclk_rst;
+	struct reset_ctl aclk_rst;

drivers/pci/pcie_rockchip.h line 79

Quoted 10 lines
drivers/pci/pcie_rockchip.h new file +10 -0
+
+	/* gpio */
+	struct gpio_desc ep_gpio;
+
+	/* vpcie regulators */
+	struct udevice *vpcie12v;
+	struct udevice *vpcie3v3;
+	struct udevice *vpcie1v8;
+	struct udevice *vpcie0v9;
+};

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#20 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver【请注意,邮件由linux-rockchip-bounces+shawn.lin=rock-chips.com@lists.infradead.org代发】

Quoted 117 lines · Shawn Lin
Quoted 6 lines · Jagan Teki

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

Thanks for your patches!

Quoted 89 lines
---
  drivers/pci/Kconfig         |   8 +
  drivers/pci/Makefile        |   1 +
  drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
  drivers/pci/pcie_rockchip.h |  79 +++++++
  4 files changed, 548 insertions(+)

create mode 100644 drivers/pci/pcie_rockchip.c
create mode 100644 drivers/pci/pcie_rockchip.h

drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
        Say Y here if you want to enable Gen2 PCIe controller,
        which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+     bool "Enable Rockchip PCIe driver"
+     select DM_PCI
+     default y if ROCKCHIP_RK3399
+     help
+       Say Y here if you want to enable PCIe controller support on
+       Rockchip SoCs.
+
  endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
  obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
  obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
  obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +46 -0
new file mode 100644
index 0000000000..adc64aedf5
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Rockchip AXI PCIe host controller driver
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ * Copyright (c) 2018 Mark Kettenis <[email protected]>
+ *
+ * Bits taken from Linux Rockchip PCIe host controller.
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <pci.h>
+#include <power-domain.h>
+#include <power/regulator.h>
+#include <reset.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <asm/arch-rockchip/clock.h>
+#include <linux/iopoll.h>
+
+#include "pcie_rockchip.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int rockchip_pcie_rd_conf(const struct udevice *bus, pci_dev_t bdf,
+                              uint offset, ulong *valuep,
+                              enum pci_size_t size)
+{
+     struct rockchip_pcie *priv = dev_get_priv(bus);
+     ulong value;
+     u32 off;
+
+     off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+           (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+     if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;

drivers/pci/pcie_rockchip.c line 56

Quoted 10 lines
drivers/pci/pcie_rockchip.c new file +10 -0
+     }
+
+     if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+             value = readl(priv->axi_base + off);
+             *valuep = pci_conv_32_to_size(value, offset, size);
+             return 0;
+     }
+
+     *valuep = pci_get_ff(size);
+

PCIe cfg accessors, for instance, rockchip_pcie_rd_config,is supposed to configure TLP type to PCIE_ATR_HDR_CFG_TYPE1 if scanning the downstream buses, as it possiblely is a pcie-switch which should need forward the type1 header packets.

Quoted 2 lines

Linux driver is a good example for reference:
https://elixir.bootlin.com/linux/latest/source/drivers/pci/controller/pcie-rockchip-host.c#L177

Looks like we need to preserve root_bus_nr for this, but this indeed requires to parse the pcie ranges which I'm not sure it would be available in U-Boot. But, I can mark it as TODO if it really requires it in U-Boot.?

Jagan.

Reviewed-by
#21 lore raw

Re: [PATCH 5/8] pci: Add Rockchip PCIe controller driver

In reply to a message not in the archive
Quoted 8 lines · Jagan Teki

Add Rockchip PCIe controller driver for rk3399 platform.

Driver support Gen1 by operating as a Root complex.

Thanks to Patrick for initial work.

Thanks,
- Kever

Quoted 576 lines
---
  drivers/pci/Kconfig         |   8 +
  drivers/pci/Makefile        |   1 +
  drivers/pci/pcie_rockchip.c | 460 ++++++++++++++++++++++++++++++++++++
  drivers/pci/pcie_rockchip.h |  79 +++++++
  4 files changed, 548 insertions(+)

create mode 100644 drivers/pci/pcie_rockchip.c
create mode 100644 drivers/pci/pcie_rockchip.h

drivers/pci/Kconfig +8 -0
index 437cd9a055..3dba84103b 100644
@@ -197,4 +197,12 @@ config PCIE_MEDIATEK
  	  Say Y here if you want to enable Gen2 PCIe controller,
  	  which could be found on MT7623 SoC family.
 
+config PCIE_ROCKCHIP
+	bool "Enable Rockchip PCIe driver"
+	select DM_PCI
+	default y if ROCKCHIP_RK3399
+	help
+	  Say Y here if you want to enable PCIe controller support on
+	  Rockchip SoCs.
+
  endif
drivers/pci/Makefile +1 -0
index c051ecc9f3..493e9354dd 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
  obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
  obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
  obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
drivers/pci/pcie_rockchip.c new file +460 -0
new file mode 100644
index 0000000000..adc64aedf5
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Rockchip AXI PCIe host controller driver
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ * Copyright (c) 2018 Mark Kettenis <[email protected]>
+ *
+ * Bits taken from Linux Rockchip PCIe host controller.
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <pci.h>
+#include <power-domain.h>
+#include <power/regulator.h>
+#include <reset.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <asm/arch-rockchip/clock.h>
+#include <linux/iopoll.h>
+
+#include "pcie_rockchip.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int rockchip_pcie_rd_conf(const struct udevice *bus, pci_dev_t bdf,
+				 uint offset, ulong *valuep,
+				 enum pci_size_t size)
+{
+	struct rockchip_pcie *priv = dev_get_priv(bus);
+	ulong value;
+	u32 off;
+
+	off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+	      (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+	if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+		value = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		*valuep = pci_conv_32_to_size(value, offset, size);
+		return 0;
+	}
+
+	if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+		value = readl(priv->axi_base + off);
+		*valuep = pci_conv_32_to_size(value, offset, size);
+		return 0;
+	}
+
+	*valuep = pci_get_ff(size);
+
+	return 0;
+}
+
+static int rockchip_pcie_wr_conf(struct udevice *bus, pci_dev_t bdf,
+				 uint offset, ulong value,
+				 enum pci_size_t size)
+{
+	struct rockchip_pcie *priv = dev_get_priv(bus);
+	ulong old;
+	u32 off;
+
+	off = (PCI_BUS(bdf) << 20) | (PCI_DEV(bdf) << 15) |
+	      (PCI_FUNC(bdf) << 12) | (offset & ~0x3);
+
+	if ((PCI_BUS(bdf) == priv->first_busno) && (PCI_DEV(bdf) == 0)) {
+		old = readl(priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		value = pci_conv_size_to_32(old, value, offset, size);
+		writel(value, priv->apb_base + PCIE_RC_NORMAL_BASE + off);
+		return 0;
+	}
+
+	if ((PCI_BUS(bdf) == priv->first_busno + 1) && (PCI_DEV(bdf) == 0)) {
+		old = readl(priv->axi_base + off);
+		value = pci_conv_size_to_32(old, value, offset, size);
+		writel(value, priv->axi_base + off);
+		return 0;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_atr_init(struct rockchip_pcie *priv)
+{
+	struct udevice *ctlr = pci_get_controller(priv->dev);
+	struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+	u64 addr, size, offset;
+	u32 type;
+	int i, region;
+
+	/* Use region 0 to map PCI configuration space. */
+	writel(25 - 1, priv->apb_base + PCIE_ATR_OB_ADDR0(0));
+	writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(0));
+	writel(PCIE_ATR_HDR_CFG_TYPE0 | PCIE_ATR_HDR_RID,
+	       priv->apb_base + PCIE_ATR_OB_DESC0(0));
+	writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(0));
+
+	for (i = 0; i < hose->region_count; i++) {
+		if (hose->regions[i].flags == PCI_REGION_SYS_MEMORY)
+			continue;
+
+		if (hose->regions[i].flags == PCI_REGION_IO)
+			type = PCIE_ATR_HDR_IO;
+		else
+			type = PCIE_ATR_HDR_MEM;
+
+		/* Only support identity mappings. */
+		if (hose->regions[i].bus_start !=
+		    hose->regions[i].phys_start)
+			return -EINVAL;
+
+		/* Only support mappings aligned on a region boundary. */
+		addr = hose->regions[i].bus_start;
+		if (addr & (PCIE_ATR_OB_REGION_SIZE - 1))
+			return -EINVAL;
+
+		/* Mappings should lie between AXI and APB regions. */
+		size = hose->regions[i].size;
+		if (addr < (u64)priv->axi_base + PCIE_ATR_OB_REGION0_SIZE)
+			return -EINVAL;
+		if (addr + size > (u64)priv->apb_base)
+			return -EINVAL;
+
+		offset = addr - (u64)priv->axi_base - PCIE_ATR_OB_REGION0_SIZE;
+		region = 1 + (offset / PCIE_ATR_OB_REGION_SIZE);
+		while (size > 0) {
+			writel(32 - 1,
+			       priv->apb_base + PCIE_ATR_OB_ADDR0(region));
+			writel(0, priv->apb_base + PCIE_ATR_OB_ADDR1(region));
+			writel(type | PCIE_ATR_HDR_RID,
+			       priv->apb_base + PCIE_ATR_OB_DESC0(region));
+			writel(0, priv->apb_base + PCIE_ATR_OB_DESC1(region));
+
+			addr += PCIE_ATR_OB_REGION_SIZE;
+			size -= PCIE_ATR_OB_REGION_SIZE;
+			region++;
+		}
+	}
+
+	/* Passthrough inbound translations unmodified. */
+	writel(32 - 1, priv->apb_base + PCIE_ATR_IB_ADDR0(2));
+	writel(0, priv->apb_base + PCIE_ATR_IB_ADDR1(2));
+
+	return 0;
+}
+
+static int rockchip_pcie_init_port(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	u32 cr, val, status;
+	int ret;
+
+	if (dm_gpio_is_valid(&priv->ep_gpio))
+		dm_gpio_set_value(&priv->ep_gpio, 0);
+
+	ret = reset_assert(&priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert mgmt-sticky reset (ret=%d)\n",
+			ret);
+		return ret;
+	}
+
+	ret = reset_assert(&priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to assert pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	udelay(10);
+
+	ret = reset_deassert(&priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	/* Select GEN1 for now */
+	cr = PCIE_CLIENT_GEN_SEL_1;
+	/* Set Root complex mode */
+	cr |= PCIE_CLIENT_CONF_ENABLE | PCIE_CLIENT_MODE_RC;
+	writel(cr, priv->apb_base + PCIE_CLIENT_CONFIG);
+
+	ret = reset_deassert(&priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert mgmt-sticky reset (ret=%d)\n",
+			ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_deassert(&priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to deassert pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	/* Enable Gen1 training */
+	writel(PCIE_CLIENT_LINK_TRAIN_ENABLE,
+	       priv->apb_base + PCIE_CLIENT_CONFIG);
+
+	if (dm_gpio_is_valid(&priv->ep_gpio))
+		dm_gpio_set_value(&priv->ep_gpio, 1);
+
+	ret = readl_poll_sleep_timeout
+			(priv->apb_base + PCIE_CLIENT_BASIC_STATUS1,
+			status, PCIE_LINK_UP(status), 20, 500 * 1000);
+	if (ret) {
+		dev_err(dev, "PCIe link training gen1 timeout!\n");
+		return ret;
+	}
+
+	/* Initialize Root Complex registers. */
+	writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
+	writel(PCI_CLASS_BRIDGE_PCI << 16,
+	       priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
+	writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
+	       priv->apb_base + PCIE_LM_RCBAR);
+
+	if (dev_read_bool(dev, "aspm-no-l0s")) {
+		val = readl(priv->apb_base + PCIE_RC_PCIE_LCAP);
+		val &= ~PCIE_RC_PCIE_LCAP_APMS_L0S;
+		writel(val, priv->apb_base + PCIE_RC_PCIE_LCAP);
+	}
+
+	/* Configure Address Translation. */
+	ret = rockchip_pcie_atr_init(priv);
+	if (ret) {
+		dev_err(dev, "PCIE-%d: ATR init failed\n", dev->seq);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_set_vpcie(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	int ret;
+
+	if (!IS_ERR(priv->vpcie3v3)) {
+		ret = regulator_set_enable(priv->vpcie3v3, true);
+		if (ret) {
+			dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n",
+				ret);
+			return ret;
+		}
+	}
+
+	ret = regulator_set_enable(priv->vpcie1v8, true);
+	if (ret) {
+		dev_err(dev, "failed to enable vpcie1v8 (ret=%d)\n", ret);
+		goto err_disable_3v3;
+	}
+
+	ret = regulator_set_enable(priv->vpcie0v9, true);
+	if (ret) {
+		dev_err(dev, "failed to enable vpcie0v9 (ret=%d)\n", ret);
+		goto err_disable_1v8;
+	}
+
+	return 0;
+
+err_disable_1v8:
+	regulator_set_enable(priv->vpcie1v8, false);
+err_disable_3v3:
+	if (!IS_ERR(priv->vpcie3v3))
+		regulator_set_enable(priv->vpcie3v3, false);
+	return ret;
+}
+
+static int rockchip_pcie_parse_dt(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	int ret;
+
+	priv->axi_base = dev_read_addr_name(dev, "axi-base");
+	if (!priv->axi_base)
+		return -ENODEV;
+
+	priv->apb_base = dev_read_addr_name(dev, "apb-base");
+	if (!priv->axi_base)
+		return -ENODEV;
+
+	ret = gpio_request_by_name(dev, "ep-gpios", 0,
+				   &priv->ep_gpio, GPIOD_IS_OUT);
+	if (ret) {
+		dev_err(dev, "failed to find ep-gpios property\n");
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "core", &priv->core_rst);
+	if (ret) {
+		dev_err(dev, "failed to get core reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "mgmt", &priv->mgmt_rst);
+	if (ret) {
+		dev_err(dev, "failed to get mgmt reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "mgmt-sticky", &priv->mgmt_sticky_rst);
+	if (ret) {
+		dev_err(dev, "failed to get mgmt-sticky reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pipe", &priv->pipe_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pipe reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pm", &priv->pm_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pm reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "pclk", &priv->pclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to get pclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = reset_get_by_name(dev, "aclk", &priv->aclk_rst);
+	if (ret) {
+		dev_err(dev, "failed to get aclk reset (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie3v3-supply",
+					  &priv->vpcie3v3);
+	if (ret && ret != -ENOENT) {
+		dev_err(dev, "failed to get vpcie3v3 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie1v8-supply",
+					  &priv->vpcie1v8);
+	if (ret) {
+		dev_err(dev, "failed to get vpcie1v8 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	ret = device_get_supply_regulator(dev, "vpcie0v9-supply",
+					  &priv->vpcie0v9);
+	if (ret) {
+		dev_err(dev, "failed to get vpcie0v9 supply (ret=%d)\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int rockchip_pcie_probe(struct udevice *dev)
+{
+	struct rockchip_pcie *priv = dev_get_priv(dev);
+	struct udevice *ctlr = pci_get_controller(dev);
+	struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+	int ret;
+
+	priv->first_busno = dev->seq;
+	priv->dev = dev;
+
+	ret = rockchip_pcie_parse_dt(dev);
+	if (ret)
+		return ret;
+
+	ret = rockchip_pcie_set_vpcie(dev);
+	if (ret)
+		return ret;
+
+	ret = rockchip_pcie_init_port(dev);
+	if (ret)
+		return ret;
+
+	dev_info(dev, "PCIE-%d: Link up (Bus%d)\n",
+		 dev->seq, hose->first_busno);
+
+	return 0;
+}
+
+static const struct dm_pci_ops rockchip_pcie_ops = {
+	.read_config	= rockchip_pcie_rd_conf,
+	.write_config	= rockchip_pcie_wr_conf,
+};
+
+static const struct udevice_id rockchip_pcie_ids[] = {
+	{ .compatible = "rockchip,rk3399-pcie" },
+	{ }
+};
+
+U_BOOT_DRIVER(rockchip_pcie) = {
+	.name			= "rockchip_pcie",
+	.id			= UCLASS_PCI,
+	.of_match		= rockchip_pcie_ids,
+	.ops			= &rockchip_pcie_ops,
+	.probe			= rockchip_pcie_probe,
+	.priv_auto_alloc_size	= sizeof(struct rockchip_pcie),
+};
drivers/pci/pcie_rockchip.h new file +69 -0
new file mode 100644
index 0000000000..6ded5c9553
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Rockchip PCIe Headers
+ *
+ * Copyright (c) 2016 Rockchip, Inc.
+ * Copyright (c) 2020 Amarula Solutions(India)
+ * Copyright (c) 2020 Jagan Teki <[email protected]>
+ * Copyright (c) 2019 Patrick Wildt <[email protected]>
+ *
+ */
+
+#define HIWORD_UPDATE(mask, val)        (((mask) << 16) | (val))
+#define HIWORD_UPDATE_BIT(val)          HIWORD_UPDATE(val, val)
+
+#define ENCODE_LANES(x)                 ((((x) >> 1) & 3) << 4)
+#define PCIE_CLIENT_BASE                0x0
+#define PCIE_CLIENT_CONFIG              (PCIE_CLIENT_BASE + 0x00)
+#define PCIE_CLIENT_CONF_ENABLE         HIWORD_UPDATE_BIT(0x0001)
+#define PCIE_CLIENT_LINK_TRAIN_ENABLE   HIWORD_UPDATE_BIT(0x0002)
+#define PCIE_CLIENT_MODE_RC             HIWORD_UPDATE_BIT(0x0040)
+#define PCIE_CLIENT_GEN_SEL_1           HIWORD_UPDATE(0x0080, 0)
+#define PCIE_CLIENT_BASIC_STATUS1	0x0048
+#define PCIE_CLIENT_LINK_STATUS_UP	GENMASK(21, 20)
+#define PCIE_CLIENT_LINK_STATUS_MASK	GENMASK(21, 20)
+#define PCIE_LINK_UP(x) \
+	(((x) & PCIE_CLIENT_LINK_STATUS_MASK) == PCIE_CLIENT_LINK_STATUS_UP)
+#define PCIE_RC_NORMAL_BASE		0x800000
+#define PCIE_LM_BASE			0x900000
+#define PCIE_LM_VENDOR_ID              (PCIE_LM_BASE + 0x44)
+#define PCIE_LM_VENDOR_ROCKCHIP		0x1d87
+#define PCIE_LM_RCBAR			(PCIE_LM_BASE + 0x300)
+#define PCIE_LM_RCBARPIE		BIT(19)
+#define PCIE_LM_RCBARPIS		BIT(20)
+#define PCIE_RC_BASE			0xa00000
+#define PCIE_RC_CONFIG_DCR		(PCIE_RC_BASE + 0x0c4)
+#define PCIE_RC_CONFIG_DCR_CSPL_SHIFT	18
+#define PCIE_RC_CONFIG_DCR_CPLS_SHIFT	26
+#define PCIE_RC_PCIE_LCAP		(PCIE_RC_BASE + 0x0cc)
+#define PCIE_RC_PCIE_LCAP_APMS_L0S	BIT(10)
+#define PCIE_ATR_BASE			0xc00000
+#define PCIE_ATR_OB_ADDR0(i)		(PCIE_ATR_BASE + 0x000 + (i) * 0x20)
+#define PCIE_ATR_OB_ADDR1(i)		(PCIE_ATR_BASE + 0x004 + (i) * 0x20)
+#define PCIE_ATR_OB_DESC0(i)		(PCIE_ATR_BASE + 0x008 + (i) * 0x20)
+#define PCIE_ATR_OB_DESC1(i)		(PCIE_ATR_BASE + 0x00c + (i) * 0x20)
+#define PCIE_ATR_IB_ADDR0(i)		(PCIE_ATR_BASE + 0x800 + (i) * 0x8)
+#define PCIE_ATR_IB_ADDR1(i)		(PCIE_ATR_BASE + 0x804 + (i) * 0x8)
+#define PCIE_ATR_HDR_MEM		0x2
+#define PCIE_ATR_HDR_IO			0x6
+#define PCIE_ATR_HDR_CFG_TYPE0		0xa
+#define PCIE_ATR_HDR_CFG_TYPE1		0xb
+#define PCIE_ATR_HDR_RID		BIT(23)
+
+#define PCIE_ATR_OB_REGION0_SIZE	(32 * 1024 * 1024)
+#define PCIE_ATR_OB_REGION_SIZE		(1 * 1024 * 1024)
+
+struct rockchip_pcie {
+	fdt_addr_t axi_base;
+	fdt_addr_t apb_base;
+	int first_busno;
+	struct udevice *dev;
+
+	/* resets */
+	struct reset_ctl core_rst;
+	struct reset_ctl mgmt_rst;
+	struct reset_ctl mgmt_sticky_rst;
+	struct reset_ctl pipe_rst;
+	struct reset_ctl pm_rst;
+	struct reset_ctl pclk_rst;
+	struct reset_ctl aclk_rst;

drivers/pci/pcie_rockchip.h line 79

Quoted 10 lines
drivers/pci/pcie_rockchip.h new file +10 -0
+
+	/* gpio */
+	struct gpio_desc ep_gpio;
+
+	/* vpcie regulators */
+	struct udevice *vpcie12v;
+	struct udevice *vpcie3v3;
+	struct udevice *vpcie1v8;
+	struct udevice *vpcie0v9;
+};

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#22 lore raw

PATCH 6/8 pci: Add Rockchip PCIe PHY controller driver

In reply to a message not in the archive

Yes, it is possible to have a dedicated UCLASS PHY driver for this Rockchip PCIe PHY but there are some issues on Generic PHY framework to support the same.

The Generic PHY framework is unable to get the PHY if the PHY parent is of a different uclass.

Say if we try to get the PCIe PHY then the phy-uclass will look for PHY in the first instance if it is not in the root node it will try to probe the parent by assuming that the actual PHY is inside the parent PHY of UCLASS_PHY. But, in rk3399 hardware representation PHY like emmc, usb and pcie are part of syscon which is completely a different of UCLASS_SYSCON.

Example:

grf: syscon@ff770000 {
compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0x0 0xff770000 0x0 0x10000>; #address-cells = <1>;
#size-cells = <1>;

   pcie_phy: pcie-phy {
       compatible = "rockchip,rk3399-pcie-phy";
       clocks = <&cru SCLK_PCIEPHY_REF>;
       clock-names = "refclk";
       #phy-cells = <1>;
       resets = <&cru SRST_PCIEPHY>;
       drive-impedance-ohm = <50>;
       reset-names = "phy";
       status = "disabled";

};
};

Due to this limitation, this patch adds a separate PHY driver for Rockchip PCIe. This might be removed in future once Generic PHY supports this limitation.

---
 drivers/pci/Makefile            |   2 +-
 drivers/pci/pcie_rockchip.c     |  50 ++++++--
 drivers/pci/pcie_rockchip.h     |  63 ++++++++++
 drivers/pci/pcie_rockchip_phy.c | 205 ++++++++++++++++++++++++++++++++
 4 files changed, 306 insertions(+), 14 deletions(-)
 create mode 100644 drivers/pci/pcie_rockchip_phy.c
drivers/pci/Makefile +1 -1
index 493e9354dd..955351c5c2 100644
@@ -43,4 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
 obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
 obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
-obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o
+obj-$(CONFIG_PCIE_ROCKCHIP) += pcie_rockchip.o pcie_rockchip_phy.o
drivers/pci/pcie_rockchip.c +37 -13

143 lines not on this page · raw message

drivers/pci/pcie_rockchip.h +63 -0

77 lines not on this page · raw message

drivers/pci/pcie_rockchip_phy.c new file +205 -0

205 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#23 lore raw

PATCH 7/8 rockchip: Enable PCIe/M.2 on rk3399 board w/ M.2

In reply to a message not in the archive

Enable PCIe/M.2 support on
- NanoPC-T4
- ROC-RK3399-PC Mezzanine boards.

=> pci
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x1d87 0x0100 Bridge device 0x04
=> nvme scan
=> nvme dev

IDE device 0: Vendor: 0x144d Rev: 4L1QCXB7 Prod: S35FNX0J623292
Type: Hard Disk
Capacity: 122104.3 MB = 119.2 GB (250069680 x 512)

---
 arch/arm/dts/rk3399-u-boot.dtsi           | 1 +
 configs/nanopc-t4-rk3399_defconfig        | 4 ++++
 configs/roc-pc-mezzanine-rk3399_defconfig | 4 ++++
 3 files changed, 9 insertions(+)
arch/arm/dts/rk3399-u-boot.dtsi +1 -0
index ef57c36e73..a79a2d23d8 100644
@@ -8,6 +8,7 @@
 	aliases {
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
+		pci0 = &pcie0;
 	};
 
 	cic: syscon@ff620000 {
configs/nanopc-t4-rk3399_defconfig +4 -0
index 607a00dbf7..032256fd76 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
@@ -34,10 +35,13 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYSRESET=y
configs/roc-pc-mezzanine-rk3399_defconfig +4 -0
index 5a694edc03..0b853805f3 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
@@ -36,11 +37,14 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
+CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_ROCKCHIP_SPI=y
Signature · 1 line
2.17.1
author
#24 lore raw

PATCH 8/8 rockchip: Enable PCIe/M.2 on rock960 board

In reply to a message not in the archive

Due to some on board limitation rock960 PCIe
works only with 1.8V IO domain.

So, this patch enables grf io_sel explicitly
to make PCIe/M.2 to work.

rock960 => pci
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x1d87 0x0100 Bridge device 0x04
rock960 => nvme scan
rock960 => nvme dev

IDE device 0: Vendor: 0x144d Rev: 4L1QCXB7 Prod: S35FNX0J623292
Type: Hard Disk
Capacity: 122104.3 MB = 119.2 GB (250069680 x 512)

---
 board/vamrs/rock960_rk3399/rock960-rk3399.c | 20 ++++++++++++++++++++
 configs/rock960-rk3399_defconfig            |  5 +++++
 2 files changed, 25 insertions(+)
board/vamrs/rock960_rk3399/rock960-rk3399.c +20 -0
index 68a127b9ac..98d62e89ca 100644
@@ -2,3 +2,23 @@
 /*
  * Copyright (C) 2018 Manivannan Sadhasivam <[email protected]>
  */
+
+#include <common.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/grf_rk3399.h>
+#include <asm/arch-rockchip/hardware.h>
+
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+	struct rk3399_grf_regs *grf =
+	    syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+
+	/* BT565 is in 1.8v domain */
+	rk_setreg(&grf->io_vsel, BIT(0));
+
+	return 0;
+}
+#endif
configs/rock960-rk3399_defconfig +5 -0
index c4e954731a..cb1ec3c26b 100644
@@ -9,6 +9,7 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART=y
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb"
+CONFIG_MISC_INIT_R=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 CONFIG_SPL_STACK_R=y
@@ -19,6 +20,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_CMD_PMIC=y
@@ -36,10 +38,13 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_DM_ETH=y
+CONFIG_NVME=y
+CONFIG_PCI=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYSRESET=y
Signature · 1 line
2.17.1