summaryrefslogtreecommitdiffstats
path: root/arch/s390/pci
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2021-07-29 23:51:51 +0200
committerThomas Gleixner <tglx@linutronix.de>2021-08-10 11:03:29 +0200
commit3998527d2e3ee2bfdf710a45b7b90968ff87babc (patch)
treeb137294e5282449627e9392addb4cbfa556c5aad /arch/s390/pci
parent4b41ea606e535d47636ac4f5283834e9f6c5fa53 (diff)
downloadlinux-3998527d2e3ee2bfdf710a45b7b90968ff87babc.tar.gz
linux-3998527d2e3ee2bfdf710a45b7b90968ff87babc.tar.bz2
linux-3998527d2e3ee2bfdf710a45b7b90968ff87babc.zip
s390/pci: Do not mask MSI[-X] entries on teardown
The PCI core already ensures that the MSI[-X] state is correct when MSI[-X] is disabled. For MSI the reset state is all entries unmasked and for MSI-X all vectors are masked. S390 masks all MSI entries and masks the already masked MSI-X entries again. Remove it and let the device in the correct state. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Niklas Schnelle <schnelle@linux.ibm.com> Tested-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Marc Zyngier <maz@kernel.org> Acked-by: Niklas Schnelle <schnelle@linux.ibm.com> Link: https://lore.kernel.org/r/20210729222542.939798136@linutronix.de
Diffstat (limited to 'arch/s390/pci')
-rw-r--r--arch/s390/pci/pci_irq.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c
index 9c7de9089939..3823e159bf74 100644
--- a/arch/s390/pci/pci_irq.c
+++ b/arch/s390/pci/pci_irq.c
@@ -365,10 +365,6 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev)
for_each_pci_msi_entry(msi, pdev) {
if (!msi->irq)
continue;
- if (msi->msi_attrib.is_msix)
- __pci_msix_desc_mask_irq(msi, 1);
- else
- __pci_msi_desc_mask_irq(msi, 1, 1);
irq_set_msi_desc(msi->irq, NULL);
irq_free_desc(msi->irq);
msi->msg.address_lo = 0;