From patchwork Mon Jun 8 13:40:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 49621 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 210AE214B2 for ; Mon, 8 Jun 2015 13:41:57 +0000 (UTC) Received: by wizw5 with SMTP id w5sf15070337wiz.2 for ; Mon, 08 Jun 2015 06:41:56 -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: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=bSsww7RC1/5lrfpfral1oOeeaezeJA+b8YiL75amt+4=; b=J0pKMpQi64t0oJ/Vfh2Bxi0Zd77n95UE/6BKjWDrH5oXgKKK7QndFDjYYkBwZxP3ci FuwaS6XN8BZgYwRQea5nUivqfwDHlOTqTQCik/XOE6f9UqmnBwyC1hJpnwIolO/YI0x+ m8WG2V7H97mGbI1x0yTjyWhapVRowXkW3k7WBCjDNFDy9n0KGcYZhTjQLKd2w7Cq+p1T iFZBAieSGQnx7hU8ejOex9pshsmlkwPd24ppDctT2aTInwcFMF3hBn868YWFTgz+gyFa 8QecCRItaqzRZSPv6Omgl7V/H3PdjDh3YPe6q2mo6GYEsFvF+w0yPjnvYRCfIudk9FBF 7uzA== X-Gm-Message-State: ALoCoQkSt/H45xvl6iHiu0U6O7EIQiR/WjW6q5cp9AhK3f3CG0jXyk/utuNW6SiZDOvwSBlns4Mq X-Received: by 10.113.11.3 with SMTP id ee3mr17218073lbd.9.1433770916349; Mon, 08 Jun 2015 06:41:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.194 with SMTP id 2ls699716law.0.gmail; Mon, 08 Jun 2015 06:41:56 -0700 (PDT) X-Received: by 10.112.72.228 with SMTP id g4mr16709817lbv.90.1433770916170; Mon, 08 Jun 2015 06:41:56 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id zl2si2768617lbb.55.2015.06.08.06.41.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jun 2015 06:41:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by labpy14 with SMTP id py14so97425208lab.0 for ; Mon, 08 Jun 2015 06:41:56 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr12351818lbc.112.1433770915559; Mon, 08 Jun 2015 06:41:55 -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.112.108.230 with SMTP id hn6csp1874299lbb; Mon, 8 Jun 2015 06:41:54 -0700 (PDT) X-Received: by 10.66.157.71 with SMTP id wk7mr29280769pab.99.1433770913023; Mon, 08 Jun 2015 06:41:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cy9si4215829pad.8.2015.06.08.06.41.52; Mon, 08 Jun 2015 06:41:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752814AbbFHNlq (ORCPT + 28 others); Mon, 8 Jun 2015 09:41:46 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:36364 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752879AbbFHNlU (ORCPT ); Mon, 8 Jun 2015 09:41:20 -0400 Received: by pabqy3 with SMTP id qy3so97767871pab.3 for ; Mon, 08 Jun 2015 06:41:20 -0700 (PDT) X-Received: by 10.66.168.11 with SMTP id zs11mr30413711pab.138.1433770880486; Mon, 08 Jun 2015 06:41:20 -0700 (PDT) Received: from localhost ([122.167.219.251]) by mx.google.com with ESMTPSA id zs5sm2714883pac.11.2015.06.08.06.41.18 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 08 Jun 2015 06:41:19 -0700 (PDT) From: Viresh Kumar To: Thomas Gleixner , Daniel Lezcano Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Viresh Kumar , Srinivas Kandagatla , Maxime Coquelin , Patrice Chotard Subject: [PATCH 2/6] clocksource: arm_global_timer: Migrate to new 'set-state' interface Date: Mon, 8 Jun 2015 19:10:43 +0530 Message-Id: <54f346e663f605e2f078a3114de85ba281d1e6d0.1433768426.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: 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: viresh.kumar@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.215.53 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: , Migrate arm_global_timer driver to the new 'set-state' interface provided by the clockevents core, the earlier 'set-mode' interface is marked obsolete now. This also enables us to implement callbacks for new states of clockevent devices, for example: ONESHOT_STOPPED. Cc: Srinivas Kandagatla Cc: Maxime Coquelin Cc: Patrice Chotard Signed-off-by: Viresh Kumar Acked-by: Daniel Lezcano Acked-by: Srinivas Kandagatla --- drivers/clocksource/arm_global_timer.c | 37 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c index e6833771a716..29ea50ac366a 100644 --- a/drivers/clocksource/arm_global_timer.c +++ b/drivers/clocksource/arm_global_timer.c @@ -107,26 +107,21 @@ static void gt_compare_set(unsigned long delta, int periodic) writel(ctrl, gt_base + GT_CONTROL); } -static void gt_clockevent_set_mode(enum clock_event_mode mode, - struct clock_event_device *clk) +static int gt_clockevent_shutdown(struct clock_event_device *evt) { unsigned long ctrl; - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - gt_compare_set(DIV_ROUND_CLOSEST(gt_clk_rate, HZ), 1); - break; - case CLOCK_EVT_MODE_ONESHOT: - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - ctrl = readl(gt_base + GT_CONTROL); - ctrl &= ~(GT_CONTROL_COMP_ENABLE | - GT_CONTROL_IRQ_ENABLE | GT_CONTROL_AUTO_INC); - writel(ctrl, gt_base + GT_CONTROL); - break; - default: - break; - } + ctrl = readl(gt_base + GT_CONTROL); + ctrl &= ~(GT_CONTROL_COMP_ENABLE | GT_CONTROL_IRQ_ENABLE | + GT_CONTROL_AUTO_INC); + writel(ctrl, gt_base + GT_CONTROL); + return 0; +} + +static int gt_clockevent_set_periodic(struct clock_event_device *evt) +{ + gt_compare_set(DIV_ROUND_CLOSEST(gt_clk_rate, HZ), 1); + return 0; } static int gt_clockevent_set_next_event(unsigned long evt, @@ -155,7 +150,7 @@ static irqreturn_t gt_clockevent_interrupt(int irq, void *dev_id) * the Global Timer flag _after_ having incremented * the Comparator register value to a higher value. */ - if (evt->mode == CLOCK_EVT_MODE_ONESHOT) + if (clockevent_state_oneshot(evt)) gt_compare_set(ULONG_MAX, 0); writel_relaxed(GT_INT_STATUS_EVENT_FLAG, gt_base + GT_INT_STATUS); @@ -171,7 +166,9 @@ static int gt_clockevents_init(struct clock_event_device *clk) clk->name = "arm_global_timer"; clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERCPU; - clk->set_mode = gt_clockevent_set_mode; + clk->set_state_shutdown = gt_clockevent_shutdown; + clk->set_state_periodic = gt_clockevent_set_periodic; + clk->set_state_oneshot = gt_clockevent_shutdown; clk->set_next_event = gt_clockevent_set_next_event; clk->cpumask = cpumask_of(cpu); clk->rating = 300; @@ -184,7 +181,7 @@ static int gt_clockevents_init(struct clock_event_device *clk) static void gt_clockevents_stop(struct clock_event_device *clk) { - gt_clockevent_set_mode(CLOCK_EVT_MODE_UNUSED, clk); + gt_clockevent_shutdown(clk); disable_percpu_irq(clk->irq); }