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

Commit 1fa46f1f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Simplify affinity related code 



There is lot of #ifdef CONFIG_GENERIC_PENDING_IRQ along with
duplicated code in the irq core. Move the #ifdeffery into one place
and cleanup the code so it's readable. No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a0cd9ca2

kernel/irq/manage.c

+41 −23
Original line number Original line Diff line number Diff line
@@ -100,47 +100,70 @@ void irq_set_thread_affinity(struct irq_desc *desc) 
	}

	}

}

}





#ifdef CONFIG_GENERIC_PENDING_IRQ

static inline bool irq_can_move_pcntxt(struct irq_desc *desc)

{

	return desc->status & IRQ_MOVE_PCNTXT;

}

static inline bool irq_move_pending(struct irq_desc *desc)

{

	return desc->status & IRQ_MOVE_PENDING;

}

static inline void

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

{

	cpumask_copy(desc->pending_mask, mask);

}

static inline void

irq_get_pending(struct cpumask *mask, struct irq_desc *desc)

{

	cpumask_copy(mask, desc->pending_mask);

}

#else

static inline bool irq_can_move_pcntxt(struct irq_desc *desc) { return true; }

static inline bool irq_move_pending(struct irq_desc *desc) { return false; }

static inline void

irq_copy_pending(struct irq_desc *desc, const struct cpumask *mask) { }

static inline void

irq_get_pending(struct cpumask *mask, struct irq_desc *desc) { }

#endif



/**

/**

 *	irq_set_affinity - Set the irq affinity of a given irq

 *	irq_set_affinity - Set the irq affinity of a given irq

 *	@irq:		Interrupt to set affinity

 *	@irq:		Interrupt to set affinity

 *	@cpumask:	cpumask

 *	@cpumask:	cpumask

 *

 *

 */

 */

int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)

int irq_set_affinity(unsigned int irq, const struct cpumask *mask)

{

{

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_chip *chip = desc->irq_data.chip;

	struct irq_chip *chip = desc->irq_data.chip;

	unsigned long flags;

	unsigned long flags;

	int ret = 0;





	if (!chip->irq_set_affinity)

	if (!chip->irq_set_affinity)

		return -EINVAL;

		return -EINVAL;





	raw_spin_lock_irqsave(&desc->lock, flags);

	raw_spin_lock_irqsave(&desc->lock, flags);





#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (irq_can_move_pcntxt(desc)) {

	if (desc->status & IRQ_MOVE_PCNTXT) {

		ret = chip->irq_set_affinity(&desc->irq_data, mask, false);

		if (!chip->irq_set_affinity(&desc->irq_data, cpumask, false)) {

		if (!ret) {

			cpumask_copy(desc->irq_data.affinity, cpumask);

			cpumask_copy(desc->irq_data.affinity, mask);

			irq_set_thread_affinity(desc);

			irq_set_thread_affinity(desc);

		}

		}

	}

	} else {

	else {

		desc->status |= IRQ_MOVE_PENDING;

		desc->status |= IRQ_MOVE_PENDING;

		cpumask_copy(desc->pending_mask, cpumask);

		irq_copy_pending(desc, mask);

	}

	}

#else



	if (!chip->irq_set_affinity(&desc->irq_data, cpumask, false)) {

		cpumask_copy(desc->irq_data.affinity, cpumask);

		irq_set_thread_affinity(desc);

	}

#endif

	if (desc->affinity_notify) {

	if (desc->affinity_notify) {

		kref_get(&desc->affinity_notify->kref);

		kref_get(&desc->affinity_notify->kref);

		schedule_work(&desc->affinity_notify->work);

		schedule_work(&desc->affinity_notify->work);

	}

	}

	desc->status |= IRQ_AFFINITY_SET;

	desc->status |= IRQ_AFFINITY_SET;

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	return 0;

	return ret;

}

}





int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)

int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
@@ -167,18 +190,13 @@ static void irq_affinity_notify(struct work_struct *work) 
	cpumask_var_t cpumask;

	cpumask_var_t cpumask;

	unsigned long flags;

	unsigned long flags;





	if (!desc)

	if (!desc || !alloc_cpumask_var(&cpumask, GFP_KERNEL))

		goto out;



	if (!alloc_cpumask_var(&cpumask, GFP_KERNEL))

		goto out;

		goto out;





	raw_spin_lock_irqsave(&desc->lock, flags);

	raw_spin_lock_irqsave(&desc->lock, flags);

#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (irq_move_pending(desc))

	if (desc->status & IRQ_MOVE_PENDING)

		irq_get_pending(cpumask, desc);

		cpumask_copy(cpumask, desc->pending_mask);

	else

	else

#endif

		cpumask_copy(cpumask, desc->irq_data.affinity);

		cpumask_copy(cpumask, desc->irq_data.affinity);

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	raw_spin_unlock_irqrestore(&desc->lock, flags);