Messages in this thread | | | Date | Tue, 9 Jun 2015 16:57:40 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the iommu tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in drivers/iommu/dmar.c between commit bc2272dcecae ("iommu/vt-d: Clean up log messages in intel-iommu.c") from the tree and commit 34742db8eaf9 ("iommu/vt-d: Refine the interfaces to create IRQ for DMAR unit") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/iommu/dmar.c index a2f50c5f4a2f,536f2d8ea41a..000000000000 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@@ -1642,26 -1642,17 +1642,17 @@@ int dmar_set_interrupt(struct intel_iom if (iommu->irq) return 0; - irq = dmar_alloc_hwirq(); - if (irq <= 0) { + irq = dmar_alloc_hwirq(iommu->seq_id, iommu->node, iommu); + if (irq > 0) { + iommu->irq = irq; + } else { - pr_err("IOMMU: no free vectors\n"); + pr_err("No free irq vectors\n"); return -EINVAL; } - irq_set_handler_data(irq, iommu); - iommu->irq = irq; - ret = arch_setup_dmar_msi(irq); - if (ret) { - irq_set_handler_data(irq, NULL); - iommu->irq = 0; - dmar_free_hwirq(irq); - return ret; - } ret = request_irq(irq, dmar_fault, IRQF_NO_THREAD, iommu->name, iommu); if (ret) - pr_err("IOMMU: can't request irq\n"); + pr_err("Can't request irq\n"); return ret; } [unhandled content-type:application/pgp-signature] | |