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

r8169: fix issue with forced threading in combination with shared interrupts

[ Upstream commit 2734a24e6e5d18522fbf599135c59b82ec9b2c9e ]

As reported by Serge flag IRQF_NO_THREAD causes an error if the
interrupt is actually shared and the other driver(s) don't have this
flag set. This situation can occur if a PCI(e) legacy interrupt is
used in combination with forced threading.
There's no good way to deal with this properly, therefore we have to
remove flag IRQF_NO_THREAD. For fixing the original forced threading
issue switch to napi_schedule().

Fixes: 424a646e072a ("r8169: fix operation under forced interrupt threading")

Reported-by: default avatarSerge Belyshev <>
Signed-off-by: default avatarHeiner Kallweit <>
Tested-by: default avatarSerge Belyshev <>

Signed-off-by: default avatarJakub Kicinski <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 62d9cec6
...@@ -4559,7 +4559,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) ...@@ -4559,7 +4559,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
} }
rtl_irq_disable(tp); rtl_irq_disable(tp);
napi_schedule_irqoff(&tp->napi); napi_schedule(&tp->napi);
out: out:
rtl_ack_events(tp, status); rtl_ack_events(tp, status);
...@@ -4727,7 +4727,7 @@ static int rtl_open(struct net_device *dev) ...@@ -4727,7 +4727,7 @@ static int rtl_open(struct net_device *dev)
rtl_request_firmware(tp); rtl_request_firmware(tp);
retval = request_irq(pci_irq_vector(pdev, 0), rtl8169_interrupt, retval = request_irq(pci_irq_vector(pdev, 0), rtl8169_interrupt,
IRQF_NO_THREAD | IRQF_SHARED, dev->name, tp); IRQF_SHARED, dev->name, tp);
if (retval < 0) if (retval < 0)
goto err_release_fw_2; goto err_release_fw_2;
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