dre: Update Wi-Fi configs from OOS 11.0.6.0.DE17AA

Preserve read_mac_addr_from_mac_file while we are at it.

Change-Id: I810e8cbf8755849b8ad2cdd9823e4627d0355408

wifi/WCNSS_qcom_cfg.ini

@@ -1,73 +1,25 @@
 # This file allows user to override the factory
 # defaults for the WLAN Driver
-# ifdef VENDOR_EDIT
+
-#yuquan.fei@CONNECTIVITY.WiFi, 2020/12/25,
-#Add for scan dev whose beacon is invalid with wrong length
-scan_allow_bss_with_corrupted_ie=1
-gDualMacFeatureDisable=6
-gInitialScanNoDFSChnl=1
-#gInitialDwellTime=20
-#ifndef VENDOR_EDIT
-#Use dynamic iwpriv to control
-#gSoftApMaxPeers=8
-#endif VENDOR_EDIT
-gRoamBmissFirstBcnt=15
-gRoamBmissFinalBcnt=25
-gDroppedPktDisconnectTh=1024
-# Runtime is default zero in hostdriver
-gRAFilterEnable=0
-gMCAddrListEnable=1
-# 0: disable feature (default)
-# 1: drop all broadcast frames, except ARP
-# 2: drop all multicast frames, except ICMPv6
-# 3: drop all broadcast and multicast frames, except ARP and ICMPv6
-gHwFilterMode=3
-gBpfFilterEnable=1
-gFwDebugLogLevel=3
-#gFwDebugModuleLoglevel=2,1,3,1,5,1,9,1,13,1,14,1,18,1,19,1,26,1,28,1,29,1,31,1,36,1,38,1,46,1,47,1,50,1,52,1,53,1,56,1,60,1,61,1
-gFwDebugModuleLoglevel=1,1,2,1,3,1,4,1,5,1,8,1,9,1,13,1,14,1,17,1,18,1,19,1,22,1,26,1,28,1,29,1,31,1,36,1,38,1,46,1,47,1,50,1,52,1,53,1,56,1,60,1,61,1
-gChannelBondingMode24GHz=1
-gStaKeepAlivePeriod=30
-gper_roam_enabled=3
-gper_roam_th_percent=80
-gper_min_rssi_threshold_for_roam=70
-gItoRepeatCount=5
-gDisablePacketFilter=0
-#ifndef VENDOR_EDIT
-#g_enable_packet_filter_bitmap=3
-#else
-# for layer2(mac) multicast, layer3(ip) multicast filter
-g_enable_packet_filter_bitmap=7
-#endif /* VENDOR_EDIT */
-gEnableModulatedDTIM=3
-gMaxLIModulatedDTIM=6
-#gActiveModeOffload=0
-gReportMaxLinkSpeed=2
-gEnableTDLSScan=1
-gEnableTxSUBeamformer=0
-gEnableSelfRecovery=1
-wlm_latency_flags_ultralow=0x180c83
-# endif /* VENDOR_EDIT */
 # Enable IMPS or not
 gEnableImps=1
 
 # Enable BMPS or not
 gEnableBmps=1
 
-# ifdef VENDOR_EDIT
-# Enable Qpower or not on lahaina platform, 0 for disable
-gOptimizedPowerManagement=0
-# endif /* VENDOR_EDIT */
-
-#Below ini copied from LA.UM.0.6.3
-fw_timeout_crash=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.
 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
@@ -77,15 +29,29 @@ 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
 
@@ -98,23 +64,28 @@ RTSThreshold=1048576
 # Intra-BSS forward
 gDisableIntraBssFwd=0
 
+# WMM Enable/Disable
+WmmIsEnabled=0
+
 # 802.11d support
-#ifdef VENDOR_EDIT
+g11dSupportEnabled=0
-g11dSupportEnabled=1
+
-#else
+# 802.11h support
-#g11dSupportEnabled=0
+g11hSupportEnabled=1
-#endif /* VENDOR_EDIT */
 
 # DFS Master Capability
-#ifdef VENDOR_EDIT
+gEnableDFSMasterCap=1
-gEnableDFSMasterCap=0
+
-#else
+# ESE Support and fast transition
-#gEnableDFSMasterCap=1
+EseEnabled=0
-#endif /* VENDOR_EDIT */
+
+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
@@ -131,13 +102,26 @@ RoamRssiDiff=5
 # 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 gGoLinkMonitorPeriod(10 seconds).
+#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.
 
@@ -155,11 +139,17 @@ gChannelBondingMode5GHz=1
 #gApLinkMonitorPeriod = 10
 #gGoLinkMonitorPeriod = 10
 
-#gApKeepAlivePeriod is time to spend to check whether frame
+#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
 
@@ -167,10 +157,7 @@ gEnableDFSChnlScan=1
 # 0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
 gAllowDFSChannelRoam=1
 
-#ifdef VENDOR_EDIT
+gVhtChannelWidth=2
-# Enable ETSI13 hotspot on SRD channel
-etsi13_srd_chan_in_master_mode=1
-#endif VENDOR_EDIT
 
 #Data Inactivity Timeout when in powersave (in ms)
 gDataInactivityTimeout=200
@@ -184,13 +171,14 @@ gSetTxChainmask1x1=1
 gSetRxChainmask1x1=1
 
 # Scan Timing Parameters
-gPassiveMaxChannelTime=110
+# gPassiveMaxChannelTime=110
-#ifdef VENDOR_EDIT
+# gPassiveMinChannelTime=60
-gActiveMaxChannelTime=60
+gActiveMaxChannelTime=40
-gActiveMinChannelTime=40
+gActiveMinChannelTime=20
-#else
+
-#gActiveMaxChannelTime=40
+#If set to 0, MCC is not allowed.
-#endif /* VENDOR_EDIT */
+gEnableMCCMode=1
+
 # MCC to SCC Switch mode:
 # 0-Disable
 # 1-Enable
@@ -200,9 +188,18 @@ gActiveMinChannelTime=40
 #   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
 
@@ -211,18 +208,19 @@ gEnableTxBFeeSAP=1
 # 0=disable, 1=enable
 gEnableTxBFin20MHz=1
 
-#Enable/Disable SU Tx beamformer support
+#Enable/Disable SU Tx beamformer support.
-#gEnableTxSUBeamformer=1
+gEnableTxSUBeamformer=1
+
+gEnableFastRoamInConcurrency=1
+
+#Maxium Channel time in msec
+gMaxMediumTime = 6000
 
 # 802.11K support
 gRrmEnable=1
 
-#ifdef VENDOR_EDIT
 #Enable Power Save offload
-gEnablePowerSaveOffload=1
+gEnablePowerSaveOffload=2
-#else
-#gEnablePowerSaveOffload=2
-#endif VENDOR_EDIT
 
 #Enable firmware uart print
 gEnablefwprint=0
@@ -232,9 +230,6 @@ gEnablefwprint=0
 # 0=Disable, 1=WMI, 2=DIAG
 gEnablefwlog=1
 
-# Enable broadcast logging to the userspace entities
-gMulticastHostFwMsgs=1
-
 # Maximum Receive AMPDU size (VHT only. Valid values:
 # 0->8k 1->16k 2->32k 3->64k 4->128k)
 gVhtAmpduLenExponent=7
@@ -243,6 +238,9 @@ gVhtAmpduLenExponent=7
 # 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.
@@ -251,9 +249,16 @@ gVhtMpduLen=2
 # 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
 
+# Remove Overlap channel restriction
+gEnableOverLapCh=0
+
 #Enable VHT on 2.4Ghz
 gEnableVhtFor24GHzBand=1
 
@@ -267,12 +272,30 @@ gEnableVhtFor24GHzBand=1
 # 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
@@ -280,33 +303,20 @@ gEnableLpassSupport=1
 # Whether userspace country code setting shld have priority
 gCountryCodePriority=1
 
-
 # Enable(1)/Disable(0) SIFS burst
-#ifdef VENDOR_EDIT
+gEnableSifsBurst=1
-#Min: 0  disabled
-#Max: 3  enabled802.11g
-#Default: 1 enabled, but disabled for legacy mode
-gEnableSifsBurst=3
-#else
-# gEnableSifsBurst=1
-# endif /* VENDOR_EDIT */
 
 # Enable or Disable Multi-user MIMO
 # 1=Enable (default), 0=Disable
 gEnableMuBformee=1
 
-# Enable support for TDLS
+# Enable/Disable channel avoidance for SAP in SCC scenario
-#  0 - disable
+# 0 - disable
-#  1 - enable
+# 1 - enable
-gEnableTDLSSupport=1
+gSapSccChanAvoidance=0
 
-# Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
+# Inactivity time (in ms) to end TX Service Period while in IBSS power save mode
-# initiate TDLS Discovery towards a peer whenever setup criteria (throughput
+gIbssTxSpEndInactivityTime=10
-# 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.
@@ -327,6 +337,10 @@ gTDLSExternalControl=1
 # 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
@@ -361,9 +375,6 @@ gVhtTxMCS2x2=2
 gIPAConfig=0x7d
 gIPADescSize=800
 
-# Increase TCL ringsize
-dp_tx_ring_size=3072
-
 # Enable/Disable RX full reorder offload
 gReorderOffloadSupported=1
 
@@ -373,9 +384,7 @@ gCEClassifyEnable=1
 
 # Enable Rx handling options
 # Rx_thread=1 RPS=2(default for ROME) NAPI=4(default for ihelium)
-# DP_RX_THREAD=16 (1 << 4)
+rx_mode=5
-# 20 = (DP_RX_THREAD | NAPI)
-rx_mode=20
 
 # Enable(Tx) fastpath for data traffic.
 # 1 - enable(default)  0 - disable
@@ -389,13 +398,9 @@ gEnableIpTcpUdpChecksumOffload=1
 # 1 - enable  0 - disable
 TSOEnable=1
 
-#ifndef VENDOR_EDIT
 # Enable Generic Receive Offload
 # 1 - enable(default)  0 - disable
-#GROEnable=0
-#else
 GROEnable=1
-#end if /* VENDOR_EDIT */
 
 # Enable HT MPDU Density
 # 4 for 2 micro sec
@@ -418,26 +423,26 @@ maxMSDUsPerRxInd=8
 
 # Enable NUD tracking feature
 # 1 - enable 0 - disable(default)
-#ifndef VENDOR_EDIT
+gEnableNUDTracking=1
-# richy.li@Connectivity, 2019/10/11, [Q porting] align the vowifi behavior with 18811.
+
-#gEnableNUDTracking=1
+# Enable PEER UNMAP CONF SUPPORT
-#else
+# 1 - enable 0 - disable(default)
-gEnableNUDTracking=0
+gEnablePeerUnmapConfSupport=1
-#endif /* VENDOR_EDIT */
 
-dp_rx_fisa_enable=1
-dp_rx_flow_search_table_size=128
 rpsRxQueueCpuMapList=f3
-legacy_mode_csum_disable=1
-send_icmp_req_to_fw=200
-################ Datapath f
 ################ Datapath feature set End ################
 
-#ifdef VENDOR_EDIT
+################ NAN feature set start ###################
-adaptive_dwell_mode_enabled=0
+
-#else
+# Enable NAN discovery (NAN 1.0)
-#adaptive_dwell_mode_enabled=1
+# 1 - enable  0 - disable(default)
-#endif /* VENDOR_EDIT */
+gEnableNanSupport=1
+# Enable NAN Datapath
+genable_nan_datapath=1
+
+################ NAN feature set end #####################
+
+adaptive_dwell_mode_enabled=1
 
 hostscan_adaptive_dwell_mode=1
 
@@ -445,55 +450,19 @@ adapt_dwell_lpf_weight=80
 
 adapt_dwell_wifi_act_threshold=10
 
+MAWCEnabled=0
+
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
 #Enable/Disable SNR monitoring
 gEnableSNRMonitoring=1
 
-# HTC Credit count for WMI operation
+# Rx thread affinity mask in UL case
-# 1 to serialize the WMI commands
+RX_THREAD_UL_CPU_AFFINITY_MASK=0xc0
-# 0 default works with FW advertised credits, 2 credits usually
-gWmiCreditCount=1
 
-# Enable enhanced ACS
+# Packet Log buffer size
-acs_with_more_param=1
+PktlogBufSize=1
-# bits 0-3:   rssi weight
-# bits 4-7:   bss count weight
-# bits 8-11:  noise floor weight
-# bits 12-15: channel free weight
-# bits 16-19: tx power range weight
-# bits 20-23: tx power throughput weight
-# bits 24-31: reserved
-AutoChannelSelectWeight=0x00fafafa
-
-# Enable/Disable broadcast TWT
-bcast_twt=1
-
-# Enable Dynamic Runtime PM
-gRuntimePM=2
-gRuntimePMDelay=500
-
-# Disable packetlog explicitly
-#ifndef VENDOR_EDIT
-#gEnablePacketLog=0
-#else
-global_adapt_dwelltime_mode=1
-roamscan_adaptive_dwell_mode=1
-extscan_adaptive_dwell_mode=1
-pnoscan_adaptive_dwell_mode=1
-active_max_channel_time_2g=60
-#endif /* VENDOR_EDIT */
-
-gfine_time_meas_cap=0x0030D
-#enale 6Ghz support
-oem_6g_support_disable=1
-
-cfr_disable=7
-active_max_channel_time_6g=60
-passive_max_channel_time_6g=60
-# prefer to establish 5GHz band GO for p2p connection
-g_prefer_5g_scc_to_dbs=0xc
 
 read_mac_addr_from_mac_file=1
 

wifi/p2p_supplicant_overlay.conf

@@ -2,4 +2,3 @@ disable_scan_offload=1
 p2p_no_group_iface=1
 persistent_reconnect=1
 bss_max_count=400
-p2p_ignore_shared_freq=1

wifi/wpa_supplicant_overlay.conf

@@ -4,4 +4,5 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
-driver_param=use_p2p_group_interface=1
+config_methods=virtual_display virtual_push_button keypad
+driver_param="no_rrm=1 use_p2p_group_interface=1"