All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Jani Nikula" <jani.nikula@linux.intel.com>,
	"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
	"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	"Rafael J . Wysocki" <rjw@rjwysocki.net>,
	"Len Brown" <lenb@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>,
	linux-pwm@vger.kernel.org,
	intel-gfx <intel-gfx@lists.freedesktop.org>,
	dri-devel@lists.freedesktop.org,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	linux-acpi@vger.kernel.org
Subject: [PATCH v2 07/15] pwm: crc: Fix off-by-one error in the clock-divider calculations
Date: Sun,  7 Jun 2020 20:18:32 +0200	[thread overview]
Message-ID: <20200607181840.13536-8-hdegoede@redhat.com> (raw)
In-Reply-To: <20200607181840.13536-1-hdegoede@redhat.com>

The CRC PWM controller has a clock-divider which divides the clock with
a value between 1-128. But as can seen from the PWM_DIV_CLK_xxx
defines, this range maps to a register value of 0-127.

So after calculating the clock-divider we must subtract 1 to get the
register value, unless the requested frequency was so high that the
calculation has already resulted in a (rounded) divider value of 0.

Note that before this fix, setting a period of PWM_MAX_PERIOD_NS which
corresponds to the max. divider value of 128 could have resulted in a
bug where the code would use 128 as divider-register value which would
have resulted in an actual divider value of 0 (and the enable bit being
set). A rounding error stopped this bug from actually happen. This
same rounding error means that after the subtraction of 1 it is impossible
to set the divider to 128. Also bump PWM_MAX_PERIOD_NS by 1 ns to allow
setting a divider of 128 (register-value 127).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/pwm/pwm-crc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pwm/pwm-crc.c b/drivers/pwm/pwm-crc.c
index 43fc912c1fe9..5ba2a65c524c 100644
--- a/drivers/pwm/pwm-crc.c
+++ b/drivers/pwm/pwm-crc.c
@@ -22,7 +22,7 @@
 #define PWM_MAX_LEVEL		0xFF
 
 #define PWM_BASE_CLK_MHZ	6	/* 6 MHz */
-#define PWM_MAX_PERIOD_NS	5461333	/* 183 Hz */
+#define PWM_MAX_PERIOD_NS	5461334	/* 183 Hz */
 
 #define NSEC_PER_MHZ		1000
 
@@ -75,6 +75,9 @@ static int crc_pwm_config(struct pwm_chip *c, struct pwm_device *pwm,
 		/* changing the clk divisor, need to disable fisrt */
 		crc_pwm_disable(c, pwm);
 		clk_div = PWM_BASE_CLK_MHZ * period_ns / (256 * NSEC_PER_MHZ);
+		/* clk_div 1 - 128, maps to register values 0-127 */
+		if (clk_div > 0)
+			clk_div--;
 
 		regmap_write(crc_pwm->regmap, PWM0_CLK_DIV,
 					clk_div | PWM_OUTPUT_ENABLE);
-- 
2.26.2


WARNING: multiple messages have this Message-ID (diff)
From: Hans de Goede <hdegoede@redhat.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Jani Nikula" <jani.nikula@linux.intel.com>,
	"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
	"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	"Rafael J . Wysocki" <rjw@rjwysocki.net>,
	"Len Brown" <lenb@kernel.org>
Cc: linux-pwm@vger.kernel.org, linux-acpi@vger.kernel.org,
	intel-gfx <intel-gfx@lists.freedesktop.org>,
	dri-devel@lists.freedesktop.org,
	Hans de Goede <hdegoede@redhat.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH v2 07/15] pwm: crc: Fix off-by-one error in the clock-divider calculations
Date: Sun,  7 Jun 2020 20:18:32 +0200	[thread overview]
Message-ID: <20200607181840.13536-8-hdegoede@redhat.com> (raw)
In-Reply-To: <20200607181840.13536-1-hdegoede@redhat.com>

The CRC PWM controller has a clock-divider which divides the clock with
a value between 1-128. But as can seen from the PWM_DIV_CLK_xxx
defines, this range maps to a register value of 0-127.

So after calculating the clock-divider we must subtract 1 to get the
register value, unless the requested frequency was so high that the
calculation has already resulted in a (rounded) divider value of 0.

Note that before this fix, setting a period of PWM_MAX_PERIOD_NS which
corresponds to the max. divider value of 128 could have resulted in a
bug where the code would use 128 as divider-register value which would
have resulted in an actual divider value of 0 (and the enable bit being
set). A rounding error stopped this bug from actually happen. This
same rounding error means that after the subtraction of 1 it is impossible
to set the divider to 128. Also bump PWM_MAX_PERIOD_NS by 1 ns to allow
setting a divider of 128 (register-value 127).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/pwm/pwm-crc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pwm/pwm-crc.c b/drivers/pwm/pwm-crc.c
index 43fc912c1fe9..5ba2a65c524c 100644
--- a/drivers/pwm/pwm-crc.c
+++ b/drivers/pwm/pwm-crc.c
@@ -22,7 +22,7 @@
 #define PWM_MAX_LEVEL		0xFF
 
 #define PWM_BASE_CLK_MHZ	6	/* 6 MHz */
-#define PWM_MAX_PERIOD_NS	5461333	/* 183 Hz */
+#define PWM_MAX_PERIOD_NS	5461334	/* 183 Hz */
 
 #define NSEC_PER_MHZ		1000
 
@@ -75,6 +75,9 @@ static int crc_pwm_config(struct pwm_chip *c, struct pwm_device *pwm,
 		/* changing the clk divisor, need to disable fisrt */
 		crc_pwm_disable(c, pwm);
 		clk_div = PWM_BASE_CLK_MHZ * period_ns / (256 * NSEC_PER_MHZ);
+		/* clk_div 1 - 128, maps to register values 0-127 */
+		if (clk_div > 0)
+			clk_div--;
 
 		regmap_write(crc_pwm->regmap, PWM0_CLK_DIV,
 					clk_div | PWM_OUTPUT_ENABLE);
-- 
2.26.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Hans de Goede <hdegoede@redhat.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Jani Nikula" <jani.nikula@linux.intel.com>,
	"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
	"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	"Rafael J . Wysocki" <rjw@rjwysocki.net>,
	"Len Brown" <lenb@kernel.org>
Cc: linux-pwm@vger.kernel.org, linux-acpi@vger.kernel.org,
	intel-gfx <intel-gfx@lists.freedesktop.org>,
	dri-devel@lists.freedesktop.org,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [Intel-gfx] [PATCH v2 07/15] pwm: crc: Fix off-by-one error in the clock-divider calculations
Date: Sun,  7 Jun 2020 20:18:32 +0200	[thread overview]
Message-ID: <20200607181840.13536-8-hdegoede@redhat.com> (raw)
In-Reply-To: <20200607181840.13536-1-hdegoede@redhat.com>

The CRC PWM controller has a clock-divider which divides the clock with
a value between 1-128. But as can seen from the PWM_DIV_CLK_xxx
defines, this range maps to a register value of 0-127.

So after calculating the clock-divider we must subtract 1 to get the
register value, unless the requested frequency was so high that the
calculation has already resulted in a (rounded) divider value of 0.

Note that before this fix, setting a period of PWM_MAX_PERIOD_NS which
corresponds to the max. divider value of 128 could have resulted in a
bug where the code would use 128 as divider-register value which would
have resulted in an actual divider value of 0 (and the enable bit being
set). A rounding error stopped this bug from actually happen. This
same rounding error means that after the subtraction of 1 it is impossible
to set the divider to 128. Also bump PWM_MAX_PERIOD_NS by 1 ns to allow
setting a divider of 128 (register-value 127).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/pwm/pwm-crc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pwm/pwm-crc.c b/drivers/pwm/pwm-crc.c
index 43fc912c1fe9..5ba2a65c524c 100644
--- a/drivers/pwm/pwm-crc.c
+++ b/drivers/pwm/pwm-crc.c
@@ -22,7 +22,7 @@
 #define PWM_MAX_LEVEL		0xFF
 
 #define PWM_BASE_CLK_MHZ	6	/* 6 MHz */
-#define PWM_MAX_PERIOD_NS	5461333	/* 183 Hz */
+#define PWM_MAX_PERIOD_NS	5461334	/* 183 Hz */
 
 #define NSEC_PER_MHZ		1000
 
@@ -75,6 +75,9 @@ static int crc_pwm_config(struct pwm_chip *c, struct pwm_device *pwm,
 		/* changing the clk divisor, need to disable fisrt */
 		crc_pwm_disable(c, pwm);
 		clk_div = PWM_BASE_CLK_MHZ * period_ns / (256 * NSEC_PER_MHZ);
+		/* clk_div 1 - 128, maps to register values 0-127 */
+		if (clk_div > 0)
+			clk_div--;
 
 		regmap_write(crc_pwm->regmap, PWM0_CLK_DIV,
 					clk_div | PWM_OUTPUT_ENABLE);
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-06-07 18:19 UTC|newest]

Thread overview: 116+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-07 18:18 [PATCH v2 00/15] pwm/i915: Convert pwm-crc and i915 driver's PWM code to use the atomic PWM API Hans de Goede
2020-06-07 18:18 ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18 ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 01/15] ACPI / LPSS: Resume Cherry Trail PWM controller in no-irq phase Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 02/15] ACPI / LPSS: Save Cherry Trail PWM ctx registers only once (at activation) Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 03/15] pwm: lpss: Add range limit check for the base_unit register value Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-08  3:50   ` Andy Shevchenko
2020-06-08  3:50     ` [Intel-gfx] " Andy Shevchenko
2020-06-08  3:50     ` Andy Shevchenko
2020-06-08 11:07     ` Hans de Goede
2020-06-08 11:07       ` [Intel-gfx] " Hans de Goede
2020-06-08 11:07       ` Hans de Goede
2020-06-08 12:51       ` Andy Shevchenko
2020-06-08 12:51         ` [Intel-gfx] " Andy Shevchenko
2020-06-08 12:51         ` Andy Shevchenko
2020-06-08 12:51         ` Andy Shevchenko
2020-06-08 14:19         ` Hans de Goede
2020-06-08 14:19           ` [Intel-gfx] " Hans de Goede
2020-06-08 14:19           ` Hans de Goede
2020-06-11 22:12       ` Uwe Kleine-König
2020-06-11 22:12         ` [Intel-gfx] " Uwe Kleine-König
2020-06-11 22:12         ` Uwe Kleine-König
2020-06-12 11:57         ` Andy Shevchenko
2020-06-12 11:57           ` [Intel-gfx] " Andy Shevchenko
2020-06-12 11:57           ` Andy Shevchenko
2020-06-13 20:50           ` Uwe Kleine-König
2020-06-13 20:50             ` [Intel-gfx] " Uwe Kleine-König
2020-06-13 20:50             ` Uwe Kleine-König
2020-06-07 18:18 ` [PATCH v2 04/15] pwm: lpss: Fix off by one error in base_unit math in pwm_lpss_prepare() Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-08  3:55   ` Andy Shevchenko
2020-06-08  3:55     ` [Intel-gfx] " Andy Shevchenko
2020-06-08  3:55     ` Andy Shevchenko
2020-06-08 11:13     ` Hans de Goede
2020-06-08 11:13       ` [Intel-gfx] " Hans de Goede
2020-06-08 11:13       ` Hans de Goede
2020-06-08 11:13       ` Hans de Goede
2020-06-08 12:55       ` Andy Shevchenko
2020-06-08 12:55         ` [Intel-gfx] " Andy Shevchenko
2020-06-08 12:55         ` Andy Shevchenko
2020-06-07 18:18 ` [PATCH v2 05/15] pwm: lpss: Set SW_UPDATE bit when enabling the PWM Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 06/15] pwm: crc: Fix period / duty_cycle times being off by a factor of 256 Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-09 11:29   ` Andy Shevchenko
2020-06-09 11:29     ` [Intel-gfx] " Andy Shevchenko
2020-06-09 11:29     ` Andy Shevchenko
2020-06-09 13:45     ` Hans de Goede
2020-06-09 13:45       ` [Intel-gfx] " Hans de Goede
2020-06-09 13:45       ` Hans de Goede
2020-06-07 18:18 ` Hans de Goede [this message]
2020-06-07 18:18   ` [Intel-gfx] [PATCH v2 07/15] pwm: crc: Fix off-by-one error in the clock-divider calculations Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 08/15] pwm: crc: Fix period changes not having any effect Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 09/15] pwm: crc: Enable/disable PWM output on enable/disable Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-09 11:31   ` Andy Shevchenko
2020-06-09 11:31     ` [Intel-gfx] " Andy Shevchenko
2020-06-09 11:31     ` Andy Shevchenko
2020-06-11 22:20   ` Uwe Kleine-König
2020-06-11 22:20     ` [Intel-gfx] " Uwe Kleine-König
2020-06-11 22:20     ` Uwe Kleine-König
2020-06-12 16:59     ` Hans de Goede
2020-06-12 16:59       ` [Intel-gfx] " Hans de Goede
2020-06-12 16:59       ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 10/15] pwm: crc: Implement apply() method to support the new atomic PWM API Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-09 11:32   ` Andy Shevchenko
2020-06-09 11:32     ` [Intel-gfx] " Andy Shevchenko
2020-06-09 11:32     ` Andy Shevchenko
2020-06-09 13:44     ` Hans de Goede
2020-06-09 13:44       ` [Intel-gfx] " Hans de Goede
2020-06-09 13:44       ` Hans de Goede
2020-06-09 13:50       ` Andy Shevchenko
2020-06-09 13:50         ` [Intel-gfx] " Andy Shevchenko
2020-06-09 13:50         ` Andy Shevchenko
2020-06-07 18:18 ` [PATCH v2 11/15] pwm: crc: Implement get_state() method Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-09 11:32   ` Andy Shevchenko
2020-06-09 11:32     ` [Intel-gfx] " Andy Shevchenko
2020-06-09 11:32     ` Andy Shevchenko
2020-06-11 21:37   ` Uwe Kleine-König
2020-06-11 21:37     ` [Intel-gfx] " Uwe Kleine-König
2020-06-11 21:37     ` Uwe Kleine-König
2020-06-12 17:00     ` Hans de Goede
2020-06-12 17:00       ` [Intel-gfx] " Hans de Goede
2020-06-12 17:00       ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 12/15] drm/i915: panel: Add get_vbt_pwm_freq() helper Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 13/15] drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 14/15] drm/i915: panel: Honor the VBT PWM min setting " Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:18 ` [PATCH v2 15/15] drm/i915: panel: Use atomic PWM API " Hans de Goede
2020-06-07 18:18   ` [Intel-gfx] " Hans de Goede
2020-06-07 18:18   ` Hans de Goede
2020-06-07 18:28 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for pwm/i915: Convert pwm-crc and i915 driver's PWM code to use the atomic PWM API Patchwork
2020-06-07 18:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-06-07 19:44 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

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=20200607181840.13536-8-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=thierry.reding@gmail.com \
    --cc=u.kleine-koenig@pengutronix.de \
    --cc=ville.syrjala@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.