5 files changed, 86 insertions, 110 deletions

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 7cbd397884f5..a951ef7decb1 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2224,81 +2224,6 @@ void send_cleanup_vector(struct irq_cfg *cfg)
         cfg->move_in_progress = 0;
 }
 
-static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, struct irq_cfg *cfg)
-{
-        int apic, pin;
-        struct irq_pin_list *entry;
-        u8 vector = cfg->vector;
-
-        for_each_irq_pin(entry, cfg->irq_2_pin) {
-                unsigned int reg;
-
-                apic = entry->apic;
-                pin = entry->pin;
-                /*
-                 * With interrupt-remapping, destination information comes
-                 * from interrupt-remapping table entry.
-                 */
-                if (!irq_remapped(cfg))
-                        io_apic_write(apic, 0x11 + pin*2, dest);
-                reg = io_apic_read(apic, 0x10 + pin*2);
-                reg &= ~IO_APIC_REDIR_VECTOR_MASK;
-                reg |= vector;
-                io_apic_modify(apic, 0x10 + pin*2, reg);
-        }
-}
-
-/*
- * Either sets data->affinity to a valid value, and returns
- * ->cpu_mask_to_apicid of that in dest_id, or returns -1 and
- * leaves data->affinity untouched.
- */
-int __ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
-                          unsigned int *dest_id)
-{
-        struct irq_cfg *cfg = data->chip_data;
-        unsigned int irq = data->irq;
-        int err;
-
-        if (!cpumask_intersects(mask, cpu_online_mask))
-                return -EINVAL;
-
-        err = assign_irq_vector(irq, cfg, mask);
-        if (err)
-                return err;
-
-        err = apic->cpu_mask_to_apicid_and(mask, cfg->domain, dest_id);
-        if (err) {
-                if (assign_irq_vector(irq, cfg, data->affinity))
-                        pr_err("Failed to recover vector for irq %d\n", irq);
-                return err;
-        }
-
-        cpumask_copy(data->affinity, mask);
-
-        return 0;
-}
-
-static int
-ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
-                    bool force)
-{
-        unsigned int dest, irq = data->irq;
-        unsigned long flags;
-        int ret;
-
-        raw_spin_lock_irqsave(&ioapic_lock, flags);
-        ret = __ioapic_set_affinity(data, mask, &dest);
-        if (!ret) {
-                /* Only the high 8 bits are valid. */
-                dest = SET_APIC_LOGICAL_ID(dest);
-                __target_IO_APIC_irq(irq, dest, data->chip_data);
-                ret = IRQ_SET_MASK_OK_NOCOPY;
-        }
-        raw_spin_unlock_irqrestore(&ioapic_lock, flags);
-        return ret;
-}
-
 asmlinkage void smp_irq_move_cleanup_interrupt(void)
 {
         unsigned vector, me;
@@ -2386,6 +2311,87 @@ void irq_force_complete_move(int irq)
 static inline void irq_complete_move(struct irq_cfg *cfg) { }
 #endif
 
+static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, struct irq_cfg *cfg)
+{
+        int apic, pin;
+        struct irq_pin_list *entry;
+        u8 vector = cfg->vector;
+
+        for_each_irq_pin(entry, cfg->irq_2_pin) {
+                unsigned int reg;
+
+                apic = entry->apic;
+                pin = entry->pin;
+                /*
+                 * With interrupt-remapping, destination information comes
+                 * from interrupt-remapping table entry.
+                 */
+                if (!irq_remapped(cfg))
+                        io_apic_write(apic, 0x11 + pin*2, dest);
+                reg = io_apic_read(apic, 0x10 + pin*2);
+                reg &= ~IO_APIC_REDIR_VECTOR_MASK;
+                reg |= vector;
+                io_apic_modify(apic, 0x10 + pin*2, reg);
+        }
+}
+
+/*
+ * Either sets data->affinity to a valid value, and returns
+ * ->cpu_mask_to_apicid of that in dest_id, or returns -1 and
+ * leaves data->affinity untouched.
+ */
+int __ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
+                          unsigned int *dest_id)
+{
+        struct irq_cfg *cfg = data->chip_data;
+        unsigned int irq = data->irq;
+        int err;
+
+        if (!config_enabled(CONFIG_SMP))
+                return -1;
+
+        if (!cpumask_intersects(mask, cpu_online_mask))
+                return -EINVAL;
+
+        err = assign_irq_vector(irq, cfg, mask);
+        if (err)
+                return err;
+
+        err = apic->cpu_mask_to_apicid_and(mask, cfg->domain, dest_id);
+        if (err) {
+                if (assign_irq_vector(irq, cfg, data->affinity))
+                        pr_err("Failed to recover vector for irq %d\n", irq);
+                return err;
+        }
+
+        cpumask_copy(data->affinity, mask);
+
+        return 0;
+}
+
+static int
+ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
+                    bool force)
+{
+        unsigned int dest, irq = data->irq;
+        unsigned long flags;
+        int ret;
+
+        if (!config_enabled(CONFIG_SMP))
+                return -1;
+
+        raw_spin_lock_irqsave(&ioapic_lock, flags);
+        ret = __ioapic_set_affinity(data, mask, &dest);
+        if (!ret) {
+                /* Only the high 8 bits are valid. */
+                dest = SET_APIC_LOGICAL_ID(dest);
+                __target_IO_APIC_irq(irq, dest, data->chip_data);
+                ret = IRQ_SET_MASK_OK_NOCOPY;
+        }
+        raw_spin_unlock_irqrestore(&ioapic_lock, flags);
+        return ret;
+}
+
 static void ack_apic_edge(struct irq_data *data)
 {
         irq_complete_move(data->chip_data);
@@ -2565,9 +2571,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip)
         chip->irq_ack = ir_ack_apic_edge;
         chip->irq_eoi = ir_ack_apic_level;
 
-#ifdef CONFIG_SMP
         chip->irq_set_affinity = set_remapped_irq_affinity;
-#endif
 }
 #endif /* CONFIG_IRQ_REMAP */
 
@@ -2578,9 +2582,7 @@ static struct irq_chip ioapic_chip __read_mostly = {
         .irq_unmask             = unmask_ioapic_irq,
         .irq_ack                = ack_apic_edge,
         .irq_eoi                = ack_apic_level,
-#ifdef CONFIG_SMP
         .irq_set_affinity       = ioapic_set_affinity,
-#endif
         .irq_retrigger          = ioapic_retrigger_irq,
 };
 
@@ -3099,7 +3101,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,
         return err;
 }
 
-#ifdef CONFIG_SMP
 static int
 msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
 {
@@ -3121,7 +3122,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
 
         return IRQ_SET_MASK_OK_NOCOPY;
 }
-#endif /* CONFIG_SMP */
 
 /*
  * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3132,9 +3132,7 @@ static struct irq_chip msi_chip = {
         .irq_unmask             = unmask_msi_irq,
         .irq_mask               = mask_msi_irq,
         .irq_ack                = ack_apic_edge,
-#ifdef CONFIG_SMP
         .irq_set_affinity       = msi_set_affinity,
-#endif
         .irq_retrigger          = ioapic_retrigger_irq,
 };
 
@@ -3219,7 +3217,6 @@ void native_teardown_msi_irq(unsigned int irq)
 }
 
 #ifdef CONFIG_DMAR_TABLE
-#ifdef CONFIG_SMP
 static int
 dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,
                       bool force)
@@ -3244,16 +3241,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,
         return IRQ_SET_MASK_OK_NOCOPY;
 }
 
-#endif /* CONFIG_SMP */
-
 static struct irq_chip dmar_msi_type = {
         .name                   = "DMAR_MSI",
         .irq_unmask             = dmar_msi_unmask,
         .irq_mask               = dmar_msi_mask,
         .irq_ack                = ack_apic_edge,
-#ifdef CONFIG_SMP
         .irq_set_affinity       = dmar_msi_set_affinity,
-#endif
         .irq_retrigger          = ioapic_retrigger_irq,
 };
 
@@ -3274,7 +3267,6 @@ int arch_setup_dmar_msi(unsigned int irq)
 
 #ifdef CONFIG_HPET_TIMER
 
-#ifdef CONFIG_SMP
 static int hpet_msi_set_affinity(struct irq_data *data,
                                  const struct cpumask *mask, bool force)
 {
@@ -3297,16 +3289,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,
         return IRQ_SET_MASK_OK_NOCOPY;
 }
 
-#endif /* CONFIG_SMP */
-
 static struct irq_chip hpet_msi_type = {
         .name = "HPET_MSI",
         .irq_unmask = hpet_msi_unmask,
         .irq_mask = hpet_msi_mask,
         .irq_ack = ack_apic_edge,
-#ifdef CONFIG_SMP
         .irq_set_affinity = hpet_msi_set_affinity,
-#endif
         .irq_retrigger = ioapic_retrigger_irq,
 };
 
@@ -3341,8 +3329,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)
  */
 #ifdef CONFIG_HT_IRQ
 
-#ifdef CONFIG_SMP
-
 static void target_ht_irq(unsigned int irq, unsigned int dest, u8 vector)
 {
         struct ht_irq_msg msg;
@@ -3370,16 +3356,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
         return IRQ_SET_MASK_OK_NOCOPY;
 }
 
-#endif
-
 static struct irq_chip ht_irq_chip = {
         .name                   = "PCI-HT",
         .irq_mask               = mask_ht_irq,
         .irq_unmask             = unmask_ht_irq,
         .irq_ack                = ack_apic_edge,
-#ifdef CONFIG_SMP
         .irq_set_affinity       = ht_set_affinity,
-#endif
         .irq_retrigger          = ioapic_retrigger_irq,
 };
 
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 853902a1b7db..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.
  *
@@ -926,6 +925,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
         struct irte irte;
         int err;
 
+        if (!config_enabled(CONFIG_SMP))
+                return -EINVAL;
+
         if (!cpumask_intersects(mask, cpu_online_mask))
                 return -EINVAL;
 
@@ -963,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,
@@ -1065,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,
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 40cda8e98d87..1d29b1c66e72 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq,
                                              vector, attr);
 }
 
-#ifdef CONFIG_SMP
 int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask,
                               bool force)
 {
-        if (!remap_ops || !remap_ops->set_affinity)
+        if (!config_enabled(CONFIG_SMP) || !remap_ops ||
+            !remap_ops->set_affinity)
                 return 0;
 
         return remap_ops->set_affinity(data, mask, force);
 }
-#endif
 
 void free_remapped_irq(int irq)
 {
diff --git a/drivers/iommu/irq_remapping.h b/drivers/iommu/irq_remapping.h
index be9d72950c51..b12974cc1dfe 100644
--- a/drivers/iommu/irq_remapping.h
+++ b/drivers/iommu/irq_remapping.h
@@ -59,11 +59,9 @@ struct irq_remap_ops {
                                   unsigned int, int,
                                   struct io_apic_irq_attr *);
 
-#ifdef CONFIG_SMP
         /* Set the CPU affinity of a remapped interrupt */
         int (*set_affinity)(struct irq_data *data, const struct cpumask *mask,
                             bool force);
-#endif
 
         /* Free an IRQ */
         int (*free_irq)(int);
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 61f5cec031e0..47a937cd84af 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -150,9 +150,7 @@ struct irq_data {
         void                    *handler_data;
         void                    *chip_data;
         struct msi_desc         *msi_desc;
-#ifdef CONFIG_SMP
         cpumask_var_t           affinity;
-#endif
 };
 
 /*