Skip to content

Commit 90fa588

Browse files
Richard Zhugregkh
authored andcommitted
PCI: imx6: Remove apps_reset toggling from imx_pcie_{assert/deassert}_core_reset
commit d31eb21 upstream. apps_reset corresponds to LTSSM_EN in i.MX7, i.MX8MQ, i.MX8MM and i.MX8MP platforms. Since assertion/de-assertion of apps_reset is done in imx_pcie_ltssm_enable() and imx_pcie_ltssm_disable(), remove it from imx_pcie_assert_core_reset() and imx_pcie_deassert_core_reset(). This also fixes a failure in enumerating the PI7C9X2G608GP (hotplug) chip reliably on i.MX8MM, as reported by Tim. It should be noted that only i.MX7D, i.MX8MQ, i.MX8MM, and i.MX8MP platforms have the apps_reset logic, so this change doesn't have any effect on other platforms. Fixes: ef61c7d ("PCI: imx6: Deassert apps_reset in imx_pcie_deassert_core_reset()") Reported-by: Tim Harvey <tharvey@gateworks.com> Closes: https://lore.kernel.org/all/CAJ+vNU3ohR2YKTwC4xoYrc1z-neDoH2TTZcMHDy+poj9=jSy+w@mail.gmail.com/ Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> [mani: reworded commit subject and description] Signed-off-by: Manivannan Sadhasivam <mani@kernel.org> [bhelgaas: commit log] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Tested-by: Tim Harvey <tharvey@gateworks.com> # imx8mp-venice-gw74xx (i.MX8MP + hotplug capable switch) Reviewed-by: Frank Li <Frank.Li@nxp.com> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20250709033722.2924372-2-hongxing.zhu@nxp.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0845e3b commit 90fa588

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/pci/controller/dwc/pci-imx6.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,6 @@ static int imx7d_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
778778
static void imx_pcie_assert_core_reset(struct imx_pcie *imx_pcie)
779779
{
780780
reset_control_assert(imx_pcie->pciephy_reset);
781-
reset_control_assert(imx_pcie->apps_reset);
782781

783782
if (imx_pcie->drvdata->core_reset)
784783
imx_pcie->drvdata->core_reset(imx_pcie, true);
@@ -790,7 +789,6 @@ static void imx_pcie_assert_core_reset(struct imx_pcie *imx_pcie)
790789
static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie)
791790
{
792791
reset_control_deassert(imx_pcie->pciephy_reset);
793-
reset_control_deassert(imx_pcie->apps_reset);
794792

795793
if (imx_pcie->drvdata->core_reset)
796794
imx_pcie->drvdata->core_reset(imx_pcie, false);
@@ -997,6 +995,9 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp)
997995
}
998996
}
999997

998+
/* Make sure that PCIe LTSSM is cleared */
999+
imx_pcie_ltssm_disable(dev);
1000+
10001001
ret = imx_pcie_deassert_core_reset(imx_pcie);
10011002
if (ret < 0) {
10021003
dev_err(dev, "pcie deassert core reset failed: %d\n", ret);

0 commit comments

Comments
 (0)