Commit 7546ad5e authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/aardvark'

- Update comment about delay before link training (Pali Rohár)

* remotes/lorenzo/pci/aardvark:
  PCI: aardvark: Update comment about disabling link training
parents 7c250f82 1d1cd163
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -252,7 +252,14 @@ static void advk_pcie_issue_perst(struct advk_pcie *pcie)
	if (!pcie->reset_gpio)
		return;

	/* PERST does not work for some cards when link training is enabled */
	/*
	 * As required by PCI Express spec (PCI Express Base Specification, REV.
	 * 4.0 PCI Express, February 19 2014, 6.6.1 Conventional Reset) a delay
	 * for at least 100ms after de-asserting PERST# signal is needed before
	 * link training is enabled. So ensure that link training is disabled
	 * prior de-asserting PERST# signal to fulfill that PCI Express spec
	 * requirement.
	 */
	reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
	reg &= ~LINK_TRAINING_EN;
	advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);