Merge tag 'irq_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit f20a2637b1b1 · 2021-08-29T10:47:02.000-07:00
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
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -776,6 +776,9 @@ static void msix_mask_all(void __iomem *base, int tsize)`
`776`	`776`	`u32 ctrl = PCI_MSIX_ENTRY_CTRL_MASKBIT;`
`777`	`777`	`int i;`
`778`	`778`
	`779`	`+ if (pci_msi_ignore_mask)`
	`780`	`+ return;`
	`781`	`+`
`779`	`782`	`for (i = 0; i < tsize; i++, base += PCI_MSIX_ENTRY_SIZE)`
`780`	`783`	`writel(ctrl, base + PCI_MSIX_ENTRY_VECTOR_CTRL);`
`781`	`784`	`}`