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

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

genirq: Mirror IRQ_PER_CPU and IRQ_NO_BALANCING in irq_data.state 



That's the right data structure to look at for arch code.

Accessor functions are provided.

	 irqd_is_per_cpu(irqdata);
	 irqd_can_balance(irqdata);

Coders who access them directly will be tracked down and slapped with
stinking trouts.

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

include/linux/irq.h

+15 −1
Original line number Diff line number Diff line
@@ -132,10 +132,14 @@ struct irq_data { 
 * Bit masks for irq_data.state

 *

 * IRQD_SETAFFINITY_PENDING	- Affinity setting is pending

 * IRQD_NO_BALANCING		- Balancing disabled for this IRQ

 * IRQD_PER_CPU			- Interrupt is per cpu

 */

enum {

	/* Bit 0 - 7 reserved for TYPE will use later */

	IRQD_SETAFFINITY_PENDING	= (1 <<  8),

	IRQD_NO_BALANCING		= (1 << 10),

	IRQD_PER_CPU			= (1 << 11),

};



static inline bool irqd_is_setaffinity_pending(struct irq_data *d)
@@ -143,6 +147,16 @@ static inline bool irqd_is_setaffinity_pending(struct irq_data *d) 
	return d->state_use_accessors & IRQD_SETAFFINITY_PENDING;

}



static inline bool irqd_is_per_cpu(struct irq_data *d)

{

	return d->state_use_accessors & IRQD_PER_CPU;

}



static inline bool irqd_can_balance(struct irq_data *d)

{

	return !(d->state_use_accessors & (IRQD_PER_CPU | IRQD_NO_BALANCING));

}



/**

 * struct irq_chip - hardware interrupt chip descriptor

 *

kernel/irq/chip.c

+9 −6
Original line number Diff line number Diff line
@@ -706,12 +706,15 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set) 
	if (!desc)

		return;



	/* Sanitize flags */

	set &= IRQF_MODIFY_MASK;

	clr &= IRQF_MODIFY_MASK;



	raw_spin_lock_irqsave(&desc->lock, flags);

	desc->status &= ~clr;

	desc->status |= set;



	irq_settings_clr_and_set(desc, clr, set);



	irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU);

	if (irq_settings_has_no_balance_set(desc))

		irqd_set(&desc->irq_data, IRQD_NO_BALANCING);

	if (irq_settings_is_per_cpu(desc))

		irqd_set(&desc->irq_data, IRQD_PER_CPU);



	raw_spin_unlock_irqrestore(&desc->lock, flags);

}

kernel/irq/internals.h

+11 −0
Original line number Diff line number Diff line
@@ -139,3 +139,14 @@ static inline void irqd_clr_move_pending(struct irq_data *d) 
	d->state_use_accessors &= ~IRQD_SETAFFINITY_PENDING;

	irq_compat_clr_move_pending(irq_data_to_desc(d));

}



static inline void irqd_clear(struct irq_data *d, unsigned int mask)

{

	d->state_use_accessors &= ~mask;

}



static inline void irqd_set(struct irq_data *d, unsigned int mask)

{

	d->state_use_accessors |= mask;

}

kernel/irq/manage.c

+10 −6
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ int irq_can_set_affinity(unsigned int irq) 
{

	struct irq_desc *desc = irq_to_desc(irq);



	if ((desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) ||

	    !desc->irq_data.chip || !desc->irq_data.chip->irq_set_affinity)

	if (!irqd_can_balance(&desc->irq_data) || !desc->irq_data.chip ||

	    !desc->irq_data.chip->irq_set_affinity)

		return 0;



	return 1;
@@ -897,8 +897,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
				  IRQS_INPROGRESS | IRQS_ONESHOT | \

				  IRQS_WAITING);



		if (new->flags & IRQF_PERCPU)

			desc->status |= IRQ_PER_CPU;

		if (new->flags & IRQF_PERCPU) {

			irqd_set(&desc->irq_data, IRQD_PER_CPU);

			irq_settings_set_per_cpu(desc);

		}



		if (new->flags & IRQF_ONESHOT)

			desc->istate |= IRQS_ONESHOT;
@@ -910,8 +912,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
			desc->depth = 1;



		/* Exclude IRQ from balancing if requested */

		if (new->flags & IRQF_NOBALANCING)

			desc->status |= IRQ_NO_BALANCING;

		if (new->flags & IRQF_NOBALANCING) {

			irq_settings_set_no_balancing(desc);

			irqd_set(&desc->irq_data, IRQD_NO_BALANCING);

		}



		/* Set default affinity mask once everything is setup */

		setup_affinity(irq, desc, mask);

kernel/irq/migration.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ void move_masked_irq(int irq) 
	/*

	 * Paranoia: cpu-local interrupts shouldn't be calling in here anyway.

	 */

	if (desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) {

	if (!irqd_can_balance(&desc->irq_data)) {

		WARN_ON(1);

		return;

	}