From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel.lezcano@linaro.org (Daniel Lezcano) Date: Thu, 26 Sep 2013 02:39:25 +0200 Subject: [PATCH] clockevent: exynos_mct: fix lockdep warning In-Reply-To: <1380120578-17458-1-git-send-email-tom.leiming@gmail.com> References: <1380120578-17458-1-git-send-email-tom.leiming@gmail.com> Message-ID: <5243823D.4040208@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 09/25/2013 04:49 PM, Ming Lei wrote: > This patch moves request_irq() out of cpu notifier callback > to fix below lockdep warning: > > [ 0.249513] ------------[ cut here ]------------ > [ 0.249525] WARNING: CPU: 1 PID: 0 at kernel/lockdep.c:2740 lockdep_trace_alloc+0xc8/0x10c() > [ 0.249534] DEBUG_LOCKS_WARN_ON(irqs_disabled_flags(flags)) > [ 0.249538] Modules linked in: > [ 0.249548] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 3.12.0-rc1-next-20130923+ #338 > [ 0.249564] [] (unwind_backtrace+0x0/0xec) from [] (show_stack+0x20/0x24) > [ 0.249577] [] (show_stack+0x20/0x24) from [] (dump_stack+0x74/0xb4) > [ 0.249591] [] (dump_stack+0x74/0xb4) from [] (warn_slowpath_common+0x78/0x9c) > [ 0.249604] [] (warn_slowpath_common+0x78/0x9c) from [] (warn_slowpath_fmt+0x40/0x48) > [ 0.249615] [] (warn_slowpath_fmt+0x40/0x48) from [] (lockdep_trace_alloc+0xc8/0x10c) > [ 0.249626] [] (lockdep_trace_alloc+0xc8/0x10c) from [] (kmem_cache_alloc_trace+0x38/0x2 > 24) > [ 0.249638] [] (kmem_cache_alloc_trace+0x38/0x224) from [] (request_threaded_irq+0x90/0x130) > [ 0.249651] [] (request_threaded_irq+0x90/0x130) from [] (exynos4_local_timer_setup+0xdc/0x140) > [ 0.249663] [] (exynos4_local_timer_setup+0xdc/0x140) from [] (exynos4_mct_cpu_notify+0x40/0xb0) > [ 0.249675] [] (exynos4_mct_cpu_notify+0x40/0xb0) from [] (notifier_call_chain+0x48/0x78) > [ 0.249688] [] (notifier_call_chain+0x48/0x78) from [] (__raw_notifier_call_chain+0x24/0x2c) > [ 0.249700] [] (__raw_notifier_call_chain+0x24/0x2c) from [] (__cpu_notify+0x3c/0x58) > [ 0.249713] [] (__cpu_notify+0x3c/0x58) from [] (cpu_notify+0x20/0x24) > [ 0.249725] [] (cpu_notify+0x20/0x24) from [] (notify_cpu_starting+0x58/0x60) > [ 0.249737] [] (notify_cpu_starting+0x58/0x60) from [] (secondary_start_kernel+0xec/0x13 > 8) > [ 0.249748] [] (secondary_start_kernel+0xec/0x138) from [<40008664>] (0x40008664) > [ 0.249767] ---[ end trace 3406ff24bd97382e ]--- > > Cc: Daniel Lezcano > Cc: Thomas Gleixner > Cc: Kukjin Kim > Cc: linux-arm-kernel at lists.infradead.org > Cc: linux-samsung-soc at vger.kernel.org > Signed-off-by: Ming Lei > --- Tomasz, what do you think ? > drivers/clocksource/exynos_mct.c | 34 +++++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c > index 5b34768..94b35aa 100644 > --- a/drivers/clocksource/exynos_mct.c > +++ b/drivers/clocksource/exynos_mct.c > @@ -419,19 +419,10 @@ static int exynos4_local_timer_setup(struct clock_event_device *evt) > > exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET); > > - if (mct_int_type == MCT_INT_SPI) { > - evt->irq = mct_irqs[MCT_L0_IRQ + cpu]; > - if (request_irq(evt->irq, exynos4_mct_tick_isr, > - IRQF_TIMER | IRQF_NOBALANCING, > - evt->name, mevt)) { > - pr_err("exynos-mct: cannot register IRQ %d\n", > - evt->irq); > - return -EIO; > - } > - irq_set_affinity(evt->irq, cpumask_of(cpu)); > - } else { > + if (mct_int_type == MCT_INT_PPI) > enable_percpu_irq(mct_irqs[MCT_L0_IRQ], 0); > - } > + else > + enable_irq(evt->irq); > > return 0; > } > @@ -440,7 +431,7 @@ static void exynos4_local_timer_stop(struct clock_event_device *evt) > { > evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); > if (mct_int_type == MCT_INT_SPI) > - free_irq(evt->irq, this_cpu_ptr(&percpu_mct_tick)); > + disable_irq(evt->irq); > else > disable_percpu_irq(mct_irqs[MCT_L0_IRQ]); > } > @@ -500,6 +491,23 @@ static void __init exynos4_timer_resources(struct device_node *np, void __iomem > &percpu_mct_tick); > WARN(err, "MCT: can't request IRQ %d (%d)\n", > mct_irqs[MCT_L0_IRQ], err); > + } else { > + int cpu; > + > + for_each_possible_cpu(cpu) { > + struct mct_clock_event_device *mevt = > + &per_cpu(percpu_mct_tick, cpu); > + > + mevt->evt.irq = mct_irqs[MCT_L0_IRQ + cpu]; > + if (request_irq(mevt->evt.irq, exynos4_mct_tick_isr, > + IRQF_TIMER | IRQF_NOBALANCING, > + mevt->evt.name, mevt)) { > + WARN(1, "exynos-mct: cannot register IRQ %d\n", > + mevt->evt.irq); > + } > + irq_set_affinity(mevt->evt.irq, cpumask_of(cpu)); > + disable_irq(mevt->evt.irq); > + } > } > > err = register_cpu_notifier(&exynos4_mct_cpu_nb); > -- Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog