Revert "Revert "kitakami-common: Kang Perf/Thermal stack from angler & hima""

This reverts commit 5baf84cb.

configs/thermal-engine.conf

+# SENSOR : ALIAS
+# tsens_tz_sensor8 : cpu1
+# tsens_tz_sensor7 : cpu0
+# tsens_tz_sensor6 : cpu7
+# tsens_tz_sensor2 : pop_mem
+# tsens_tz_sensor15 : cpu6
+# tsens_tz_sensor14 : cpu5
+# tsens_tz_sensor13 : cpu4
+# tsens_tz_sensor12 : gpu
+# tsens_tz_sensor10 : cpu3
+# tsens_tz_sensor9 : cpu2
+
+sampling 5000
+#Conf file: /vendor/etc/thermal-engine.conf
+
+[CAMERA_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu0
+thresholds 60000 65000 75000
+thresholds_clr 50000 60000 65000
+actions camcorder camcorder camcorder
+action_info 0 1 2
+
+[SS-EMMCTHERM-CLUSTER0]
+algo_type ss
+sampling 500
+sensor emmc_therm
+device cluster0
+set_point 45000
+set_point_clr 44000
+time_constant 0
+
+[CPU7_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu7
+thresholds 75000
+thresholds_clr 60000
+actions hotplug_7
+action_info 1
+
+[CPU6_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu6
+thresholds 75000
+thresholds_clr 60000
+actions hotplug_6
+action_info 1
+
+[CPU5_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu5
+thresholds 75000
+thresholds_clr 60000
+actions hotplug_5
+action_info 1
+
+[CPU4_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu4
+thresholds 75000
+thresholds_clr 60000
+actions hotplug_4
+action_info 1
+
+[CPU3_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu3
+thresholds 90000
+thresholds_clr 75000
+actions hotplug_3
+action_info 1
+
+[CPU2_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu2
+thresholds 90000
+thresholds_clr 75000
+actions hotplug_2
+action_info 1
+
+[CPU1_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 100
+sensor cpu1
+thresholds 90000
+thresholds_clr 75000
+actions hotplug_1
+action_info 1
+
+[SS-CPU7-FINAL]
+algo_type ss
+sampling 100
+sensor cpu7
+device final_cluster1
+set_point 85000
+set_point_clr 70000
+time_constant 0
+
+[SS-CPU6-FINAL]
+algo_type ss
+sampling 100
+sensor cpu6
+device final_cluster1
+set_point 85000
+set_point_clr 70000
+time_constant 0
+
+[SS-CPU5-FINAL]
+algo_type ss
+sampling 100
+sensor cpu5
+device final_cluster1
+set_point 85000
+set_point_clr 70000
+time_constant 0
+
+[SS-CPU4-FINAL]
+algo_type ss
+sampling 100
+sensor cpu4
+device final_cluster1
+set_point 85000
+set_point_clr 70000
+time_constant 0
+
+[SS-CPU3-FINAL]
+algo_type ss
+sampling 100
+sensor cpu3
+device final_cluster0
+set_point 90000
+set_point_clr 75000
+time_constant 0
+
+[SS-CPU2-FINAL]
+algo_type ss
+sampling 100
+sensor cpu2
+device final_cluster0
+set_point 90000
+set_point_clr 75000
+time_constant 0
+
+[SS-CPU1-FINAL]
+algo_type ss
+sampling 100
+sensor cpu1
+device final_cluster0
+set_point 90000
+set_point_clr 75000
+time_constant 0
+
+[SS-CPU0-FINAL]
+algo_type ss
+sampling 100
+sensor cpu0
+device final_cluster0
+set_point 90000
+set_point_clr 75000
+time_constant 0
+
+[EMMC_MONITOR]
+algo_type monitor
+sampling 1000
+sensor emmc_therm
+thresholds 32000 33000 34000 35000 37000 38000 40000 41000 43000 45000 48000
+thresholds_clr 31000 32000 33000 34000 36000 37000 39000 40000 42000 44000 47000
+actions emmc emmc emmc emmc emmc emmc emmc emmc emmc emmc emmc
+action_info 2 2 3 3 4 4 4 4 2 3 10
+
+[CPU3_MONITOR]
+algo_type monitor
+sampling 65
+sensor cpu3
+thresholds 100000 105000 110000 115000
+thresholds_clr 97000 102000 107000 95000
+actions Uevent_Notify Uevent_Notify Uevent_Notify shutdown
+action_info 1 2 3 1000
+
+[CPU2_MONITOR]
+algo_type monitor
+sampling 65
+sensor cpu2
+thresholds 100000 105000 110000 115000
+thresholds_clr 97000 102000 107000 95000
+actions Uevent_Notify Uevent_Notify Uevent_Notify shutdown
+action_info 1 2 3 1000
+
+[CPU1_MONITOR]
+algo_type monitor
+sampling 65
+sensor cpu1
+thresholds 100000 105000 110000 115000
+thresholds_clr 97000 102000 107000 95000
+actions Uevent_Notify Uevent_Notify Uevent_Notify shutdown
+action_info 1 2 3 1000
+
+[CPU0_MONITOR]
+algo_type monitor
+sampling 1000
+sensor cpu0
+thresholds 100000 105000 110000 115000
+thresholds_clr 97000 102000 107000 95000
+actions Uevent_Notify Uevent_Notify Uevent_Notify shutdown
+action_info 1 2 3 1000
+
+[SS-GPU]
+#algo_type ss
+sampling 250
+sensor gpu
+device gpu
+set_point 82000
+set_point_clr 52000
+time_constant 0
+
+[SS-POPMEM]
+#algo_type ss
+sampling 10
+sensor pop_mem
+device cluster1
+set_point 80000
+set_point_clr 55000
+time_constant 16
+
+[SS-CPU7]
+#algo_type ss
+sampling 100
+sensor cpu7
+device cluster1
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SS-CPU6]
+#algo_type ss
+sampling 100
+sensor cpu6
+device cluster1
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SS-CPU5]
+#algo_type ss
+sampling 100
+sensor cpu5
+device cluster1
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SS-CPU4]
+#algo_type ss
+sampling 100
+sensor cpu4
+device cluster1
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SS-CPU3]
+#algo_type ss
+sampling 100
+sensor cpu3
+device cluster0
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SS-CPU2]
+#algo_type ss
+sampling 100
+sensor cpu2
+device cluster0
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SS-CPU1]
+#algo_type ss
+sampling 100
+sensor cpu1
+device cluster0
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SS-CPU0]
+#algo_type ss
+sampling 100
+sensor cpu0
+device cluster0
+set_point 75000
+set_point_clr 60000
+time_constant 0
+
+[SPEAKER-CAL]
+sampling 30000 30000 10 1800000
+sensor pm8994_tz
+sensors tsens_tz_sensor1 tsens_tz_sensor2 tsens_tz_sensor3 tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor11 tsens_tz_sensor12
+temp_range 6000 10000 2000
+max_temp 45000
+offset -4000
+
+[PMIC-ALARM-MONITOR]
+#algo_type monitor
+sampling 1000
+sensor pm8994_tz
+thresholds 107000 127000
+thresholds_clr 103000 123000
+actions hotplug_7+hotplug_6+hotplug_5+hotplug_4+hotplug_3+hotplug_2+hotplug_1+cluster1+cluster0 hotplug_7+hotplug_6+hotplug_5+hotplug_4+hotplug_3+hotplug_2+hotplug_1
+action_info 0+0+0+0+0+0+0+302400+302400 1+1+1+1+1+1+1
+
+[VDD_RSTR_MONITOR-TSENS15]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor15
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS14]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor14
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS13]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor13
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS12]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor12
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS11]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor11
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS10]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor10
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS9]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor9
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS8]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor8
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS7]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor7
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS6]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor6
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS5]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor5
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS4]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor4
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS3]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor3
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS2]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor2
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS1]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor1
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS0]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor0
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[GPU_MONITOR]
+algo_type monitor
+sensor msm_therm
+sampling 1000
+thresholds 40000     42000     45000     47000
+thresholds_clr 38000     40000     43000     45000
+actions gpu       gpu       gpu       gpu
+action_info 510000000 450000000 390000000 305000000
+
+[FINAL-GPU_MONITOR]
+algo_type monitor
+sensor gpu
+sampling 1000
+thresholds 76000     80000     85000     90000
+thresholds_clr 67000     75000     80000     85000
+actions gpu       gpu       gpu       gpu
+action_info 510000000 450000000 390000000 305000000
+
+[LC_MONITOR]
+algo_type       monitor
+sensor          msm_therm
+sampling        1000
+thresholds      37000     43000
+thresholds_clr  35000     40000
+actions         cluster0  cluster0
+action_info     1344000   960000
+
+[BC_MONITOR]
+algo_type       monitor
+sensor          msm_therm
+sampling        1000
+thresholds      36000     38000     41000
+thresholds_clr  34000     36000     40000
+actions         cluster1  cluster1  cluster1
+action_info     1536000   1344000   960000
+
+[MODEM_MONITOR]
+algo_type    monitor
+sensor       emmc_therm
+sampling     1000
+thresholds        47000
+thresholds_clr    44000
+actions           modem
+action_info       1

device-common.mk

@@ -327,6 +327,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
    camera.qcom_shim
 
+# Thermal
+PRODUCT_PACKAGES += \
+    thermal.qcom
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf
+
 # TimeKeep
 PRODUCT_PACKAGES += \
     timekeep \

proprietary-files.txt

@@ -135,17 +135,20 @@ vendor/lib/libconnctrl.so
 
 # Perf
 bin/msm_irqbalance
-vendor/bin/perfd
+vendor/bin/perfd|3abbda7d519d567429cfab3294ae5e62d8e8d5eb
+vendor/bin/thermal-engine|d501a7b6261f606cd79c188548d747f4c3ec1b03
 vendor/etc/perf-profile0.conf
 vendor/etc/perf-profile1.conf
 vendor/etc/perf-profile2.conf
 vendor/etc/perf-profile3.conf
 vendor/etc/perf-profile4.conf
 vendor/etc/perf-profile5.conf
-vendor/lib64/libqti-perfd-client.so
-vendor/lib64/libqti_performance.so
-vendor/lib/libqti-perfd-client.so
-vendor/lib/libqti_performance.so
+vendor/lib/libqti-perfd-client.so|a52d27399fd4ca2522a4ca3a97697346ed9cb7d1
+vendor/lib64/libqti-perfd-client.so|eb3bb8c51fd022efe89341ffb91d238e388256e9
+vendor/lib64/libsettings.so|3e459839d90a27d2eb23a3c9d030f46a5c4bfaf1
+vendor/lib/libthermalclient.so|6b84a374b99baef6218886c8a8b87081c054de84
+vendor/lib64/libthermalclient.so.so|b8b3af940651f0e06a6c769051eed76a208ffbd6
+vendor/lib64/libthermalioctl.so|6165b829945d8133f02e3f2d368399a06ede9f5a
 
 # Peripheral manager from Nexus 6P
 bin/pm-proxy

rootdir/init.qcom.rc

@@ -454,8 +454,6 @@ on post-fs-data
     chmod 2755 /data/misc/perfd
     mkdir /data/system/perfd 0770 root system
     chmod 2770 /data/system/perfd
-    rm /data/system/perfd/default_values
-    start perfd
 
     # SONY: Camera
     mkdir /data/camera 0770 media camera
@@ -548,18 +546,18 @@ on property:sys.listeners.registered=*
 service perfd /vendor/bin/perfd
     class main
     user root
-    group system
+    group root readproc
     disabled
-    socket perfd seqpacket 0666 root system
     writepid /dev/cpuset/system-background/tasks
 
-service thermal-engine /system/vendor/bin/thermal-engine
-   class main
-   user root
-   group root
-   socket thermal-send-client stream 0666 system system
-   socket thermal-recv-client stream 0660 system system
-   socket thermal-recv-passive-client stream 0666 system system
+service vendor.thermal-engine /vendor/bin/thermal-engine -c /vendor/etc/thermal-engine.conf
+    class main
+    user root
+    socket thermal-send-client stream 0660 system system
+    socket thermal-recv-client stream 0660 system system
+    socket thermal-recv-passive-client stream 0660 system system
+    group root
+    writepid /dev/cpuset/system-background/tasks
 
 service adsprpcd /system/bin/adsprpcd
    class main
@@ -702,6 +700,10 @@ service iddd /system/bin/iddd
     group oem_2987 log inet oem_2993
     disabled
 
+on property:sys.boot_completed=1
+    rm /data/system/perfd/default_values
+    start perfd
+
 on property:service.usb.otg.switch=check
     write /sys/module/qpnp_smbcharger_extension/parameters/start_id_polling 1
     setprop service.usb.otg_switch check_done

thermal/Android.bp

+//
+// Copyright 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_library_shared {
+    cflags: ["-Wno-unused-parameter"],
+    relative_install_path: "hw",
+    proprietary: true,
+    srcs: ["thermal.c"],
+    shared_libs: [
+        "liblog",
+        "libcutils",
+    ],
+
+    name: "thermal.qcom",
+}