Commit feb7a43d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-msi-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull MSI irq updates from Thomas Gleixner:
 "Rework of the MSI interrupt infrastructure.

  This is a treewide cleanup and consolidation of MSI interrupt handling
  in preparation for further changes in this area which are necessary
  to:

   - address existing shortcomings in the VFIO area

   - support the upcoming Interrupt Message Store functionality which
     decouples the message store from the PCI config/MMIO space"

* tag 'irq-msi-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (94 commits)
  genirq/msi: Populate sysfs entry only once
  PCI/MSI: Unbreak pci_irq_get_affinity()
  genirq/msi: Convert storage to xarray
  genirq/msi: Simplify sysfs handling
  genirq/msi: Add abuse prevention comment to msi header
  genirq/msi: Mop up old interfaces
  genirq/msi: Convert to new functions
  genirq/msi: Make interrupt allocation less convoluted
  platform-msi: Simplify platform device MSI code
  platform-msi: Let core code handle MSI descriptors
  bus: fsl-mc-msi: Simplify MSI descriptor handling
  soc: ti: ti_sci_inta_msi: Remove ti_sci_inta_msi_domain_free_irqs()
  soc: ti: ti_sci_inta_msi: Rework MSI descriptor allocation
  NTB/msi: Convert to msi_on_each_desc()
  PCI: hv: Rework MSI handling
  powerpc/mpic_u3msi: Use msi_for_each-desc()
  powerpc/fsl_msi: Use msi_for_each_desc()
  powerpc/pasemi/msi: Convert to msi_on_each_dec()
  powerpc/cell/axon_msi: Convert to msi_on_each_desc()
  powerpc/4xx/hsta: Rework MSI handling
  ...
parents fd048992 74a5257a

.clang-format

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ ForEachMacros: 
  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_msi_vector'

  - 'for_each_net'

  - 'for_each_net_continue_reverse'

  - 'for_each_netdev'

Documentation/driver-api/pci/pci.rst

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ PCI Support Library 
.. kernel-doc:: drivers/pci/search.c

   :export:



.. kernel-doc:: drivers/pci/msi.c

.. kernel-doc:: drivers/pci/msi/msi.c

   :export:



.. kernel-doc:: drivers/pci/bus.c

arch/mips/pci/msi-octeon.c

+3 −29
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) 
	u64 search_mask;

	int index;



	if (desc->pci.msi_attrib.is_msix)

		return -EINVAL;



	/*

	 * Read the MSI config to figure out how many IRQs this device

	 * wants.  Most devices only want 1, which will give
@@ -182,35 +185,6 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) 
	return 0;

}



int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	struct msi_desc *entry;

	int ret;



	/*

	 * MSI-X is not supported.

	 */

	if (type == PCI_CAP_ID_MSIX)

		return -EINVAL;



	/*

	 * If an architecture wants to support multiple MSI, it needs to

	 * override arch_setup_msi_irqs()

	 */

	if (type == PCI_CAP_ID_MSI && nvec > 1)

		return 1;



	for_each_pci_msi_entry(entry, dev) {

		ret = arch_setup_msi_irq(dev, entry);

		if (ret < 0)

			return ret;

		if (ret > 0)

			return -ENOSPC;

	}



	return 0;

}



/**

 * Called when a device no longer needs its MSI interrupts. All

 * MSI interrupts for the device are freed.

arch/powerpc/boot/dts/bluestone.dts

+0 −25
Original line number Diff line number Diff line
@@ -366,30 +366,5 @@ PCIE0: pcie@d00000000 { 
				0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */

				0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;

		};



		MSI: ppc4xx-msi@C10000000 {

			compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";

			reg = < 0xC 0x10000000 0x100

				0xC 0x10000000 0x100>;

			sdr-base = <0x36C>;

			msi-data = <0x00004440>;

			msi-mask = <0x0000ffe0>;

			interrupts =<0 1 2 3 4 5 6 7>;

			interrupt-parent = <&MSI>;

			#interrupt-cells = <1>;

			#address-cells = <0>;

			#size-cells = <0>;

			msi-available-ranges = <0x0 0x100>;

			interrupt-map = <

				0 &UIC3 0x18 1

				1 &UIC3 0x19 1

				2 &UIC3 0x1A 1

				3 &UIC3 0x1B 1

				4 &UIC3 0x1C 1

				5 &UIC3 0x1D 1

				6 &UIC3 0x1E 1

				7 &UIC3 0x1F 1

			>;

		};

	};

};

arch/powerpc/boot/dts/canyonlands.dts

+0 −18
Original line number Diff line number Diff line
@@ -544,23 +544,5 @@ PCIE1: pcie@d20000000 { 
				0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */

				0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>;

		};



		MSI: ppc4xx-msi@C10000000 {

			compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";

			reg = < 0xC 0x10000000 0x100>;

			sdr-base = <0x36C>;

			msi-data = <0x00000000>;

			msi-mask = <0x44440000>;

			interrupt-count = <3>;

			interrupts = <0 1 2 3>;

			interrupt-parent = <&UIC3>;

			#interrupt-cells = <1>;

			#address-cells = <0>;

			#size-cells = <0>;

			interrupt-map = <0 &UIC3 0x18 1

					1 &UIC3 0x19 1

					2 &UIC3 0x1A 1

					3 &UIC3 0x1B 1>;

		};

	};

};