Commit a9d887dc authored by Guru Das Srinagesh's avatar Guru Das Srinagesh Committed by Thierry Reding
Browse files

pwm: Convert period and duty cycle to u64 



Because period and duty cycle are defined as ints with units of
nanoseconds, the maximum time duration that can be set is limited to
~2.147 seconds. Change their definitions to u64 in the structs of the
PWM framework so that higher durations may be set.

Also use the right format specifiers in debug prints in both core.c,
pwm-stm32-lp.c as well as video/fbdev/ssd1307fb.c.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarGuru Das Srinagesh <gurus@codeaurora.org>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent a6733474

drivers/pwm/core.c

+7 −7
Original line number Diff line number Diff line
@@ -510,12 +510,12 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 
	    last->period > s2.period &&

	    last->period <= state->period)

		dev_warn(chip->dev,

			 ".apply didn't pick the best available period (requested: %u, applied: %u, possible: %u)\n",

			 ".apply didn't pick the best available period (requested: %llu, applied: %llu, possible: %llu)\n",

			 state->period, s2.period, last->period);



	if (state->enabled && state->period < s2.period)

		dev_warn(chip->dev,

			 ".apply is supposed to round down period (requested: %u, applied: %u)\n",

			 ".apply is supposed to round down period (requested: %llu, applied: %llu)\n",

			 state->period, s2.period);



	if (state->enabled &&
@@ -524,14 +524,14 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 
	    last->duty_cycle > s2.duty_cycle &&

	    last->duty_cycle <= state->duty_cycle)

		dev_warn(chip->dev,

			 ".apply didn't pick the best available duty cycle (requested: %u/%u, applied: %u/%u, possible: %u/%u)\n",

			 ".apply didn't pick the best available duty cycle (requested: %llu/%llu, applied: %llu/%llu, possible: %llu/%llu)\n",

			 state->duty_cycle, state->period,

			 s2.duty_cycle, s2.period,

			 last->duty_cycle, last->period);



	if (state->enabled && state->duty_cycle < s2.duty_cycle)

		dev_warn(chip->dev,

			 ".apply is supposed to round down duty_cycle (requested: %u/%u, applied: %u/%u)\n",

			 ".apply is supposed to round down duty_cycle (requested: %llu/%llu, applied: %llu/%llu)\n",

			 state->duty_cycle, state->period,

			 s2.duty_cycle, s2.period);
@@ -558,7 +558,7 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 
	    (s1.enabled && s1.period != last->period) ||

	    (s1.enabled && s1.duty_cycle != last->duty_cycle)) {

		dev_err(chip->dev,

			".apply is not idempotent (ena=%d pol=%d %u/%u) -> (ena=%d pol=%d %u/%u)\n",

			".apply is not idempotent (ena=%d pol=%d %llu/%llu) -> (ena=%d pol=%d %llu/%llu)\n",

			s1.enabled, s1.polarity, s1.duty_cycle, s1.period,

			last->enabled, last->polarity, last->duty_cycle,

			last->period);
@@ -1284,8 +1284,8 @@ static void pwm_dbg_show(struct pwm_chip *chip, struct seq_file *s) 
		if (state.enabled)

			seq_puts(s, " enabled");



		seq_printf(s, " period: %u ns", state.period);

		seq_printf(s, " duty: %u ns", state.duty_cycle);

		seq_printf(s, " period: %llu ns", state.period);

		seq_printf(s, " duty: %llu ns", state.duty_cycle);

		seq_printf(s, " polarity: %s",

			   state.polarity ? "inverse" : "normal");

drivers/pwm/pwm-stm32-lp.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int stm32_pwm_lp_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	do_div(div, NSEC_PER_SEC);

	if (!div) {

		/* Clock is too slow to achieve requested period. */

		dev_dbg(priv->chip.dev, "Can't reach %u ns\n",	state->period);

		dev_dbg(priv->chip.dev, "Can't reach %llu ns\n", state->period);

		return -EINVAL;

	}

drivers/pwm/sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static ssize_t period_show(struct device *child, 


	pwm_get_state(pwm, &state);



	return sprintf(buf, "%u\n", state.period);

	return sprintf(buf, "%llu\n", state.period);

}



static ssize_t period_store(struct device *child,
@@ -52,10 +52,10 @@ static ssize_t period_store(struct device *child, 
	struct pwm_export *export = child_to_pwm_export(child);

	struct pwm_device *pwm = export->pwm;

	struct pwm_state state;

	unsigned int val;

	u64 val;

	int ret;



	ret = kstrtouint(buf, 0, &val);

	ret = kstrtou64(buf, 0, &val);

	if (ret)

		return ret;
@@ -77,7 +77,7 @@ static ssize_t duty_cycle_show(struct device *child, 


	pwm_get_state(pwm, &state);



	return sprintf(buf, "%u\n", state.duty_cycle);

	return sprintf(buf, "%llu\n", state.duty_cycle);

}



static ssize_t duty_cycle_store(struct device *child,

drivers/video/fbdev/ssd1307fb.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par) 
		/* Enable the PWM */

		pwm_enable(par->pwm);



		dev_dbg(&par->client->dev, "Using PWM%d with a %dns period.\n",

		dev_dbg(&par->client->dev, "Using PWM%d with a %lluns period.\n",

			par->pwm->pwm, pwm_get_period(par->pwm));

	}

include/linux/pwm.h

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ enum pwm_polarity { 
 * current PWM hardware state.

 */

struct pwm_args {

	unsigned int period;

	u64 period;

	enum pwm_polarity polarity;

};
@@ -56,8 +56,8 @@ enum { 
 * @enabled: PWM enabled status

 */

struct pwm_state {

	unsigned int period;

	unsigned int duty_cycle;

	u64 period;

	u64 duty_cycle;

	enum pwm_polarity polarity;

	bool enabled;

};
@@ -107,13 +107,13 @@ static inline bool pwm_is_enabled(const struct pwm_device *pwm) 
	return state.enabled;

}



static inline void pwm_set_period(struct pwm_device *pwm, unsigned int period)

static inline void pwm_set_period(struct pwm_device *pwm, u64 period)

{

	if (pwm)

		pwm->state.period = period;

}



static inline unsigned int pwm_get_period(const struct pwm_device *pwm)

static inline u64 pwm_get_period(const struct pwm_device *pwm)

{

	struct pwm_state state;
@@ -128,7 +128,7 @@ static inline void pwm_set_duty_cycle(struct pwm_device *pwm, unsigned int duty) 
		pwm->state.duty_cycle = duty;

}



static inline unsigned int pwm_get_duty_cycle(const struct pwm_device *pwm)

static inline u64 pwm_get_duty_cycle(const struct pwm_device *pwm)

{

	struct pwm_state state;

CRA Git | Maintained and supported by SUSTech CRA and CCSE