Commit f99b926f authored by Anup Patel's avatar Anup Patel Committed by Thomas Gleixner
Browse files

irqchip/sifive-plic: Fix syscore registration for multi-socket systems 



Multi-socket systems have a separate PLIC in each socket, so __plic_init()
is invoked for each PLIC. __plic_init() registers syscore operations, which
obviously fails on the second invocation.

Move it into the already existing condition for installing the CPU hotplug
state so it is only invoked once when the first PLIC is initialized.

[ tglx: Massaged changelog ]

Fixes: e80f0b6a ("irqchip/irq-sifive-plic: Add syscore callbacks for hibernation")
Signed-off-by: default avatarAnup Patel <apatel@ventanamicro.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20231025142820.390238-4-apatel@ventanamicro.com
parent 08d4c174

drivers/irqchip/irq-sifive-plic.c

+4 −3
Original line number Diff line number Diff line
@@ -532,17 +532,18 @@ static int __init __plic_init(struct device_node *node, 
	}



	/*

	 * We can have multiple PLIC instances so setup cpuhp state only

	 * when context handler for current/boot CPU is present.

	 * We can have multiple PLIC instances so setup cpuhp state

	 * and register syscore operations only when context handler

	 * for current/boot CPU is present.

	 */

	handler = this_cpu_ptr(&plic_handlers);

	if (handler->present && !plic_cpuhp_setup_done) {

		cpuhp_setup_state(CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,

				  "irqchip/sifive/plic:starting",

				  plic_starting_cpu, plic_dying_cpu);

		register_syscore_ops(&plic_irq_syscore_ops);

		plic_cpuhp_setup_done = true;

	}

	register_syscore_ops(&plic_irq_syscore_ops);



	pr_info("%pOFP: mapped %d interrupts with %d handlers for"

		" %d contexts.\n", node, nr_irqs, nr_handlers, nr_contexts);