Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp1737245imc; Mon, 11 Mar 2019 22:43:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqwE1+nu3UiV/hStEztL2qwHsH5vWe6pg/hrc7hah4/YXvo6nglufq2a47UHODb85jRlse2l X-Received: by 2002:a63:c0e:: with SMTP id b14mr33579489pgl.236.1552369435037; Mon, 11 Mar 2019 22:43:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552369435; cv=none; d=google.com; s=arc-20160816; b=PYKMJFNEjZi+q5SX7Fl+1I2HXVBY93lLCHnL4iUAyt4pj3HGPS/ogqNBCBOxuDWhy+ 1Sy2+NaeBcaorsIHQthmudS26/Dv1TwucPGyQnd5KjTlYgJf1LjXNVrlnyeBXju7e57i XtYFUMqSmfKg3ypo6MEry7CWhHhFLH4bo4NqFBV2taRJQ7XScSIAxq/C3n4t+Bx9VhE6 D+TWAp/zvCbF2mEXBR0R/O8GO5/5MVNOwc2Pl8AWt2HQy48uKq+NAeiQzJdwRNe/p2tO vvMUr7LwL9ybPpljitDRy3T3MrzESm3nzeIgtc9ZlQ7PZJ438tM9XQUehUK8MpTbfslu DNEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=DCFWrKMkPSlIxd7n635HoPYKiNDnEatlKvCsU2Ma/vo=; b=oH6JpE+m9LRXQSEgL8r1e8Xs7Ee14gYQgvAbq5QmOyXaLoEo8OEclc3jlfpCKYNEK5 hy85qywub1/Sd8QamsXn6bbgLKPg1tWY9gK5J6g4hpnNdRaSgLXjxI3cHmDf1Rv+Vxg/ uDzGRqkxgIdnvu60/J5yWi8T4jcszAUnnuNCLPxrjoN2IUrwD6vBY+LdcScaPNdl9buo 2dBdJD1yXKAbXufwkQubEQj6JTkpyfwEgFi9+XJ1je3Tv+F9ti+kn+LVybEOV7sOpQ4n aRVFGR1vFN6gFOAU/rszLVJ6eTi/LpQMqKGnY2oHV/4XMuskUoAH2Q+W+5ycDvJu9z+T 5Tgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gW2oFbFJ; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p17si6744090pgg.259.2019.03.11.22.43.38; Mon, 11 Mar 2019 22:43:55 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gW2oFbFJ; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727140AbfCLFnN (ORCPT + 99 others); Tue, 12 Mar 2019 01:43:13 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44945 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726545AbfCLFnM (ORCPT ); Tue, 12 Mar 2019 01:43:12 -0400 Received: by mail-wr1-f68.google.com with SMTP id w2so1203273wrt.11; Mon, 11 Mar 2019 22:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=DCFWrKMkPSlIxd7n635HoPYKiNDnEatlKvCsU2Ma/vo=; b=gW2oFbFJiXv6vuFijUvsp/yKB63LRlwtrZNse9xVVgXS6K3xRD9EtaxY85q9BJwcDi 19tht/DzSRC/h2j/YpoaF+Ygeyu2tW7dwgqkyazpN7Z6FhHPuuSiJrkyUB2gmRXcijOb F1+u5eSOThzmlrXW/ZKWIE9aJ2mutvuFAVr+tTSDFTm+vzMS/fMF9HM+EyZJyqhOU9+1 E4yKWTRl+LE8295Fv02J6/WHHBbBWenQKrG6kG2vZEtG+bB7OEXwP9Qznv16oYRtz+nZ J/kVuDrWKpAKVH9LwWEXH/04lCW74+KqDAiQ1gtYQDEVy3sL/CUaMFOyALXyxQXNEBYZ Tzkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=DCFWrKMkPSlIxd7n635HoPYKiNDnEatlKvCsU2Ma/vo=; b=i2XAd61GDWqNZbFxFIPbLYH7OUbu4xpcH9YHZA71A5t6ABhifi9MuaWjn48wAUjimy MU7W9b5e22pUYuuhxfOE+4d7LUI1ucev0r+zdXghpQsJpTYTZfpWpovpoqqkkua10wSL 1wa98a7Zs83XB76PCBgYYj2/eyZYFsk6dhMhuWiu07Ak828pIdzLcq63L+miVJ7oEF/L t2JlzOOo0DxFSAhzDivK9auD1c96ncpSrPLwueVRhWM016h0+KFP/hCJKxLTAUXNpHbE gKPUJInys840cVX2tTQw0hoknhjZ3CRVxwBcIBDtiFMXCnQ5AsqNy/3etsUYTvO1hwFO 4eqg== X-Gm-Message-State: APjAAAXxsccSLEBxeenWWHB/Wqhh6yhPYkdD/xVUlkHLNsYNIyHljDH/ NFlArW0ZeulmAhDCYYQaqGDvjzM1O47vxuuRMdg= X-Received: by 2002:adf:e4c9:: with SMTP id v9mr9437633wrm.209.1552369389065; Mon, 11 Mar 2019 22:43:09 -0700 (PDT) MIME-Version: 1.0 References: <20181125162319.GA5422@arx-s1> <20181220175750.GG9408@ulmo> In-Reply-To: <20181220175750.GG9408@ulmo> From: Hao Zhang Date: Tue, 12 Mar 2019 13:42:57 +0800 Message-ID: Subject: Re: [PATCH v3 6/6] ARM: PWM: add allwinner sun8i R40/T3/V40 PWM support. To: Thierry Reding Cc: robh+dt@kernel.org, Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Michael Turquette , sboyd@kernel.org, linux-gpio@vger.kernel.org, open list , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , "moderated list:ARM/Allwinner sunXi SoC support" , linux-pwm@vger.kernel.org, linux-sunxi@googlegroups.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thierry Reding =E4=BA=8E2018=E5=B9=B412=E6=9C=88= 21=E6=97=A5=E5=91=A8=E4=BA=94 =E4=B8=8A=E5=8D=881:57=E5=86=99=E9=81=93=EF= =BC=9A > > On Mon, Nov 26, 2018 at 12:23:19AM +0800, Hao Zhang wrote: > > The sun8i R40/T3/V40 PWM has 8 PWM channals and divides to 4 PWM pairs, > > each PWM pair built-in 1 clock module, 2 timer logic module and 1 > > programmable dead-time generator, it also support waveform capture. > > It has 2 clock sources OSC24M and APB1, it is different with the > > sun4i-pwm driver, Therefore add a new driver for it. > > > > Signed-off-by: Hao Zhang > > --- > > drivers/pwm/Kconfig | 12 +- > > drivers/pwm/Makefile | 1 + > > drivers/pwm/pwm-sun8i.c | 418 ++++++++++++++++++++++++++++++++++++++++= ++++++++ > > 3 files changed, 430 insertions(+), 1 deletion(-) > > create mode 100644 drivers/pwm/pwm-sun8i.c > > > > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > > index 504d252..6105ac8 100644 > > --- a/drivers/pwm/Kconfig > > +++ b/drivers/pwm/Kconfig > > @@ -426,7 +426,7 @@ config PWM_STMPE > > expanders. > > > > config PWM_SUN4I > > - tristate "Allwinner PWM support" > > + tristate "Allwinner SUN4I PWM support" > > depends on ARCH_SUNXI || COMPILE_TEST > > depends on HAS_IOMEM && COMMON_CLK > > help > > @@ -435,6 +435,16 @@ config PWM_SUN4I > > To compile this driver as a module, choose M here: the module > > will be called pwm-sun4i. > > > > +config PWM_SUN8I > > + tristate "Allwinner SUN8I (R40/V40/T3) PWM support" > > + depends on ARCH_SUNXI || COMPILE_TEST > > + depends on HAS_IOMEM && COMMON_CLK > > + help > > + Generic PWM framework driver for Allwinner R40/V40/T3 SoCs. > > + > > + To compile this driver as a module, choose M here: the module > > + will be called pwm-sun8i. > > + > > config PWM_TEGRA > > tristate "NVIDIA Tegra PWM support" > > depends on ARCH_TEGRA > > diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile > > index 9c676a0..32c8d2d 100644 > > --- a/drivers/pwm/Makefile > > +++ b/drivers/pwm/Makefile > > @@ -43,6 +43,7 @@ obj-$(CONFIG_PWM_STM32) +=3D pwm-stm32.o > > obj-$(CONFIG_PWM_STM32_LP) +=3D pwm-stm32-lp.o > > obj-$(CONFIG_PWM_STMPE) +=3D pwm-stmpe.o > > obj-$(CONFIG_PWM_SUN4I) +=3D pwm-sun4i.o > > +obj-$(CONFIG_PWM_SUN8I) +=3D pwm-sun8i.o > > obj-$(CONFIG_PWM_TEGRA) +=3D pwm-tegra.o > > obj-$(CONFIG_PWM_TIECAP) +=3D pwm-tiecap.o > > obj-$(CONFIG_PWM_TIEHRPWM) +=3D pwm-tiehrpwm.o > > diff --git a/drivers/pwm/pwm-sun8i.c b/drivers/pwm/pwm-sun8i.c > > new file mode 100644 > > index 0000000..d8597e4 > > --- /dev/null > > +++ b/drivers/pwm/pwm-sun8i.c > > @@ -0,0 +1,418 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +// Copyright (C) 2018 Hao Zhang > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#define PWM_IRQ_ENABLE_REG 0x0000 > > +#define PCIE(ch) BIT(ch) > > + > > +#define PWM_IRQ_STATUS_REG 0x0004 > > +#define PIS(ch) BIT(ch) > > + > > +#define CAPTURE_IRQ_ENABLE_REG 0x0010 > > +#define CRIE(ch) BIT((ch) * 2) > > +#define CFIE(ch) BIT((ch) * 2 + 1) > > + > > +#define CAPTURE_IRQ_STATUS_REG 0x0014 > > +#define CRIS(ch) BIT((ch) * 2) > > +#define CFIS(ch) BIT((ch) * 2 + 1) > > + > > +#define CLK_CFG_REG(ch) (0x0020 + ((ch) >> 1) * 4) > > +#define CLK_SRC_SEL GENMASK(8, 7) > > +#define CLK_SRC_BYPASS_SEC BIT(6) > > +#define CLK_SRC_BYPASS_FIR BIT(5) > > +#define CLK_GATING BIT(4) > > +#define CLK_DIV_M GENMASK(3, 0) > > + > > +#define PWM_DZ_CTR_REG(ch) (0x0030 + ((ch) >> 1) * 4) > > +#define PWM_DZ_INTV GENMASK(15, 8) > > +#define PWM_DZ_EN BIT(0) > > + > > +#define PWM_ENABLE_REG 0x0040 > > +#define PWM_EN(ch) BIT(ch) > > + > > +#define CAPTURE_ENABLE_REG 0x0044 > > +#define CAP_EN(ch) BIT(ch) > > + > > +#define PWM_CTR_REG(ch) (0x0060 + (ch) * 0x20) > > +#define PWM_PERIOD_RDY BIT(11) > > +#define PWM_PUL_START BIT(10) > > +#define PWM_MODE BIT(9) > > +#define PWM_ACT_STA BIT(8) > > +#define PWM_PRESCAL_K GENMASK(7, 0) > > + > > +#define PWM_PERIOD_REG(ch) (0x0064 + (ch) * 0x20) > > +#define PWM_ENTIRE_CYCLE GENMASK(31, 16) > > +#define PWM_ACT_CYCLE GENMASK(15, 0) > > + > > +#define PWM_CNT_REG(ch) (0x0068 + (ch) * 0x20) > > +#define PWM_CNT_VAL GENMASK(15, 0) > > + > > +#define CAPTURE_CTR_REG(ch) (0x006c + (ch) * 0x20) > > +#define CAPTURE_CRLF BIT(2) > > +#define CAPTURE_CFLF BIT(1) > > +#define CAPINV BIT(0) > > + > > +#define CAPTURE_RISE_REG(ch) (0x0070 + (ch) * 0x20) > > +#define CAPTURE_CRLR GENMASK(15, 0) > > + > > +#define CAPTURE_FALL_REG(ch) (0x0074 + (ch) * 0x20) > > +#define CAPTURE_CFLR GENMASK(15, 0) > > + > > +struct sun8i_pwm_chip { > > + struct pwm_chip chip; > > + struct clk *clk; > > + void __iomem *base; > > + const struct sun8i_pwm_data *data; > > + struct regmap *regmap; > > +}; > > + > > +static struct sun8i_pwm_chip *to_sun8i_pwm_chip(struct pwm_chip *chip) > > +{ > > + return container_of(chip, struct sun8i_pwm_chip, chip); > > +} > > + > > +static u32 sun8i_pwm_read(struct sun8i_pwm_chip *sun8i_pwm, > > + unsigned long offset) > > +{ > > + u32 val; > > + > > + regmap_read(sun8i_pwm->regmap, offset, &val); > > + return val; > > +} > > + > > +static void sun8i_pwm_set_bit(struct sun8i_pwm_chip *sun8i_pwm, > > + unsigned long reg, u32 bit) > > +{ > > + regmap_update_bits(sun8i_pwm->regmap, reg, bit, bit); > > +} > > + > > +static void sun8i_pwm_clear_bit(struct sun8i_pwm_chip *sun8i_pwm, > > + unsigned long reg, u32 bit) > > +{ > > + regmap_update_bits(sun8i_pwm->regmap, reg, bit, 0); > > +} > > + > > +static void sun8i_pwm_set_value(struct sun8i_pwm_chip *sun8i_pwm, > > + unsigned long reg, u32 mask, u32 val) > > +{ > > + regmap_update_bits(sun8i_pwm->regmap, reg, mask, val); > > +} > > + > > +static void sun8i_pwm_set_polarity(struct sun8i_pwm_chip *chip, u32 ch= , > > + enum pwm_polarity polarity) > > +{ > > + if (polarity =3D=3D PWM_POLARITY_NORMAL) > > + sun8i_pwm_set_bit(chip, PWM_CTR_REG(ch), PWM_ACT_STA); > > + else > > + sun8i_pwm_clear_bit(chip, PWM_CTR_REG(ch), PWM_ACT_STA); > > +} > > + > > +static int sun8i_pwm_config(struct sun8i_pwm_chip *sun8i_pwm, u8 ch, > > + struct pwm_state *state) > > +{ > > + u64 clk_rate, clk_div, val; > > + u16 prescaler =3D 0; > > + u16 div_id =3D 0; > > + struct clk *clk; > > + bool is_clk; > > + int ret; > > + > > + clk_rate =3D clk_get_rate(sun8i_pwm->clk); > > + > > + /* check period and select clock source */ > > + val =3D state->period * clk_rate; > > + do_div(val, NSEC_PER_SEC); > > + is_clk =3D devm_clk_name_match(sun8i_pwm->clk, "mux-0"); > > + if (val <=3D 1 && is_clk) { > > + clk =3D devm_clk_get(sun8i_pwm->chip.dev, "mux-1"); > > + if (IS_ERR(clk)) { > > + dev_err(sun8i_pwm->chip.dev, > > + "Period expects a larger value\n"); > > + return -EINVAL; > > + } > > You should never try to get resources at this point. You should have > requested them already at ->probe() time. Otherwise, how are you going > to handle failures here? > Something wrong here, i will fix it, thanks :) > > + > > + clk_rate =3D clk_get_rate(clk); > > + val =3D state->period * clk_rate; > > + do_div(val, NSEC_PER_SEC); > > + if (val <=3D 1) { > > + dev_err(sun8i_pwm->chip.dev, > > + "Period expects a larger value\n"); > > + return -EINVAL; > > + } > > + > > + /* change clock source to "mux-1" */ > > + clk_disable_unprepare(sun8i_pwm->clk); > > + devm_clk_put(sun8i_pwm->chip.dev, sun8i_pwm->clk); > > + sun8i_pwm->clk =3D clk; > > + > > + ret =3D clk_prepare_enable(sun8i_pwm->clk); > > + if (ret) { > > + dev_err(sun8i_pwm->chip.dev, > > + "Failed to enable PWM clock\n"); > > + return ret; > > + } > > + > > + } else { > > + dev_err(sun8i_pwm->chip.dev, > > + "Period expects a larger value\n"); > > + return -EINVAL; > > + } > > + > > + is_clk =3D devm_clk_name_match(sun8i_pwm->clk, "mux-0"); > > + if (is_clk) > > + sun8i_pwm_set_value(sun8i_pwm, CLK_CFG_REG(ch), > > + CLK_SRC_SEL, 0 << 7); > > + else > > + sun8i_pwm_set_value(sun8i_pwm, CLK_CFG_REG(ch), > > + CLK_SRC_SEL, 1 << 7); > > + > > + dev_info(sun8i_pwm->chip.dev, "clock source freq:%lldHz\n", clk_r= ate); > > + > > + /* calculate and set prescaler, div table, PWM entire cycle */ > > + clk_div =3D val; > > + while (clk_div > 65535) { > > + prescaler++; > > + clk_div =3D val; > > + do_div(clk_div, 1U << div_id); > > + do_div(clk_div, prescaler + 1); > > + > > + if (prescaler =3D=3D 255) { > > + prescaler =3D 0; > > + div_id++; > > + if (div_id =3D=3D 9) { > > + dev_err(sun8i_pwm->chip.dev, > > + "unsupport period value\n"); > > + return -EINVAL; > > + } > > + } > > + } > > + > > + sun8i_pwm_set_value(sun8i_pwm, PWM_PERIOD_REG(ch), > > + PWM_ENTIRE_CYCLE, clk_div << 16); > > + sun8i_pwm_set_value(sun8i_pwm, PWM_CTR_REG(ch), > > + PWM_PRESCAL_K, prescaler << 0); > > + sun8i_pwm_set_value(sun8i_pwm, CLK_CFG_REG(ch), > > + CLK_DIV_M, div_id << 0); > > + > > + /* set duty cycle */ > > + val =3D state->period; > > + do_div(val, clk_div); > > + clk_div =3D state->duty_cycle; > > + do_div(clk_div, val); > > + if (clk_div > 65535) > > + clk_div =3D 65535; > > + > > + sun8i_pwm_set_value(sun8i_pwm, PWM_PERIOD_REG(ch), > > + PWM_ACT_CYCLE, clk_div << 0); > > + > > + return 0; > > +} > > + > > +static int sun8i_pwm_apply(struct pwm_chip *chip, struct pwm_device *p= wm, > > + struct pwm_state *state) > > +{ > > + int ret; > > + struct sun8i_pwm_chip *sun8i_pwm =3D to_sun8i_pwm_chip(chip); > > + struct pwm_state cstate; > > + > > + pwm_get_state(pwm, &cstate); > > + if (!cstate.enabled) { > > + ret =3D clk_prepare_enable(sun8i_pwm->clk); > > + if (ret) { > > + dev_err(chip->dev, "Failed to enable PWM clock\n"= ); > > + return ret; > > + } > > + } > > + > > + if ((cstate.period !=3D state->period) || > > + (cstate.duty_cycle !=3D state->duty_cycle)) { > > + ret =3D sun8i_pwm_config(sun8i_pwm, pwm->hwpwm, state); > > + if (ret) { > > + dev_err(chip->dev, "Failed to config PWM\n"); > > + return ret; > > + } > > + } > > So this isn't really how atomic is supposed to work. The whole point of > the single callback is to allow the driver to apply the changes in an > atomic way, which means that either everything is applied or nothing is > applied. > > That's not what you do here. In the above you can end up with an enabled > clock but the settings not being applied. Similarly sun8i_pwm_config() > can abort in a number of places, which would leave you with a half- > configured PWM channel. > > Instead, what you should be doing is precompute everything and check > that the configuration can be applied before touching any registers or > enabling clocks. Once you've validate the new state, you need to write > everything and there should be no more risk of failure. > Got it, it is useful for me ! > Thierry > -----BEGIN PGP SIGNATURE----- > > iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAlwb2B4ACgkQ3SOs138+ > s6GmgRAAwvTyhaFa0jWmUftz+0FS5JTXADm9VusyhbSlmHV7UNkqkQuLnaT1WoGi > gGW5ZMLA+wSPWrXqGsw1HuzLc57c1/eDQdxLmlqBz0Lwribn75+0kisEvV3CRCEL > P9UiTgMualhTe0DGKZmcHJvV56sEhx7b2WQ81sOn5nZvCP/iFTURp5WSyk+phAyb > ss9i5bjwuxC34wLC0wCVNvr2XlpdD7CTy0R/nap1Za2nf6Cm0TnzGGPIYki1/gM2 > fUtYT/zCvfGp+JG5+R2755XdomXzj0vmXD7Omv75eKzMb+HivolmLPJEfUiP8c+x > SElT/F/jIkwvdBzyeQ/sA8ybh4N0DVapnUxBjrUBLOMlrNDlh+ApjUOOpwylQBXQ > 6JKmjoHoBg31lK9QEPxoIoNP0FdZBr6+lAaZeQNx95PeICxD21IvPtuLEp4ksbX7 > fJsOxbkBzbIMpKuxLM3vkl89/O9IhPbVoyvMASCPMmdwAIH+LSy3SvIFWbGQ0nXS > gwjTzN4r1AWmdXIN+faT6khnNY64WoPd896AyJSQ5mQsl42IMKRi42kpfeN3/f8y > x4d07WSTCRB4v+OehJEVP2WJNsbI3EvtClbngn66xSac7kGSbg4cpbW0NzkrFj+T > dOG2p9wUMibPBXzS+V7JzTsDgR9JG2fzxG8PhEesaG/Bt32Hg0Y=3D > =3DS1Wz > -----END PGP SIGNATURE-----