x86/irq: handle chained interrupts during IRQ migration
Chained interrupt handlers dont have an irqaction and hence are not handled during migrating interrupts when some cores go offline.
Handle this by introducing a irq_is_chained() check which is based on the the CHAINED flag being set for such interrupts. fixup_irq() can then handle such interrupts and not skip them over.
Signed-off-by Sundar Iyer <[email protected]>
Signed-off-by Fei Yang <[email protected]>
Cc Fei Yang <[email protected]>
---
Issue was found with GPIO interrupts whose handlers are registered as chained handler, see drivers/gpio/gpio-langwell.c for details. These interrupts stop coming after offlining a few cpus, and never come back even after put the cpus back online. This patch had been integrated in the kernel for Intel's Android software platform, and proved to solve the issue.
arch/x86/kernel/irq.c | 4 +++- include/linux/irq.h | 1 + include/linux/irqdesc.h | 7 +++++++ kernel/irq/chip.c | 1 + kernel/irq/settings.h | 7 +++++++ 5 files changed, 19 insertions(+), 1 deletion(-)
arch/x86/kernel/irq.c +3 -1
@@ -286,7 +286,9 @@ void fixup_irqs(void) data =irq_desc_get_irq_data (desc); affinity = data->affinity; -if (!irq_has_action (irq) ||irqd_is_per_cpu (data) || +/* include IRQs who have no action, but are chained */ +if ((!irq_has_action (irq) && !irq_is_chained (irq)) || +irqd_is_per_cpu (data) ||cpumask_subset (affinity, cpu_online_mask)) {raw_spin_unlock (&desc->lock);continue ;
include/linux/irq.h +1 -0
@@ -94,6 +94,7 @@ enum {IRQ_NESTED_THREAD = (1 <<15 ),IRQ_NOTHREAD = (1 <<16 ),IRQ_PER_CPU_DEVID = (1 <<17 ), + IRQ_CHAINED = (1 << 18), };#define IRQF_MODIFY_MASK \
include/linux/irqdesc.h +7 -0
@@ -121,6 +121,13 @@ static inline int irq_has_action(unsigned int irq)return desc->action !=NULL ; } +/* Test to see if the IRQ is chained */ +static inline int irq_is_chained (unsigned int irq) +{ +struct irq_desc *desc =irq_to_desc (irq); +return desc->status_use_accessors &IRQ_CHAINED ; +} +/* caller has locked the irq_desc and both params are valid */ static inline void __irq_set_handler_locked (unsigned int irq,irq_flow_handler_t handler)
kernel/irq/chip.c +1 -0
@@ -685,6 +685,7 @@ __irq_set_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,irq_settings_set_noprobe (desc);irq_settings_set_norequest (desc);irq_settings_set_nothread (desc); +irq_settings_set_chained (desc);irq_startup (desc, true); } out:
kernel/irq/settings.h +7 -0
@@ -15,6 +15,7 @@ enum { _IRQ_NESTED_THREAD =IRQ_NESTED_THREAD , _IRQ_PER_CPU_DEVID =IRQ_PER_CPU_DEVID , _IRQF_MODIFY_MASK =IRQF_MODIFY_MASK , + _IRQ_CHAINED = IRQ_CHAINED, };#define IRQ_PER_CPU GOT_YOU_MORON
@@ -28,6 +29,7 @@ enum {#define IRQ_PER_CPU_DEVID GOT_YOU_MORON#undef IRQF_MODIFY_MASK#define IRQF_MODIFY_MASK GOT_YOU_MORON +#define IRQ_CHAINED GOT_YOU_MORONstatic inline void irq_settings_clr_and_set (struct irq_desc *desc,u32 clr,u32 set)
@@ -147,3 +149,8 @@ static inline bool irq_settings_is_nested_thread(struct irq_desc *desc) {return desc->status_use_accessors & _IRQ_NESTED_THREAD; } + +static inline bool irq_settings_set_chained (struct irq_desc *desc) +{ +return desc->status_use_accessors |= _IRQ_CHAINED; +}
Signature · 1 line
1.7.9.5