sm7325-common: Use one qcacld config for all chips
* ximi sm8350-common does this, and it works, so why not. * Also cleanup some unused entries like wlan_mac and WCNSS_mot_cfg Change-Id: Ifaf77ece24c229fce55f93079236a03282d5a891 Signed-off-by: electimon <electimon@gmail.com>
This commit is contained in:
parent
2120f3cd4a
commit
68e350c835
13
Android.mk
13
Android.mk
@ -100,18 +100,11 @@ WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld
|
|||||||
$(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
|
$(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
|
||||||
@echo "Creating wifi firmware symlinks: $@"
|
@echo "Creating wifi firmware symlinks: $@"
|
||||||
@mkdir -p $@/wlan
|
@mkdir -p $@/wlan
|
||||||
@mkdir -p $@/qca6390
|
@mkdir -p $@/qca6490
|
||||||
@mkdir -p $@/qca6750
|
@mkdir -p $@/qca6750
|
||||||
$(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
|
|
||||||
$(hide) ln -sf /mnt/vendor/persist/wlan/wlan_mac.bin $@/wlan/wlan_mac.bin
|
$(hide) ln -sf /mnt/vendor/persist/wlan/wlan_mac.bin $@/wlan/wlan_mac.bin
|
||||||
$(hide) ln -sf /vendor/etc/wifi/wlan/WCNSS_qcom_cfg.ini $@/wlan/WCNSS_qcom_cfg.ini
|
$(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/qca6490/WCNSS_qcom_cfg.ini
|
||||||
$(hide) ln -sf /vendor/etc/wifi/wlan/WCNSS_mot_cfg.ini $@/wlan/WCNSS_mot_cfg.ini
|
$(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/qca6750/WCNSS_qcom_cfg.ini
|
||||||
$(hide) ln -sf /mnt/vendor/persist/qca6390/wlan_mac.bin $@/qca6390/wlan_mac.bin
|
|
||||||
$(hide) ln -sf /vendor/etc/wifi/qca6390/WCNSS_qcom_cfg.ini $@/qca6390/WCNSS_qcom_cfg.ini
|
|
||||||
$(hide) ln -sf /vendor/etc/wifi/qca6390/WCNSS_mot_cfg.ini $@/qca6390/WCNSS_mot_cfg.ini
|
|
||||||
$(hide) ln -sf /mnt/vendor/persist/qca6750/wlan_mac.bin $@/qca6750/wlan_mac.bin
|
|
||||||
$(hide) ln -sf /vendor/etc/wifi/qca6750/WCNSS_qcom_cfg.ini $@/qca6750/WCNSS_qcom_cfg.ini
|
|
||||||
$(hide) ln -sf /vendor/etc/wifi/qca6750/WCNSS_mot_cfg.ini $@/qca6750/WCNSS_mot_cfg.ini
|
|
||||||
|
|
||||||
ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) \
|
ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) \
|
||||||
$(RFS_MSM_WPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS)
|
$(RFS_MSM_WPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS)
|
||||||
|
@ -497,9 +497,7 @@ PRODUCT_PACKAGES += \
|
|||||||
wpa_supplicant.conf
|
wpa_supplicant.conf
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/wifi/qca6390/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6390/WCNSS_qcom_cfg.ini \
|
$(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \
|
||||||
$(LOCAL_PATH)/wifi/qca6750/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6750/WCNSS_qcom_cfg.ini \
|
|
||||||
$(LOCAL_PATH)/wifi/wlan/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wlan/WCNSS_qcom_cfg.ini \
|
|
||||||
$(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
|
$(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
|
||||||
$(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
|
$(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
|
||||||
|
|
||||||
|
@ -1,101 +0,0 @@
|
|||||||
# This file allows user to override the factory
|
|
||||||
# defaults for the WLAN Driver
|
|
||||||
|
|
||||||
fw_timeout_crash=1
|
|
||||||
gDot11Mode=0
|
|
||||||
InfraUapsdVoSrvIntv=0
|
|
||||||
InfraUapsdViSrvIntv=0
|
|
||||||
InfraUapsdBeSrvIntv=0
|
|
||||||
InfraUapsdBkSrvIntv=0
|
|
||||||
gAddTSWhenACMIsOff=1
|
|
||||||
gEnableApOBSSProt=1
|
|
||||||
RTSThreshold=1048576
|
|
||||||
gDisableIntraBssFwd=0
|
|
||||||
g11dSupportEnabled=0
|
|
||||||
gEnableDFSMasterCap=1
|
|
||||||
gNeighborScanTimerPeriod=200
|
|
||||||
gNeighborLookupThreshold=76
|
|
||||||
gNeighborScanChannelMinTime=20
|
|
||||||
FastRoamEnabled=1
|
|
||||||
RoamRssiDiff=5
|
|
||||||
gRoamIntraBand=0
|
|
||||||
gChannelBondingMode5GHz=1
|
|
||||||
gEnableDFSChnlScan=1
|
|
||||||
gAllowDFSChannelRoam=1
|
|
||||||
gSetTxChainmask1x1=1
|
|
||||||
gSetRxChainmask1x1=1
|
|
||||||
gWlanMccToSccSwitchMode = 3
|
|
||||||
gEnableTXSTBC=1
|
|
||||||
gEnableTxBFeeSAP=1
|
|
||||||
gEnableTxBFin20MHz=1
|
|
||||||
gEnableTxSUBeamformer=1
|
|
||||||
gRrmEnable=1
|
|
||||||
gEnablefwprint=0
|
|
||||||
gVhtAmpduLenExponent=7
|
|
||||||
gVhtMpduLen=2
|
|
||||||
isP2pDeviceAddrAdministrated=0
|
|
||||||
gEnableVhtFor24GHzBand=1
|
|
||||||
gEnableLpassSupport=1
|
|
||||||
gCountryCodePriority=1
|
|
||||||
gEnableMuBformee=1
|
|
||||||
gTDLSExternalControl=1
|
|
||||||
gEnableTDLSOffChannel=1
|
|
||||||
|
|
||||||
################ Datapath feature set Begin ################
|
|
||||||
gBusBandwidthHighThreshold=2000
|
|
||||||
gBusBandwidthMediumThreshold=500
|
|
||||||
gBusBandwidthLowThreshold=150
|
|
||||||
gBusBandwidthComputeInterval=100
|
|
||||||
gVhtRxMCS=2
|
|
||||||
gVhtTxMCS=2
|
|
||||||
gEnable2x2=1
|
|
||||||
gVhtRxMCS2x2=2
|
|
||||||
gVhtTxMCS2x2=2
|
|
||||||
gIPAConfig=0
|
|
||||||
gIPADescSize=800
|
|
||||||
dp_tx_ring_size=5120
|
|
||||||
dp_tx_compl_ring_size=8192
|
|
||||||
dp_tx_desc=6144
|
|
||||||
dp_tx_ext_desc=6144
|
|
||||||
gReorderOffloadSupported=1
|
|
||||||
gCEClassifyEnable=1
|
|
||||||
rx_mode=20
|
|
||||||
gEnableFastPath=1
|
|
||||||
gEnableIpTcpUdpChecksumOffload=1
|
|
||||||
TSOEnable=1
|
|
||||||
GROEnable=1
|
|
||||||
ght_mpdu_density=4
|
|
||||||
gEnableFlowSteering=1
|
|
||||||
ce_service_max_yield_time=500
|
|
||||||
ce_service_max_rx_ind_flush=1
|
|
||||||
maxMSDUsPerRxInd=8
|
|
||||||
gEnableNUDTracking=1
|
|
||||||
rpsRxQueueCpuMapList=f3
|
|
||||||
legacy_mode_csum_disable=1
|
|
||||||
icmp_req_to_fw_mark_interval=200
|
|
||||||
|
|
||||||
################ Datapath feature set End ################
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
active_max_channel_time_2g=80
|
|
||||||
gPassiveMaxChannelTime=110
|
|
||||||
g_prefer_5g_scc_to_dbs=8
|
|
||||||
|
|
||||||
END
|
|
||||||
|
|
||||||
# Note: Configuration parser would not read anything past the END marker
|
|
||||||
|
|
@ -1,132 +0,0 @@
|
|||||||
# This file allows user to override the factory
|
|
||||||
# defaults for the WLAN Driver
|
|
||||||
|
|
||||||
fw_timeout_crash=1
|
|
||||||
gDot11Mode=0
|
|
||||||
InfraUapsdVoSrvIntv=0
|
|
||||||
InfraUapsdViSrvIntv=0
|
|
||||||
InfraUapsdBeSrvIntv=0
|
|
||||||
InfraUapsdBkSrvIntv=0
|
|
||||||
gAddTSWhenACMIsOff=1
|
|
||||||
gEnableApOBSSProt=1
|
|
||||||
RTSThreshold=1048576
|
|
||||||
gDisableIntraBssFwd=0
|
|
||||||
g11dSupportEnabled=0
|
|
||||||
gEnableDFSMasterCap=1
|
|
||||||
gNeighborScanTimerPeriod=200
|
|
||||||
gNeighborLookupThreshold=76
|
|
||||||
gNeighborScanChannelMinTime=20
|
|
||||||
FastRoamEnabled=1
|
|
||||||
RoamRssiDiff=5
|
|
||||||
gRoamIntraBand=0
|
|
||||||
gChannelBondingMode5GHz=1
|
|
||||||
gEnableDFSChnlScan=1
|
|
||||||
gAllowDFSChannelRoam=1
|
|
||||||
gSetTxChainmask1x1=1
|
|
||||||
gSetRxChainmask1x1=1
|
|
||||||
gWlanMccToSccSwitchMode = 3
|
|
||||||
gEnableTXSTBC=1
|
|
||||||
gEnableTxBFeeSAP=1
|
|
||||||
gEnableTxBFin20MHz=1
|
|
||||||
gEnableTxSUBeamformer=1
|
|
||||||
gRrmEnable=1
|
|
||||||
gEnablefwprint=0
|
|
||||||
gVhtAmpduLenExponent=7
|
|
||||||
gVhtMpduLen=2
|
|
||||||
|
|
||||||
# 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 p2p device address administered
|
|
||||||
isP2pDeviceAddrAdministrated=1
|
|
||||||
|
|
||||||
#Enable VHT on 2.4Ghz
|
|
||||||
gEnableVhtFor24GHzBand=1
|
|
||||||
gEnableLpassSupport=1
|
|
||||||
gCountryCodePriority=1
|
|
||||||
gEnableMuBformee=1
|
|
||||||
gTDLSExternalControl=1
|
|
||||||
gEnableTDLSOffChannel=1
|
|
||||||
|
|
||||||
################ Datapath feature set Begin ################
|
|
||||||
gBusBandwidthHighThreshold=2000
|
|
||||||
gBusBandwidthMediumThreshold=500
|
|
||||||
gBusBandwidthLowThreshold=150
|
|
||||||
gBusBandwidthComputeInterval=100
|
|
||||||
gVhtRxMCS=2
|
|
||||||
gVhtTxMCS=2
|
|
||||||
gEnable2x2=1
|
|
||||||
gVhtRxMCS2x2=2
|
|
||||||
gVhtTxMCS2x2=2
|
|
||||||
gIPAConfig=0x7d
|
|
||||||
gIPADescSize=800
|
|
||||||
dp_tx_ring_size=5120
|
|
||||||
dp_tx_compl_ring_size=8192
|
|
||||||
dp_tx_desc=6144
|
|
||||||
dp_tx_ext_desc=6144
|
|
||||||
gReorderOffloadSupported=1
|
|
||||||
gCEClassifyEnable=1
|
|
||||||
rx_mode=20
|
|
||||||
gEnableFastPath=1
|
|
||||||
gEnableIpTcpUdpChecksumOffload=1
|
|
||||||
TSOEnable=1
|
|
||||||
GROEnable=1
|
|
||||||
ght_mpdu_density=4
|
|
||||||
gEnableFlowSteering=1
|
|
||||||
ce_service_max_yield_time=500
|
|
||||||
ce_service_max_rx_ind_flush=1
|
|
||||||
maxMSDUsPerRxInd=8
|
|
||||||
gEnableNUDTracking=1
|
|
||||||
dp_rx_fisa_enable=1
|
|
||||||
dp_rx_flow_search_table_size=128
|
|
||||||
rpsRxQueueCpuMapList=07
|
|
||||||
legacy_mode_csum_disable=1
|
|
||||||
icmp_req_to_fw_mark_interval=200
|
|
||||||
|
|
||||||
################ Datapath feature set End ################
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
active_max_channel_time_2g=80
|
|
||||||
active_max_channel_time_6g=60
|
|
||||||
gPassiveMaxChannelTime=110
|
|
||||||
passive_max_channel_time_6g=60
|
|
||||||
g_prefer_5g_scc_to_dbs=8
|
|
||||||
|
|
||||||
# Enable cocurrent interface wlan1
|
|
||||||
gEnableConcurrentSTA=wlan1
|
|
||||||
|
|
||||||
# Enable Indoor channel support for MHS to turn on in 6Ghz
|
|
||||||
gindoor_channel_support=1
|
|
||||||
|
|
||||||
gEnableSelfRecovery=1
|
|
||||||
gEnableForceTargetAssert=1
|
|
||||||
avoid_list_expiry_time=5
|
|
||||||
black_list_expiry_time=1
|
|
||||||
bad_bssid_counter_thresh=10
|
|
||||||
|
|
||||||
# Enable SRD channel
|
|
||||||
etsi13_srd_chan_in_master_mode=1
|
|
||||||
END
|
|
||||||
|
|
||||||
# Note: Configuration parser would not read anything past the END marker
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user