Skip to content

Commit c60603c

Browse files
committed
Merge branch 'pci/controller/tegra194'
- Move endpoint controller cleanups that depend on refclk from the host to the notifier that tells us the host has deasserted PERST# (Manivannan Sadhasivam) * pci/controller/tegra194: PCI: tegra194: Move controller cleanups to pex_ep_event_pex_rst_deassert()
2 parents 72ae381 + 40e2125 commit c60603c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/pci/controller/dwc/pcie-tegra194.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,9 +1704,6 @@ static void pex_ep_event_pex_rst_assert(struct tegra_pcie_dw *pcie)
17041704
if (ret)
17051705
dev_err(pcie->dev, "Failed to go Detect state: %d\n", ret);
17061706

1707-
pci_epc_deinit_notify(pcie->pci.ep.epc);
1708-
dw_pcie_ep_cleanup(&pcie->pci.ep);
1709-
17101707
reset_control_assert(pcie->core_rst);
17111708

17121709
tegra_pcie_disable_phy(pcie);
@@ -1785,6 +1782,10 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie)
17851782
goto fail_phy;
17861783
}
17871784

1785+
/* Perform cleanup that requires refclk */
1786+
pci_epc_deinit_notify(pcie->pci.ep.epc);
1787+
dw_pcie_ep_cleanup(&pcie->pci.ep);
1788+
17881789
/* Clear any stale interrupt statuses */
17891790
appl_writel(pcie, 0xFFFFFFFF, APPL_INTR_STATUS_L0);
17901791
appl_writel(pcie, 0xFFFFFFFF, APPL_INTR_STATUS_L1_0_0);

0 commit comments

Comments
 (0)