Merge branch 'android-4.14-p' into android-exynos-4.14-ww-9610-minor_up-dev

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 37ecab2cba99131b2165aa84a3c978072fb5195b..0c0aa1996e6ee7b2e1add6f1d9aa235eac7da39b 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -599,7 +599,11 @@ menu "FAIR Scheuler tunables"
 
 choice
        prompt "Utilization's PELT half-Life"
+<<<<<<< HEAD
+       default PELT_UTIL_HALFLIFE_16
+=======
        default PELT_UTIL_HALFLIFE_32
+>>>>>>> android-4.14-p
        help
          Allows choosing one of the possible values for the PELT half-life to
          be used for the update of the utilization of tasks and CPUs.
@@ -607,6 +611,18 @@ choice
          build up to 50% utilization. The higher the half-life the longer it
          takes for a task to be represented as a big one.
 
+<<<<<<< HEAD
+         If not sure, use the deafult of 16 ms.
+
+config PELT_UTIL_HALFLIFE_32
+       bool "32 ms, for server"
+
+config PELT_UTIL_HALFLIFE_16
+       bool "16 ms, suggested for interactive workloads"
+
+config PELT_UTIL_HALFLIFE_8
+       bool "8 ms, very fast"
+=======
          If not sure, use the default of 32 ms.
 
 config PELT_UTIL_HALFLIFE_32
@@ -625,6 +641,7 @@ config PELT_UTIL_HALFLIFE_8
          Use 8ms as PELT half-life value. This will increase the ramp-up and
          decay of utlization and load four time as fast as for the default
          configuration using 32ms.
+>>>>>>> android-4.14-p
 
 endchoice
 
@@ -1026,6 +1043,18 @@ config SCHED_TUNE
 
          If unsure, say N.
 
+config SCHED_EMS
+       bool "Exynos Mobile Scheduler"
+       depends on SMP
+       help
+         This option supports Exynos mobile scheduler. It is designed to
+         secure the limits of energy aware scheduler. This option provides
+         features such as independent boosting functinos such as on-time migration,
+         and prefer_perf and enhanced prefer_idle that work in conjunction with
+         SCHEDTUNE.
+
+         If unsure, say N.
+
 config DEFAULT_USE_ENERGY_AWARE
        bool "Default to enabling the Energy Aware Scheduler feature"
        default n
@@ -1036,6 +1065,28 @@ config DEFAULT_USE_ENERGY_AWARE
 
          Say N if unsure.
 
+config SIMPLIFIED_ENERGY_MODEL
+       bool "Enable simplified energy model feature"
+       depends on SCHED_EMS
+       default n
+       help
+         This option enables support for simplified energy model. This allows
+         using a simple energy table declared per_cpu instead of using the EAS
+         energy table.
+
+         Say N if unsure.
+
+config SCHED_USE_FLUID_RT
+       bool "Enable Fluid RT scheduler feature"
+       depends on SCHED_EMS
+       default n
+       help
+       Basically, the Fluid RT selects the core by a task priority as usual.
+       But beyond the basic behavior, FRT performs the load balancing of
+       RT task by core selection with reference to utilization of rq.
+       And in some circumstances, she allows the task of lower priority
+       to preempt the higher one based on weighted load.
+
 config SYSFS_DEPRECATED
        bool "Enable deprecated sysfs features to support old userspace tools"
        depends on SYSFS