Skip to content

Commit 434b20a

Browse files
hkallweitgregkh
authored andcommitted
r8169: fix issue with forced threading in combination with shared interrupts
[ Upstream commit 2734a24 ] 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: 424a646 ("r8169: fix operation under forced interrupt threading") Link: https://www.spinics.net/lists/netdev/msg694960.html Reported-by: Serge Belyshev <[email protected]> Signed-off-by: Heiner Kallweit <[email protected]> Tested-by: Serge Belyshev <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 196cec6 commit 434b20a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/realtek/r8169_main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4563,7 +4563,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
45634563
}
45644564

45654565
rtl_irq_disable(tp);
4566-
napi_schedule_irqoff(&tp->napi);
4566+
napi_schedule(&tp->napi);
45674567
out:
45684568
rtl_ack_events(tp, status);
45694569

@@ -4738,7 +4738,7 @@ static int rtl_open(struct net_device *dev)
47384738
rtl_request_firmware(tp);
47394739

47404740
retval = request_irq(pci_irq_vector(pdev, 0), rtl8169_interrupt,
4741-
IRQF_NO_THREAD | IRQF_SHARED, dev->name, tp);
4741+
IRQF_SHARED, dev->name, tp);
47424742
if (retval < 0)
47434743
goto err_release_fw_2;
47444744

0 commit comments

Comments
 (0)