Skip to content

Commit eb0a8e5

Browse files
lvjianmin-loongsonyetist
authored andcommitted
irqchip/loongson-eiointc: Fix registration of syscore_ops
When support suspend/resume for loongson-eiointc, the syscore_ops is registered twice in dual-bridges machines where there are two eiointc IRQ domains. Repeated registration of an same syscore_ops broke syscore_ops_list. Also, cpuhp_setup_state_nocalls is only needed to call for once. So the patch will corret them. Fixes: a90335c ("irqchip/loongson-eiointc: Add suspend/resume support") Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
1 parent e1d6ab4 commit eb0a8e5

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/irqchip/irq-loongson-eiointc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,12 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
445445
parent_irq = irq_create_mapping(parent, acpi_eiointc->cascade);
446446
irq_set_chained_handler_and_data(parent_irq, eiointc_irq_dispatch, priv);
447447

448-
register_syscore_ops(&eiointc_syscore_ops);
449-
cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_LOONGARCH_STARTING,
448+
if (nr_pics == 1) {
449+
register_syscore_ops(&eiointc_syscore_ops);
450+
cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_LOONGARCH_STARTING,
450451
"irqchip/loongarch/intc:starting",
451452
eiointc_router_init, NULL);
453+
}
452454

453455
if (cpu_has_flatmode)
454456
node = cpu_to_node(acpi_eiointc->node * CORES_PER_EIO_NODE);

0 commit comments

Comments
 (0)