ACPI: platform: Add balanced-performance platform profile

Some devices, including most Microsoft Surface devices, have a platform
profile somewhere inbetween balanced and performance. More specifically,
adding this profile allows the following mapping on Surface devices:

  Vendor Name           Platform Profile
  ------------------------------------------
  Battery Saver         low-power
  Recommended           balanced
  Better Performance    balanced-performance
  Best Performance      performance

Suggested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/ABI/testing/sysfs-platform_profile b/Documentation/ABI/testing/sysfs-platform_profile
index 9d6b89b66cca7f0368830b7f14731872abd42aab..dae9c89419053b56b9e115afa16e8c23e246e864 100644 (file)
--- a/Documentation/ABI/testing/sysfs-platform_profile
+++ b/Documentation/ABI/testing/sysfs-platform_profile
@@ -5,13 +5,17 @@ Description:  This file contains a space-separated list of profiles supported for
 
                Drivers must use the following standard profile-names:
 
-               ============    ============================================
-               low-power       Low power consumption
-               cool            Cooler operation
-               quiet           Quieter operation
-               balanced        Balance between low power consumption and performance
-               performance     High performance operation
-               ============    ============================================
+               ====================    ========================================
+               low-power               Low power consumption
+               cool                    Cooler operation
+               quiet                   Quieter operation
+               balanced                Balance between low power consumption
+                                       and performance
+               balanced-performance    Balance between performance and low
+                                       power consumption with a slight bias
+                                       towards performance
+               performance             High performance operation
+               ====================    ========================================
 
                Userspace may expect drivers to offer more than one of these
                standard profile names.

diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c
index 4a59c5993bde432b482f85d6bf7c345b6467b3dd..dd2fbf38e414889589b126315650d0410b9caba7 100644 (file)
--- a/drivers/acpi/platform_profile.c
+++ b/drivers/acpi/platform_profile.c
@@ -17,6 +17,7 @@ static const char * const profile_names[] = {
        [PLATFORM_PROFILE_COOL] = "cool",
        [PLATFORM_PROFILE_QUIET] = "quiet",
        [PLATFORM_PROFILE_BALANCED] = "balanced",
+       [PLATFORM_PROFILE_BALANCED_PERFORMANCE] = "balanced-performance",
        [PLATFORM_PROFILE_PERFORMANCE] = "performance",
 };
 static_assert(ARRAY_SIZE(profile_names) == PLATFORM_PROFILE_LAST);

diff --git a/include/linux/platform_profile.h b/include/linux/platform_profile.h
index b4794027e759a0ec5c8a3c7fe086c22164e5bcca..a6329003aee7fdb297ba5ff26d45aa9ed13c2d50 100644 (file)
--- a/include/linux/platform_profile.h
+++ b/include/linux/platform_profile.h
@@ -21,6 +21,7 @@ enum platform_profile_option {
        PLATFORM_PROFILE_COOL,
        PLATFORM_PROFILE_QUIET,
        PLATFORM_PROFILE_BALANCED,
+       PLATFORM_PROFILE_BALANCED_PERFORMANCE,
        PLATFORM_PROFILE_PERFORMANCE,
        PLATFORM_PROFILE_LAST, /*must always be last */
 };