Commit 4717f133 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Thomas Gleixner

genirq/PM: Restore system wake up from chained interrupts

Commit e509bd7d ("genirq: Allow migration of chained interrupts
by installing default action") breaks PCS wake up IRQ behaviour on
TI OMAP based platforms (dra7-evm).

TI OMAP IRQ wake up configuration:
  |- omap_prcm_register_chain_handler
     |- PRCM-irqchip -> PRCM_IO_IRQ
        |- pcs_irq_chain_handler
           |- pinctrl-irqchip -> PCS_uart1_wakeup_irq

This happens because IRQ PM code (irq/pm.c) is expected to ignore
chained interrupts by default:
  static bool suspend_device_irq(struct irq_desc *desc)
	if (!desc->action || desc->no_suspend_depth)
		return false;
 - it's expected !desc->action = true for chained interrupts;

but, after above change, all chained interrupt descriptors will
have default action handler installed - chained_action.
As result, chained interrupts will be silently disabled during system

Hence, fix it by introducing helper function irq_desc_is_chained() and
use it in suspend_device_irq() for chained interrupts identification
and skip them, once detected.

Fixes: e509bd7d ("genirq: Allow migration of chained interrupts..")
Signed-off-by: default avatarGrygorii Strashko <>
Reviewed-by: default avatarMika Westerberg <>
Cc: Tony Lindgren <>
Cc: <>
Cc: <>
Cc: Tony Lindgren <>
Link: default avatarThomas Gleixner <>
parent 66ef3493
......@@ -199,6 +199,11 @@ static inline int irq_desc_get_node(struct irq_desc *desc)
return irq_common_data_get_node(&desc->irq_common_data);
static inline int irq_desc_is_chained(struct irq_desc *desc)
return (desc->action && desc->action == &chained_action);
bool irq_pm_check_wakeup(struct irq_desc *desc);
void irq_pm_install_action(struct irq_desc *desc, struct irqaction *action);
......@@ -70,7 +70,8 @@ void irq_pm_remove_action(struct irq_desc *desc, struct irqaction *action)
static bool suspend_device_irq(struct irq_desc *desc)
if (!desc->action || desc->no_suspend_depth)
if (!desc->action || irq_desc_is_chained(desc) ||
return false;
if (irqd_is_wakeup_set(&desc->irq_data)) {
......@@ -475,7 +475,7 @@ int show_interrupts(struct seq_file *p, void *v)
any_count |= kstat_irqs_cpu(i, j);
action = desc->action;
if ((!action || action == &chained_action) && !any_count)
if ((!action || irq_desc_is_chained(desc)) && !any_count)
goto out;
seq_printf(p, "%*d: ", prec, i);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment