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

Commit 37946d95 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Add align parameter to alloc_irq_index() 



For multi-MSI IRQ ranges the IRQ index needs to be aligned
to the power-of-two of the requested IRQ count. Extend the
alloc_irq_index() function to allow such an allocation.

Reported-by: default avatarThomas Gleixner <tglx@linutronix.de>
Fixes: 2b324506 ('iommu/amd: Add routines to manage irq remapping tables')
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 9e66317d

drivers/iommu/amd_iommu.c

+14 −8
Original line number Diff line number Diff line
@@ -3660,11 +3660,11 @@ static struct irq_remap_table *get_irq_table(u16 devid, bool ioapic) 
	return table;

}



static int alloc_irq_index(u16 devid, int count)

static int alloc_irq_index(u16 devid, int count, bool align)

{

	struct irq_remap_table *table;

	int index, c, alignment = 1;

	unsigned long flags;

	int index, c;

	struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];



	if (!iommu)
@@ -3674,16 +3674,22 @@ static int alloc_irq_index(u16 devid, int count) 
	if (!table)

		return -ENODEV;



	if (align)

		alignment = roundup_pow_of_two(count);



	spin_lock_irqsave(&table->lock, flags);



	/* Scan table for free entries */

	for (c = 0, index = table->min_index;

	for (index = ALIGN(table->min_index, alignment), c = 0;

	     index < MAX_IRQS_PER_TABLE;

	     ++index) {

		if (!iommu->irte_ops->is_allocated(table, index))

	     index++) {

		if (!iommu->irte_ops->is_allocated(table, index)) {

			c += 1;

		else

		} else {

			c     = 0;

			index = ALIGN(index, alignment);

			continue;

		}



		if (c == count)	{

			for (; c != 0; --c)
@@ -4096,7 +4102,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq, 
		else

			ret = -ENOMEM;

	} else {

		index = alloc_irq_index(devid, nr_irqs);

		index = alloc_irq_index(devid, nr_irqs, false);

	}

	if (index < 0) {

		pr_warn("Failed to allocate IRTE\n");