From patchwork Fri May 23 10:43:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 30744 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D71CA2066E for ; Fri, 23 May 2014 10:43:35 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kq14sf17230875pab.10 for ; Fri, 23 May 2014 03:43:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ZR2EZv1ZsJsnXMmBPAAP9gth8bdDQN0bylNNTFxuZBE=; b=mHJ9nTKkyGPOTr6OdRDxfRIl5fbA9zHbGZRilorAcoCHJcg1dEsjEyPCFJbqJ8IyQ/ DsygaYdS9SMIbWYqJo0ECFFDFSYu3TiVVp+UuEbwwQlSVZyxaJy1EqgJSPfnDDgDPqvN ze98pYmUHbrSOoxYbKEY4H1p9xJ7mUtkP1VsUNtEYjo1L5IjeERVP1RjH3+eDuh06Yi9 xIhVeROFOsVRozR9c5hmNNWHvNC1N8J70wBtSvdmuDb91P2C/jhQV3537PVkUVqOfmHO unKxIWduZFm5siGFilWWcnDTbzeU0b+itbA+dOyHtZHvRJOnaObVXiw4dJNAeUP3DItG IUNQ== X-Gm-Message-State: ALoCoQlAVZ5tcUKbUlkyX2WTAvno2fGm+APZCZ9/wDi0JrzKrnx8ZM/6hiAFRNjs2nfwKeEaYXvD X-Received: by 10.66.222.129 with SMTP id qm1mr1804107pac.6.1400841815129; Fri, 23 May 2014 03:43:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.84 with SMTP id h78ls1708700qge.54.gmail; Fri, 23 May 2014 03:43:35 -0700 (PDT) X-Received: by 10.220.82.133 with SMTP id b5mr3411184vcl.13.1400841815011; Fri, 23 May 2014 03:43:35 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id ir9si1385470vdb.61.2014.05.23.03.43.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:43:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hq11so209332vcb.22 for ; Fri, 23 May 2014 03:43:34 -0700 (PDT) X-Received: by 10.221.58.144 with SMTP id wk16mr3401373vcb.23.1400841814945; Fri, 23 May 2014 03:43:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp20470vcb; Fri, 23 May 2014 03:43:34 -0700 (PDT) X-Received: by 10.68.237.228 with SMTP id vf4mr4644311pbc.131.1400841814017; Fri, 23 May 2014 03:43:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xg6si3394799pab.9.2014.05.23.03.43.33 for ; Fri, 23 May 2014 03:43:33 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562AbaEWKmv (ORCPT + 27 others); Fri, 23 May 2014 06:42:51 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:52355 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752468AbaEWKmt (ORCPT ); Fri, 23 May 2014 06:42:49 -0400 Received: by mail-wg0-f49.google.com with SMTP id m15so4562722wgh.8 for ; Fri, 23 May 2014 03:42:48 -0700 (PDT) X-Received: by 10.180.185.244 with SMTP id ff20mr2504323wic.42.1400841768284; Fri, 23 May 2014 03:42:48 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-404-187.w82-125.abo.wanadoo.fr. [82.125.3.187]) by mx.google.com with ESMTPSA id dk10sm3882063wib.1.2014.05.23.03.42.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:42:47 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] clocksource: tcb_clksrc: Make tc_mode interrupt safe Date: Fri, 23 May 2014 12:43:00 +0200 Message-Id: <1400841780-7119-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400841780-7119-1-git-send-email-daniel.lezcano@linaro.org> References: <537F2589.5050807@linaro.org> <1400841780-7119-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: David Jander tc_mode() can be called from interrupt context and thus must not call clk_*prepare*() functions. Signed-off-by: David Jander Signed-off-by: Daniel Lezcano Acked-by: Alexandre Belloni Acked-by: Nicolas Ferre --- drivers/clocksource/tcb_clksrc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c index 00fdd11..a8d7ea1 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c @@ -100,7 +100,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) || tcd->clkevt.mode == CLOCK_EVT_MODE_ONESHOT) { __raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR)); __raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR)); - clk_disable_unprepare(tcd->clk); + clk_disable(tcd->clk); } switch (m) { @@ -109,7 +109,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) * of oneshot, we get lower overhead and improved accuracy. */ case CLOCK_EVT_MODE_PERIODIC: - clk_prepare_enable(tcd->clk); + clk_enable(tcd->clk); /* slow clock, count up to RC, then irq and restart */ __raw_writel(timer_clock @@ -126,7 +126,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) break; case CLOCK_EVT_MODE_ONESHOT: - clk_prepare_enable(tcd->clk); + clk_enable(tcd->clk); /* slow clock, count up to RC, then irq and stop */ __raw_writel(timer_clock | ATMEL_TC_CPCSTOP @@ -194,7 +194,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) ret = clk_prepare_enable(t2_clk); if (ret) return ret; - clk_disable_unprepare(t2_clk); + clk_disable(t2_clk); clkevt.regs = tc->regs; clkevt.clk = t2_clk;