Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5840d3cb authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of...

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 into android12-5.4-lahaina

"LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0:
  qcacld-3.0: set nan_separate_iface_support flag in FTM mode
  Release 2.0.8.28B
  qcacld-3.0: Fix deadlock scenario in packet capture mode
  Release 2.0.8.28A
  qcacld-3.0: fetch profile_data from right position
  Release 2.0.8.28
  qcacld-3.0: SAE: delete preauth node if it's present in list
  Release 2.0.8.27Z
  qcacld-3.0: Fix out-of-bounds in tx_stats
  Release 2.0.8.27Y
  qcacld-3.0: Release serialization cmd when get peer null
  Release 2.0.8.27X
  qcacld-3.0: STA falis to notify Disassoc Imminent to UI
  Release 2.0.8.27W
  qcacld-3.0: select min bw during csa if channel bonding disabled
  Release 2.0.8.27V
  qcacld-3.0: Add TPC Report in probe response
  Release 2.0.8.27U
  qcacld-3.0: Remove roam_invoke_timer stop in case of ROAM_ABORT
  qcacld-3.0: Fix reo id mismatch in fisa path
  Release 2.0.8.27T
  qcacld-3.0: Fix out of bounds access for he_ppet
  Release 2.0.8.27S
  qcacld-3.0: Revert double free change
  Release 2.0.8.27R
  qcacld-3.0: Fix double free in wma_roam_pmkid_request_event_handler
  Release 2.0.8.27Q
  qcacld-3.0: Add support to configure 6G roam scan dwell time
  Release 2.0.8.27P
  qcacld-3.0: Update num_transmit_power_env before packing probe response
  Release 2.0.8.27O
  qcacld-3.0: Optimize the roam latency time
  Release 2.0.8.27N
  qcacld-3.0: Don't send probe req when receive beacon miss
  Release 2.0.8.27M
  qcacld-3.0: Reduce the log level to optimise the roam time
  Release 2.0.8.27L
  qcacld-3.0: Update Copyright for NAN discovery
  Release 2.0.8.27K
  qcacld-3.0: Enable ce debug history always
  Release 2.0.8.27J
  cld-3.0: Consider connected AP for roaming candidate
  Release 2.0.8.27I
  qcacld-3.0: Do not reserve NAN discovery vdev in case of FTM mode
  Release 2.0.8.27H
  qcacld-3.0: Add kbuild cpp flag for low power mode feature
  Release 2.0.8.27G
  qcacld-3.0: Allow suspend in Deep Sleep/Hibernate in wearables
  Release 2.0.8.27F
  qcacld-3.0: Fix slab-out-of-bounds in radio stats
  Release 2.0.8.27E
  qcacld-3.0: Add bug_on if 5 consecutive ll_stats requests fails
  Release 2.0.8.27D
  qcacld-3.0: Handle reset case for P2P_SET_NOA
  Release 2.0.8.27C
  qcacld-3.0: Remove redundant code
  Release 2.0.8.27B
  qcacld-3.0: Enable network queue directly in case of roaming
  qcacld-3.0: Check if netdev feature need to update
  Release 2.0.8.27A
  qcacld-3.0: Change tx retries unit from msdu to mpdu
  qcacld-3.0: Do not ignore idle_shutdown in case of driver mode change
  Release 2.0.8.27
  qcacld-3.0: Enable nan only for VLP channels for 6GHz
  qcacld-3.0: sta roam failed after sap stopped
  qcacld-3.0: Fix arp offload not sent when suspend
  qcacld-3.0: update number of thermal conf param for thermal throttle config
  Release 2.0.8.26Z
  Revert "qcacld-3.0: Prevent runtime suspend on ll_stats and get station requests"
  Release 2.0.8.26Y
  qcacld-3.0: Prevent runtime suspend on ll_stats and get station requests
  qcacld-3.0: Initialize sap ch_width by Max ch_width
  Release 2.0.8.26X
  qcacld-3.0: Return success when firmware doesn't support 11k offload
  Release 2.0.8.26W
  qcacld-3.0: Reject LL stats request for SAP mode
  Release 2.0.8.26V
  qcacld-3.0: Move the sar req-resp event to work context
  Release 2.0.8.26U
  qcacld-3.0: Ignore idle_shutdown if any interface is up
  qcacld-3.0: Allow suspend in deep sleep or Hibernate
  Release 2.0.8.26T
  qcacld-3.0: Send high 32bit addr for no smmu platform which fw need
  qcacld-3.0: Send high 32bit addr for no smmu platform which fw need
  Release 2.0.8.26S
  qcacld-3.0: Add RSO state change logs
  Release 2.0.8.26R
  qcacld-3.0: Validate ini for standalone SAP CSA
  Release 2.0.8.26Q
  qcacld-3.0: Fix signal strength for mgmt rx pkts in pkt capture
  qcacld-3.0: Add support for qos null filters in packet capture
  qcacld-3.0: Add ref count for global vdev used in packet capture
  Release 2.0.8.26P
  qcacld-3.0: Fix phy type for mgmt rx packets in pkt capture mode
  Release 2.0.8.26O
  qcacld-3.0: set msdu/mpdu aggr size for each vdev start
  qcacld-3.0: enhance oui based iot aggr size processing
  qcacld-3.0: add ini for setting oui based aggr size
  Release 2.0.8.26N
  qcacld-3.0: Address race between disconnect and system suspend
  Release 2.0.8.26M
  qcacld-3.0: Add support to calibration failure events parsing
  Release 2.0.8.26L
  qcacld-3.0: Fix possible memory leak of tx_time_per_power_level
  qcacld-3.0: Check input parameters for tx_attr/rx_attr
  Release 2.0.8.26K
  qcacld-3.0: Add INI to configure MGMT frame HW retry count
  Release 2.0.8.26J
  qcacld-3.0: Cleanup SAP interface if start_bss is aborted
  Release 2.0.8.26I
  qcacld-3.0: Fill status correctly for twt resume
  Release 2.0.8.26H
  qcacld-3.0: Drop packets when vdev_id is invalid
  Release 2.0.8.26G
  qcacld-3.0: Reset sap_radar_found_status flag before start sap
  qcacld-3.0: Change ops from vdev specific to psoc level
  qcacld-3.0: Change enum pkt_capture_mode to bit map
  Release 2.0.8.26F
  qcacld-3.0: Check peer TWT capability before TWT setup request
  Release 2.0.8.26E
  qcacld-3.0: Add support for beacon filters in packet capture mode
  Release 2.0.8.26D
  qcacld-3.0: Fix mem leak with NDP peer multicast address list
  Release 2.0.8.26C
  qcacld-3.0: Update channel_before_switch_band in passive chan switch case
  Release 2.0.8.26B
  qcacld-3.0: Control netif sub queues with sub queue pause mask
  Release 2.0.8.26A
  qcacld-3.0: Mem leak in wlan_cm_dual_sta_roam_update_connect_channels
  qcacld-3.0: Print allowed channels for the 2nd STA vdev conn
  Release 2.0.8.26
  qcacld-3.0: Derive NDP peer multicast address from peer MAC address
  Release 2.0.8.25Z
  qcacld-3.0: optimization of p2p miracast connecting time
  Release 2.0.8.25Y
  qcacld-3.0: Exclude BSS membership selector from rate set
  qcacld-3.0: Add H2E require flag to extended support rate
  Release 2.0.8.25X
  qcacld-3.0: Set default value for bss_color_collision_det_sta to 1
  Release 2.0.8.25W
  qcacld-3.0: Fix invalid bssid filled while deleting pmksa
  Release 2.0.8.25V
  qcacld-3.0: Classify qmi/wmi for WMI_REQUEST_STATS_CMDID
  Release 2.0.8.25U
  qcacld-3.0: Reduced country change work resched time
  Release 2.0.8.25T
  qcacld-3.0: Add ini support for tx_retry_multiplier
  qcacld-3.0: Avoid OOB read in sch_get_csa_ecsa_count_offset
  qcacld-3.0: Avoid OOB read in dot11f_unpack_assoc_response
  qcacld-3.0: Fix possible OOB in unpack_tlv_core
  Release 2.0.8.25S
  qcacld-3.0: Add wow event and reason for roam event stats
  qcacld-3.0: Fill the vendor attributes with the Roam stats
  qcacld-3.0: Vendor command changes to enable the roam events stats
  qcacld-3.0: Update tx Failed Count
  Release 2.0.8.25R
  qcacld-3.0: add os_if layer for monitor mode configuration
  qcacld-3.0: Move enet.h header file
  Release 2.0.8.25Q
  qcacld-3.0: Send OCV capability in assoc request
  Release 2.0.8.25P
  qcacld-3.0: Save ext cap IE from join request
  Release 2.0.8.25O
  qcacld-3.0: Avoid OOB read in sch_get_csa_ecsa_count_offset
  qcacld-3.0: Avoid OOB read in dot11f_unpack_assoc_response
  Release 2.0.8.25N
  qcacld-3.0: Resume all modules before recovery shutdown
  Release 2.0.8.25M
  qcacld-3.0: Add support to send set IE request in cnx manager
  qcacld-3.0: Update exteneded capabilities after connection
  Release 2.0.8.25L
  qcacld-3.0: Revert "Fix channel width mismatch in ROAM SYNC"
  qcacld-3.0: Update ch freq/bw to wma in Roam sync
  Release 2.0.8.25K
  qcacld-3.0: Reduce log level when get unexpected action frame
  qcacld-3.0: channel_switch_complete_evt need wake up all waiting threads
  Release 2.0.8.25J
  qcacld-3.0: Limit ROC for listen if NAN or NDI present
  Release 2.0.8.25I
  qcacld-3.0: Update VHT IE with highest supported LGI rate
  Release 2.0.8.25H
  qcacld-3.0: compilation fix for ks sync path change
  Release 2.0.8.25G
  qcacld-3.0: remove FEATURE_HAL_DELAYED_REG_WRITE_V2 from Kbuild
  Release 2.0.8.25F
  qcacld-3.0: Fix refill thread getting stuck in suspend state
  Release 2.0.8.25E
  qcacld-3.0: Deliver tx offload mgmt pkts based on filter
  Release 2.0.8.25D
  qcacld-3.0: Add check for mgmt/ctrl tx packets in pkt capture
  Release 2.0.8.25C
  qcacld-3.0: Remove all WLAN_REG_IS_SAME_BAND_CHANNELS instances
  Release 2.0.8.25B
  qcacld-3.0: Add check for mgmt/ctrl rx packets in pkt capture
  Release 2.0.8.25A
  qcacld-3.0: Add filter for data packets in packet capture mode
  Release 2.0.8.25
  qcacld-3.0: Add check for data tx rx based on vendor command
  qcacld-3.0: Add tgt support to send beacon report period to FW
  qcacld-3.0: Add support to send config to FW based on filter
  qcacld-3.0: Add support to send mode to FW based on frame filter
  Release 2.0.8.24Z
  qcacld-3.0: Fix race condition between connect and disconnect
  Release 2.0.8.24Y
  qcacld-3.0: Avoid possible array OOB
  Release 2.0.8.24X
  qcacld-3.0: Cleanup CSR/LIM for Roam sync indication failure in CSR
  Release 2.0.8.24W
  qcacld-3.0: update default addba response rx aggr size to 256
  qcacld-3.0: initialize pdev id after ssr for thermal throttle reconfig
  qcacld-3.0: Invalid rem_len computation in roam stats evt handler
  Release 2.0.8.24V
  qcacld-3.0: vendor command changes to configure parameters for monitor mode
  Release 2.0.8.24U
  qcacld-3.0: Fix array OOB for duplicate rate
  Release 2.0.8.24T
  qcacld-3.0: Set frame filter based on vendor command
  Release 2.0.8.24S
  qcacld-3.0: Map monitor interface vdev during SSR
  Release 2.0.8.24R
  qcacld-3.0: Fix SAP alone failed when g_sta_sap_scc_on_dfs_chan is 1
  Release 2.0.8.24Q
  qcacld-3.0: Fix possible OOB in unpack_tlv_core
  qcacld-3.0: Fix PHY type of rx legacy packets in packet capture
  Release 2.0.8.24P
  qcacld-3.0: Do not fill average rssi for RX packets
  Release 2.0.8.24O
  qcacld-3.0: Fix possible OOB in extract_peer_stats_count_tlv
  qcacld-3.0: Invalid rem_len computation in roam stats evt handler
  Release 2.0.8.24N
  qcacld-3.0: Don't delete monitor interface when STA interface is down
  qcacld-3.0: Add ini configuration to limit supported HE MCS rates
  Release 2.0.8.24M
  qcacld-3.0: Fix invalid bss descriptor length check
  Release 2.0.8.24L
  qcacld-3.0: Add debug prints in SA query response
  Release 2.0.8.24K
  qcacld-3.0: Stop CFR once get disconnection event
  Release 2.0.8.24J
  qcacld-3.0: Add an INI to configure SAE auth failure timeout
  qcacld-3.0: Notify the failure to firmware if SAE auth retries exhausted
  Release 2.0.8.24I
  qcacld-3.0: Add support to get thermal throttle stats
  Release 2.0.8.24H
  qcacld-3.0: Include Thermal Module in KBuild
  Release 2.0.8.24G
  qcacld-3.0: Unsubscribe in reverse order of subscription
  Release 2.0.8.24F
  qcacld-3.0: Remove unused linux header file
  Release 2.0.8.24E
  qcacld-3.0: Fill the nss in tx status in pkt capture mode
  qcacld-3.0: Fill the ppdu stats in tx status in pkt capture mode
  qcacld-3.0: Register for wdi event WDI_PKT_CAPTURE_PPDU_STATS

Change-Id: Ic331fbe4ae5910fb40ce98c7cf2fee884f88c94b
parents d1d5435c 59239622
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ ENABLE_QCACLD := true
endif
endif

ifeq ($(BOARD_COMMON_DIR),)
    BOARD_COMMON_DIR := device/qcom/common
endif

ifeq  ($(ENABLE_QCACLD), true)
# Android makefile for the WLAN Module
LOCAL_PATH := $(call my-dir)
@@ -105,7 +109,7 @@ endif

# DLKM_DIR was moved for JELLY_BEAN (PLATFORM_SDK 16)
ifeq ($(call is-platform-sdk-version-at-least,16),true)
	DLKM_DIR := $(TOP)/device/qcom/common/dlkm
	DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm
else
	DLKM_DIR := build/dlkm
endif # platform-sdk-version
+12 −5
Original line number Diff line number Diff line
@@ -1274,7 +1274,8 @@ FWOL_OS_IF_SRC := os_if/fw_offload/src
FWOL_INC := -I$(WLAN_ROOT)/$(FWOL_CORE_INC) \
	    -I$(WLAN_ROOT)/$(FWOL_DISPATCHER_INC) \
	    -I$(WLAN_ROOT)/$(FWOL_TARGET_IF_INC) \
	    -I$(WLAN_ROOT)/$(FWOL_OS_IF_INC)
	    -I$(WLAN_ROOT)/$(FWOL_OS_IF_INC) \
	    -I$(WLAN_COMMON_INC)/umac/thermal/dispatcher/inc

ifeq ($(CONFIG_WLAN_FW_OFFLOAD), y)
FWOL_OBJS :=	$(FWOL_CORE_SRC)/wlan_fw_offload_main.o \
@@ -1402,10 +1403,12 @@ $(call add-wlan-objs,action_oui,$(ACTION_OUI_OBJS))
######## PACKET CAPTURE ########

PKT_CAPTURE_DIR := components/pkt_capture
PKT_CAPTURE_OS_IF_DIR := os_if/pkt_capture
PKT_CAPTURE_TARGET_IF_DIR := components/target_if/pkt_capture/
PKT_CAPTURE_INC := -I$(WLAN_ROOT)/$(PKT_CAPTURE_DIR)/core/inc \
		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_DIR)/dispatcher/inc \
		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_TARGET_IF_DIR)/inc
		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_TARGET_IF_DIR)/inc \
		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_OS_IF_DIR)/inc

ifeq ($(CONFIG_WLAN_FEATURE_PKT_CAPTURE), y)
PKT_CAPTURE_OBJS := $(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_main.o \
@@ -1414,7 +1417,9 @@ PKT_CAPTURE_OBJS := $(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_main.o \
		$(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_data_txrx.o \
		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_ucfg_api.o \
		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_tgt_api.o \
		$(PKT_CAPTURE_TARGET_IF_DIR)/src/target_if_pkt_capture.o
		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_api.o \
		$(PKT_CAPTURE_TARGET_IF_DIR)/src/target_if_pkt_capture.o \
		$(PKT_CAPTURE_OS_IF_DIR)/src/os_if_pkt_capture.o
endif

$(call add-wlan-objs,pkt_capture,$(PKT_CAPTURE_OBJS))
@@ -2605,6 +2610,7 @@ cppflags-y += -DANI_OS_TYPE_ANDROID=6 \
		-Werror\
		-D__linux__

cppflags-$(CONFIG_THERMAL_STATS_SUPPORT) += -DTHERMAL_STATS_SUPPORT
cppflags-$(CONFIG_PTT_SOCK_SVC_ENABLE) += -DPTT_SOCK_SVC_ENABLE
cppflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DFEATURE_WLAN_WAPI
cppflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DATH_SUPPORT_WAPI
@@ -2650,6 +2656,7 @@ WLAN_TWT_SAP_STA_COUNT ?= 32
ccflags-y += -DWLAN_TWT_SAP_STA_COUNT=$(WLAN_TWT_SAP_STA_COUNT)
endif

cppflags-$(CONFIG_ENABLE_LOW_POWER_MODE) += -DCONFIG_ENABLE_LOW_POWER_MODE
cppflags-$(CONFIG_WLAN_TWT_SAP_PDEV_COUNT) += -DWLAN_TWT_AP_PDEV_COUNT_NUM_PHY
cppflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL
cppflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED
@@ -2695,7 +2702,6 @@ cppflags-$(CONFIG_PLD_PCIE_INIT_FLAG) += -DCONFIG_PLD_PCIE_INIT
cppflags-$(CONFIG_WLAN_FEATURE_DP_RX_THREADS) += -DFEATURE_WLAN_DP_RX_THREADS
cppflags-$(CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT) += -DWLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT
cppflags-$(CONFIG_FEATURE_HAL_DELAYED_REG_WRITE) += -DFEATURE_HAL_DELAYED_REG_WRITE
cppflags-$(CONFIG_FEATURE_HAL_DELAYED_REG_WRITE_V2) += -DFEATURE_HAL_DELAYED_REG_WRITE_V2
cppflags-$(CONFIG_QCA_OL_DP_SRNG_LOCK_LESS_ACCESS) += -DQCA_OL_DP_SRNG_LOCK_LESS_ACCESS
cppflags-$(CONFIG_SHADOW_WRITE_DELAY) += -DSHADOW_WRITE_DELAY

@@ -3337,6 +3343,7 @@ cppflags-$(CONFIG_RXDMA_ERR_PKT_DROP) += -DRXDMA_ERR_PKT_DROP
cppflags-$(CONFIG_MAX_ALLOC_PAGE_SIZE) += -DMAX_ALLOC_PAGE_SIZE
cppflags-$(CONFIG_DELIVERY_TO_STACK_STATUS_CHECK) += -DDELIVERY_TO_STACK_STATUS_CHECK
cppflags-$(CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS) += -DWLAN_TRACE_HIDE_MAC_ADDRESS
cppflags-$(CONFIG_WLAN_FEATURE_CAL_FAILURE_TRIGGER) += -DWLAN_FEATURE_CAL_FAILURE_TRIGGER

cppflags-$(CONFIG_LITHIUM) += -DFIX_TXDMA_LIMITATION
cppflags-$(CONFIG_LITHIUM) += -DFEATURE_AST
@@ -3729,7 +3736,7 @@ cppflags-$(CONFIG_MORE_TX_DESC) += -DTX_TO_NPEERS_INC_TX_DESCS

ccflags-$(CONFIG_HASTINGS_BT_WAR) += -DHASTINGS_BT_WAR

cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHIF_CONFIG_SLUB_DEBUG_ON
cppflags-y += -DHIF_CONFIG_SLUB_DEBUG_ON
cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHAL_CONFIG_SLUB_DEBUG_ON

ccflags-$(CONFIG_FOURTH_CONNECTION) += -DFEATURE_FOURTH_CONNECTION
+1 −2
Original line number Diff line number Diff line
@@ -2600,8 +2600,7 @@ QDF_STATUS policy_mgr_set_chan_switch_complete_evt(
		return QDF_STATUS_SUCCESS;
	}

	status = qdf_event_set(
			&pm_ctx->channel_switch_complete_evt);
	status = qdf_event_set_all(&pm_ctx->channel_switch_complete_evt);

	if (!QDF_IS_STATUS_SUCCESS(status)) {
		policy_mgr_err("set event failed");
+4 −3
Original line number Diff line number Diff line
/*
 * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
 * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
 *
 * Permission to use, copy, modify, and/or distribute this software for
 * any purpose with or without fee is hereby granted, provided that the
@@ -201,15 +202,15 @@ void policy_mgr_decr_session_set_pcl(struct wlan_objmgr_psoc *psoc,

			/* Send RSO stop before sending set pcl command */
			pm_ctx->sme_cbacks.sme_rso_stop_cb(
						mac_handle, session_id,
						mac_handle, vdev_id,
						REASON_DRIVER_DISABLED,
						RSO_SET_PCL);

			policy_mgr_set_pcl_for_existing_combo(psoc, PM_STA_MODE,
							      session_id);
							      vdev_id);

			pm_ctx->sme_cbacks.sme_rso_start_cb(
					mac_handle, session_id,
					mac_handle, vdev_id,
					REASON_DRIVER_ENABLED,
					RSO_SET_PCL);
		}
+2 −2
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
 * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
 *
 * Permission to use, copy, modify, and/or distribute this software for
 * any purpose with or without fee is hereby granted, provided that the
@@ -299,7 +300,6 @@ tgt_mc_cp_stats_prepare_raw_peer_rssi(struct wlan_objmgr_psoc *psoc,
	}

end:
	if (ev.peer_stats)
	get_peer_rssi_cb(&ev, last_req->cookie);

	ucfg_mc_cp_stats_free_stats_resources(&ev);
Loading