Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62962873 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Greg Kroah-Hartman
Browse files

pwm: meson: fix handling of period/duty if greater than UINT_MAX 



[ Upstream commit 87a2cbf02d7701255f9fcca7e5bd864a7bb397cf ]

state->period/duty are of type u64, and if their value is greater than
UINT_MAX, then the cast to uint will cause problems. Fix this by
changing the type of the respective local variables to u64.

Fixes: b79c3670 ("pwm: meson: Don't duplicate the polarity internally")
Cc: stable@vger.kernel.org
Suggested-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7ae4671a

drivers/pwm/pwm-meson.c

+7 −7
Original line number Diff line number Diff line
@@ -163,8 +163,9 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, 
			  const struct pwm_state *state)

{

	struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm];

	unsigned int duty, period, pre_div, cnt, duty_cnt;

	unsigned int pre_div, cnt, duty_cnt;

	unsigned long fin_freq;

	u64 duty, period;



	duty = state->duty_cycle;

	period = state->period;
@@ -186,19 +187,19 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, 


	dev_dbg(meson->chip.dev, "fin_freq: %lu Hz\n", fin_freq);



	pre_div = div64_u64(fin_freq * (u64)period, NSEC_PER_SEC * 0xffffLL);

	pre_div = div64_u64(fin_freq * period, NSEC_PER_SEC * 0xffffLL);

	if (pre_div > MISC_CLK_DIV_MASK) {

		dev_err(meson->chip.dev, "unable to get period pre_div\n");

		return -EINVAL;

	}



	cnt = div64_u64(fin_freq * (u64)period, NSEC_PER_SEC * (pre_div + 1));

	cnt = div64_u64(fin_freq * period, NSEC_PER_SEC * (pre_div + 1));

	if (cnt > 0xffff) {

		dev_err(meson->chip.dev, "unable to get period cnt\n");

		return -EINVAL;

	}



	dev_dbg(meson->chip.dev, "period=%u pre_div=%u cnt=%u\n", period,

	dev_dbg(meson->chip.dev, "period=%llu pre_div=%u cnt=%u\n", period,

		pre_div, cnt);



	if (duty == period) {
@@ -211,14 +212,13 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, 
		channel->lo = cnt;

	} else {

		/* Then check is we can have the duty with the same pre_div */

		duty_cnt = div64_u64(fin_freq * (u64)duty,

				     NSEC_PER_SEC * (pre_div + 1));

		duty_cnt = div64_u64(fin_freq * duty, NSEC_PER_SEC * (pre_div + 1));

		if (duty_cnt > 0xffff) {

			dev_err(meson->chip.dev, "unable to get duty cycle\n");

			return -EINVAL;

		}



		dev_dbg(meson->chip.dev, "duty=%u pre_div=%u duty_cnt=%u\n",

		dev_dbg(meson->chip.dev, "duty=%llu pre_div=%u duty_cnt=%u\n",

			duty, pre_div, duty_cnt);



		channel->pre_div = pre_div;