The Intel IOMMU interrupt remapping driver already programs correctly the
delivery mode of individual irqs as per their irq_data. Improve handling
of NMIs. Allow only one irq per NMI. Also, it is not necessary to cleanup
irq vectors after updating affinity. NMIs do not have associated vectors.
Cc: Andi Kleen <a...@linux.intel.com>
Cc: David Woodhouse <dw...@infradead.org>
Cc: "Ravi V. Shankar" <ravi.v.shan...@intel.com>
Cc: Lu Baolu <baolu...@linux.intel.com>
Cc: Stephane Eranian <eran...@google.com>
Cc: io...@lists.linux-foundation.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: x...@kernel.org
Reviewed-by: Lu Baolu <baolu...@linux.intel.com>
Signed-off-by: Ricardo Neri <ricardo.neri-calde...@linux.intel.com>
---
Changes since v5:
* Introduced this patch.
Changes since v4:
* N/A
Changes since v3:
* N/A
Changes since v2:
* N/A
Changes since v1:
* N/A
---
drivers/iommu/intel/irq_remapping.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/intel/irq_remapping.c
b/drivers/iommu/intel/irq_remapping.c
index fb2d71bea98d..791a9331e257 100644
--- a/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@ -1198,8 +1198,12 @@ intel_ir_set_affinity(struct irq_data *data, const
struct cpumask *mask,
* After this point, all the interrupts will start arriving
* at the new destination. So, time to cleanup the previous
* vector allocation.
+ *
+ * Do it only for non-NMI irqs. NMIs don't have associated
+ * vectors.
*/
- send_cleanup_vector(cfg);
+ if (cfg->delivery_mode != APIC_DELIVERY_MODE_NMI)
+ send_cleanup_vector(cfg);
return IRQ_SET_MASK_OK_DONE;
}
@@ -1352,6 +1356,9 @@ static int intel_irq_remapping_alloc(struct irq_domain
*domain,
if (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI)
info->flags &= ~X86_IRQ_ALLOC_CONTIGUOUS_VECTORS;
+ if ((info->flags & X86_IRQ_ALLOC_AS_NMI) && nr_irqs != 1)
+ return -EINVAL;
+
ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, arg);
if (ret < 0)
return ret;
--
2.17.1
