samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: remove delay_before_vdev_stop from wma_txrx_node

Browse Source 
The delay before vdev stop is a global config,
no need to set for each interface separately.

Change-Id: I5760cf083a6749bb82cc88635a947f1d18308dfe
CRs-Fixed: 2904748
This commit is contained in:
Yu Wang
2021-03-22 18:57:14 +08:00
committed by snandini
parent 7fa9d56ddd
commit ffbb93ace5
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/wma/inc/wma.h
View File

@@ -683,7 +683,6 @@ struct wma_invalid_peer_params {
* @roam_synch_in_progress: flag is in progress or not * @roam_synch_in_progress: flag is in progress or not
* @plink_status_req: link status request * @plink_status_req: link status request
* @psnr_req: snr request * @psnr_req: snr request
* @delay_before_vdev_stop: delay
* @tx_streams: number of tx streams can be used by the vdev * @tx_streams: number of tx streams can be used by the vdev
* @mac_id: the mac on which vdev is on * @mac_id: the mac on which vdev is on
* @arp_offload_req: cached arp offload request * @arp_offload_req: cached arp offload request
@@ -728,7 +727,6 @@ struct wma_txrx_node {
uint32_t peer_count; uint32_t peer_count;
void *plink_status_req; void *plink_status_req;
void *psnr_req; void *psnr_req;
uint8_t delay_before_vdev_stop;
#ifdef FEATURE_WLAN_EXTSCAN #ifdef FEATURE_WLAN_EXTSCAN
bool extscan_in_progress; bool extscan_in_progress;
#endif #endif

11
core/wma/src/wma_dev_if.c
View File

@@ -82,6 +82,7 @@
#include "wlan_mlme_public_struct.h" #include "wlan_mlme_public_struct.h"
#include "wlan_mlme_api.h" #include "wlan_mlme_api.h"
#include "wlan_mlme_main.h" #include "wlan_mlme_main.h"
#include "wlan_mlme_ucfg_api.h"
#include <wlan_dfs_utils_api.h> #include <wlan_dfs_utils_api.h>
#include "../../core/src/vdev_mgr_ops.h" #include "../../core/src/vdev_mgr_ops.h"
#include "wlan_utility.h" #include "wlan_utility.h"
@@ -5064,19 +5065,21 @@ fail_del_bss_ho_fail:
static void wma_wait_tx_complete(tp_wma_handle wma, static void wma_wait_tx_complete(tp_wma_handle wma,
uint32_t session_id) uint32_t session_id)
{ {
uint8_t max_wait_iterations = 0; uint8_t max_wait_iterations = 0, delay = 0;
cdp_config_param_type val; cdp_config_param_type val;
void *soc = cds_get_context(QDF_MODULE_ID_SOC); void *soc = cds_get_context(QDF_MODULE_ID_SOC);
QDF_STATUS status;
if (!wma_is_vdev_valid(session_id)) { if (!wma_is_vdev_valid(session_id)) {
wma_err("Vdev is not valid: %d", session_id); wma_err("Vdev is not valid: %d", session_id);
return; return;
} }
max_wait_iterations = status = ucfg_mlme_get_delay_before_vdev_stop(wma->psoc, &delay);
wma->interfaces[session_id].delay_before_vdev_stop / if (QDF_IS_STATUS_ERROR(status))
WMA_TX_Q_RECHECK_TIMER_WAIT; wma_err("Failed to get delay before vdev stop");
max_wait_iterations = delay / WMA_TX_Q_RECHECK_TIMER_WAIT;
if (cdp_txrx_get_pdev_param(soc, if (cdp_txrx_get_pdev_param(soc,
wlan_objmgr_pdev_get_pdev_id(wma->pdev), wlan_objmgr_pdev_get_pdev_id(wma->pdev),
CDP_TX_PENDING, &val)) CDP_TX_PENDING, &val))

9
core/wma/src/wma_main.c
View File

@@ -2887,7 +2887,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
bool val = 0; bool val = 0;
void *cds_context; void *cds_context;
target_resource_config *wlan_res_cfg; target_resource_config *wlan_res_cfg;
uint8_t delay_before_vdev_stop;
uint32_t self_gen_frm_pwr = 0; uint32_t self_gen_frm_pwr = 0;
uint32_t device_mode = cds_get_conparam(); uint32_t device_mode = cds_get_conparam();
@@ -3065,13 +3064,9 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
goto err_scn_context; goto err_scn_context;
} }
for (i = 0; i < wma_handle->max_bssid; ++i) { for (i = 0; i < wma_handle->max_bssid; ++i)
wma_vdev_init(&wma_handle->interfaces[i]); wma_vdev_init(&wma_handle->interfaces[i]);
ucfg_mlme_get_delay_before_vdev_stop(wma_handle->psoc,
&delay_before_vdev_stop);
wma_handle->interfaces[i].delay_before_vdev_stop =
delay_before_vdev_stop;
}
/* Register the debug print event handler */ /* Register the debug print event handler */
wmi_unified_register_event_handler(wma_handle->wmi_handle, wmi_unified_register_event_handler(wma_handle->wmi_handle,
wmi_debug_print_event_id, wmi_debug_print_event_id,