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

genirq: Distangle irq.h 



Move irq_desc and internal functions out of irq.h

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent fe212213

include/linux/irq.h

+13 −279
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, 
# define IRQ_NO_BALANCING_MASK	IRQ_NO_BALANCING

#endif



struct proc_dir_entry;

struct msi_desc;



/**
@@ -202,152 +201,36 @@ struct irq_chip { 
#endif

};



struct timer_rand_state;

struct irq_2_iommu;

/**

 * struct irq_desc - interrupt descriptor

 * @irq_data:		per irq and chip data passed down to chip functions

 * @timer_rand_state:	pointer to timer rand state struct

 * @kstat_irqs:		irq stats per cpu

 * @handle_irq:		highlevel irq-events handler [if NULL, __do_IRQ()]

 * @action:		the irq action chain

 * @status:		status information

 * @depth:		disable-depth, for nested irq_disable() calls

 * @wake_depth:		enable depth, for multiple set_irq_wake() callers

 * @irq_count:		stats field to detect stalled irqs

 * @last_unhandled:	aging timer for unhandled count

 * @irqs_unhandled:	stats field for spurious unhandled interrupts

 * @lock:		locking for SMP

 * @pending_mask:	pending rebalanced interrupts

 * @threads_active:	number of irqaction threads currently running

 * @wait_for_threads:	wait queue for sync_irq to wait for threaded handlers

 * @dir:		/proc/irq/ procfs entry

 * @name:		flow handler name for /proc/interrupts output

 */

struct irq_desc {



#ifdef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED

	struct irq_data		irq_data;

#else

	/*

	 * This union will go away, once we fixed the direct access to

	 * irq_desc all over the place. The direct fields are a 1:1

	 * overlay of irq_data.

	 */

	union {

		struct irq_data		irq_data;

		struct {

			unsigned int		irq;

			unsigned int		node;

			struct irq_chip		*chip;

			void			*handler_data;

			void			*chip_data;

			struct msi_desc		*msi_desc;

#ifdef CONFIG_SMP

			cpumask_var_t		affinity;

#endif

#ifdef CONFIG_INTR_REMAP

			struct irq_2_iommu      *irq_2_iommu;

#endif

		};

	};

#endif



	struct timer_rand_state *timer_rand_state;

	unsigned int            *kstat_irqs;

	irq_flow_handler_t	handle_irq;

	struct irqaction	*action;	/* IRQ action list */

	unsigned int		status;		/* IRQ status */



	unsigned int		depth;		/* nested irq disables */

	unsigned int		wake_depth;	/* nested wake enables */

	unsigned int		irq_count;	/* For detecting broken IRQs */

	unsigned long		last_unhandled;	/* Aging timer for unhandled count */

	unsigned int		irqs_unhandled;

	raw_spinlock_t		lock;

#ifdef CONFIG_SMP

	const struct cpumask	*affinity_hint;

#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_var_t		pending_mask;

#endif

#endif

	atomic_t		threads_active;

	wait_queue_head_t       wait_for_threads;

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry	*dir;

#endif

	const char		*name;

} ____cacheline_internodealigned_in_smp;



extern void arch_init_copy_chip_data(struct irq_desc *old_desc,

					struct irq_desc *desc, int node);

extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc);



#ifndef CONFIG_SPARSE_IRQ

extern struct irq_desc irq_desc[NR_IRQS];

#endif



#ifdef CONFIG_NUMA_IRQ_DESC

extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int node);

#else

static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)

{

	return desc;

}

#endif



extern struct irq_desc *irq_to_desc_alloc_node(unsigned int irq, int node);

/* This include will go away once we isolated irq_desc usage to core code */

#include <linux/irqdesc.h>



/*

 * Pick up the arch-dependent methods:

 */

#include <asm/hw_irq.h>



struct irqaction;

extern int setup_irq(unsigned int irq, struct irqaction *new);

extern void remove_irq(unsigned int irq, struct irqaction *act);



#ifdef CONFIG_GENERIC_HARDIRQS



#ifdef CONFIG_SMP



# ifdef CONFIG_GENERIC_PENDING_IRQ



void move_native_irq(int irq);

void move_masked_irq(int irq);



#else /* CONFIG_GENERIC_PENDING_IRQ */



static inline void move_irq(int irq)

{

}



static inline void move_native_irq(int irq)

{

}



static inline void move_masked_irq(int irq)

{

}



#endif /* CONFIG_GENERIC_PENDING_IRQ */



#else /* CONFIG_SMP */



#define move_native_irq(x)

#define move_masked_irq(x)



#endif /* CONFIG_SMP */

# else

static inline void move_irq(int irq) { }

static inline void move_native_irq(int irq) { }

static inline void move_masked_irq(int irq) { }

# endif

#else

static inline void move_native_irq(int irq) { }

static inline void move_masked_irq(int irq) { }

#endif



extern int no_irq_affinity;



static inline int irq_balancing_disabled(unsigned int irq)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);

	return desc->status & IRQ_NO_BALANCING_MASK;

}



/* Handle irq action chains: */

extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
@@ -363,42 +246,10 @@ extern void handle_percpu_irq(unsigned int irq, struct irq_desc *desc); 
extern void handle_bad_irq(unsigned int irq, struct irq_desc *desc);

extern void handle_nested_irq(unsigned int irq);



/*

 * Monolithic do_IRQ implementation.

 */

#ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ

extern unsigned int __do_IRQ(unsigned int irq);

#endif



/*

 * Architectures call this to let the generic IRQ layer

 * handle an interrupt. If the descriptor is attached to an

 * irqchip-style controller then we call the ->handle_irq() handler,

 * and it calls __do_IRQ() if it's attached to an irqtype-style controller.

 */

static inline void generic_handle_irq_desc(unsigned int irq, struct irq_desc *desc)

{

#ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ

	desc->handle_irq(irq, desc);

#else

	if (likely(desc->handle_irq))

		desc->handle_irq(irq, desc);

	else

		__do_IRQ(irq);

#endif

}



static inline void generic_handle_irq(unsigned int irq)

{

	generic_handle_irq_desc(irq, irq_to_desc(irq));

}



/* Handling of unhandled and spurious interrupts: */

extern void note_interrupt(unsigned int irq, struct irq_desc *desc,

			   irqreturn_t action_ret);



/* Resending of interrupts :*/

void check_irq_resend(struct irq_desc *desc, unsigned int irq);



/* Enable/disable irq debugging output: */

extern int noirqdebug_setup(char *str);
@@ -421,16 +272,6 @@ extern void 
__set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,

		  const char *name);



/* caller has locked the irq_desc and both params are valid */

static inline void __set_irq_handler_unlocked(int irq,

					      irq_flow_handler_t handler)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);

	desc->handle_irq = handler;

}



/*

 * Set a highlevel flow handler for a given IRQ:

 */
@@ -462,13 +303,6 @@ extern unsigned int create_irq_nr(unsigned int irq_want, int node); 
extern int create_irq(void);

extern void destroy_irq(unsigned int irq);



/* Test to see if a driver has successfully requested an irq */

static inline int irq_has_action(unsigned int irq)

{

	struct irq_desc *desc = irq_to_desc(irq);

	return desc->action != NULL;

}



/* Dynamic irq helper functions */

extern void dynamic_irq_init(unsigned int irq);

void dynamic_irq_init_keep_chip_data(unsigned int irq);
@@ -487,108 +321,8 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry); 
#define get_irq_data(irq)	(irq_to_desc(irq)->irq_data.handler_data)

#define get_irq_msi(irq)	(irq_to_desc(irq)->irq_data.msi_desc)



#define get_irq_desc_chip(desc)		((desc)->irq_data.chip)

#define get_irq_desc_chip_data(desc)	((desc)->irq_data.chip_data)

#define get_irq_desc_data(desc)		((desc)->irq_data.handler_data)

#define get_irq_desc_msi(desc)		((desc)->irq_data.msi_desc)



#endif /* CONFIG_GENERIC_HARDIRQS */



#endif /* !CONFIG_S390 */



#ifdef CONFIG_SMP

/**

 * alloc_desc_masks - allocate cpumasks for irq_desc

 * @desc:	pointer to irq_desc struct

 * @node:	node which will be handling the cpumasks

 * @boot:	true if need bootmem

 *

 * Allocates affinity and pending_mask cpumask if required.

 * Returns true if successful (or not required).

 */

static inline bool alloc_desc_masks(struct irq_desc *desc, int node,

							bool boot)

{

	gfp_t gfp = GFP_ATOMIC;



	if (boot)

		gfp = GFP_NOWAIT;



#ifdef CONFIG_CPUMASK_OFFSTACK

	if (!alloc_cpumask_var_node(&desc->irq_data.affinity, gfp, node))

		return false;



#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (!alloc_cpumask_var_node(&desc->pending_mask, gfp, node)) {

		free_cpumask_var(desc->irq_data.affinity);

		return false;

	}

#endif

#endif

	return true;

}



static inline void init_desc_masks(struct irq_desc *desc)

{

	cpumask_setall(desc->irq_data.affinity);

#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_clear(desc->pending_mask);

#endif

}



/**

 * init_copy_desc_masks - copy cpumasks for irq_desc

 * @old_desc:	pointer to old irq_desc struct

 * @new_desc:	pointer to new irq_desc struct

 *

 * Insures affinity and pending_masks are copied to new irq_desc.

 * If !CONFIG_CPUMASKS_OFFSTACK the cpumasks are embedded in the

 * irq_desc struct so the copy is redundant.

 */



static inline void init_copy_desc_masks(struct irq_desc *old_desc,

					struct irq_desc *new_desc)

{

#ifdef CONFIG_CPUMASK_OFFSTACK

	cpumask_copy(new_desc->irq_data.affinity, old_desc->irq_data.affinity);



#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_copy(new_desc->pending_mask, old_desc->pending_mask);

#endif

#endif

}



static inline void free_desc_masks(struct irq_desc *old_desc,

				   struct irq_desc *new_desc)

{

	free_cpumask_var(old_desc->irq_data.affinity);



#ifdef CONFIG_GENERIC_PENDING_IRQ

	free_cpumask_var(old_desc->pending_mask);

#endif

}



#else /* !CONFIG_SMP */



static inline bool alloc_desc_masks(struct irq_desc *desc, int node,

								bool boot)

{

	return true;

}



static inline void init_desc_masks(struct irq_desc *desc)

{

}



static inline void init_copy_desc_masks(struct irq_desc *old_desc,

					struct irq_desc *new_desc)

{

}



static inline void free_desc_masks(struct irq_desc *old_desc,

				   struct irq_desc *new_desc)

{

}

#endif	/* CONFIG_SMP */



#endif /* _LINUX_IRQ_H */

include/linux/irqdesc.h

0 → 100644
+171 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_IRQDESC_H

#define _LINUX_IRQDESC_H



/*

 * Core internal functions to deal with irq descriptors

 *

 * This include will move to kernel/irq once we cleaned up the tree.

 * For now it's included from <linux/irq.h>

 */



struct proc_dir_entry;

struct timer_rand_state;

struct irq_2_iommu;

/**

 * struct irq_desc - interrupt descriptor

 * @irq_data:		per irq and chip data passed down to chip functions

 * @timer_rand_state:	pointer to timer rand state struct

 * @kstat_irqs:		irq stats per cpu

 * @handle_irq:		highlevel irq-events handler [if NULL, __do_IRQ()]

 * @action:		the irq action chain

 * @status:		status information

 * @depth:		disable-depth, for nested irq_disable() calls

 * @wake_depth:		enable depth, for multiple set_irq_wake() callers

 * @irq_count:		stats field to detect stalled irqs

 * @last_unhandled:	aging timer for unhandled count

 * @irqs_unhandled:	stats field for spurious unhandled interrupts

 * @lock:		locking for SMP

 * @pending_mask:	pending rebalanced interrupts

 * @threads_active:	number of irqaction threads currently running

 * @wait_for_threads:	wait queue for sync_irq to wait for threaded handlers

 * @dir:		/proc/irq/ procfs entry

 * @name:		flow handler name for /proc/interrupts output

 */

struct irq_desc {



#ifdef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED

	struct irq_data		irq_data;

#else

	/*

	 * This union will go away, once we fixed the direct access to

	 * irq_desc all over the place. The direct fields are a 1:1

	 * overlay of irq_data.

	 */

	union {

		struct irq_data		irq_data;

		struct {

			unsigned int		irq;

			unsigned int		node;

			struct irq_chip		*chip;

			void			*handler_data;

			void			*chip_data;

			struct msi_desc		*msi_desc;

#ifdef CONFIG_SMP

			cpumask_var_t		affinity;

#endif

#ifdef CONFIG_INTR_REMAP

			struct irq_2_iommu      *irq_2_iommu;

#endif

		};

	};

#endif



	struct timer_rand_state *timer_rand_state;

	unsigned int		*kstat_irqs;

	irq_flow_handler_t	handle_irq;

	struct irqaction	*action;	/* IRQ action list */

	unsigned int		status;		/* IRQ status */



	unsigned int		depth;		/* nested irq disables */

	unsigned int		wake_depth;	/* nested wake enables */

	unsigned int		irq_count;	/* For detecting broken IRQs */

	unsigned long		last_unhandled;	/* Aging timer for unhandled count */

	unsigned int		irqs_unhandled;

	raw_spinlock_t		lock;

#ifdef CONFIG_SMP

	const struct cpumask	*affinity_hint;

#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_var_t		pending_mask;

#endif

#endif

	atomic_t		threads_active;

	wait_queue_head_t       wait_for_threads;

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry	*dir;

#endif

	const char		*name;

} ____cacheline_internodealigned_in_smp;



extern void arch_init_copy_chip_data(struct irq_desc *old_desc,

					struct irq_desc *desc, int node);

extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc);



#ifndef CONFIG_SPARSE_IRQ

extern struct irq_desc irq_desc[NR_IRQS];

#endif



#ifdef CONFIG_NUMA_IRQ_DESC

extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int node);

#else

static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)

{

	return desc;

}

#endif



extern struct irq_desc *irq_to_desc_alloc_node(unsigned int irq, int node);



#ifdef CONFIG_GENERIC_HARDIRQS



#define get_irq_desc_chip(desc)		((desc)->irq_data.chip)

#define get_irq_desc_chip_data(desc)	((desc)->irq_data.chip_data)

#define get_irq_desc_data(desc)		((desc)->irq_data.handler_data)

#define get_irq_desc_msi(desc)		((desc)->irq_data.msi_desc)



/*

 * Monolithic do_IRQ implementation.

 */

#ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ

extern unsigned int __do_IRQ(unsigned int irq);

#endif



/*

 * Architectures call this to let the generic IRQ layer

 * handle an interrupt. If the descriptor is attached to an

 * irqchip-style controller then we call the ->handle_irq() handler,

 * and it calls __do_IRQ() if it's attached to an irqtype-style controller.

 */

static inline void generic_handle_irq_desc(unsigned int irq, struct irq_desc *desc)

{

#ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ

	desc->handle_irq(irq, desc);

#else

	if (likely(desc->handle_irq))

		desc->handle_irq(irq, desc);

	else

		__do_IRQ(irq);

#endif

}



static inline void generic_handle_irq(unsigned int irq)

{

	generic_handle_irq_desc(irq, irq_to_desc(irq));

}



/* Test to see if a driver has successfully requested an irq */

static inline int irq_has_action(unsigned int irq)

{

	struct irq_desc *desc = irq_to_desc(irq);

	return desc->action != NULL;

}



static inline int irq_balancing_disabled(unsigned int irq)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);

	return desc->status & IRQ_NO_BALANCING_MASK;

}



/* caller has locked the irq_desc and both params are valid */

static inline void __set_irq_handler_unlocked(int irq,

					      irq_flow_handler_t handler)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);

	desc->handle_irq = handler;

}

#endif



#endif

kernel/irq/internals.h

+100 −0
Original line number Diff line number Diff line 
/*

 * IRQ subsystem internal functions and variables:

 */

#include <linux/irqdesc.h>



extern int noirqdebug;
@@ -22,6 +23,9 @@ extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr); 
extern void clear_kstat_irqs(struct irq_desc *desc);

extern raw_spinlock_t sparse_irq_lock;



/* Resending of interrupts :*/

void check_irq_resend(struct irq_desc *desc, unsigned int irq);



#ifdef CONFIG_SPARSE_IRQ

void replace_irq_desc(unsigned int irq, struct irq_desc *desc);

#endif
@@ -105,3 +109,99 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc) 


#undef P



/* Stuff below will be cleaned up after the sparse allocator is done */



#ifdef CONFIG_SMP

/**

 * alloc_desc_masks - allocate cpumasks for irq_desc

 * @desc:	pointer to irq_desc struct

 * @node:	node which will be handling the cpumasks

 * @boot:	true if need bootmem

 *

 * Allocates affinity and pending_mask cpumask if required.

 * Returns true if successful (or not required).

 */

static inline bool alloc_desc_masks(struct irq_desc *desc, int node,

							bool boot)

{

	gfp_t gfp = GFP_ATOMIC;



	if (boot)

		gfp = GFP_NOWAIT;



#ifdef CONFIG_CPUMASK_OFFSTACK

	if (!alloc_cpumask_var_node(&desc->irq_data.affinity, gfp, node))

		return false;



#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (!alloc_cpumask_var_node(&desc->pending_mask, gfp, node)) {

		free_cpumask_var(desc->irq_data.affinity);

		return false;

	}

#endif

#endif

	return true;

}



static inline void init_desc_masks(struct irq_desc *desc)

{

	cpumask_setall(desc->irq_data.affinity);

#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_clear(desc->pending_mask);

#endif

}



/**

 * init_copy_desc_masks - copy cpumasks for irq_desc

 * @old_desc:	pointer to old irq_desc struct

 * @new_desc:	pointer to new irq_desc struct

 *

 * Insures affinity and pending_masks are copied to new irq_desc.

 * If !CONFIG_CPUMASKS_OFFSTACK the cpumasks are embedded in the

 * irq_desc struct so the copy is redundant.

 */



static inline void init_copy_desc_masks(struct irq_desc *old_desc,

					struct irq_desc *new_desc)

{

#ifdef CONFIG_CPUMASK_OFFSTACK

	cpumask_copy(new_desc->irq_data.affinity, old_desc->irq_data.affinity);



#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_copy(new_desc->pending_mask, old_desc->pending_mask);

#endif

#endif

}



static inline void free_desc_masks(struct irq_desc *old_desc,

				   struct irq_desc *new_desc)

{

	free_cpumask_var(old_desc->irq_data.affinity);



#ifdef CONFIG_GENERIC_PENDING_IRQ

	free_cpumask_var(old_desc->pending_mask);

#endif

}



#else /* !CONFIG_SMP */



static inline bool alloc_desc_masks(struct irq_desc *desc, int node,

								bool boot)

{

	return true;

}



static inline void init_desc_masks(struct irq_desc *desc)

{

}



static inline void init_copy_desc_masks(struct irq_desc *old_desc,

					struct irq_desc *new_desc)

{

}



static inline void free_desc_masks(struct irq_desc *old_desc,

				   struct irq_desc *new_desc)

{

}

#endif	/* CONFIG_SMP */