1 files changed, 13 insertions, 7 deletions

diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 6d347064b8b0..e0b18f3ae9a8 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,
         return 0;
 }
 
-#ifdef CONFIG_SMP
 /*
  * Migrate the IO-APIC irq in the presence of intr-remapping.
  *
@@ -924,6 +923,10 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
         struct irq_cfg *cfg = data->chip_data;
         unsigned int dest, irq = data->irq;
         struct irte irte;
+        int err;
+
+        if (!config_enabled(CONFIG_SMP))
+                return -EINVAL;
 
         if (!cpumask_intersects(mask, cpu_online_mask))
                 return -EINVAL;
@@ -931,10 +934,16 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
         if (get_irte(irq, &irte))
                 return -EBUSY;
 
-        if (assign_irq_vector(irq, cfg, mask))
-                return -EBUSY;
+        err = assign_irq_vector(irq, cfg, mask);
+        if (err)
+                return err;
 
-        dest = apic->cpu_mask_to_apicid_and(cfg->domain, mask);
+        err = apic->cpu_mask_to_apicid_and(cfg->domain, mask, &dest);
+        if (err) {
+                if (assign_irq_vector(irq, cfg, data->affinity))
+                        pr_err("Failed to recover vector for irq %d\n", irq);
+                return err;
+        }
 
         irte.vector = cfg->vector;
         irte.dest_id = IRTE_DEST(dest);
@@ -956,7 +965,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
         cpumask_copy(data->affinity, mask);
         return 0;
 }
-#endif
 
 static void intel_compose_msi_msg(struct pci_dev *pdev,
                                   unsigned int irq, unsigned int dest,
@@ -1058,9 +1066,7 @@ struct irq_remap_ops intel_irq_remap_ops = {
         .reenable               = reenable_irq_remapping,
         .enable_faulting        = enable_drhd_fault_handling,
         .setup_ioapic_entry     = intel_setup_ioapic_entry,
-#ifdef CONFIG_SMP
         .set_affinity           = intel_ioapic_set_affinity,
-#endif
         .free_irq               = free_irte,
         .compose_msi_msg        = intel_compose_msi_msg,
         .msi_alloc_irq          = intel_msi_alloc_irq,