switch to intelliactive as defaultn7.1

5 files changed, 99 insertions, 86 deletions

diff --git a/init.grouper.rc b/init.grouper.rc
index 14b2de1..59198da 100644
--- a/init.grouper.rc
+++ b/init.grouper.rc
@@ -1,21 +1,25 @@
 import init.grouper.usb.rc
 
 on early-init
+    # Set init and its forked children's oom_adj.
+    write /proc/1/oom_score_adj -1000
     mount debugfs debugfs /sys/kernel/debug
 
 on init
     symlink /sdcard /storage/sdcard0
 
 on early-boot
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
+    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor intelliactive
+    write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor intelliactive
+    write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor intelliactive
+    write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor intelliactive
 
 on fs
     setprop ro.crypto.umount_sd false
     mount_all /fstab.grouper
     swapon_all /fstab.grouper
+    mkdir /per 0700 root root
+    mount vfat /dev/block/platform/sdhci-tegra.3/by-name/PER /per ro context=u:object_r:oemfs:s0
 
 on post-fs-data
     # change back to bluetooth from system
@@ -84,6 +88,7 @@ on boot
 # didim
     chown system system /sys/class/graphics/fb0/device/smartdimmer/enable
     chown system system /sys/class/graphics/fb0/device/smartdimmer/aggressiveness
+    chown system system /sys/class/graphics/fb0/device/smartdimmer/phase_in_adjustments
 
 # power
     chown system system /sys/kernel/tegra_cap/core_cap_level
@@ -236,55 +241,66 @@ on boot
     chmod 600 /sys/bus/iio/devices/iio:device1/trigger/current_trigger
 
 # Power management settings
-    write /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load 50
-    write /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay 20000
-    write /sys/devices/system/cpu/cpufreq/interactive/boost_factor 2
-    write /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq 860000
-    write /sys/devices/system/cpu/cpufreq/interactive/input_boost 1
-    write /sys/devices/system/cpu/cpufreq/interactive/io_is_busy 1
-    write /sys/devices/system/cpu/cpufreq/interactive/min_sample_time 100000
-    write /sys/devices/system/cpu/cpufreq/interactive/sustain_load 80
-    write /sys/devices/system/cpu/cpufreq/interactive/timer_rate 50000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/above_hispeed_delay 30000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/boost 0
+    write /sys/devices/system/cpu/cpufreq/intelliactive/boostpulse 1
+    write /sys/devices/system/cpu/cpufreq/intelliactive/boostpulse_duration 80000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/go_hispeed_load 90
+    write /sys/devices/system/cpu/cpufreq/intelliactive/hispeed_freq 860000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/io_is_busy 1
+    write /sys/devices/system/cpu/cpufreq/intelliactive/min_sample_time 40000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/sampling_down_factor 60000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/sync_freq 780000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/target_loads 90
+    write /sys/devices/system/cpu/cpufreq/intelliactive/timer_rate 10000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/timer_slack 30000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_freq 780000
+    write /sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_load 65
+    write /sys/devices/system/cpu/cpufreq/intelliactive/two_phase_freq 860000,860000,860000,860000
     write /sys/module/cpu_tegra3/parameters/no_lp 0
     write /sys/module/cpu_tegra3/parameters/auto_hotplug 1
     write /sys/module/cpuidle/parameters/lp2_in_idle 0
-    #write /sys/module/tegra3_emc/parameters/emc_enable 0
-    #write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 1000000
-    #write /sys/module/cpuidle_t3/parameters/lp2_0_in_idle 0
-
-# Interactive governor settings
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/boost_factor
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boost_factor
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/core_lock_count
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/core_lock_count
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/core_lock_period
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/core_lock_period
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/go_maxspeed_load
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/go_maxspeed_load
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/io_is_busy
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/max_boost
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/max_boost
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/sustain_load
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/sustain_load
-    chown system system /sys/devices/system/cpu/cpufreq/interactive/min_core_keep
-    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/min_core_keep
-    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
-    chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
-    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
-    chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
-    chown system system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
-    chmod 0660 /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
-    chown system system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq
-    chmod 0660 /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq
-    chown system system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq
-    chmod 0660 /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq
-    chown system system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq
-    chmod 0660 /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq
-    chown system system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq
-    chmod 0660 /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq
-    chown system system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq
-    chmod 0660 /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq
+
+# Inteelliactive governor settings
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/above_hispeed_delay
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/boost
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/boostpulse
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/boostpulse_duration
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/go_hispeed_load
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/hispeed_freq
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/io_is_busy
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/min_sample_time
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/sampling_down_factor
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/sync_freq
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/target_loads
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/timer_rate
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/timer_slack
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_freq
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_load
+    chown system system /sys/devices/system/cpu/cpufreq/intelliactive/two_phase_freq
+    chown system system /sys/module/cpu_tegra3/parameters/no_lp
+    chown system system /sys/module/cpu_tegra3/parameters/auto_hotplug
+    chown system system /sys/module/cpuidle/parameters/lp2_in_idle
+
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/above_hispeed_delay
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/boost
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/boostpulse
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/boostpulse_duration
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/go_hispeed_load
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/hispeed_freq
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/io_is_busy
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/min_sample_time
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/sampling_down_factor
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/sync_freq
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/target_loads
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/timer_rate
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/timer_slack
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_freq
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_load
+    chmod 0660 /sys/devices/system/cpu/cpufreq/intelliactive/two_phase_freq
+    chmod 0660 /sys/module/cpu_tegra3/parameters/no_lp
+    chmod 0660 /sys/module/cpu_tegra3/parameters/auto_hotplug
+    chmod 0660 /sys/module/cpuidle/parameters/lp2_in_idle 
 
 # Default Read Ahead value for sdcards
     write /sys/block/mmcblk0/queue/read_ahead_kb 128
@@ -316,6 +332,7 @@ on boot
     write /proc/sys/vm/page-cluster 0
     write /proc/sys/vm/swappiness 60
 
+
 # some additional performance tweaks (to be tested)
 	setprop dalvik.vm.heapgrowthlimit 128m
 	setprop dalvik.vm.heapsize 174m
@@ -336,6 +353,10 @@ on boot
 	write /sys/devices/tegradc.0/smartdimmer/enable 0
 	write /sys/devices/host1x/gr3d/enable_3d_scaling 1
 
+# stop ril-daemon if this is a wifi-only device
+on property:ro.carrier=wifi-only
+    stop ril-daemon
+
 service wpa_supplicant /system/bin/wpa_supplicant \
     -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
     -I/system/etc/wifi/wpa_supplicant_overlay.conf \
@@ -405,13 +426,6 @@ service iprenew_bt-pan /system/bin/dhcpcd -n
     disabled
     oneshot
 
-#Sensor: load calibration files.
-    service sensors-config /system/bin/sensors-config
-    class main
-    user root
-    oneshot
-#Sensor load calibration files end
-
 # set hwui properties depending on the screen resolution and the memory size
 service set_hwui_params /system/bin/set_hwui_params.sh
     class main
@@ -419,7 +433,6 @@ service set_hwui_params /system/bin/set_hwui_params.sh
     group root
     oneshot
 
-
 # bugreport is triggered by the VOLUME-DOWN and VOLUME-UP keys
 service bugreport /system/bin/dumpstate -d -p -B \
         -o /data/data/com.android.shell/files/bugreports/bugreport
@@ -466,4 +479,8 @@ service touch_fw_update /system/bin/touch_fw_update.sh
     group root
     oneshot
 
+service sensors-calib /system/bin/sensors-load-calibration.sh
+    class main
+    user root
+    oneshot
 
diff --git a/power/power.c b/power/power.c
index a87b05f..6470458 100644
--- a/power/power.c
+++ b/power/power.c
@@ -32,8 +32,7 @@
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
-#define BOOST_PATH      "/sys/devices/system/cpu/cpufreq/interactive/boost"
-#define INTERACTIVE_KEEP_MIN_CPU      "/sys/devices/system/cpu/cpufreq/interactive/min_core_keep"
+#define BOOST_PATH      "/sys/devices/system/cpu/cpufreq/intelliactive/boostpulse"
 #define UEVENT_MSG_LEN 2048
 #define TOTAL_CPUS 4
 #define RETRY_TIME_CHANGING_FREQ 20
@@ -182,20 +181,20 @@ static void uevent_init()
 
 static void grouper_power_init( __attribute__((unused)) struct power_module *module)
 {
-    /*
-     * cpufreq interactive governor: timer 20ms, min sample 100ms,
-     * hispeed 700MHz at load 40%
-     */
-
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/timer_rate", "50000");
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/min_sample_time", "100000");
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load", "50");
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay", "20000");
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/boost_factor", "0");
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/input_boost", "1");
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/io_is_busy", "1");
-    sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/hispeed_freq", "860000");
-    sysfs_write(INTERACTIVE_KEEP_MIN_CPU, "4");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/above_hispeed_delay","30000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/boostpulse","1");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/boostpulse_duration","80000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/go_hispeed_load","90");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/hispeed_freq","860000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/io_is_busy","1");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/min_sample_time","40000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/sampling_down_factor","60000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/sync_freq","780000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/target_loads","90");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/timer_rate","10000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/timer_slack","30000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_freq","780000");
+    sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/up_threshold_any_cpu_load","65");
     uevent_init();
 }
 
@@ -203,20 +202,12 @@ static void grouper_power_set_interactive(__attribute__((unused)) struct power_m
                                           __attribute__((unused)) int on)
 {
 	if (on) {
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load", "50");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/core_lock_period", "3000000");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/core_lock_count", "2");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/input_boost", "1");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/io_is_busy", "1");
-    		sysfs_write(INTERACTIVE_KEEP_MIN_CPU, "2");
+		sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/boostpulse", "1");
+    		sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/io_is_busy", "1");
 	}
 	else {
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load", "85");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/core_lock_period", "200000");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/core_lock_count", "0");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/input_boost", "0");
-		sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/io_is_busy", "0");
-    		sysfs_write(INTERACTIVE_KEEP_MIN_CPU, "0");
+		sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/boostpulse", "0");
+    		sysfs_write("/sys/devices/system/cpu/cpufreq/intelliactive/io_is_busy", "0");
 	}
 }
 
diff --git a/sepolicy/bootstat.te b/sepolicy/bootstat.te
new file mode 100644
index 0000000..ca7caa8
--- /dev/null
+++ b/sepolicy/bootstat.te
@@ -0,0 +1,3 @@
+# Read access to pseudo filesystems (for /proc/uptime).
+r_dir_file(bootstat, proc)
+
diff --git a/sepolicy/radio.te b/sepolicy/radio.te
index 6d72f41..9254b51 100644
--- a/sepolicy/radio.te
+++ b/sepolicy/radio.te
@@ -5,4 +5,5 @@ userdebug_or_eng(`
 
 allow radio system_app_data_file:dir getattr;
 allow radio self:process ptrace;
+allow radio sysfs_module_fuse:file read;
 
diff --git a/sepolicy/zygote.te b/sepolicy/zygote.te
index 5786c10..5e87f8a 100644
--- a/sepolicy/zygote.te
+++ b/sepolicy/zygote.te
@@ -11,3 +11,4 @@ allow zygote system_data_file:dir write;
 allow zygote system_data_file:dir add_name;
 allow zygote system_data_file:dir create;
 allow zygote system_data_file:dir setattr;
+allow zygote sysfs_module_fuse:file read;