Skip to contentSkip to conversation

fix apalis_t30 optional pcie operation

PATCH New Marcel Ziswiler 1 participant 4 messages May 8, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v4 cover fix apalis_t30 optional pcie operation

This series addresses a PCIe reliability issue as observed on Apalis T30 related to a PCIe reset timing violation.

This series is available at http://git.toradex.com/cgit/u-boot-toradex.git/log/?h=for-next

Changes in v4:
- Fix spelling of losing vs. loosing.

Changes in v3:
- Updated copyright period to 2014-2018.
- Added a blank line after declarations as warned by patman.
- Added Stephen's acked-by.
- Rebased and resend as series so far never got applied!

Changes in v2:
- Leave resp. enable all port 0 pins input drivers as a customer may optionally want to use some of those MXM3 pins as inputs as well.
- Stick to struct tegra_pcie_port as suggested by Stephen.
- Introduce proper CONFIG_APALIS_T30_PCIE_EVALBOARD_INIT Kconfig option as suggested by Stephen.
- Improved the ifdef vs. if curly braces sequencing as suggested by Stephen.
- Keep PCIe port reset status in order to safeguard for future changes to the port reset order or even allow for re-initialisation should that ever be implemented in the higher levels of the driver model.

Marcel Ziswiler (3):
apalis_t30: describe pcie ports
apalis_t30: fix pcie port 0 and 1 pin muxing
apalis_t30: fix optional pcie port reset for reliable pcie operation

 arch/arm/dts/tegra30-apalis.dts                    |  3 ++
 board/toradex/apalis_t30/Kconfig                   |  9 ++++
 board/toradex/apalis_t30/apalis_t30.c              | 57 +++++++++++++++++++++-
 .../toradex/apalis_t30/pinmux-config-apalis_t30.h  | 16 +++---
 4 files changed, 77 insertions(+), 8 deletions(-)
Signature · 1 line
2.14.3
#1 lore raw

PATCH v4 1/3 apalis_t30: describe pcie ports

From: Marcel Ziswiler <[email protected]>

Add some more comments describing the various PCIe ports available.

---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm/dts/tegra30-apalis.dts | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/dts/tegra30-apalis.dts +3 -0
index 0b84dae215..0852d8dc53 100644
@@ -43,16 +43,19 @@
 		vddio-pex-ctl-supply = <&sys_3v3_reg>;
 		hvdd-pex-supply = <&sys_3v3_reg>;
 
+		/* Apalis Type Specific 4 Lane PCIe */
 		pci at 1,0 {
 			/* TS_DIFF1/2/3/4 left disabled */
 			nvidia,num-lanes = <4>;
 		};
 
+		/* Apalis PCIe */
 		pci at 2,0 {
 			/* PCIE1_RX/TX left disabled */
 			nvidia,num-lanes = <1>;
 		};
 
+		/* I210 Gigabit Ethernet Controller (On-module) */
 		pci at 3,0 {
 			status = "okay";
 			nvidia,num-lanes = <1>;
Signature · 1 line
2.14.3
#2 lore raw

PATCH v4 2/3 apalis_t30: fix pcie port 0 and 1 pin muxing

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix optional Apalis type specific 4 lane PCIe port 0 and Apalis PCIe port 1 pin muxing.

---

Changes in v4: None
Changes in v3: None
Changes in v2:
- Leave resp. enable all port 0 pins input drivers as a customer may optionally want to use some of those MXM3 pins as inputs as well.

 board/toradex/apalis_t30/pinmux-config-apalis_t30.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
board/toradex/apalis_t30/pinmux-config-apalis_t30.h +9 -7
index e28742ba6f..49c2df7ab2 100644
@@ -284,17 +284,19 @@ static struct pmux_pingrp_config tegra3_pinmux_common[] = {
 	DEFAULT_PINMUX(SPI1_CS0_N_PX6, SPI1, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(SPI1_MISO_PX7, SPI1, NORMAL, NORMAL, INPUT),
 
-	DEFAULT_PINMUX(PEX_L0_PRSNT_N_PDD0, PCIE, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(PEX_L0_RST_N_PDD1, PCIE, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(PEX_L0_CLKREQ_N_PDD2, PCIE, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(PEX_WAKE_N_PDD3, PCIE, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(PEX_L0_PRSNT_N_PDD0, RSVD2, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(PEX_L0_RST_N_PDD1, RSVD2, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(PEX_L0_CLKREQ_N_PDD2, RSVD2, NORMAL, NORMAL, INPUT),
+
+	DEFAULT_PINMUX(PEX_L1_PRSNT_N_PDD4, RSVD2, DOWN, TRISTATE, OUTPUT), /* NC */
+	DEFAULT_PINMUX(PEX_L1_RST_N_PDD5, RSVD2, DOWN, TRISTATE, OUTPUT), /* NC */
+	DEFAULT_PINMUX(PEX_L1_CLKREQ_N_PDD6, RSVD2, DOWN, TRISTATE, OUTPUT), /* NC */
 
-	DEFAULT_PINMUX(PEX_L1_PRSNT_N_PDD4, PCIE, DOWN, TRISTATE, OUTPUT), /* NC */
-	DEFAULT_PINMUX(PEX_L1_RST_N_PDD5, PCIE, DOWN, TRISTATE, OUTPUT), /* NC */
-	DEFAULT_PINMUX(PEX_L1_CLKREQ_N_PDD6, PCIE, DOWN, TRISTATE, OUTPUT), /* NC */
 	DEFAULT_PINMUX(PEX_L2_PRSNT_N_PDD7, PCIE, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(PEX_L2_RST_N_PCC6, PCIE, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(PEX_L2_CLKREQ_N_PCC7, PCIE, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(PEX_WAKE_N_PDD3, PCIE, NORMAL, NORMAL, INPUT),
+
 	DEFAULT_PINMUX(HDMI_CEC_PEE3, CEC, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(HDMI_INT_PN7, RSVD1, NORMAL, NORMAL, INPUT),
 
Signature · 1 line
2.14.3
#3 lore raw

PATCH v4 3/3 apalis_t30: fix optional pcie port reset for reliable pcie operation

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Allow optionally bringing up the Apalis type specific 4 lane PCIe port as well as the PCIe switch as found on the Apalis Evaluation board. In order to avoid violating the PCIe reset timing do this by overriding the tegra_pcie_board_port_reset() function. Note however that both the Apalis type specific 4 lane PCIe port as well as the regular Apalis PCIe port are also left disabled in the device tree by default.

---

Changes in v4:
- Fix spelling of losing vs. loosing.

Changes in v3:
- Updated copyright period to 2014-2018.
- Added a blank line after declarations as warned by patman.
- Added Stephen's acked-by.
- Rebased and resend as series so far never got applied!

Changes in v2:
- Stick to struct tegra_pcie_port as suggested by Stephen.
- Introduce proper CONFIG_APALIS_T30_PCIE_EVALBOARD_INIT Kconfig option as suggested by Stephen.
- Improved the ifdef vs. if curly braces sequencing as suggested by Stephen.
- Keep PCIe port reset status in order to safeguard for future changes to the port reset order or even allow for re-initialisation should that ever be implemented in the higher levels of the driver model.

 board/toradex/apalis_t30/Kconfig      |  9 ++++++
 board/toradex/apalis_t30/apalis_t30.c | 57 ++++++++++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)
board/toradex/apalis_t30/Kconfig +9 -0
index 16224daa12..9cd497091d 100644
@@ -25,6 +25,15 @@ config TDX_CFG_BLOCK_PART
 config TDX_CFG_BLOCK_OFFSET
 	default "-512"
 
+config APALIS_T30_PCIE_EVALBOARD_INIT
+	bool "Apalis Evaluation Board PCIe Initialisation"
+	help
+	  Bring up the Apalis type specific 4 lane PCIe port as well as the
+	  Apalis PCIe port with the PCIe switch as found on the Apalis
+	  Evaluation board. Note that by default both those ports are also left
+	  disabled in the device tree which needs changing as well for this to
+	  actually work.
+
 source "board/toradex/common/Kconfig"
 
 endif
board/toradex/apalis_t30/apalis_t30.c +56 -1

80 lines not on this page · raw message

Signature · 1 line
2.14.3