Skip to contentSkip to conversation

PCI: mediatek: Release the resource when PCIe enable port fail

PATCH In review Chuanjia Liu 3 participants 6 messages Aug 31, 2020 – Sep 10, 2020 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: mediatek: Release the resource when PCIe enable port fail

On the mt7623 platform, if one port enable fail and other port enable succeed. It will hang on when using pci enum because the resource was not released correctly.

---
 drivers/pci/pcie_mediatek.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/pci/pcie_mediatek.c +13 -6
index ad34f7c597..55b6a40f25 100644
@@ -443,29 +443,36 @@ static void mtk_pcie_enable_port(struct mtk_pcie_port *port)
 
 	err = clk_enable(&port->sys_ck);
 	if (err)
-		goto exit;
+		goto err_sys_clk;
 
 	err = reset_assert(&port->reset);
 	if (err)
-		goto exit;
+		goto err_reset;
 
 	err = reset_deassert(&port->reset);
 	if (err)
-		goto exit;
+		goto err_reset;
 
 	err = generic_phy_init(&port->phy);
 	if (err)
-		goto exit;
+		goto err_phy_init;
 
 	err = generic_phy_power_on(&port->phy);
 	if (err)
-		goto exit;
+		goto err_phy_on;
 
 	if (!mtk_pcie_startup_port(port))
 		return;
 
 	pr_err("Port%d link down\n", port->slot);
-exit:
+
+	generic_phy_power_off(&port->phy);
+err_phy_on:
+	generic_phy_exit(&port->phy);
+err_phy_init:
+err_reset:
+	clk_disable(&port->sys_ck);
+err_sys_clk:
 	mtk_pcie_port_free(port);
 }
 
Signature · 1 line
2.18.0
#1 lore raw

Hi,

thank you for fixing this issue :)

regards Frank

Quoted 8 lines

Gesendet: Montag, 31. August 2020 um 09:53 Uhr
Von: "Chuanjia Liu" <[email protected]>
On the mt7623 platform, if one port enable fail and other port enable succeed. It will hang on when using pci enum because the resource was not released correctly.

if fixes-Tag is needed:

Fixes 42d37450e5 ("pci: mediatek: add PCIe controller support for MT7623")
#2 lore raw

PATCH 1/1 PCI: mediatek: Release the resource when PCIe enable port fail

In reply to Chuanjia Liu
Quoted 6 lines · Chuanjia Liu

On the mt7623 platform, if one port enable fail and other port enable succeed. It will hang on when using pci enum because the resource was not released correctly.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200910/5a1b1edf/attachment.sig>
#3 lore raw

PATCH 1/1 PCI: mediatek: Release the resource when PCIe enable port fail

Am 10. September 2020 20:40:10 MESZ schrieb Tom Rini <[email protected]>:

Quoted 1 line

Applied to u-boot/next, thanks!

Thanks

Can it be applied to current release too as it is a fix (hang till watchdog reset on pci enum if no card inserted in pcie slot,but sata chip connected)? regards Frank

#4 lore raw

PATCH 1/1 PCI: mediatek: Release the resource when PCIe enable port fail

Quoted 6 lines · Frank Wunderlich

Am 10. September 2020 20:40:10 MESZ schrieb Tom Rini <[email protected]>:

Quoted 1 line

Applied to u-boot/next, thanks!

Thanks

Can it be applied to current release too as it is a fix (hang till watchdog reset on pci enum if no card inserted in pcie slot,but sata chip connected)?

Yes, OK, thanks for letting me know. I've queued this up for master when I push again. Is there anything else currently that's outstanding for MediaTek and should be in this release?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200910/e568beb0/attachment.sig>
#5 lore raw

PATCH 1/1 PCI: mediatek: Release the resource when PCIe enable port fail

Am 10. September 2020 21:33:01 MESZ schrieb Tom Rini <[email protected]>:

Quoted 3 lines

Yes, OK, thanks for letting me know. I've queued this up for master when I push again. Is there anything else currently that's outstanding for MediaTek and should be in this release?

Hi,

For my boards only xhci 0.96 support is outstanding,but this is more functionality than bugfix and missing it does not break (only usb not working on bpi r2/r64). So i guess it will go in next. regards Frank