Skip to content

Commit 518fa6b

Browse files
dolcinigregkh
authored andcommitted
PCI: imx6: Fix PERST# start-up sequence
[ Upstream commit a680994 ] According to the PCIe standard the PERST# signal (reset-gpio in fsl,imx* compatible dts) should be kept asserted for at least 100 usec before the PCIe refclock is stable, should be kept asserted for at least 100 msec after the power rails are stable and the host should wait at least 100 msec after it is de-asserted before accessing the configuration space of any attached device. From PCIe CEM r2.0, sec 2.6.2 T-PVPERL: Power stable to PERST# inactive - 100 msec T-PERST-CLK: REFCLK stable before PERST# inactive - 100 usec. From PCIe r5.0, sec 6.6.1 With a Downstream Port that does not support Link speeds greater than 5.0 GT/s, software must wait a minimum of 100 ms before sending a Configuration Request to the device immediately below that Port. Failure to do so could prevent PCIe devices to be working correctly, and this was experienced with real devices. Move reset assert to imx6_pcie_assert_core_reset(), this way we ensure that PERST# is asserted before enabling any clock, move de-assert to the end of imx6_pcie_deassert_core_reset() after the clock is enabled and deemed stable and add a new delay of 100 msec just afterward. Link: https://lore.kernel.org/all/20220211152550.286821-1-francesco.dolcini@toradex.com Link: https://lore.kernel.org/r/20220404081509.94356-1-francesco.dolcini@toradex.com Fixes: bb38919 ("PCI: imx6: Add support for i.MX6 PCIe controller") Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Acked-by: Richard Zhu <hongxing.zhu@nxp.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 6df8af6 commit 518fa6b

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,11 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
403403
dev_err(dev, "failed to disable vpcie regulator: %d\n",
404404
ret);
405405
}
406+
407+
/* Some boards don't have PCIe reset GPIO. */
408+
if (gpio_is_valid(imx6_pcie->reset_gpio))
409+
gpio_set_value_cansleep(imx6_pcie->reset_gpio,
410+
imx6_pcie->gpio_active_high);
406411
}
407412

408413
static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie)
@@ -525,15 +530,6 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
525530
/* allow the clocks to stabilize */
526531
usleep_range(200, 500);
527532

528-
/* Some boards don't have PCIe reset GPIO. */
529-
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
530-
gpio_set_value_cansleep(imx6_pcie->reset_gpio,
531-
imx6_pcie->gpio_active_high);
532-
msleep(100);
533-
gpio_set_value_cansleep(imx6_pcie->reset_gpio,
534-
!imx6_pcie->gpio_active_high);
535-
}
536-
537533
switch (imx6_pcie->drvdata->variant) {
538534
case IMX8MQ:
539535
reset_control_deassert(imx6_pcie->pciephy_reset);
@@ -576,6 +572,15 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
576572
break;
577573
}
578574

575+
/* Some boards don't have PCIe reset GPIO. */
576+
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
577+
msleep(100);
578+
gpio_set_value_cansleep(imx6_pcie->reset_gpio,
579+
!imx6_pcie->gpio_active_high);
580+
/* Wait for 100ms after PERST# deassertion (PCIe r5.0, 6.6.1) */
581+
msleep(100);
582+
}
583+
579584
return;
580585

581586
err_ref_clk:

0 commit comments

Comments
 (0)