[PATCH][Focal linux-aws-5.11] Revert "PCI/MSI: Mask MSI-X vectors only on success"

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/1960144

This reverts commit caefebc4b66f841612504c9bb3b37ce6a326d994.

Stable update from LP: #1958461 causes boot failure on c4.large instances.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 drivers/pci/msi.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 1953f1a9d35cc..c0091877ba0b8 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -851,6 +851,9 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
 		goto out_disable;
 	}
 
+	/* Ensure that all table entries are masked. */
+	msix_mask_all(base, tsize);
+
 	ret = msix_setup_entries(dev, base, entries, nvec, affd);
 	if (ret)
 		goto out_disable;
@@ -873,16 +876,6 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
 	/* Set MSI-X enabled bits and unmask the function */
 	pci_intx_for_msi(dev, 0);
 	dev->msix_enabled = 1;
-
-	/*
-	 * Ensure that all table entries are masked to prevent
-	 * stale entries from firing in a crash kernel.
-	 *
-	 * Done late to deal with a broken Marvell NVME device
-	 * which takes the MSI-X mask bits into account even
-	 * when MSI-X is disabled, which prevents MSI delivery.
-	 */
-	msix_mask_all(base, tsize);
 	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);
 
 	pcibios_free_irq(dev);
-- 
2.35.1