Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f19f5ecc authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Convert remapped ioapic affinity setting to new irq chip function 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
parent 5346b2a7

arch/x86/kernel/apic/io_apic.c

+20 −38
Original line number Diff line number Diff line
@@ -2333,24 +2333,21 @@ ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask, 
 * the interrupt-remapping table entry.

 */

static int

migrate_ioapic_irq_desc(struct irq_desc *desc, const struct cpumask *mask)

ir_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,

		       bool force)

{

	struct irq_cfg *cfg;

	struct irq_cfg *cfg = data->chip_data;

	unsigned int dest, irq = data->irq;

	struct irte irte;

	unsigned int dest;

	unsigned int irq;

	int ret = -1;



	if (!cpumask_intersects(mask, cpu_online_mask))

		return ret;

		return -EINVAL;



	irq = desc->irq;

	if (get_irte(irq, &irte))

		return ret;

		return -EBUSY;



	cfg = get_irq_desc_chip_data(desc);

	if (assign_irq_vector(irq, cfg, mask))

		return ret;

		return -EBUSY;



	dest = apic->cpu_mask_to_apicid_and(cfg->domain, mask);
@@ -2365,29 +2362,14 @@ migrate_ioapic_irq_desc(struct irq_desc *desc, const struct cpumask *mask) 
	if (cfg->move_in_progress)

		send_cleanup_vector(cfg);



	cpumask_copy(desc->affinity, mask);



	cpumask_copy(data->affinity, mask);

	return 0;

}



/*

 * Migrates the IRQ destination in the process context.

 */

static int set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc,

					    const struct cpumask *mask)

{

	return migrate_ioapic_irq_desc(desc, mask);

}

static int set_ir_ioapic_affinity_irq(unsigned int irq,

				       const struct cpumask *mask)

{

	struct irq_desc *desc = irq_to_desc(irq);



	return set_ir_ioapic_affinity_irq_desc(desc, mask);

}

#else

static inline int set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc,

						   const struct cpumask *mask)

static inline int

ir_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,

		       bool force)

{

	return 0;

}
@@ -2670,7 +2652,7 @@ static struct irq_chip ir_ioapic_chip __read_mostly = { 
	.irq_ack		= ir_ack_apic_edge,

	.irq_eoi		= ir_ack_apic_level,

#ifdef CONFIG_SMP

	.set_affinity	= set_ir_ioapic_affinity_irq,

	.irq_set_affinity	= ir_ioapic_set_affinity,

#endif

#endif

	.irq_retrigger		= ioapic_retrigger_irq,
@@ -4029,7 +4011,7 @@ void __init setup_ioapic_dest(void) 
			mask = apic->target_cpus();



		if (intr_remapping_enabled)

			set_ir_ioapic_affinity_irq_desc(desc, mask);

			ir_ioapic_set_affinity(&desc->irq_data, mask, false);

		else

			ioapic_set_affinity(&desc->irq_data, mask, false);

	}