From patchwork Thu Jan 4 12:50:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 123417 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp11390454qgn; Thu, 4 Jan 2018 04:52:21 -0800 (PST) X-Google-Smtp-Source: ACJfBov809FNjlXd4zRh44pUKz4YlTCzzRhykw2W7MSObxKwdmFvlnGnoilkp5q4shD4eFLQS5td X-Received: by 10.98.162.20 with SMTP id m20mr4726360pff.6.1515070341008; Thu, 04 Jan 2018 04:52:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515070341; cv=none; d=google.com; s=arc-20160816; b=X6jWBSo/ysZH1tIWSOk3ozbJgZXKB+mJL0yhsSxkpVz8xT6rOQjp8Cxboiw9nN2cW1 lpv1QP9Vu2kgAPHt6v7HNie7fvCNNPqh158/0rEwnKx/irBekok8arM+WspsuOAC6j0K Z5321YtbsXEft7MHRx2VWu6RieoDQh9PiezcGygbbysHbKxw2MxCkIrmSuafDR5KwIpc Z8tLBUiXVxDhm8FZxQLda0kG7u7Nt7y1QvJF5zK7/Gxcw0lS6m5g+3CIHSSdDdmpgIPN yZeL97hh7P3EIylNZVKbSQPNA17LXsYxQe32o5LuUK/DFZW5HSjScnicIb6mUPHjPtSf 5Vwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=kLZbY857xM7DtopOtBg3KCSvCVvbCDMp6H75OglVrWA=; b=v2rIxUIk8tnpJ7a3btFi/vybTDJn4SglnvQP18U8ZE2D04xa+30G9znesmj02IW7Gd zBMuw8UTzidUGooqBTFSWdYbUjC2sWHK6PAljZCqfvcx12i+ASRudjSlWWBvpKWY1N8U TI5xcr6XFZzFuZ5yTNe/1hU3aPdNV9Fb2LdwFVrCj+d3uLmU1rB6PGY0gpfcqIgfNV6Z ptPOEdj+roqrq2R4no7/Fep10Ln2HZRlKFvH9L3My3wcoVGpW7wYmxNBmA7N1jS2+z0p TuSbVVy76+XB2DuOE7V22ZXeaLr4krMce3WpDvdpTbrDvyLS/6LDK81IdmxNBgeRqk9y sRgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i3adswEg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o7si2028497pgr.567.2018.01.04.04.52.20; Thu, 04 Jan 2018 04:52:20 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i3adswEg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753134AbeADMwS (ORCPT + 27 others); Thu, 4 Jan 2018 07:52:18 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36349 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752820AbeADMvb (ORCPT ); Thu, 4 Jan 2018 07:51:31 -0500 Received: by mail-wm0-f67.google.com with SMTP id b76so3278965wmg.1 for ; Thu, 04 Jan 2018 04:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kLZbY857xM7DtopOtBg3KCSvCVvbCDMp6H75OglVrWA=; b=i3adswEgdFnUSKSIoQMu+0/1RvjCoQ1MtiSe+eHTGO2WrcF5RFT3b5DkZxNFiAt1+I TVWEjnVO1GO0lMcY2RuSOhJdFvCbxKbuKIe6j3MPHoSACqabdKZkrorTxOI2eipY/874 Rm620fRt5qvqIVpnySpk7+czS3kHtl8qs4lAk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kLZbY857xM7DtopOtBg3KCSvCVvbCDMp6H75OglVrWA=; b=QDG3E7CtQT1mL1z0br/qY5DNcRx52Pv/hs5AsIaGlb2aogdK48JyinkM5VKRCH42e6 LOsVDpycno8GDA+ccA5fD1lwaiza0QMvL3BA1Ci9PBkXQiySdJiCjprs9GhrJiwpkkoo T1GlvRDHHhvg7ODY14DgVAfLIY/FES4P7+d5amCWUS70miw6EC07XYRCiAcA5M13gNDx gqlZs5HUD0+ac+QYmrfE9cSs+l2bggDIQ7wPlZgvG+Vq0p6g0FFSp9yCG0SOLX+ataEB scLNPcPWt7qQ+60Hcc/yl8SwxK5MGgaMwsV8oO19I0H3JK1ooUq0VTHyCafhLzG9zUVV je8Q== X-Gm-Message-State: AKGB3mKvR7HcAXFgmkaN9lo5NaEBIwOG6y02aqFisfIK9L5Vcufq3G3S OvCy2dEXLHABBn6S+RTCeQ6ngg== X-Received: by 10.28.16.144 with SMTP id 138mr3773874wmq.155.1515070290400; Thu, 04 Jan 2018 04:51:30 -0800 (PST) Received: from mai.lan ([2001:41d0:fe90:b800:c10d:405d:d60:60bb]) by smtp.gmail.com with ESMTPSA id d71sm3668348wma.7.2018.01.04.04.51.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jan 2018 04:51:29 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, benjamin.gaignard@linaro.org, Maxime Coquelin , Alexandre Torgue , linux-arm-kernel@lists.infradead.org (moderated list:ARM/STM32 ARCHITECTURE) Subject: [PATCH 09/12] clocksource/drivers/stm32: Encapsulate more the clockevent code Date: Thu, 4 Jan 2018 13:50:25 +0100 Message-Id: <1515070228-10481-10-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515070228-10481-1-git-send-email-daniel.lezcano@linaro.org> References: <1515070228-10481-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to prepare the clocksource code, let's encapsulate the clockevent code, split the prescaler and timer width code into separate functions. Signed-off-by: Daniel Lezcano --- drivers/clocksource/timer-stm32.c | 107 +++++++++++++++++++++++++++++--------- 1 file changed, 82 insertions(+), 25 deletions(-) -- 2.7.4 diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index baca42c..1891924 100644 --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -44,6 +44,42 @@ #define TIM_PSC_MAX USHRT_MAX #define TIM_PSC_CLKRATE 10000 +struct stm32_timer_private { + int bits; +}; + +/** + * stm32_timer_of_bits_set - set accessor helper + * @to: a timer_of structure pointer + * @bits: the number of bits (16 or 32) + * + * Accessor helper to set the number of bits in the timer-of private + * structure. + * + */ +static void stm32_timer_of_bits_set(struct timer_of *to, int bits) +{ + struct stm32_timer_private *pd = to->private_data; + + pd->bits = bits; +} + +/** + * stm32_timer_of_bits_get - get accessor helper + * @to: a timer_of structure pointer + * + * Accessor helper to get the number of bits in the timer-of private + * structure. + * + * Returns an integer corresponding to the number of bits. + */ +static int stm32_timer_of_bits_get(struct timer_of *to) +{ + struct stm32_timer_private *pd = to->private_data; + + return pd->bits; +} + static void stm32_clock_event_disable(struct timer_of *to) { writel_relaxed(0, timer_of_base(to) + TIM_DIER); @@ -124,35 +160,31 @@ static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id) * is a 32bits width, the result will be UINT_MAX, otherwise it will * be truncated by the 16bits register to USHRT_MAX. * - * Returns UINT_MAX if the timer is 32bits width, USHRT_MAX if it is a - * 16bits width. */ -static u32 __init stm32_timer_width(struct timer_of *to) +static void __init stm32_timer_set_width(struct timer_of *to) { + u32 width; + writel_relaxed(UINT_MAX, timer_of_base(to) + TIM_ARR); - return readl_relaxed(timer_of_base(to) + TIM_ARR); + width = readl_relaxed(timer_of_base(to) + TIM_ARR); + + stm32_timer_of_bits_set(to, width == UINT_MAX ? 32 : 16); } -static void __init stm32_clockevent_init(struct timer_of *to) +/** + * stm32_timer_set_prescaler - Compute and set the prescaler register + * @to: a pointer to a timer-of structure + * + * Depending on the timer width, compute the prescaler to always + * target a 10MHz timer rate for the 16bits. 32bits timers are + * considered precise and long enough to not use the prescaler. + */ +static void __init stm32_timer_set_prescaler(struct timer_of *to) { - u32 width = 0; - int prescaler; + int prescaler = 1; - to->clkevt.name = to->np->full_name; - to->clkevt.features = CLOCK_EVT_FEAT_PERIODIC; - to->clkevt.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; - to->clkevt.set_state_shutdown = stm32_clock_event_shutdown; - to->clkevt.set_state_periodic = stm32_clock_event_set_periodic; - to->clkevt.set_state_oneshot = stm32_clock_event_set_oneshot; - to->clkevt.tick_resume = stm32_clock_event_shutdown; - to->clkevt.set_next_event = stm32_clock_event_set_next_event; - - width = stm32_timer_width(to); - if (width == UINT_MAX) { - prescaler = 1; - to->clkevt.rating = 250; - } else { + if (stm32_timer_of_bits_get(to) != 32) { prescaler = DIV_ROUND_CLOSEST(timer_of_rate(to), TIM_PSC_CLKRATE); /* @@ -161,7 +193,6 @@ static void __init stm32_clockevent_init(struct timer_of *to) * this case. */ prescaler = prescaler < TIM_PSC_MAX ? prescaler : TIM_PSC_MAX; - to->clkevt.rating = 100; } writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC); @@ -171,12 +202,26 @@ static void __init stm32_clockevent_init(struct timer_of *to) /* Adjust rate and period given the prescaler value */ to->of_clk.rate = DIV_ROUND_CLOSEST(to->of_clk.rate, prescaler); to->of_clk.period = DIV_ROUND_UP(to->of_clk.rate, HZ); +} + +static void __init stm32_clockevent_init(struct timer_of *to) +{ + u32 bits = stm32_timer_of_bits_get(to); - clockevents_config_and_register(&to->clkevt, - timer_of_rate(to), 0x1, width); + to->clkevt.name = to->np->full_name; + to->clkevt.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; + to->clkevt.set_state_shutdown = stm32_clock_event_shutdown; + to->clkevt.set_state_periodic = stm32_clock_event_set_periodic; + to->clkevt.set_state_oneshot = stm32_clock_event_set_oneshot; + to->clkevt.tick_resume = stm32_clock_event_shutdown; + to->clkevt.set_next_event = stm32_clock_event_set_next_event; + to->clkevt.rating = bits == 32 ? 250 : 100; + + clockevents_config_and_register(&to->clkevt, timer_of_rate(to), 0x1, + (1 << bits) - 1); pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n", - to->np, width == UINT_MAX ? 32 : 16); + to->np, bits); } static int __init stm32_timer_init(struct device_node *node) @@ -196,14 +241,26 @@ static int __init stm32_timer_init(struct device_node *node) if (ret) goto err; + to->private_data = kzalloc(sizeof(struct stm32_timer_private), + GFP_KERNEL); + if (!to->private_data) + goto deinit; + rstc = of_reset_control_get(node, NULL); if (!IS_ERR(rstc)) { reset_control_assert(rstc); reset_control_deassert(rstc); } + stm32_timer_set_width(to); + + stm32_timer_set_prescaler(to); + stm32_clockevent_init(to); return 0; + +deinit: + timer_of_cleanup(to); err: kfree(to); return ret;