Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 473430ed authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Greg Kroah-Hartman
Browse files

r8169: don't use MSI before RTL8168d 

[ Upstream commit 003bd5b4a7b4a94b501e3a1e2e7c9df6b2a94ed4 ]

It was reported that after resuming from suspend network fails with
error "do_IRQ: 3.38 No irq handler for vector", see [0]. Enabling WoL
can work around the issue, but the only actual fix is to disable MSI.
So let's mimic the behavior of the vendor driver and disable MSI on
all chip versions before RTL8168d.

[0] https://bugzilla.kernel.org/show_bug.cgi?id=204079



Fixes: 6c6aa15f ("r8169: improve interrupt handling")
Reported-by: default avatarDušan Dragić <dragic.dusan@gmail.com>
Tested-by: default avatarDušan Dragić <dragic.dusan@gmail.com>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ccf4726

drivers/net/ethernet/realtek/r8169.c

+7 −2
Original line number Diff line number Diff line
@@ -7239,13 +7239,18 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) 
{

	unsigned int flags;



	if (tp->mac_version <= RTL_GIGA_MAC_VER_06) {

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06:

		RTL_W8(tp, Cfg9346, Cfg9346_Unlock);

		RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable);

		RTL_W8(tp, Cfg9346, Cfg9346_Lock);

		/* fall through */

	case RTL_GIGA_MAC_VER_07 ... RTL_GIGA_MAC_VER_24:

		flags = PCI_IRQ_LEGACY;

	} else {

		break;

	default:

		flags = PCI_IRQ_ALL_TYPES;

		break;

	}



	return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags);