qcacmn: Send VDEV command to enabled SR prohibit

Send WMI_VDEV_PARAM_ENABLE_SR_PROHIBIT_CMDID to enable/disable
SR prohibit.

Change-Id: I4123af04ab2c4cf539a4ea7938d2a34e58a7ba45
CRs-Fixed: 3308068
This commit is contained in:
Rachit Kankane
2022-09-06 12:19:31 +05:30
committed by Madan Koyyalamudi
parent a9083f7afe
commit 58ccce90fb
7 changed files with 126 additions and 3 deletions

View File

@@ -20,6 +20,7 @@
#include <target_if_spatial_reuse.h> #include <target_if_spatial_reuse.h>
#include <wlan_lmac_if_def.h> #include <wlan_lmac_if_def.h>
#include <wmi_unified_api.h> #include <wmi_unified_api.h>
#include <wmi_unified_vdev_api.h>
#include <target_if_vdev_mgr_tx_ops.h> #include <target_if_vdev_mgr_tx_ops.h>
static QDF_STATUS spatial_reuse_send_cfg(struct wlan_objmgr_vdev *vdev, static QDF_STATUS spatial_reuse_send_cfg(struct wlan_objmgr_vdev *vdev,
@@ -53,8 +54,28 @@ static QDF_STATUS spatial_reuse_send_cfg(struct wlan_objmgr_vdev *vdev,
WILDCARD_PDEV_ID); WILDCARD_PDEV_ID);
} }
static QDF_STATUS
spatial_reuse_send_sr_prohibit_cfg(struct wlan_objmgr_vdev *vdev,
bool he_siga_va15_allowed)
{
struct sr_prohibit_param srp_param;
wmi_unified_t wmi_handle;
wmi_handle = target_if_vdev_mgr_wmi_handle_get(vdev);
if (!wmi_handle) {
mlme_err("Failed to get WMI handle!");
return QDF_STATUS_E_INVAL;
}
srp_param.vdev_id = wlan_vdev_get_id(vdev);
srp_param.sr_he_siga_val15_allowed = he_siga_va15_allowed;
return wmi_unified_vdev_param_sr_prohibit_send(wmi_handle, &srp_param);
}
void target_if_spatial_reuse_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops) void target_if_spatial_reuse_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
{ {
tx_ops->spatial_reuse_tx_ops.send_cfg = spatial_reuse_send_cfg; tx_ops->spatial_reuse_tx_ops.send_cfg = spatial_reuse_send_cfg;
tx_ops->spatial_reuse_tx_ops.send_sr_prohibit_cfg =
spatial_reuse_send_sr_prohibit_cfg;
} }

View File

@@ -1474,10 +1474,12 @@ struct wlan_lmac_if_twt_rx_ops {
}; };
#endif #endif
#if defined WLAN_FEATURE_11AX #if defined WLAN_FEATURE_SR
struct wlan_lmac_if_spatial_reuse_tx_ops { struct wlan_lmac_if_spatial_reuse_tx_ops {
QDF_STATUS (*send_cfg)(struct wlan_objmgr_vdev *vdev, uint8_t sr_ctrl, QDF_STATUS (*send_cfg)(struct wlan_objmgr_vdev *vdev, uint8_t sr_ctrl,
uint8_t non_srg_max_pd_offset); uint8_t non_srg_max_pd_offset);
QDF_STATUS (*send_sr_prohibit_cfg)(struct wlan_objmgr_vdev *vdev,
bool he_siga_val15_allowed);
}; };
#endif #endif
@@ -1619,7 +1621,7 @@ struct wlan_lmac_if_tx_ops {
struct wlan_lmac_if_twt_tx_ops twt_tx_ops; struct wlan_lmac_if_twt_tx_ops twt_tx_ops;
#endif #endif
#if defined WLAN_FEATURE_11AX #if defined WLAN_FEATURE_SR
struct wlan_lmac_if_spatial_reuse_tx_ops spatial_reuse_tx_ops; struct wlan_lmac_if_spatial_reuse_tx_ops spatial_reuse_tx_ops;
#endif #endif

View File

@@ -883,4 +883,15 @@ struct rtt_channel_info {
uint16_t num_bssids; uint16_t num_bssids;
struct rtt_bssid_info bssid_info[RTT_MAX_BSSIDS_TO_SCAN]; struct rtt_bssid_info bssid_info[RTT_MAX_BSSIDS_TO_SCAN];
}; };
/**
* struct sr_prohibit_param - SR prohibit command parameter
*
* @vdev_id: vdev id
* @sr_he_siga_val15_allowed: HE_SIG_A_VAL15_ALLOWED is enabled/disabled
*/
struct sr_prohibit_param {
uint8_t vdev_id;
bool sr_he_siga_val15_allowed;
};
#endif /* __WLAN_VDEV_MGR_TX_OPS_DEFS_H__ */ #endif /* __WLAN_VDEV_MGR_TX_OPS_DEFS_H__ */

View File

@@ -2857,6 +2857,11 @@ QDF_STATUS (*extract_smart_monitor_event)(
QDF_STATUS (*multisoc_tbtt_sync_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*multisoc_tbtt_sync_cmd)(wmi_unified_t wmi_handle,
struct rnr_tbtt_multisoc_sync_param *param); struct rnr_tbtt_multisoc_sync_param *param);
#ifdef WLAN_FEATURE_SR
QDF_STATUS (*vdev_param_sr_prohibit_send)(wmi_unified_t wmi_handle,
struct sr_prohibit_param *param);
#endif
#ifdef FEATURE_WLAN_TIME_SYNC_FTM #ifdef FEATURE_WLAN_TIME_SYNC_FTM
QDF_STATUS (*send_wlan_time_sync_ftm_trigger_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*send_wlan_time_sync_ftm_trigger_cmd)(wmi_unified_t wmi_handle,
uint32_t vdev_id, uint32_t vdev_id,

View File

@@ -200,4 +200,24 @@ QDF_STATUS wmi_extract_multi_vdev_restart_resp_event(
QDF_STATUS QDF_STATUS
wmi_unified_multisoc_tbtt_sync_cmd(wmi_unified_t wmi_handle, wmi_unified_multisoc_tbtt_sync_cmd(wmi_unified_t wmi_handle,
struct rnr_tbtt_multisoc_sync_param *param); struct rnr_tbtt_multisoc_sync_param *param);
#ifdef WLAN_FEATURE_SR
/**
* wmi_unified_vdev_param_sr_prohibit_send() - send vdev SR prohibit command
* @wmi: wmi handle
* @srp_param: SR Prohibit parameters
*
* Return: QDF_STATUS_SUCCESS for success or error code
*/
QDF_STATUS
wmi_unified_vdev_param_sr_prohibit_send(wmi_unified_t wmi_hdl,
struct sr_prohibit_param *srp_param);
#else
static inline QDF_STATUS
wmi_unified_vdev_param_sr_prohibit_send(wmi_unified_t wmi_hdl,
struct sr_prohibit_param *srp_param)
{
return QDF_STATUS_SUCCESS;
}
#endif
#endif #endif

View File

@@ -205,3 +205,16 @@ QDF_STATUS wmi_unified_multisoc_tbtt_sync_cmd(wmi_unified_t wmi_handle,
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
#ifdef WLAN_FEATURE_SR
QDF_STATUS
wmi_unified_vdev_param_sr_prohibit_send(wmi_unified_t wmi_hdl,
struct sr_prohibit_param *srp_param)
{
if (wmi_hdl->ops->vdev_param_sr_prohibit_send)
return wmi_hdl->ops->vdev_param_sr_prohibit_send(wmi_hdl,
srp_param);
return QDF_STATUS_E_FAILURE;
}
#endif

View File

@@ -424,6 +424,56 @@ static QDF_STATUS extract_muedca_params_tlv(wmi_unified_t wmi_hdl,
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
#ifdef WLAN_FEATURE_SR
static QDF_STATUS
vdev_param_sr_prohibit_send_tlv(struct wmi_unified *wmi_handle,
struct sr_prohibit_param *param)
{
wmi_vdev_param_enable_sr_prohibit_fixed_param *cmd;
wmi_buf_t buf;
int32_t len = sizeof(*cmd);
buf = wmi_buf_alloc(wmi_handle, len);
if (!buf) {
wmi_err("wmi_buf_alloc failed");
return QDF_STATUS_E_FAILURE;
}
cmd = (wmi_vdev_param_enable_sr_prohibit_fixed_param *)
wmi_buf_data(buf);
WMITLV_SET_HDR
(&cmd->tlv_header,
WMITLV_TAG_STRUC_wmi_vdev_param_enable_sr_prohibit_fixed_param,
WMITLV_GET_STRUCT_TLVLEN
(wmi_vdev_param_enable_sr_prohibit_fixed_param));
cmd->vdev_id = param->vdev_id;
cmd->tidmap = 0;
cmd->prohibit_enable = param->sr_he_siga_val15_allowed;
wmi_mtrace(WMI_VDEV_PARAM_ENABLE_SR_PROHIBIT_CMDID, cmd->vdev_id, 0);
if (wmi_unified_cmd_send(wmi_handle, buf, len,
WMI_VDEV_PARAM_ENABLE_SR_PROHIBIT_CMDID)) {
wmi_err("Failed to set neighbour rx param");
wmi_buf_free(buf);
return QDF_STATUS_E_FAILURE;
}
return QDF_STATUS_SUCCESS;
}
static void wmi_vdev_attach_sr_cmds_tlv(struct wmi_ops *wmi_ops)
{
if (!wmi_ops)
return;
wmi_ops->vdev_param_sr_prohibit_send =
vdev_param_sr_prohibit_send_tlv;
}
#else
static inline void wmi_vdev_attach_sr_cmds_tlv(struct wmi_ops *wmi_ops)
{
}
#endif
void wmi_vdev_attach_tlv(struct wmi_unified *wmi_handle) void wmi_vdev_attach_tlv(struct wmi_unified *wmi_handle)
{ {
struct wmi_ops *wmi_ops; struct wmi_ops *wmi_ops;
@@ -455,4 +505,5 @@ void wmi_vdev_attach_tlv(struct wmi_unified *wmi_handle)
wmi_ops->send_vdev_config_ratemask_cmd = wmi_ops->send_vdev_config_ratemask_cmd =
send_vdev_config_ratemask_cmd_tlv; send_vdev_config_ratemask_cmd_tlv;
wmi_ops->send_peer_filter_set_tx_cmd = send_peer_filter_set_tx_cmd_tlv; wmi_ops->send_peer_filter_set_tx_cmd = send_peer_filter_set_tx_cmd_tlv;
wmi_vdev_attach_sr_cmds_tlv(wmi_ops);
} }