From patchwork Fri Jun 12 08:00:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 49804 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 350F7228DB for ; Fri, 12 Jun 2015 08:01:04 +0000 (UTC) Received: by labsp1 with SMTP id sp1sf8498961lab.3 for ; Fri, 12 Jun 2015 01:01:03 -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=0LFN/4GZFwO/23J1HDKT/OCfP6YQcZQY35ckglqOufU=; b=gJbbQLvrPe5k5/Z6LSVX2koM4yJ+cNUWFi9WMULG3GcQMyPE123afkz5vFFj2IO4Hc 01mH2vwL2jMYQmBmgB2w2dnFAvgJn8wG7ULCA98xUQGzol7wSjRks+Fv7csHH/IjEDd3 /vuK2BEBuwmkoT6THUSVm040OeBrBSzwYHrMk2nL+uON+1sRliAHCIx81dRxhTrWA2SC E7ZMpfgOE1S2HEfNE6D+cC2v/w118HZOaNxCPHlAoSF8p+Hk729wUKvI1pGaBHTz9Vma il6sos9a2T03zymEnSQxvaFmcR4UCFUHSmxv2SENSQkeAVbtoI7lEBWnOJwSLvA1z/ch KY1Q== X-Gm-Message-State: ALoCoQm6B/pRqr1eQz54uX7FMaNEQkyar/X66frtSXq3ZKMBAkjsK5TTo5EJqbO6+SLwWq4Ij41S X-Received: by 10.112.148.101 with SMTP id tr5mr13093313lbb.13.1434096063198; Fri, 12 Jun 2015 01:01:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.179.39 with SMTP id dd7ls544954lac.60.gmail; Fri, 12 Jun 2015 01:01:03 -0700 (PDT) X-Received: by 10.112.85.204 with SMTP id j12mr13453060lbz.47.1434096063025; Fri, 12 Jun 2015 01:01:03 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id a7si2760302lab.49.2015.06.12.01.01.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jun 2015 01:01:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lagh7 with SMTP id h7so6502431lag.0 for ; Fri, 12 Jun 2015 01:01:02 -0700 (PDT) X-Received: by 10.112.131.98 with SMTP id ol2mr14155864lbb.56.1434096062872; Fri, 12 Jun 2015 01:01:02 -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 hn6csp361496lbb; Fri, 12 Jun 2015 01:01:01 -0700 (PDT) X-Received: by 10.68.205.33 with SMTP id ld1mr21645304pbc.22.1434096058339; Fri, 12 Jun 2015 01:00:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qo6si2497711pac.151.2015.06.12.01.00.57; Fri, 12 Jun 2015 01:00:58 -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 S1754967AbbFLIAt (ORCPT + 29 others); Fri, 12 Jun 2015 04:00:49 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:34536 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751248AbbFLIAo (ORCPT ); Fri, 12 Jun 2015 04:00:44 -0400 Received: by pdbki1 with SMTP id ki1so19846344pdb.1 for ; Fri, 12 Jun 2015 01:00:43 -0700 (PDT) X-Received: by 10.68.69.39 with SMTP id b7mr21339790pbu.35.1434096043318; Fri, 12 Jun 2015 01:00:43 -0700 (PDT) Received: from localhost ([122.167.70.98]) by mx.google.com with ESMTPSA id h11sm2776199pdj.27.2015.06.12.01.00.42 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Jun 2015 01:00:42 -0700 (PDT) From: Viresh Kumar To: Thomas Gleixner , Daniel Lezcano Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar , Srinivas Kandagatla , Maxime Coquelin , Patrice Chotard Subject: [PATCH V2 3/7] clocksource: arm_global_timer: Migrate to new 'set-state' interface Date: Fri, 12 Jun 2015 13:30:13 +0530 Message-Id: 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.41 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. Acked-by: Daniel Lezcano Cc: Srinivas Kandagatla Cc: Maxime Coquelin Cc: Patrice Chotard Signed-off-by: Viresh Kumar --- 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); }