diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index 93f94c03e1839a98d1b2c86046657ad8249f27a2..7954f6238218e2f74b57def4d01ecd5c400e2da4 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -1,521 +1,224 @@
 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
-# Enable IMPS or not
-gEnableImps=1
-
-# Enable BMPS or not
-gEnableBmps=1
-
-# Phy Mode (auto, b, g, n, etc)
-# Valid values are 0-9, with 0 = Auto, 4 = 11n, 9 = 11ac
-# 1 = 11abg, 2 = 11b, 3 = 11g, 5 = 11g only, 6 = 11n only
-# 7 = 11b only 8 = 11ac only.
+fw_timeout_crash=1
 gDot11Mode=0
-
-# Assigned MAC Addresses - This will be used until NV items are in place
-# Each byte of MAC address is represented in Hex format as XX
-Intf0MacAddress=000AF58989FF
-Intf1MacAddress=000AF58989FE
-Intf2MacAddress=000AF58989FD
-Intf3MacAddress=000AF58989FC
-
-# UAPSD service interval for VO,VI, BE, BK traffic
 InfraUapsdVoSrvIntv=0
 InfraUapsdViSrvIntv=0
 InfraUapsdBeSrvIntv=0
 InfraUapsdBkSrvIntv=0
-
-# Flag to allow STA send AddTspec even when ACM is Off
 gAddTSWhenACMIsOff=1
-
-# Flags to filter Mcast and Bcast RX packets.
-# Value 0: No filtering, 1: Filter all Multicast.
-# 2: Filter all Broadcast. 3: Filter all Mcast abd Bcast
-McastBcastFilter=3
-
-#Flag to enable HostARPOffload feature or not
-hostArpOffload=1
-
-#Flag to enable HostNSOffload feature or not
-hostNSOffload=1
-
-# 802.11n Protection flag
-gEnableApProt=1
-
-#Enable OBSS protection
 gEnableApOBSSProt=1
-
-#Enable/Disable UAPSD for SoftAP
-gEnableApUapsd=1
-
-# Fixed Rate
-gFixedRate=0
-
-# Maximum Tx power
-# gTxPowerCap=30
-
-# Fragmentation Threshold
-# gFragmentationThreshold=2346
-
-# RTS threshold
-RTSThreshold=2346
-
-# Intra-BSS forward
+RTSThreshold=1048576
 gDisableIntraBssFwd=0
-
-# WMM Enable/Disable
-WmmIsEnabled=0
-
-# 802.11d support
 g11dSupportEnabled=0
-
-# 802.11h support
-g11hSupportEnabled=1
-
-# DFS Master Capability
 gEnableDFSMasterCap=1
-
-# ESE Support and fast transition
-EseEnabled=0
-
-ImplicitQosIsEnabled=0
-
 gNeighborScanTimerPeriod=200
 gNeighborLookupThreshold=76
 gNeighborScanChannelMinTime=20
-gNeighborScanChannelMaxTime=30
-gMaxNeighborReqTries=3
-
-# Legacy (non-ESE, non-802.11r) Fast Roaming Support
-# To enable, set FastRoamEnabled=1
-# To disable, set FastRoamEnabled=0
 FastRoamEnabled=1
-
-# Check if the AP to which we are roaming is better than current AP in
-# terms of RSSI.  Checking is disabled if set to Zero.Otherwise it will
-# use this value as to how better the RSSI of the new/roamable AP should
-# be for roaming
 RoamRssiDiff=5
-
-# To enable, set gRoamIntraBand=1 (Roaming within band)
-# To disable, set gRoamIntraBand=0 (Roaming across band)
 gRoamIntraBand=0
-
-#Short Guard Interval Enable/disable
-gShortGI20Mhz=1
-gShortGI40Mhz=1
-
-#Auto Shutdown  Value in seconds. A value of 0 means Auto shutoff is disabled
-gAPAutoShutOff=0
-
-#Auto Shutdown wlan : Value in Seconds. 0 means disabled. Max 1 day = 86400 sec
-gWlanAutoShutdown = 0
-
-# Not used.
-gApAutoChannelSelection=0
-
-#Preferred band (both or 2.4 only or 5 only)
-BandCapability=0
-
-#Channel Bonding
 gChannelBondingMode5GHz=1
-
-#Say gGoKeepAlivePeriod(5 seconds) and gGoLinkMonitorPeriod(10 seconds).
-#For every 10 seconds DUT send Qos Null frame(i.e., Keep Alive frame if link
-#is idle for last 10 seconds.) For both active and power save clients.
-
-#Power save clients: DUT set TIM bit from 10th second onwards and till client
-#honors TIM bit. If doesn't honor for 5 seconds then DUT remove client.
-
-#Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not
-#success still we try on 11th second if not tries on 12th and so on till 15th
-#second. Hence before disconnection DUT will send 5 NULL frames. Hence in any
-#case DUT will detect client got removed in (10+5) seconds.
-#i.e., (gGoKeepAlivePeriod + gGoLinkMonitorPeriod)..
-
-#gGoLinkMonitorPeriod/ gApLinkMonitorPeriod is period where link is idle and
-#it is period where we send NULL frame.
-#gApLinkMonitorPeriod = 10
-#gGoLinkMonitorPeriod = 10
-
-#gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame
-#are succeed to send or not. Hence total effective detection time is
-# (gGoLinkMonitorPeriod + gGoKeepAlivePeriod) /
-# (gApLinkMonitorPeriod + gApKeepAlivePeriod)
-gGoKeepAlivePeriod = 20
-gApKeepAlivePeriod = 20
-
-#If set will start with active scan after driver load, otherwise will start with
-#passive scan to find out the domain
-gEnableBypass11d=1
-
-#If set to 0, will not scan DFS channels
 gEnableDFSChnlScan=1
-
-# Enable DFS channel roam
-# 0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
 gAllowDFSChannelRoam=1
-
-gVhtChannelWidth=2
-
-#Data Inactivity Timeout when in powersave (in ms)
-gDataInactivityTimeout=200
-
-# Set txchainmask and rxchainmask
-# These parameters are used only if gEnable2x2 is 0
-# Valid values are 1,2
-# Set gSetTxChainmask1x1=1 or gSetRxChainmask1x1=1 to select chain0.
-# Set gSetTxChainmask1x1=2 or gSetRxChainmask1x1=2 to select chain1.
 gSetTxChainmask1x1=1
 gSetRxChainmask1x1=1
-
-# Scan Timing Parameters
-# gPassiveMaxChannelTime=110
-# gPassiveMinChannelTime=60
 gActiveMaxChannelTime=40
-gActiveMinChannelTime=20
-
-#If set to 0, MCC is not allowed.
-gEnableMCCMode=1
-
-# MCC to SCC Switch mode:
-# 0-Disable
-# 1-Enable
-# 2-Force SCC if same band, with SAP restart
-# 3-Force SCC if same band, without SAP restart by sending (E)CSA
-# 4-Force SCC if same band (or) use SAP mandatory channel for DBS,
-#   without SAP restart by sending (E)CSA
 gWlanMccToSccSwitchMode = 3
-
-# 1=enable STBC; 0=disable STBC
-gEnableRXSTBC=1
-
-# 1=enable tx STBC; 0=disable
 gEnableTXSTBC=1
-
-# 1=enable rx LDPC; 0=disable
-gEnableRXLDPC=1
-
-#Enable/Disable Tx beamforming
-gTxBFEnable=1
-
-#Enable/Disable Tx beamformee in SAP mode
 gEnableTxBFeeSAP=1
-
-# Enable Tx beamforming in VHT20MHz
-# Valid values are 0,1. If commented out, the default value is 0.
-# 0=disable, 1=enable
 gEnableTxBFin20MHz=1
-
-#Enable/Disable SU Tx beamformer support.
 gEnableTxSUBeamformer=1
-
-gEnableFastRoamInConcurrency=1
-
-#Maxium Channel time in msec
-gMaxMediumTime = 6000
-
-# 802.11K support
 gRrmEnable=1
-
-#Enable Power Save offload
-gEnablePowerSaveOffload=1
-
-#Enable firmware uart print
 gEnablefwprint=0
-
-# Firmware log mode
-# Valid values are 0,1,2
-# 0=Disable, 1=WMI, 2=DIAG
 gEnablefwlog=1
-
-# Maximum Receive AMPDU size (VHT only. Valid values:
-# 0->8k 1->16k 2->32k 3->64k 4->128k)
 gVhtAmpduLenExponent=7
-
-# Maximum MPDU length (VHT only. Valid values:
-# 0->3895 octets, 1->7991 octets, 2->11454 octets)
 gVhtMpduLen=2
-
-# Maximum number of wow filters required
-#gMaxWoWFilters=22
-
-# WOW Enable/Disable.
-# 0 - Disable both magic pattern match and pattern byte match.
-# 1 - Enable magic pattern match on all interfaces.
-# 2 - Enable pattern byte match on all interfaces.
-# 3 - Enable both magic pattern and pattern byte match on all interfaces.
-# Default value of gEnableWoW is 3.
-# gEnableWoW=0
-
-# Enable or Disable MCC Adaptive Scheduler at the FW
-# 1=Enable (default), 0=Disable
-gEnableMCCAdaptiveScheduler=1
-
-#Enable or Disable p2p device address administered
 isP2pDeviceAddrAdministrated=0
-
-# Set Thermal Power limit
-TxPower2g=10
-TxPower5g=10
-# Remove Overlap channel restriction
-gEnableOverLapCh=0
-
-#Enable VHT on 2.4Ghz
 gEnableVhtFor24GHzBand=1
-# Configure channel Bonding in 2.4GHz
-gChannelBondingMode24GHz=0
-
-#Maximum number of offload peers supported
-# gMaxOffloadPeers=2
-
-# controlling the following offload patterns
-# through ini parameter. Default value is 1
-# to disable set it to zero. ssdp = 0
-# Setup multicast pattern for mDNS 224.0.0.251,
-# SSDP 239.255.255.250 and LLMNR 224.0.0.252
-ssdp=0
-
-#Enable Memory Deep Sleep
-gEnableMemDeepSleep=1
-
-# Regulatory Setting; 0=STRICT; 1=CUSTOM
-gRegulatoryChangeCountry=1
-
-# RA filtering rate limit param, the current value would not
-# help if the lifetime in RA is less than 3*60=3min. Then
-# we need to change it, though it is uncommon.
-# gRAFilterEnable=0
-gRArateLimitInterval=600
-
-# Maximum number of concurrent connections
-gMaxConcurrentActiveSessions=3
-
-# Disable/Enable GreenAP
-# 0 to disable, 1 to enable, default: 1
-gEnableGreenAp=0
-
-# Radar PRI multiplier
-gDFSradarMappingPriMultiplier=4
-
-gPNOScanSupport=1
-
-#Enable/Disable LPASS support
-# 0 to disable, 1 to enable
 gEnableLpassSupport=1
-
-# Whether userspace country code setting shld have priority
 gCountryCodePriority=1
-
-# Enable(1)/Disable(0) SIFS burst
-gEnableSifsBurst=1
-
-# Enable or Disable Multi-user MIMO
-# 1=Enable (default), 0=Disable
 gEnableMuBformee=1
-
-# Enable/Disable channel avoidance for SAP in SCC scenario
-# 0 - disable
-# 1 - enable
-gSapSccChanAvoidance=0
-
-# Inactivity time (in ms) to end TX Service Period while in IBSS power save mode
-gIbssTxSpEndInactivityTime=10
-
-# Enable support for TDLS
-#  0 - disable
-#  1 - enable
 gEnableTDLSSupport=1
-
-# Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
-# initiate TDLS Discovery towards a peer whenever setup criteria (throughput
-# and RSSI) is met and then will initiate teardown when teardown criteria
-# (idle packet count and RSSI) is met.
-#  0 - disable
-#  1 - enable
 gEnableTDLSImplicitTrigger=1
-
-# Enable TDLS External Control. That is, user space application has to
-# first configure a peer MAC in wlan driver towards which TDLS is desired.
-# Device will establish TDLS only towards those configured peers whenever
-# TDLS criteria (throughput and RSSI threshold) is met and teardown TDLS
-# when teardown criteria (idle packet count and RSSI) is met. However,
-# device will accept TDLS connection if it is initiated from any other peer,
-# even if that peer is not configured.
-#  0 - disable
-#  1 - enable
-# For TDLS External Control, Implicit Trigger must also be enabled.
 gTDLSExternalControl=1
-
-# Enable support for TDLS off-channel operation
-#  0 - disable
-#  1 - enable
-# TDLS off-channel operation will be invoked when there is only one
-# TDLS connection.
 gEnableTDLSOffChannel=1
 
-# Enable or Disable Random MAC (Spoofing)
-# 1=Enable (default), 0=Disable
-gEnableMacAddrSpoof=1
-
 ################ Datapath feature set Begin ################
-# Bus bandwidth threshold values in terms of number of packets
 gBusBandwidthHighThreshold=2000
 gBusBandwidthMediumThreshold=500
 gBusBandwidthLowThreshold=150
-
-# Bus bandwidth compute timeout value in ms
 gBusBandwidthComputeInterval=100
-
-# VHT Tx/Rx MCS values
-# Valid values are 0,1,2. If commented out, the default value is 0.
-# 0=MCS0-7, 1=MCS0-8, 2=MCS0-9
 gVhtRxMCS=2
 gVhtTxMCS=2
-
-# VHT Tx/Rx MCS values for 2x2
-# Valid values are 0,1,2. If commented out, the default value is 0.
-# 0=MCS0-7, 1=MCS0-8, 2=MCS0-9
 gEnable2x2=1
 gVhtRxMCS2x2=2
 gVhtTxMCS2x2=2
-
-#IPA config is a bit mask and following are the configurations.
-#bit0 IPA Enable
-#bit1 IPA PRE Filter enable
-#bit2 IPv6 enable
-#bit3 IPA Resource Manager (RM) enable
-#bit4 IPA Clock scaling enable
-#bit5 IPA uC ENABLE
-#bit6 IPA uC STA ENABLE
-#bit8 IPA Real Time Debugging
 gIPAConfig=0x7d
 gIPADescSize=800
-
-# Enable/Disable RX full reorder offload
+dp_tx_ring_size=3072
 gReorderOffloadSupported=1
-
-# Enable CE classification
-# 1 - enable(default)  0 - disable
 gCEClassifyEnable=1
-
-# Enable Rx handling options
-# Rx_thread=1 RPS=2(default for ROME) NAPI=4(default for ihelium)
-rx_mode=5
-
-# Enable(Tx) fastpath for data traffic.
-# 1 - enable(default)  0 - disable
+rx_mode=20
 gEnableFastPath=1
-
-# This flag enables IP, TCP and UDP checksum offload
-# 1 - enable(default)  0 - disable
 gEnableIpTcpUdpChecksumOffload=1
-
-# Enable TCP Segmentation Offload
-# 1 - enable  0 - disable
 TSOEnable=1
-
-# Enable Generic Receive Offload
-# 1 - enable(default)  0 - disable
 GROEnable=1
-
-# Enable HT MPDU Density
-# 4 for 2 micro sec
 ght_mpdu_density=4
-
-# Enable flow steering to enable multiple CEs for Rx flows.
-# Multiple Rx CEs<==>Multiple Rx IRQs<==>probably different CPUs.
-# Parallel Rx paths.
-# 1 - enable 0 - disable(default)
 gEnableFlowSteering=1
-
-# Time in microseconds after which a NAPI poll must yield
 ce_service_max_yield_time=500
-
-#Maximum number of HTT messages to be processed per NAPI poll
 ce_service_max_rx_ind_flush=1
-
-# Maximum number of MSDUs the firmware will pack in one HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND
 maxMSDUsPerRxInd=8
-
-# Enable NUD tracking feature
-# 1 - enable 0 - disable(default)
-gEnableNUDTracking=1
-
-# Enable PEER UNMAP CONF SUPPORT
-# 1 - enable 0 - disable(default)
-gEnablePeerUnmapConfSupport=1
+#gEnableNUDTracking=1
+dp_rx_fisa_enable=1
+dp_rx_flow_search_table_size=128
+rpsRxQueueCpuMapList=f3
+legacy_mode_csum_disable=1
 
 ################ Datapath feature set End ################
 
-################ NAN feature set start ###################
+adaptive_dwell_mode_enabled=1
+hostscan_adaptive_dwell_mode=1
+adapt_dwell_lpf_weight=80
+adapt_dwell_wifi_act_threshold=10
+enable_rtt_mac_randomization=1
+gEnableSNRMonitoring=1
+gWmiCreditCount=1
+acs_with_more_param=1
+AutoChannelSelectWeight=0x00fafafa
+bcast_twt=1
+gRuntimePM=2
+gRuntimePMDelay=500
+gEnablePacketLog=0
+gfine_time_meas_cap=0x0030D
+oem_6g_support_disable=0
+cfr_disable=7
+
+active_max_channel_time_2g=80
+gActiveMaxChannelTime=60
+active_max_channel_time_6g=60
+gPassiveMaxChannelTime=110
+passive_max_channel_time_6g=60
+
+#####################################Xiaomi ADD: START
+
+# WLM flags setting for ultralow level, bit9 for BMPS disabled
+# bit 0: Avoid scan request from HLOS if setting
+# bit 1: Skip DFS channel SCAN if setting
+# bit 19/20: 1 to set PCIE in L1SS state(low power mode), 0 to set PCIE in L0 state(active mode)
+wlm_latency_flags_ultralow=0x180003
+
+#APF: Android Packet Filter
+gActiveMcBcBpfMode=1
+
+# Assoc failure timeout value
+# Code default is 2000
+assoc_failure_timeout=5000
 
-# Enable NAN discovery (NAN 1.0)
-# 1 - enable  0 - disable(default)
-gEnableNanSupport=1
-# Enable NAN Datapath
-genable_nan_datapath=1
+# Enable NUD tracking feature
+# 0 - disable(default),1 - trigger disconnect, 2 - trigger roaming,
+# 3 - trigger roaming, but if roam fails, disconnection
+gEnableNUDTracking=3
 
-################ NAN feature set end #####################
+#gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame
+#are succeed to send or not. Hence total effective detection time is
+# (gGoLinkMonitorPeriod + gGoKeepAlivePeriod) /
+# (gApLinkMonitorPeriod + gApKeepAlivePeriod)
+gGoKeepAlivePeriod = 20
+gApKeepAlivePeriod = 20
+#Enable Keep alive with non-zero period value
+gStaKeepAlivePeriod = 30
+
+# Enable ETSI SRD channels by Xiaomi. Qualcom default value is disable
+# * BIT 0:- Enable/Disable SRD channels for SAP.
+# * BIT 1:- Enable/Disable SRD channels for P2P-GO.
+# * BIT 2:- Enable/Disable SRD channels for NAN.
+# Code default value is 6.
+etsi13_srd_chan_in_master_mode=7
+
+#####Roaming
+# Sets RSSI preference for 5GHz over 2.4GHz AP
+gSelect5GHzMargin=5
 
-adaptive_dwell_mode_enabled=1
+# Candidate AP minimum RSSI for beacon miss roam trigger
+# Code default is -70
+candidate_min_rssi_for_beacon_miss=-83
 
-hostscan_adaptive_dwell_mode=1
+# Dense traffic threshold in kBps
+# Code default is 400
+gtraffic_threshold=50
 
-adapt_dwell_lpf_weight=80
+#Idle Monitor Roaming: START
+# Code default is flase to disable idle roaming
+enable_idle_roam=1
+idle_roam_min_rssi=-65
+#Idle Monitor Roaming: END
 
-adapt_dwell_wifi_act_threshold=10
+#enable/disable FT open feature
+# Code default is 1
+enable_ftopen=0
 
-MAWCEnabled=0
+# Stop auto-creating twt session
+twt_congestion_timeout=0
 
-drop_bcn_on_chan_mismatch=0
-# Enable/Disable rtt sta mac randomization
-enable_rtt_mac_randomization=1
+#VTS SAR test fail as sar version is not match
+gEnableSARV1toSARV2=1
 
-#Enable/Disable SNR monitoring
-gEnableSNRMonitoring=1
+# This ini is used to give higher priority for 5g scc than dbs.
+# It is bitmap per enum policy_mgr_con_mode.
+# For example in GO+STA(5G) mode, when TPUT is onfigured as wlan system
+# preference option, If 5G SCC needs higher priority than dbs, set it as 8.
+g_prefer_5g_scc_to_dbs=8
 
-#Sets RSSI preference for 5GHz over 2.4GHz AP
-gSelect5GHzMargin=5
-#RSSI threshold offset for 2G to 5G roam
-roam_bad_rssi_thresh_offset_2g=0
-#RSSI threshold for background roam
-roam_bg_scan_bad_rssi_thresh=-76
-#Sends NULL frame to AP periodically in seconds to notify STA's existence
-gStaKeepAlivePeriod=30
-gEnablePacketLog=1
-#Enable/Disable Modulated DTIM feature
+# set modulated DTIM interval
 gEnableModulatedDTIM=3
-#Set MaxLIModulate Dtim
 gMaxLIModulatedDTIM=3
-#Sets dense roam RSSI Threshold diff
-groam_dense_rssi_thresh_offset=5
-#traffic Threshold required for dense roam scan
-gtraffic_threshold=50
-gRoamBmissFirstBcnt=10
-gRoamBmissFinalBcnt=20
-#To Enable/Disable PER based Roaming in FW
-gper_roam_enabled=3
-#ARP access category
-arp_ac_category=0
-#Enable/Disable LPRx
-gEnableLPRx=0
-gEnableSelfRecovery=1
-#Enable/Disable FT open feature
-enable_ftopen=0
+
+# Reduce the expiry time for avoid list and black list in drv.
+avoid_list_expiry_time=3
+black_list_expiry_time=5
+# Improve threshold to move the Ap from avoid to blacklist
+bad_bssid_counter_thresh=7
+
+# Enable the sending of ICMP requests to the
+# FW at an interval of 200 milliseconds
+send_icmp_req_to_fw=200
+
+# Enable SoftAP on indoor channel, but Xiaomi's patch in driver only
+# allow this when STA was connected on the same indoor channel.
+gindoor_channel_support=1
+
 #Enable max link speed
 gReportMaxLinkSpeed=2
-#Enable/Disable SAE support in Driver
-sae_enabled=0
-# Enable/disable ETSI SRD channels in master mode PCL and ACS functionality
-etsi13_srd_chan_in_master_mode=1
-# Set max time for active 2G channel scan
-active_max_channel_time_2g=0
-# Enable/Disable emergency roaming during deauth/disassoc
-enable_disconnect_roam_offload=1
-# Enable/Disable RTT feature
-gEnableRTTSupport=0
+
+#####################################Xiaomi ADD: END
+
+
+# MIUI:ADD:
+# Add for optimize download performance in noisy env.
+
+# used to specify AP OUIs. The station's EDCA should follow
+# the APs' when connecting to those AP, even if the
+# gEnableEdcaParams is set.
+# Huawei OUI:ac:85:3d
+gActionOUIDisableAggressiveEDCA=ac853d 00 01
+# Enable edca parameter
+gEnableEdcaParams=1
+gEdcaVoCwmin=2
+gEdcaViCwmin=2
+gEdcaBkCwmin=2
+gEdcaBeCwmin=2
+
+gEdcaVoCwmax=3
+gEdcaViCwmax=3
+gEdcaBkCwmax=3
+gEdcaBeCwmax=3
+
+gEdcaVoAifs=2
+gEdcaViAifs=2
+gEdcaBkAifs=2
+gEdcaBeAifs=2
 
 END
 
diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf
index 4de5bc69a473eaab58aa440551d0109cbf22c47d..6c38a4521f90c75d9315fc2da466d39b1fdf9254 100644
--- a/wifi/p2p_supplicant_overlay.conf
+++ b/wifi/p2p_supplicant_overlay.conf
@@ -2,4 +2,5 @@ disable_scan_offload=1
 p2p_no_group_iface=1
 persistent_reconnect=1
 bss_max_count=400
-p2p_go_intent=14
+p2p_go_he=1
+p2p_6ghz_disable=1