devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk,
	mcoquelin.stm32@gmail.com, alexandre.torgue@st.com,
	daniel.lezcano@linaro.org, tglx@linutronix.de,
	ludovic.barre@st.com, julien.thierry@arm.com
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Benjamin Gaignard <benjamin.gaignard@linaro.org>
Subject: [PATCH v6 3/5] clocksource: stm32: only use 32 bits timers
Date: Wed, 18 Oct 2017 14:58:24 +0200	[thread overview]
Message-ID: <1508331506-23782-4-git-send-email-benjamin.gaignard@linaro.org> (raw)
In-Reply-To: <1508331506-23782-1-git-send-email-benjamin.gaignard@linaro.org>

16 bits hardware are not enough accure to be used.
Do no allow them to be probed by tested max counter value.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
 drivers/clocksource/timer-stm32.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c
index 67dcf48..c834648 100644
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
@@ -81,9 +81,9 @@ static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id)
 static int __init stm32_clockevent_init(struct device_node *node)
 {
 	struct reset_control *rstc;
-	unsigned long max_delta;
-	int ret, bits, prescaler = 1;
+	unsigned long max_arr;
 	struct timer_of *to;
+	int ret;
 
 	to = kzalloc(sizeof(*to), GFP_KERNEL);
 	if (!to)
@@ -113,29 +113,27 @@ static int __init stm32_clockevent_init(struct device_node *node)
 
 	/* Detect whether the timer is 16 or 32 bits */
 	writel_relaxed(~0U, timer_of_base(to) + TIM_ARR);
-	max_delta = readl_relaxed(timer_of_base(to) + TIM_ARR);
-	if (max_delta == ~0U) {
-		prescaler = 1;
-		bits = 32;
-	} else {
-		prescaler = 1024;
-		bits = 16;
+	max_arr = readl_relaxed(timer_of_base(to) + TIM_ARR);
+	if (max_arr != ~0U) {
+		pr_err("32 bits timer is needed\n");
+		ret = -EINVAL;
+		goto deinit;
 	}
+
 	writel_relaxed(0, timer_of_base(to) + TIM_ARR);
 
-	writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC);
+	writel_relaxed(0, timer_of_base(to) + TIM_PSC);
 	writel_relaxed(TIM_EGR_UG, timer_of_base(to) + TIM_EGR);
 	writel_relaxed(TIM_DIER_UIE, timer_of_base(to) + TIM_DIER);
 	writel_relaxed(0, timer_of_base(to) + TIM_SR);
 
 	clockevents_config_and_register(&to->clkevt,
-					timer_of_period(to), 0x60, max_delta);
-
-	pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",
-			node, bits);
+					timer_of_period(to), 0x60, ~0U);
 
 	return 0;
 
+deinit:
+	timer_of_deinit(to);
 err:
 	kfree(to);
 	return ret;
-- 
2.7.4

  parent reply	other threads:[~2017-10-18 12:58 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-18 12:58 [PATCH v6 0/5] stm32 clocksource driver rework Benjamin Gaignard
2017-10-18 12:58 ` [PATCH v6 1/5] timer: add timer_of_deinit function Benjamin Gaignard
2017-10-18 12:58 ` Benjamin Gaignard [this message]
2017-10-18 18:35   ` [PATCH v6 3/5] clocksource: stm32: only use 32 bits timers Thomas Gleixner
2017-10-18 12:58 ` [PATCH v6 4/5] clocksource: stm32: add clocksource support Benjamin Gaignard
     [not found]   ` <1508331506-23782-5-git-send-email-benjamin.gaignard-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-10-18 18:59     ` Thomas Gleixner
2017-10-19  8:06       ` Benjamin Gaignard
     [not found]         ` <CA+M3ks5K6+XnK1KDuSwAx1DF=jSJuWuGbvn64cWXrGnOTOPcCQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-10-19  8:18           ` Thomas Gleixner
     [not found] ` <1508331506-23782-1-git-send-email-benjamin.gaignard-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-10-18 12:58   ` [PATCH v6 2/5] clocksource: stm32: convert driver to timer_of Benjamin Gaignard
2017-10-18 18:31     ` Thomas Gleixner
2017-10-18 19:32       ` Benjamin Gaignard
     [not found]         ` <CA+M3ks4Eg2-S8yDZuMd-jqZ6g2efvveU_WwQEh0rPZW0fGDt3w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-10-19  9:07           ` Daniel Lezcano
2017-10-18 12:58   ` [PATCH v6 5/5] arm: dts: stm32: remove useless clocksource nodes Benjamin Gaignard
2017-10-18 13:21     ` Rob Herring
     [not found]       ` <CABGGisx1mrf8xSWAXSm9sevE16HgCT72RhcpH6J44ECQnCd3Jw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-10-18 13:38         ` Benjamin Gaignard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1508331506-23782-4-git-send-email-benjamin.gaignard@linaro.org \
    --to=benjamin.gaignard@linaro.org \
    --cc=alexandre.torgue@st.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=julien.thierry@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=ludovic.barre@st.com \
    --cc=mark.rutland@arm.com \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).