Commit 7acccaa2 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Zheng Zengkai
Browse files

r8169: fix DMA being used after buffer free if WoL is enabled 



stable inclusion
from stable-5.10.27
commit d3b5a04b8ce51877c245fdb454d3a4f4ba86b74d
bugzilla: 51493

--------------------------------

commit f658b909 upstream.

IOMMU errors have been reported if WoL is enabled and interface is
brought down. It turned out that the network chip triggers DMA
transfers after the DMA buffers have been freed. For WoL to work we
need to leave rx enabled, therefore simply stop the chip from being
a DMA busmaster.

Fixes: 567ca57f ("r8169: add rtl8169_up")
Tested-by: default avatarPaul Blazejowski <paulb@blazebox.homeip.net>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatar&nbsp; Weilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent b04a8995

drivers/net/ethernet/realtek/r8169_main.c

+4 −2
Original line number Diff line number Diff line
@@ -4726,6 +4726,9 @@ static void rtl8169_down(struct rtl8169_private *tp) 


	rtl8169_update_counters(tp);



	pci_clear_master(tp->pci_dev);

	rtl_pci_commit(tp);



	rtl8169_cleanup(tp, true);



	rtl_pll_power_down(tp);
@@ -4733,6 +4736,7 @@ static void rtl8169_down(struct rtl8169_private *tp) 


static void rtl8169_up(struct rtl8169_private *tp)

{

	pci_set_master(tp->pci_dev);

	rtl_pll_power_up(tp);

	rtl8169_init_phy(tp);

	napi_enable(&tp->napi);
@@ -5394,8 +5398,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	rtl_hw_reset(tp);



	pci_set_master(pdev);



	rc = rtl_alloc_irq(tp);

	if (rc < 0) {

		dev_err(&pdev->dev, "Can't allocate interrupt\n");