Commit 003bd5b4 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

r8169: don't use MSI before RTL8168d

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 avatarDavid S. Miller <davem@davemloft.net>
parent 66058b1c
...@@ -6586,13 +6586,18 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) ...@@ -6586,13 +6586,18 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
{ {
unsigned int flags; 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_unlock_config_regs(tp); rtl_unlock_config_regs(tp);
RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable); RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable);
rtl_lock_config_regs(tp); rtl_lock_config_regs(tp);
/* fall through */
case RTL_GIGA_MAC_VER_07 ... RTL_GIGA_MAC_VER_24:
flags = PCI_IRQ_LEGACY; flags = PCI_IRQ_LEGACY;
} else { break;
default:
flags = PCI_IRQ_ALL_TYPES; flags = PCI_IRQ_ALL_TYPES;
break;
} }
return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags); return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment