diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2019-02-06 23:26:08 +0200 |
|---|---|---|
| committer |   Marc Zyngier <marc.zyngier@arm.com> | 2019-02-14 10:42:11 +0000 |
| commit | 518bfe84ec417318b2470652cdb27978ddfeaa59 (patch) | |
| tree | effefba61d0988980c5cb64f99ce5ed853d9f34d /drivers/irqchip | |
| parent | dt-bindings: interrupt-controller: loongson ls1x intc (diff) | |
| download | linux-dev-518bfe84ec417318b2470652cdb27978ddfeaa59.tar.xz linux-dev-518bfe84ec417318b2470652cdb27978ddfeaa59.zip | |
irqchip/i8259: Fix shutdown order by moving syscore_ops registration
When using cpufreq on Loongson 2F MIPS platform, "poweroff"
command gets frequently stuck in syscore_shutdown(). The reason is
that i8259A_shutdown() gets called before cpufreq_suspend(), and if we
have pending work then irq_work_sync() in cpufreq_dbs_governor_stop()
gets stuck forever as we have all interrupts masked already.
irq-i8259 is registering syscore_ops using device_initcall(),
while cpufreq uses core_initcall(). Fix the shutdown order simply
by registering the irq syscore_ops during the early IRQ init instead
of using a separate initcall at later stage.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-i8259.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c index b0d4aab1a58c..d000870d9b6b 100644 --- a/drivers/irqchip/irq-i8259.c +++ b/drivers/irqchip/irq-i8259.c @@ -225,14 +225,6 @@ static struct syscore_ops i8259_syscore_ops = { .shutdown = i8259A_shutdown, }; -static int __init i8259A_init_sysfs(void) -{ - register_syscore_ops(&i8259_syscore_ops); - return 0; -} - -device_initcall(i8259A_init_sysfs); - static void init_8259A(int auto_eoi) { unsigned long flags; @@ -332,6 +324,7 @@ struct irq_domain * __init __init_i8259_irqs(struct device_node *node) panic("Failed to add i8259 IRQ domain"); setup_irq(I8259A_IRQ_BASE + PIC_CASCADE_IR, &irq2); + register_syscore_ops(&i8259_syscore_ops); return domain; } |