Skip to content

Commit f81f095

Browse files
fabioestevamLorenzo Pieralisi
authored andcommitted
PCI: imx6: Allow to probe when dw_pcie_wait_for_link() fails
The intention of commit 886a9c1 ("PCI: dwc: Move link handling into common code") was to standardize the behavior of link down as explained in its commit log: "The behavior for a link down was inconsistent as some drivers would fail probe in that case while others succeed. Let's standardize this to succeed as there are usecases where devices (and the link) appear later even without hotplug. For example, a reconfigured FPGA device." The pci-imx6 still fails to probe when the link is not present, which causes the following warning: imx6q-pcie 8ffc000.pcie: Phy link never came up imx6q-pcie: probe of 8ffc000.pcie failed with error -110 ------------[ cut here ]------------ WARNING: CPU: 0 PID: 30 at drivers/regulator/core.c:2257 _regulator_put.part.0+0x1b8/0x1dc Modules linked in: CPU: 0 PID: 30 Comm: kworker/u2:2 Not tainted 5.15.0-next-20211103 #1 Hardware name: Freescale i.MX6 SoloX (Device Tree) Workqueue: events_unbound async_run_entry_fn [<c0111730>] (unwind_backtrace) from [<c010bb74>] (show_stack+0x10/0x14) [<c010bb74>] (show_stack) from [<c0f90290>] (dump_stack_lvl+0x58/0x70) [<c0f90290>] (dump_stack_lvl) from [<c012631c>] (__warn+0xd4/0x154) [<c012631c>] (__warn) from [<c0f87b00>] (warn_slowpath_fmt+0x74/0xa8) [<c0f87b00>] (warn_slowpath_fmt) from [<c076b4bc>] (_regulator_put.part.0+0x1b8/0x1dc) [<c076b4bc>] (_regulator_put.part.0) from [<c076b574>] (regulator_put+0x2c/0x3c) [<c076b574>] (regulator_put) from [<c08c3740>] (release_nodes+0x50/0x178) Fix this problem by ignoring the dw_pcie_wait_for_link() error like it is done on the other dwc drivers. Tested on imx6sx-sdb and imx6q-sabresd boards. Link: https://lore.kernel.org/r/20220106103645.2790803-1-festevam@gmail.com Fixes: 886a9c1 ("PCI: dwc: Move link handling into common code") Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com> Cc: <stable@vger.kernel.org>
1 parent e783362 commit f81f095

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,7 @@ static int imx6_pcie_start_link(struct dw_pcie *pci)
809809
/* Start LTSSM. */
810810
imx6_pcie_ltssm_enable(dev);
811811

812-
ret = dw_pcie_wait_for_link(pci);
813-
if (ret)
814-
goto err_reset_phy;
812+
dw_pcie_wait_for_link(pci);
815813

816814
if (pci->link_gen == 2) {
817815
/* Allow Gen2 mode after the link is up. */
@@ -847,11 +845,7 @@ static int imx6_pcie_start_link(struct dw_pcie *pci)
847845
}
848846

849847
/* Make sure link training is finished as well! */
850-
ret = dw_pcie_wait_for_link(pci);
851-
if (ret) {
852-
dev_err(dev, "Failed to bring link up!\n");
853-
goto err_reset_phy;
854-
}
848+
dw_pcie_wait_for_link(pci);
855849
} else {
856850
dev_info(dev, "Link: Gen2 disabled\n");
857851
}

0 commit comments

Comments
 (0)