Commit 50f2b98d authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Thomas Bogendoerfer
Browse files

MIPS: cevt-r4k: Don't call get_c0_compare_int if timer irq is installed 



This avoids warning:

[    0.118053] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:283

Caused by get_c0_compare_int on secondary CPU.

We also skipped saving IRQ number to struct clock_event_device *cd as
it's never used by clockevent core, as per comments it's only meant
for "non CPU local devices".

Reported-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Closes: https://lore.kernel.org/linux-mips/6szkkqxpsw26zajwysdrwplpjvhl5abpnmxgu2xuj3dkzjnvsf@4daqrz4mf44k/


Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Tested-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 1cb6ab44

arch/mips/kernel/cevt-r4k.c

+7 −8
Original line number Diff line number Diff line
@@ -303,13 +303,6 @@ int r4k_clockevent_init(void) 
	if (!c0_compare_int_usable())

		return -ENXIO;



	/*

	 * With vectored interrupts things are getting platform specific.

	 * get_c0_compare_int is a hook to allow a platform to return the

	 * interrupt number of its liking.

	 */

	irq = get_c0_compare_int();



	cd = &per_cpu(mips_clockevent_device, cpu);



	cd->name		= "MIPS";
@@ -320,7 +313,6 @@ int r4k_clockevent_init(void) 
	min_delta		= calculate_min_delta();



	cd->rating		= 300;

	cd->irq			= irq;

	cd->cpumask		= cpumask_of(cpu);

	cd->set_next_event	= mips_next_event;

	cd->event_handler	= mips_event_handler;
@@ -332,6 +324,13 @@ int r4k_clockevent_init(void) 


	cp0_timer_irq_installed = 1;



	/*

	 * With vectored interrupts things are getting platform specific.

	 * get_c0_compare_int is a hook to allow a platform to return the

	 * interrupt number of its liking.

	 */

	irq = get_c0_compare_int();



	if (request_irq(irq, c0_compare_interrupt, flags, "timer",

			c0_compare_interrupt))

		pr_err("Failed to request irq %d (timer)\n", irq);