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()
This commit is contained in:
@@ -934,10 +934,12 @@ int pci_msix_write_tph_tag(struct pci_dev *pdev, unsigned int index, u16 tag)
|
||||
if (!pdev->msix_enabled)
|
||||
return -ENXIO;
|
||||
|
||||
guard(msi_descs_lock)(&pdev->dev);
|
||||
virq = msi_get_virq(&pdev->dev, index);
|
||||
if (!virq)
|
||||
return -ENXIO;
|
||||
|
||||
guard(msi_descs_lock)(&pdev->dev);
|
||||
|
||||
/*
|
||||
* This is a horrible hack, but short of implementing a PCI
|
||||
* specific interrupt chip callback and a huge pile of
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#define MATCH_PLATFORM_MSI BIT(DOMAIN_BUS_PLATFORM_MSI)
|
||||
|
||||
struct msi_domain_info;
|
||||
int msi_lib_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec,
|
||||
enum irq_domain_bus_token bus_token);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user