r8169: reset bus if NIC isn't accessible after tx timeout
Heiner Kallweit
maintainerPATCH v2 1/1 r8169: reset bus if NIC isn't accessible after tx timeout
ASPM issues may result in the NIC not being accessible any longer. In this case disabling ASPM may not work. Therefore detect this case by checking whether register reads return ~0, and try to make the NIC accessible again by resetting the secondary bus.
v2:
- add exception handling for the case that pci_reset_bus() fails
--- drivers/net/ethernet/realtek/r8169_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/realtek/r8169_main.c +10 -0
@@ -4535,6 +4535,16 @@ static void rtl_task(struct work_struct *work) goto out_unlock;if (test_and_clear_bit (RTL_FLAG_TASK_TX_TIMEOUT , tp->wk.flags)) { +/* if chip isn't accessible, reset bus to revive it */ +if (RTL_R32 (tp, TxConfig) == ~0 ) { + ret =pci_reset_bus (tp->pci_dev); +if (ret <0 ) { +netdev_err (tp->dev,"Can't reset secondary PCI bus, detach NIC\n" ); +netif_device_detach (tp->dev); + goto out_unlock; + } + } +/* ASPM compatibility issues are a typical reason for tx timeouts */ ret =pci_disable_link_state (tp->pci_dev,PCIE_LINK_STATE_L1 |PCIE_LINK_STATE_L0S );
Signature · 1 line
2.39.0
Quoted 26 lines · Heiner Kallweit
ASPM issues may result in the NIC not being accessible any longer. In this case disabling ASPM may not work. Therefore detect this case by checking whether register reads return ~0, and try to make the NIC accessible again by resetting the secondary bus.
v2:
- add exception handling for the case thatpci_reset_bus()failsSuggested-by Alexander Duyck <[email protected]>Signed-off-by Heiner Kallweit <[email protected]>--- drivers/net/ethernet/realtek/r8169_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/net/ethernet/realtek/r8169_main.c +3
-0@@ -4535,6 +4535,16 @@ static void rtl_task(struct work_struct *work) goto out_unlock;if (test_and_clear_bit (RTL_FLAG_TASK_TX_TIMEOUT , tp->wk.flags)) { +/* if chip isn't accessible, reset bus to revive it */ +if (RTL_R32 (tp, TxConfig) == ~0 ) { + ret =pci_reset_bus (tp->pci_dev);
drivers/net/ethernet/realtek/r8169_main.c static void rtl_task(struct work_struct *work) · line 4550
Quoted 10 lines
drivers/net/ethernet/realtek/r8169_main.c +7
-0+if (ret <0 ) { +netdev_err (tp->dev,"Can't reset secondary PCI bus, detach NIC\n" ); +netif_device_detach (tp->dev); + goto out_unlock; + } + } +/* ASPM compatibility issues are a typical reason for tx timeouts */ ret =pci_disable_link_state (tp->pci_dev,PCIE_LINK_STATE_L1 |PCIE_LINK_STATE_L0S );
Looks good to me.
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 9 lines · On Fri, 13 Jan 2023 23:46:19 +0100 you wrote:
ASPM issues may result in the NIC not being accessible any longer. In this case disabling ASPM may not work. Therefore detect this case by checking whether register reads return ~0, and try to make the NIC accessible again by resetting the secondary bus.
v2:
- add exception handling for the case thatpci_reset_bus()fails[...]
Here is the summary with links:
- [net-next,v2] r8169: reset bus if NIC isn't accessible after tx timeout
https://git.kernel.org/netdev/net-next/c/ce870af39558
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html