z2_plus: wifi: Import partially from op3

* already cleaned up
* also removed WCNSS_cfg.dat that didn't seem called by anything

Signed-off-by: dd3boh <dade.garberi@gmail.com>

4 files changed, 118 insertions, 119 deletions

diff --git a/device.mk b/device.mk
index 6dfbba2..a11379d 100644
--- a/device.mk
+++ b/device.mk
@@ -263,6 +263,5 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf 
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
-    $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/qca_cld/WCNSS_cfg.dat
+    $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini
 
diff --git a/wifi/WCNSS_cfg.dat b/wifi/WCNSS_cfg.dat
deleted file mode 100644
index 08aaf2b..0000000
--- a/wifi/WCNSS_cfg.dat
+++ /dev/null
diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index 643de96..b645922 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -2,6 +2,22 @@
 
 # defaults for the WLAN Driver
 
+gInitialScanNoDFSChnl=1
+gInitialDwellTime=20
+RoamRssiDiff=5
+gEnable2x2=0
+g11dSupportEnabled=1
+gSoftApMaxPeers=8
+gRAFilterEnable=0
+gRoamBmissFirstBcnt=25
+gRoamBmissFinalBcnt=35
+RTSThreshold=117350
+gTcpDelAckThresholdHigh=10000
+gDroppedPktDisconnectTh=1024
+gRuntimePM=0
+gMCAddrListEnable=0
+gBpfFilterEnable=0
+gEnablePowerSaveOffload=1
 
 # Enable IMPS or not
 gEnableImps=1
@@ -75,7 +91,7 @@ gNthBeaconFilter=50
 
 # Enable WAPI or not
 
-WAPIIsEnabled=1
+# WAPIIsEnabled=0
 
 
 # Flags to filter Mcast abd Bcast RX packets.
@@ -129,22 +145,6 @@ gEnableApUapsd=1
 
 gFixedRate=0
 
-
-# Maximum Tx power
-
-# gTxPowerCap=30
-
-
-# Fragmentation Threshold
-
-# gFragmentationThreshold=2346
-
-
-# RTS threshold
-
-RTSThreshold=1048576
-
-
 # Intra-BSS forward
 
 gDisableIntraBssFwd=0
@@ -154,11 +154,6 @@ gDisableIntraBssFwd=0
 
 WmmIsEnabled=0
 
-
-# 802.11d support
-
-g11dSupportEnabled=1
-
 # 802.11h support
 
 g11hSupportEnabled=1
@@ -167,7 +162,7 @@ g11hSupportEnabled=1
 gEnableDFSMasterCap=1
 
 # ESE Support and fast transition
-EseEnabled=0
+EseEnabled=1
 ImplicitQosIsEnabled=0
 gNeighborScanTimerPeriod=200
 
@@ -183,11 +178,6 @@ gMaxNeighborReqTries=3
 # 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
-
 # If the RSSI of any available candidate is better than currently associated
 # AP by at least gImmediateRoamRssiDiff, then being to roam immediately (without
 # registering for reassoc threshold).
@@ -198,22 +188,6 @@ gImmediateRoamRssiDiff=10
 # To disable, set gRoamIntraBand=0 (Roaming across band)
 gRoamIntraBand=0
 
-# SAP Country code
-
-# Default Country Code is 2 bytes, 3rd byte is optional indoor or out door.
-
-# Example
-
-#   US Indoor, USI
-
-#   Korea Outdoor, KRO
-
-#   Japan without optional byte, JP
-
-#   France without optional byte, FR
-
-#gAPCntryCode=USI
-
 
 #Short Guard Interval Enable/disable
 
@@ -226,6 +200,9 @@ gShortGI40Mhz=1
 
 gAPAutoShutOff=0
 
+#Auto Shutdown wlan : Value in Seconds. 0 means disabled. Max 1 day = 86400 sec
+gWlanAutoShutdown = 0
+
 
 # SAP auto channel selection configuration
 
@@ -233,13 +210,7 @@ gAPAutoShutOff=0
 
 # 1 = enable auto channel selection, channel provided by supplicant will be ignored
 
-gApAutoChannelSelection=1
-gAPChannelSelectStartChannel=8
-gAPChannelSelectEndChannel=8
-gAPChannelSelectOperatingBand=0
-
-#Auto Shutdown wlan : Value in Seconds. 0 means disabled. Max 1 day = 86400 sec
-gWlanAutoShutdown = 0
+gApAutoChannelSelection=0
 
 
 # Listen Energy Detect Mode Configuration
@@ -286,19 +257,52 @@ BandCapability=0
 
 #Beacon Early Termination (1 = enable the BET feature, 0 = disable)
 
-enableBeaconEarlyTermination=1
+enableBeaconEarlyTermination=0
+
+beaconEarlyTerminationWakeInterval=3
 
-beaconEarlyTerminationWakeInterval=8
+
+#SOFTAP Channel Range selection
+
+gAPChannelSelectStartChannel=1
+
+gAPChannelSelectEndChannel=11
+
+
+#SOFTAP Channel Range selection Operating band
+
+# 0:2.4GHZ 1: LOW-5GHZ 2:MID-5GHZ 3:HIGH-5GHZ 4: 4.9HZ BAND
+
+gAPChannelSelectOperatingBand=0
 
 
 #Channel Bonding
 gChannelBondingMode5GHz=1
-gChannelBondingMode24GHz=1
+gChannelBondingMode24GHz=0
 
 
 #Enable Keep alive with non-zero period value
 
-gStaKeepAlivePeriod = 10
+gStaKeepAlivePeriod = 30
+
+#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
+
 
 #If set will start with active scan after driver load, otherwise will start with
 
@@ -313,10 +317,9 @@ gEnableDFSChnlScan=1
 
 
 gVhtChannelWidth=2
+gEnableLogp=1
 
 
-gGoKeepAlivePeriod = 30
-gApKeepAlivePeriod = 10
 # Enable Automatic Tx Power control
 
 gEnableAutomaticTxPowerControl=1
@@ -333,13 +336,11 @@ gDataInactivityTimeout=200
 gVhtRxMCS=2
 gVhtTxMCS=2
 
-gEnableLpwrImgTransition=1
-
 # 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
-#gVhtRxMCS2x2=2
-#gVhtTxMCS2x2=2
+gVhtRxMCS2x2=2
+gVhtTxMCS2x2=2
 
 # Enable Tx beamforming
 gTxBFEnable=1
@@ -349,7 +350,13 @@ gTxBFEnable=1
 # 0=disable, 1=enable
 gEnableTxBFin20MHz=1
 
-gTxChainMask1ss=0
+# 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
@@ -357,8 +364,6 @@ gTxChainMask1ss=0
 gActiveMaxChannelTime=40
 gActiveMinChannelTime=20
 
-gEnableDynamicDTIM=3
-
 #If set to 0, MCC is not allowed.
 gEnableMCCMode=1
 
@@ -374,6 +379,10 @@ gEnableTXSTBC=1
 # 1=enable rx LDPC; 0=disable
 gEnableRXLDPC=1
 
+# Enable or Disable txLdpc capability
+# 0 - disable, 1 - HT LDPC enable, 2 - VHT LDPC enable, 3 - HT & VHT LDPC enable
+gTxLdpcEnable=3
+
 # Enable Active mode offload
 gEnableActiveModeOffload=1
 
@@ -395,10 +404,6 @@ gThermalMitigationEnable=0
 
 gEnableFastRoamInConcurrency=1
 
-#List of Country codes for which 11ac needs to be disabled
-#Each country code must be delimited by comma(,)
-gListOfNon11acCountryCode=RU,UA,ZA
-
 #Maxium Channel time in msec
 gMaxMediumTime = 6000
 
@@ -418,23 +423,27 @@ gFlexConnectPowerFactor=0
 #Disable split scan, the FW will take care of it
 gNumChanCombinedConc=60
 
-#Enable Power Save offload
-gEnablePowerSaveOffload=4
-
 #Enable firmware uart print
 gEnablefwprint=0
 
 #Enable firmware log
 gEnablefwlog=1
 # Additional firmware log levels
-gFwDebugLogLevel=1
+gFwDebugLogLevel=4
 gFwDebugModuleLoglevel=1,0,2,0,4,0,5,0,6,0,7,4,8,0,9,0,11,0,13,0,17,0,18,0,19,0,27,0,29,0,31,0,35,0,36,0,38,0
 
 #IPA config
+#gIPAEnable=0x00
 gIPADescSize=800
 gIPAPreFilterEnable=1
 gIPARMEnable=1
 gIPAIPv6Enable=1
+gIPAConfig=0x1d
+IpaUcOffloadEnabled=1
+gIpaUcStaOffload=0
+gIPAHighBandwidthMbps=800
+gIPAMediumBandwidthMbps=400
+gIPALowBandwidthMbps=200
 
 #P2P Listen offload
 gEnableP2pListenOffload=1
@@ -469,13 +478,6 @@ isP2pDeviceAddrAdministrated=1
 # 2: RPS
 rxhandle=2
 
-#RPS CPU map, core 2 and 3
-rpsRxQueueCpuMapList=c
-
-# Set Thermal Power limit
-TxPower2g=10
-TxPower5g=10
-
 # Remove Overlap channel restriction
 gEnableOverLapCh=0
 
@@ -497,16 +499,12 @@ gEnable5gEBT=1
 
 ssdp = 0
 
+
 # Bus bandwidth threshold values in terms of number of packets
 gBusBandwidthHighThreshold=2000
 gBusBandwidthMediumThreshold=500
 gBusBandwidthLowThreshold=150
 
-# IPA bandwidth voting
-gIPAHighBandwidthMbps=800
-gIPAMediumBandwidthMbps=400
-gIPALowBandwidthMbps=200
-
 # Bus bandwidth compute timeout value in ms
 gBusBandwidthComputeInterval=100
 
@@ -521,6 +519,14 @@ gDFSradarMappingPriMultiplier=4
 
 gPNOScanSupport=1
 
+# Perform PNO fast scan this many number of times
+gPNOScanTimerRepeatValue=6
+
+# PNO slow scan period = gPNOSlowScanMultiplier times PNO fast scan period
+# Example: fast scan period is passed from framework (default = 10 sec), then
+# PNO slow scan period = 60 sec.
+gPNOSlowScanMultiplier=6
+
 # Enable/Disable RX full reorder offload
 gReorderOffloadSupported=1
 
@@ -546,8 +552,8 @@ gSapSccChanAvoidance=0
 # 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=60
+# Enable RA filtering offload
+gRArateLimitInterval=300
 
 # Inactivity time (in ms) to end TX Service Period while in IBSS power save mode
 gIbssTxSpEndInactivityTime=10
@@ -584,53 +590,46 @@ gTDLSExternalControl=1
 # TDLS connection.
 gEnableTDLSOffChannel=1
 
+gEnableTDLSScan=1
+gTDLSTxStatsPeriod=500
+gTDLSTxPacketThreshold=10
+gTDLSIdlePacketThreshold=1
+
 # Enable/Disable Roaming Offload Support (a.k.a Key Management Offload)
 # 0 to disable, 1 to enable
 gRoamOffloadEnabled=0
 
 gEnableSelfRecovery=1
 
-#Enable RA filtering offload
-gRAFilterEnable=1
-
-gAllowDFSChannelRoam=1
+# When gRuntimePM is disabled gRuntimeAutoTime won't take effect.
+# The Time is in msec.
+# 100 is min, 10000 is max, 500 is default.
 
-gChainMask_2g=3
-gChainMask_5g=3
-gVdevTypeNss_2g=43690
-gVdevTypeNss_5g=43690
+gRuntimePMDelay=500
 
-gEnableMemDeepSleep=1
+# Enable to check FW hash if secure FW feature is enabled. It's for defconfig
+# builds only since it will be ignored in performance/release builds.
+gEnableFWHashCheck=1
 
-gIPAConfig=0x1d
-IpaUcOffloadEnabled=1
-gIpaUcStaOffload=0
+# Tx Chain Mask for CCK
+gCckChainMaskEnable=1
 
-# Enable Runtime PM Feature.
-# Enabling this feature will put target wow and shutdown pcie link
-# when inactivity is detected in WLAN Driver.
-# This feature is inactive when beaconing interfaces are active with
-# clients associated.
-# 0 - disable
-# 1 - enable
-gRuntimePM=0
+# Tx Chain Mask for 1SS
+gTxChainMask1ss=0
 
-# When gRuntimePM is disabled gRuntimeAutoTime won't take effect.
-# The Time is in msec.
-# 100 is min, 10000 is max, 500 is default.
+# TPC power
+gSelfGenFrmPwr=3
 
-gRuntimePMDelay=1500
+gAllowDFSChannelRoam=1
 
-gEnablePacketLog=0
+# Enable or Disable Extended Scan (GScan)
+# 1=Enable (default), 0=Disable
+gExtScanEnable=1
 
-gTxLdpcEnable=3
 
-gMulticastHostFwMsgs=0
-#vosTraceEnableWDA=255
-#vosTraceEnableHDD=255
-#vosTraceEnableSME=255
+gEnableModulatedDTIM=2
+gMaxLIModulatedDTIM=6
 
 END
 
 # Note: Configuration parser would not read anything past the END marker
-
diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf
index b5e89e0..71f2e4f 100644
--- a/wifi/p2p_supplicant_overlay.conf
+++ b/wifi/p2p_supplicant_overlay.conf
@@ -1,2 +1,3 @@
 disable_scan_offload=1
+p2p_search_delay=100
 p2p_no_group_iface=1