Skip to contentSkip to conversation

PCI: cadence: Retrain Link to work around Gen2

PATCH Superseded Nadeem Athani 3 participants 8 messages Dec 11, 2020 – Dec 15, 2020

Subsystems (4)

v4 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v4 cover PCI: cadence: Retrain Link to work around Gen2

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed change. Adding a quirk flag based on a new compatible string. In future IP revisions this will not be applicable.

Version history:
Changes in v4:
- Added a quirk flag based on a new compatible string.
- Change of api for link up: cdns_pcie_host_wait_for_link(). Changes in v3:
- To set retrain link bit,checking device capability & link status.
- 32bit read in place of 8bit.
- Minor correction in patch comment.
- Change in variable & macro name.
Changes in v2:
- 16bit read in place of 8bit.

Nadeem Athani (2):
dt-bindings: pci: Retrain Link to work around Gen2 training defect.
PCI: cadence: Retrain Link to work around Gen2 training defect.

 .../bindings/pci/cdns,cdns-pcie-host.yaml          |  4 +-
 drivers/pci/controller/cadence/pcie-cadence-host.c | 67 ++++++++++++++++------
 drivers/pci/controller/cadence/pcie-cadence-plat.c | 13 +++++
 drivers/pci/controller/cadence/pcie-cadence.h      | 11 +++-
 4 files changed, 76 insertions(+), 19 deletions(-)
Signature · 1 line
2.15.0
#1 lore raw

PATCH v4 1/2 dt-bindings: pci: Retrain Link to work around Gen2 training defect.

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed change. Adding a quirk flag based on a new compatible string.

---
 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +3 -1
index 293b8ec318bc..204d78f9efe3 100644
@@ -15,7 +15,9 @@ allOf:
 
 properties:
   compatible:
-    const: cdns,cdns-pcie-host
+    enum:
+        - cdns,cdns-pcie-host
+        - cdns,cdns-pcie-host-quirk-retrain
 
   reg:
     maxItems: 2
Signature · 1 line
2.15.0
maintainer
#2 lore raw

Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

Quoted 15 lines · Nadeem Athani

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed change. Adding a quirk flag based on a new compatible string.

---
 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +0 -0
index 293b8ec318bc..204d78f9efe3 100644

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml allOf: · line 20

Quoted 7 lines
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +3 -1
@@ -15,7 +15,9 @@ allOf:
 
 properties:
   compatible:
-    const: cdns,cdns-pcie-host
+    enum:
+        - cdns,cdns-pcie-host
+        - cdns,cdns-pcie-host-quirk-retrain

So, we'll just keep adding quirk strings on to the compatible? I don't think so. Compatible strings should map to a specific implementation/platform and quirks can then be implied from them. This is the only way we can implement quirks in the OS without firmware (DT) changes.

Rob

#3 lore raw

RE: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

Hi Rob / Kishon,

Quoted 39 lines

-----Original Message-----
From: Rob Herring <[email protected]>
Sent: Friday, December 11, 2020 10:32 PM
To: Athani Nadeem Ladkhan <[email protected]>
Cc: Tom Joseph <[email protected]>; Lorenzo Pieralisi <[email protected]>; Bjorn Helgaas <[email protected]>; PCI <[email protected]>; [email protected]; Kishon Vijay Abraham I <[email protected]>; [email protected]; Milind Parab <[email protected]>; Swapnil Kashinath Jakhade <[email protected]>; Parshuram Raju Thombare <[email protected]>
Subject: Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

EXTERNAL MAIL

Quoted 3 lines · Nadeem Athani

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed

change.

Quoted 16 lines

Adding a quirk flag based on a new compatible string.

---
 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml | 4
+++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml b/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml index 293b8ec318bc..204d78f9efe3 100644

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +0 -0
@@ -15,7 +15,9 @@ allOf:
 
Quoted 12 lines

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml allOf: · line 20

Quoted 6 lines
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +3 -1
 properties:
   compatible:
-    const: cdns,cdns-pcie-host
+    enum:
+        - cdns,cdns-pcie-host
+        - cdns,cdns-pcie-host-quirk-retrain

So, we'll just keep adding quirk strings on to the compatible? I don't think so. Compatible strings should map to a specific implementation/platform and quirks can then be implied from them. This is the only way we can implement quirks in the OS without firmware
(DT) changes.

Ok, I will change the compatible string to " ti,j721e-pcie-host" in place of " cdns,cdns-pcie-host-quirk-retrain" . @Kishon Vijay Abraham I: Is this fine? Or will you suggest an appropriate name?

Nadeem

Quoted 2 lines

Rob

#4 lore raw

Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

Hi Nadeem,

Quoted 53 lines · Athani Nadeem Ladkhan

Hi Rob / Kishon,

Quoted 39 lines

-----Original Message-----
From: Rob Herring <[email protected]>
Sent: Friday, December 11, 2020 10:32 PM
To: Athani Nadeem Ladkhan <[email protected]>
Cc: Tom Joseph <[email protected]>; Lorenzo Pieralisi <[email protected]>; Bjorn Helgaas <[email protected]>; PCI <[email protected]>; [email protected]; Kishon Vijay Abraham I <[email protected]>; [email protected]; Milind Parab <[email protected]>; Swapnil Kashinath Jakhade <[email protected]>; Parshuram Raju Thombare <[email protected]>
Subject: Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

EXTERNAL MAIL

Quoted 3 lines · Nadeem Athani

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed

change.

Quoted 16 lines

Adding a quirk flag based on a new compatible string.

---
 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml | 4
+++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml b/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml index 293b8ec318bc..204d78f9efe3 100644

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +0 -0
@@ -15,7 +15,9 @@ allOf:
 
Quoted 12 lines

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml allOf: · line 20

Quoted 6 lines
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +3 -1
 properties:
   compatible:
-    const: cdns,cdns-pcie-host
+    enum:
+        - cdns,cdns-pcie-host
+        - cdns,cdns-pcie-host-quirk-retrain

So, we'll just keep adding quirk strings on to the compatible? I don't think so. Compatible strings should map to a specific implementation/platform and quirks can then be implied from them. This is the only way we can implement quirks in the OS without firmware
(DT) changes.

Quoted 2 lines

Ok, I will change the compatible string to " ti,j721e-pcie-host" in place of " cdns,cdns-pcie-host-quirk-retrain" . @Kishon Vijay Abraham I: Is this fine? Or will you suggest an appropriate name?

IMHO it should be something like "cdns,cdns-pcie-host-vX", since the quirk itself is not specific to TI platform rather Cadence IP version.

Thank You,
Kishon

maintainer
#5 lore raw

Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

Quoted 57 lines · Kishon Vijay Abraham I

Hi Nadeem,

Quoted 53 lines · Athani Nadeem Ladkhan

Hi Rob / Kishon,

Quoted 51 lines

-----Original Message-----
From: Rob Herring <[email protected]>
Sent: Friday, December 11, 2020 10:32 PM
To: Athani Nadeem Ladkhan <[email protected]>
Cc: Tom Joseph <[email protected]>; Lorenzo Pieralisi <[email protected]>; Bjorn Helgaas <[email protected]>; PCI <[email protected]>; [email protected]; Kishon Vijay Abraham I <[email protected]>; [email protected]; Milind Parab <[email protected]>; Swapnil Kashinath Jakhade <[email protected]>; Parshuram Raju Thombare <[email protected]>
Subject: Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

EXTERNAL MAIL

Quoted 3 lines · Nadeem Athani

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed

change.

Quoted 15 lines

Adding a quirk flag based on a new compatible string.

---
 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml | 4
+++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml b/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml index 293b8ec318bc..204d78f9efe3 100644

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml allOf: · line 20

Quoted 7 lines
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +3 -1
@@ -15,7 +15,9 @@ allOf:
 
 properties:
   compatible:
-    const: cdns,cdns-pcie-host
+    enum:
+        - cdns,cdns-pcie-host
+        - cdns,cdns-pcie-host-quirk-retrain

So, we'll just keep adding quirk strings on to the compatible? I don't think so. Compatible strings should map to a specific implementation/platform and quirks can then be implied from them. This is the only way we can implement quirks in the OS without firmware
(DT) changes.

Quoted 5 lines
Quoted 2 lines

Ok, I will change the compatible string to " ti,j721e-pcie-host" in place of " cdns,cdns-pcie-host-quirk-retrain" . @Kishon Vijay Abraham I: Is this fine? Or will you suggest an appropriate name?

IMHO it should be something like "cdns,cdns-pcie-host-vX", since the quirk itself is not specific to TI platform rather Cadence IP version.

That's fine if Cadence has a need for it, but for TI platforms use the TI compatible string. ECOs on version X IP without changing X is not uncommon.

Rob

#6 lore raw

Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

Hi,

Quoted 61 lines · Rob Herring
Quoted 60 lines · Kishon Vijay Abraham I

Hi Nadeem,

Quoted 55 lines · Athani Nadeem Ladkhan

Hi Rob / Kishon,

Quoted 39 lines

-----Original Message-----
From: Rob Herring <[email protected]>
Sent: Friday, December 11, 2020 10:32 PM
To: Athani Nadeem Ladkhan <[email protected]>
Cc: Tom Joseph <[email protected]>; Lorenzo Pieralisi <[email protected]>; Bjorn Helgaas <[email protected]>; PCI <[email protected]>; [email protected]; Kishon Vijay Abraham I <[email protected]>; [email protected]; Milind Parab <[email protected]>; Swapnil Kashinath Jakhade <[email protected]>; Parshuram Raju Thombare <[email protected]>
Subject: Re: [PATCH v4 1/2] dt-bindings: pci: Retrain Link to work around Gen2 training defect.

EXTERNAL MAIL

Quoted 3 lines · Nadeem Athani

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed

change.

Quoted 16 lines

Adding a quirk flag based on a new compatible string.

---
 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml | 4
+++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml b/Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml index 293b8ec318bc..204d78f9efe3 100644

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +0 -0
@@ -15,7 +15,9 @@ allOf:
 
Quoted 12 lines

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml allOf: · line 20

Quoted 6 lines
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml +3 -1
 properties:
   compatible:
-    const: cdns,cdns-pcie-host
+    enum:
+        - cdns,cdns-pcie-host
+        - cdns,cdns-pcie-host-quirk-retrain

So, we'll just keep adding quirk strings on to the compatible? I don't think so. Compatible strings should map to a specific implementation/platform and quirks can then be implied from them. This is the only way we can implement quirks in the OS without firmware
(DT) changes.

Ok, I will change the compatible string to " ti,j721e-pcie-host" in place of " cdns,cdns-pcie-host-quirk-retrain" . @Kishon Vijay Abraham I: Is this fine? Or will you suggest an appropriate name?

Quoted 6 lines
Quoted 2 lines

IMHO it should be something like "cdns,cdns-pcie-host-vX", since the quirk itself is not specific to TI platform rather Cadence IP version.

That's fine if Cadence has a need for it, but for TI platforms use the TI compatible string. ECOs on version X IP without changing X is not uncommon.

Okay. I re-worked the patch to be applicable only to TI's J721E SoC
http://lore.kernel.org/r/[email protected]

Thank You,
Kishon

#7 lore raw

PATCH v4 2/2 PCI: cadence: Retrain Link to work around Gen2 training defect.

In reply to Nadeem Athani

Cadence controller will not initiate autonomous speed change if strapped as Gen2. The Retrain Link bit is set as quirk to enable this speed change.

---
 drivers/pci/controller/cadence/pcie-cadence-host.c | 67 ++++++++++++++++------
 drivers/pci/controller/cadence/pcie-cadence-plat.c | 13 +++++
 drivers/pci/controller/cadence/pcie-cadence.h      | 11 +++-
 3 files changed, 73 insertions(+), 18 deletions(-)
drivers/pci/controller/cadence/pcie-cadence-host.c +50 -17
index 811c1cb2e8de..36dccf7241fe 100644
@@ -77,6 +77,53 @@ static struct pci_ops cdns_pcie_host_ops = {
 	.write		= pci_generic_config_write,
 };
 
+static int cdns_pcie_host_wait_for_link(struct cdns_pcie *pcie)
+{
+	struct device *dev = pcie->dev;
+	int retries;
+
+	/* Check if the link is up or not */
+	for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) {
+		if (cdns_pcie_link_up(pcie)) {
+			dev_info(dev, "Link up\n");
+			return 0;
+		}
+		usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX);
+	}
+
+	return -ETIMEDOUT;
+}
+
+static void cdns_pcie_retrain(struct cdns_pcie *pcie)
+{
+	u32 lnk_cap_sls, pcie_cap_off = CDNS_PCIE_RP_CAP_OFFSET;
+	u16 lnk_stat, lnk_ctl;
+
+	if (cdns_pcie_host_wait_for_link(pcie))
+		return;
+
+	/*
+	 * Set retrain bit if current speed is 2.5 GB/s,
+	 * but the PCIe root port support is > 2.5 GB/s.
+	 */
+
+	lnk_cap_sls = cdns_pcie_readl(pcie, (CDNS_PCIE_RP_BASE + pcie_cap_off +
+					     PCI_EXP_LNKCAP));
+	if ((lnk_cap_sls & PCI_EXP_LNKCAP_SLS) <= PCI_EXP_LNKCAP_SLS_2_5GB)
+		return;
+
+	lnk_stat = cdns_pcie_rp_readw(pcie, pcie_cap_off + PCI_EXP_LNKSTA);
+	if ((lnk_stat & PCI_EXP_LNKSTA_CLS) == PCI_EXP_LNKSTA_CLS_2_5GB) {
+		lnk_ctl = cdns_pcie_rp_readw(pcie,
+					     pcie_cap_off + PCI_EXP_LNKCTL);
+		lnk_ctl |= PCI_EXP_LNKCTL_RL;
+		cdns_pcie_rp_writew(pcie, pcie_cap_off + PCI_EXP_LNKCTL,
+				    lnk_ctl);
+
+		if (cdns_pcie_host_wait_for_link(pcie))
+			return;
+	}
+}
 
 static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc)
 {
@@ -115,6 +162,9 @@ static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc)
 	cdns_pcie_rp_writeb(pcie, PCI_CLASS_PROG, 0);
 	cdns_pcie_rp_writew(pcie, PCI_CLASS_DEVICE, PCI_CLASS_BRIDGE_PCI);
 
+	if (rc->quirk_retrain_flag)
+		cdns_pcie_retrain(pcie);
+
 	return 0;
 }
 
@@ -398,23 +448,6 @@ static int cdns_pcie_host_init(struct device *dev,
 	return cdns_pcie_host_init_address_translation(rc);
 }
 
-static int cdns_pcie_host_wait_for_link(struct cdns_pcie *pcie)
-{
-	struct device *dev = pcie->dev;
-	int retries;
-
-	/* Check if the link is up or not */
-	for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) {
-		if (cdns_pcie_link_up(pcie)) {
-			dev_info(dev, "Link up\n");
-			return 0;
-		}
-		usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX);
-	}
-
-	return -ETIMEDOUT;
-}
-
 int cdns_pcie_host_setup(struct cdns_pcie_rc *rc)
 {
 	struct device *dev = rc->pcie.dev;
drivers/pci/controller/cadence/pcie-cadence-plat.c +13 -0
index 5fee0f89ab59..97b4b4f98fa4 100644
@@ -28,6 +28,7 @@ struct cdns_plat_pcie {
 
 struct cdns_plat_pcie_of_data {
 	bool is_rc;
+	bool quirk_retrain_flag;
 };
 
 static const struct of_device_id cdns_plat_pcie_of_match[];
@@ -78,6 +79,7 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev)
 		rc = pci_host_bridge_priv(bridge);
 		rc->pcie.dev = dev;
 		rc->pcie.ops = &cdns_plat_ops;
+		rc->quirk_retrain_flag = data->quirk_retrain_flag;
 		cdns_plat_pcie->pcie = &rc->pcie;
 		cdns_plat_pcie->is_rc = is_rc;
 
@@ -156,6 +158,13 @@ static void cdns_plat_pcie_shutdown(struct platform_device *pdev)
 
 static const struct cdns_plat_pcie_of_data cdns_plat_pcie_host_of_data = {
 	.is_rc = true,
+	.quirk_retrain_flag = false,
+};
+
+static const struct cdns_plat_pcie_of_data
+		    cdns_plat_pcie_host_quirk_retrain_of_data = {
+	.is_rc = true,
+	.quirk_retrain_flag = true,
 };
 
 static const struct cdns_plat_pcie_of_data cdns_plat_pcie_ep_of_data = {
@@ -167,6 +176,10 @@ static const struct of_device_id cdns_plat_pcie_of_match[] = {
 		.compatible = "cdns,cdns-pcie-host",
 		.data = &cdns_plat_pcie_host_of_data,
 	},
+	{
+		.compatible = "cdns,cdns-pcie-host-quirk-retrain",
+		.data = &cdns_plat_pcie_host_quirk_retrain_of_data,
+	},
 	{
 		.compatible = "cdns,cdns-pcie-ep",
 		.data = &cdns_plat_pcie_ep_of_data,
drivers/pci/controller/cadence/pcie-cadence.h +10 -1
index 30eba6cafe2c..0f29128a5d0a 100644
@@ -119,7 +119,7 @@
  * Root Port Registers (PCI configuration space for the root port function)
  */
 #define CDNS_PCIE_RP_BASE	0x00200000
-
+#define CDNS_PCIE_RP_CAP_OFFSET 0xc0
 
 /*
  * Address Translation Registers
@@ -291,6 +291,7 @@ struct cdns_pcie {
  * @device_id: PCI device ID
  * @avail_ib_bar: Satus of RP_BAR0, RP_BAR1 and	RP_NO_BAR if it's free or
  *                available
+ * @quirk_retrain_flag: Retrain link as quirk for PCIe Gen2
  */
 struct cdns_pcie_rc {
 	struct cdns_pcie	pcie;
@@ -299,6 +300,7 @@ struct cdns_pcie_rc {
 	u32			vendor_id;
 	u32			device_id;
 	bool			avail_ib_bar[CDNS_PCIE_RP_MAX_IB];
+	bool			quirk_retrain_flag;
 };
 
 /**
@@ -414,6 +416,13 @@ static inline void cdns_pcie_rp_writew(struct cdns_pcie *pcie,
 	cdns_pcie_write_sz(addr, 0x2, value);
 }
 
+static inline u16 cdns_pcie_rp_readw(struct cdns_pcie *pcie, u32 reg)
+{
+	void __iomem *addr = pcie->reg_base + CDNS_PCIE_RP_BASE + reg;
+
+	return cdns_pcie_read_sz(addr, 0x2);
+}
+
 /* Endpoint Function register access */
 static inline void cdns_pcie_ep_fn_writeb(struct cdns_pcie *pcie, u8 fn,
 					  u32 reg, u8 value)
Signature · 1 line
2.15.0