From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 14 Dec 2021 12:30:34 +0000 (+0100)
Subject: Merge branch 'irq/urgent' into irq/msi
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=09eb3ad55fef8d62edb74d5fe3a6720b6b467463;p=linux.git

Merge branch 'irq/urgent' into irq/msi

to pick up the PCI/MSI-x fixes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

09eb3ad55fef8d62edb74d5fe3a6720b6b467463
diff --cc drivers/pci/msi/msi.c
index 8b4d529792a6,d84cf30bb279..eb917fecf3cf
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@@ -598,14 -722,9 +598,11 @@@ static int msix_capability_init(struct 
  		goto out_disable;
  	}
  
 +	dev->msix_base = base;
 +
- 	/* 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;
 +		goto out_free;
  
  	ret = pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);
  	if (ret)