Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d24a1354 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: irq_remapping: Use irq_alloc/free_hwirq() 



The create_irq variants are going away. Use the new interface. The
core and arch code already excludes the gsi interrupts from the
allocation, so no functional change.

This does not replace the requirement to move x86 to irq domains, but
it limits the mess to some degree.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: default avatarJoerg Roedel <joro@8bytes.org>
Cc: x86@kernel.org
Cc: iommu@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/20140507154334.741805075@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b1ee5441

drivers/iommu/irq_remapping.c

+5 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void irq_remapping_disable_io_apic(void) 


static int do_setup_msi_irqs(struct pci_dev *dev, int nvec)

{

	int node, ret, sub_handle, nvec_pow2, index = 0;

	int ret, sub_handle, nvec_pow2, index = 0;

	unsigned int irq;

	struct msi_desc *msidesc;
@@ -61,8 +61,7 @@ static int do_setup_msi_irqs(struct pci_dev *dev, int nvec) 
	WARN_ON(msidesc->msi_attrib.multiple);

	WARN_ON(msidesc->nvec_used);



	node = dev_to_node(&dev->dev);

	irq = __create_irqs(get_nr_irqs_gsi(), nvec, node);

	irq = irq_alloc_hwirqs(nvec, dev_to_node(&dev->dev));

	if (irq == 0)

		return -ENOSPC;
@@ -89,7 +88,7 @@ static int do_setup_msi_irqs(struct pci_dev *dev, int nvec) 
	return 0;



error:

	destroy_irqs(irq, nvec);

	irq_free_hwirqs(irq, nvec);



	/*

	 * Restore altered MSI descriptor fields and prevent just destroyed
@@ -109,12 +108,11 @@ static int do_setup_msix_irqs(struct pci_dev *dev, int nvec) 
	unsigned int irq;



	node		= dev_to_node(&dev->dev);

	irq		= get_nr_irqs_gsi();

	sub_handle	= 0;



	list_for_each_entry(msidesc, &dev->msi_list, list) {



		irq = create_irq_nr(irq, node);

		irq = irq_alloc_hwirq(node);

		if (irq == 0)

			return -1;
@@ -137,7 +135,7 @@ static int do_setup_msix_irqs(struct pci_dev *dev, int nvec) 
	return 0;



error:

	destroy_irq(irq);

	irq_free_hwirq(irq);

	return ret;

}