Merge branch 'pci/msi'

bjorn-helgaas · bjorn-helgaas · commit 519e512110e4 · 2022-10-05T17:32:53.000-05:00
- Correct a typo in 71020a3 ('PCI/MSI: Use msi_add_msi_desc()') that reversed the sense of 'can_mask' in msi_add_msi_desc() (Josef Johansson) * pci/msi: PCI/MSI: Correct 'can_mask' test in msi_add_msi_desc()
diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
@@ -526,7 +526,7 @@ static int msix_setup_msi_descs(struct pci_dev *dev, void __iomem *base,
 		desc.pci.msi_attrib.can_mask = !pci_msi_ignore_mask &&
 					       !desc.pci.msi_attrib.is_virtual;
 
-		if (!desc.pci.msi_attrib.can_mask) {
+		if (desc.pci.msi_attrib.can_mask) {
 			addr = pci_msix_desc_addr(&desc);
 			desc.pci.msix_ctrl = readl(addr + PCI_MSIX_ENTRY_VECTOR_CTRL);
 		}

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ static int msix_setup_msi_descs(struct pci_dev dev, void __iomem base,`
`526`	`526`	`desc.pci.msi_attrib.can_mask = !pci_msi_ignore_mask &&`
`527`	`527`	`!desc.pci.msi_attrib.is_virtual;`
`528`	`528`
`529`		`- if (!desc.pci.msi_attrib.can_mask) {`
	`529`	`+ if (desc.pci.msi_attrib.can_mask) {`
`530`	`530`	`addr = pci_msix_desc_addr(&desc);`
`531`	`531`	`desc.pci.msix_ctrl = readl(addr + PCI_MSIX_ENTRY_VECTOR_CTRL);`
`532`	`532`	`}`