diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-12-14 12:42:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-22 09:18:00 +0100 |
| commit | c9b5c1d450ac722572f158034b4167b490e9307e (patch) | |
| tree | 4af6bfb53a3710d1a1689037683cc9170fa1fb47 | |
| parent | 9b3a3a363591aa002cd5abedbdca098f398eddd5 (diff) | |
| download | linux-c9b5c1d450ac722572f158034b4167b490e9307e.tar.gz linux-c9b5c1d450ac722572f158034b4167b490e9307e.tar.bz2 linux-c9b5c1d450ac722572f158034b4167b490e9307e.zip | |
PCI/MSI: Clear PCI_MSIX_FLAGS_MASKALL on error
commit 94185adbfad56815c2c8401e16d81bdb74a79201 upstream.
PCI_MSIX_FLAGS_MASKALL is set in the MSI-X control register at MSI-X
interrupt setup time. It's cleared on success, but the error handling path
only clears the PCI_MSIX_FLAGS_ENABLE bit.
That's incorrect as the reset state of the PCI_MSIX_FLAGS_MASKALL bit is
zero. That can be observed via lspci:
Capabilities: [b0] MSI-X: Enable- Count=67 Masked+
Clear the bit in the error path to restore the reset state.
Fixes: 438553958ba1 ("PCI/MSI: Enable and mask MSI-X early")
Reported-by: Stefan Roese <sr@denx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Stefan Roese <sr@denx.de>
Cc: linux-pci@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Marek Vasut <marex@denx.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/87tufevoqx.ffs@tglx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/pci/msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 2c000b9b0a42..1b5614f95ff0 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -847,7 +847,7 @@ out_free: free_msi_irqs(dev); out_disable: - pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0); + pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE, 0); return ret; } |