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

Commit 654abd0a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/irq: Restructure fixup_irqs() 



Reorder fixup_irqs() so it matches the flow in the generic migration code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Link: http://lkml.kernel.org/r/20170619235445.774272454@linutronix.de
parent 77f85e66

arch/x86/kernel/irq.c

+20 −26
Original line number Original line Diff line number Diff line
@@ -433,7 +433,6 @@ int check_irq_vectors_for_cpu_disable(void) 
void fixup_irqs(void)

void fixup_irqs(void)

{

{

	unsigned int irq, vector;

	unsigned int irq, vector;

	static int warned;

	struct irq_desc *desc;

	struct irq_desc *desc;

	struct irq_data *data;

	struct irq_data *data;

	struct irq_chip *chip;

	struct irq_chip *chip;
@@ -441,18 +440,27 @@ void fixup_irqs(void) 




	for_each_irq_desc(irq, desc) {

	for_each_irq_desc(irq, desc) {

		const struct cpumask *affinity;

		const struct cpumask *affinity;

		int break_affinity = 0;

		bool break_affinity = false;

		int set_affinity = 1;





		if (!desc)

		if (!desc)

			continue;

			continue;

		if (irq == 2)

			continue;





		/* interrupt's are disabled at this point */

		/* interrupt's are disabled at this point */

		raw_spin_lock(&desc->lock);

		raw_spin_lock(&desc->lock);





		data = irq_desc_get_irq_data(desc);

		data = irq_desc_get_irq_data(desc);

		chip = irq_data_get_irq_chip(data);

		/*

		 * The interrupt descriptor might have been cleaned up

		 * already, but it is not yet removed from the radix

		 * tree. If the chip does not have an affinity setter,

		 * nothing to do here.

		 */

		if (!chip && !chip->irq_set_affinity) {

			raw_spin_unlock(&desc->lock);

			continue;

		}



		affinity = irq_data_get_affinity_mask(data);

		affinity = irq_data_get_affinity_mask(data);





		if (!irq_has_action(irq) || irqd_is_per_cpu(data) ||

		if (!irq_has_action(irq) || irqd_is_per_cpu(data) ||
@@ -485,30 +493,18 @@ void fixup_irqs(void) 
		 * affinity and use cpu_online_mask as fall back.

		 * affinity and use cpu_online_mask as fall back.

		 */

		 */

		if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {

		if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {

			break_affinity = 1;

			broke_affinity = true;

			affinity = cpu_online_mask;

			affinity = cpu_online_mask;

		}

		}





		chip = irq_data_get_irq_chip(data);

		/*

		 * The interrupt descriptor might have been cleaned up

		 * already, but it is not yet removed from the radix tree

		 */

		if (!chip) {

			raw_spin_unlock(&desc->lock);

			continue;

		}



		if (!irqd_can_move_in_process_context(data) && chip->irq_mask)

		if (!irqd_can_move_in_process_context(data) && chip->irq_mask)

			chip->irq_mask(data);

			chip->irq_mask(data);





		if (chip->irq_set_affinity) {

		ret = chip->irq_set_affinity(data, affinity, true);

		ret = chip->irq_set_affinity(data, affinity, true);

			if (ret == -ENOSPC)

		if (ret) {

				pr_crit("IRQ %d set affinity failed because there are no available vectors.  The device assigned to this IRQ is unstable.\n", irq);

			pr_crit("IRQ %u: Force affinity failed (%d)\n",

		} else {

				d->irq, ret);

			if (!(warned++))

			broke_affinity = false;

				set_affinity = 0;

		}

		}





		/*

		/*
@@ -522,10 +518,8 @@ void fixup_irqs(void) 




		raw_spin_unlock(&desc->lock);

		raw_spin_unlock(&desc->lock);





		if (break_affinity && set_affinity)

		if (broke_affinity)

			pr_notice("Broke affinity for irq %i\n", irq);

			pr_notice("Broke affinity for irq %i\n", irq);

		else if (!set_affinity)

			pr_notice("Cannot set affinity for irq %i\n", irq);

	}

	}





	/*

	/*