Skip to content

Commit 41998ee

Browse files
committed
Merge tag 'irq_urgent_for_v6.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Borislav Petkov: - Fix a case of recursive locking in the MSI code - Fix a randconfig build failure in armada-370-xp irqchip * tag 'irq_urgent_for_v6.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/irq-msi-lib: Fix build with PCI disabled PCI/MSI: Prevent recursive locking in pci_msix_write_tph_tag()
2 parents 0a197b7 + a8b289f commit 41998ee

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/pci/msi/msi.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,10 +934,12 @@ int pci_msix_write_tph_tag(struct pci_dev *pdev, unsigned int index, u16 tag)
934934
if (!pdev->msix_enabled)
935935
return -ENXIO;
936936

937-
guard(msi_descs_lock)(&pdev->dev);
938937
virq = msi_get_virq(&pdev->dev, index);
939938
if (!virq)
940939
return -ENXIO;
940+
941+
guard(msi_descs_lock)(&pdev->dev);
942+
941943
/*
942944
* This is a horrible hack, but short of implementing a PCI
943945
* specific interrupt chip callback and a huge pile of

include/linux/irqchip/irq-msi-lib.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#define MATCH_PLATFORM_MSI BIT(DOMAIN_BUS_PLATFORM_MSI)
1919

20+
struct msi_domain_info;
2021
int msi_lib_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec,
2122
enum irq_domain_bus_token bus_token);
2223

0 commit comments

Comments
 (0)