From: "Limonciello, Mario" <Mario.Limonciello@amd.com>
To: Mark Pearson <mpearson-lenovo@squebb.ca>
Cc: "hdegoede@redhat.com" <hdegoede@redhat.com>,
"markgross@kernel.org" <markgross@kernel.org>,
"platform-driver-x86@vger.kernel.org"
<platform-driver-x86@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: RE: [PATCH] platform/x86: thinkpad_acpi: Fix profile modes on Intel platforms
Date: Tue, 24 Jan 2023 15:42:02 +0000 [thread overview]
Message-ID: <MN0PR12MB6101116BB3A356A9A8E846B5E2C99@MN0PR12MB6101.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20230124153623.145188-1-mpearson-lenovo@squebb.ca>
[Public]
> -----Original Message-----
> From: Mark Pearson <mpearson-lenovo@squebb.ca>
> Sent: Tuesday, January 24, 2023 09:36
> To: mpearson-lenovo@squebb.ca
> Cc: hdegoede@redhat.com; markgross@kernel.org; Limonciello, Mario
> <Mario.Limonciello@amd.com>; platform-driver-x86@vger.kernel.org;
> stable@vger.kernel.org
> Subject: [PATCH] platform/x86: thinkpad_acpi: Fix profile modes on Intel
> platforms
>
> My last commit to fix profile mode displays on AMD platforms caused
> an issue on Intel platforms - sorry!
>
> In it I was reading the current functional mode (MMC, PSC, AMT) from
> the BIOS but didn't account for the fact that on some of our Intel
> platforms I use a different API which returns just the profile and not
> the functional mode.
>
> This commit fixes it so that on Intel platforms it knows the functional
> mode is always MMC.
>
> I also fixed a potential problem that a platform may try to set the mode
> for both MMC and PSC - which was incorrect.
>
> Tested on X1 Carbon 9 (Intel) and Z13 (AMD).
>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216963
> Fixes: fde5f74ccfc7 ("platform/x86: thinkpad_acpi: Fix profile mode display in
> AMT mode")
In order for this to go to stable, it needs this tag in the commit message and not
just CC stable in the git send-email command.
(no need to respin for this reason, patchwork or b4 should pick it up when Hans grabs it)
Cc: stable@vger.kernel.org
>
> Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> drivers/platform/x86/thinkpad_acpi.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c
> b/drivers/platform/x86/thinkpad_acpi.c
> index a95946800ae9..6668d472df39 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -10496,8 +10496,7 @@ static int dytc_profile_set(struct
> platform_profile_handler *pprof,
> if (err)
> goto unlock;
> }
> - }
> - if (dytc_capabilities & BIT(DYTC_FC_PSC)) {
> + } else if (dytc_capabilities & BIT(DYTC_FC_PSC)) {
> err =
> dytc_command(DYTC_SET_COMMAND(DYTC_FUNCTION_PSC, perfmode,
> 1), &output);
> if (err)
> goto unlock;
> @@ -10525,14 +10524,16 @@ static void dytc_profile_refresh(void)
> err = dytc_command(DYTC_CMD_MMC_GET,
> &output);
> else
> err = dytc_cql_command(DYTC_CMD_GET, &output);
> - } else if (dytc_capabilities & BIT(DYTC_FC_PSC))
> + funcmode = DYTC_FUNCTION_MMC;
> + } else if (dytc_capabilities & BIT(DYTC_FC_PSC)) {
> err = dytc_command(DYTC_CMD_GET, &output);
> -
> + /*Check if we are PSC mode, or have AMT enabled */
> + funcmode = (output >> DYTC_GET_FUNCTION_BIT) & 0xF;
> + }
> mutex_unlock(&dytc_mutex);
> if (err)
> return;
>
> - funcmode = (output >> DYTC_GET_FUNCTION_BIT) & 0xF;
> perfmode = (output >> DYTC_GET_MODE_BIT) & 0xF;
> convert_dytc_to_profile(funcmode, perfmode, &profile);
> if (profile != dytc_current_profile) {
> --
> 2.38.1
next prev parent reply other threads:[~2023-01-24 15:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 15:36 [PATCH] platform/x86: thinkpad_acpi: Fix profile modes on Intel platforms Mark Pearson
2023-01-24 15:42 ` Limonciello, Mario [this message]
2023-01-24 16:18 ` Greg KH
2023-01-25 11:49 ` 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=MN0PR12MB6101116BB3A356A9A8E846B5E2C99@MN0PR12MB6101.namprd12.prod.outlook.com \
--to=mario.limonciello@amd.com \
--cc=hdegoede@redhat.com \
--cc=markgross@kernel.org \
--cc=mpearson-lenovo@squebb.ca \
--cc=platform-driver-x86@vger.kernel.org \
--cc=stable@vger.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;
as well as URLs for NNTP newsgroup(s).