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

genirq: Add IRQ_MOVE_PENDING to irq_data.state 



chip implementations need to know about it. Keep status in sync until
all users are fixed. 

Accessor function: irqd_is_setaffinity_pending(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 91c49917

include/linux/irq.h

+18 −2
Original line number Diff line number Diff line
@@ -58,15 +58,16 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, 
#define IRQ_DISABLED		0x00000800	/* DEPRECATED */

#define IRQ_PENDING		0x00001000	/* DEPRECATED */

#define IRQ_MASKED		0x00002000	/* DEPRECATED */

/* DEPRECATED use irq_setaffinity_pending() instead*/

#define IRQ_MOVE_PENDING	0x00004000

#endif



#define IRQ_LEVEL		0x00004000	/* IRQ level triggered */

#define IRQ_LEVEL		0x00008000	/* IRQ level triggered */

#define IRQ_PER_CPU		0x00010000	/* IRQ is per CPU */

#define IRQ_NOPROBE		0x00020000	/* IRQ is not valid for probing */

#define IRQ_NOREQUEST		0x00040000	/* IRQ cannot be requested */

#define IRQ_NOAUTOEN		0x00080000	/* IRQ will not be enabled on request irq */

#define IRQ_WAKEUP		0x00100000	/* IRQ triggers system wakeup */

#define IRQ_MOVE_PENDING	0x00200000	/* need to re-target IRQ destination */

#define IRQ_NO_BALANCING	0x00400000	/* IRQ is excluded from balancing */

#define IRQ_MOVE_PCNTXT		0x01000000	/* IRQ migration from process context */

#define IRQ_AFFINITY_SET	0x02000000	/* IRQ affinity was set from userspace*/
@@ -128,6 +129,21 @@ struct irq_data { 
#endif

};



/*

 * Bit masks for irq_data.state

 *

 * IRQD_SETAFFINITY_PENDING	- Affinity setting is pending

 */

enum {

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

	IRQD_SETAFFINITY_PENDING = (1 << 8),

};



static inline bool irqd_is_setaffinity_pending(struct irq_data *d)

{

	return d->state_use_accessors & IRQD_SETAFFINITY_PENDING;

}



/**

 * struct irq_chip - hardware interrupt chip descriptor

 *

kernel/irq/compat.h

+11 −0
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@ static inline void irq_compat_clr_masked(struct irq_desc *desc) 
{

	desc->status &= ~IRQ_MASKED;

}

static inline void irq_compat_set_move_pending(struct irq_desc *desc)

{

	desc->status |= IRQ_MOVE_PENDING;

}



static inline void irq_compat_clr_move_pending(struct irq_desc *desc)

{

	desc->status &= ~IRQ_MOVE_PENDING;

}

#else

static inline void irq_compat_set_progress(struct irq_desc *desc) { }

static inline void irq_compat_clr_progress(struct irq_desc *desc) { }
@@ -46,5 +55,7 @@ static inline void irq_compat_set_pending(struct irq_desc *desc) { } 
static inline void irq_compat_clr_pending(struct irq_desc *desc) { }

static inline void irq_compat_set_masked(struct irq_desc *desc) { }

static inline void irq_compat_clr_masked(struct irq_desc *desc) { }

static inline void irq_compat_set_move_pending(struct irq_desc *desc) { }

static inline void irq_compat_clr_move_pending(struct irq_desc *desc) { }

#endif

kernel/irq/internals.h

+15 −0
Original line number Diff line number Diff line
@@ -124,6 +124,21 @@ static inline void chip_bus_sync_unlock(struct irq_desc *desc) 
		desc->irq_data.chip->irq_bus_sync_unlock(&desc->irq_data);

}



/*

 * Manipulation functions for irq_data.state

 */

static inline void irqd_set_move_pending(struct irq_data *d)

{

	d->state_use_accessors |= IRQD_SETAFFINITY_PENDING;

	irq_compat_set_move_pending(irq_data_to_desc(d));

}



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));

}



/*

 * Debugging printout:

 */

kernel/irq/manage.c

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static inline bool irq_can_move_pcntxt(struct irq_desc *desc) 
}

static inline bool irq_move_pending(struct irq_desc *desc)

{

	return desc->status & IRQ_MOVE_PENDING;

	return irqd_is_setaffinity_pending(&desc->irq_data);

}

static inline void

irq_copy_pending(struct irq_desc *desc, const struct cpumask *mask)
@@ -156,7 +156,7 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *mask) 
			ret = 0;

		}

	} else {

		desc->status |= IRQ_MOVE_PENDING;

		irqd_set_move_pending(&desc->irq_data);

		irq_copy_pending(desc, mask);

	}

kernel/irq/migration.c

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ void move_masked_irq(int irq) 
	struct irq_desc *desc = irq_to_desc(irq);

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



	if (likely(!(desc->status & IRQ_MOVE_PENDING)))

	if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))

		return;



	/*
@@ -20,7 +20,7 @@ void move_masked_irq(int irq) 
		return;

	}



	desc->status &= ~IRQ_MOVE_PENDING;

	irqd_clr_move_pending(&desc->irq_data);



	if (unlikely(cpumask_empty(desc->pending_mask)))

		return;
@@ -58,7 +58,7 @@ void move_native_irq(int irq) 
	struct irq_desc *desc = irq_to_desc(irq);

	bool masked;



	if (likely(!(desc->status & IRQ_MOVE_PENDING)))

	if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))

		return;



	if (unlikely(desc->istate & IRQS_DISABLED))

CRA Git | Maintained and supported by SUSTech CRA and CCSE