platform/x86: thinkpad-acpi: profile capabilities as integer
PATCH 1/4 platform/x86: thinkpad-acpi: profile capabilities as integer
Currently the active mode (PSC/MMC) is stored in an enum and queried throughout the driver.
Other driver changes will enumerate additional submodes that are relevant to be tracked, so instead track PSC/MMC in a single integer variable.
--- drivers/platform/x86/thinkpad_acpi.c | 45 +++++++++++----------------- 1 file changed, 18 insertions(+), 27 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +18 -27
@@ -10299,21 +10299,15 @@ static struct ibm_struct proxsensor_driver_data = {#define DYTC_DISABLE_CQL DYTC_SET_COMMAND(DYTC_FUNCTION_CQL, DYTC_MODE_MMC_BALANCE, 0)#define DYTC_ENABLE_CQL DYTC_SET_COMMAND(DYTC_FUNCTION_CQL, DYTC_MODE_MMC_BALANCE, 1) -enum dytc_profile_funcmode { -DYTC_FUNCMODE_NONE =0 , -DYTC_FUNCMODE_MMC , -DYTC_FUNCMODE_PSC , -}; - -static enum dytc_profile_funcmode dytc_profile_available;static enum platform_profile_option dytc_current_profile;static atomic_t dytc_ignore_event =ATOMIC_INIT (0 );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) { -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) { +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {switch (dytcmode) {case DYTC_MODE_MMC_LOWPOWER : *profile =PLATFORM_PROFILE_LOW_POWER ;
@@ -10330,7 +10324,7 @@ static int convert_dytc_to_profile(int dytcmode, enum platform_profile_option *p }return 0 ; } -if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) { +if (dytc_capabilities &BIT (DYTC_FC_PSC )) {switch (dytcmode) {case DYTC_MODE_PSC_LOWPOWER : *profile =PLATFORM_PROFILE_LOW_POWER ;
@@ -10352,21 +10346,21 @@ static int convert_profile_to_dytc(enum platform_profile_option profile, int *pe {switch (profile) {case PLATFORM_PROFILE_LOW_POWER : -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) +if (dytc_capabilities &BIT (DYTC_FC_MMC )) *perfmode =DYTC_MODE_MMC_LOWPOWER ; -else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) +else if (dytc_capabilities &BIT (DYTC_FC_PSC )) *perfmode =DYTC_MODE_PSC_LOWPOWER ;break ;case PLATFORM_PROFILE_BALANCED : -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) +if (dytc_capabilities &BIT (DYTC_FC_MMC )) *perfmode =DYTC_MODE_MMC_BALANCE ; -else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) +else if (dytc_capabilities &BIT (DYTC_FC_PSC )) *perfmode =DYTC_MODE_PSC_BALANCE ;break ;case PLATFORM_PROFILE_PERFORMANCE : -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) +if (dytc_capabilities &BIT (DYTC_FC_MMC )) *perfmode =DYTC_MODE_MMC_PERFORM ; -else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) +else if (dytc_capabilities &BIT (DYTC_FC_PSC )) *perfmode =DYTC_MODE_PSC_PERFORM ;break ;default :/* Unknown profile */
@@ -10445,7 +10439,7 @@ static int dytc_profile_set(struct platform_profile_handler *pprof,if (err) goto unlock; -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) { +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {if (profile ==PLATFORM_PROFILE_BALANCED ) {/* * To get back to balanced mode we need to issue a reset command.
@@ -10464,7 +10458,7 @@ static int dytc_profile_set(struct platform_profile_handler *pprof, goto unlock; } } -if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) { +if (dytc_capabilities &BIT (DYTC_FC_PSC )) { err =dytc_command (DYTC_SET_COMMAND (DYTC_FUNCTION_PSC , perfmode,1 ), &output);if (err) goto unlock;
@@ -10483,12 +10477,12 @@ static void dytc_profile_refresh(void)int perfmode;mutex_lock (&dytc_mutex); -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) { +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {if (dytc_mmc_get_available) err =dytc_command (DYTC_CMD_MMC_GET , &output);else err =dytc_cql_command (DYTC_CMD_GET , &output); - }else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) + }else if (dytc_capabilities &BIT (DYTC_FC_PSC )) err =dytc_command (DYTC_CMD_GET , &output);mutex_unlock (&dytc_mutex);
@@ -10517,7 +10511,6 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)set_bit (PLATFORM_PROFILE_BALANCED , dytc_profile.choices);set_bit (PLATFORM_PROFILE_PERFORMANCE , dytc_profile.choices); - dytc_profile_available =DYTC_FUNCMODE_NONE ; err =dytc_command (DYTC_CMD_QUERY , &output);if (err)return err;
@@ -10530,13 +10523,12 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)return -ENODEV ;/* Check what capabilities are supported */ - err =dytc_command (DYTC_CMD_FUNC_CAP , &output); + err =dytc_command (DYTC_CMD_FUNC_CAP , &dytc_capabilities);if (err)return err; -if (output &BIT (DYTC_FC_MMC )) {/* MMC MODE */ - dytc_profile_available =DYTC_FUNCMODE_MMC ; - +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {/* MMC MODE */ +pr_debug ("MMC is supported\n" );/* * Check if MMC_GET functionality available * Version > 6 and return success from MMC_GET command
@@ -10547,8 +10539,8 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)if (!err && ((output &DYTC_ERR_MASK ) ==DYTC_ERR_SUCCESS )) dytc_mmc_get_available = true; } - }else if (output &BIT (DYTC_FC_PSC )) {/* PSC MODE */ - dytc_profile_available =DYTC_FUNCMODE_PSC ; + }else if (dytc_capabilities &BIT (DYTC_FC_PSC )) {/* PSC MODE */ +pr_debug ("PSC is supported\n" ); }else {dbg_printk (TPACPI_DBG_INIT ,"No DYTC support available\n" );return -ENODEV ;
@@ -10574,7 +10566,6 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)static void dytc_profile_exit (void ) { - dytc_profile_available =DYTC_FUNCMODE_NONE ;platform_profile_remove (); }
Signature · 1 line
2.36.1
PATCH 2/4 platform/x86: thinkpad-acpi: Add support for automatic mode transitions
Some AMD Thinkpads support automatic mode transitions. The actual transition logic doesn't live in the thinkpad_acpi driver. The events to activate this logic come from this driver though.
Populate these events when switching PSC power modes.
--- drivers/platform/x86/thinkpad_acpi.c | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/platform/x86/thinkpad_acpi.c +34 -0
@@ -10266,6 +10266,7 @@ static struct ibm_struct proxsensor_driver_data = {#define DYTC_CMD_FUNC_CAP 3/* To get DYTC capabilities */ #define DYTC_FC_MMC 27/* MMC Mode supported */ #define DYTC_FC_PSC 29/* PSC Mode supported */ +#define DYTC_FC_AMT 31/* AMT mode supported */ #define DYTC_GET_FUNCTION_BIT 8/* Bits 8-11 - function setting */ #define DYTC_GET_MODE_BIT 12/* Bits 12-15 - mode setting */
@@ -10278,6 +10279,10 @@ static struct ibm_struct proxsensor_driver_data = {#define DYTC_FUNCTION_CQL 1/* Function = 1, lap mode */ #define DYTC_FUNCTION_MMC 11/* Function = 11, MMC mode */ #define DYTC_FUNCTION_PSC 13/* Function = 13, PSC mode */ +#define DYTC_FUNCTION_AMT 15/* Function = 15, AMT mode */ + +#define DYTC_MODE_AMT_ENABLE 0x1/* Enable AMT (in balanced mode) */ +#define DYTC_MODE_AMT_DISABLE 0xF/* Disable AMT (in other modes) */ #define DYTC_MODE_MMC_PERFORM 2/* High power mode aka performance */ #define DYTC_MODE_MMC_LOWPOWER 3/* Low power mode */
@@ -10298,6 +10303,8 @@ static struct ibm_struct proxsensor_driver_data = {#define DYTC_DISABLE_CQL DYTC_SET_COMMAND(DYTC_FUNCTION_CQL, DYTC_MODE_MMC_BALANCE, 0)#define DYTC_ENABLE_CQL DYTC_SET_COMMAND(DYTC_FUNCTION_CQL, DYTC_MODE_MMC_BALANCE, 1) +static int dytc_control_amt (bool enable); +static bool dytc_amt_active;static enum platform_profile_option dytc_current_profile;static atomic_t dytc_ignore_event =ATOMIC_INIT (0 );
@@ -10380,6 +10387,30 @@ static int dytc_profile_get(struct platform_profile_handler *pprof,return 0 ; } +static int dytc_control_amt (bool enable) +{ +int dummy; +int err; +int cmd; + +if (!(dytc_capabilities &BIT (DYTC_FC_AMT ))) { +pr_warn ("Attempting to toggle AMT on a system that doesn't advertise support\n" ); +return -ENODEV ; + } + +if (enable) + cmd =DYTC_SET_COMMAND (DYTC_FUNCTION_AMT ,DYTC_MODE_AMT_ENABLE , enable); +else + cmd =DYTC_SET_COMMAND (DYTC_FUNCTION_AMT ,DYTC_MODE_AMT_DISABLE , enable); + +pr_debug ("%sabling AMT (cmd 0x%x)" , enable ?"en" :"dis" , cmd); + err =dytc_command (cmd, &dummy); +if (err) +return err; + dytc_amt_active = enable; +return 0 ; +} +/* * Helper function - check if we are in CQL mode and if we are * - disable CQL,
@@ -10462,6 +10493,9 @@ 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 ); }/* Success - update current profile */ dytc_current_profile = profile;
Signature · 1 line
2.36.1
PATCH 3/4 platform/x86: thinkpad-acpi: Add support for hotkey 0x131a
In reply to Mark PearsonOn some AMD platforms if you press FN+T it will toggle whether automatic mode transitions are active.
Recognize this keycode and use it to toggle AMT.
--- drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/platform/x86/thinkpad_acpi.c +11 -0
@@ -159,6 +159,7 @@ enum tpacpi_hkey_event_t {TP_HKEY_EV_VOL_DOWN =0x1016 ,/* Volume down or unmute */ TP_HKEY_EV_VOL_MUTE =0x1017 ,/* Mixer output mute */ TP_HKEY_EV_PRIVACYGUARD_TOGGLE =0x130f ,/* Toggle priv.guard on/off */ +TP_HKEY_EV_AMT_TOGGLE =0x131a ,/* Toggle AMT on/off */ /* Reasons for waking up from S3/S4 */ TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undock requested, S3 */
@@ -3735,6 +3736,7 @@ static bool hotkey_notify_extended_hotkey(const u32 hkey)switch (hkey) {case TP_HKEY_EV_PRIVACYGUARD_TOGGLE : +case TP_HKEY_EV_AMT_TOGGLE :tpacpi_driver_event (hkey);return true; }
@@ -11038,6 +11040,15 @@ static void tpacpi_driver_event(const unsigned int hkey_event)if (changed)drm_privacy_screen_call_notifier_chain (lcdshadow_dev); } +if (hkey_event ==TP_HKEY_EV_AMT_TOGGLE ) { +/* If we're enabling AMT we need to force balanced mode */ +if (!dytc_amt_active) +/* This will also set AMT mode enabled */ +dytc_profile_set (NULL ,PLATFORM_PROFILE_BALANCED ); +else +dytc_control_amt (!dytc_amt_active); + } + }static void hotkey_driver_event (const unsigned int scancode)
Signature · 1 line
2.36.1
RE: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey 0x131a
[AMD Official Use Only - General]
Quoted 52 lines
-----Original Message-----
From: Mark Pearson <[email protected]>
Sent: Friday, June 3, 2022 12:02
To: [email protected]
Cc: [email protected]; [email protected]; platform-driver- [email protected]; Limonciello, Mario <[email protected]>
Subject: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey0x131aOn some AMD platforms if you press FN+T it will toggle whether automatic mode transitions are active.
Recognize this keycode and use it to toggle AMT.
Co-developed-by Mario Limonciello <[email protected]>Signed-off-by Mario Limonciello <[email protected]>Signed-off-by Mark Pearson <[email protected]>--- drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/platform/x86/thinkpad_acpi.c +0
-0@@ -159,6 +159,7 @@ enum tpacpi_hkey_event_t { TP_HKEY_EV_VOL_DOWN = 0x1016, /* Volume down orunmute */
TP_HKEY_EV_VOL_MUTE=0x1017, /* Mixer output
mute */
TP_HKEY_EV_PRIVACYGUARD_TOGGLE=0x130f, /* Toggle priv.guard
on/off */drivers/platform/x86/thinkpad_acpi.c +1
-0+ TP_HKEY_EV_AMT_TOGGLE = 0x131a, /* Toggle AMTon/off */
drivers/platform/x86/thinkpad_acpi.c +0
-0/* Reasons for waking up from S3/S4 */ TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undockrequested, S3 */
drivers/platform/x86/thinkpad_acpi.c +1
-0@@ -3735,6 +3736,7 @@ static bool hotkey_notify_extended_hotkey(const u32 hkey) switch (hkey) {case TP_HKEY_EV_PRIVACYGUARD_TOGGLE : +case TP_HKEY_EV_AMT_TOGGLE :tpacpi_driver_event (hkey);return true;drivers/platform/x86/thinkpad_acpi.c +0
-0}@@ -11038,6 +11040,15 @@ static void tpacpi_driver_event(const unsigned int hkey_event)if (changed)
drivers/platform/x86/thinkpad_acpi.c static void tpacpi_driver_event(const unsigned int · line 11052
Quoted 10 lines
drivers/platform/x86/thinkpad_acpi.c +7
-0drm_privacy_screen_call_notifier_chain (lcdshadow_dev); } +if (hkey_event ==TP_HKEY_EV_AMT_TOGGLE ) { +/* If we're enabling AMT we need to force balanced mode */ +if (!dytc_amt_active) +/* This will also set AMT mode enabled */ +dytc_profile_set (NULL ,PLATFORM_PROFILE_BALANCED ); +else +dytc_control_amt (!dytc_amt_active);
I missed this while we were making the series, but a fresh set of eyes tells me shouldn't dytc_control_amt(..) run in either case - not just in the "else" case?
* If AMT is not active and you press the key (to activate it) you should switch to balanced mode "and" turn it on.
* If AMT is active and you press the key (to deactivate it) you're already in balanced mode, so you should just turn it off.
Quoted 7 lines
drivers/platform/x86/thinkpad_acpi.c +2
-0+ } +}
static void
hotkey_driver_event(const unsigned int scancode)
--
2.36.1
Re: [External] RE: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey 0x131a
Hi Mario
Quoted 70 lines · Mario
[AMD Official Use Only - General]
Quoted 52 lines
-----Original Message-----
From: Mark Pearson <[email protected]>
Sent: Friday, June 3, 2022 12:02
To: [email protected]
Cc: [email protected]; [email protected]; platform-driver- [email protected]; Limonciello, Mario <[email protected]>
Subject: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey0x131aOn some AMD platforms if you press FN+T it will toggle whether automatic mode transitions are active.
Recognize this keycode and use it to toggle AMT.
Co-developed-by Mario Limonciello <[email protected]>Signed-off-by Mario Limonciello <[email protected]>Signed-off-by Mark Pearson <[email protected]>--- drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/platform/x86/thinkpad_acpi.c +0
-0@@ -159,6 +159,7 @@ enum tpacpi_hkey_event_t { TP_HKEY_EV_VOL_DOWN = 0x1016, /* Volume down orunmute */
TP_HKEY_EV_VOL_MUTE=0x1017, /* Mixer output
mute */
TP_HKEY_EV_PRIVACYGUARD_TOGGLE=0x130f, /* Toggle priv.guard
on/off */drivers/platform/x86/thinkpad_acpi.c +1
-0+ TP_HKEY_EV_AMT_TOGGLE = 0x131a, /* Toggle AMTon/off */
drivers/platform/x86/thinkpad_acpi.c +0
-0/* Reasons for waking up from S3/S4 */ TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undockrequested, S3 */
drivers/platform/x86/thinkpad_acpi.c +1
-0@@ -3735,6 +3736,7 @@ static bool hotkey_notify_extended_hotkey(const u32 hkey) switch (hkey) {case TP_HKEY_EV_PRIVACYGUARD_TOGGLE : +case TP_HKEY_EV_AMT_TOGGLE :tpacpi_driver_event (hkey);return true;drivers/platform/x86/thinkpad_acpi.c +0
-0}@@ -11038,6 +11040,15 @@ static void tpacpi_driver_event(const unsigned int hkey_event)if (changed)drivers/platform/x86/thinkpad_acpi.c static void tpacpi_driver_event(const unsigned int · line 11052
Quoted 10 lines
drivers/platform/x86/thinkpad_acpi.c +7
-0drm_privacy_screen_call_notifier_chain (lcdshadow_dev); } +if (hkey_event ==TP_HKEY_EV_AMT_TOGGLE ) { +/* If we're enabling AMT we need to force balanced mode */ +if (!dytc_amt_active) +/* This will also set AMT mode enabled */ +dytc_profile_set (NULL ,PLATFORM_PROFILE_BALANCED ); +else +dytc_control_amt (!dytc_amt_active);I missed this while we were making the series, but a fresh set of eyes tells me shouldn't
dytc_control_amt(..)run in either case - not just in the "else" case?
Quoted 4 lines
* If AMT is not active and you press the key (to activate it) you should switch to balanced mode "and" turn it on.
* If AMT is active and you press the key (to deactivate it) you're already in balanced mode, so you should just turn it off.
The dytc_profile_set for balanced mode will also enable AMT (if it's supported) so I didn't want to call it twice.
Mark
RE: [External] RE: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey 0x131a
[Public]
Quoted 83 lines
-----Original Message-----
From: Mark Pearson <[email protected]>
Sent: Friday, June 3, 2022 12:21
To: Limonciello, Mario <[email protected]>
Cc: [email protected]; [email protected]; platform-driver- [email protected]
Subject: Re: [External] RE: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey0x131aHi Mario
Quoted 46 lines · Mario
[AMD Official Use Only - General]
Quoted 42 lines
-----Original Message-----
From: Mark Pearson <[email protected]>
Sent: Friday, June 3, 2022 12:02
To: [email protected]
Cc: [email protected]; [email protected]; platform-driver- [email protected]; Limonciello, Mario <[email protected]>
Subject: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey0x131aOn some AMD platforms if you press FN+T it will toggle whether automatic mode transitions are active.
Recognize this keycode and use it to toggle AMT.
Co-developed-by Mario Limonciello <[email protected]>Signed-off-by Mario Limonciello <[email protected]>Signed-off-by Mark Pearson <[email protected]>--- drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/platform/x86/thinkpad_acpi.c +0
-0@@ -159,6 +159,7 @@ enum tpacpi_hkey_event_t { TP_HKEY_EV_VOL_DOWN = 0x1016, /* Volume down orunmute */
TP_HKEY_EV_VOL_MUTE=0x1017, /* Mixer output
mute */
TP_HKEY_EV_PRIVACYGUARD_TOGGLE=0x130f, /* Toggle priv.guard
on/off */drivers/platform/x86/thinkpad_acpi.c +1
-0+ TP_HKEY_EV_AMT_TOGGLE = 0x131a, /* Toggle AMTon/off */
drivers/platform/x86/thinkpad_acpi.c +0
-0/* Reasons for waking up from S3/S4 */ TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undockrequested, S3 */
drivers/platform/x86/thinkpad_acpi.c +0
-0@@ -3735,6 +3736,7 @@ static bool hotkey_notify_extended_hotkey(const u32 hkey)Quoted 7 lines
drivers/platform/x86/thinkpad_acpi.c static void tpacpi_driver_event(const unsigned
Quoted 7 lines
drivers/platform/x86/thinkpad_acpi.c +1
-0switch (hkey) {case TP_HKEY_EV_PRIVACYGUARD_TOGGLE : +case TP_HKEY_EV_AMT_TOGGLE :tpacpi_driver_event (hkey);return true;drivers/platform/x86/thinkpad_acpi.c +0
-0}@@ -11038,6 +11040,15 @@ static void tpacpi_driver_event(const unsignedint
Quoted 17 lines
drivers/platform/x86/thinkpad_acpi.c static void tpacpi_driver_event(const unsigned int hkey_event) · line 11049
Quoted 13 lines
drivers/platform/x86/thinkpad_acpi.c +7
-0hkey_event)if (changed)drm_privacy_screen_call_notifier_chain (lcdshadow_dev); } +if (hkey_event ==TP_HKEY_EV_AMT_TOGGLE ) { +/* If we're enabling AMT we need to force balanced mode */ +if (!dytc_amt_active) +/* This will also set AMT mode enabled */ +dytc_profile_set (NULL ,PLATFORM_PROFILE_BALANCED ); +else +dytc_control_amt (!dytc_amt_active);I missed this while we were making the series, but a fresh set of eyes tells me shouldn't
dytc_control_amt(..)run in either case - not just in the "else" case?
Quoted 7 lines
Quoted 4 lines
* If AMT is not active and you press the key (to activate it) you should switch to balanced mode "and" turn it on.
* If AMT is active and you press the key (to deactivate it) you're already in balanced mode, so you should just turn it off.The
dytc_profile_setfor balanced mode will also enable AMT (if it's supported) so I didn't want to call it twice.
Ah, got it thanks.
PATCH 4/4 platform/x86: thinkpad-acpi: Enable AMT by default on supported systems
In reply to Mark PearsonBy default the ACPI platform profile starts in balanced mode. On supported systems AMT is supposed to be enabled in balanced mode by default.
When checking the capabilities during initialization, set up AMT to be enabled if it's supported.
--- drivers/platform/x86/thinkpad_acpi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/platform/x86/thinkpad_acpi.c +5 -0
@@ -10597,6 +10597,11 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)/* Ensure initial values are correct */ dytc_profile_refresh (); +/* Set AMT correctly now we know current profile */ +if ((dytc_capabilities &BIT (DYTC_FC_PSC )) && + (dytc_capabilities &BIT (DYTC_FC_AMT ))) +dytc_control_amt (dytc_current_profile ==PLATFORM_PROFILE_BALANCED ); +return 0 ; }
Signature · 1 line
2.36.1
Hi,
Quoted 9 lines · Mark Pearson
Currently the active mode (PSC/MMC) is stored in an enum and queried throughout the driver.
Other driver changes will enumerate additional submodes that are relevant to be tracked, so instead track PSC/MMC in a single integer variable.
Co-developed-by Mario Limonciello <[email protected]>Signed-off-by Mario Limonciello <[email protected]>Signed-off-by Mark Pearson <[email protected]>
Thank you for your patch-series, I've applied the series to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 146 lines
--- drivers/platform/x86/thinkpad_acpi.c | 45 +++++++++++----------------- 1 file changed, 18 insertions(+), 27 deletions(-)drivers/platform/x86/thinkpad_acpi.c +18
-27@@ -10299,21 +10299,15 @@ static struct ibm_struct proxsensor_driver_data = {#define DYTC_DISABLE_CQL DYTC_SET_COMMAND(DYTC_FUNCTION_CQL, DYTC_MODE_MMC_BALANCE, 0)#define DYTC_ENABLE_CQL DYTC_SET_COMMAND(DYTC_FUNCTION_CQL, DYTC_MODE_MMC_BALANCE, 1) -enum dytc_profile_funcmode { -DYTC_FUNCMODE_NONE =0 , -DYTC_FUNCMODE_MMC , -DYTC_FUNCMODE_PSC , -}; - -static enum dytc_profile_funcmode dytc_profile_available;static enum platform_profile_option dytc_current_profile;static atomic_t dytc_ignore_event =ATOMIC_INIT (0 );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) { -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) { +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {switch (dytcmode) {case DYTC_MODE_MMC_LOWPOWER : *profile =PLATFORM_PROFILE_LOW_POWER ;@@ -10330,7 +10324,7 @@ static int convert_dytc_to_profile(int dytcmode, enum platform_profile_option *p }return 0 ; } -if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) { +if (dytc_capabilities &BIT (DYTC_FC_PSC )) {switch (dytcmode) {case DYTC_MODE_PSC_LOWPOWER : *profile =PLATFORM_PROFILE_LOW_POWER ;@@ -10352,21 +10346,21 @@ static int convert_profile_to_dytc(enum platform_profile_option profile, int *pe {switch (profile) {case PLATFORM_PROFILE_LOW_POWER : -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) +if (dytc_capabilities &BIT (DYTC_FC_MMC )) *perfmode =DYTC_MODE_MMC_LOWPOWER ; -else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) +else if (dytc_capabilities &BIT (DYTC_FC_PSC )) *perfmode =DYTC_MODE_PSC_LOWPOWER ;break ;case PLATFORM_PROFILE_BALANCED : -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) +if (dytc_capabilities &BIT (DYTC_FC_MMC )) *perfmode =DYTC_MODE_MMC_BALANCE ; -else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) +else if (dytc_capabilities &BIT (DYTC_FC_PSC )) *perfmode =DYTC_MODE_PSC_BALANCE ;break ;case PLATFORM_PROFILE_PERFORMANCE : -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) +if (dytc_capabilities &BIT (DYTC_FC_MMC )) *perfmode =DYTC_MODE_MMC_PERFORM ; -else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) +else if (dytc_capabilities &BIT (DYTC_FC_PSC )) *perfmode =DYTC_MODE_PSC_PERFORM ;break ;default :/* Unknown profile */ @@ -10445,7 +10439,7 @@ static int dytc_profile_set(struct platform_profile_handler *pprof,if (err) goto unlock; -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) { +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {if (profile ==PLATFORM_PROFILE_BALANCED ) {/* * To get back to balanced mode we need to issue a reset command. @@ -10464,7 +10458,7 @@ static int dytc_profile_set(struct platform_profile_handler *pprof, goto unlock; } } -if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) { +if (dytc_capabilities &BIT (DYTC_FC_PSC )) { err =dytc_command (DYTC_SET_COMMAND (DYTC_FUNCTION_PSC , perfmode,1 ), &output);if (err) goto unlock;@@ -10483,12 +10477,12 @@ static void dytc_profile_refresh(void)int perfmode;mutex_lock (&dytc_mutex); -if (dytc_profile_available ==DYTC_FUNCMODE_MMC ) { +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {if (dytc_mmc_get_available) err =dytc_command (DYTC_CMD_MMC_GET , &output);else err =dytc_cql_command (DYTC_CMD_GET , &output); - }else if (dytc_profile_available ==DYTC_FUNCMODE_PSC ) + }else if (dytc_capabilities &BIT (DYTC_FC_PSC )) err =dytc_command (DYTC_CMD_GET , &output);mutex_unlock (&dytc_mutex);@@ -10517,7 +10511,6 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)set_bit (PLATFORM_PROFILE_BALANCED , dytc_profile.choices);set_bit (PLATFORM_PROFILE_PERFORMANCE , dytc_profile.choices); - dytc_profile_available =DYTC_FUNCMODE_NONE ; err =dytc_command (DYTC_CMD_QUERY , &output);if (err)return err;@@ -10530,13 +10523,12 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)return -ENODEV ;/* Check what capabilities are supported */ - err =dytc_command (DYTC_CMD_FUNC_CAP , &output); + err =dytc_command (DYTC_CMD_FUNC_CAP , &dytc_capabilities);if (err)return err; -if (output &BIT (DYTC_FC_MMC )) {/* MMC MODE */ - dytc_profile_available =DYTC_FUNCMODE_MMC ; - +if (dytc_capabilities &BIT (DYTC_FC_MMC )) {/* MMC MODE */ +pr_debug ("MMC is supported\n" );/* * Check if MMC_GET functionality available * Version > 6 and return success from MMC_GET command @@ -10547,8 +10539,8 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)if (!err && ((output &DYTC_ERR_MASK ) ==DYTC_ERR_SUCCESS )) dytc_mmc_get_available = true; } - }else if (output &BIT (DYTC_FC_PSC )) {/* PSC MODE */ - dytc_profile_available =DYTC_FUNCMODE_PSC ; + }else if (dytc_capabilities &BIT (DYTC_FC_PSC )) {/* PSC MODE */ +pr_debug ("PSC is supported\n" ); }else {dbg_printk (TPACPI_DBG_INIT ,"No DYTC support available\n" );return -ENODEV ;@@ -10574,7 +10566,6 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)static void dytc_profile_exit (void ) { - dytc_profile_available =DYTC_FUNCMODE_NONE ;platform_profile_remove (); }