diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-29 19:47:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-29 19:47:02 +0200 |
| commit | f20a2637b1b1851cb30fceab68c27aef5fd43a2c (patch) | |
| tree | edbbcc7542ff62be4b8af74c81d4942ef4988547 /drivers | |
| parent | Merge tag 'perf_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | PCI/MSI: Skip masking MSI-X on Xen PV (diff) | |
| download | linux-f20a2637b1b1851cb30fceab68c27aef5fd43a2c.tar.xz linux-f20a2637b1b1851cb30fceab68c27aef5fd43a2c.zip | |
Merge tag 'irq_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Borislav Petkov:
- Have msix_mask_all() check a global control which says whether MSI-X
masking should be done and thus make it usable on Xen-PV too
* tag 'irq_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
PCI/MSI: Skip masking MSI-X on Xen PV
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/msi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index e5e75331b415..3a9f4f8ad8f9 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -776,6 +776,9 @@ static void msix_mask_all(void __iomem *base, int tsize) u32 ctrl = PCI_MSIX_ENTRY_CTRL_MASKBIT; int i; + if (pci_msi_ignore_mask) + return; + for (i = 0; i < tsize; i++, base += PCI_MSIX_ENTRY_SIZE) writel(ctrl, base + PCI_MSIX_ENTRY_VECTOR_CTRL); } |