iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genirq; Fix cleanup fallout

Browse Source 
I missed the CONFIG_GENERIC_PENDING_IRQ dependency in the affinity
related functions and the IRQ_LEVEL propagation into irq_data
state. Did not pop up on my main test platforms. :(

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: David Daney <ddaney@caviumnetworks.com>
This commit is contained in:
Thomas Gleixner 2011-03-28 21:59:37 +02:00
parent a6aeddd1c4
commit 0ef5ca1e1f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/irq/chip.c
View File

@ -734,6 +734,8 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
irqd_set(&desc->irq_data, IRQD_PER_CPU); irqd_set(&desc->irq_data, IRQD_PER_CPU);
if (irq_settings_can_move_pcntxt(desc)) if (irq_settings_can_move_pcntxt(desc))
irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT); irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT);
if (irq_settings_is_level(desc))
irqd_set(&desc->irq_data, IRQD_LEVEL);
irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc)); irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));

16
kernel/irq/manage.c
View File

@ -112,13 +112,13 @@ void irq_set_thread_affinity(struct irq_desc *desc)
} }
#ifdef CONFIG_GENERIC_PENDING_IRQ #ifdef CONFIG_GENERIC_PENDING_IRQ
static inline bool irq_can_move_pcntxt(struct irq_desc *desc) static inline bool irq_can_move_pcntxt(struct irq_data *data)
{ {
return irq_settings_can_move_pcntxt(desc); return irqd_can_move_in_process_context(data);
} }
static inline bool irq_move_pending(struct irq_desc *desc) static inline bool irq_move_pending(struct irq_data *data)
{ {
return irqd_is_setaffinity_pending(&desc->irq_data); return irqd_is_setaffinity_pending(data);
} }
static inline void static inline void
irq_copy_pending(struct irq_desc *desc, const struct cpumask *mask) irq_copy_pending(struct irq_desc *desc, const struct cpumask *mask)
@ -131,8 +131,8 @@ irq_get_pending(struct cpumask *mask, struct irq_desc *desc)
cpumask_copy(mask, desc->pending_mask); cpumask_copy(mask, desc->pending_mask);
} }
#else #else
static inline bool irq_can_move_pcntxt(struct irq_desc *desc) { return true; } static inline bool irq_can_move_pcntxt(struct irq_data *data) { return true; }
static inline bool irq_move_pending(struct irq_desc *desc) { return false; } static inline bool irq_move_pending(struct irq_desc *data) { return false; }
static inline void static inline void
irq_copy_pending(struct irq_desc *desc, const struct cpumask *mask) { } irq_copy_pending(struct irq_desc *desc, const struct cpumask *mask) { }
static inline void static inline void
@ -148,7 +148,7 @@ int __irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask)
if (!chip || !chip->irq_set_affinity) if (!chip || !chip->irq_set_affinity)
return -EINVAL; return -EINVAL;
if (irqd_can_move_in_process_context(data)) { if (irq_can_move_pcntxt(data)) {
ret = chip->irq_set_affinity(data, mask, false); ret = chip->irq_set_affinity(data, mask, false);
switch (ret) { switch (ret) {
case IRQ_SET_MASK_OK: case IRQ_SET_MASK_OK:
@ -218,7 +218,7 @@ static void irq_affinity_notify(struct work_struct *work)
goto out; goto out;
raw_spin_lock_irqsave(&desc->lock, flags); raw_spin_lock_irqsave(&desc->lock, flags);
if (irq_move_pending(desc)) if (irq_move_pending(&desc->irq_data))
irq_get_pending(cpumask, desc); irq_get_pending(cpumask, desc);
else else
cpumask_copy(cpumask, desc->irq_data.affinity); cpumask_copy(cpumask, desc->irq_data.affinity);