Commit 7cb328c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:

 - A few fixes mopping up the fallout of the big irq overhaul

 - Move the interrupt resource management logic out of the spin locked,
   irq disabled region to avoid unnecessary restrictions of the resource
   callbacks

 - Preparation for reworking the per cpu irq request function.

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers
  genirq/debugfs: Remove redundant NULL pointer check
  genirq: Allow to pass the IRQF_TIMER flag with percpu irq request
  genirq/timings: Move free timings out of spinlocked region
  genirq: Move irq resource handling out of spinlocked region
  genirq: Add mutex to irq desc to serialize request/free_irq()
  genirq: Move bus locking into __setup_irq()
  genirq: Force inlining of __irq_startup_managed to prevent build failure
  genirq/debugfs: Fix build for !CONFIG_IRQ_DOMAIN
parents 19bf2e0e c5c601c4

include/linux/interrupt.h

+10 −1
Original line number Diff line number Diff line
@@ -152,8 +152,17 @@ request_any_context_irq(unsigned int irq, irq_handler_t handler, 
			unsigned long flags, const char *name, void *dev_id);



extern int __must_check

__request_percpu_irq(unsigned int irq, irq_handler_t handler,

		     unsigned long flags, const char *devname,

		     void __percpu *percpu_dev_id);



static inline int __must_check

request_percpu_irq(unsigned int irq, irq_handler_t handler,

		   const char *devname, void __percpu *percpu_dev_id);

		   const char *devname, void __percpu *percpu_dev_id)

{

	return __request_percpu_irq(irq, handler, 0,

				    devname, percpu_dev_id);

}



extern const void *free_irq(unsigned int, void *);

extern void free_percpu_irq(unsigned int, void __percpu *);

include/linux/irqdesc.h

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/rcupdate.h>

#include <linux/kobject.h>

#include <linux/mutex.h>



/*

 * Core internal functions to deal with irq descriptors
@@ -45,6 +46,7 @@ struct pt_regs; 
 *			IRQF_FORCE_RESUME set

 * @rcu:		rcu head for delayed free

 * @kobj:		kobject used to represent this struct in sysfs

 * @request_mutex:	mutex to protect request/free before locking desc->lock

 * @dir:		/proc/irq/ procfs entry

 * @debugfs_file:	dentry for the debugfs file

 * @name:		flow handler name for /proc/interrupts output
@@ -96,6 +98,7 @@ struct irq_desc { 
	struct rcu_head		rcu;

	struct kobject		kobj;

#endif

	struct mutex		request_mutex;

	int			parent_irq;

	struct module		*owner;

	const char		*name;

kernel/irq/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ __irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force) 
	return IRQ_STARTUP_MANAGED;

}

#else

static int

static __always_inline int

__irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force)

{

	return IRQ_STARTUP_NORMAL;

kernel/irq/internals.h

+3 −1
Original line number Diff line number Diff line
@@ -437,7 +437,9 @@ static inline void irq_remove_debugfs_entry(struct irq_desc *desc) 
# ifdef CONFIG_IRQ_DOMAIN

void irq_domain_debugfs_init(struct dentry *root);

# else

static inline void irq_domain_debugfs_init(struct dentry *root);

static inline void irq_domain_debugfs_init(struct dentry *root)

{

}

# endif

#else /* CONFIG_GENERIC_IRQ_DEBUGFS */

static inline void irq_add_debugfs_entry(unsigned int irq, struct irq_desc *d)

kernel/irq/irqdesc.c

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ static struct irq_desc *alloc_desc(int irq, int node, unsigned int flags, 


	raw_spin_lock_init(&desc->lock);

	lockdep_set_class(&desc->lock, &irq_desc_lock_class);

	mutex_init(&desc->request_mutex);

	init_rcu_head(&desc->rcu);



	desc_set_defaults(irq, desc, node, affinity, owner);

CRA Git | Maintained and supported by SUSTech CRA and CCSE