sm8250-common: Update to Android 12 blobs

* From alioth V13.0.2.0.SKHMIXM Change-Id: I82e5ed03424e3c41a59a43c3324f4ff02a51949f
2022-04-29 19:31:22 +02:00
parent cf5f7786d4
commit 22ffc8d638
13 changed files with 421 additions and 408 deletions
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -212,7 +212,7 @@ SOONG_CONFIG_XIAOMI_KONA_ROOTDIR_PARTITION_SCHEME := a
 endif

 # Security patch level
-VENDOR_SECURITY_PATCH := 2022-01-01
+VENDOR_SECURITY_PATCH := 2022-02-01

 # Sepolicy
 include device/qcom/sepolicy_vndr/SEPolicy.mk
--- a/configs/public.libraries.txt
+++ b/configs/public.libraries.txt
@@ -11,10 +11,8 @@ libHalSuperSensorServer.so 64
 libSuperSensor.so 64
 libSuperSensorCPU.so 64
 libarcsoft_beautyshot.so 64
-libarcsoft_dualcam_refocus.so 64
-libarcsoft_dualcam_refocus_rear_t.so 64
-libarcsoft_dualcam_refocus_rear_w.so 64
-libarcsoft_dualcam_refocus_front.so 64
+libarcsoft_dualcam_refocus_image.so 64
+libarcsoft_dualcam_refocus_video.so 64
 libarcsoft_portrait_lighting.so 64
 libarcsoft_portrait_lighting_c.so 64
 libarcsoft_high_dynamic_range.so 64
@@ -32,13 +30,14 @@ libarcsoft_superportrait.so 64
 libmialgo_ie_capture.so 64
 libmialgo_utils.so 64
 libxmi_high_dynamic_range.so 64
+libxmi_hdr_checker.so 64
 libMIAIHDRhvx_interface.so 64
 libcvp2.so
 libcvp2_hfi.so
 libSNPE.so 64
 libsymphony-cpu.so 64
-libc++_shared.so 64
 libcamera_scene.so 64
 libsnpe_dsp_domains_v2.so 64
-libGLESv3.so
+libbeauty_face_interface.so 64
+libmiai_portraitsupernight.so 64
 libEGL.so
--- a/kona.mk
+++ b/kona.mk
@@ -215,7 +215,9 @@ PRODUCT_PACKAGES += \
    android.hardware.memtrack@1.0-service \
    libdisplayconfig.qti \
    libdisplayconfig.qti.vendor \
+    libdisplayconfig.system.qti \
    libqdMetaData \
+    libqdMetaData.system \
    libsdmcore \
    libsdmutils \
    libtinyxml \
--- a/manifest.xml
+++ b/manifest.xml
@@ -24,23 +24,11 @@
        <transport>hwbinder</transport>
        <fqname>@2.4::ICameraProvider/legacy/0</fqname>
    </hal>
-    <hal format="hidl">
-        <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.3::ICryptoFactory/wfdhdcp</fqname>
-        <fqname>@1.3::IDrmFactory/wfdhdcp</fqname>
-    </hal>
    <hal format="hidl">
        <name>android.hardware.gatekeeper</name>
        <transport>hwbinder</transport>
        <fqname>@1.0::IGatekeeper/default</fqname>
    </hal>
-    <hal format="hidl">
-        <name>android.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IGnss/gnss_vendor</fqname>
-        <fqname>@1.1::IGnss/default</fqname>
-    </hal>
    <hal format="hidl">
        <name>android.hardware.ir</name>
        <transport>hwbinder</transport>
@@ -115,11 +103,6 @@
        <transport>hwbinder</transport>
        <fqname>@2.1::IFactory/default</fqname>
    </hal>
-    <hal format="hidl">
-        <name>vendor.qti.gnss</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ILocHidlGnss/gnss_vendor</fqname>
-    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.alarm</name>
        <transport>hwbinder</transport>
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# Unpinned blobs from alioth_global-user 11 RKQ1.200826.002 V12.5.6.0.RKHMIXM release-keys
+# Unpinned blobs from alioth_global-user 12 RKQ1.200826.002 V13.0.2.0.SKHMIXM release-keys
 # lmi: lmi-user 11 RKQ1.200826.002 V12.5.3.0.RJKMIXM release-keys

 # ADSP
@@ -651,7 +651,6 @@ system_ext/etc/permissions/qcrilhook.xml
 system_ext/etc/permissions/qti_libpermissions.xml
 system_ext/etc/permissions/qti_permissions.xml
 system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml
-system_ext/etc/permissions/telephonyservice.xml
 system_ext/framework/qcrilhook.jar
 -system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 -vendor/app/IWlanService/IWlanService.apk
@@ -770,8 +769,8 @@ vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.soter@1.0.so

-# Soter service (Tencent) - from lmi
-vendor/app/SoterService/SoterService.apk|939423f0016034cf8676f64d384aafde308f779b
+# Soter service (Tencent)
+-vendor/app/SoterService/SoterService.apk

 # Thermal
 vendor/bin/mi_thermald
@@ -830,9 +829,11 @@ vendor/etc/wifi/aoa_cldb_swl14.bin
 # WiFi Display
 -framework/WfdCommon.jar
 system_ext/bin/wfdservice
+system_ext/bin/wfdservice64
 system_ext/etc/init/wfdservice.rc
 system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml
 system_ext/etc/seccomp_policy/wfdservice.policy
+system_ext/etc/seccomp_policy/wfdservice64.policy
 system_ext/etc/wfdconfigsink.xml
 system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
 system_ext/lib/libmmrtpdecoder.so
@@ -871,14 +872,8 @@ system_ext/lib64/libwfduibcsinkinterface.so
 system_ext/lib64/libwfduibcsrc.so
 system_ext/lib64/libwfduibcsrcinterface.so
 -system_ext/priv-app/WfdService/WfdService.apk
-vendor/bin/wfdhdcphalservice
-vendor/bin/wfdvndservice
 vendor/bin/wifidisplayhalservice
-vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc
 vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
-vendor/etc/init/wfdvndservice.rc
-vendor/etc/seccomp_policy/wfdhdcphalservice.policy
-vendor/etc/seccomp_policy/wfdvndservice.policy
 vendor/etc/seccomp_policy/wifidisplayhalservice.policy
 vendor/etc/wfdconfig.xml
 vendor/lib/libFileMux_proprietary.so
--- a/rootdir/bin/init.class_main.sh
+++ b/rootdir/bin/init.class_main.sh
@@ -33,12 +33,13 @@
 baseband=`getprop ro.baseband`
 sgltecsfb=`getprop persist.vendor.radio.sglte_csfb`
 datamode=`getprop persist.vendor.data.mode`
-low_ram=`getprop ro.config.low_ram`
 qcrild_status=true

 case "$baseband" in
    "apq" | "sda" | "qcs" )
-    setprop ro.vendor.radio.noril yes
+#    setprop ro.vendor.radio.noril yes
+    setprop ro.vendor.radio.noril true
+    stop ril-daemon
    stop vendor.ril-daemon
    stop vendor.qcrild
 esac
@@ -86,10 +87,12 @@ case "$baseband" in
    if [ "$qcrild_status" = "true" ]; then
        # Make sure both rild, qcrild are not running at same time.
        # This is possible with vanilla aosp system image.
+        stop ril-daemon
        stop vendor.ril-daemon

        start vendor.qcrild
    else
+        start ril-daemon
        start vendor.ril-daemon
    fi

@@ -127,15 +130,11 @@ case "$baseband" in
    case "$datamode" in
        "tethered")
            start vendor.dataqti
-            if [ "$low_ram" != "true" ]; then
-              start vendor.dataadpl
-            fi
+            start vendor.dataadpl
            ;;
        "concurrent")
            start vendor.dataqti
-            if [ "$low_ram" != "true" ]; then
-              start vendor.dataadpl
-            fi
+            start vendor.dataadpl
            ;;
        *)
            ;;
--- a/rootdir/bin/init.qcom.early_boot.sh
+++ b/rootdir/bin/init.qcom.early_boot.sh
@@ -262,13 +262,10 @@ case "$target" in
                    log -t BOOT -p i "SDM429 early_boot prop set for: HwID '$soc_hwid'"
                fi
                ;;
-            303|307|308|309|320|386|436)
+            303|307|308|309|320)
                # Vulkan is not supported for 8917 variants
                setprop vendor.opengles.version 196608
                setprop persist.graphics.vulkan.disable true
-                setprop vendor.gralloc.disable_ahardware_buffer 1
-                # Disable adsprpcd_sensorspd daemon
-                setprop vendor.fastrpc.disable.adsprpcd_sensorspd.daemon 1
                ;;
            *)
                setprop vendor.opengles.version 196608
@@ -338,38 +335,13 @@ case "$target" in
                    setprop vendor.media.target.version 3
                fi
                ;;
-            476)
-                # Fraser soc_id 476
-                setprop vendor.display.enable_qsync_idle 1
-                ;;
        esac
        ;;
    "bengal")
        case "$soc_hwid" in
-            441|473)
-                # 441 is for scuba and 473 for scuba iot qcm
-                setprop vendor.fastrpc.disable.cdsprpcd.daemon 1
-                setprop vendor.media.target.version 2
-                setprop vendor.gralloc.disable_ubwc 1
-                setprop vendor.display.enhance_idle_time 1
-                setprop vendor.netflix.bsp_rev ""
-                # 196609 is decimal for 0x30001 to report version 3.1
-                setprop vendor.opengles.version 196609
-                sku_ver=`cat /sys/devices/platform/soc/5a00000.qcom,vidc1/sku_version` 2> /dev/null
-                if [ $sku_ver -eq 1 ]; then
-                   setprop vendor.media.target.version 3
-                fi
-                ;;
-            471|474)
-                # 471 is for scuba APQ and 474 for scuba iot qcs
+            441)
                setprop vendor.fastrpc.disable.cdsprpcd.daemon 1
                setprop vendor.gralloc.disable_ubwc 1
-                setprop vendor.display.enhance_idle_time 1
-                setprop vendor.netflix.bsp_rev ""
-                ;;
-            *)
-                # default case is for bengal
-                setprop vendor.netflix.bsp_rev "Q6115-31409-1"
                ;;
        esac
        ;;
@@ -418,27 +390,26 @@ case "$target" in
                ;;
        esac
        ;;
+    "lahaina")
+        case "$soc_hwid" in
+            450)
+                setprop vendor.media.target_variant "_shima_v3"
+                sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc/sku_version` 2> /dev/null
+                if [ $sku_ver -eq 1 ]; then
+                    setprop vendor.media.target_variant "_shima_v1"
+                elif [ $sku_ver -eq 2 ]; then
+                    setprop vendor.media.target_variant "_shima_v2"
+                fi
+                ;;
+            *)
+                setprop vendor.media.target_variant "_lahaina"
+                ;;
+        esac
+        ;;
    "holi")
        setprop vendor.media.target_variant "_holi"
        ;;
 esac
-case "$target" in
-       "msm8937")
-          case "$soc_hwid" in
-              386|354|353|303)
-                 # enable qrtr-ns service for kernel 4.14 or above
-                 KernelVersionStr=`cat /proc/sys/kernel/osrelease`
-                 KernelVersionS=${KernelVersionStr:2:2}
-                 KernelVersionA=${KernelVersionStr:0:1}
-                 KernelVersionB=${KernelVersionS%.*}
-
-                 if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 14 ]; then
-                     setprop init.qcom.qrtrns.enable 1
-                 fi
-                 ;;
-           esac
-           ;;
- esac

 baseband=`getprop ro.baseband`
 #enable atfwd daemon all targets except sda, apq, qcs
--- a/rootdir/bin/init.qcom.post_boot.sh
+++ b/rootdir/bin/init.qcom.post_boot.sh
@@ -32,8 +32,7 @@ function 8953_sched_dcvs_eas()
    #governor settings
    echo 1 > /sys/devices/system/cpu/cpu0/online
    echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-    echo 0 > /sys/devices/system/cpu/cpufreq/schedutil/up_rate_limit_us
-    echo 0 > /sys/devices/system/cpu/cpufreq/schedutil/down_rate_limit_us
+    echo 0 > /sys/devices/system/cpu/cpufreq/schedutil/rate_limit_us
    #set the hispeed_freq
    echo 1401600 > /sys/devices/system/cpu/cpufreq/schedutil/hispeed_freq
    #default value for hispeed_load is 90, for 8953 and sdm450 it should be 85
@@ -45,8 +44,7 @@ function 8917_sched_dcvs_eas()
    #governor settings
    echo 1 > /sys/devices/system/cpu/cpu0/online
    echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-    echo 0 > /sys/devices/system/cpu/cpufreq/schedutil/up_rate_limit_us
-    echo 0 > /sys/devices/system/cpu/cpufreq/schedutil/down_rate_limit_us
+    echo 0 > /sys/devices/system/cpu/cpufreq/schedutil/rate_limit_us
    #set the hispeed_freq
    echo 1094400 > /sys/devices/system/cpu/cpufreq/schedutil/hispeed_freq
    #default value for hispeed_load is 90, for 8917 it should be 85
@@ -58,8 +56,7 @@ function 8937_sched_dcvs_eas()
    # enable governor for perf cluster
    echo 1 > /sys/devices/system/cpu/cpu0/online
    echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-    echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
-    echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
+    echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/rate_limit_us
    #set the hispeed_freq
    echo 1094400 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq
    #default value for hispeed_load is 90, for 8937 it should be 85
@@ -67,8 +64,7 @@ function 8937_sched_dcvs_eas()
    ## enable governor for power cluster
    echo 1 > /sys/devices/system/cpu/cpu4/online
    echo "schedutil" > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor
-    echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
-    echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
+    echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/rate_limit_us
    #set the hispeed_freq
    echo 768000 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_freq
    #default value for hispeed_load is 90, for 8937 it should be 85
@@ -82,19 +78,12 @@ function configure_automotive_sku_parameters() {
    echo 1056000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq
    echo 1171200 > /sys/devices/system/cpu/cpu7/cpufreq/scaling_min_freq
    echo 1785600 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
-    echo 902400000  > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/min_freq
-    echo 902400000  > /sys/class/devfreq/18321110.qcom,cpu4-cpu-l3-lat/min_freq
-    echo 902400000  > /sys/class/devfreq/18321110.qcom,cpu7-cpu-l3-lat/min_freq
-    echo 1612800000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/max_freq
-    echo 1612800000 > /sys/class/devfreq/18321110.qcom,cpu4-cpu-l3-lat/max_freq
-    echo 1612800000 > /sys/class/devfreq/18321110.qcom,cpu7-cpu-l3-lat/max_freq
    echo 902400000  > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/min_freq
    echo 902400000  > /sys/class/devfreq/soc\:qcom,cpu4-cpu-l3-lat/min_freq
    echo 902400000  > /sys/class/devfreq/soc\:qcom,cpu7-cpu-l3-lat/min_freq
    echo 1612800000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/max_freq
    echo 1612800000 > /sys/class/devfreq/soc\:qcom,cpu4-cpu-l3-lat/max_freq
    echo 1612800000 > /sys/class/devfreq/soc\:qcom,cpu7-cpu-l3-lat/max_freq
-
 #read feature id from nvram
 reg_val=`cat /sys/devices/platform/soc/780130.qfprom/qfprom0/nvmem | od -An -t d4`
 feature_id=$(((reg_val >> 20) & 0xFF))
@@ -114,50 +103,6 @@ else
 fi
 }

-function configure_automotive_sku_parameters_sa8195() {
-
-	#Setting the min supported frequencies
-        echo 1113600 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
-        echo 1171200 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq
-        echo 940800000  > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/min_freq
-        echo 940800000  > /sys/class/devfreq/18321110.qcom,cpu4-cpu-l3-lat/min_freq
-        echo 1651200000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/max_freq
-        echo 1651200000 > /sys/class/devfreq/18321110.qcom,cpu4-cpu-l3-lat/max_freq
-	echo 940800000  > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/min_freq
-        echo 940800000  > /sys/class/devfreq/soc\:qcom,cpu4-cpu-l3-lat/min_freq
-        echo 1651200000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/max_freq
-	echo 1651200000 > /sys/class/devfreq/soc\:qcom,cpu4-cpu-l3-lat/max_freq
-
-	#read feature id
-        reg_val=`cat /sys/devices/platform/soc/780130.qfprom/qfprom0/nvmem | od -An -t d4`
-        feature_id=$(((reg_val >> 20) & 0xFF))
-
-        #setting min gpu freq to 392  MHz
-        echo 4 > /sys/class/kgsl/kgsl-3d0/min_pwrlevel
-        if [ $feature_id == 0 ]; then
-                echo "feature_id is 0 for SA8195AA"
-
-                #setting max cpu freq to 2.496GHz
-                echo 2496000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq
-                #setting max gpu freq to 530 MHz
-                echo 3 > /sys/class/kgsl/kgsl-3d0/max_pwrlevel
-                echo {class:ddr, res:capped, val: 1804} > /sys/kernel/debug/aop_send_message
-        elif [ $feature_id == 1 ] || [ $feature_id == 2 ]; then
-                echo "feature_id is 1 for external SA8195AB"
-                echo "feature_id is 2 for internal SA8195AB"
-
-                #setting max cpu freq to 2.496GHz
-                echo 2496000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq
-                #setting max gpu freq to 670 MHz
-                echo 0 > /sys/class/kgsl/kgsl-3d0/max_pwrlevel
-                echo {class:ddr, res:capped, val: 2092} > /sys/kernel/debug/aop_send_message
-        elif [ $feature_id == 3 ]; then
-                echo "feature_id is 3 for external SA8195AC"
-        else
-                echo "unknown feature_id value" $feature_id
-        fi
-}
-
 function configure_sku_parameters() {

 #read feature id from nvram
@@ -182,10 +127,6 @@ if [ $feature_id == 6 ]; then
 	echo 748800 > /sys/devices/system/cpu/cpu5/cpufreq/scaling_max_freq
 	echo 1017600 > /sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq
 	echo 1017600 > /sys/devices/system/cpu/cpu7/cpufreq/scaling_max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/min_freq
-	echo 1017600000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/min_freq
-	echo 1017600000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/min_freq
 	echo 1017600000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu6-cpu-l3-lat/min_freq
@@ -212,10 +153,6 @@ elif [ $feature_id == 5 ]; then
 	echo 998400 > /sys/devices/system/cpu/cpu5/cpufreq/scaling_max_freq
 	echo 1708800 > /sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq
 	echo 1708800 > /sys/devices/system/cpu/cpu7/cpufreq/scaling_max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/min_freq
-	echo 1363200000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/min_freq
-	echo 1363200000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/min_freq
 	echo 1363200000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu6-cpu-l3-lat/min_freq
@@ -242,10 +179,6 @@ elif [ $feature_id == 4 ] || [ $feature_id == 3 ]; then
 	echo 1593600 > /sys/devices/system/cpu/cpu5/cpufreq/scaling_max_freq
 	echo 1900800 > /sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq
 	echo 1900800 > /sys/devices/system/cpu/cpu7/cpufreq/scaling_max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/min_freq
-	echo 1363200000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/min_freq
-	echo 1363200000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/min_freq
 	echo 1363200000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu6-cpu-l3-lat/min_freq
@@ -272,10 +205,6 @@ else
 	echo 1593600 > /sys/devices/system/cpu/cpu5/cpufreq/scaling_max_freq
 	echo 1900800 > /sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq
 	echo 1900800 > /sys/devices/system/cpu/cpu7/cpufreq/scaling_max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/min_freq
-	echo 1363200000 > /sys/class/devfreq/18321110.qcom,cpu0-cpu-l3-lat/max_freq
-	echo 940800000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/min_freq
-	echo 1363200000 > /sys/class/devfreq/18321110.qcom,cpu6-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/min_freq
 	echo 1363200000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/max_freq
 	echo 940800000 > /sys/class/devfreq/soc\:qcom,cpu6-cpu-l3-lat/min_freq
@@ -545,48 +474,22 @@ function sdm660_sched_interactive_dcvs() {

 function sdm660_sched_schedutil_dcvs() {

-    if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 19 ]; then
-        # configure governor settings for little cluster
-        echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy0/scaling_governor
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/up_rate_limit_us
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/down_rate_limit_us
-        echo 1401600 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/hispeed_freq
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/pl
-        echo 633600 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
-        echo 902400 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/rtg_boost_freq
+    # configure governor settings for little cluster
+    echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+    echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
+    echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
+    echo 1401600 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq

-        # configure governor settings for big cluster
-        echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy4/scaling_governor
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/up_rate_limit_us
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/down_rate_limit_us
-        echo 1401600 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/hispeed_freq
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/pl
-        echo 1113600 > /sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/rtg_boost_freq
-    else
-        # configure governor settings for little cluster
-        echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-        echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
-        echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
-        echo 1401600 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq
-
-        # configure governor settings for big cluster
-        echo "schedutil" > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor
-        echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
-        echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
-        echo 1401600 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_freq
-    fi
+    # configure governor settings for big cluster
+    echo "schedutil" > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor
+    echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
+    echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
+    echo 1401600 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_freq

    echo 1 > /proc/sys/kernel/sched_walt_rotate_big_tasks

-    #if the kernel version >=4.19,set input_boost_freq accordingly
-    if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 19 ]; then
-        echo "0:1401600" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
-        echo 40 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
-    else
-        echo "0:1401600" > /sys/module/cpu_boost/parameters/input_boost_freq
-        echo 40 > /sys/module/cpu_boost/parameters/input_boost_ms
-    fi
+    echo "0:1401600" > /sys/module/cpu_boost/parameters/input_boost_freq
+    echo 40 > /sys/module/cpu_boost/parameters/input_boost_ms

    # sched_load_boost as -6 is equivalent to target load as 85. It is per cpu tunable.
    echo -6 >  /sys/devices/system/cpu/cpu0/sched_load_boost
@@ -621,37 +524,24 @@ function sdm660_sched_schedutil_dcvs() {
            echo 1600 > $cpubw/bw_hwmon/idle_mbps
        done

-        if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -le 14 ]; then
-            for memlat in $device/*cpu*-lat/devfreq/*cpu*-lat
-            do
-                echo "mem_latency" > $memlat/governor
-                echo 10 > $memlat/polling_interval
-                echo 400 > $memlat/mem_latency/ratio_ceil
-            done
+        for memlat in $device/*cpu*-lat/devfreq/*cpu*-lat
+        do
+            echo "mem_latency" > $memlat/governor
+            echo 10 > $memlat/polling_interval
+            echo 400 > $memlat/mem_latency/ratio_ceil
+        done
+
+        for latfloor in $device/*cpu*-ddr-latfloor*/devfreq/*cpu-ddr-latfloor*
+        do
+            echo "compute" > $latfloor/governor
+            echo 10 > $latfloor/polling_interval
+        done

-            for latfloor in $device/*cpu*-ddr-latfloor*/devfreq/*cpu-ddr-latfloor*
-            do
-                echo "compute" > $latfloor/governor
-                echo 10 > $latfloor/polling_interval
-            done
-        fi
    done
-
-    if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 19 ]; then
-        # memlat specific settings are moved to seperate file under
-        # device/target specific folder
-        setprop vendor.dcvs.prop 1
-    fi
-
 }

 target=`getprop ro.board.platform`

-KernelVersionStr=`cat /proc/sys/kernel/osrelease`
-KernelVersionS=${KernelVersionStr:2:2}
-KernelVersionA=${KernelVersionStr:0:1}
-KernelVersionB=${KernelVersionS%.*}
-
 function configure_zram_parameters() {
    MemTotalStr=`cat /proc/meminfo | grep MemTotal`
    MemTotal=${MemTotalStr:16:8}
@@ -661,17 +551,12 @@ function configure_zram_parameters() {
    # Zram disk - 75% for Go devices.
    # For 512MB Go device, size = 384MB, set same for Non-Go.
    # For 1GB Go device, size = 768MB, set same for Non-Go.
-    # For 2GB Go device, size = 1536MB, set same for Non-Go.
-    # For >2GB Non-Go devices, size = 50% of RAM size. Limit the size to 4GB.
+    # For >=2GB Non-Go devices, size = 50% of RAM size. Limit the size to 4GB.
    # And enable lz4 zram compression for Go targets.

    let RamSizeGB="( $MemTotal / 1048576 ) + 1"
+    let zRamSizeMB="( $RamSizeGB * 1024 ) / 2"
    diskSizeUnit=M
-    if [ $RamSizeGB -le 2 ]; then
-        let zRamSizeMB="( $RamSizeGB * 1024 ) * 3 / 4"
-    else
-        let zRamSizeMB="( $RamSizeGB * 1024 ) / 2"
-    fi

    # use MB avoid 32 bit overflow
    if [ $zRamSizeMB -gt 4096 ]; then
@@ -683,22 +568,32 @@ function configure_zram_parameters() {
    fi

    if [ -f /sys/block/zram0/disksize ]; then
-        if [ -f /sys/block/zram0/use_dedup ]; then
-            echo 1 > /sys/block/zram0/use_dedup
-        fi
-        echo "$zRamSizeMB""$diskSizeUnit" > /sys/block/zram0/disksize
+        disksize=`cat /sys/block/zram0/disksize`
+        if [ $disksize -eq 0 ]; then
+            if [ -f /sys/block/zram0/use_dedup ]; then
+                echo 1 > /sys/block/zram0/use_dedup
+            fi
+            if [ $MemTotal -le 524288 ]; then
+                echo 402653184 > /sys/block/zram0/disksize
+            elif [ $MemTotal -le 1048576 ]; then
+                echo 805306368 > /sys/block/zram0/disksize
+            else
+                zramDiskSize=$zRamSizeMB$diskSizeUnit
+                echo $zramDiskSize > /sys/block/zram0/disksize
+            fi

-        # ZRAM may use more memory than it saves if SLAB_STORE_USER
-        # debug option is enabled.
-        if [ -e /sys/kernel/slab/zs_handle ]; then
-            echo 0 > /sys/kernel/slab/zs_handle/store_user
-        fi
-        if [ -e /sys/kernel/slab/zspage ]; then
-            echo 0 > /sys/kernel/slab/zspage/store_user
-        fi
+            # ZRAM may use more memory than it saves if SLAB_STORE_USER
+            # debug option is enabled.
+            if [ -e /sys/kernel/slab/zs_handle ]; then
+                echo 0 > /sys/kernel/slab/zs_handle/store_user
+            fi
+            if [ -e /sys/kernel/slab/zspage ]; then
+                echo 0 > /sys/kernel/slab/zspage/store_user
+            fi

-        mkswap /dev/block/zram0
-        swapon /dev/block/zram0 -p 32758
+            mkswap /dev/block/zram0
+            swapon /dev/block/zram0 -p 32758
+        fi
    fi
 }

@@ -775,21 +670,34 @@ function configure_memory_parameters() {
    # Set allocstall_threshold to 0 for all targets.
    #

-ProductName=`getprop ro.product.name`
-low_ram=`getprop ro.config.low_ram`
+    ProductName=`getprop ro.product.name`
+    low_ram=`getprop ro.config.low_ram`

-if [ "$ProductName" == "msmnile" ] || [ "$ProductName" == "kona" ] || [ "$ProductName" == "sdmshrike_au" ]; then
-      # Enable ZRAM
-      configure_zram_parameters
-      configure_read_ahead_kb_values
-      echo 0 > /proc/sys/vm/page-cluster
-      echo 100 > /proc/sys/vm/swappiness
-else
-    arch_type=`uname -m`
+    if [ "$ProductName" == "msmnile" ] || [ "$ProductName" == "kona" ] || [ "$ProductName" == "sdmshrike_au" ] || [ "$ProductName" == "alioth" ]; then
+        # Enable ZRAM
+        configure_zram_parameters
+        configure_read_ahead_kb_values
+        echo 0 > /proc/sys/vm/page-cluster
+        echo 100 > /proc/sys/vm/swappiness

-    # Set parameters for 32-bit Go targets.
-    if [ "$low_ram" == "true" ]; then
-        # Disable KLMK, ALMK, PPR & Core Control for Go devices
+        #add memory limit to camera cgroup
+        MemTotalStr=`cat /proc/meminfo | grep MemTotal`
+        MemTotal=${MemTotalStr:16:8}
+        if [ $MemTotal -gt 8388608 ]; then
+            let LimitSize=838860800
+        else
+            let LimitSize=524288000
+        fi
+
+        echo $LimitSize > /dev/memcg/camera/memory.soft_limit_in_bytes
+    else
+        arch_type=`uname -m`
+        MemTotalStr=`cat /proc/meminfo | grep MemTotal`
+        MemTotal=${MemTotalStr:16:8}
+
+        # Set parameters for 32-bit Go targets.
+        if [ $MemTotal -le 1048576 ] && [ "$low_ram" == "true" ]; then
+            # Disable KLMK, ALMK, PPR & Core Control for Go devices
        echo 0 > /sys/module/lowmemorykiller/parameters/enable_lmk
        echo 0 > /sys/module/lowmemorykiller/parameters/enable_adaptive_lmk
        echo 0 > /sys/module/process_reclaim/parameters/enable_process_reclaim
@@ -865,7 +773,7 @@ else
              *)
                #Set PPR parameters for all other targets.
                echo $set_almk_ppr_adj > /sys/module/process_reclaim/parameters/min_score_adj
-                echo 1 > /sys/module/process_reclaim/parameters/enable_process_reclaim
+                echo 0 > /sys/module/process_reclaim/parameters/enable_process_reclaim
                echo 50 > /sys/module/process_reclaim/parameters/pressure_min
                echo 70 > /sys/module/process_reclaim/parameters/pressure_max
                echo 30 > /sys/module/process_reclaim/parameters/swap_opt_eff
@@ -894,6 +802,14 @@ else
    # wsf Range : 1..1000 So set to bare minimum value 1.
    echo 1 > /proc/sys/vm/watermark_scale_factor

+    # Disable the feature of watermark boost for 8G and below device
+    MemTotalStr=`cat /proc/meminfo | grep MemTotal`
+    MemTotal=${MemTotalStr:16:8}
+
+    if [ $MemTotal -le 8388608 ]; then
+        echo 0 > /proc/sys/vm/watermark_boost_factor
+    fi
+
    configure_zram_parameters

    configure_read_ahead_kb_values
@@ -2220,6 +2136,10 @@ case "$target" in
                done

                #if the kernel version >=4.9,use the schedutil governor
+                KernelVersionStr=`cat /proc/sys/kernel/osrelease`
+                KernelVersionS=${KernelVersionStr:2:2}
+                KernelVersionA=${KernelVersionStr:0:1}
+                KernelVersionB=${KernelVersionS%.*}
                if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 9 ]; then
                    8953_sched_dcvs_eas
                else
@@ -2342,8 +2262,7 @@ case "$target" in
            # configure governor settings for little cluster
            echo 1 > /sys/devices/system/cpu/cpu0/online
            echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-            echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
-            echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
+            echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/rate_limit_us
            echo 1363200 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq
            #default value for hispeed_load is 90, for sdm632 it should be 85
            echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_load
@@ -2356,8 +2275,7 @@ case "$target" in
            # configure governor settings for big cluster
            echo 1 > /sys/devices/system/cpu/cpu4/online
            echo "schedutil" > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor
-            echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
-            echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
+            echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/rate_limit_us
            echo 1401600 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_freq
            #default value for hispeed_load is 90, for sdm632 it should be 85
            echo 85 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_load
@@ -2504,6 +2422,10 @@ case "$target" in
                # disable thermal core_control to update interactive gov settings
                echo 0 > /sys/module/msm_thermal/core_control/enabled

+                KernelVersionStr=`cat /proc/sys/kernel/osrelease`
+                KernelVersionS=${KernelVersionStr:2:2}
+                KernelVersionA=${KernelVersionStr:0:1}
+                KernelVersionB=${KernelVersionS%.*}
                if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 9 ]; then
                    8917_sched_dcvs_eas
                else
@@ -2585,6 +2507,10 @@ case "$target" in
                # disable thermal core_control to update interactive gov and core_ctl settings
                echo 0 > /sys/module/msm_thermal/core_control/enabled

+                KernelVersionStr=`cat /proc/sys/kernel/osrelease`
+                KernelVersionS=${KernelVersionStr:2:2}
+                KernelVersionA=${KernelVersionStr:0:1}
+                KernelVersionB=${KernelVersionS%.*}
                if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 9 ]; then
                    8937_sched_dcvs_eas
                else
@@ -2673,9 +2599,7 @@ case "$target" in
                     # enable governor for perf cluster
                     echo 1 > /sys/devices/system/cpu/cpu0/online
                     echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-                     echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
-                     echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
-
+                     echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/rate_limit_us
                     #set the hispeed_freq
                     echo 1497600 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq
                     echo 80 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_load
@@ -2689,9 +2613,7 @@ case "$target" in
                     ## enable governor for power cluster
                     echo 1 > /sys/devices/system/cpu/cpu4/online
                     echo "schedutil" > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor
-                     echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
-                     echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
-
+                     echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/rate_limit_us
                     #set the hispeed_freq
                     echo 998400 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_freq
                     echo 85 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_load
@@ -2741,9 +2663,7 @@ case "$target" in
                     # configure schedutil governor settings
                     echo 1 > /sys/devices/system/cpu/cpu0/online
                     echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-                     echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
-                     echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
-
+                     echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/rate_limit_us
                     #set the hispeed_freq
                     echo 1305600 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq
                     echo 80 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_load
@@ -2825,14 +2745,12 @@ case "$target" in
            panel=${panel:2:4}
        fi

-        if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -le 14 ]; then
-            if [ $panel -gt 1080 ]; then
-                echo 2 > /proc/sys/kernel/sched_window_stats_policy
-                echo 5 > /proc/sys/kernel/sched_ravg_hist_size
-            else
-                echo 3 > /proc/sys/kernel/sched_window_stats_policy
-                echo 3 > /proc/sys/kernel/sched_ravg_hist_size
-            fi
+        if [ $panel -gt 1080 ]; then
+            echo 2 > /proc/sys/kernel/sched_window_stats_policy
+            echo 5 > /proc/sys/kernel/sched_ravg_hist_size
+        else
+            echo 3 > /proc/sys/kernel/sched_window_stats_policy
+            echo 3 > /proc/sys/kernel/sched_ravg_hist_size
        fi
        #Apply settings for sdm660, sdm636,sda636
        case "$soc_id" in
@@ -2856,6 +2774,10 @@ case "$target" in
            echo 0-3 > /dev/cpuset/system-background/cpus

            #if the kernel version >=4.14,use the schedutil governor
+            KernelVersionStr=`cat /proc/sys/kernel/osrelease`
+            KernelVersionS=${KernelVersionStr:2:2}
+            KernelVersionA=${KernelVersionStr:0:1}
+            KernelVersionB=${KernelVersionS%.*}
            if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 14 ]; then
                sdm660_sched_schedutil_dcvs
            else
@@ -2890,9 +2812,6 @@ case "$target" in
                ;;
            esac

-	    # Disable cdsprpcd daemon for sdm630
-	    setprop vendor.fastrpc.disable.cdsprpcd.daemon 1
-
            # Setting b.L scheduler parameters
            echo 85 > /proc/sys/kernel/sched_upmigrate
            echo 85 > /proc/sys/kernel/sched_downmigrate
@@ -3210,8 +3129,11 @@ case "$target" in
            echo 100 > /proc/sys/kernel/sched_group_upmigrate

            # cpuset settings
-            echo 0-3 > /dev/cpuset/background/cpus
-            echo 0-3 > /dev/cpuset/system-background/cpus
+            echo 0-2     > /dev/cpuset/background/cpus
+            echo 0-3     > /dev/cpuset/system-background/cpus
+            echo 4-7     > /dev/cpuset/foreground/boost/cpus
+            echo 0-2,4-7 > /dev/cpuset/foreground/cpus
+            echo 0-7     > /dev/cpuset/top-app/cpus


            # configure governor settings for little cluster
@@ -3560,7 +3482,7 @@ case "$target" in
    fi

    case "$soc_id" in
-        "400" | "440" | "476" )
+        "400" | "440" )
        # Core control parameters on silver
        echo 0 0 0 0 1 1 > /sys/devices/system/cpu/cpu0/core_ctl/not_preferred
        echo 4 > /sys/devices/system/cpu/cpu0/core_ctl/min_cpus
@@ -3625,15 +3547,20 @@ case "$target" in
        # Enable conservative pl
        echo 1 > /proc/sys/kernel/sched_conservative_pl

-        echo "0:1228800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+        # enable input boost
+        echo 2 > /sys/devices/system/cpu/cpu_boost/sched_boost_on_input
+        echo "0:1516800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
        echo 120 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
+        echo 1 > /sys/devices/system/cpu/cpu_boost/sched_boost_on_powerkey_input
+        echo "0:1804800 1:0 2:0 3:0 4:0 5:0 6:2208000 7:2400000" > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_freq
+        echo 400 > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_ms

        # Set Memory parameters
        configure_memory_parameters

        if [ `cat /sys/devices/soc0/revision` == "2.0" ]; then
             # r2.0 related changes
-             echo "0:1075200" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+             echo "0:1516800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
             echo 610000 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/rtg_boost_freq
             echo 1075200 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/hispeed_freq
             echo 1152000 > /sys/devices/system/cpu/cpufreq/policy6/schedutil/hispeed_freq
@@ -3716,8 +3643,11 @@ case "$target" in
        setprop vendor.dcvs.prop 1

        # cpuset parameters
-        echo 0-5 > /dev/cpuset/background/cpus
-        echo 0-5 > /dev/cpuset/system-background/cpus
+        echo 0-2     > /dev/cpuset/background/cpus
+        echo 0-3     > /dev/cpuset/system-background/cpus
+        echo 4-7     > /dev/cpuset/foreground/boost/cpus
+        echo 0-2,4-7 > /dev/cpuset/foreground/cpus
+        echo 0-7     > /dev/cpuset/top-app/cpus

        # Turn off scheduler boost at the end
        echo 0 > /proc/sys/kernel/sched_boost
@@ -3786,8 +3716,12 @@ case "$target" in
        # Enable conservative pl
        echo 1 > /proc/sys/kernel/sched_conservative_pl

-        echo "0:1248000" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+        echo 2 > /sys/devices/system/cpu/cpu_boost/sched_boost_on_input
+        echo "0:1516800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
        echo 120 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
+        echo 1 > /sys/devices/system/cpu/cpu_boost/sched_boost_on_powerkey_input
+        echo "0:1804800 1:0 2:0 3:0 4:0 5:0 6:2208000 7:0" > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_freq
+        echo 400 > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_ms

        # Set Memory parameters
        configure_memory_parameters
@@ -3846,6 +3780,7 @@ case "$target" in
            do
                echo 1 > /sys/devices/virtual/npu/msm_npu/pwr
                echo "bw_hwmon" > $npullccbw/governor
+                echo 40 > $npullccbw/polling_interval
                echo "2288 4577 7110 9155 12298 14236 16265" > $npullccbw/bw_hwmon/mbps_zones
                echo 4 > $npullccbw/bw_hwmon/sample_ms
                echo 100 > $npullccbw/bw_hwmon/io_percent
@@ -3854,7 +3789,6 @@ case "$target" in
                echo 30 > $npullccbw/bw_hwmon/down_thres
                echo 0 > $npullccbw/bw_hwmon/guard_band_mbps
                echo 250 > $npullccbw/bw_hwmon/up_scale
-                echo 40 > $npullccbw/polling_interval
                echo 0 > /sys/devices/virtual/npu/msm_npu/pwr
            done
        done
@@ -3863,8 +3797,11 @@ case "$target" in
        setprop vendor.dcvs.prop 1

        # cpuset parameters
-        echo 0-5 > /dev/cpuset/background/cpus
-        echo 0-5 > /dev/cpuset/system-background/cpus
+        echo 0-2     > /dev/cpuset/background/cpus
+        echo 0-3     > /dev/cpuset/system-background/cpus
+        echo 4-7     > /dev/cpuset/foreground/boost/cpus
+        echo 0-2,4-7 > /dev/cpuset/foreground/cpus
+        echo 0-7     > /dev/cpuset/top-app/cpus

        # Turn off scheduler boost at the end
        echo 0 > /proc/sys/kernel/sched_boost
@@ -3885,7 +3822,7 @@ case "$target" in
        fi

        case "$soc_id" in
-                 "417" | "420" | "444" | "445" | "469" | "470" )
+                 "417" | "420" | "444" | "445" )

            # Core control is temporarily disabled till bring up
            echo 0 > /sys/devices/system/cpu/cpu0/core_ctl/enable
@@ -3923,9 +3860,6 @@ case "$target" in
            echo 1056000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq
            echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/rtg_boost_freq

-            echo "0:1017600" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
-            echo 80 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
-
 	    echo 1 > /proc/sys/kernel/sched_walt_rotate_big_tasks

            # sched_load_boost as -6 is equivalent to target load as 85. It is per cpu tunable.
@@ -3996,7 +3930,7 @@ case "$target" in

        # Scuba perf/power tunings
        case "$soc_id" in
-             "441" | "473" | "474" )
+             "441" )

            # Quad-core device. disable core_ctl
            echo 0 > /sys/devices/system/cpu/cpu0/core_ctl/enable
@@ -5039,18 +4973,9 @@ case "$target" in
    echo 0 > /sys/module/lpm_levels/parameters/sleep_disabled
    configure_memory_parameters
    target_type=`getprop ro.hardware.type`
-	if [ -f /sys/devices/soc0/soc_id ]; then
-                soc_id=`cat /sys/devices/soc0/soc_id`
-            else
-                soc_id=`cat /sys/devices/system/soc/soc0/id`
-            fi
 	if [ "$target_type" == "automotive" ]; then
           # update frequencies
-	   if [ "$soc_id" == "340" ] | [ "$soc_id" == "405" ]; then #sa8195
-		configure_automotive_sku_parameters_sa8195
-	   else #sa8155
-		configure_automotive_sku_parameters
-	   fi
+           configure_automotive_sku_parameters
 	fi

    ;;
@@ -5256,7 +5181,13 @@ case "$target" in

 	#Setting the min supported frequencies
 	echo 1113600 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+	echo 1113600 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
+	echo 1113600 > /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq
+        echo 1113600 > /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq
        echo 1171200 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq
+        echo 1171200 > /sys/devices/system/cpu/cpu5/cpufreq/scaling_min_freq
+        echo 1171200 > /sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq
+        echo 1171200 > /sys/devices/system/cpu/cpu7/cpufreq/scaling_min_freq
 	echo 940800000  > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/min_freq
 	echo 940800000  > /sys/class/devfreq/soc\:qcom,cpu4-cpu-l3-lat/min_freq
 	echo 1651200000 > /sys/class/devfreq/soc\:qcom,cpu0-cpu-l3-lat/max_freq
@@ -5264,24 +5195,17 @@ case "$target" in
        #setting min gpu freq to 392  MHz
        echo 4 > /sys/class/kgsl/kgsl-3d0/min_pwrlevel
        if [ $feature_id == 0 ]; then
-                echo "feature_id is 0 for SA8195AA"
+                echo "feature_id is 0 for SA8185P"

-                #setting max cpu freq to 2.496GHz
-                echo 2496000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq
                #setting max gpu freq to 530 MHz
                echo 3 > /sys/class/kgsl/kgsl-3d0/max_pwrlevel
                echo {class:ddr, res:capped, val: 1804} > /sys/kernel/debug/aop_send_message
-        elif [ $feature_id == 1 ] || [ $feature_id == 2 ]; then
-                echo "feature_id is 1 for external SA8195AB"
-                echo "feature_id is 2 for internal SA8195AB"
+        elif [ $feature_id == 1 ]; then
+                echo "feature_id is 1 for SA8195P"

-                #setting max cpu freq to 2.496GHz
-                echo 2496000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq
                #setting max gpu freq to 670 MHz
                echo 0 > /sys/class/kgsl/kgsl-3d0/max_pwrlevel
                echo {class:ddr, res:capped, val: 2092} > /sys/kernel/debug/aop_send_message
-        elif [ $feature_id == 3 ]; then
-                echo "feature_id is 3 for external SA8195AC"
        else
                echo "unknown feature_id value" $feature_id
        fi
@@ -5333,8 +5257,11 @@ case "$target" in
 	echo 400000000 > /proc/sys/kernel/sched_coloc_downmigrate_ns

 	# cpuset parameters
-	echo 0-3 > /dev/cpuset/background/cpus
-	echo 0-3 > /dev/cpuset/system-background/cpus
+        echo 0-2     > /dev/cpuset/background/cpus
+        echo 0-3     > /dev/cpuset/system-background/cpus
+        echo 4-7     > /dev/cpuset/foreground/boost/cpus
+        echo 0-2,4-7 > /dev/cpuset/foreground/cpus
+        echo 0-7     > /dev/cpuset/top-app/cpus

 	# Turn off scheduler boost at the end
 	echo 0 > /proc/sys/kernel/sched_boost
@@ -5352,8 +5279,10 @@ case "$target" in
 	echo 1 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/pl

 	# configure input boost settings
-	echo "0:1324800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+	echo "0:1344000" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
 	echo 120 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
+	echo "0:1804800 1:0 2:0 3:0 4:2419200 5:0 6:0 7:2841600" > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_freq
+	echo 400 > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_ms

 	# configure governor settings for gold cluster
 	echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy4/scaling_governor
--- a/rootdir/etc/init.qcom.power.rc
+++ b/rootdir/etc/init.qcom.power.rc
@@ -92,6 +92,13 @@ on early-init
    write /sys/bus/platform/devices/1d84000.ufshc/clkscale_enable 0

 on init
+    # Setup permission for Power HAL
+    chown system system /dev/stune/top-app/schedtune.boost
+    chown system system /dev/cpu_dma_latency
+
+    chmod 0664 /dev/stune/top-app/schedtune.boost
+    chmod 0664 /dev/cpu_dma_latency
+
    # Boot time cpuset and stune
    write /dev/cpuset/top-app/cpus 0-7
    write /dev/cpuset/foreground/cpus 0-7
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -59,13 +59,10 @@ on early-init
    chown system graphics /sys/kernel/debug/sync/sw_sync
    chmod 0666 /sys/kernel/debug/sync/sw_sync

-    #Disable UFS clock scaling
-    write /sys/bus/platform/devices/1d84000.ufshc/clkscale_enable 0
-
    chown root system /dev/kmsg
    chmod 0620 /dev/kmsg
    # Load WIGIG platform driver
-    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules msm_11ad_proxy
+    # exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules msm_11ad_proxy

 on init

@@ -81,9 +78,11 @@ on init
    write /sys/fs/cgroup/memory/bg/memory.swappiness 140
    write /sys/fs/cgroup/memory/bg/memory.move_charge_at_immigrate 1
    chown root system /sys/fs/cgroup/memory/bg/tasks
-    write /sys/kernel/icnss/wpss_boot 1
    chmod 0660 /sys/fs/cgroup/memory/bg/tasks

+    # Allow both charger and hal_light to access panel0 backlight
+    chown system system /sys/class/backlight/panel0-backlight/brightness
+
 on post-fs
    chmod 0755 /sys/kernel/debug/tracing

@@ -106,16 +105,6 @@ on early-boot

    chown system system /mnt/vendor/persist/data/pfm/licenses
    chmod 0775 /mnt/vendor/persist/data/pfm/licenses
-    chown system system /mnt/vendor/persist/data/pfm/licenses/store_0
-    chmod 0664 /mnt/vendor/persist/data/pfm/licenses/store_0
-    chown system system /mnt/vendor/persist/data/pfm/licenses/store_1
-    chmod 0664 /mnt/vendor/persist/data/pfm/licenses/store_1
-    chown system system /mnt/vendor/persist/data/pfm/licenses/store_2
-    chmod 0664 /mnt/vendor/persist/data/pfm/licenses/store_2
-    chown system system /mnt/vendor/persist/data/pfm/licenses/store_3
-    chmod 0664 /mnt/vendor/persist/data/pfm/licenses/store_3
-    chown system system /mnt/vendor/persist/data/pfm/licenses/store_4
-    chmod 0664 /mnt/vendor/persist/data/pfm/licenses/store_4

 on boot
    chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power
@@ -150,6 +139,16 @@ on boot
    chown bluetooth net_bt /sys/class/rfkill/rfkill0/device/extldo
    chmod 0660 /sys/class/rfkill/rfkill0/device/extldo

+    # add for power data upload
+    chown system system /sys/power/sum_wakeup_time
+    chmod 0660 /sys/power/sum_wakeup_time
+    chown system system /sys/power/last_wake_time
+    chmod 0660 /sys/power/last_wake_time
+    chown system system /sys/power/wake_times
+    chmod 0660 /sys/power/wake_times
+    chown system system /sys/power/screen_off_flag
+    chmod 0660 /sys/power/screen_off_flag
+
    # This location is used by QCRIL to host UNIX domain
    # socket files used for internal IPC within QCRIL
    # modules
@@ -170,6 +169,8 @@ on boot

    setprop wifi.interface wlan0

+    setprop persist.bluetooth.a2dp_offload.disabled false
+
    setprop ro.telephony.call_ring.multiple false

    #enable camera read sensors data
@@ -211,7 +212,6 @@ on boot
    chown root system /sys/kernel/dload/dload_mode
    chmod 0660 /sys/kernel/dload/dload_mode

-    chown system system /sys/class/backlight/panel0-backlight/brightness
    chown system system /sys/class/backlight/panel0-backlight/max_brightness
    chown system system /sys/class/backlight/panel1-backlight/brightness
    chown system system /sys/class/backlight/panel1-backlight/max_brightness
@@ -233,6 +233,10 @@ on boot

    # Create vpp directory
    mkdir /mnt/vendor/persist/vpp 0770 media media
+    copy  /vendor/etc/tunings.txt /mnt/vendor/persist/vpp/tunings.txt
+
+    # Create hvdcp_opti directory
+    mkdir /mnt/vendor/persist/hvdcp_opti 0770 root system

    #Create persist for camera calibration data
    mkdir /mnt/vendor/persist/camera 0755 system cameraserver
@@ -242,6 +246,8 @@ on boot

 # msm specific files that need to be created on /data
 on post-fs-data
+    rm /data/vendor/wifi/cnss_diag.conf
+
    mkdir /data/vendor/misc 01771 system system

    # Create directory used for dump collection
@@ -253,9 +259,6 @@ on post-fs-data
    # Change lm related dirs
    mkdir /data/vendor/lm 0700 root root

-    # Create directory used by powermodule
-    mkdir /data/vendor/pwr 0700 root root
-
    # Create directory used by media clients
    mkdir /data/vendor/media 0770 mediacodec media

@@ -296,7 +299,7 @@ on post-fs-data
    chown radio radio /data/vendor/connectivity

    # Create directory used by audio subsystem
-    mkdir /data/vendor/audio 0770 audio audio
+    mkdir /data/vendor/audio 0771 audio audio

    # Create directory for audio delta files
    mkdir /data/vendor/audio/acdbdata 0770 media audio
@@ -335,7 +338,6 @@ on post-fs-data
    mkdir /dev/socket/location 0770 gps gps
    mkdir /dev/socket/location/mq 0770 gps gps
    mkdir /dev/socket/location/xtra 0770 gps gps
-    mkdir /dev/socket/location/dgnss 0770 gps gps

    #Create directories for wifihal services
    mkdir /dev/socket/wifihal 0770 wifi wifi
@@ -400,6 +402,9 @@ on post-fs-data
    #Create dir for TUI
    mkdir /data/vendor/tui 0700 system drmrpc

+    #Create dir for dolby
+    mkdir /data/vendor/dolby 0770 media media
+
 service nqnfcinfo /system/vendor/bin/nqnfcinfo
    class late_start
    group nfc
@@ -437,11 +442,10 @@ service vendor.ssr_setup /system/vendor/bin/ssr_setup
    oneshot
    disabled

-service vendor.ss_ramdump /system/vendor/bin/subsystem_ramdump
-    class main
-    user system
-    group system
-    ioprio rt 4
+service vendor.ss_ramdump /system/bin/subsystem_ramdump_system 2
+    class late_start
+#   user system
+    group system everybody
    disabled

 on property:ro.vendor.iocgrp.config=1
@@ -456,6 +460,9 @@ on property:ro.vendor.iocgrp.config=1
    write /dev/blkio/blkio.weight 1000
    write /dev/blkio/bg/blkio.weight 100

+on property:persist.vendor.sys.per_app_memcg=1
+    setprop ro.config.per_app_memcg true
+
 on property:persist.sys.ssr.enable_debug=*
    write /sys/module/subsystem_restart/parameters/enable_debug ${persist.sys.ssr.enable_debug}

@@ -474,7 +481,7 @@ on property:persist.vendor.ssr.restart_level=*
 on property:persist.vendor.ssr.enable_ramdumps=1
    write /sys/module/subsystem_restart/parameters/enable_ramdumps 1
    mkdir /data/vendor/ramdump_ssr 770 system system
-    start vendor.ss_ramdump
+#   start vendor.ss_ramdump

 on property:persist.vendor.ssr.enable_ramdumps=0
    write /sys/module/subsystem_restart/parameters/enable_ramdumps 0
@@ -487,8 +494,6 @@ on property:persist.vendor.sys.rawdump_copy=0

 on property:sys.boot_completed=1
    write /dev/kmsg "Boot completed "
-    #Enable UFS clock scaling back
-    write /sys/bus/platform/devices/1d84000.ufshc/clkscale_enable 1
    #Reset read ahead for dm-0 and dm-1 to 512kb
    write /sys/block/dm-0/queue/read_ahead_kb 512
    write /sys/block/dm-1/queue/read_ahead_kb 512
@@ -507,14 +512,11 @@ on property:vendor.radio.atfwd.start=false
 # corefile limit
 on property:persist.debug.trace=1
    mkdir /data/core 0777 root root
-    write /proc/sys/kernel/core_pattern "/data/core/%E.%p.%e"
+    write /proc/sys/kernel/core_pattern "/data/core/core-%e-%p"

 on property:vendor.media.target.version=*
    setprop vendor.sys.media.target.version ${vendor.media.target.version}

-on property:vendor.netflix.bsp_rev=*
-    setprop ro.netflix.bsp_rev ${vendor.netflix.bsp_rev}
-
 on property:vendor.media.target_variant=*
    setprop ro.media.xml_variant.codecs ${vendor.media.target_variant}
    setprop ro.media.xml_variant.codecs_performance ${vendor.media.target_variant}
@@ -546,6 +548,14 @@ service qmiproxy /system/bin/qmiproxy
    group radio diag
    disabled

+# Adjust socket buffer to enlarge TCP receive window for high bandwidth
+# but only if ro.data.large_tcp_window_size property is set.
+on property:ro.data.large_tcp_window_size=true
+    write /proc/sys/net/ipv4/tcp_adv_win_scale  2
+
+on property:sys.sysctl.tcp_adv_win_scale=*
+    write /proc/sys/net/ipv4/tcp_adv_win_scale ${sys.sysctl.tcp_adv_win_scale}
+
 service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \
    -iwigig0 -Dnl80211 -c/data/vendor/wifi/wigig_supplicant.conf \
    -m/data/vendor/wifi/wigig_p2p_supplicant.conf \
@@ -729,6 +739,10 @@ service hostapd_fst /vendor/bin/hw/hostapd -dd -g /data/vendor/wifi/hostapd/glob
    disabled
    oneshot

+on property:ro.data.large_tcp_window_size=true
+    # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB)
+    write /proc/sys/net/ipv4/tcp_adv_win_scale  2
+
 service battery_monitor /system/bin/battery_monitor
    user system
    group system
@@ -767,14 +781,40 @@ service vendor.ssr_diag /system/vendor/bin/ssr_diag
    group system
    disabled

-service diag_mdlog_start /system/vendor/bin/diag_mdlog
+service hvdcp /system/bin/hvdcp
+    class core
+    user root
+    disabled
+
+on property:persist.usb.hvdcp.detect=true
+    start hvdcp
+
+on property:persist.usb.hvdcp.detect=false
+    stop hvdcp
+
+service charger_monitor /system/bin/charger_monitor
+    user root
+    group root
+    disabled
+
+service qbcharger /charger -m 1
+    disabled
+    oneshot
+
+on property:sys.qbcharger.enable=true
+    start qbcharger
+
+on property:sys.qbcharger.enable=false
+    stop qbcharger
+
+service diag_mdlog_start /vendor/bin/diag_mdlog -u -c -n 20
    class late_start
    user shell
    group system oem_2901 sdcard_rw sdcard_r media_rw
    disabled
    oneshot

-service diag_mdlog_stop /system/vendor/bin/diag_mdlog -k
+service diag_mdlog_stop /vendor/bin/diag_mdlog -k
    class late_start
    user shell
    group system oem_2901 sdcard_rw sdcard_r media_rw
@@ -840,8 +880,10 @@ service esepmdaemon /system/vendor/bin/esepmdaemon
    group nfc

 on charger
-    setprop persist.sys.usb.config mass_storage
    start qcom-post-boot
+    wait /dev/block/bootdevice/by-name/system
+    mount ext4 /dev/block/bootdevice/by-name/system / ro barrier=1
+    setprop sys.usb.config adb

 #add poweroffhandler
 service poweroffhandler /system/vendor/bin/poweroffhandler
@@ -851,6 +893,17 @@ service poweroffhandler /system/vendor/bin/poweroffhandler
    disabled
    oneshot

+# Logcat dump daemon, dumps logs to logdump partition
+service logdumpd /system/bin/logcat -b all -v threadtime -D -w /dev/block/bootdevice/by-name/logdump
+    class core
+    writepid /dev/cpuset/system-background/tasks
+    seclabel u:r:logdumpd:s0
+    disabled
+
+# Logdumpd is enabled only for userdebug non-perf build
+on property:ro.logdumpd.enabled=1
+    start logdumpd
+
 service time_daemon /vendor/bin/time_daemon
    class main
    user system
@@ -877,12 +930,12 @@ service vendor.hbtp /vendor/bin/hbtp_daemon
     capabilities SYS_NICE
     disabled

-service chre /vendor/bin/chre
-    class late_start
-    user system
-    group system
-    socket chre seqpacket 0660 root system
-    shutdown critical
+#service chre /vendor/bin/chre
+#    class late_start
+#    user system
+#    group system
+#    socket chre seqpacket 0660 root system
+#    shutdown critical

 on property:vendor.chre.enabled=0
   stop chre
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -28,17 +28,10 @@
 #

 on early-init
-    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules audio_q6_pdr audio_q6_notifier audio_snd_event audio_apr audio_adsp_loader audio_q6 audio_native audio_usf audio_pinctrl_wcd audio_pinctrl_lpi audio_swr audio_platform audio_hdmi audio_stub audio_wcd_core audio_wsa881x audio_bolero_cdc audio_wsa_macro audio_va_macro audio_rx_macro audio_tx_macro audio_wcd938x audio_wcd938x_slave audio_machine_kona
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules audio_q6_pdr audio_q6_notifier audio_snd_event audio_apr audio_adsp_loader audio_q6 audio_native audio_usf audio_pinctrl_wcd audio_pinctrl_lpi audio_swr audio_platform audio_hdmi audio_stub audio_wcd_core audio_wsa881x audio_bolero_cdc audio_wsa_macro audio_va_macro audio_rx_macro audio_tx_macro audio_wcd938x audio_wcd938x_slave audio_cs35l41 audio_tfa98xx audio_machine_kona
    write /proc/sys/kernel/sched_boost 1

 on init
-    # Setup permission for Power HAL
-    chown system system /dev/stune/top-app/schedtune.boost
-    chown system system /dev/cpu_dma_latency
-
-    chmod 0664 /dev/stune/top-app/schedtune.boost
-    chmod 0664 /dev/cpu_dma_latency
-
    write /dev/stune/foreground/schedtune.sched_boost_no_override 1
    write /dev/stune/top-app/schedtune.sched_boost_no_override 1
    write /dev/stune/schedtune.colocate 0
@@ -52,19 +45,22 @@ on init
    chmod 0660 /sys/devices/platform/soc/1d84000.ufshc/auto_hibern8
    start logd
    chown system system /proc/last_kmsg
+    #change owner of white led
+    chown system system /sys/class/leds/white/brightness
+    chown system system /sys/class/leds/white/breath

 on early-fs
    start vold

 on fs
    start hwservicemanager
-    mkdir /mnt/vendor/persist/audio 0755 system system
    chmod 644 /mnt/vendor/persist/audio/us_manual_cal
    mkdir /mnt/vendor/spunvm 0660 system system
    mount_all /vendor/etc/fstab.qcom --early
    chown root system /mnt/vendor/persist
    chmod 0771 /mnt/vendor/persist
    mkdir /mnt/vendor/persist/haptics 0755 system system
+    mkdir /mnt/vendor/persist/audio 0755 system system
    chmod 0644 /mnt/vendor/persist/haptics/vov
    chown system system /mnt/vendor/persist/haptics/vov
    chown system system /sys/bus/i2c/drivers/aw8697_haptic/2-005a/vov
@@ -88,6 +84,10 @@ on fs
    chown system system /sys/devices/platform/soc/a8c000.i2c/i2c-2/2-005a/custom_wave
    chmod 0666  /sys/devices/platform/soc/a8c000.i2c/i2c-2/2-005a/custom_wave

+on fs && property:ro.build.ab_update=true
+    mount ext4 /dev/block/bootdevice/by-name/rescue /mnt/rescue noatime
+    restorecon_recursive /mnt/rescue
+
 on post-fs
    # set RLIMIT_MEMLOCK to 64MB
    setrlimit 8 67108864 67108864
@@ -105,6 +105,10 @@ on post-fs-data
    # Enable WLAN cold boot calibration
    write /sys/devices/platform/soc/b0000000.qcom,cnss-qca6390/fs_ready 1
    chmod 0660 /dev/ir_spi
+    #sensors diag2bugreport log dir
+    mkdir /data/vendor/sensor_log
+    chown system system /data/vendor/sensor_log
+    chown system system /vendor/etc/sensors/sensor_diag.cfg
    chown system system /dev/ir_spi
    mkdir /data/vendor/wlan_logs 0777 root shell
    mkdir /data/vendor/nfc 0770 nfc nfc
@@ -114,6 +118,7 @@ on post-fs-data
    mkdir /data/vendor/mqsas_common 0771 system system
    mkdir /data/vendor/thermal 0771 root system
    mkdir /data/vendor/thermal/config 0771 root system
+    chown gps system /dev/ttyHS1

 on boot
    start vendor.sensors
@@ -122,11 +127,12 @@ on property:ro.boot.dp=0x0

 on boot
    chown system system /sys/class/touch/touch_dev/palm_sensor
+    chown system system /sys/class/touch/touch_dev/partial_diff_data
    write /dev/cpuset/audio-app/cpus 1-2
    # Add a cpuset for the camera daemon
    # We want all cores for camera
    mkdir /dev/cpuset/camera-daemon
-    write /dev/cpuset/camera-daemon/cpus 0-3
+    write /dev/cpuset/camera-daemon/cpus 0-7
    write /dev/cpuset/camera-daemon/mems 0
    chown cameraserver cameraserver /dev/cpuset/camera-daemon
    chown cameraserver cameraserver /dev/cpuset/camera-daemon/tasks
@@ -138,8 +144,11 @@ on boot
    setprop vendor.usb.dpl.inst.name "dpl"
    setprop vendor.usb.qdss.inst.name "qdss"
    setprop vendor.usb.controller a600000.dwc3
+    #Load WLAN driver
+    exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ qca_cld3_wlan
    chown system system /sys/class/drm/card0-DSI-1/disp_param
    chown system system /proc/tp_selftest
+    chmod 0664 /proc/tp_selftest
    chmod 0664 /sys/class/drm/card0-DSI-1/disp_param
    chown system system /sys/class/drm/card0-DSI-1/mipi_reg
    chmod 0664 /sys/class/drm/card0-DSI-1/mipi_reg
@@ -155,6 +164,8 @@ on boot
    chmod 0664 /sys/class/drm/card0-DSI-1/doze_brightness
    chown system system /sys/class/drm/card0-DSI-1/disp_count
    chmod 0664 /sys/class/drm/card0-DSI-1/disp_count
+    chown system system /sys/class/drm/card0-DSI-1/disp_pcc
+    chmod 0664 /sys/class/drm/card0-DSI-1/disp_pcc
    #camera motor
    chmod 0777 /sys/class/drv8846/ti-drv8846/debug
    chown system system /sys/class/backlight/panel0-backlight/brightness_clone
@@ -163,6 +174,8 @@ on boot
    # Load all wlan drivers
    exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ qca_cld3_qca6390 qca_cld3_qca6490

+    write /sys/block/sda/queue/wbt_lat_usec 75000
+
 on property:persist.vendor.sys.fp.fod.large_field=1
    write sys/bus/i2c/devices/3-0049/fod_area 1

@@ -177,10 +190,7 @@ on charger
    start vendor.power_off_alarm
    setprop sys.usb.controller a600000.dwc3
    setprop sys.usb.configfs 1
-    chown system system /sys/class/leds/red/brightness
-    chown system system /sys/class/leds/white/brightness
-    write /sys/class/leds/red/brightness 255
-    write /sys/class/leds/white/brightness 255
+    start leds-sh

 on property:vendor.audio.cit.spkcal.copy=true
    copy /data/vendor/cit/cs35l41_cal.bin /mnt/vendor/persist/audio/cs35l41_cal.bin
@@ -193,6 +203,61 @@ on property:vendor.audio.cit.spkcal.copy=true
    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_right.txt
    copy /data/vendor/cit/tfa9874_chk.txt /mnt/vendor/persist/audio/tfa9874_chk.txt
    chmod 666 /mnt/vendor/persist/audio/tfa9874_chk.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk1.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk1.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk2.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk2.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk3.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk3.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk4.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk4.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk5.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk5.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk6.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk6.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk7.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk7.txt
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk8.bin
+    chmod 444 /data/vendor/cit/cs35l41_cal_spk8.txt
+    copy /data/vendor/cit/cs35l41_cal_spk1.bin /mnt/vendor/persist/audio/cs35l41_cal_spk1.bin
+    copy /data/vendor/cit/cs35l41_cal_spk1.txt /mnt/vendor/persist/audio/cs35l41_cal_spk1.txt
+    copy /data/vendor/cit/cs35l41_cal_spk2.bin /mnt/vendor/persist/audio/cs35l41_cal_spk2.bin
+    copy /data/vendor/cit/cs35l41_cal_spk2.txt /mnt/vendor/persist/audio/cs35l41_cal_spk2.txt
+    copy /data/vendor/cit/cs35l41_cal_spk3.bin /mnt/vendor/persist/audio/cs35l41_cal_spk3.bin
+    copy /data/vendor/cit/cs35l41_cal_spk3.txt /mnt/vendor/persist/audio/cs35l41_cal_spk3.txt
+    copy /data/vendor/cit/cs35l41_cal_spk4.bin /mnt/vendor/persist/audio/cs35l41_cal_spk4.bin
+    copy /data/vendor/cit/cs35l41_cal_spk4.txt /mnt/vendor/persist/audio/cs35l41_cal_spk4.txt
+    copy /data/vendor/cit/cs35l41_cal_spk5.bin /mnt/vendor/persist/audio/cs35l41_cal_spk5.bin
+    copy /data/vendor/cit/cs35l41_cal_spk5.txt /mnt/vendor/persist/audio/cs35l41_cal_spk5.txt
+    copy /data/vendor/cit/cs35l41_cal_spk6.bin /mnt/vendor/persist/audio/cs35l41_cal_spk6.bin
+    copy /data/vendor/cit/cs35l41_cal_spk6.txt /mnt/vendor/persist/audio/cs35l41_cal_spk6.txt
+    copy /data/vendor/cit/cs35l41_cal_spk7.bin /mnt/vendor/persist/audio/cs35l41_cal_spk7.bin
+    copy /data/vendor/cit/cs35l41_cal_spk7.txt /mnt/vendor/persist/audio/cs35l41_cal_spk7.txt
+    copy /data/vendor/cit/cs35l41_cal_spk8.bin /mnt/vendor/persist/audio/cs35l41_cal_spk8.bin
+    copy /data/vendor/cit/cs35l41_cal_spk8.txt /mnt/vendor/persist/audio/cs35l41_cal_spk8.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk1.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk1.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk2.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk2.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk3.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk3.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk4.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk4.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk5.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk5.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk6.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk6.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk7.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk7.txt
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk8.bin
+    chmod 666 /mnt/vendor/persist/audio/cs35l41_cal_spk8.txt
+
+service audioshell_service /vendor/bin/audioshell_service
+    oneshot
+    disabled
+
+on property:ro.vendor.miui.region=*
+    start audioshell_service

 service vendor.lowi /vendor/bin/sscrpcd
   class core
@@ -259,3 +324,27 @@ service dcvs-sh /vendor/bin/init.qti.dcvs.sh

 on property:vendor.dcvs.prop=1
   start dcvs-sh
+
+#####copy megvii files#####
+on property:sys.boot_completed=1
+    mkdir /data/vendor/camera/model 0777 cameraserver audio
+    mkdir /data/vendor/camera/model/rt_model 0777 cameraserver audio
+    copy /vendor/etc/camera/model/rt_model/preview_model /data/vendor/camera/model/rt_model/preview_model
+    chown cameraserver audio  /data/vendor/camera/model/rt_model/preview_model
+    chmod 0777 /data/vendor/camera/model/rt_model/preview_model
+    copy /vendor/etc/camera/model/rt_model/preview_cache /data/vendor/camera/model/rt_model/preview_cache
+    chown cameraserver audio  /data/vendor/camera/model/rt_model/preview_cache
+    chmod 0777 /data/vendor/camera/model/rt_model/preview_cache
+    copy /vendor/etc/camera/model/rt_model/preview_policy /data/vendor/camera/model/rt_model/preview_policy
+    chown cameraserver audio  /data/vendor/camera/model/rt_model/preview_policy
+    chmod 0777 /data/vendor/camera/model/rt_model/preview_policy
+    mkdir /data/vendor/camera/model/dof_model 0777 cameraserver audio
+    copy /vendor/etc/camera/model/dof_model/capture_cache /data/vendor/camera/model/dof_model/capture_cache
+    chown cameraserver audio  /data/vendor/camera/model/dof_model/capture_cache
+    chmod 0777 /data/vendor/camera/model/dof_model/capture_cache
+    copy /vendor/etc/camera/model/dof_model/capture_model /data/vendor/camera/model/dof_model/capture_model
+    chown cameraserver audio  /data/vendor/camera/model/dof_model/capture_model
+    chmod 0777 /data/vendor/camera/model/dof_model/capture_model
+    copy /vendor/etc/camera/model/dof_model/capture_policy /data/vendor/camera/model/dof_model/capture_policy
+    chown cameraserver audio  /data/vendor/camera/model/dof_model/capture_policy
+    chmod 0777 /data/vendor/camera/model/dof_model/capture_policy
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@@ -61,7 +61,6 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/ipa_adpl             0660   system     oem_2905
 /dev/synx_device          0660   root       camera
 /dev/hab                  0666   system     system
-/dev/hgsl                 0666   system     system
 /dev/iio:device*          0664   system     system

 #permissions for UFS RPMB BSG device node
@@ -176,34 +175,12 @@ firmware_directories /vendor/firmware_mnt/image/
 #qvr
 /dev/qvr_external_sensor_ioctl      0660  system  system
 /sys/kernel/qvr_external_sensor/fd  0660  system  system
-/dev/bus/usb/001/001      0660   system     system
-/dev/bus/usb/001/002      0660   system     system
-/dev/bus/usb/001/003      0660   system     system
-/dev/bus/usb/002/001      0660   system     system
-/dev/bus/usb/002/002      0660   system     system
-/dev/bus/usb/002/003      0660   system     system
-/dev/bus/usb/003/001      0660   system     system
-/dev/bus/usb/003/002      0660   system     system
-/dev/bus/usb/003/003      0660   system     system
-/dev/hidraw0              0660   system     system
-/dev/hidraw1              0660   system     system
-/dev/hidraw2              0660   system     system
-/dev/hidraw3              0660   system     system
-/dev/hidraw4              0660   system     system
-/dev/hidraw5              0660   system     system
-/dev/hidraw6              0660   system     system
-/dev/hidraw7              0660   system     system
-/dev/hidraw8              0660   system     system
-/dev/hidraw9              0660   system     system

 # wlan
 /dev/wcnss_wlan           0660   system     system
 /dev/wcnss_ctrl           0660   system     system
 /sys/devices/soc/a000000.qcom,wcnss-wlan/net/wlan0/queues/rx-* rps_cpus           0660   system     system
 /sys/devices/soc/a000000.qcom,wcnss-wlan/net/p2p0/queues/rx-* rps_cpus            0660   system     system
-/sys/devices/platform/soc/*.qcom,icnss/net/wlan*/queues/rx-* rps_cpus             0660   system     system
-/sys/devices/platform/soc/1c00000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/wlan*/queues/rx-* rps_cpus      0660   system     system
-/sys/devices/platform/soc/17a10040.qcom,wcn6750/net/wlan*/queues/rx-* rps_cpus    0660   system     system
 /dev/spidev0.0            0660   system     audio
 /dev/i2c-7                0660   system     audio
 /dev/msm_camera/*         0660   system     camera
@@ -257,7 +234,6 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/i2c-5                0660   media       media
 /dev/avtimer              0660   system     audio
 /dev/spidev2.0            0660   system     audio
-/dev/spidev22.0           0660   system     audio

 # DVB devices
 /dev/dvb/adapter0/demux*  0440   media       media
@@ -303,6 +279,8 @@ firmware_directories /vendor/firmware_mnt/image/
 /sys/devices/platform/soc/a98000.i2c/i2c-2/2-0020/input/input*  secure_touch_enable   0660 system drmrpc
 /sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input*  secure_touch          0440 system drmrpc
 /sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input*  secure_touch_enable   0660 system drmrpc
+/sys/devices/platform/soc/a94000.i2c/i2c-3/3-00*                secure_touch         0440   system  drmrpc
+/sys/devices/platform/soc/a94000.i2c/i2c-3/3-00*                secure_touch_enable  0660   system  drmrpc

 # GNSS Device premissions
 /dev/gnss_sirf             0660   gps     gps
@@ -442,8 +420,6 @@ firmware_directories /vendor/firmware_mnt/image/
 /sys/class/graphics/fb0     msm_cmd_autorefresh_en   0664    system  graphics
 */

-/sys/devices/platform/soc/ae00000.qcom,mdss_mdp power/control 0664 system graphics
-
 #asm330 sensor
 #common sensors files
 /sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device*   buffer/enable                   0664    system  system
--- a/wifi/qca6390/WCNSS_qcom_cfg.ini
+++ b/wifi/qca6390/WCNSS_qcom_cfg.ini
@@ -289,6 +289,8 @@ gEnableNUDTracking=3
 gEnableNanSupport=1
 # Enable NAN Datapath
 genable_nan_datapath=1
+# Separate iface creation for NAN
+nan_separate_iface_support=1

 ################ NAN feature set end #####################

@@ -362,6 +364,9 @@ AutoChannelSelectWeight=0x00fafafa
 # Enable/Disable broadcast TWT
 bcast_twt=1

+# Stop auto-creating twt session
+twt_congestion_timeout=0
+
 # Enable broadcast logging to the userspace entities
 gMulticastHostFwMsgs=1
 # Disable packetlog explicitly
@@ -373,7 +378,7 @@ gIPAMediumBandwidthMbps=400
 gIPAHighBandwidthMbps=800

 # Add another interface while driver load
-gEnableConcurrentSTA=wlan1
+#gEnableConcurrentSTA=wlan1

 #max time for active 2G channel scan.
 #if set to zero, gActiveMaxChannelTime is used for 2G channel scan.
@@ -411,6 +416,11 @@ chan_width_weightage=5
 he_caps_weightage=1
 chan_band_weightage=5

+# Reduce the expiry time for avoid list and black list in drv.
+avoid_list_expiry_time=3
+black_list_expiry_time=3
+# Improve threshold to move the Ap from avoid to blacklist
+bad_bssid_counter_thresh=7
 END

 # Note: Configuration parser would not read anything past the END marker