Skip to content

Commit

Permalink
r8169: set IRQF_NO_THREAD if MSI(X) is enabled
Browse files Browse the repository at this point in the history
We had to remove flag IRQF_NO_THREAD because it conflicts with shared
interrupts in case legacy interrupts are used. Following up on the
linked discussion set IRQF_NO_THREAD if MSI or MSI-X is used, because
both guarantee that interrupt won't be shared.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://www.spinics.net/lists/netdev/msg695341.html
Link: https://lore.kernel.org/r/446cf5b8-dddd-197f-cb96-66783141ade4@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Heiner Kallweit authored and Jakub Kicinski committed Nov 4, 2020
1 parent f06059c commit 870f531
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/net/ethernet/realtek/r8169_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4690,6 +4690,7 @@ static int rtl_open(struct net_device *dev)
{
struct rtl8169_private *tp = netdev_priv(dev);
struct pci_dev *pdev = tp->pci_dev;
unsigned long irqflags;
int retval = -ENOMEM;

pm_runtime_get_sync(&pdev->dev);
Expand All @@ -4714,8 +4715,9 @@ static int rtl_open(struct net_device *dev)

rtl_request_firmware(tp);

irqflags = pci_dev_msi_enabled(pdev) ? IRQF_NO_THREAD : IRQF_SHARED;
retval = request_irq(pci_irq_vector(pdev, 0), rtl8169_interrupt,
IRQF_SHARED, dev->name, tp);
irqflags, dev->name, tp);
if (retval < 0)
goto err_release_fw_2;

Expand Down

0 comments on commit 870f531

Please sign in to comment.