From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Guru Das Srinagesh <gurus@codeaurora.org>
Cc: linux-pwm@vger.kernel.org,
Daniel Thompson <daniel.thompson@linaro.org>,
David Collins <collinsd@codeaurora.org>,
Arnd Bergmann <arnd@arndb.de>, Stephen Boyd <sboyd@kernel.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Guenter Roeck <linux@roeck-us.net>,
linux-kernel@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Dan Carpenter <dan.carpenter@oracle.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Joe Perches <joe@perches.com>,
Subbaraman Narayanamurthy <subbaram@codeaurora.org>,
Lee Jones <lee.jones@linaro.org>,
Fabio Estevam <festevam@gmail.com>,
linux-arm-kernel@lists.infradead.org,
NXP Linux Team <linux-imx@nxp.com>
Subject: Re: [PATCH v16 06/11] pwm: imx27: Use 64-bit division macro and function
Date: Thu, 2 Jul 2020 09:11:04 +0200 [thread overview]
Message-ID: <20200702071104.dbuwzqufezbmxwg7@pengutronix.de> (raw)
In-Reply-To: <bb43ff8ad9e0b9884722d85e51c8fdb3ef4154d1.1591136989.git.gurus@codeaurora.org>
[-- Attachment #1.1: Type: text/plain, Size: 4668 bytes --]
Hello,
On Tue, Jun 02, 2020 at 03:31:10PM -0700, Guru Das Srinagesh wrote:
> Since the PWM framework is switching struct pwm_state.period's
> datatype to u64, prepare for this transition by using
> DIV_ROUND_UP_ULL to handle a 64-bit dividend, and div64_u64 to handle a
> 64-bit divisor.
>
> Also handle a possible overflow in the calculation of period_cycles when
> both clk_rate and period are large numbers. This logic was unit-tested
> out by calculating period_cycles using both the existing logic and the
> proposed one, and the results are as below.
>
> ----------------------------------------------------------------------------
> clk_rate period existing proposed
> ----------------------------------------------------------------------------
> 1000000000 18446744073709551615 18446744072 18446744073000000000
> (U64_MAX)
> ----------------------------------------------------------------------------
> 1000000000 4294967291 4294967291 4294967291
> ----------------------------------------------------------------------------
>
> Overflow occurs in the first case with the existing logic, whereas the
> proposed logic handles it better, sacrificing some precision in a best-effort
> attempt to handle overflow. As for the second case where there are
> more typical values of period, the proposed logic handles that correctly
> too.
>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: NXP Linux Team <linux-imx@nxp.com>
> Signed-off-by: Guru Das Srinagesh <gurus@codeaurora.org>
> ---
> drivers/pwm/pwm-imx27.c | 48 +++++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 43 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pwm/pwm-imx27.c b/drivers/pwm/pwm-imx27.c
> index 732a6f3..147729d 100644
> --- a/drivers/pwm/pwm-imx27.c
> +++ b/drivers/pwm/pwm-imx27.c
> @@ -202,7 +202,7 @@ static void pwm_imx27_wait_fifo_slot(struct pwm_chip *chip,
> sr = readl(imx->mmio_base + MX3_PWMSR);
> fifoav = FIELD_GET(MX3_PWMSR_FIFOAV, sr);
> if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
> - period_ms = DIV_ROUND_UP(pwm_get_period(pwm),
> + period_ms = DIV_ROUND_UP_ULL(pwm_get_period(pwm),
> NSEC_PER_MSEC);
> msleep(period_ms);
>
> @@ -212,6 +212,45 @@ static void pwm_imx27_wait_fifo_slot(struct pwm_chip *chip,
> }
> }
>
> +static int pwm_imx27_calc_period_cycles(const struct pwm_state *state,
> + unsigned long clk_rate,
> + unsigned long *period_cycles)
> +{
> + u64 c = 0, c1, c2;
> +
> + c1 = clk_rate;
> + c2 = state->period;
> + if (c2 > c1) {
> + c2 = c1;
> + c1 = state->period;
> + }
> +
> + if (!c1 || !c2) {
> + pr_err("clk rate and period should be nonzero\n");
> + return -EINVAL;
> + }
> +
> + if (c2 <= div64_u64(U64_MAX, c1)) {
> + c = c1 * c2;
> + do_div(c, 1000000000);
> + } else if (c2 <= div64_u64(U64_MAX, div64_u64(c1, 1000))) {
> + do_div(c1, 1000);
> + c = c1 * c2;
> + do_div(c, 1000000);
> + } else if (c2 <= div64_u64(U64_MAX, div64_u64(c1, 1000000))) {
> + do_div(c1, 1000000);
> + c = c1 * c2;
> + do_div(c, 1000);
> + } else if (c2 <= div64_u64(U64_MAX, div64_u64(c1, 1000000000))) {
> + do_div(c1, 1000000000);
> + c = c1 * c2;
} else {
???
> + }
> +
> + *period_cycles = c;
> +
> + return 0;
> +}
> +
> static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm,
> const struct pwm_state *state)
> {
> @@ -226,10 +265,9 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm,
> pwm_get_state(pwm, &cstate);
>
> clkrate = clk_get_rate(imx->clk_per);
> - c = clkrate * state->period;
> -
> - do_div(c, NSEC_PER_SEC);
> - period_cycles = c;
> + ret = pwm_imx27_calc_period_cycles(state, clkrate, &period_cycles);
> + if (ret)
> + return ret;
I would expect this problem to be generic enough that it justifies a
function in pwm-core (or even more generic?).
Something like:
/*
* calculates *result = a * b / c.
* Returns false on overflow (and doesn't assign result in this
* case); true otherwise.
*/
static inline bool multdiv(u64 *result, u64 a, u64 b, u64 c)
I'd split this out in a separate patch though? (Or is imx27 the only
driver in this series with this problem?)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-02 7:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 22:31 [PATCH v16 00/11] Convert PWM period and duty cycle to u64 Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 01/11] drm/i915: Use 64-bit division macro Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 02/11] hwmon: pwm-fan: " Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 03/11] ir-rx51: " Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 04/11] pwm: clps711x: " Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 05/11] pwm: pwm-imx-tpm: " Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 06/11] pwm: imx27: Use 64-bit division macro and function Guru Das Srinagesh
2020-07-02 7:11 ` Uwe Kleine-König [this message]
[not found] ` <cover.1591135774.git.gurus@codeaurora.org>
2020-06-02 22:31 ` [PATCH v16 06/11] pwm: imx27: Use 64-bit division macro Guru Das Srinagesh
2020-06-02 22:34 ` Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 07/11] pwm: sifive: " Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 08/11] pwm: sun4i: Use nsecs_to_jiffies to avoid a division Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 09/11] backlight: pwm_bl: Use 64-bit division function Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 10/11] clk: pwm: " Guru Das Srinagesh
2020-06-02 22:31 ` [PATCH v16 11/11] pwm: core: Convert period and duty cycle to u64 Guru Das Srinagesh
2020-06-11 16:55 ` [PATCH v16 00/11] Convert PWM " Guru Das Srinagesh
2020-06-11 17:57 ` Lee Jones
2020-06-11 18:24 ` Thierry Reding
2020-06-11 18:31 ` Guru Das Srinagesh
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=20200702071104.dbuwzqufezbmxwg7@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=arnd@arndb.de \
--cc=collinsd@codeaurora.org \
--cc=dan.carpenter@oracle.com \
--cc=daniel.thompson@linaro.org \
--cc=festevam@gmail.com \
--cc=geert@linux-m68k.org \
--cc=gurus@codeaurora.org \
--cc=joe@perches.com \
--cc=kernel@pengutronix.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=subbaram@codeaurora.org \
--cc=thierry.reding@gmail.com \
/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).