diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ebc67c5..940d6a1 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -192,7 +192,7 @@ OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
 ENABLE_VENDOR_RIL_SERVICE := true
 
 # Security patch level
-VENDOR_SECURITY_PATCH := 2022-11-01
+VENDOR_SECURITY_PATCH := 2023-04-01
 
 # Sepolicy
 include device/qcom/sepolicy_vndr-legacy-um/SEPolicy.mk
diff --git a/configs/powerhint.xml b/configs/powerhint.xml
index 914e8cf..aec4cbb 100644
--- a/configs/powerhint.xml
+++ b/configs/powerhint.xml
@@ -335,6 +335,7 @@
         <!--L CPU CORE 5 SCHED LOAD BOOST -->
         <!--L CPU CORE 6 SCHED LOAD BOOST -->
         <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--sysctl_sched_prefer_spread 2-->
         <!--L CPU Hispeed freq of 1113Mhz -->
         <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
         <!--L CLUSTER_BIG - Set hispeed load 95 -->
@@ -342,11 +343,12 @@
         <!--CPUBW HWMON - Set io_percent 100 -->
         <!--CPUBW HWMON - Set up_scale 0 -->
         <!--L CPU core ctl min cpus 6 -->
+        <!--L CPU cluster min freq of 979Mhz -->
         <Config
             Id="0x00001330" Enable="true" Timeout="0" Target="blair"
             Resources="0x40C68100, -12, 0x40C68110, -12, 0x40C68120, -12,
-            0x40C68130, -12, 0x40C68000, -12, 0x40C68010, -12, 0x40C68020, -12, 0x40C68030, -12,
-            0x4143C100, 1113, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x43034000, 0x32, 0x43020000, 0x64, 0x43014000, 0x0, 0x41000100, 6"/>
+            0x40C68130, -12, 0x40C68000, -12, 0x40C68010, -12, 0x40C68020, -12, 0x40C68030, -12, 0x40CA8000, 0x2,
+            0x4143C100, 1113, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x43034000, 0x32, 0x43020000, 0x64, 0x43014000, 0x0, 0x41000100, 6,0x40800100, 979"/>
 
         <!-- camera 30fps-->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -428,6 +430,9 @@
         <!--L CPU CORE 5 SCHED LOAD BOOST -->
         <!--L CPU CORE 6 SCHED LOAD BOOST -->
         <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CLUSTER_LITTLE  SCHED LOAD BOOST -->
+        <!--L CLUSTER_BIG  SCHED LOAD BOOST -->
+        <!--sysctl_sched_prefer_spread 2-->
         <!--L CPU Hispeed freq of 1113Mhz -->
         <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
         <!--L CLUSTER_BIG - Set hispeed load 95 -->
@@ -437,6 +442,7 @@
             Id="0x00001334" Enable="true" Timeout="0" Target="blair"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68000, 0xFFFFFFFA, 0x40C68010, 0xFFFFFFFA, 0x40C68020, 0xFFFFFFFA, 0x40C68030, 0xFFFFFFFA,
+            0x41444000, 1, 0x41444100, 1,0x40CA8000,2,
             0x4143C100, 1113, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x43034000, 0x14, 0x41000100, 6"/>
 
 
@@ -618,7 +624,7 @@
             Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
             0x40C68130, -10, 0x40C68000, -10, 0x40C68010, -10, 0x40C68020, -10, 0x40C68030, -10,
             0x40800100, 1113, 0x43034000, 0x32, 0x43020000, 0x64, 0x43014000, 0x0, 0x41000100, 6,
-            0x40CEC000, 0x1, 0x40CA8000, 0x1"/>
+            0x40CEC000, 0x1, 0x40CA8000, 0x1, 0x40C20000,0x32, 0x40C1C000,0x3c"/>
 
     </Powerhint>
 </HintConfigs>
diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt
index a599ed2..abf890a 100644
--- a/configs/public.libraries.txt
+++ b/configs/public.libraries.txt
@@ -6,4 +6,5 @@ libfastcvopt.so
 liblistensoundmodel2.so
 libOpenCL.so
 
+libmialgo_utils.so
 libmialgoengine.so 64
diff --git a/configs/snapdragon_color_libs_config.xml b/configs/snapdragon_color_libs_config.xml
index e257b1f..4dd0095 100644
--- a/configs/snapdragon_color_libs_config.xml
+++ b/configs/snapdragon_color_libs_config.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!--
 Copyright (c) 2020, The Linux Foundation. All rights reserved.
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@@ -13,6 +14,7 @@ met:
     * Neither the name of The Linux Foundation nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
diff --git a/holi.mk b/holi.mk
index 65b53a5..94cbaf6 100644
--- a/holi.mk
+++ b/holi.mk
@@ -380,7 +380,6 @@ PRODUCT_PACKAGES += \
     init.qcom.post_boot.sh \
     init.qcom.rc \
     init.qti.kernel.rc \
-    init.qti.ufs.rc \
     init.target.rc \
     ueventd.qcom.rc \
     vendor_modprobe.sh
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b583845..a5a52cc 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,5 @@
 # All unpinned blobs below are extracted from veux_eea-user 12 SKQ1.211006.001 V13.0.3.0.SKCEUXM release-keys
+# from miui_MOONSTONEGlobal_V14.0.3.0.TMPMIXM_0920ca8fad_13.0
 
 # ADSP
 vendor/bin/adsprpcd
@@ -25,6 +26,7 @@ vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
 
 # Bluetooth (A2DP)
+system_ext/etc/bluetooth/leaudio_configs.xml
 vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
 vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
 vendor/lib/btaudio_offload_if.so
@@ -46,7 +48,6 @@ vendor/lib64/libmdsprpc.so
 vendor/lib64/libsdsprpc.so
 
 # CNE
-vendor/app/CneApp/lib/arm64/libvndfwk_detect_jni.qti.so
 -vendor/app/CneApp/CneApp.apk
 vendor/bin/cnd
 vendor/etc/cne/mwqem.conf
@@ -381,8 +382,6 @@ system_ext/lib64/libmmosal.so
 system_ext/lib64/libmmparser_lite.so
 vendor/bin/hw/vendor.qti.media.c2@1.0-service
 vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
-vendor/etc/media_blair/video_system_specs.json
-vendor/etc/media_holi/video_system_specs.json
 vendor/etc/seccomp_policy/codec2.vendor.base-arm.policy
 vendor/etc/seccomp_policy/codec2.vendor.ext-arm.policy
 -vendor/etc/vintf/manifest/c2_manifest_vendor.xml
@@ -399,10 +398,11 @@ vendor/lib64/libmmosal.so
 
 # Media Configs
 vendor/etc/media_blair/video_system_specs.json
+vendor/etc/media_blair_lite/video_system_specs.json
 vendor/etc/media_holi/video_system_specs.json
 vendor/etc/media_codecs.xml
 vendor/etc/media_codecs_blair.xml
-vendor/etc/media_codecs_dolby_audio.xml
+vendor/etc/media_codecs_blair_lite.xml
 vendor/etc/media_codecs_google_audio.xml
 vendor/etc/media_codecs_google_c2.xml
 vendor/etc/media_codecs_google_c2_audio.xml
@@ -411,14 +411,15 @@ vendor/etc/media_codecs_google_telephony.xml
 vendor/etc/media_codecs_google_video.xml
 vendor/etc/media_codecs_google_video_le.xml
 vendor/etc/media_codecs_holi.xml
-vendor/etc/media_codecs_kona.xml
 vendor/etc/media_codecs_performance.xml
 vendor/etc/media_codecs_performance_blair.xml
+vendor/etc/media_codecs_performance_blair_lite.xml
 vendor/etc/media_codecs_performance_holi.xml
 vendor/etc/media_codecs_vendor_audio.xml
 vendor/etc/media_profiles.xml
 vendor/etc/media_profiles_V1_0.xml
 vendor/etc/media_profiles_blair.xml
+vendor/etc/media_profiles_blair_lite.xml
 vendor/etc/media_profiles_holi.xml
 vendor/etc/media_profiles_vendor.xml
 
@@ -429,7 +430,7 @@ vendor/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc
 vendor/lib64/libmlipay.so
 vendor/lib64/libmlipay@1.1.so
 
-# Neural networks
+# Neural networks - from veux_eea-user 12 SKQ1.211006.001 V13.0.3.0.SKCEUXM release-keys
 vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
 vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
 -vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
@@ -539,6 +540,7 @@ vendor/lib/libqmi_client_helper.so
 vendor/lib/libqmi_client_qmux.so
 vendor/lib/libqmi_common_so.so
 vendor/lib/libqmi_csi.so
+vendor/lib/libqmi_csvt_srvc.so
 vendor/lib/libqmi_encdec.so
 vendor/lib/libqmi_legacy.so
 vendor/lib/libqmiservices.so
@@ -551,15 +553,16 @@ vendor/lib64/libqcmaputils.so
 vendor/lib64/libqdi.so
 vendor/lib64/libqdp.so
 vendor/lib64/libqmi.so
--vendor/lib64/libqmi_cci.so
+vendor/lib64/libqmi_cci.so
 vendor/lib64/libqmi_client_helper.so
 vendor/lib64/libqmi_client_qmux.so
--vendor/lib64/libqmi_common_so.so
+vendor/lib64/libqmi_common_so.so
 vendor/lib64/libqmi_csi.so
+vendor/lib64/libqmi_csvt_srvc.so
 vendor/lib64/libqmi_encdec.so
 vendor/lib64/libqmi_legacy.so
+vendor/lib64/libqmiextservices.so
 vendor/lib64/libqmiservices.so
-vendor/lib64/libqrtr.so
 
 # RIL
 etc/permissions/privapp-permissions-qti.xml
@@ -640,12 +643,18 @@ vendor/etc/init/ssgtzd.rc
 vendor/etc/init/vendor.qti.rmt_storage.rc
 vendor/etc/init/vendor.qti.tftp.rc
 vendor/etc/qcril_database/upgrade/config/10.0_config.sql
+vendor/etc/qcril_database/upgrade/config/11.0_config.sql
+vendor/etc/qcril_database/upgrade/config/12.0_config.sql
 vendor/etc/qcril_database/upgrade/config/6.0_config.sql
 vendor/etc/qcril_database/upgrade/config/7.0_config.sql
 vendor/etc/qcril_database/upgrade/config/8.0_config.sql
 vendor/etc/qcril_database/upgrade/config/9.0_config.sql
 vendor/etc/qcril_database/upgrade/other/0_initial_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/10_version_update_ecc_table.sql
+vendor/etc/qcril_database/upgrade/other/11_version_update_ecc_table.sql
+vendor/etc/qcril_database/upgrade/other/12_version_update_ecc_table.sql
+vendor/etc/qcril_database/upgrade/other/13_version_update_ecc_table.sql
+vendor/etc/qcril_database/upgrade/other/14_version_update_ecc_table.sql
 vendor/etc/qcril_database/upgrade/other/1_version_intro_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/2_version_add_wps_config_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/3_version_update_wps_config_qcrilnr.sql
@@ -684,9 +693,10 @@ vendor/lib64/libqsocket.so
 vendor/lib64/libril-db.so
 vendor/lib64/libril-qc-ltedirectdisc.so
 vendor/lib64/libril-qc-radioconfig.so
-vendor/lib64/libril-qcril-hook-oem.so
+vendor/lib64/libril.so
 vendor/lib64/librilqmimiscservices.so
 vendor/lib64/librilqmiservices.so
+vendor/lib64/librilutils.so
 vendor/lib64/librpmb.so
 vendor/lib64/libsystem_health_mon.so
 vendor/lib64/qcrilMarshal.so
@@ -702,7 +712,6 @@ vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so
 vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so
-vendor/lib64/vendor.qti.hardware.radio.qcriNvOpt@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so
@@ -720,10 +729,6 @@ vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so
 vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so
 vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so
 
-# Secure element
-vendor/bin/hw/android.hardware.secure_element@1.2-service
-vendor/etc/init/android.hardware.secure_element@1.2-service.rc
-
 # Snapdragon Computer Vision Engine
 vendor/lib/libscveCommon.so
 vendor/lib/libscveCommon_stub.so
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 2788c51..e08a528 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -90,14 +90,6 @@ LOCAL_SRC_FILES    := etc/init.qti.kernel.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.qti.ufs.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.qti.ufs.rc
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.target.rc
 LOCAL_MODULE_TAGS  := optional
diff --git a/rootdir/bin/init.kernel.post_boot-blair.sh b/rootdir/bin/init.kernel.post_boot-blair.sh
index 0c52026..09d1f16 100755
--- a/rootdir/bin/init.kernel.post_boot-blair.sh
+++ b/rootdir/bin/init.kernel.post_boot-blair.sh
@@ -96,8 +96,6 @@ function configure_read_ahead_kb_values() {
 }
 
 function configure_memory_parameters() {
-	MemTotalStr=`cat /proc/meminfo | grep MemTotal`
-	MemTotal=${MemTotalStr:16:8}
 	# Set Memory parameters.
 
 	# Set swappiness to 100 for all targets
@@ -106,15 +104,14 @@ function configure_memory_parameters() {
 	# Disable wsf for all targets beacause we are using efk.
 	# 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
-	if [ $MemTotal -le 8388608 ]; then
-		echo 0 > /proc/sys/vm/watermark_boost_factor
-	fi
 	configure_zram_parameters
 	configure_read_ahead_kb_values
-
-	#Spawn 2 kswapd threads which can help in fast reclaiming of pages
-	echo 2 > /proc/sys/vm/kswapd_threads
+        
+        #M17-T code for HQ-264248 by liuhelong at 2022/12/8 start
+	#Spawn 1 kswapd threads which can help in fast reclaiming of pages
+	echo 1 > /proc/sys/vm/kswapd_threads
+        #M17-T code for HQ-264248 by liuhelong at 2022/12/8 end
+        
 }
 
 # Core control parameters for silver
@@ -145,11 +142,10 @@ echo 5 > /proc/sys/kernel/sched_ravg_window_nr_ticks
 echo 20000000 > /proc/sys/kernel/sched_task_unfilter_period
 
 # cpuset parameters
-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
+echo 0-2 > /dev/cpuset/background/cpus
+echo 0-5 > /dev/cpuset/system-background/cpus
+echo 4-7 > /dev/cpuset/foreground/boost/cpus
+echo 0-7 > /dev/cpuset/top-app/cpus
 
 # Turn off scheduler boost at the end
 echo 0 > /proc/sys/kernel/sched_boost
@@ -180,9 +176,12 @@ echo -6 > /sys/devices/system/cpu/cpu7/sched_load_boost
 echo 85 > /sys/devices/system/cpu/cpufreq/policy6/schedutil/hispeed_load
 
 # configure input boost settings
-echo "0:1804800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+echo "0:1516800" > /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:0 5:0 6:2016000 7:0" > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_freq
+echo 400 > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_ms
+
 # Enable bus-dcvs
 for device in /sys/devices/platform/soc
 do
@@ -247,3 +246,7 @@ echo N > /sys/module/lpm_levels/parameters/sleep_disabled
 configure_memory_parameters
 
 setprop vendor.post_boot.parsed 1
+
+# M17P_T code for HQ-290074 by zhouxinyi at 2023-03-27 start
+echo 0 > /proc/sys/vm/panic_on_oom
+# M17P_T code for HQ-290074 by zhouxinyi at 2023-03-27 end
\ No newline at end of file
diff --git a/rootdir/bin/init.kernel.post_boot-holi.sh b/rootdir/bin/init.kernel.post_boot-holi.sh
index 7ee3ae8..b777048 100755
--- a/rootdir/bin/init.kernel.post_boot-holi.sh
+++ b/rootdir/bin/init.kernel.post_boot-holi.sh
@@ -96,8 +96,6 @@ function configure_read_ahead_kb_values() {
 }
 
 function configure_memory_parameters() {
-	MemTotalStr=`cat /proc/meminfo | grep MemTotal`
-	MemTotal=${MemTotalStr:16:8}
 	# Set Memory parameters.
 
 	# Set swappiness to 100 for all targets
@@ -106,15 +104,14 @@ function configure_memory_parameters() {
 	# Disable wsf for all targets beacause we are using efk.
 	# 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
-	if [ $MemTotal -le 8388608 ]; then
-		echo 0 > /proc/sys/vm/watermark_boost_factor
-	fi
 	configure_zram_parameters
 	configure_read_ahead_kb_values
-
-	#Spawn 2 kswapd threads which can help in fast reclaiming of pages
-	echo 2 > /proc/sys/vm/kswapd_threads
+        
+        #M17-T code for HQ-264248 by liuhelong at 2022/12/8 start
+	#Spawn 1 kswapd threads which can help in fast reclaiming of pages
+	echo 1 > /proc/sys/vm/kswapd_threads
+        #M17-T code for HQ-264248 by liuhelong at 2022/12/8 end
+        
 }
 
 # Core control parameters for silver
@@ -177,9 +174,12 @@ echo -6 > /sys/devices/system/cpu/cpu7/sched_load_boost
 echo 85 > /sys/devices/system/cpu/cpufreq/policy6/schedutil/hispeed_load
 
 # configure input boost settings
-echo "0:1190400" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+echo "0:1516800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
 echo 120 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
 
+echo ":1804800 1:0 2:0 3:0 4:0 5:0 6:2016000 7:0"> /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_freq
+echo 400 > /sys/devices/system/cpu/cpu_boost/powerkey_input_boost_ms
+
 # Enable bus-dcvs
 for device in /sys/devices/platform/soc
 do
@@ -244,3 +244,7 @@ echo N > /sys/module/lpm_levels/parameters/sleep_disabled
 configure_memory_parameters
 
 setprop vendor.post_boot.parsed 1
+
+# M17P_T code for HQ-290074 by zhouxinyi at 2023-03-27 start
+echo 0 > /proc/sys/vm/panic_on_oom
+# M17P_T code for HQ-290074 by zhouxinyi at 2023-03-27 end
\ No newline at end of file
diff --git a/rootdir/bin/init.qcom.post_boot.sh b/rootdir/bin/init.qcom.post_boot.sh
index 3a1eb13..aeaa3c9 100755
--- a/rootdir/bin/init.qcom.post_boot.sh
+++ b/rootdir/bin/init.qcom.post_boot.sh
@@ -1101,6 +1101,36 @@ case "$target" in
         ;;
 esac
 
+# For Kodiak target for which cdsp is defective, we read remote cdsp status from fastrpc node
+# and if its value is false we disable cdsp daemon by setting the cdsp disable propety to true
+case "$target" in
+	"lahaina")
+		if [ -f /sys/devices/soc0/chip_family ]; then
+			chip_family_id=`cat /sys/devices/soc0/chip_family`
+		else
+			chip_family_id=-1
+		fi
+
+		echo "adsprpc : chip_family_id : $chip_faily_id" > /dev/kmsg
+
+		case "$chip_family_id" in
+			"0x76")
+			if [ -f /sys/devices/platform/soc/soc:qcom,msm_fastrpc/remote_cdsp_status ]; then
+				remote_cdsp_status=`cat /sys/devices/platform/soc/soc:qcom,msm_fastrpc/remote_cdsp_status`
+			else
+				remote_cdsp_status=-1
+			fi
+
+			echo "adsprpc : remote_cdsp_status : $remote_cdsp_status" > /dev/kmsg
+
+			if [ $remote_cdsp_status -eq 0 ]; then
+				setprop vendor.fastrpc.disable.cdsprpcd.daemon 1
+				echo "adsprpc : Disabled cdsp daemon" > /dev/kmsg
+			fi
+		 esac
+		  ;;
+esac
+
 case "$target" in
     "msm7201a_ffa" | "msm7201a_surf")
         echo 500000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate
@@ -3644,7 +3674,7 @@ case "$target" in
       do
           for cpubw in $device/*cpu-cpu-llcc-bw/devfreq/*cpu-cpu-llcc-bw
           do
-	      echo "bw_hwmon" > $cpubw/governor
+	      cat $cpubw/available_frequencies | cut -d " " -f 1 > $cpubw/min_freq
 	      echo "2288 4577 7110 9155 12298 14236" > $cpubw/bw_hwmon/mbps_zones
 	      echo 4 > $cpubw/bw_hwmon/sample_ms
 	      echo 68 > $cpubw/bw_hwmon/io_percent
@@ -3659,7 +3689,7 @@ case "$target" in
 
 	  for llccbw in $device/*cpu-llcc-ddr-bw/devfreq/*cpu-llcc-ddr-bw
 	  do
-	      echo "bw_hwmon" > $llccbw/governor
+	      cat $llccbw/available_frequencies | cut -d " " -f 1 > $llccbw/min_freq
 	      echo "1144 1720 2086 2929 3879 5931 6881" > $llccbw/bw_hwmon/mbps_zones
 	      echo 4 > $llccbw/bw_hwmon/sample_ms
 	      echo 68 > $llccbw/bw_hwmon/io_percent
@@ -3671,6 +3701,30 @@ case "$target" in
 	      echo 1600 > $llccbw/bw_hwmon/idle_mbps
               echo 40 > $llccbw/polling_interval
 	  done
+
+	  #Enable mem_latency governor for L3, LLCC, and DDR scaling
+	  for memlat in $device/*cpu*-lat/devfreq/*cpu*-lat
+	  do
+	      cat $memlat/available_frequencies | cut -d " " -f 1 > $memlat/min_freq
+	  done
+
+	  #Enable compute governor for gold latfloor
+	  for latfloor in $device/*cpu-ddr-latfloor*/devfreq/*cpu-ddr-latfloor*
+	  do
+	      cat $latfloor/available_frequencies | cut -d " " -f 1 > $latfloor/min_freq
+	  done
+
+	  #Gold L3 ratio ceil
+	  for l3silver in $device/*cpu0-cpu-l3-lat/devfreq/*cpu0-cpu-l3-lat
+	  do
+	      cat $l3silver/available_frequencies | cut -d " " -f 1 > $l3silver/min_freq
+	  done
+
+	  #Gold L3 ratio ceil
+	  for l3gold in $device/*cpu6-cpu-l3-lat/devfreq/*cpu6-cpu-l3-lat
+	  do
+	      cat $l3gold/available_frequencies | cut -d " " -f 1 > $l3gold/min_freq
+	  done
       done
 
       # memlat specific settings are moved to seperate file under
@@ -3745,7 +3799,7 @@ case "$target" in
             do
                 for cpubw in $device/*cpu-cpu-llcc-bw/devfreq/*cpu-cpu-llcc-bw
                 do
-                    echo "bw_hwmon" > $cpubw/governor
+                    cat $cpubw/available_frequencies | cut -d " " -f 1 > $cpubw/min_freq
                     echo "2288 4577 7110 9155 12298 14236" > $cpubw/bw_hwmon/mbps_zones
                     echo 4 > $cpubw/bw_hwmon/sample_ms
                     echo 68 > $cpubw/bw_hwmon/io_percent
@@ -3760,7 +3814,7 @@ case "$target" in
 
                 for llccbw in $device/*cpu-llcc-ddr-bw/devfreq/*cpu-llcc-ddr-bw
                 do
-                    echo "bw_hwmon" > $llccbw/governor
+                    cat $llccbw/available_frequencies | cut -d " " -f 1 > $llccbw/min_freq
                     echo "1144 1720 2086 2929 3879 5931 6881" > $llccbw/bw_hwmon/mbps_zones
                     echo 4 > $llccbw/bw_hwmon/sample_ms
                     echo 68 > $llccbw/bw_hwmon/io_percent
@@ -4256,7 +4310,7 @@ case "$target" in
 
         #power/perf tunings for khaje
         case "$soc_id" in
-                 "518" )
+                 "518" | "561")
 
             # Core control parameters on big
             echo 0 > /sys/devices/system/cpu/cpu0/core_ctl/enable
@@ -4347,6 +4401,10 @@ case "$target" in
             # Turn off scheduler boost at the end
             echo 0 > /proc/sys/kernel/sched_boost
 
+	    echo N > /sys/module/lpm_levels/system/pwr/pwr-l2-gdhs/idle_enabled
+	    echo N > /sys/module/lpm_levels/system/perf/perf-l2-gdhs/idle_enabled
+	    echo N > /sys/module/lpm_levels/system/pwr/pwr-l2-gdhs/suspend_enabled
+            echo N > /sys/module/lpm_levels/system/perf/perf-l2-gdhs/suspend_enabled
             # Turn on sleep modes
             echo 0 > /sys/module/lpm_levels/parameters/sleep_disabled
 
@@ -5226,7 +5284,7 @@ case "$target" in
     "msmnile")
 	# cpuset parameters
 	target_varient=`getprop ro.build.product`
-        if [ "$target_varient" == "msmnile_gvmq" ]; then
+        if [ "$target_varient" == "msmnile_gvmq" ] || [ "$target_varient" == "msmnile_gvmgh" ]; then
 		echo 4-7 > /dev/cpuset/background/cpus
 		echo 4-7 > /dev/cpuset/system-background/cpus
 
@@ -5278,14 +5336,11 @@ case "$target" in
 		echo 85 85 > /proc/sys/kernel/sched_downmigrate
 		echo 100 > /proc/sys/kernel/sched_group_upmigrate
 		echo 10 > /proc/sys/kernel/sched_group_downmigrate
-		echo 1 > /proc/sys/kernel/sched_walt_rotate_big_tasks
 
 		echo 0-3 > /dev/cpuset/background/cpus
 		echo 0-3 > /dev/cpuset/system-background/cpus
 
 
-		# Turn off scheduler boost at the end
-		echo 0 > /proc/sys/kernel/sched_boost
 
 		# configure governor settings for silver cluster
 		echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy0/scaling_governor
@@ -5329,7 +5384,7 @@ case "$target" in
 		do
 		    for cpubw in $device/*cpu-cpu-llcc-bw/devfreq/*cpu-cpu-llcc-bw
 		    do
-			echo "bw_hwmon" > $cpubw/governor
+			cat $cpubw/available_frequencies | cut -d " " -f 1 > $cpubw/min_freq
 			echo "2288 4577 7110 9155 12298 14236 15258" > $cpubw/bw_hwmon/mbps_zones
 			echo 4 > $cpubw/bw_hwmon/sample_ms
 			echo 50 > $cpubw/bw_hwmon/io_percent
@@ -5340,42 +5395,77 @@ case "$target" in
 			echo 250 > $cpubw/bw_hwmon/up_scale
 			echo 1600 > $cpubw/bw_hwmon/idle_mbps
 			echo 14236 > $cpubw/max_freq
-        	        echo 40 > $cpubw/polling_interval
+	                echo 40 > $cpubw/polling_interval
 		    done
 
 		    for llccbw in $device/*cpu-llcc-ddr-bw/devfreq/*cpu-llcc-ddr-bw
-	    		do
-				echo "bw_hwmon" > $llccbw/governor
-				echo "1720 2929 3879 5931 6881 7980" > $llccbw/bw_hwmon/mbps_zones
-				echo 4 > $llccbw/bw_hwmon/sample_ms
-				echo 80 > $llccbw/bw_hwmon/io_percent
-				echo 20 > $llccbw/bw_hwmon/hist_memory
-				echo 10 > $llccbw/bw_hwmon/hyst_length
-				echo 30 > $llccbw/bw_hwmon/down_thres
-				echo 0 > $llccbw/bw_hwmon/guard_band_mbps
-				echo 250 > $llccbw/bw_hwmon/up_scale
-				echo 1600 > $llccbw/bw_hwmon/idle_mbps
-				echo 6881 > $llccbw/max_freq
-                		echo 40 > $llccbw/polling_interval
+		    do
+			cat $llccbw/available_frequencies | cut -d " " -f 1 > $llccbw/min_freq
+			echo "1720 2929 3879 5931 6881 7980" > $llccbw/bw_hwmon/mbps_zones
+			echo 4 > $llccbw/bw_hwmon/sample_ms
+			echo 80 > $llccbw/bw_hwmon/io_percent
+			echo 20 > $llccbw/bw_hwmon/hist_memory
+			echo 10 > $llccbw/bw_hwmon/hyst_length
+			echo 30 > $llccbw/bw_hwmon/down_thres
+			echo 0 > $llccbw/bw_hwmon/guard_band_mbps
+			echo 250 > $llccbw/bw_hwmon/up_scale
+			echo 1600 > $llccbw/bw_hwmon/idle_mbps
+			echo 6881 > $llccbw/max_freq
+	                echo 40 > $llccbw/polling_interval
 		    done
 
 		    for npubw in $device/*npu-npu-ddr-bw/devfreq/*npu-npu-ddr-bw
-			do
-				echo 1 > /sys/devices/virtual/npu/msm_npu/pwr
-				echo "bw_hwmon" > $npubw/governor
-				echo "1720 2929 3879 5931 6881 7980" > $npubw/bw_hwmon/mbps_zones
-				echo 4 > $npubw/bw_hwmon/sample_ms
-				echo 80 > $npubw/bw_hwmon/io_percent
-				echo 20 > $npubw/bw_hwmon/hist_memory
-				echo 6  > $npubw/bw_hwmon/hyst_length
-				echo 30 > $npubw/bw_hwmon/down_thres
-				echo 0 > $npubw/bw_hwmon/guard_band_mbps
-				echo 250 > $npubw/bw_hwmon/up_scale
-				echo 0 > $npubw/bw_hwmon/idle_mbps
-		                echo 40 > $npubw/polling_interval
-				echo 0 > /sys/devices/virtual/npu/msm_npu/pwr
-	    done
-	done
+		    do
+			echo 1 > /sys/devices/virtual/npu/msm_npu/pwr
+			cat $npubw/available_frequencies | cut -d " " -f 1 > $npubw/min_freq
+			echo "1720 2929 3879 5931 6881 7980" > $npubw/bw_hwmon/mbps_zones
+			echo 4 > $npubw/bw_hwmon/sample_ms
+			echo 80 > $npubw/bw_hwmon/io_percent
+			echo 20 > $npubw/bw_hwmon/hist_memory
+			echo 6  > $npubw/bw_hwmon/hyst_length
+			echo 30 > $npubw/bw_hwmon/down_thres
+			echo 0 > $npubw/bw_hwmon/guard_band_mbps
+			echo 250 > $npubw/bw_hwmon/up_scale
+			echo 0 > $npubw/bw_hwmon/idle_mbps
+	                echo 40 > $npubw/polling_interval
+			echo 0 > /sys/devices/virtual/npu/msm_npu/pwr
+		    done
+
+		    #Enable mem_latency governor for L3, LLCC, and DDR scaling
+		    for memlat in $device/*cpu*-lat/devfreq/*cpu*-lat
+		    do
+			cat $memlat/available_frequencies | cut -d " " -f 1 > $memlat/min_freq
+		    done
+
+		    #Enable compute governor for gold latfloor
+		    for latfloor in $device/*cpu-ddr-latfloor*/devfreq/*cpu-ddr-latfloor*
+		    do
+			cat $latfloor/available_frequencies | cut -d " " -f 1 > $latfloor/min_freq
+		    done
+
+		    #Gold L3 ratio ceil
+		    for l3silver in $device/*cpu0-cpu-l3-lat/devfreq/*cpu0-cpu-l3-lat
+		    do
+			cat $l3silver/available_frequencies | cut -d " " -f 1 > $l3silver/min_freq
+		    done
+
+		    #Gold L3 ratio ceil
+		    for l3gold in $device/*cpu4-cpu-l3-lat/devfreq/*cpu4-cpu-l3-lat
+		    do
+			cat $l3gold/available_frequencies | cut -d " " -f 1 > $l3gold/min_freq
+		    done
+
+		    #Prime L3 ratio ceil
+		    for l3prime in $device/*cpu7-cpu-l3-lat/devfreq/*cpu7-cpu-l3-lat
+		    do
+			cat $l3prime/available_frequencies | cut -d " " -f 1 > $l3prime/min_freq
+		    done
+
+		done
+	fi
+	# Turn off scheduler boost at the end
+	echo 0 > /proc/sys/kernel/sched_boost
+	echo 1 > /proc/sys/kernel/sched_walt_rotate_big_tasks
 
 	# memlat specific settings are moved to seperate file under
 	# device/target specific folder
@@ -5423,7 +5513,6 @@ case "$target" in
 			configure_automotive_sku_parameters
 		   fi
 		fi
-	fi
     ;;
 esac
 
@@ -5514,7 +5603,7 @@ case "$target" in
 	do
 	    for cpubw in $device/*cpu-cpu-llcc-bw/devfreq/*cpu-cpu-llcc-bw
 	    do
-		echo "bw_hwmon" > $cpubw/governor
+		cat $cpubw/available_frequencies | cut -d " " -f 1 > $cpubw/min_freq
 		echo 40 > $cpubw/polling_interval
 		echo "2288 4577 7110 9155 12298 14236 15258" > $cpubw/bw_hwmon/mbps_zones
 		echo 4 > $cpubw/bw_hwmon/sample_ms
@@ -5530,7 +5619,7 @@ case "$target" in
 
 	    for llccbw in $device/*cpu-llcc-ddr-bw/devfreq/*cpu-llcc-ddr-bw
 	    do
-		echo "bw_hwmon" > $llccbw/governor
+		cat $llccbw/available_frequencies | cut -d " " -f 1 > $llccbw/min_freq
 		echo 40 > $llccbw/polling_interval
 		echo "1720 2929 3879 5931 6881 7980" > $llccbw/bw_hwmon/mbps_zones
 		echo 4 > $llccbw/bw_hwmon/sample_ms
@@ -5547,7 +5636,7 @@ case "$target" in
 	    for npubw in $device/*npu-npu-ddr-bw/devfreq/*npu-npu-ddr-bw
 	    do
 		echo 1 > /sys/devices/virtual/npu/msm_npu/pwr
-		echo "bw_hwmon" > $npubw/governor
+		cat $npubw/available_frequencies | cut -d " " -f 1 > $npubw/min_freq
 		echo 40 > $npubw/polling_interval
 		echo "1720 2929 3879 5931 6881 7980" > $npubw/bw_hwmon/mbps_zones
 		echo 4 > $npubw/bw_hwmon/sample_ms
@@ -5564,7 +5653,7 @@ case "$target" in
 	    #Enable mem_latency governor for L3, LLCC, and DDR scaling
 	    for memlat in $device/*cpu*-lat/devfreq/*cpu*-lat
 	    do
-		echo "mem_latency" > $memlat/governor
+		cat $memlat/available_frequencies | cut -d " " -f 1 > $memlat/min_freq
 		echo 10 > $memlat/polling_interval
 		echo 400 > $memlat/mem_latency/ratio_ceil
 	    done
@@ -5578,19 +5667,21 @@ case "$target" in
 	    #Enable compute governor for gold latfloor
 	    for latfloor in $device/*cpu-ddr-latfloor*/devfreq/*cpu-ddr-latfloor*
 	    do
-		echo "compute" > $latfloor/governor
+		cat $latfloor/available_frequencies | cut -d " " -f 1 > $latfloor/min_freq
 		echo 10 > $latfloor/polling_interval
 	    done
 
 	    #Gold L3 ratio ceil
 	    for l3gold in $device/*cpu4-cpu-l3-lat/devfreq/*cpu4-cpu-l3-lat
 	    do
+		cat $l3gold/available_frequencies | cut -d " " -f 1 > $l3gold/min_freq
 		echo 4000 > $l3gold/mem_latency/ratio_ceil
 	    done
 
 	    #Prime L3 ratio ceil
 	    for l3prime in $device/*cpu7-cpu-l3-lat/devfreq/*cpu7-cpu-l3-lat
 	    do
+		cat $l3prime/available_frequencies | cut -d " " -f 1 > $l3prime/min_freq
 		echo 20000 > $l3prime/mem_latency/ratio_ceil
 	    done
 	done
diff --git a/rootdir/bin/init.qcom.sh b/rootdir/bin/init.qcom.sh
index b80e98a..3e16182 100755
--- a/rootdir/bin/init.qcom.sh
+++ b/rootdir/bin/init.qcom.sh
@@ -450,6 +450,9 @@ fi
 chmod g-w /data/vendor/modem_config
 setprop ro.vendor.ril.mbn_copy_completed 1
 
+chown -h root.oem_2902 /sys/devices/platform/soc/8048000.tmc/coresight-tmc-etr/block_size
+chmod 660 /sys/devices/platform/soc/8048000.tmc/coresight-tmc-etr/block_size
+
 #check build variant for printk logging
 #current default minimum boot-time-default
 buildvariant=`getprop ro.build.type`
diff --git a/rootdir/etc/init.qti.kernel.rc b/rootdir/etc/init.qti.kernel.rc
index a1f8c62..98ed98c 100644
--- a/rootdir/etc/init.qti.kernel.rc
+++ b/rootdir/etc/init.qti.kernel.rc
@@ -82,9 +82,7 @@ on boot
     # Set the default message loglevel to KERN_INFO
     write /proc/sys/kernel/printk "4 6 1 7"
 
-    # Allow access to emmc rawdump block partition and dload sysfs node
-    chown root system /dev/block/bootdevice/by-name/rawdump
-    chmod 0660 /dev/block/bootdevice/by-name/rawdump
+    # Allow access to dload sysfs node
     chown root system /sys/kernel/dload/emmc_dload
     chmod 0660 /sys/kernel/dload/emmc_dload
     chown root system /dev/block/bootdevice/by-name/ramdump
diff --git a/rootdir/etc/init.qti.ufs.rc b/rootdir/etc/init.qti.ufs.rc
deleted file mode 100644
index a37e55e..0000000
--- a/rootdir/etc/init.qti.ufs.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2011-2016, 2018-2020 The Linux Foundation. All rights reserved.
-# #
-# # Redistribution and use in source and binary forms, with or without
-# # modification, are permitted provided that the following conditions are
-# # met:
-# #     * Redistributions of source code must retain the above copyright
-# #       notice, this list of conditions and the following disclaimer.
-# #     * Redistributions in binary form must reproduce the above
-# #       copyright notice, this list of conditions and the following
-# #       disclaimer in the documentation and/or other materials provided
-# #       with the distribution.
-# #     * Neither the name of The Linux Foundation nor the names of its
-# #       contributors may be used to endorse or promote products derived
-# #       from this software without specific prior written permission.
-# #
-# # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# # ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-on init
-    exec u:r:vendor-qti-testscripts:s0 -- /vendor/bin/sh /vendor/bin/init.qti.ufs.debug.sh
diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc
index 04e5708..5b1f2a0 100644
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@@ -72,6 +72,7 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/smd2                 0660   bluetooth  bluetooth
 /dev/smd3                 0660   bluetooth  bluetooth
 /dev/btpower              0660   bluetooth  system
+/dev/btfmslim             0660   bluetooth  system
 
 #permissions for pta
 /dev/pta                  0660   system     system
@@ -173,32 +174,11 @@ 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/002      0660   system     system
-/dev/bus/usb/001/003      0660   system     system
-/dev/bus/usb/001/004      0660   system     system
-/dev/bus/usb/001/005      0660   system     system
-/dev/bus/usb/002/002      0660   system     system
-/dev/bus/usb/002/003      0660   system     system
-/dev/bus/usb/002/004      0660   system     system
-/dev/bus/usb/002/005      0660   system     system
-/dev/bus/usb/003/002      0660   system     system
-/dev/bus/usb/003/003      0660   system     system
-/dev/bus/usb/003/004      0660   system     system
-/dev/bus/usb/003/005      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
+/dev/bus/usb/*                      0660  root    usb
+/dev/hidraw*                        0660  root    usb
 
-#goodix fingerprint
-/dev/goodix_fp   0660   system   system
+#rawdump
+/dev/block/platform/soc/*/by-name/rawdump       0660   root     system
 
 # wlan
 /dev/wcnss_wlan           0660   system     system
@@ -341,6 +321,9 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/nq-nci               0660    nfc         nfc
 /dev/assd                 0660    nfc         nfc
 
+#Modify by yanqiwen for st bringup
+/dev/st21nfc              0660    nfc         nfc
+
 # UIO devices
 /dev/uio0                 0660   system     system
 /dev/uio1                 0660   system     system
@@ -381,10 +364,6 @@ firmware_directories /vendor/firmware_mnt/image/
 # Kmsg device
 /dev/kmsg                                               0620   root       system
 
-#bug636798, xuxinyu@wt, 20210724,add hardware info
-#hardwareinfo
-/dev/hardwareinfo        0660   root     system
-
 # LED class devices
 /sys/class/leds/red      delay_on     0640    system    system
 /sys/class/leds/red      delay_off    0640    system    system
@@ -412,6 +391,9 @@ firmware_directories /vendor/firmware_mnt/image/
 
 /sys/devices/virtual/hdcp/msm_hdcp  min_level_change 0664    system  graphics
 
+#KGSL
+/sys/class/kgsl/kgsl-3d0    perfcounter              0660    root    shell
+
 # sys-fs display
 /sys/class/graphics/fb*     hpd                      0664    system  graphics
 /sys/class/graphics/fb*     res_info                 0664    system  graphics