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>,
"Rodrigo Vivi" <rodrigo.vivi@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 v8 06/17] pwm: lpss: Use pwm_lpss_restore() when restoring state on resume
Date: Sun, 30 Aug 2020 14:57:42 +0200 [thread overview]
Message-ID: <20200830125753.230420-7-hdegoede@redhat.com> (raw)
In-Reply-To: <20200830125753.230420-1-hdegoede@redhat.com>
Before this commit a suspend + resume of the LPSS PWM controller
would result in the controller being reset to its defaults of
output-freq = clock/256, duty-cycle=100%, until someone changes
to the output-freq and/or duty-cycle are made.
This problem has been masked so far because the main consumer
(the i915 driver) was always making duty-cycle changes on resume.
With the conversion of the i915 driver to the atomic PWM API the
driver now only disables/enables the PWM on suspend/resume leaving
the output-freq and duty as is, triggering this problem.
The LPSS PWM controller has a mechanism where the ctrl register value
and the actual base-unit and on-time-div values used are latched. When
software sets the SW_UPDATE bit then at the end of the current PWM cycle,
the new values from the ctrl-register will be latched into the actual
registers, and the SW_UPDATE bit will be cleared.
The problem is that before this commit our suspend/resume handling
consisted of simply saving the PWM ctrl register on suspend and
restoring it on resume, without setting the PWM_SW_UPDATE bit.
When the controller has lost its state over a suspend/resume and thus
has been reset to the defaults, just restoring the register is not
enough. We must also set the SW_UPDATE bit to tell the controller to
latch the restored values into the actual registers.
Fixing this problem is not as simple as just or-ing in the value which
is being restored with SW_UPDATE. If the PWM was enabled before we must
write the new settings + PWM_SW_UPDATE before setting PWM_ENABLE.
We must also wait for PWM_SW_UPDATE to become 0 again and depending on the
model we must do this either before or after the setting of PWM_ENABLE.
All the necessary logic for doing this is already present inside
pwm_lpss_apply(), so instead of duplicating this inside the resume
handler, this commit adds a new pwm_lpss_restore() helper which mirrors
pwm_lpss_apply() minus the runtime-pm reference handling (which we should
not change on resume).
This fixes the output-freq and duty-cycle being reset to their defaults
on resume.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v8:
- Drop optimization to skip restore if current ctrl reg is the same as our saved
ctrl reg value (because this causes issues on some devices)
- Simplify pwm_lpss_restore_state() to not rely on the current state
- Modify commit message to mention the new pwm_lpss_restore_state() helper
Changes in v6:
- Add a pwm_lpss_restore_state() helper for re-applying the PWM state on resume
Changes in v5:
- The changes to pwm_lpss_apply() are much cleaner now thanks to the new
pwm_lpss_prepare_enable() helper.
Changes in v3:
- This replaces the "pwm: lpss: Set SW_UPDATE bit when enabling the PWM"
patch from previous versions of this patch-set, which really was a hack
working around the resume issue which this patch fixes properly.
---
drivers/pwm/pwm-lpss.c | 40 +++++++++++++++++++++++++++++++++++++---
1 file changed, 37 insertions(+), 3 deletions(-)
diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
index 8a136ba2a583..9a7400c6fb6e 100644
--- a/drivers/pwm/pwm-lpss.c
+++ b/drivers/pwm/pwm-lpss.c
@@ -166,6 +166,25 @@ static int pwm_lpss_apply(struct pwm_chip *chip, struct pwm_device *pwm,
return ret;
}
+/*
+ * This is a mirror of pwm_lpss_apply() without relying on the current state
+ * (no pwm_is_enabled() calls) and without pm_runtime reference handling,
+ * for restoring the PWM state on resume.
+ */
+static int pwm_lpss_restore_state(struct pwm_lpss_chip *lpwm,
+ struct pwm_device *pwm,
+ const struct pwm_state *state)
+{
+ int ret = 0;
+
+ if (state->enabled)
+ ret = pwm_lpss_prepare_enable(lpwm, pwm, state, true);
+ else
+ pwm_lpss_write(pwm, pwm_lpss_read(pwm) & ~PWM_ENABLE);
+
+ return ret;
+}
+
static void pwm_lpss_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
struct pwm_state *state)
{
@@ -278,10 +297,25 @@ EXPORT_SYMBOL_GPL(pwm_lpss_suspend);
int pwm_lpss_resume(struct device *dev)
{
struct pwm_lpss_chip *lpwm = dev_get_drvdata(dev);
- int i;
+ struct pwm_device *pwm;
+ int i, ret;
- for (i = 0; i < lpwm->info->npwm; i++)
- writel(lpwm->saved_ctrl[i], lpwm->regs + i * PWM_SIZE + PWM);
+ for (i = 0; i < lpwm->info->npwm; i++) {
+ pwm = &lpwm->chip.pwms[i];
+
+ /*
+ * We cannot just blindly restore the old value here. Since we
+ * are changing the settings we must set SW_UPDATE and if the
+ * PWM was enabled before we must write the new settings +
+ * PWM_SW_UPDATE before setting PWM_ENABLE. We must also wait
+ * for PWM_SW_UPDATE to become 0 again and depending on the
+ * model we must do this either before or after the setting of
+ * PWM_ENABLE.
+ */
+ ret = pwm_lpss_restore_state(lpwm, pwm, &pwm->state);
+ if (ret)
+ dev_err(dev, "Error restoring state on resume\n");
+ }
return 0;
}
--
2.28.0
next prev parent reply other threads:[~2020-08-30 12:59 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-30 12:57 [PATCH v8 00/17] acpi/pwm/i915: Convert pwm-crc and i915 driver's PWM code to use the atomic PWM API Hans de Goede
2020-08-30 12:57 ` [PATCH v8 01/17] ACPI / LPSS: Resume Cherry Trail PWM controller in no-irq phase Hans de Goede
2020-08-30 12:57 ` [PATCH v8 02/17] ACPI / LPSS: Save Cherry Trail PWM ctx registers only once (at activation) Hans de Goede
2020-08-30 12:57 ` [PATCH v8 03/17] pwm: lpss: Fix off by one error in base_unit math in pwm_lpss_prepare() Hans de Goede
2020-08-31 11:01 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 04/17] pwm: lpss: Add range limit check for the base_unit register value Hans de Goede
2020-08-31 11:02 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 05/17] pwm: lpss: Add pwm_lpss_prepare_enable() helper Hans de Goede
2020-08-31 11:03 ` Thierry Reding
2020-08-30 12:57 ` Hans de Goede [this message]
2020-08-31 11:10 ` [PATCH v8 06/17] pwm: lpss: Use pwm_lpss_restore() when restoring state on resume Thierry Reding
2020-08-31 11:46 ` Hans de Goede
2020-08-31 13:15 ` Thierry Reding
2020-08-31 17:57 ` Hans de Goede
2020-09-01 8:09 ` Andy Shevchenko
2020-08-30 12:57 ` [PATCH v8 07/17] pwm: lpss: Always update state and set update bit Hans de Goede
2020-08-31 8:56 ` Andy Shevchenko
2020-08-31 11:50 ` Hans de Goede
2020-08-31 11:13 ` Thierry Reding
2020-08-31 11:26 ` Hans de Goede
2020-08-31 13:31 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 08/17] pwm: crc: Fix period / duty_cycle times being off by a factor of 256 Hans de Goede
2020-08-31 11:13 ` Thierry Reding
2020-08-31 11:14 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 09/17] pwm: crc: Fix off-by-one error in the clock-divider calculations Hans de Goede
2020-08-31 11:15 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 10/17] pwm: crc: Fix period changes not having any effect Hans de Goede
2020-08-31 11:15 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 11/17] pwm: crc: Enable/disable PWM output on enable/disable Hans de Goede
2020-08-31 11:16 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 12/17] pwm: crc: Implement apply() method to support the new atomic PWM API Hans de Goede
2020-08-31 11:17 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 13/17] pwm: crc: Implement get_state() method Hans de Goede
2020-08-31 11:18 ` Thierry Reding
2020-08-30 12:57 ` [PATCH v8 14/17] drm/i915: panel: Add get_vbt_pwm_freq() helper Hans de Goede
2020-08-30 12:57 ` [PATCH v8 15/17] drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller Hans de Goede
2020-08-30 12:57 ` [PATCH v8 16/17] drm/i915: panel: Honor the VBT PWM min setting " Hans de Goede
2020-08-30 12:57 ` [PATCH v8 17/17] drm/i915: panel: Use atomic PWM API " Hans de Goede
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=20200830125753.230420-7-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=rodrigo.vivi@intel.com \
--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 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).