[Public]
> -----Original Message-----
> From: Mark Pearson <mpearson-lenovo@xxxxxxxxx>
> Sent: Thursday, January 12, 2023 14:45
> To: mpearson-lenovo@xxxxxxxxx
> Cc: hdegoede@xxxxxxxxxx; Limonciello, Mario
> <Mario.Limonciello@xxxxxxx>; markgross@xxxxxxxxxx; platform-driver-
> x86@xxxxxxxxxxxxxxx
> Subject: [PATCH] platform/x86: thinkpad_acpi: Remove AMT enablement
>
This title really isn't accurate is it? AMT is still there, it's really more of a bug
fix for reporting the right profiles when AMT is active (which should be balanced).
> Recently AMT mode was enabled (somewhat unexpectedly) on the Lenovo
> Z13 platform. The FW is advertising it is available and the driver tries
> to use it - unfortunately it reports the profile mode incorrectly.
>
> Note, there is also some extra work needed to enable the dynamic aspect
> of AMT support that I will be following up with; but more testing is
> needed first. This patch just fixes things so the profiles are reported
> correctly.
>
> Signed-off-by: Mark Pearson <mpearson-lenovo@xxxxxxxxx>
With the title fixed.
Reviewed-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Suggest this to Cc to 6.1-stable as well as it's fixing a power profile reporting bug.
> ---
> drivers/platform/x86/thinkpad_acpi.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c
> b/drivers/platform/x86/thinkpad_acpi.c
> index 1195293b22fd..a95946800ae9 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -10311,9 +10311,11 @@ static DEFINE_MUTEX(dytc_mutex);
> static int dytc_capabilities;
> static bool dytc_mmc_get_available;
>
> -static int convert_dytc_to_profile(int dytcmode, enum
> platform_profile_option *profile)
> +static int convert_dytc_to_profile(int funcmode, int dytcmode,
> + enum platform_profile_option *profile)
> {
> - if (dytc_capabilities & BIT(DYTC_FC_MMC)) {
> + switch (funcmode) {
> + case DYTC_FUNCTION_MMC:
> switch (dytcmode) {
> case DYTC_MODE_MMC_LOWPOWER:
> *profile = PLATFORM_PROFILE_LOW_POWER;
> @@ -10329,8 +10331,7 @@ static int convert_dytc_to_profile(int dytcmode,
> enum platform_profile_option *p
> return -EINVAL;
> }
> return 0;
> - }
> - if (dytc_capabilities & BIT(DYTC_FC_PSC)) {
> + case DYTC_FUNCTION_PSC:
> switch (dytcmode) {
> case DYTC_MODE_PSC_LOWPOWER:
> *profile = PLATFORM_PROFILE_LOW_POWER;
> @@ -10344,6 +10345,14 @@ static int convert_dytc_to_profile(int dytcmode,
> enum platform_profile_option *p
> default: /* Unknown mode */
> return -EINVAL;
> }
> + return 0;
> + case DYTC_FUNCTION_AMT:
> + /* For now return balanced. It's the closest we have to 'auto'
> */
> + *profile = PLATFORM_PROFILE_BALANCED;
> + return 0;
> + default:
> + /* Unknown function */
> + return -EOPNOTSUPP;
> }
> return 0;
> }
> @@ -10492,6 +10501,7 @@ static int dytc_profile_set(struct
> platform_profile_handler *pprof,
> err =
> dytc_command(DYTC_SET_COMMAND(DYTC_FUNCTION_PSC, perfmode,
> 1), &output);
> if (err)
> goto unlock;
> +
> /* system supports AMT, activate it when on balanced */
> if (dytc_capabilities & BIT(DYTC_FC_AMT))
> dytc_control_amt(profile ==
> PLATFORM_PROFILE_BALANCED);
> @@ -10507,7 +10517,7 @@ static void dytc_profile_refresh(void)
> {
> enum platform_profile_option profile;
> int output, err = 0;
> - int perfmode;
> + int perfmode, funcmode;
>
> mutex_lock(&dytc_mutex);
> if (dytc_capabilities & BIT(DYTC_FC_MMC)) {
> @@ -10522,8 +10532,9 @@ static void dytc_profile_refresh(void)
> if (err)
> return;
>
> + funcmode = (output >> DYTC_GET_FUNCTION_BIT) & 0xF;
> perfmode = (output >> DYTC_GET_MODE_BIT) & 0xF;
> - convert_dytc_to_profile(perfmode, &profile);
> + convert_dytc_to_profile(funcmode, perfmode, &profile);
> if (profile != dytc_current_profile) {
> dytc_current_profile = profile;
> platform_profile_notify();
> --
> 2.39.0
