platform/x86: thinkpad_acpi: Support for V9 DYTC platform profiles

Newer Thinkpad AMD platforms are using V9 DYTC and this changes the
profiles used for PSC mode. Add support for this update.
Tested on P14s G5 AMD

Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Link: https://lore.kernel.org/r/20250206193953.58365-1-mpearson-lenovo@squebb.ca
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index e7778ea41478ea96576c2975d7b5b3ef7c69fa41..99cdea723d32c79aa033e27978c0297558cff548 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -10331,6 +10331,10 @@ static struct ibm_struct proxsensor_driver_data = {
 #define DYTC_MODE_PSC_BALANCE  5  /* Default mode aka balanced */
 #define DYTC_MODE_PSC_PERFORM  7  /* High power mode aka performance */
 
+#define DYTC_MODE_PSCV9_LOWPOWER 1  /* Low power mode */
+#define DYTC_MODE_PSCV9_BALANCE  3  /* Default mode aka balanced */
+#define DYTC_MODE_PSCV9_PERFORM  4  /* High power mode aka performance */
+
 #define DYTC_ERR_MASK       0xF  /* Bits 0-3 in cmd result are the error result */
 #define DYTC_ERR_SUCCESS      1  /* CMD completed successful */
 
@@ -10351,6 +10355,10 @@ static int dytc_capabilities;
 static bool dytc_mmc_get_available;
 static int profile_force;
 
+static int platform_psc_profile_lowpower = DYTC_MODE_PSC_LOWPOWER;
+static int platform_psc_profile_balanced = DYTC_MODE_PSC_BALANCE;
+static int platform_psc_profile_performance = DYTC_MODE_PSC_PERFORM;
+
 static int convert_dytc_to_profile(int funcmode, int dytcmode,
                enum platform_profile_option *profile)
 {
@@ -10372,19 +10380,15 @@ static int convert_dytc_to_profile(int funcmode, int dytcmode,
                }
                return 0;
        case DYTC_FUNCTION_PSC:
-               switch (dytcmode) {
-               case DYTC_MODE_PSC_LOWPOWER:
+               if (dytcmode == platform_psc_profile_lowpower)
                        *profile = PLATFORM_PROFILE_LOW_POWER;
-                       break;
-               case DYTC_MODE_PSC_BALANCE:
+               else if (dytcmode == platform_psc_profile_balanced)
                        *profile =  PLATFORM_PROFILE_BALANCED;
-                       break;
-               case DYTC_MODE_PSC_PERFORM:
+               else if (dytcmode == platform_psc_profile_performance)
                        *profile =  PLATFORM_PROFILE_PERFORMANCE;
-                       break;
-               default: /* Unknown mode */
+               else
                        return -EINVAL;
-               }
+
                return 0;
        case DYTC_FUNCTION_AMT:
                /* For now return balanced. It's the closest we have to 'auto' */
@@ -10405,19 +10409,19 @@ static int convert_profile_to_dytc(enum platform_profile_option profile, int *pe
                if (dytc_capabilities & BIT(DYTC_FC_MMC))
                        *perfmode = DYTC_MODE_MMC_LOWPOWER;
                else if (dytc_capabilities & BIT(DYTC_FC_PSC))
-                       *perfmode = DYTC_MODE_PSC_LOWPOWER;
+                       *perfmode = platform_psc_profile_lowpower;
                break;
        case PLATFORM_PROFILE_BALANCED:
                if (dytc_capabilities & BIT(DYTC_FC_MMC))
                        *perfmode = DYTC_MODE_MMC_BALANCE;
                else if (dytc_capabilities & BIT(DYTC_FC_PSC))
-                       *perfmode = DYTC_MODE_PSC_BALANCE;
+                       *perfmode = platform_psc_profile_balanced;
                break;
        case PLATFORM_PROFILE_PERFORMANCE:
                if (dytc_capabilities & BIT(DYTC_FC_MMC))
                        *perfmode = DYTC_MODE_MMC_PERFORM;
                else if (dytc_capabilities & BIT(DYTC_FC_PSC))
-                       *perfmode = DYTC_MODE_PSC_PERFORM;
+                       *perfmode = platform_psc_profile_performance;
                break;
        default: /* Unknown profile */
                return -EOPNOTSUPP;
@@ -10611,6 +10615,7 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
        if (output & BIT(DYTC_QUERY_ENABLE_BIT))
                dytc_version = (output >> DYTC_QUERY_REV_BIT) & 0xF;
 
+       dbg_printk(TPACPI_DBG_INIT, "DYTC version %d\n", dytc_version);
        /* Check DYTC is enabled and supports mode setting */
        if (dytc_version < 5)
                return -ENODEV;
@@ -10649,6 +10654,11 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
                }
        } else if (dytc_capabilities & BIT(DYTC_FC_PSC)) { /* PSC MODE */
                pr_debug("PSC is supported\n");
+               if (dytc_version >= 9) { /* update profiles for DYTC 9 and up */
+                       platform_psc_profile_lowpower = DYTC_MODE_PSCV9_LOWPOWER;
+                       platform_psc_profile_balanced = DYTC_MODE_PSCV9_BALANCE;
+                       platform_psc_profile_performance = DYTC_MODE_PSCV9_PERFORM;
+               }
        } else {
                dbg_printk(TPACPI_DBG_INIT, "No DYTC support available\n");
                return -ENODEV;