Evolution-X-Devices/kernel_oneplus_8750-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Add wifi test cmd to restrict CSA

Browse Source 
Add changes to accept wifi test configuration attr to
restrict CSA for P2P GO operating in assisted AP mode
in DFS channel.

Change-Id: Iab4ac8fbec839e1b66d5061895033b2bf1111ceb
CRs-Fixed: 3910664
This commit is contained in:
Vinod Kumar Pirla
2024-08-28 01:50:16 -07:00
committed by Ravindra Konda
parent d46a5297d8
commit 8c1916beab
12 changed files with 100 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/cmn_services/interface_mgr/src/wlan_if_mgr_roam.c
View File

@@ -1063,7 +1063,7 @@ QDF_STATUS if_mgr_validate_candidate(struct wlan_objmgr_vdev *vdev,
true, chan_freq, true);
wlan_p2p_get_ap_assist_dfs_params(vdev, &is_dfs_owner,
&is_valid_ap_assist,
NULL, NULL, NULL);
NULL, NULL, NULL, NULL);
if (is_dfs_owner)
goto end;

32
components/p2p/core/src/wlan_p2p_main.c
View File

@@ -1501,6 +1501,7 @@ QDF_STATUS p2p_extract_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
QDF_STATUS p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
bool *is_dfs_owner,
bool *is_valid_ap_assist,
bool *is_usr_restrict_csa,
struct qdf_mac_addr *ap_bssid,
uint8_t *opclass, uint8_t *chan)
{
@@ -1519,6 +1520,9 @@ QDF_STATUS p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
if (is_valid_ap_assist)
*is_valid_ap_assist = dfs_info->is_valid_ap_assist;
if (is_usr_restrict_csa)
*is_usr_restrict_csa = dfs_info->is_user_restrict_csa;
if (ap_bssid)
qdf_copy_macaddr(ap_bssid, &dfs_info->ap_info[0].ap_bssid);
@@ -1531,6 +1535,25 @@ QDF_STATUS p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
return QDF_STATUS_SUCCESS;
}
QDF_STATUS
p2p_force_restrict_dfs_go_csa(struct wlan_objmgr_vdev *vdev, bool val)
{
struct p2p_vdev_priv_obj *p2p_vdev_obj;
if (wlan_vdev_mlme_get_opmode(vdev) != QDF_P2P_GO_MODE)
return QDF_STATUS_E_INVAL;
p2p_vdev_obj =
wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_P2P);
if (!p2p_vdev_obj)
return QDF_STATUS_E_INVAL;
p2p_vdev_obj->ap_assist_dfs.is_user_restrict_csa = val;
p2p_debug("P2P force restrict %d", val);
return QDF_STATUS_SUCCESS;
}
bool p2p_check_oui_and_force_1x1(uint8_t *assoc_ie, uint32_t assoc_ie_len)
{
const uint8_t *pos;
@@ -2082,13 +2105,15 @@ QDF_STATUS p2p_check_ap_assist_dfs_group_go(struct wlan_objmgr_vdev *vdev)
struct wlan_objmgr_pdev *pdev = wlan_vdev_get_pdev(vdev);
struct wlan_objmgr_psoc *psoc;
bool is_dfs_owner = false, is_valid_ap_assist = false;
bool is_usr_restrict_csa = false;
uint8_t chan = 0;
if (!pdev)
return QDF_STATUS_E_INVAL;
p2p_get_ap_assist_dfs_params(vdev, &is_dfs_owner, &is_valid_ap_assist,
&ap_bssid, NULL, &chan);
&is_usr_restrict_csa, &ap_bssid,
NULL, &chan);
if (is_dfs_owner)
return QDF_STATUS_SUCCESS;
@@ -2096,6 +2121,9 @@ QDF_STATUS p2p_check_ap_assist_dfs_group_go(struct wlan_objmgr_vdev *vdev)
if (!is_valid_ap_assist)
return QDF_STATUS_E_INVAL;
if (is_usr_restrict_csa)
return QDF_STATUS_SUCCESS;
if (wlan_vdev_mlme_is_init_state(vdev) == QDF_STATUS_SUCCESS) {
/* Ignore opclass check as the valid ap assist flag is true */
cur_freq = wlan_reg_legacy_chan_to_freq(pdev, chan);
@@ -2172,7 +2200,7 @@ QDF_STATUS p2p_check_ap_assist_dfs_group_cli(struct wlan_objmgr_vdev *vdev)
}
p2p_get_ap_assist_dfs_params(vdev, &is_dfs_owner, &is_valid_ap_assist,
&params.bssid, NULL, NULL);
NULL, &params.bssid, NULL, NULL);
if (is_dfs_owner)
return QDF_STATUS_SUCCESS;

16
components/p2p/core/src/wlan_p2p_main.h
View File

@@ -384,6 +384,7 @@ struct p2p_ap_assist_dfs_ap_info {
* to DFS owner capability and AP assisted params
* @is_dfs_owner: Is DFS owner
* @is_client_csa: Can client send CSA request
* @is_user_restrict_csa: User restrict CSA on P2P GO
* @extn_cap_attr_found: Is extended cap attr found
* @wlan_ap_info_attr_found: Is WLAN AP info attr found
* @is_valid_ap_assist: Is assisted AP params valid
@@ -393,6 +394,7 @@ struct p2p_ap_assist_dfs_ap_info {
struct p2p_ap_assist_dfs_group_info {
bool is_dfs_owner;
bool is_client_csa;
bool is_user_restrict_csa;
bool extn_cap_attr_found;
bool wlan_ap_info_attr_found;
bool is_valid_ap_assist;
@@ -787,6 +789,7 @@ QDF_STATUS p2p_extract_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
* @vdev: VDEV object manager pointer of P2P entity
* @is_dfs_owner: Pointer to get DFS owner capability in extended cap of P2P2 IE
* @is_valid_ap_assist: Is assisted AP params valid
* @is_usr_restrict_csa: Is user restricted CSA
* @ap_bssid: Pointer to get AP BSSID of assisted AP in DFS oper extracted from
* wlan ap info attribute
* @opclass: Operating class of the AP pointed in @ap_bssid
@@ -797,6 +800,7 @@ QDF_STATUS p2p_extract_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
QDF_STATUS p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
bool *is_dfs_owner,
bool *is_valid_ap_assist,
bool *is_usr_restrict_csa,
struct qdf_mac_addr *ap_bssid,
uint8_t *opclass, uint8_t *chan);
@@ -948,4 +952,16 @@ p2p_set_rand_mac_for_p2p_dev(struct wlan_objmgr_psoc *soc,
uint32_t vdev_id, uint32_t freq,
uint64_t rnd_cookie, uint32_t duration);
/**
* p2p_force_restrict_dfs_go_csa() - API to handle user restricted CSA via
* test configuration.
* @vdev: VDEV object manager.
* @val: User config value.
*
* API to configure restriction of CSA from user for assisted P2P group.
*
* Return: QDF_STATUS
*/
QDF_STATUS
p2p_force_restrict_dfs_go_csa(struct wlan_objmgr_vdev *vdev, bool val);
#endif /* _WLAN_P2P_MAIN_H_ */

2
components/p2p/dispatcher/inc/wlan_p2p_api.h
View File

@@ -185,6 +185,7 @@ QDF_STATUS wlan_p2p_validate_ap_assist_dfs_group(struct wlan_objmgr_vdev *vdev);
* @vdev: VDEV object manager
* @is_dfs_owner: Pointer to get DFS owner cap bit
* @is_valid_ap_assist: Is valid AP assist params
* @is_usr_restrict_csa: Is user restricted CSA
* @ap_bssid: BSSID of the assisted AP
* @opclass: Operating class of the assisted AP
* @chan: Channel number of the assisted AP
@@ -194,6 +195,7 @@ QDF_STATUS wlan_p2p_validate_ap_assist_dfs_group(struct wlan_objmgr_vdev *vdev);
QDF_STATUS wlan_p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
bool *is_dfs_owner,
bool *is_valid_ap_assist,
bool *is_usr_restrict_csa,
struct qdf_mac_addr *ap_bssid,
uint8_t *opclass, uint8_t *chan);

15
components/p2p/dispatcher/inc/wlan_p2p_ucfg_api.h
View File

@@ -610,6 +610,7 @@ ucfg_p2p_extract_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
* @vdev: VDEV object manager
* @is_dfs_owner: Pointer to get the DFS owner cap
* @is_valid_ap_assist: Is valid AP assist params
* @is_usr_restrict_csa: Is CSA restricted by user
* @ap_bssid: BSSID of the assisted AP
* @opclass: Operating class of the assisted AP
* @chan: Channel number of assisted AP
@@ -619,6 +620,7 @@ ucfg_p2p_extract_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
QDF_STATUS ucfg_p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
bool *is_dfs_owner,
bool *is_valid_ap_assist,
bool *is_usr_restrict_csa,
struct qdf_mac_addr *ap_bssid,
uint8_t *opclass, uint8_t *chan);
@@ -698,4 +700,17 @@ void ucfg_p2p_psoc_priv_set_sta_vdev_id(struct wlan_objmgr_psoc *psoc,
* Return: vdev_id
*/
uint8_t ucfg_p2p_psoc_priv_get_sta_vdev_id(struct wlan_objmgr_psoc *psoc);
/**
* ucfg_p2p_force_restrict_dfs_go_csa() - User restricted CSA for assisted P2P
* group operation
* @vdev: VDEV object manager
* @val: Value from user.
*
* Test configuration to restrict CSA from happening via assisted P2P group
*
* Return: QDF_STATUS
*/
QDF_STATUS
ucfg_p2p_force_restrict_dfs_go_csa(struct wlan_objmgr_vdev *vdev, bool val);
#endif /* _WLAN_P2P_UCFG_API_H_ */

4
components/p2p/dispatcher/src/wlan_p2p_api.c
View File

@@ -181,11 +181,13 @@ bool wlan_p2p_fw_support_ap_assist_dfs_group(struct wlan_objmgr_psoc *psoc)
QDF_STATUS wlan_p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
bool *is_dfs_owner,
bool *is_valid_ap_assist,
bool *is_usr_restrict_csa,
struct qdf_mac_addr *ap_bssid,
uint8_t *opclass, uint8_t *chan)
{
return p2p_get_ap_assist_dfs_params(vdev, is_dfs_owner,
is_valid_ap_assist, ap_bssid,
is_valid_ap_assist,
is_usr_restrict_csa, ap_bssid,
opclass, chan);
}

10
components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c
View File

@@ -808,11 +808,13 @@ ucfg_p2p_extract_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
QDF_STATUS ucfg_p2p_get_ap_assist_dfs_params(struct wlan_objmgr_vdev *vdev,
bool *is_dfs_owner,
bool *is_valid_ap_assist,
bool *is_usr_restrict_csa,
struct qdf_mac_addr *ap_bssid,
uint8_t *opclass, uint8_t *chan)
{
return p2p_get_ap_assist_dfs_params(vdev, is_dfs_owner,
is_valid_ap_assist, ap_bssid,
is_valid_ap_assist,
is_usr_restrict_csa, ap_bssid,
opclass, chan);
}
@@ -856,3 +858,9 @@ uint8_t ucfg_p2p_psoc_priv_get_sta_vdev_id(struct wlan_objmgr_psoc *psoc)
{
return p2p_psoc_priv_get_sta_vdev_id(psoc);
}
QDF_STATUS
ucfg_p2p_force_restrict_dfs_go_csa(struct wlan_objmgr_vdev *vdev, bool val)
{
return p2p_force_restrict_dfs_go_csa(vdev, val);
}

18
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -9026,6 +9026,8 @@ wlan_hdd_wifi_test_config_policy[
.type = NLA_U8},
[QCA_WLAN_VENDOR_ATTR_WIFI_TEST_CONFIG_EHT_SCS_TRAFFIC_SUPPORT] = {
.type = NLA_U8},
[QCA_WLAN_VENDOR_ATTR_WIFI_TEST_CONFIG_DISABLE_CHAN_SWITCH_INITIATION] = {
.type = NLA_U8},
};
/**
@@ -14968,6 +14970,7 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
struct hdd_station_ctx *hdd_sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(link_info);
uint8_t op_mode;
struct wlan_objmgr_vdev *vdev;
hdd_enter_dev(dev);
@@ -16116,6 +16119,21 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
hdd_err("Failed to set SCS traffic desc support");
}
cmd_id = QCA_WLAN_VENDOR_ATTR_WIFI_TEST_CONFIG_DISABLE_CHAN_SWITCH_INITIATION;
if (tb[cmd_id] && adapter->device_mode == QDF_P2P_GO_MODE) {
cfg_val = nla_get_u8(tb[cmd_id]);
hdd_debug("Restrict CSA params %d", cfg_val);
vdev = hdd_objmgr_get_vdev_by_user(link_info, WLAN_OSIF_ID);
if (vdev) {
status = ucfg_p2p_force_restrict_dfs_go_csa(vdev,
cfg_val);
hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_ID);
ret_val = qdf_status_to_os_return(status);
} else {
ret_val = qdf_status_to_os_return(QDF_STATUS_E_INVAL);
}
}
if (update_sme_cfg)
sme_update_config(mac_handle, sme_config);

2
core/hdd/src/wlan_hdd_hostapd.c
View File

@@ -7927,7 +7927,7 @@ hdd_check_ap_assist_dfs_group_start_req(struct wlan_hdd_link_info *link_info,
}
status = ucfg_p2p_get_ap_assist_dfs_params(vdev, &is_go_dfs_owner,
&is_valid_ap_assist,
&is_valid_ap_assist, NULL,
&ap_bssid, NULL, NULL);
if (is_go_dfs_owner || !is_valid_ap_assist || !is_fw_cap) {

2
core/hdd/src/wlan_hdd_main.c
View File

@@ -910,7 +910,7 @@ int hdd_validate_channel_and_bandwidth(struct hdd_adapter *adapter,
vdev_freq = wlan_get_operation_chan_freq(vdev);
ucfg_p2p_get_ap_assist_dfs_params(vdev, &is_go_dfs_owner,
&is_valid_ap_assist,
&is_valid_ap_assist, NULL,
NULL, &opclass, &ap_chan);
if (!wlan_reg_is_6ghz_op_class(hdd_ctx->pdev, opclass))
ap_freq = wlan_reg_legacy_chan_to_freq(hdd_ctx->pdev,

4
core/mac/src/pe/lim/lim_api.c
View File

@@ -732,8 +732,8 @@ void lim_fill_dfs_p2p_group_params(struct pe_session *pe_session)
}
wlan_p2p_get_ap_assist_dfs_params(pe_session->vdev, &is_dfs_owner,
&is_valid_ap_assist, &ap_bssid,
NULL, NULL);
&is_valid_ap_assist, NULL,
&ap_bssid, NULL, NULL);
if (is_dfs_owner || !is_valid_ap_assist)
return;

3
core/sap/src/sap_fsm.c
View File

@@ -3983,7 +3983,8 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx,
wlan_p2p_get_ap_assist_dfs_params(sap_ctx->vdev,
&is_dfs_owner,
&is_valid_ap_assist,
NULL, NULL, NULL);
NULL, NULL,
NULL, NULL);
if (!is_dfs_owner && is_valid_ap_assist)
is_dfs = false;
}