| Message ID | 2391ada0-eac5-ac43-f061-a7a44b0e7f33@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c9ae520ac3faf2f272b5705b085b3778c7997ec8 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] r8169: remove rtl_wol_shutdown_quirk() | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Paolo Abeni <pabeni@redhat.com>: On Tue, 6 Sep 2022 20:24:57 +0200 you wrote: > Since f658b90977d2 ("r8169: fix DMA being used after buffer free if WoL is > enabled") it has been redundant to disable PCI bus mastering in > rtl_wol_shutdown_quirk(). And since 120068481405 ("r8169: fix failing WoL") > CmdRxEnb is still enabled when we get here. So we can remove the function. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > > [...] Here is the summary with links: - [net-next] r8169: remove rtl_wol_shutdown_quirk() https://git.kernel.org/netdev/net-next/c/c9ae520ac3fa You are awesome, thank you!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 3763855e4..306c65228 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4842,22 +4842,6 @@ static const struct dev_pm_ops rtl8169_pm_ops = { rtl8169_runtime_idle) }; -static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp) -{ - /* WoL fails with 8168b when the receiver is disabled. */ - switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_11: - case RTL_GIGA_MAC_VER_17: - pci_clear_master(tp->pci_dev); - - RTL_W8(tp, ChipCmd, CmdRxEnb); - rtl_pci_commit(tp); - break; - default: - break; - } -} - static void rtl_shutdown(struct pci_dev *pdev) { struct rtl8169_private *tp = pci_get_drvdata(pdev); @@ -4871,9 +4855,6 @@ static void rtl_shutdown(struct pci_dev *pdev) if (system_state == SYSTEM_POWER_OFF && tp->dash_type == RTL_DASH_NONE) { - if (tp->saved_wolopts) - rtl_wol_shutdown_quirk(tp); - pci_wake_from_d3(pdev, tp->saved_wolopts); pci_set_power_state(pdev, PCI_D3hot); }
Since f658b90977d2 ("r8169: fix DMA being used after buffer free if WoL is enabled") it has been redundant to disable PCI bus mastering in rtl_wol_shutdown_quirk(). And since 120068481405 ("r8169: fix failing WoL") CmdRxEnb is still enabled when we get here. So we can remove the function. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/ethernet/realtek/r8169_main.c | 19 ------------------- 1 file changed, 19 deletions(-)