Commit 70b7d651 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fix from Thomas Gleixner:
 "A single fix for the PCI/MSI code:

  The conversion to per device MSI domains created a MSI domain with
  size 1 instead of sizing it to the maximum possible number of MSI
  interrupts for the device. This "worked" as the subsequent allocations
  resized the domain, but the recent change to move the prepare() call
  into the domain creation path broke this works by chance mechanism.

  Size the domain properly at creation time"

* tag 'irq-urgent-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  PCI/MSI: Size device MSI domain with the maximum number of vectors
parents 35b574a6 9cc82d99

drivers/pci/msi/irqdomain.c

+3 −2
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ static bool pci_create_device_domain(struct pci_dev *pdev, const struct msi_doma 
/**

 * pci_setup_msi_device_domain - Setup a device MSI interrupt domain

 * @pdev:	The PCI device to create the domain on

 * @hwsize:	The maximum number of MSI vectors

 *

 * Return:

 *  True when:
@@ -287,7 +288,7 @@ static bool pci_create_device_domain(struct pci_dev *pdev, const struct msi_doma 
 *	- The device is removed

 *	- MSI is disabled and a MSI-X domain is created

 */

bool pci_setup_msi_device_domain(struct pci_dev *pdev)

bool pci_setup_msi_device_domain(struct pci_dev *pdev, unsigned int hwsize)

{

	if (WARN_ON_ONCE(pdev->msix_enabled))

		return false;
@@ -297,7 +298,7 @@ bool pci_setup_msi_device_domain(struct pci_dev *pdev) 
	if (pci_match_device_domain(pdev, DOMAIN_BUS_PCI_DEVICE_MSIX))

		msi_remove_device_irq_domain(&pdev->dev, MSI_DEFAULT_DOMAIN);



	return pci_create_device_domain(pdev, &pci_msi_template, 1);

	return pci_create_device_domain(pdev, &pci_msi_template, hwsize);

}



/**

drivers/pci/msi/msi.c

+4 −4
Original line number Diff line number Diff line
@@ -439,16 +439,16 @@ int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec, 
	if (nvec < minvec)

		return -ENOSPC;



	if (nvec > maxvec)

		nvec = maxvec;



	rc = pci_setup_msi_context(dev);

	if (rc)

		return rc;



	if (!pci_setup_msi_device_domain(dev))

	if (!pci_setup_msi_device_domain(dev, nvec))

		return -ENODEV;



	if (nvec > maxvec)

		nvec = maxvec;



	for (;;) {

		if (affd) {

			nvec = irq_calc_affinity_vectors(minvec, nvec, affd);

drivers/pci/msi/msi.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ enum support_mode { 
};



bool pci_msi_domain_supports(struct pci_dev *dev, unsigned int feature_mask, enum support_mode mode);

bool pci_setup_msi_device_domain(struct pci_dev *pdev);

bool pci_setup_msi_device_domain(struct pci_dev *pdev, unsigned int hwsize);

bool pci_setup_msix_device_domain(struct pci_dev *pdev, unsigned int hwsize);



/* Legacy (!IRQDOMAIN) fallbacks */