summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2021-07-29 23:51:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-08-18 08:59:16 +0200
commit724d0a9850866ce2cc7df71b1497f49066535ccc (patch)
tree8bb6dbe6eb60bc27d9453a95aac56bf3f8819e53
parent923368751866babfc8924e24cd19f61fda1bca23 (diff)
downloadlinux-stable-724d0a9850866ce2cc7df71b1497f49066535ccc.tar.gz
linux-stable-724d0a9850866ce2cc7df71b1497f49066535ccc.tar.bz2
linux-stable-724d0a9850866ce2cc7df71b1497f49066535ccc.zip
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>
-rw-r--r--drivers/pci/msi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 479f35a5effc..8a32462d0e0f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -961,7 +961,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;