ACPI: processor: Use Apple-specific methods for P/C-states
PATCH RESEND 1/1 ACPI: processor: Use Apple-specific methods for P/C-states
Use APSS and ACST instead of _PSS and _CST when available on Intel Macs. These methods are used in X86PlatformPlugin.kext, and when not found we fallback to generic _PSS and _CST methods.
--- drivers/acpi/acpi_processor.c | 22 +++++++++++++++++----- drivers/acpi/processor_perflib.c | 10 ++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-)
drivers/acpi/acpi_processor.c +17 -5
@@ -18,6 +18,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/platform_data/x86/apple.h> #include <linux/platform_device.h> #include <acpi/processor.h>
@@ -837,27 +838,38 @@ int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu,acpi_status status;u64 count;int last_index =0 ; -int i, ret =0 ; +int i, ret =0 , base =0 ; +if (x86_apple_machine) { + status =acpi_evaluate_object (handle,"ACST" ,NULL , &buffer); +if (ACPI_SUCCESS (status)) { + base =1 ;/* ACST is a 4 field variable we need to skip the first field */ + goto success; + } + + buffer.length =ACPI_ALLOCATE_BUFFER ; + buffer.pointer =NULL ; + } status =acpi_evaluate_object (handle,"_CST" ,NULL , &buffer);if (ACPI_FAILURE (status)) {acpi_handle_debug (handle,"No _CST\n" );return -ENODEV ; } +success: cst = buffer.pointer;/* There must be at least 2 elements. */ -if (!cst || cst->type !=ACPI_TYPE_PACKAGE || cst->package.count <2 ) { +if (!cst || cst->type !=ACPI_TYPE_PACKAGE || cst->package.count < base +2 ) {acpi_handle_warn (handle,"Invalid _CST output\n" ); ret = -EFAULT ; goto end; } - count = cst->package.elements[0 ].integer.value; + count = cst->package.elements[base].integer.value;/* Validate the number of C-states. */ -if (count <1 || count != cst->package.count -1 ) { +if (count <1 || count != cst->package.count -1 - base) {acpi_handle_warn (handle,"Inconsistent _CST data\n" ); ret = -EFAULT ; goto end;
@@ -882,7 +894,7 @@ int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu,memset (&cx,0 ,sizeof (cx)); - element = &cst->package.elements[i]; + element = &cst->package.elements[base + i];if (element->type !=ACPI_TYPE_PACKAGE ) {acpi_handle_info (handle,"_CST C%d type(%x) is not package, skip...\n" , i, element->type);
drivers/acpi/processor_perflib.c +10 -0
@@ -17,6 +17,7 @@#include <linux/cpufreq.h> #include <linux/slab.h> #include <linux/acpi.h> +#include <linux/platform_data/x86/apple.h> #include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h>
@@ -324,11 +325,20 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)int i;int last_invalid =-1 ; +if (x86_apple_machine) { + status =acpi_evaluate_object (pr->handle,"APSS" ,NULL , &buffer); +if (ACPI_SUCCESS (status)) + goto success; + + buffer.length =ACPI_ALLOCATE_BUFFER ; + buffer.pointer =NULL ; + } status =acpi_evaluate_object (pr->handle,"_PSS" ,NULL , &buffer);if (ACPI_FAILURE (status)) {acpi_evaluation_failure_warn (pr->handle,"_PSS" , status);return -ENODEV ; } +success: pss = buffer.pointer;if (!pss || pss->type !=ACPI_TYPE_PACKAGE ) {
Signature · 1 line
2.55.0
Hi can i please get a update on this, i sent this patch almost 15 days ago.
Thanks.
Rafael J. Wysocki (Intel)
maintainerQuoted 3 lines · Atharva Tiwari
Hi can i please get a update on this, i sent this patch almost 15 days ago.
You haven't provided a motivation for the change and I know nothing about Apple platforms, sorry.
Quoted 2 lines
You haven't provided a motivation for the change and I know nothing about Apple platforms, sorry.
APSS provides more P-states than _PSS on apple macs, for example on MacBookPro11,3
_PSS provides 17 P-states ranging from 800Mhz to 2301 Mhz, while APSS provides 28 P-states ranging from 800Mhz to 3500 Mhz
Same with ACST, on Xserve3,1 _CST provides 2 C-states (C1, C6) while ACST provides 3 C-states (C1, C2, C6).
This is also used in older macs only (before 2015).
And also macOS uses these.
Rafael J. Wysocki (Intel)
maintainerQuoted 6 lines · Atharva Tiwari
Quoted 3 lines
You haven't provided a motivation for the change and I know nothing about Apple platforms, sorry.
APSS provides more P-states than
_PSSon apple macs, for example on MacBookPro11,3
Quoted 7 lines
_PSSprovides 17 P-states ranging from 800Mhz to 2301 Mhz, while APSS provides 28 P-states ranging from 800Mhz to 3500 MhzSame with ACST, on Xserve3,1
_CSTprovides 2 C-states (C1, C6) while ACST provides 3 C-states (C1, C2, C6).This is also used in older macs only (before 2015).
Which one is used in older Macs, ACST?
Quoted 1 line
And also macOS uses these.
Information like the above should go into the patch changelog.
Quoted 1 line
Which one is used in older Macs, ACST?
Both, APSS and ACST, i think they were discontinued from T1 macs onwards (so 2016+).
Rafael J. Wysocki (Intel)
maintainerQuoted 24 lines · Atharva Tiwari
Use APSS and ACST instead of
_PSSand_CSTwhen available on Intel Macs. These methods are used in X86PlatformPlugin.kext, and when not found we fallback to generic_PSSand_CSTmethods.Signed-off-by Atharva Tiwari <[email protected]>--- drivers/acpi/acpi_processor.c | 22 +++++++++++++++++----- drivers/acpi/processor_perflib.c | 10 ++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-)drivers/acpi/acpi_processor.c +1
-0@@ -18,6 +18,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/platform_data/x86/apple.h> #include <linux/platform_device.h> #include <acpi/processor.h>
drivers/acpi/acpi_processor.c int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu, · line 846
Quoted 10 lines
drivers/acpi/acpi_processor.c +5
-1@@ -837,27 +838,38 @@ int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu,acpi_status status;u64 count;int last_index =0 ; -int i, ret =0 ; +int i, ret =0 , base =0 ; +if (x86_apple_machine) { + status =acpi_evaluate_object (handle,"ACST" ,NULL , &buffer); +if (ACPI_SUCCESS (status)) { + base =1 ;/* ACST is a 4 field variable we need to skip the first field */
s/variable/package/ in the comment.
drivers/acpi/acpi_processor.c int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu, · line 852
Quoted 6 lines
drivers/acpi/acpi_processor.c +6
-0+ goto success; + } + + buffer.length =ACPI_ALLOCATE_BUFFER ; + buffer.pointer =NULL ; + }
I'd put the above into a separate function returning 1 on success and 0 on failure, say acpi_processor_apple_acst(), that would also reset the buffer on failures, so the code in acpi_processor_evaluate_cst() can be something like
base = acpi_processor_apple_acst(handle, &buffer); if (!base) {
drivers/acpi/acpi_processor.c int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu, · line 862
Quoted 10 lines
drivers/acpi/acpi_processor.c +1
-0status =acpi_evaluate_object (handle,"_CST" ,NULL , &buffer);if (ACPI_FAILURE (status)) {acpi_handle_debug (handle,"No _CST\n" );return -ENODEV ; } +success: cst = buffer.pointer;/* There must be at least 2 elements. */
The above comment is not applicable to the ACST case, is it?
drivers/acpi/acpi_processor.c int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu, · line 864
Quoted 3 lines
drivers/acpi/acpi_processor.c +1
-1-if (!cst || cst->type !=ACPI_TYPE_PACKAGE || cst->package.count <2 ) { +if (!cst || cst->type !=ACPI_TYPE_PACKAGE || cst->package.count < base +2 ) {acpi_handle_warn (handle,"Invalid _CST output\n" );
You should also avoid printing "_CST" in this message if _CST is not actually used (and analogously below).
Quoted 35 lines
drivers/acpi/acpi_processor.c +3
-3ret = -EFAULT ; goto end; } - count = cst->package.elements[0 ].integer.value; + count = cst->package.elements[base].integer.value;/* Validate the number of C-states. */ -if (count <1 || count != cst->package.count -1 ) { +if (count <1 || count != cst->package.count -1 - base) {acpi_handle_warn (handle,"Inconsistent _CST data\n" ); ret = -EFAULT ; goto end;@@ -882,7 +894,7 @@ int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu,memset (&cx,0 ,sizeof (cx)); - element = &cst->package.elements[i]; + element = &cst->package.elements[base + i];if (element->type !=ACPI_TYPE_PACKAGE ) {acpi_handle_info (handle,"_CST C%d type(%x) is not package, skip...\n" , i, element->type);drivers/acpi/processor_perflib.c +1
-0@@ -17,6 +17,7 @@#include <linux/cpufreq.h> #include <linux/slab.h> #include <linux/acpi.h> +#include <linux/platform_data/x86/apple.h> #include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h>
drivers/acpi/processor_perflib.c static int acpi_processor_get_performance_states(struct acpi_processor *pr) · line 331
Quoted 7 lines
drivers/acpi/processor_perflib.c +4
-0@@ -324,11 +325,20 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)int i;int last_invalid =-1 ; +if (x86_apple_machine) { + status =acpi_evaluate_object (pr->handle,"APSS" ,NULL , &buffer); +if (ACPI_SUCCESS (status)) + goto success;
In analogy with the above, I'd introduce acpi_evaluate_apple_apss(), so the code here can be written as
if (!acpi_evaluate_apple_apss(pr->handle, &buffer)) {
status = acpi_evaluate_object(pr->handle, "_PSS", NULL, &buffer);etc.
Quoted 4 lines
drivers/acpi/processor_perflib.c +4
-0+ + buffer.length =ACPI_ALLOCATE_BUFFER ; + buffer.pointer =NULL ; + }
drivers/acpi/processor_perflib.c static int acpi_processor_get_performance_states(struct acpi_processor *pr)
Quoted 10 lines
drivers/acpi/processor_perflib.c +1
-1status =acpi_evaluate_object (pr->handle,"_PSS" ,NULL , &buffer);if (ACPI_FAILURE (status)) {acpi_evaluation_failure_warn (pr->handle,"_PSS" , status);return -ENODEV ; } +success: pss = buffer.pointer;if (!pss || pss->type !=ACPI_TYPE_PACKAGE ) { --
And there are diagnostic messages below mentioning _PSS directly that should not mention it when it is not actually used.