Expose all known Intel DPTF policies
Intel's Dynamic Platform and Thermal Framework is a combination firmware/OS framework for allowing userland to implement more complex thermal policies in conjunction with the platform firmware. The rough gist is that the firmware exposes a set of information describing the relationships between various heat generating and heat removing components in the system, the OS makes a reasonable decision about what sort of policy will work best given the constraints the system is currently operating under and passes that decision back to the firmware, and the firmware does some magic (potentially including reprogramming various CPU MSRs) to match the OS policy. Depending on the policy, the OS may then be responsible for ensuring that the system stays within the appropriate thermal envelope.
Linux already has a driver that exposes the firmware interface for setting the policy, but it's somewhat broken - it only exposes a very small subset of the defined policies, and most new systems don't intersect with the exposed ones (strangely, support for some policies was actively removed in 31908f45a583e8f21db37f402b6e8d5739945afd). It also doesn't actually /work/ on any new systems, since the PASSIVE_1 policy seems to have been replaced by the PASSIVE_2 policy and therefore it's impossible to actually trigger a new UUID write.
The consequence of this right now is that various new systems (such as most current Thinkpads) default to a safe policy that throttles the CPU at a low temperature, dramatically reducing system performance. Since Linux provides no mechanism to set any of the other policies the platform supports, users are stuck. This patchset adds all the UUIDs I've been able to find from scraping various ACPI tables, and fixes the mode setting in order to make it possible to actually set the new modes. It should be noted that this is nowhere near an actual solution - doing this properly requires appropriate userspace management tooling, and Intel haven't documented most of the ACPI information required to make it possible to write such tooling. However, this is a first step in making it possible to do that work.
PATCH 1/2 thermal/int340x_thermal: Add additional UUIDs
Platforms support more DPTF policies than the driver currently exposes. Add them. This effectively reverts 31908f45a583e8f21db37f402b6e8d5739945afd which removed several UUIDs without explaining why.
--- drivers/thermal/int340x_thermal/int3400_thermal.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/thermal/int340x_thermal/int3400_thermal.c +14 -0
@@ -22,6 +22,13 @@ enum int3400_thermal_uuid {INT3400_THERMAL_PASSIVE_1 ,INT3400_THERMAL_ACTIVE ,INT3400_THERMAL_CRITICAL , +INT3400_THERMAL_ADAPTIVE_PERFORMANCE , +INT3400_THERMAL_EMERGENCY_CALL_MODE , +INT3400_THERMAL_PASSIVE_2 , +INT3400_THERMAL_POWER_BOSS , +INT3400_THERMAL_VIRTUAL_SENSOR , +INT3400_THERMAL_COOLING_MODE , +INT3400_THERMAL_HARDWARE_DUTY_CYCLING , INT3400_THERMAL_MAXIMUM_UUID, };
@@ -29,6 +36,13 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {"42A441D6-AE6A-462b-A84B-4A8CE79027D3" ,"3A95C389-E4B8-4629-A526-C52C88626BAE" ,"97C68AE7-15FA-499c-B8C9-5DA81D606E0A" , +"63BE270F-1C11-48FD-A6F7-3AF253FF3E2D" , +"5349962F-71E6-431D-9AE8-0A635B710AEE" , +"9E04115A-AE87-4D1C-9500-0F3E340BFE75" , +"F5A35014-C209-46A4-993A-EB56DE7530A1" , +"6ED722A7-9240-48A5-B479-31EEF723D7CF" , +"16CAF1B7-DD38-40ED-B1C1-1B8A1913D531" , + "BE84BABF-C4D4-403D-B495-3128FD44dAC1", }; struct int3400_thermal_priv {
Signature · 1 line
2.19.0.605.g01d371f741-goog
Zhang Rui
reviewerRe: [PATCH 1/2] thermal/int340x_thermal: Add additional UUIDs
Hi, Matthew,
Quoted 6 lines · Matthew Garrett
Platforms support more DPTF policies than the driver currently exposes.
Add them. This effectively reverts31908f45a583e8f21db37f402b6e8d5739945afdwhich removed several UUIDs without explaining why.
I'm going to apply this patch series, just with two minor changes, 1. 31908f45a583e8f21db37f402b6e8d5739945afd does not follow the git commit description style 'commit <12+ chars of sha1> ("<title line>")'
2. the UUIDs were removed previously because these policies were not used.
thanks,
rui
Quoted 42 lines
Signed-off-by Matthew Garrett <[email protected]>Cc Zhang Rui <[email protected]>Cc Nisha Aram <[email protected]>---
drivers/thermal/int340x_thermal/int3400_thermal.c | 14
++++++++++++++1 file changed, 14 insertions(+)drivers/thermal/int340x_thermal/int3400_thermal.c +7
-0@@ -22,6 +22,13 @@ enum int3400_thermal_uuid { INT3400_THERMAL_PASSIVE_1, INT3400_THERMAL_ACTIVE, INT3400_THERMAL_CRITICAL, +INT3400_THERMAL_ADAPTIVE_PERFORMANCE , +INT3400_THERMAL_EMERGENCY_CALL_MODE , +INT3400_THERMAL_PASSIVE_2 , +INT3400_THERMAL_POWER_BOSS , +INT3400_THERMAL_VIRTUAL_SENSOR , +INT3400_THERMAL_COOLING_MODE , +INT3400_THERMAL_HARDWARE_DUTY_CYCLING , INT3400_THERMAL_MAXIMUM_UUID, };drivers/thermal/int340x_thermal/int3400_thermal.c +7
-0@@ -29,6 +36,13 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = { "42A441D6-AE6A-462b-A84B-4A8CE79027D3", "3A95C389-E4B8-4629-A526-C52C88626BAE", "97C68AE7-15FA-499c-B8C9-5DA81D606E0A", +"63BE270F-1C11-48FD-A6F7-3AF253FF3E2D" , +"5349962F-71E6-431D-9AE8-0A635B710AEE" , +"9E04115A-AE87-4D1C-9500-0F3E340BFE75" , +"F5A35014-C209-46A4-993A-EB56DE7530A1" , +"6ED722A7-9240-48A5-B479-31EEF723D7CF" , +"16CAF1B7-DD38-40ED-B1C1-1B8A1913D531" , + "BE84BABF-C4D4-403D-B495-3128FD44dAC1", };
structint3400_thermal_priv{
Re: [PATCH 1/2] thermal/int340x_thermal: Add additional UUIDs
Hello Rui,
Quoted 7 lines · Zhang Rui
Quoted 6 lines · Matthew Garrett
Platforms support more DPTF policies than the driver currently exposes.
Add them. This effectively reverts31908f45a583e8f21db37f402b6e8d5739945afdwhich removed several UUIDs without explaining why.
Quoted 5 lines
I'm going to apply this patch series, just with two minor changes,
1.31908f45a583e8f21db37f402b6e8d5739945afddoes not follow the git commit description style 'commit <12+ chars of sha1> ("<title line>")'
2. the UUIDs were removed previously because these policies were not used.
Which tree did this series get applied to?
Cheers,
Joel
Quoted 46 lines
thanks,
ruiQuoted 42 lines
Signed-off-by Matthew Garrett <[email protected]>Cc Zhang Rui <[email protected]>Cc Nisha Aram <[email protected]>--- drivers/thermal/int340x_thermal/int3400_thermal.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/thermal/int340x_thermal/int3400_thermal.c +14
-0@@ -22,6 +22,13 @@ enum int3400_thermal_uuid {INT3400_THERMAL_PASSIVE_1 ,INT3400_THERMAL_ACTIVE ,INT3400_THERMAL_CRITICAL , +INT3400_THERMAL_ADAPTIVE_PERFORMANCE , +INT3400_THERMAL_EMERGENCY_CALL_MODE , +INT3400_THERMAL_PASSIVE_2 , +INT3400_THERMAL_POWER_BOSS , +INT3400_THERMAL_VIRTUAL_SENSOR , +INT3400_THERMAL_COOLING_MODE , +INT3400_THERMAL_HARDWARE_DUTY_CYCLING , INT3400_THERMAL_MAXIMUM_UUID, };@@ -29,6 +36,13 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {"42A441D6-AE6A-462b-A84B-4A8CE79027D3" ,"3A95C389-E4B8-4629-A526-C52C88626BAE" ,"97C68AE7-15FA-499c-B8C9-5DA81D606E0A" , +"63BE270F-1C11-48FD-A6F7-3AF253FF3E2D" , +"5349962F-71E6-431D-9AE8-0A635B710AEE" , +"9E04115A-AE87-4D1C-9500-0F3E340BFE75" , +"F5A35014-C209-46A4-993A-EB56DE7530A1" , +"6ED722A7-9240-48A5-B479-31EEF723D7CF" , +"16CAF1B7-DD38-40ED-B1C1-1B8A1913D531" , + "BE84BABF-C4D4-403D-B495-3128FD44dAC1", };struct
int3400_thermal_priv{
Zhang Rui
reviewerRe: [PATCH 1/2] thermal/int340x_thermal: Add additional UUIDs
Quoted 13 lines · Joel Stanley
Hello Rui,
Quoted 10 lines · Zhang Rui
Quoted 8 lines · Matthew Garrett
Platforms support more DPTF policies than the driver currently exposes.
Add them. This effectively reverts31908f45a583e8f21db37f402b6e8d5739945afdwhich removed several UUIDs
without explaining why.
Quoted 9 lines
Quoted 7 lines
I'm going to apply this patch series, just with two minor changes,
1.31908f45a583e8f21db37f402b6e8d5739945afddoes not follow the git commit description style 'commit <12+ chars of sha1> ("<title line>")'
2. the UUIDs were removed previously because these policies were not
used.Which tree did this series get applied to?
it is in my next branch, and I will queue it for 5.1.
https://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git/log/?h
=next
thanks,
rui
Quoted 52 lines
Cheers,
Joel
Quoted 48 lines
thanks,
ruiQuoted 43 lines
Signed-off-by Matthew Garrett <[email protected]>Cc Zhang Rui <[email protected]>Cc Nisha Aram <[email protected]>---
drivers/thermal/int340x_thermal/int3400_thermal.c | 14
++++++++++++++1 file changed, 14 insertions(+)drivers/thermal/int340x_thermal/int3400_thermal.c +14
-0@@ -22,6 +22,13 @@ enum int3400_thermal_uuid { INT3400_THERMAL_PASSIVE_1, INT3400_THERMAL_ACTIVE, INT3400_THERMAL_CRITICAL, + INT3400_THERMAL_ADAPTIVE_PERFORMANCE, + INT3400_THERMAL_EMERGENCY_CALL_MODE, + INT3400_THERMAL_PASSIVE_2, + INT3400_THERMAL_POWER_BOSS, + INT3400_THERMAL_VIRTUAL_SENSOR, + INT3400_THERMAL_COOLING_MODE, + INT3400_THERMAL_HARDWARE_DUTY_CYCLING, INT3400_THERMAL_MAXIMUM_UUID, };@@ -29,6 +36,13 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = { "42A441D6-AE6A-462b-A84B-4A8CE79027D3", "3A95C389-E4B8-4629-A526-C52C88626BAE", "97C68AE7-15FA-499c-B8C9-5DA81D606E0A", + "63BE270F-1C11-48FD-A6F7-3AF253FF3E2D", + "5349962F-71E6-431D-9AE8-0A635B710AEE", + "9E04115A-AE87-4D1C-9500-0F3E340BFE75", + "F5A35014-C209-46A4-993A-EB56DE7530A1", + "6ED722A7-9240-48A5-B479-31EEF723D7CF", + "16CAF1B7-DD38-40ED-B1C1-1B8A1913D531", + "BE84BABF-C4D4-403D-B495-3128FD44dAC1", };struct
int3400_thermal_priv{
PATCH 2/2 thermal/int340x_thermal: fix mode setting
In reply to Matthew Garrettint3400 only pushes the UUID into the firmware when the mode is flipped to "enable". The current code only exposes the mode flag if the firmware supports the PASSIVE_1 UUID, which not all machines do. Remove the restriction.
--- drivers/thermal/int340x_thermal/int3400_thermal.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/thermal/int340x_thermal/int3400_thermal.c +3 -4
@@ -316,10 +316,9 @@ static int int3400_thermal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); -if (priv->uuid_bitmap &1 <<INT3400_THERMAL_PASSIVE_1 ) { - int3400_thermal_ops.get_mode = int3400_thermal_get_mode; - int3400_thermal_ops.set_mode = int3400_thermal_set_mode; - } + int3400_thermal_ops.get_mode = int3400_thermal_get_mode; + int3400_thermal_ops.set_mode = int3400_thermal_set_mode; + priv->thermal =thermal_zone_device_register ("INT3400 Thermal" ,0 ,0 , priv, &int3400_thermal_ops, &int3400_thermal_params,0 ,0 );
Signature · 1 line
2.19.0.605.g01d371f741-goog