Commit 03d84bd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'msi-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms 

Pull MSI fixes from Marc Zyngier:
 "Thomas tasked me with sending out a few urgent fixes after the giant
  MSI rework that landed in 6.2, as both s390 and powerpc ended-up
  suffering from it (they do not use the full core code infrastructure,
  leading to these previously undetected issues):

   - Return MSI_XA_DOMAIN_SIZE as the maximum MSI index when the
     architecture does not make use of irq domains instead of returning
     0, which is pretty limiting.

   - Check for the presence of an irq domain when validating the MSI
     iterator, as s390/powerpc won't have one.

   - Fix powerpc's MSI backends which fail to clear the descriptor's IRQ
     field on teardown, leading to a splat and leaked descriptors"

* tag 'msi-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms:
  powerpc/msi: Fix deassociation of MSI descriptors
  genirq/msi: Return MSI_XA_DOMAIN_SIZE as the maximum MSI index when no domain is present
  genirq/msi: Check for the presence of an irq domain when validating msi_ctrl
parents f9ff5644 4545c6a3

arch/powerpc/platforms/4xx/hsta_msi.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static void hsta_teardown_msi_irqs(struct pci_dev *dev) 
		msi_bitmap_free_hwirqs(&ppc4xx_hsta_msi.bmp, irq, 1);

		pr_debug("%s: Teardown IRQ %u (index %u)\n", __func__,

			 entry->irq, irq);

		entry->irq = 0;

	}

}

arch/powerpc/platforms/cell/axon_msi.c

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ static void axon_msi_teardown_msi_irqs(struct pci_dev *dev) 
	msi_for_each_desc(entry, &dev->dev, MSI_DESC_ASSOCIATED) {

		irq_set_msi_desc(entry->irq, NULL);

		irq_dispose_mapping(entry->irq);

		entry->irq = 0;

	}

}

arch/powerpc/platforms/pasemi/msi.c

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev) 
		hwirq = virq_to_hw(entry->irq);

		irq_set_msi_desc(entry->irq, NULL);

		irq_dispose_mapping(entry->irq);

		entry->irq = 0;

		msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, ALLOC_CHUNK);

	}

}

arch/powerpc/sysdev/fsl_msi.c

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev) 
		msi_data = irq_get_chip_data(entry->irq);

		irq_set_msi_desc(entry->irq, NULL);

		irq_dispose_mapping(entry->irq);

		entry->irq = 0;

		msi_bitmap_free_hwirqs(&msi_data->bitmap, hwirq, 1);

	}

}

arch/powerpc/sysdev/mpic_u3msi.c

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev) 
		hwirq = virq_to_hw(entry->irq);

		irq_set_msi_desc(entry->irq, NULL);

		irq_dispose_mapping(entry->irq);

		entry->irq = 0;

		msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, 1);

	}

}