Skip to contentSkip to conversation

PCI: layerscape: Add support for Link down notification

PATCH Applied Frank Li 2 participants 7 messages Jul 20, 2023 – Aug 24, 2023

Subsystems (5)
lore
Share & tools
lore

Frank Li

author maintainer
#0 lore raw

PATCH v4 1/2 PCI: layerscape: Add support for Link down notification

Add support to pass Link down notification to Endpoint function driver so that the LINK_DOWN event can be processed by the function.

---
Change from v2 to v4
- none
Change from v1 to v2

 drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -0
index de4c1758a6c3..e0969ff2ddf7 100644
@@ -89,6 +89,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)
 		dev_dbg(pci->dev, "Link up\n");
 	} else if (val & PEX_PF0_PME_MES_DR_LDD) {
 		dev_dbg(pci->dev, "Link down\n");
+		pci_epc_linkdown(pci->ep.epc);
 	} else if (val & PEX_PF0_PME_MES_DR_HRD) {
 		dev_dbg(pci->dev, "Hot reset\n");
 	}
Signature · 1 line
2.34.1
author maintainer
#1 lore raw

PATCH v4 2/2 PCI: layerscape: Add the workaround for lost link capabilities during reset.

From: Xiaowei Bao <[email protected]>

A workaround for the issue where the PCI Express Endpoint (EP) controller loses the values of the Maximum Link Width and Supported Link Speed from the Link Capabilities Register, which initially configured by the Reset Configuration Word (RCW) during a link-down or hot reset event.

Fixes a805770d8a22 ("PCI: layerscape: Add EP mode support")

---
change from v3 to v4
- fix wrong commit a debug code, change pr_err to pr_dbg
change from v2 to v3
- fix subject typo capabilities
change from v1 to v2:
- add comments at restore register
- add fixes tag
- dw_pcie_writew_dbi to dw_pcie_writel_dbi

 .../pci/controller/dwc/pci-layerscape-ep.c    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +19 -0
index e0969ff2ddf7..b1faf41a2fae 100644
@@ -45,6 +45,7 @@ struct ls_pcie_ep {
 	struct pci_epc_features		*ls_epc;
 	const struct ls_pcie_ep_drvdata *drvdata;
 	int				irq;
+	u32				lnkcap;
 	bool				big_endian;
 };
 
@@ -73,6 +74,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)
 	struct ls_pcie_ep *pcie = dev_id;
 	struct dw_pcie *pci = pcie->pci;
 	u32 val, cfg;
+	u8 offset;
 
 	val = ls_lut_readl(pcie, PEX_PF0_PME_MES_DR);
 	ls_lut_writel(pcie, PEX_PF0_PME_MES_DR, val);
@@ -81,6 +83,19 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)
 		return IRQ_NONE;
 
 	if (val & PEX_PF0_PME_MES_DR_LUD) {
+
+		offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
+
+		/*
+		 * The values of the Maximum Link Width and Supported Link
+		 * Speed from the Link Capabilities Register will be lost
+		 * during link down or hot reset. Restore initial value
+		 * that configured by the Reset Configuration Word (RCW).
+		 */
+		dw_pcie_dbi_ro_wr_en(pci);
+		dw_pcie_writel_dbi(pci, offset + PCI_EXP_LNKCAP, pcie->lnkcap);
+		dw_pcie_dbi_ro_wr_dis(pci);
+
 		cfg = ls_lut_readl(pcie, PEX_PF0_CONFIG);
 		cfg |= PEX_PF0_CFG_READY;
 		ls_lut_writel(pcie, PEX_PF0_CONFIG, cfg);
@@ -216,6 +231,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
 	struct ls_pcie_ep *pcie;
 	struct pci_epc_features *ls_epc;
 	struct resource *dbi_base;
+	u8 offset;
 	int ret;
 
 	pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
@@ -252,6 +268,9 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, pcie);
 
+	offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
+	pcie->lnkcap = dw_pcie_readl_dbi(pci, offset + PCI_EXP_LNKCAP);
+
 	ret = dw_pcie_ep_init(&pci->ep);
 	if (ret)
 		return ret;
Signature · 1 line
2.34.1
author maintainer
#2 lore raw
In reply to Frank Li
Quoted 6 lines · Frank Li

Add support to pass Link down notification to Endpoint function driver so that the LINK_DOWN event can be processed by the function.

---

@Lorenzo

Could you please consider pick both patches? Manivannan already reviewed and only impact layerscape.

Frank

Quoted 22 lines

Change from v2 to v4
- none
Change from v1 to v2

 drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -0
index de4c1758a6c3..e0969ff2ddf7 100644
@@ -89,6 +89,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)
 		dev_dbg(pci->dev, "Link up\n");
 	} else if (val & PEX_PF0_PME_MES_DR_LDD) {
 		dev_dbg(pci->dev, "Link down\n");
+		pci_epc_linkdown(pci->ep.epc);
 	} else if (val & PEX_PF0_PME_MES_DR_HRD) {
 		dev_dbg(pci->dev, "Hot reset\n");
 	}
Signature · 1 line
2.34.1
author maintainer
#3 lore raw
Quoted 4 lines · Frank Li
Quoted 3 lines · Frank Li

Add support to pass Link down notification to Endpoint function driver so that the LINK_DOWN event can be processed by the function.

Quoted 8 lines
Quoted 3 lines

---

@Lorenzo

Could you please consider pick both patches? Manivannan already reviewed and only impact layerscape.

@lorenzo:
ping

Quoted 25 lines

Frank

Quoted 22 lines

Change from v2 to v4
- none
Change from v1 to v2

 drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -0
index de4c1758a6c3..e0969ff2ddf7 100644
@@ -89,6 +89,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)
 		dev_dbg(pci->dev, "Link up\n");
 	} else if (val & PEX_PF0_PME_MES_DR_LDD) {
 		dev_dbg(pci->dev, "Link down\n");
+		pci_epc_linkdown(pci->ep.epc);
 	} else if (val & PEX_PF0_PME_MES_DR_HRD) {
 		dev_dbg(pci->dev, "Hot reset\n");
 	}
Signature · 1 line
2.34.1
author maintainer
#4 lore raw
Quoted 9 lines · Frank Li
Quoted 8 lines · Frank Li
Quoted 6 lines · Frank Li

Add support to pass Link down notification to Endpoint function driver so that the LINK_DOWN event can be processed by the function.

---

Quoted 10 lines
Quoted 4 lines

@Lorenzo

Could you please consider pick both patches? Manivannan already reviewed and only impact layerscape.

@lorenzo:
ping

Quoted 2 lines

Frank

@lorenzo
ping

Frank

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines

Change from v2 to v4
- none
Change from v1 to v2

 drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -0
index de4c1758a6c3..e0969ff2ddf7 100644
@@ -89,6 +89,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)
 		dev_dbg(pci->dev, "Link up\n");
 	} else if (val & PEX_PF0_PME_MES_DR_LDD) {
 		dev_dbg(pci->dev, "Link down\n");
+		pci_epc_linkdown(pci->ep.epc);
 	} else if (val & PEX_PF0_PME_MES_DR_HRD) {
 		dev_dbg(pci->dev, "Hot reset\n");
 	}
Signature · 1 line
2.34.1
#5 lore raw
In reply to Frank Li
Quoted 9 lines · Frank Li
Quoted 8 lines · Frank Li
Quoted 6 lines · Frank Li

Add support to pass Link down notification to Endpoint function driver so that the LINK_DOWN event can be processed by the function.

---

Quoted 7 lines
Quoted 4 lines

@Lorenzo

Could you please consider pick both patches? Manivannan already reviewed and only impact layerscape.

@lorenzo:
ping

I will have a look tomorrow.

Lorenzo

Quoted 25 lines
Quoted 25 lines

Frank

Quoted 22 lines

Change from v2 to v4
- none
Change from v1 to v2

 drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -0
index de4c1758a6c3..e0969ff2ddf7 100644
@@ -89,6 +89,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)
 		dev_dbg(pci->dev, "Link up\n");
 	} else if (val & PEX_PF0_PME_MES_DR_LDD) {
 		dev_dbg(pci->dev, "Link down\n");
+		pci_epc_linkdown(pci->ep.epc);
 	} else if (val & PEX_PF0_PME_MES_DR_HRD) {
 		dev_dbg(pci->dev, "Hot reset\n");
 	}
Signature · 1 line
2.34.1
maintainer Applied
#6 lore raw
In reply to Frank Li
Quoted 4 lines · Frank Li

Add support to pass Link down notification to Endpoint function driver so that the LINK_DOWN event can be processed by the function.

Applied to controller/layerscape, thanks!

[1/2] PCI: layerscape: Add support for Link down notification

      https://git.kernel.org/pci/pci/c/d28c0d84ca40
[2/2] PCI: layerscape: Add the workaround for lost link capabilities during reset.
      https://git.kernel.org/pci/pci/c/17cf8661ee0f

Thanks,
Lorenzo