From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EFDBC04AA9 for ; Thu, 2 May 2019 20:35:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3A5C20651 for ; Thu, 2 May 2019 20:35:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oP8zs4Q5"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XxA/kwRC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3A5C20651 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VaK690M1N5jzVn8piZ7IOm1rcTrv7UCBPw8xXu6phEk=; b=oP8zs4Q5mX23oq XoHV8N1w/kfvtwSHPKFx3r0l8CKgI+Zzyf8vRGrln5AmuRQ/itvGykh4afUMM7LxxW88+ZSqGg7mB 418TgU3z92kVccErVBxgOumVieMSVWf0GsAFNX91dfJX0D9Utpanzj1zhStB8lNvtwv5cTa40b6rJ TAD33Lec22K2SWbUECbHY+yrMas0VAYoMF/bMCATvLU2HArL3w/D6SR9LLesl+45tSFVd5/rHdqBb UVPtu5jCtnRF3+5DZAtSXl1m1uJo4gK7jBs+MqXUL0uotpqTerdeNbtoMZfFtv+KQJzs53833Lr1x GGOwIvCyBN+yTuco7jBA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMIQV-0000LV-6A; Thu, 02 May 2019 20:35:31 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMIQS-0000LB-9x for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2019 20:35:29 +0000 Received: by mail-pl1-x644.google.com with SMTP id o5so1542834pls.12 for ; Thu, 02 May 2019 13:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ZQPjFKIck0BYkQ9DfkaYVVMVn0vzKw2Cwt47ufchXuY=; b=XxA/kwRCa6NMKmrjalaj3Qu16NsuxzlkYgVanY/qsovNrjDjX9i6wbF6lKL87vEXSc HP1j1U8xKwwXPLqdd2RPnauezNK/CzVwkW0t30G0Mwkgfpl6ANwUwr/x09DNeG7EaLVe BElcJiUasAOPOGHeiBvP/kfWXUV/Ra/fdxF7GBDeMz9vKfn6TdbkuGtSQzcCilTYkPNI tVWVdjC8VHhCyXkHpcgWYYBvRkGutT6QD+xpMN9jHoy7tug51j09miGtAfaNDF8BktFx Bpye5q8mzvVM5bnHqIT0iFxNL9LAA46z3jnceUKZCjQp5DRQ0yCeDSPjqDa7XoYgTCky yzGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=ZQPjFKIck0BYkQ9DfkaYVVMVn0vzKw2Cwt47ufchXuY=; b=Wa+OSQRxstH9TOM3CLAxjTvjs9gzZ2vecrzGyxPHADO2OgpPbxaZm3xP6gee8PU++S DkhoXeuygNUsGcBuAP1QbObarbHLeQFy6Xk7npqpnv8Rw3TWw3xj1ReA1gmqww/7iiT2 wNDqT9zktDQpwGZFzPObMIwtAWMLBLqpGOo1OEhzfEs5iMcPNd+4vsYzpMbcOxMC0Pdw WjM3mqyDvuHCdb5lwvytuv998GnazALSuaS5p0MEt24d3VXjoiILgDHkMDPOI1KMbU3B if0avFnkrOa1zN7Zo9JbqFUDvUw0UI53ciFm492h82neUEn2MTTS5wopXxV0tNmdNkXw Knhg== X-Gm-Message-State: APjAAAW+w4dywbo43QEQEtTuuRirD8jN85EO+l18ibKbDDfjXvxWwkk4 ObYUawcZU2GJdbUFb3cH8Yw= X-Google-Smtp-Source: APXvYqyrAVkUvRKQ/yYhDRbHgv2bWV/pjIA4jFdHf7sRYwX5385rscwSZ+FhENNgpWMIrTjBglcSlg== X-Received: by 2002:a17:902:9a95:: with SMTP id w21mr5955597plp.74.1556829327360; Thu, 02 May 2019 13:35:27 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id c17sm24687pfn.173.2019.05.02.13.35.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 13:35:26 -0700 (PDT) Date: Thu, 2 May 2019 13:35:25 -0700 From: Guenter Roeck To: Ludovic Barre Subject: Re: [PATCH V2 3/3] watchdog: stm32: add dynamic prescaler support Message-ID: <20190502203525.GA29063@roeck-us.net> References: <1556806126-15890-1-git-send-email-ludovic.Barre@st.com> <1556806126-15890-4-git-send-email-ludovic.Barre@st.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1556806126-15890-4-git-send-email-ludovic.Barre@st.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190502_133528_373735_B58BA44B X-CRM114-Status: GOOD ( 26.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Maxime Coquelin , Wim Van Sebroeck , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Alexandre Torgue Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, May 02, 2019 at 04:08:46PM +0200, Ludovic Barre wrote: > From: Ludovic Barre > > This patch allows to define the max prescaler by compatible. > To set a large range of timeout, the prescaler should be set > dynamically (from the timeout request) to improve the resolution > in order to have a timeout close to the expected value. > > Signed-off-by: Ludovic Barre > --- > drivers/watchdog/stm32_iwdg.c | 76 ++++++++++++++++++++++++------------------- > 1 file changed, 42 insertions(+), 34 deletions(-) > > diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c > index f19a6d4..0c765d4 100644 > --- a/drivers/watchdog/stm32_iwdg.c > +++ b/drivers/watchdog/stm32_iwdg.c > @@ -34,18 +34,12 @@ > #define KR_KEY_EWA 0x5555 /* write access enable */ > #define KR_KEY_DWA 0x0000 /* write access disable */ > > -/* IWDG_PR register bit values */ > -#define PR_4 0x00 /* prescaler set to 4 */ > -#define PR_8 0x01 /* prescaler set to 8 */ > -#define PR_16 0x02 /* prescaler set to 16 */ > -#define PR_32 0x03 /* prescaler set to 32 */ > -#define PR_64 0x04 /* prescaler set to 64 */ > -#define PR_128 0x05 /* prescaler set to 128 */ > -#define PR_256 0x06 /* prescaler set to 256 */ > +#define PR_SHIFT 2 > +#define PR_MIN BIT(PR_SHIFT) > > /* IWDG_RLR register values */ > -#define RLR_MIN 0x07C /* min value supported by reload register */ > -#define RLR_MAX 0xFFF /* max value supported by reload register */ > +#define RLR_MIN 0x2 /* min value recommended */ > +#define RLR_MAX GENMASK(11, 0) /* max value of reload register */ > > /* IWDG_SR register bit mask */ > #define FLAG_PVU BIT(0) /* Watchdog prescaler value update */ > @@ -55,15 +49,28 @@ > #define TIMEOUT_US 100000 > #define SLEEP_US 1000 > > -#define HAS_PCLK true > +struct stm32_iwdg_data { > + bool has_pclk; > + u32 max_prescaler; > +}; > + > +static const struct stm32_iwdg_data stm32_iwdg_data = { > + .has_pclk = false, > + .max_prescaler = 256, > +}; > + > +static const struct stm32_iwdg_data stm32mp1_iwdg_data = { > + .has_pclk = true, > + .max_prescaler = 1024, > +}; > > struct stm32_iwdg { > struct watchdog_device wdd; > + const struct stm32_iwdg_data *data; > void __iomem *regs; > struct clk *clk_lsi; > struct clk *clk_pclk; > unsigned int rate; > - bool has_pclk; > }; > > static inline u32 reg_read(void __iomem *base, u32 reg) > @@ -79,26 +86,28 @@ static inline void reg_write(void __iomem *base, u32 reg, u32 val) > static int stm32_iwdg_start(struct watchdog_device *wdd) > { > struct stm32_iwdg *wdt = watchdog_get_drvdata(wdd); > - u32 val = FLAG_PVU | FLAG_RVU; > - u32 reload; > + u32 presc, iwdg_rlr, iwdg_pr, iwdg_sr; > > dev_dbg(wdd->parent, "%s\n", __func__); > > - /* prescaler fixed to 256 */ > - reload = clamp_t(unsigned int, ((wdd->timeout * wdt->rate) / 256) - 1, > - RLR_MIN, RLR_MAX); > + presc = DIV_ROUND_UP(wdd->timeout * wdt->rate, RLR_MAX + 1); > + > + /* The prescaler is align on power of 2 and start at 2 ^ PR_SHIFT. */ > + presc = roundup_pow_of_two(presc); > + iwdg_pr = presc <= 1 << PR_SHIFT ? 0 : ilog2(presc) - PR_SHIFT; > + iwdg_rlr = ((wdd->timeout * wdt->rate) / presc) - 1; > > + /* enable watchdog */ > + reg_write(wdt->regs, IWDG_KR, KR_KEY_ENABLE); > /* enable write access */ > reg_write(wdt->regs, IWDG_KR, KR_KEY_EWA); > - > /* set prescaler & reload registers */ > - reg_write(wdt->regs, IWDG_PR, PR_256); /* prescaler fix to 256 */ > - reg_write(wdt->regs, IWDG_RLR, reload); > - reg_write(wdt->regs, IWDG_KR, KR_KEY_ENABLE); > + reg_write(wdt->regs, IWDG_PR, iwdg_pr); > + reg_write(wdt->regs, IWDG_RLR, iwdg_rlr); > > /* wait for the registers to be updated (max 100ms) */ > - if (readl_relaxed_poll_timeout(wdt->regs + IWDG_SR, val, > - !(val & (FLAG_PVU | FLAG_RVU)), > + if (readl_relaxed_poll_timeout(wdt->regs + IWDG_SR, iwdg_sr, > + !(iwdg_sr & (FLAG_PVU | FLAG_RVU)), > SLEEP_US, TIMEOUT_US)) { > dev_err(wdd->parent, "Fail to set prescaler, reload regs\n"); > return -EIO; As mentioned in the other patch, pelase return the error returned from readl_relaxed_poll_timeout(). If that returns a timeout, we want to know about it and not just hide it behind -EIO. > @@ -155,7 +164,7 @@ static int stm32_iwdg_clk_init(struct platform_device *pdev, > } > > /* optional peripheral clock */ > - if (wdt->has_pclk) { > + if (wdt->data->has_pclk) { > wdt->clk_pclk = devm_clk_get(&pdev->dev, "pclk"); > if (IS_ERR(wdt->clk_pclk)) { > dev_err(&pdev->dev, "Unable to get pclk clock\n"); > @@ -196,8 +205,8 @@ static const struct watchdog_ops stm32_iwdg_ops = { > }; > > static const struct of_device_id stm32_iwdg_of_match[] = { > - { .compatible = "st,stm32-iwdg", .data = (void *)!HAS_PCLK }, > - { .compatible = "st,stm32mp1-iwdg", .data = (void *)HAS_PCLK }, > + { .compatible = "st,stm32-iwdg", .data = &stm32_iwdg_data }, > + { .compatible = "st,stm32mp1-iwdg", .data = &stm32mp1_iwdg_data }, > { /* end node */ } > }; > MODULE_DEVICE_TABLE(of, stm32_iwdg_of_match); > @@ -205,20 +214,17 @@ MODULE_DEVICE_TABLE(of, stm32_iwdg_of_match); > static int stm32_iwdg_probe(struct platform_device *pdev) > { > struct watchdog_device *wdd; > - const struct of_device_id *match; > struct stm32_iwdg *wdt; > struct resource *res; > int ret; > > - match = of_match_device(stm32_iwdg_of_match, &pdev->dev); > - if (!match) > - return -ENODEV; > - > wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); > if (!wdt) > return -ENOMEM; > > - wdt->has_pclk = match->data; > + wdt->data = of_device_get_match_data(&pdev->dev); > + if (!wdt->data) > + return -ENODEV; > > /* This is the timer base. */ > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > @@ -236,8 +242,10 @@ static int stm32_iwdg_probe(struct platform_device *pdev) > wdd = &wdt->wdd; > wdd->info = &stm32_iwdg_info; > wdd->ops = &stm32_iwdg_ops; > - wdd->min_timeout = ((RLR_MIN + 1) * 256) / wdt->rate; > - wdd->max_hw_heartbeat_ms = ((RLR_MAX + 1) * 256 * 1000) / wdt->rate; > + wdd->min_timeout = max_t(unsigned int, 1, > + (((RLR_MIN + 1) * PR_MIN) / wdt->rate)); Is that any different to DIV_ROUND_UP() ? > + wdd->max_hw_heartbeat_ms = ((RLR_MAX + 1) * wdt->data->max_prescaler * > + 1000) / wdt->rate; > wdd->parent = &pdev->dev; > > watchdog_set_drvdata(wdd, wdt); > -- > 2.7.4 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel