From patchwork Fri Mar 29 09:24:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ning.n.jiang@gmail.com X-Patchwork-Id: 2364771 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id F1642DFB79 for ; Fri, 29 Mar 2013 09:18:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754379Ab3C2JSZ (ORCPT ); Fri, 29 Mar 2013 05:18:25 -0400 Received: from na3sys009aog128.obsmtp.com ([74.125.149.141]:50445 "EHLO na3sys009aog128.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753320Ab3C2JSY (ORCPT ); Fri, 29 Mar 2013 05:18:24 -0400 Received: from SC-OWA.marvell.com ([199.233.58.135]) (using TLSv1) by na3sys009aob128.postini.com ([74.125.148.12]) with SMTP ID DSNKUVVcOLiYp2GOycbE3liLWEQomdKg+id1@postini.com; Fri, 29 Mar 2013 02:18:24 PDT Received: from maili.marvell.com (10.93.76.43) by SC-OWA.marvell.com (10.93.76.28) with Microsoft SMTP Server id 8.3.213.0; Fri, 29 Mar 2013 02:17:29 -0700 Received: from localhost (unknown [10.38.36.149]) by maili.marvell.com (Postfix) with ESMTP id 046464E510; Fri, 29 Mar 2013 02:17:15 -0700 (PDT) From: To: , , , , , , , , , , CC: , , , , Ning Jiang Subject: [PATCH] ARM: timer: Shutdown clock event device when stopping local timer Date: Fri, 29 Mar 2013 17:24:09 +0800 Message-ID: <1364549049-29278-1-git-send-email-ning.n.jiang@gmail.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: Ning Jiang Currently there are two problems when we try to stop local timer. First, it calls set_mode function directly so mode state is not updated for the clock event device. Second, it makes the device unused instead of shutdown. A subtle error will happen because of it. When a cpu is plugged out it will stop the local timer. It will call tick_nohz_idle_enter() in idle thread afterwards. It will cancel the sched timer and try to reprogram the next event. This is wrong since the local timer is supposed to be stopped. The right way to stop the local timer is to shutdown it by calling clockevents_set_mode(). Thus when we try to reprogram the clock event device, it will return directly without doing anything since the clock mode is CLOCK_EVT_MODE_SHUTDOWN. Signed-off-by: Ning Jiang --- arch/arm/kernel/smp_twd.c | 2 +- arch/arm/mach-exynos/mct.c | 2 +- arch/arm/mach-msm/timer.c | 2 +- drivers/clocksource/arm_arch_timer.c | 2 +- drivers/clocksource/time-armada-370-xp.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 3f25650..c1d4ab4 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -92,7 +92,7 @@ static int twd_timer_ack(void) static void twd_timer_stop(struct clock_event_device *clk) { - twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk); + clockevents_set_mode(clk, CLOCK_EVT_MODE_SHUTDOWN); disable_percpu_irq(clk->irq); } diff --git a/arch/arm/mach-exynos/mct.c b/arch/arm/mach-exynos/mct.c index c9d6650..b2d0d46 100644 --- a/arch/arm/mach-exynos/mct.c +++ b/arch/arm/mach-exynos/mct.c @@ -429,7 +429,7 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt) static void exynos4_local_timer_stop(struct clock_event_device *evt) { unsigned int cpu = smp_processor_id(); - evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); + clockevents_set_mode(evt, CLOCK_EVT_MODE_SHUTDOWN); if (mct_int_type == MCT_INT_SPI) if (cpu == 0) remove_irq(evt->irq, &mct_tick0_event_irq); diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 2969027..9b0cc66 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -152,7 +152,7 @@ static int __cpuinit msm_local_timer_setup(struct clock_event_device *evt) static void msm_local_timer_stop(struct clock_event_device *evt) { - evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); + clockevents_set_mode(evt, CLOCK_EVT_MODE_SHUTDOWN); disable_percpu_irq(evt->irq); } diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index d7ad425..beecb26 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -242,7 +242,7 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk) disable_percpu_irq(arch_timer_ppi[PHYS_NONSECURE_PPI]); } - clk->set_mode(CLOCK_EVT_MODE_UNUSED, clk); + clockevents_set_mode(clk, CLOCK_EVT_MODE_SHUTDOWN); } static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self, diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index 47a6730..bfb2971 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -201,7 +201,7 @@ static int __cpuinit armada_370_xp_timer_setup(struct clock_event_device *evt) static void armada_370_xp_timer_stop(struct clock_event_device *evt) { - evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); + clockevents_set_mode(evt, CLOCK_EVT_MODE_SHUTDOWN); disable_percpu_irq(evt->irq); }