From: Hans de Goede <hdegoede@redhat.com>
To: "Johannes Stezenbach" <js@sig21.net>,
"Takashi Iwai" <tiwai@suse.de>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Andy Shevchenko" <andy@kernel.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"H . Peter Anvin" <hpa@zytor.com>,
"Michael Turquette" <mturquette@baylibre.com>,
"Stephen Boyd" <sboyd@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>,
platform-driver-x86@vger.kernel.org, x86@kernel.org,
linux-clk@vger.kernel.org
Subject: [PATCH v2 4/5] platform/x86: pmc_atom: Check state of PMC clocks on s2idle
Date: Sun, 7 Jan 2024 15:03:09 +0100 [thread overview]
Message-ID: <20240107140310.46512-5-hdegoede@redhat.com> (raw)
In-Reply-To: <20240107140310.46512-1-hdegoede@redhat.com>
Extend the s2idle check with checking that none of the PMC clocks
is in the forced-on state. If one of the clocks is in forced on
state then S0i3 cannot be reached.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
- Drop the PMC_CLK_* defines these are defined in
include/linux/platform_data/x86/pmc_atom.h now
- Drop duplicated "pmc_atom: " prefix from pr_err() message
---
drivers/platform/x86/pmc_atom.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
index 81ad66117365..d04f635c4075 100644
--- a/drivers/platform/x86/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
@@ -477,6 +477,7 @@ static void pmc_s2idle_check(void)
u32 func_dis, func_dis_2;
u32 d3_sts_0, d3_sts_1;
u32 false_pos_sts_0, false_pos_sts_1;
+ int i;
func_dis = pmc_reg_read(pmc, PMC_FUNC_DIS);
func_dis_2 = pmc_reg_read(pmc, PMC_FUNC_DIS_2);
@@ -504,6 +505,16 @@ static void pmc_s2idle_check(void)
/* High part */
pmc_dev_state_check(d3_sts_1, m->d3_sts_1, func_dis_2, m->func_dis_2, false_pos_sts_1);
+
+ /* Check PMC clocks */
+ for (i = 0; i < PMC_CLK_NUM; i++) {
+ u32 ctl = pmc_reg_read(pmc, PMC_CLK_CTL_OFFSET + 4 * i);
+
+ if ((ctl & PMC_MASK_CLK_CTL) != PMC_CLK_CTL_FORCE_ON)
+ continue;
+
+ pr_err("clock %d is ON prior to freeze (ctl 0x%08x)\n", i, ctl);
+ }
}
static struct acpi_s2idle_dev_ops pmc_s2idle_ops = {
--
2.43.0
next prev parent reply other threads:[~2024-01-07 14:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-07 14:03 [PATCH v2 0/5] x86: atom-punit/-pmc s2idle device state checks Hans de Goede
2024-01-07 14:03 ` [PATCH v2 1/5] clk: x86: Move clk-pmc-atom register defines to include/linux/platform_data/x86/pmc_atom.h Hans de Goede
2024-01-08 10:58 ` Ilpo Järvinen
2024-01-08 23:33 ` Stephen Boyd
2024-01-07 14:03 ` [PATCH v2 2/5] platform/x86: pmc_atom: Annotate d3_sts register bit defines Hans de Goede
2024-01-07 14:03 ` [PATCH v2 3/5] platform/x86: pmc_atom: Check state of PMC managed devices on s2idle Hans de Goede
2024-01-08 11:18 ` Ilpo Järvinen
2024-01-08 12:25 ` Hans de Goede
2024-01-08 12:38 ` Hans de Goede
2024-01-07 14:03 ` Hans de Goede [this message]
2024-01-08 11:27 ` [PATCH v2 4/5] platform/x86: pmc_atom: Check state of PMC clocks " Ilpo Järvinen
2024-01-08 12:31 ` Hans de Goede
2024-01-07 14:03 ` [PATCH v2 5/5] x86/platform/atom: Check state of Punit managed devices " Hans de Goede
2024-01-08 11:39 ` Ilpo Järvinen
2024-01-07 16:09 ` [PATCH v2 0/5] x86: atom-punit/-pmc s2idle device state checks Borislav Petkov
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=20240107140310.46512-5-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=andy@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=js@sig21.net \
--cc=linux-clk@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mturquette@baylibre.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=sboyd@kernel.org \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.de \
--cc=x86@kernel.org \
/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