Commit 1b36c30a authored Jul 29, 2021 by Thomas Gleixner Committed by Sasha Levin Aug 26, 2021

PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown()



commit d28d4ad2a1aef27458b3383725bb179beb8d015c upstream.

No point in using the raw write function from shutdown. Preparatory change
to introduce proper serialization for the msi_desc::masked cache.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210729222542.674391354@linutronix.de


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c5b223cd

drivers/pci/msi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -896,7 +896,7 @@ static void pci_msi_shutdown(struct pci_dev *dev)

		/* Return the device with MSI unmasked as initial states */
		mask = msi_mask(desc->msi_attrib.multi_cap);
		__pci_msi_desc_mask_irq(desc, mask, 0);
		msi_mask_irq(desc, mask, 0);

		/* Restore dev->irq to its default pin-assertion irq */
		dev->irq = desc->msi_attrib.default_irq;