Skip to content

Commit

Permalink
sparseirq: fix intr-remap with dyn_array/nr_irqs changes]
Browse files Browse the repository at this point in the history
In irq_2_iommu_alloc() and set_irte_irq(), irq_to_desc or
irq_2_iommu pointers may not be allocated. So use the routines
which will allocate them if they are not already allocated.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Suresh Siddha authored and Ingo Molnar committed Oct 16, 2008
1 parent 0c425ce commit 7ddfb65
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/pci/intr_remapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq)
struct irq_desc *desc;
struct irq_2_iommu *irq_iommu;

desc = irq_to_desc(irq);

BUG_ON(!desc);
/*
* alloc irq desc if not allocated already.
*/
desc = irq_to_desc_alloc(irq);

irq_iommu = desc->irq_2_iommu;

Expand Down Expand Up @@ -255,11 +256,8 @@ int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
struct irq_2_iommu *irq_iommu;

spin_lock(&irq_2_ir_lock);
irq_iommu = valid_irq_2_iommu(irq);
if (!irq_iommu) {
spin_unlock(&irq_2_ir_lock);
return -1;
}

irq_iommu = irq_2_iommu_alloc(irq);

irq_iommu->iommu = iommu;
irq_iommu->irte_index = index;
Expand Down

0 comments on commit 7ddfb65

Please sign in to comment.