From 452e744883f17dd7b74547059425f3cad97643af Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Wed, 29 Mar 2017 18:09:58 -0700 Subject: [PATCH 01/20] qcacmn: Define API qdf_create_singlethread_workqueue Define API qdf_create_singlethread_workqueue to create a single threaded dedicated work queue. Change-Id: Iab70044888911c1e4adba63e8eee643d5693d716 CRs-Fixed: 2026443 --- qdf/inc/qdf_defer.h | 15 +++++++++++++++ qdf/linux/src/i_qdf_defer.h | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/qdf/inc/qdf_defer.h b/qdf/inc/qdf_defer.h index 642a1f4b2d57..49ea6acbe38a 100644 --- a/qdf/inc/qdf_defer.h +++ b/qdf/inc/qdf_defer.h @@ -140,6 +140,21 @@ static inline qdf_workqueue_t *qdf_create_workqueue(char *name) return __qdf_create_workqueue(name); } +/** + * qdf_create_singlethread_workqueue() - create a single threaded workqueue + * @name: string + * + * This API creates a dedicated work queue with a single worker thread to avoid + * wasting unnecessary resources when works which needs to be submitted in this + * queue are not very critical and frequent. + * + * Return: pointer of type qdf_workqueue_t + */ +static inline qdf_workqueue_t *qdf_create_singlethread_workqueue(char *name) +{ + return __qdf_create_singlethread_workqueue(name); +} + /** * qdf_queue_work - Queue the work/task * @hdl: OS handle diff --git a/qdf/linux/src/i_qdf_defer.h b/qdf/linux/src/i_qdf_defer.h index d2a2f730487d..a8c8919ce5e7 100644 --- a/qdf/linux/src/i_qdf_defer.h +++ b/qdf/linux/src/i_qdf_defer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -308,6 +308,21 @@ static inline __qdf_workqueue_t *__qdf_create_workqueue(char *name) return create_workqueue(name); } +/** + * __qdf_create_singlethread_workqueue() - create a single threaded workqueue + * @name: string + * + * This API creates a dedicated work queue with a single worker thread to avoid + * wasting unnecessary resources when works which needs to be submitted in this + * queue are not very critical and frequent. + * + * Return: pointer of type qdf_workqueue_t + */ +static inline __qdf_workqueue_t *__qdf_create_singlethread_workqueue(char *name) +{ + return create_singlethread_workqueue(name); +} + /** * __qdf_flush_workqueue - flush the workqueue * @hdl: OS handle From c2d4953235228a27a73a2677edc197b678befdc3 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Thu, 4 May 2017 17:12:34 -0700 Subject: [PATCH 02/20] qcacmn: Fixes for master channel list When a new master channel list is created, populate master chan list to all pdevs. Do not make any assumption on availability of pdevs. Make other stability and initialization fixes. Also add extra fields to data structures. Change-Id: I0a59c41e9425435f6069807a3c5de0b389d8fa5e CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_priv.h | 3 + umac/regulatory/core/src/reg_services.c | 466 +++++++++--------- .../inc/reg_services_public_struct.h | 14 + wmi/src/wmi_unified_tlv.c | 1 + 4 files changed, 263 insertions(+), 221 deletions(-) diff --git a/umac/regulatory/core/src/reg_priv.h b/umac/regulatory/core/src/reg_priv.h index ebc7ceac960d..ad522dd5d279 100644 --- a/umac/regulatory/core/src/reg_priv.h +++ b/umac/regulatory/core/src/reg_priv.h @@ -48,6 +48,9 @@ struct wlan_regulatory_psoc_priv_obj { struct regulatory_channel mas_chan_list[NUM_CHANNELS]; bool offload_enabled; + uint8_t num_phy; + uint16_t reg_dmn_pair; + uint16_t ctry_code; bool nol_chan[NUM_CHANNELS]; char default_country[REG_ALPHA2_LEN + 1]; char current_country[REG_ALPHA2_LEN + 1]; diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 4cd951c72e3b..1f00e279790d 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -1042,7 +1042,7 @@ static void reg_fill_channel_info(enum channel_enum chan_enum, REGULATORY_CHAN_NO_IR; master_list[chan_enum].state = - CHANNEL_STATE_PASSIVE; + CHANNEL_STATE_DFS; } if (reg_rule->flags & REGULATORY_CHAN_RADAR) { @@ -1143,166 +1143,6 @@ static void do_auto_bw_correction(uint32_t num_reg_rules, } -QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info - *regulat_info) -{ - struct wlan_regulatory_psoc_priv_obj *soc_reg; - uint32_t num_2g_reg_rules, num_5g_reg_rules; - struct cur_reg_rule *reg_rule_2g, *reg_rule_5g; - uint16_t min_bw_2g, max_bw_2g, min_bw_5g, max_bw_5g; - struct regulatory_channel *mas_chan_list; - - reg_debug("process reg master chan list"); - - wlan_psoc_obj_lock(regulat_info->psoc); - soc_reg = (struct wlan_regulatory_psoc_priv_obj *) - wlan_objmgr_psoc_get_comp_private_obj(regulat_info->psoc, - WLAN_UMAC_COMP_REGULATORY); - wlan_psoc_obj_unlock(regulat_info->psoc); - - if (NULL == soc_reg) { - reg_err("soc_reg is NULL"); - return QDF_STATUS_E_FAILURE; - } - - soc_reg->offload_enabled = true; - - soc_reg->phybitmap = regulat_info->phybitmap; - soc_reg->dfs_region = regulat_info->dfs_region; - qdf_mem_copy(soc_reg->default_country, regulat_info->alpha2, - REG_ALPHA2_LEN); - qdf_mem_copy(soc_reg->current_country, regulat_info->alpha2, - REG_ALPHA2_LEN); - - mas_chan_list = soc_reg->mas_chan_list; - - min_bw_2g = regulat_info->min_bw_2g; - max_bw_2g = regulat_info->max_bw_2g; - reg_rule_2g = regulat_info->reg_rules_2g_ptr; - num_2g_reg_rules = regulat_info->num_2g_reg_rules; - update_max_bw_per_rule(num_2g_reg_rules, - reg_rule_2g, max_bw_2g); - - min_bw_5g = regulat_info->min_bw_5g; - max_bw_5g = regulat_info->max_bw_5g; - reg_rule_5g = regulat_info->reg_rules_5g_ptr; - num_5g_reg_rules = regulat_info->num_5g_reg_rules; - update_max_bw_per_rule(num_5g_reg_rules, - reg_rule_5g, max_bw_5g); - - do_auto_bw_correction(num_5g_reg_rules, reg_rule_5g, max_bw_5g); - - populate_band_channels(CHAN_ENUM_1, CHAN_ENUM_14, - reg_rule_2g, num_2g_reg_rules, - min_bw_2g, mas_chan_list); - - populate_band_channels(CHAN_ENUM_36, CHAN_ENUM_165, - reg_rule_5g, - num_5g_reg_rules, - min_bw_5g, mas_chan_list); - - return QDF_STATUS_SUCCESS; -} - -/** - * wlan_regulatory_psoc_obj_created_notification() - PSOC obj create callback - * @psoc: PSOC object - * @arg_list: Variable argument list - * - * This callback is registered with object manager during initialization to - * get notified when the object is created. - * - * Return: Success or Failure - */ -QDF_STATUS wlan_regulatory_psoc_obj_created_notification( - struct wlan_objmgr_psoc *psoc, void *arg_list) -{ - struct wlan_regulatory_psoc_priv_obj *soc_reg_obj; - struct regulatory_channel *mas_chan_list; - enum channel_enum chan_enum; - QDF_STATUS status; - - soc_reg_obj = qdf_mem_malloc(sizeof(*soc_reg_obj)); - - if (NULL == soc_reg_obj) { - reg_alert("Mem alloc failed for reg psoc priv obj"); - return QDF_STATUS_E_NOMEM; - } - - soc_reg_obj->offload_enabled = false; - soc_reg_obj->psoc_ptr = psoc; - soc_reg_obj->dfs_enabled = true; - soc_reg_obj->set_fcc_channel = false; - soc_reg_obj->band_capability = BAND_ALL; - soc_reg_obj->indoor_chan_enabled = true; - - - mas_chan_list = soc_reg_obj->mas_chan_list; - - for (chan_enum = 0; chan_enum < NUM_CHANNELS; - chan_enum++) { - mas_chan_list[chan_enum].chan_num = - channel_map[chan_enum].chan_num; - mas_chan_list[chan_enum].center_freq = - channel_map[chan_enum].center_freq; - mas_chan_list[chan_enum].chan_flags |= - REGULATORY_CHAN_DISABLED; - mas_chan_list[chan_enum].state = - CHANNEL_STATE_DISABLE; - mas_chan_list[chan_enum].nol_chan = false; - soc_reg_obj->nol_chan[chan_enum] = false; - } - - status = wlan_objmgr_psoc_component_obj_attach(psoc, - WLAN_UMAC_COMP_REGULATORY, soc_reg_obj, - QDF_STATUS_SUCCESS); - - reg_debug("reg psoc obj created with status %d", status); - - return status; -} - -/** - * wlan_regulatory_psoc_obj_destroyed_notification() - PSOC obj delete callback - * @psoc: PSOC object - * @arg_list: Variable argument list - * - * This callback is registered with object manager during initialization to - * get notified when the object is deleted. - * - * Return: Success or Failure - */ -QDF_STATUS wlan_regulatory_psoc_obj_destroyed_notification( - struct wlan_objmgr_psoc *psoc, void *arg_list) -{ - QDF_STATUS status; - struct wlan_regulatory_psoc_priv_obj *soc_reg; - - wlan_psoc_obj_lock(psoc); - soc_reg = wlan_objmgr_psoc_get_comp_private_obj(psoc, - WLAN_UMAC_COMP_REGULATORY); - wlan_psoc_obj_unlock(psoc); - - if (NULL == soc_reg) { - reg_err("reg psoc private obj is NULL"); - return QDF_STATUS_E_FAULT; - } - - soc_reg->psoc_ptr = NULL; - - status = wlan_objmgr_psoc_component_obj_detach(psoc, - WLAN_UMAC_COMP_REGULATORY, - soc_reg); - if (status != QDF_STATUS_SUCCESS) - reg_err("soc_reg private obj detach failed"); - - reg_debug("reg psoc obj detached with status %d", status); - - qdf_mem_free(soc_reg); - - return status; -} - static void modify_chan_list_for_dfs_channels(struct regulatory_channel *chan_list, bool dfs_enabled) @@ -1470,6 +1310,250 @@ modify_chan_list_for_freq_range(struct regulatory_channel } } +static void reg_change_pdev_for_new_mas_chan_list(struct wlan_objmgr_psoc *psoc, + void *object, void *arg) +{ + struct wlan_objmgr_pdev *pdev = (struct wlan_objmgr_pdev *)object; + struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj; + struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj; + enum channel_enum chan_enum; + + wlan_psoc_obj_lock(psoc); + psoc_priv_obj = (struct wlan_regulatory_psoc_priv_obj *) + wlan_objmgr_psoc_get_comp_private_obj(psoc, + WLAN_UMAC_COMP_REGULATORY); + wlan_psoc_obj_unlock(psoc); + + if (NULL == psoc_priv_obj) { + reg_err("psoc priv obj is NULL"); + return; + } + + wlan_pdev_obj_lock(pdev); + pdev_priv_obj = (struct wlan_regulatory_pdev_priv_obj *) + wlan_objmgr_pdev_get_comp_private_obj(pdev, + WLAN_UMAC_COMP_REGULATORY); + wlan_pdev_obj_unlock(pdev); + + if (NULL == pdev_priv_obj) { + reg_err("pdev priv obj is NULL"); + return; + } + + qdf_mem_copy(pdev_priv_obj->cur_chan_list, + psoc_priv_obj->mas_chan_list, + NUM_CHANNELS * sizeof(struct regulatory_channel)); + + for (chan_enum = 0; chan_enum < NUM_CHANNELS; chan_enum++) + pdev_priv_obj->cur_chan_list[chan_enum].nol_chan = + psoc_priv_obj->nol_chan[chan_enum]; + + modify_chan_list_for_freq_range(pdev_priv_obj->cur_chan_list, + pdev_priv_obj->range_2g_low, + pdev_priv_obj->range_2g_high, + pdev_priv_obj->range_5g_low, + pdev_priv_obj->range_5g_high); + + modify_chan_list_for_dfs_channels(pdev_priv_obj->cur_chan_list, + pdev_priv_obj->dfs_enabled); + + modify_chan_list_for_indoor_channels(pdev_priv_obj->cur_chan_list, + pdev_priv_obj->indoor_chan_enabled); + + modify_chan_list_for_band(pdev_priv_obj->cur_chan_list, + pdev_priv_obj->band_capability); + + modify_chan_list_for_nol_list(pdev_priv_obj->cur_chan_list); + + modify_chan_list_for_fcc_channel(pdev_priv_obj->cur_chan_list, + pdev_priv_obj->set_fcc_channel); + +} + + +QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info + *regulat_info) +{ + struct wlan_regulatory_psoc_priv_obj *soc_reg; + uint32_t num_2g_reg_rules, num_5g_reg_rules; + struct cur_reg_rule *reg_rule_2g, *reg_rule_5g; + uint16_t min_bw_2g, max_bw_2g, min_bw_5g, max_bw_5g; + struct regulatory_channel *mas_chan_list; + QDF_STATUS status; + enum channel_enum chan_enum; + + reg_debug("process reg master chan list"); + + wlan_psoc_obj_lock(regulat_info->psoc); + soc_reg = (struct wlan_regulatory_psoc_priv_obj *) + wlan_objmgr_psoc_get_comp_private_obj(regulat_info->psoc, + WLAN_UMAC_COMP_REGULATORY); + wlan_psoc_obj_unlock(regulat_info->psoc); + + if (NULL == soc_reg) { + reg_err("soc_reg is NULL"); + return QDF_STATUS_E_FAILURE; + } + + mas_chan_list = soc_reg->mas_chan_list; + + for (chan_enum = 0; chan_enum < NUM_CHANNELS; + chan_enum++) { + mas_chan_list[chan_enum].chan_num = + channel_map[chan_enum].chan_num; + mas_chan_list[chan_enum].center_freq = + channel_map[chan_enum].center_freq; + mas_chan_list[chan_enum].chan_flags |= + REGULATORY_CHAN_DISABLED; + mas_chan_list[chan_enum].state = + CHANNEL_STATE_DISABLE; + mas_chan_list[chan_enum].nol_chan = false; + soc_reg->nol_chan[chan_enum] = false; + } + + soc_reg->offload_enabled = regulat_info->offload_enabled; + soc_reg->phybitmap = regulat_info->phybitmap; + soc_reg->dfs_region = regulat_info->dfs_region; + qdf_mem_copy(soc_reg->default_country, regulat_info->alpha2, + REG_ALPHA2_LEN); + qdf_mem_copy(soc_reg->current_country, regulat_info->alpha2, + REG_ALPHA2_LEN); + + min_bw_2g = regulat_info->min_bw_2g; + max_bw_2g = regulat_info->max_bw_2g; + reg_rule_2g = regulat_info->reg_rules_2g_ptr; + num_2g_reg_rules = regulat_info->num_2g_reg_rules; + update_max_bw_per_rule(num_2g_reg_rules, + reg_rule_2g, max_bw_2g); + + min_bw_5g = regulat_info->min_bw_5g; + max_bw_5g = regulat_info->max_bw_5g; + reg_rule_5g = regulat_info->reg_rules_5g_ptr; + num_5g_reg_rules = regulat_info->num_5g_reg_rules; + update_max_bw_per_rule(num_5g_reg_rules, + reg_rule_5g, max_bw_5g); + + if (num_5g_reg_rules != 0) + do_auto_bw_correction(num_5g_reg_rules, reg_rule_5g, + max_bw_5g); + + if (num_2g_reg_rules != 0) + populate_band_channels(CHAN_ENUM_1, CHAN_ENUM_14, + reg_rule_2g, num_2g_reg_rules, + min_bw_2g, mas_chan_list); + + if (num_5g_reg_rules != 0) + populate_band_channels(CHAN_ENUM_36, CHAN_ENUM_165, + reg_rule_5g, + num_5g_reg_rules, + min_bw_5g, mas_chan_list); + + status = wlan_objmgr_iterate_obj_list(regulat_info->psoc, WLAN_PDEV_OP, + reg_change_pdev_for_new_mas_chan_list, + NULL, 1, WLAN_REGULATORY_SB_ID); + + return status; +} + +/** + * wlan_regulatory_psoc_obj_created_notification() - PSOC obj create callback + * @psoc: PSOC object + * @arg_list: Variable argument list + * + * This callback is registered with object manager during initialization to + * get notified when the object is created. + * + * Return: Success or Failure + */ +QDF_STATUS wlan_regulatory_psoc_obj_created_notification( + struct wlan_objmgr_psoc *psoc, void *arg_list) +{ + struct wlan_regulatory_psoc_priv_obj *soc_reg_obj; + struct regulatory_channel *mas_chan_list; + enum channel_enum chan_enum; + QDF_STATUS status; + + soc_reg_obj = qdf_mem_malloc(sizeof(*soc_reg_obj)); + + if (NULL == soc_reg_obj) { + reg_alert("Mem alloc failed for reg psoc priv obj"); + return QDF_STATUS_E_NOMEM; + } + + soc_reg_obj->offload_enabled = false; + soc_reg_obj->psoc_ptr = psoc; + soc_reg_obj->dfs_enabled = true; + soc_reg_obj->set_fcc_channel = false; + soc_reg_obj->band_capability = BAND_ALL; + soc_reg_obj->indoor_chan_enabled = true; + + + mas_chan_list = soc_reg_obj->mas_chan_list; + + for (chan_enum = 0; chan_enum < NUM_CHANNELS; + chan_enum++) { + mas_chan_list[chan_enum].chan_num = + channel_map[chan_enum].chan_num; + mas_chan_list[chan_enum].center_freq = + channel_map[chan_enum].center_freq; + mas_chan_list[chan_enum].chan_flags |= + REGULATORY_CHAN_DISABLED; + mas_chan_list[chan_enum].state = + CHANNEL_STATE_DISABLE; + mas_chan_list[chan_enum].nol_chan = false; + soc_reg_obj->nol_chan[chan_enum] = false; + } + + status = wlan_objmgr_psoc_component_obj_attach(psoc, + WLAN_UMAC_COMP_REGULATORY, soc_reg_obj, + QDF_STATUS_SUCCESS); + + reg_debug("reg psoc obj created with status %d", status); + + return status; +} + +/** + * wlan_regulatory_psoc_obj_destroyed_notification() - PSOC obj delete callback + * @psoc: PSOC object + * @arg_list: Variable argument list + * + * This callback is registered with object manager during initialization to + * get notified when the object is deleted. + * + * Return: Success or Failure + */ +QDF_STATUS wlan_regulatory_psoc_obj_destroyed_notification( + struct wlan_objmgr_psoc *psoc, void *arg_list) +{ + QDF_STATUS status; + struct wlan_regulatory_psoc_priv_obj *soc_reg; + + wlan_psoc_obj_lock(psoc); + soc_reg = wlan_objmgr_psoc_get_comp_private_obj(psoc, + WLAN_UMAC_COMP_REGULATORY); + wlan_psoc_obj_unlock(psoc); + + if (NULL == soc_reg) { + reg_err("reg psoc private obj is NULL"); + return QDF_STATUS_E_FAULT; + } + + soc_reg->psoc_ptr = NULL; + + status = wlan_objmgr_psoc_component_obj_detach(psoc, + WLAN_UMAC_COMP_REGULATORY, + soc_reg); + if (status != QDF_STATUS_SUCCESS) + reg_err("soc_reg private obj detach failed"); + + reg_debug("reg psoc obj detached with status %d", status); + + qdf_mem_free(soc_reg); + + return status; +} + /** * wlan_regulatory_pdev_obj_created_notification() - PDEV obj create callback * @pdev: pdev object @@ -1891,66 +1975,6 @@ bool reg_is_regdb_offloaded(struct wlan_objmgr_psoc *psoc) } -static void reg_change_pdev_for_new_mas_chan_list(struct wlan_objmgr_psoc *psoc, - void *object, void *arg) -{ - struct wlan_objmgr_pdev *pdev = (struct wlan_objmgr_pdev *)object; - struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj; - struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj; - enum channel_enum chan_enum; - - wlan_psoc_obj_lock(psoc); - psoc_priv_obj = (struct wlan_regulatory_psoc_priv_obj *) - wlan_objmgr_psoc_get_comp_private_obj(psoc, - WLAN_UMAC_COMP_REGULATORY); - wlan_psoc_obj_unlock(psoc); - - if (NULL == psoc_priv_obj) { - reg_err("psoc priv obj is NULL"); - return; - } - - wlan_pdev_obj_lock(pdev); - pdev_priv_obj = (struct wlan_regulatory_pdev_priv_obj *) - wlan_objmgr_pdev_get_comp_private_obj(pdev, - WLAN_UMAC_COMP_REGULATORY); - wlan_pdev_obj_unlock(pdev); - - if (NULL == pdev_priv_obj) { - reg_err("pdev priv obj is NULL"); - return; - } - - qdf_mem_copy(pdev_priv_obj->cur_chan_list, - psoc_priv_obj->mas_chan_list, - NUM_CHANNELS * sizeof(struct regulatory_channel)); - - for (chan_enum = 0; chan_enum < NUM_CHANNELS; chan_enum++) - pdev_priv_obj->cur_chan_list[chan_enum].nol_chan = - psoc_priv_obj->nol_chan[chan_enum]; - - modify_chan_list_for_freq_range(pdev_priv_obj->cur_chan_list, - pdev_priv_obj->range_2g_low, - pdev_priv_obj->range_2g_high, - pdev_priv_obj->range_5g_low, - pdev_priv_obj->range_5g_high); - - modify_chan_list_for_dfs_channels(pdev_priv_obj->cur_chan_list, - pdev_priv_obj->dfs_enabled); - - modify_chan_list_for_indoor_channels(pdev_priv_obj->cur_chan_list, - pdev_priv_obj->indoor_chan_enabled); - - modify_chan_list_for_band(pdev_priv_obj->cur_chan_list, - pdev_priv_obj->band_capability); - - modify_chan_list_for_nol_list(pdev_priv_obj->cur_chan_list); - - modify_chan_list_for_fcc_channel(pdev_priv_obj->cur_chan_list, - pdev_priv_obj->set_fcc_channel); - -} - void reg_program_mas_chan_list(struct wlan_objmgr_psoc *psoc, struct regulatory_channel *reg_channels, uint8_t *alpha2, diff --git a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h index d163658a5c7f..9cef34bba1ba 100644 --- a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h +++ b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h @@ -393,6 +393,14 @@ enum ht_sec_ch_offset { HIGH_PRIMARY_CH = 3, }; +enum cc_setting_code { + REG_SET_CC_STATUS_PASS = 0, + REG_CURRENT_ALPHA2_NOT_FOUND = 1, + REG_INIT_ALPHA2_NOT_FOUND = 2, + REG_SET_CC_CHANGE_NOT_ALLOWED = 3, + REG_SET_CC_STATUS_NO_MEMORY = 4, + REG_SET_CC_STATUS_FAIL = 5, +}; /** * struct cur_reg_rule @@ -415,6 +423,7 @@ struct cur_reg_rule { /** * struct cur_regulatory_info * @psoc: psoc ptr + * @cc_setting_code: cc setting regdb value * @alpha2: country alpha2 * @dfs_reg: dfs region * @phybitmap: phy bit map @@ -429,7 +438,12 @@ struct cur_reg_rule { */ struct cur_regulatory_info { struct wlan_objmgr_psoc *psoc; + enum cc_setting_code status_code; + uint8_t num_phy; + uint16_t reg_dmn_pair; + uint16_t ctry_code; uint8_t alpha2[REG_ALPHA2_LEN + 1]; + bool offload_enabled; enum dfs_reg dfs_region; uint32_t phybitmap; uint32_t min_bw_2g; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 3e6f625c4c8a..c2582abd7141 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -17174,6 +17174,7 @@ static QDF_STATUS extract_reg_chan_list_update_event_tlv( REG_ALPHA2_LEN); reg_info->dfs_region = chan_list_event_hdr->dfs_region; reg_info->phybitmap = chan_list_event_hdr->phybitmap; + reg_info->offload_enabled = true; reg_info->min_bw_2g = chan_list_event_hdr->min_bw_2g; reg_info->max_bw_2g = chan_list_event_hdr->max_bw_2g; reg_info->min_bw_5g = chan_list_event_hdr->min_bw_5g; From 7aae4615a2c5664889cb4d475526735a685660b0 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Thu, 6 Apr 2017 10:23:22 +0530 Subject: [PATCH 03/20] qcacmn: Add the country and regdomain parse functions Country and regdomain parse functions are added for the regDB in host. Given a country code or ISO or RegDomain, these functions find the regulatory rules and builds master channel list. Change-Id: I7c632098561e3bbab1ac6ded2ae80e03d53b00bb CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db.c | 40 ++++- umac/regulatory/core/src/reg_db.h | 7 + umac/regulatory/core/src/reg_db_parser.c | 198 +++++++++++++++++++++++ umac/regulatory/core/src/reg_db_parser.h | 51 ++++++ 4 files changed, 290 insertions(+), 6 deletions(-) create mode 100644 umac/regulatory/core/src/reg_db_parser.c create mode 100644 umac/regulatory/core/src/reg_db_parser.h diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index 70e3c499fe79..75391250e8d8 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -312,7 +312,7 @@ enum reg_domain { WORLD_6C = 0x6C, }; -static const struct country_code_to_reg_domain g_all_countries[] = { +const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", "AF" , 40, 160, 0}, {CTRY_ALBANIA, ETSI1_WORLD, "AL", "AL", 40, 160, 0}, {CTRY_ALGERIA, APL13_WORLD, "DZ", "DZ", 40, 160, 0}, @@ -571,7 +571,7 @@ enum reg_domains_5g { }; -static const struct reg_domain_pair g_reg_dmn_pairs[] = { +const struct reg_domain_pair g_reg_dmn_pairs[] = { {NULL1_WORLD, NULL1, WORLD}, {FCC1_FCCA, FCC1, FCCA}, @@ -648,7 +648,7 @@ enum reg_rules_2g { CHAN_14_2, }; -static const struct regulatory_rule reg_rules_2g[] = { +const struct regulatory_rule reg_rules_2g[] = { [CHAN_1_11_1] = {2402, 2472, 40, 30, 0}, [CHAN_1_11_2] = {2402, 2472, 40, 20, 0}, @@ -661,7 +661,7 @@ static const struct regulatory_rule reg_rules_2g[] = { }; -static const struct regdomain regdomains_2g[] = { +const struct regdomain regdomains_2g[] = { [FCCA] = {CTL_FCC, DFS_UNINIT_REG, 0, 1, {CHAN_1_11_1} }, [WORLD] = {CTL_ETSI, DFS_UNINIT_REG, 0, 1, {CHAN_1_13_1} }, @@ -709,7 +709,7 @@ enum reg_rules_5g { CHAN_5735_5775_1, }; -static const struct regulatory_rule reg_rules_5g[] = { +const struct regulatory_rule reg_rules_5g[] = { [CHAN_4910_4990_1] = {4910, 4990, 20, 20, 0}, [CHAN_4940_4990_1] = {4940, 4990, 20, 33, 0}, @@ -743,7 +743,7 @@ static const struct regulatory_rule reg_rules_5g[] = { }; -static const struct regdomain regdomains_5g[] = { +const struct regdomain regdomains_5g[] = { [FCC1] = {CTL_FCC, DFS_FCC_REG, 2, 3, {CHAN_5170_5250_1, CHAN_5250_5330_1, @@ -857,3 +857,31 @@ static const struct regdomain regdomains_5g[] = { CHAN_5490_5730_3, CHAN_5735_5835_5} }, }; + +QDF_STATUS get_num_countries(int *num_countries) +{ + *num_countries = QDF_ARRAY_SIZE(g_all_countries); + + return QDF_STATUS_SUCCESS; +} + +QDF_STATUS get_num_reg_dmn_pairs(int *num_reg_dmn) +{ + *num_reg_dmn = QDF_ARRAY_SIZE(g_reg_dmn_pairs); + + return QDF_STATUS_SUCCESS; +} + +QDF_STATUS get_default_country_2g(int *default_country) +{ + *default_country = WORLD_2G_3; + + return QDF_STATUS_SUCCESS; +} + +QDF_STATUS get_default_country_5g(int *default_country) +{ + *default_country = WORLD_5G_2; + + return QDF_STATUS_SUCCESS; +} diff --git a/umac/regulatory/core/src/reg_db.h b/umac/regulatory/core/src/reg_db.h index 48d7f71a6892..de96fb96e5f4 100644 --- a/umac/regulatory/core/src/reg_db.h +++ b/umac/regulatory/core/src/reg_db.h @@ -145,4 +145,11 @@ enum ctl_value { CTL_NONE = 0xff }; +QDF_STATUS get_num_countries(int *num_countries); + +QDF_STATUS get_num_reg_dmn_pairs(int *num_reg_dmn); + +QDF_STATUS get_default_country_2g(int *default_country); + +QDF_STATUS get_default_country_5g(int *default_country); #endif diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c new file mode 100644 index 000000000000..d69f3ceaa422 --- /dev/null +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -0,0 +1,198 @@ +/* + * Copyright (c) 2017 The Linux Foundation. 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 + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: reg_db_parser.c + * This file provides regulatory data base parser functions. + */ + +#include +#include "reg_db_parser.h" +#include + +int reg_create_master_chan_list(uint8_t *event_buf) +{ + return 0; +} + +QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]) +{ + uint16_t i; + int num_countries; + + get_num_countries(&num_countries); + + for (i = 0; i < num_countries; i++) { + if ((g_all_countries[i].alpha2[0] == alpha[0]) && + (g_all_countries[i].alpha2[1] == alpha[1]) && + (g_all_countries[i].alpha2[2] == alpha[2])) + return QDF_STATUS_SUCCESS; + else + continue; + } + + return QDF_STATUS_E_FAILURE; +} + +QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, + uint8_t dmn_id_5g, + struct cur_regulatory_info *reg_info) + +{ + uint8_t k; + uint8_t rule_index; + struct cur_reg_rule *r_r_2g = reg_info->reg_rules_2g_ptr; + struct cur_reg_rule *r_r_5g = reg_info->reg_rules_5g_ptr; + + for (k = 0; k < reg_info->num_2g_reg_rules; k++) { + rule_index = regdomains_2g[dmn_id_2g].reg_rule_id[k]; + r_r_2g->start_freq = reg_rules_2g[rule_index].start_freq; + r_r_2g->end_freq = reg_rules_2g[rule_index].end_freq; + r_r_2g->max_bw = reg_rules_2g[rule_index].max_bw; + r_r_2g->reg_power = reg_rules_2g[rule_index].reg_power; + r_r_2g->flags = reg_rules_2g[rule_index].flags; + r_r_2g++; + } + + for (k = 0; k < reg_info->num_5g_reg_rules; k++) { + rule_index = regdomains_5g[dmn_id_5g].reg_rule_id[k]; + r_r_5g->start_freq = reg_rules_5g[rule_index].start_freq; + r_r_5g->end_freq = reg_rules_5g[rule_index].end_freq; + r_r_5g->max_bw = reg_rules_5g[rule_index].max_bw; + r_r_5g->reg_power = reg_rules_5g[rule_index].reg_power; + r_r_5g->flags = reg_rules_5g[rule_index].flags; + r_r_5g++; + } + + return QDF_STATUS_SUCCESS; +} + +/* Given a country code the function + * finds current regulatory information + */ +QDF_STATUS reg_get_cur_reginfo(uint8_t *alpha, + uint32_t max_rules, + struct cur_regulatory_info *reg_info) +{ + uint16_t i, j; + uint8_t rgalpha[3]; + int num_countries; + int num_reg_dmn; + int default_country_2g; + int default_country_5g; + + rgalpha[0] = alpha[0]; + rgalpha[1] = alpha[1]; + rgalpha[2] = 0; + + get_num_countries(&num_countries); + get_num_reg_dmn_pairs(&num_reg_dmn); + + if (reg_is_country_code_valid(rgalpha)) { + for (i = 0; i < num_countries; i++) { + if ((g_all_countries[i].alpha2[0] == alpha[0]) && + (g_all_countries[i].alpha2[1] == alpha[1]) && + (g_all_countries[i].alpha2[2] == alpha[2])) + break; + else + continue; + } + for (j = 0; j < num_reg_dmn; j++) { + if (g_reg_dmn_pairs[j].reg_dmn_pair_id == + g_all_countries[i].reg_dmn_pair_id) + break; + else + continue; + } + + if ((max_rules >= regdomains_2g[ + g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + + regdomains_5g[ + g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules)) { + + reg_info->dfs_region = regdomains_5g[ + g_reg_dmn_pairs[j].dmn_id_5g].dfs_region; + reg_info->phybitmap = g_all_countries[i].phymode_bitmap; + reg_info->max_bw_2g = g_all_countries[i].max_bw_2g; + reg_info->max_bw_5g = g_all_countries[i].max_bw_5g; + reg_info->min_bw_2g = regdomains_2g[ + g_reg_dmn_pairs[j].dmn_id_2g].min_bw; + reg_info->min_bw_5g = regdomains_5g[ + g_reg_dmn_pairs[j].dmn_id_5g].min_bw; + reg_info->num_2g_reg_rules = regdomains_2g[ + g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules; + reg_info->num_5g_reg_rules = regdomains_5g[ + g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules; + reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_2g_reg_rules) * + sizeof(struct cur_reg_rule)); + + reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_5g_reg_rules) * + sizeof(struct cur_reg_rule)); + + reg_regrules_assign(g_reg_dmn_pairs[j].dmn_id_2g, + g_reg_dmn_pairs[j].dmn_id_5g, reg_info); + + alpha[0] = g_all_countries[i].alpha2_11d[0]; + alpha[1] = g_all_countries[i].alpha2_11d[1]; + + return QDF_STATUS_SUCCESS; + } else if (!((max_rules >= regdomains_2g[ + g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + + regdomains_5g[ + g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) + return QDF_STATUS_E_NOMEM; + } else { + get_default_country_2g(&default_country_2g); + get_default_country_5g(&default_country_5g); + + if ((max_rules >= + regdomains_2g[default_country_2g].num_reg_rules + + regdomains_5g[default_country_5g].num_reg_rules)) { + reg_info->dfs_region = + regdomains_5g[default_country_5g].dfs_region; + reg_info->phybitmap = 0; + reg_info->max_bw_2g = 40; + reg_info->max_bw_5g = 160; + reg_info->min_bw_2g = + regdomains_2g[default_country_2g].min_bw; + reg_info->min_bw_5g = + regdomains_5g[default_country_5g].min_bw; + reg_info->num_2g_reg_rules = + regdomains_2g[default_country_2g].num_reg_rules; + reg_info->num_5g_reg_rules = + regdomains_5g[default_country_5g].num_reg_rules; + + reg_regrules_assign(default_country_2g, + default_country_5g, reg_info); + + alpha[0] = '0'; + alpha[1] = '0'; + + return QDF_STATUS_SUCCESS; + } else if (!((max_rules >= regdomains_2g[ + default_country_2g].num_reg_rules + + regdomains_5g[default_country_5g].num_reg_rules) + )) + return QDF_STATUS_E_NOMEM; + } + + return QDF_STATUS_SUCCESS; +} diff --git a/umac/regulatory/core/src/reg_db_parser.h b/umac/regulatory/core/src/reg_db_parser.h new file mode 100644 index 000000000000..dba006e7f2d7 --- /dev/null +++ b/umac/regulatory/core/src/reg_db_parser.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2017 The Linux Foundation. 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 + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: reg_db.h + * This file contains regulatory data base parser function declarations + */ + +#include + +extern const struct country_code_to_reg_domain g_all_countries[]; +extern const struct reg_domain_pair g_reg_dmn_pairs[]; +extern const struct regulatory_rule reg_rules_2g[]; +extern const struct regdomain regdomains_2g[]; +extern const struct regulatory_rule reg_rules_5g[]; +extern const struct regdomain regdomains_5g[]; + +QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]); + +QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, + uint8_t dmn_id_5g, + struct cur_regulatory_info *reg_info); + +QDF_STATUS reg_get_cur_reginfo(uint8_t *alpha, + uint32_t max_rules, + struct cur_regulatory_info *reg_info); + +QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha, + uint16_t *country_index, + uint16_t *regdmn_pair); + +QDF_STATUS reg_get_rdpair_from_country_code(uint16_t cc, + uint16_t *country_index, + uint16_t *regdmn_pair); + From 38dba645523b5eb38173d212ff892180acf37744 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Tue, 2 May 2017 11:23:51 +0530 Subject: [PATCH 04/20] qcacmn: Parse function is split to modularize code Instead of having a large function, the parse function is split into 3 for A)Country ISO B)CountryCode and C)RegDomain Pair ID. Change-Id: I5b3574cd54644d1eac13e3eff762eb7cbdd35a73 CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db_parser.c | 312 ++++++++++++++++------- umac/regulatory/core/src/reg_db_parser.h | 7 +- umac/regulatory/core/src/reg_services.c | 1 + 3 files changed, 224 insertions(+), 96 deletions(-) diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index d69f3ceaa422..57f262089575 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -26,11 +26,6 @@ #include "reg_db_parser.h" #include -int reg_create_master_chan_list(uint8_t *event_buf) -{ - return 0; -} - QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]) { uint16_t i; @@ -83,115 +78,246 @@ QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, return QDF_STATUS_SUCCESS; } -/* Given a country code the function - * finds current regulatory information - */ -QDF_STATUS reg_get_cur_reginfo(uint8_t *alpha, - uint32_t max_rules, - struct cur_regulatory_info *reg_info) +QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha, + uint16_t *country_index, + uint16_t *regdmn_pair) { uint16_t i, j; - uint8_t rgalpha[3]; int num_countries; int num_reg_dmn; - int default_country_2g; - int default_country_5g; - - rgalpha[0] = alpha[0]; - rgalpha[1] = alpha[1]; - rgalpha[2] = 0; get_num_countries(&num_countries); get_num_reg_dmn_pairs(&num_reg_dmn); - if (reg_is_country_code_valid(rgalpha)) { - for (i = 0; i < num_countries; i++) { - if ((g_all_countries[i].alpha2[0] == alpha[0]) && + for (i = 0; i < num_countries; i++) { + if ((g_all_countries[i].alpha2[0] == alpha[0]) && (g_all_countries[i].alpha2[1] == alpha[1]) && (g_all_countries[i].alpha2[2] == alpha[2])) - break; - else - continue; - } - for (j = 0; j < num_reg_dmn; j++) { - if (g_reg_dmn_pairs[j].reg_dmn_pair_id == + break; + } + + if (i == num_countries) { + *country_index = -1; + return QDF_STATUS_E_FAILURE; + } + + for (j = 0; j < num_reg_dmn; j++) { + if (g_reg_dmn_pairs[j].reg_dmn_pair_id == g_all_countries[i].reg_dmn_pair_id) - break; - else - continue; - } + break; + } - if ((max_rules >= regdomains_2g[ - g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + - regdomains_5g[ - g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules)) { + if (j == num_reg_dmn) { + *regdmn_pair = -1; + return QDF_STATUS_E_FAILURE; + } - reg_info->dfs_region = regdomains_5g[ - g_reg_dmn_pairs[j].dmn_id_5g].dfs_region; - reg_info->phybitmap = g_all_countries[i].phymode_bitmap; - reg_info->max_bw_2g = g_all_countries[i].max_bw_2g; - reg_info->max_bw_5g = g_all_countries[i].max_bw_5g; - reg_info->min_bw_2g = regdomains_2g[ - g_reg_dmn_pairs[j].dmn_id_2g].min_bw; - reg_info->min_bw_5g = regdomains_5g[ - g_reg_dmn_pairs[j].dmn_id_5g].min_bw; - reg_info->num_2g_reg_rules = regdomains_2g[ - g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules; - reg_info->num_5g_reg_rules = regdomains_5g[ - g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules; - reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_2g_reg_rules) * - sizeof(struct cur_reg_rule)); + *country_index = i; + *regdmn_pair = j; - reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_5g_reg_rules) * - sizeof(struct cur_reg_rule)); + return QDF_STATUS_SUCCESS; +} - reg_regrules_assign(g_reg_dmn_pairs[j].dmn_id_2g, - g_reg_dmn_pairs[j].dmn_id_5g, reg_info); +QDF_STATUS reg_get_rdpair_from_country_code(uint16_t cc, + uint16_t *country_index, + uint16_t *regdmn_pair) +{ + uint16_t i, j; + int num_countries; + int num_reg_dmn; - alpha[0] = g_all_countries[i].alpha2_11d[0]; - alpha[1] = g_all_countries[i].alpha2_11d[1]; + get_num_countries(&num_countries); + get_num_reg_dmn_pairs(&num_reg_dmn); - return QDF_STATUS_SUCCESS; - } else if (!((max_rules >= regdomains_2g[ - g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + - regdomains_5g[ - g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) - return QDF_STATUS_E_NOMEM; - } else { - get_default_country_2g(&default_country_2g); - get_default_country_5g(&default_country_5g); + for (i = 0; i < num_countries; i++) { + if (g_all_countries[i].country_code == cc) + break; + } - if ((max_rules >= - regdomains_2g[default_country_2g].num_reg_rules + - regdomains_5g[default_country_5g].num_reg_rules)) { - reg_info->dfs_region = - regdomains_5g[default_country_5g].dfs_region; - reg_info->phybitmap = 0; - reg_info->max_bw_2g = 40; - reg_info->max_bw_5g = 160; - reg_info->min_bw_2g = - regdomains_2g[default_country_2g].min_bw; - reg_info->min_bw_5g = - regdomains_5g[default_country_5g].min_bw; - reg_info->num_2g_reg_rules = - regdomains_2g[default_country_2g].num_reg_rules; - reg_info->num_5g_reg_rules = - regdomains_5g[default_country_5g].num_reg_rules; + if (i == num_countries) { + *country_index = -1; + return QDF_STATUS_E_FAILURE; + } - reg_regrules_assign(default_country_2g, - default_country_5g, reg_info); + for (j = 0; j < num_reg_dmn; j++) { + if (g_reg_dmn_pairs[j].reg_dmn_pair_id == + g_all_countries[i].reg_dmn_pair_id) + break; + } - alpha[0] = '0'; - alpha[1] = '0'; + if (j == num_reg_dmn) { + *regdmn_pair = -1; + return QDF_STATUS_E_FAILURE; + } - return QDF_STATUS_SUCCESS; - } else if (!((max_rules >= regdomains_2g[ - default_country_2g].num_reg_rules + - regdomains_5g[default_country_5g].num_reg_rules) - )) - return QDF_STATUS_E_NOMEM; + *country_index = i; + *regdmn_pair = j; + + return QDF_STATUS_SUCCESS; +} + +static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( + uint32_t max_rules, + struct cur_regulatory_info *reg_info, + uint16_t country_index, + uint16_t regdmn_pair) +{ + uint16_t i, j; + + i = country_index; + j = regdmn_pair; + + if ((max_rules >= + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules) + ) { + + reg_info->dfs_region = + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].dfs_region; + reg_info->phybitmap = g_all_countries[i].phymode_bitmap; + reg_info->max_bw_2g = g_all_countries[i].max_bw_2g; + reg_info->max_bw_5g = g_all_countries[i].max_bw_5g; + reg_info->min_bw_2g = + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].min_bw; + reg_info->min_bw_5g = + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].min_bw; + reg_info->num_2g_reg_rules = + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules; + reg_info->num_5g_reg_rules = + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules; + + reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_2g_reg_rules) * + sizeof(struct cur_reg_rule)); + reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_5g_reg_rules) * + sizeof(struct cur_reg_rule)); + + reg_regrules_assign(g_reg_dmn_pairs[j].dmn_id_2g, + g_reg_dmn_pairs[j].dmn_id_5g, reg_info); + + return QDF_STATUS_SUCCESS; + } else if (!((max_rules >= regdomains_2g[ + g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + + regdomains_5g[ + g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) + return QDF_STATUS_E_NOMEM; + + return QDF_STATUS_SUCCESS; +} + +static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( + uint32_t max_rules, + struct cur_regulatory_info *reg_info, + uint16_t regdmn_pair) +{ + uint16_t j; + + j = regdmn_pair; + + if ((max_rules >= + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules) + ) { + + reg_info->dfs_region = + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].dfs_region; + reg_info->phybitmap = 0; + reg_info->max_bw_2g = 40; + reg_info->max_bw_5g = 160; + reg_info->min_bw_2g = + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].min_bw; + reg_info->min_bw_5g = + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].min_bw; + reg_info->num_2g_reg_rules = + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules; + reg_info->num_5g_reg_rules = + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules; + + reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_2g_reg_rules) * + sizeof(struct cur_reg_rule)); + reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_5g_reg_rules) * + sizeof(struct cur_reg_rule)); + + reg_regrules_assign(g_reg_dmn_pairs[j].dmn_id_2g, + g_reg_dmn_pairs[j].dmn_id_5g, reg_info); + + return QDF_STATUS_SUCCESS; + } else if (!((max_rules >= regdomains_2g[ + g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + + regdomains_5g[ + g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) + return QDF_STATUS_E_NOMEM; + + return QDF_STATUS_SUCCESS; +} + +static inline QDF_STATUS reg_get_reginfo_for_default_regdmn_pair( + uint32_t max_rules, + struct cur_regulatory_info *reg_info) +{ + int default_country_2g; + int default_country_5g; + + get_default_country_2g(&default_country_2g); + get_default_country_5g(&default_country_5g); + + if ((max_rules >= regdomains_2g[default_country_2g].num_reg_rules + + regdomains_5g[default_country_5g].num_reg_rules)) { + reg_info->dfs_region = + regdomains_5g[default_country_5g].dfs_region; + reg_info->phybitmap = 0; + reg_info->max_bw_2g = 40; + reg_info->max_bw_5g = 160; + reg_info->min_bw_2g = regdomains_2g[default_country_2g].min_bw; + reg_info->min_bw_5g = regdomains_5g[default_country_5g].min_bw; + reg_info->num_2g_reg_rules = + regdomains_2g[default_country_2g].num_reg_rules; + reg_info->num_5g_reg_rules = + regdomains_5g[default_country_5g].num_reg_rules; + reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_2g_reg_rules) * + sizeof(struct cur_reg_rule)); + reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) + qdf_mem_malloc((reg_info->num_5g_reg_rules) * + sizeof(struct cur_reg_rule)); + + reg_regrules_assign(default_country_2g, + default_country_5g, reg_info); + + return QDF_STATUS_SUCCESS; + } else if (!((max_rules >= + regdomains_2g[default_country_2g].num_reg_rules + + regdomains_5g[default_country_5g].num_reg_rules))) + return QDF_STATUS_E_NOMEM; + return QDF_STATUS_SUCCESS; +} + +/* Given a country code the function finds current regulatory information */ +QDF_STATUS reg_get_cur_reginfo(uint32_t max_rules, + struct cur_regulatory_info *reg_info, + uint16_t country_index, + uint16_t regdmn_pair) +{ + if ((country_index != (uint16_t)(-1)) && + (regdmn_pair != (uint16_t)(-1))) + reg_get_reginfo_form_country_code_and_regdmn_pair( + max_rules, + reg_info, + country_index, + regdmn_pair); + else { + if (regdmn_pair != (uint16_t)(-1)) + reg_get_reginfo_form_regdmn_pair( + max_rules, + reg_info, + regdmn_pair); + else + reg_get_reginfo_for_default_regdmn_pair( + max_rules, + reg_info); } return QDF_STATUS_SUCCESS; diff --git a/umac/regulatory/core/src/reg_db_parser.h b/umac/regulatory/core/src/reg_db_parser.h index dba006e7f2d7..863cf0cfe6ab 100644 --- a/umac/regulatory/core/src/reg_db_parser.h +++ b/umac/regulatory/core/src/reg_db_parser.h @@ -37,9 +37,10 @@ QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, uint8_t dmn_id_5g, struct cur_regulatory_info *reg_info); -QDF_STATUS reg_get_cur_reginfo(uint8_t *alpha, - uint32_t max_rules, - struct cur_regulatory_info *reg_info); +QDF_STATUS reg_get_cur_reginfo(uint32_t max_rules, + struct cur_regulatory_info *reg_info, + uint16_t country_index, + uint16_t regdmn_pair); QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha, uint16_t *country_index, diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 1f00e279790d..8211ea40d5ff 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -32,6 +32,7 @@ #include "reg_services.h" #include "reg_priv.h" +#include "reg_db_parser.h" #define MAX_PWR_FCC_CHAN_12 8 #define MAX_PWR_FCC_CHAN_13 2 From ae875e5d5ada6973e3c2137aab0550906183d2bf Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Wed, 3 May 2017 13:06:54 +0530 Subject: [PATCH 05/20] qcacmn: Use sizeof of reg_rule structure instead of using macro Since the array size can be specified by a different macro or a different value in future, let the compiler calculate the array size directly instead of using the hard-coded value of the macro. Change-Id: I3fb1719db5165d0155e73c0653ec6f13fa95f69a CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db_parser.c | 51 ++++++++++++++---------- umac/regulatory/core/src/reg_db_parser.h | 3 +- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index 57f262089575..b12a73b8faeb 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -157,21 +157,25 @@ QDF_STATUS reg_get_rdpair_from_country_code(uint16_t cc, } static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( - uint32_t max_rules, struct cur_regulatory_info *reg_info, uint16_t country_index, uint16_t regdmn_pair) { uint16_t i, j; + uint8_t rule_size_2g, rule_size_5g; i = country_index; j = regdmn_pair; - if ((max_rules >= + rule_size_2g = QDF_ARRAY_SIZE( + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].reg_rule_id); + rule_size_5g = QDF_ARRAY_SIZE( + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].reg_rule_id); + + if (((rule_size_2g + rule_size_5g) >= regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules) ) { - reg_info->dfs_region = regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].dfs_region; reg_info->phybitmap = g_all_countries[i].phymode_bitmap; @@ -197,25 +201,28 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( g_reg_dmn_pairs[j].dmn_id_5g, reg_info); return QDF_STATUS_SUCCESS; - } else if (!((max_rules >= regdomains_2g[ - g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + - regdomains_5g[ - g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) - return QDF_STATUS_E_NOMEM; + } else if (!(((rule_size_2g + rule_size_5g) >= + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) + return QDF_STATUS_E_NOMEM; return QDF_STATUS_SUCCESS; } static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( - uint32_t max_rules, struct cur_regulatory_info *reg_info, uint16_t regdmn_pair) { uint16_t j; + uint8_t rule_size_2g, rule_size_5g; j = regdmn_pair; + rule_size_2g = QDF_ARRAY_SIZE( + regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].reg_rule_id); + rule_size_5g = QDF_ARRAY_SIZE( + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].reg_rule_id); - if ((max_rules >= + if (((rule_size_2g + rule_size_5g) >= regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules) ) { @@ -245,7 +252,7 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( g_reg_dmn_pairs[j].dmn_id_5g, reg_info); return QDF_STATUS_SUCCESS; - } else if (!((max_rules >= regdomains_2g[ + } else if (!(((rule_size_2g + rule_size_5g) >= regdomains_2g[ g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + regdomains_5g[ g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) @@ -255,17 +262,25 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( } static inline QDF_STATUS reg_get_reginfo_for_default_regdmn_pair( - uint32_t max_rules, - struct cur_regulatory_info *reg_info) + struct cur_regulatory_info *reg_info, + uint16_t regdmn_pair) { int default_country_2g; int default_country_5g; + uint8_t rule_size_2g, rule_size_5g; get_default_country_2g(&default_country_2g); get_default_country_5g(&default_country_5g); - if ((max_rules >= regdomains_2g[default_country_2g].num_reg_rules + + rule_size_2g = + QDF_ARRAY_SIZE(regdomains_2g[default_country_2g].reg_rule_id); + rule_size_5g = + QDF_ARRAY_SIZE(regdomains_5g[default_country_5g].reg_rule_id); + + if (((rule_size_2g + rule_size_5g) >= + regdomains_2g[default_country_2g].num_reg_rules + regdomains_5g[default_country_5g].num_reg_rules)) { + reg_info->dfs_region = regdomains_5g[default_country_5g].dfs_region; reg_info->phybitmap = 0; @@ -288,7 +303,7 @@ static inline QDF_STATUS reg_get_reginfo_for_default_regdmn_pair( default_country_5g, reg_info); return QDF_STATUS_SUCCESS; - } else if (!((max_rules >= + } else if (!(((rule_size_2g + rule_size_5g) >= regdomains_2g[default_country_2g].num_reg_rules + regdomains_5g[default_country_5g].num_reg_rules))) return QDF_STATUS_E_NOMEM; @@ -296,27 +311,23 @@ static inline QDF_STATUS reg_get_reginfo_for_default_regdmn_pair( } /* Given a country code the function finds current regulatory information */ -QDF_STATUS reg_get_cur_reginfo(uint32_t max_rules, - struct cur_regulatory_info *reg_info, +QDF_STATUS reg_get_cur_reginfo(struct cur_regulatory_info *reg_info, uint16_t country_index, uint16_t regdmn_pair) { if ((country_index != (uint16_t)(-1)) && (regdmn_pair != (uint16_t)(-1))) reg_get_reginfo_form_country_code_and_regdmn_pair( - max_rules, reg_info, country_index, regdmn_pair); else { if (regdmn_pair != (uint16_t)(-1)) reg_get_reginfo_form_regdmn_pair( - max_rules, reg_info, regdmn_pair); else reg_get_reginfo_for_default_regdmn_pair( - max_rules, reg_info); } diff --git a/umac/regulatory/core/src/reg_db_parser.h b/umac/regulatory/core/src/reg_db_parser.h index 863cf0cfe6ab..bb6f4c1789cf 100644 --- a/umac/regulatory/core/src/reg_db_parser.h +++ b/umac/regulatory/core/src/reg_db_parser.h @@ -37,8 +37,7 @@ QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, uint8_t dmn_id_5g, struct cur_regulatory_info *reg_info); -QDF_STATUS reg_get_cur_reginfo(uint32_t max_rules, - struct cur_regulatory_info *reg_info, +QDF_STATUS reg_get_cur_reginfo(struct cur_regulatory_info *reg_info, uint16_t country_index, uint16_t regdmn_pair); From 9e63cb7b001165bd42eb1eea9964382660903cd7 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Sat, 6 May 2017 11:00:06 +0530 Subject: [PATCH 06/20] qcacmn: Set default country code When a country code is not available from inside the device (from EEPROM), a default country needs to be set. Also get the regdomains from the default country code and build the master channel list. Change-Id: If307ad18318b2aea3fcdd149c01b39a678163bb5 CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db.c | 11 +- umac/regulatory/core/src/reg_db.h | 3 +- umac/regulatory/core/src/reg_db_parser.c | 175 +++++++----------- umac/regulatory/core/src/reg_db_parser.h | 2 + umac/regulatory/core/src/reg_services.c | 69 +++++++ umac/regulatory/core/src/reg_services.h | 28 +++ .../dispatcher/inc/wlan_reg_ucfg_api.h | 3 + .../dispatcher/src/wlan_reg_ucfg_api.c | 6 + 8 files changed, 182 insertions(+), 115 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index 75391250e8d8..dfffd48f0060 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -872,16 +872,9 @@ QDF_STATUS get_num_reg_dmn_pairs(int *num_reg_dmn) return QDF_STATUS_SUCCESS; } -QDF_STATUS get_default_country_2g(int *default_country) +QDF_STATUS get_default_country(uint16_t *default_country) { - *default_country = WORLD_2G_3; - - return QDF_STATUS_SUCCESS; -} - -QDF_STATUS get_default_country_5g(int *default_country) -{ - *default_country = WORLD_5G_2; + *default_country = CTRY_UNITED_STATES; return QDF_STATUS_SUCCESS; } diff --git a/umac/regulatory/core/src/reg_db.h b/umac/regulatory/core/src/reg_db.h index de96fb96e5f4..8565da839301 100644 --- a/umac/regulatory/core/src/reg_db.h +++ b/umac/regulatory/core/src/reg_db.h @@ -149,7 +149,6 @@ QDF_STATUS get_num_countries(int *num_countries); QDF_STATUS get_num_reg_dmn_pairs(int *num_reg_dmn); -QDF_STATUS get_default_country_2g(int *default_country); +QDF_STATUS get_default_country(uint16_t *default_country); -QDF_STATUS get_default_country_5g(int *default_country); #endif diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index b12a73b8faeb..3f34521a015f 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -118,6 +118,29 @@ QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha, return QDF_STATUS_SUCCESS; } +QDF_STATUS reg_get_rdpair_from_regdmn_id(uint16_t regdmn_id, + uint16_t *regdmn_pair) +{ + uint16_t j; + int num_reg_dmn; + + get_num_reg_dmn_pairs(&num_reg_dmn); + + for (j = 0; j < num_reg_dmn; j++) { + if (g_reg_dmn_pairs[j].reg_dmn_pair_id == regdmn_id) + break; + } + + if (j == num_reg_dmn) { + *regdmn_pair = -1; + return QDF_STATUS_E_FAILURE; + } + + *regdmn_pair = j; + + return QDF_STATUS_SUCCESS; +} + QDF_STATUS reg_get_rdpair_from_country_code(uint16_t cc, uint16_t *country_index, uint16_t *regdmn_pair) @@ -141,7 +164,7 @@ QDF_STATUS reg_get_rdpair_from_country_code(uint16_t cc, for (j = 0; j < num_reg_dmn; j++) { if (g_reg_dmn_pairs[j].reg_dmn_pair_id == - g_all_countries[i].reg_dmn_pair_id) + g_all_countries[i].reg_dmn_pair_id) break; } @@ -163,47 +186,46 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( { uint16_t i, j; uint8_t rule_size_2g, rule_size_5g; + uint8_t dmn_id_5g, dmn_id_2g; i = country_index; j = regdmn_pair; - rule_size_2g = QDF_ARRAY_SIZE( - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].reg_rule_id); - rule_size_5g = QDF_ARRAY_SIZE( - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].reg_rule_id); + dmn_id_5g = g_reg_dmn_pairs[j].dmn_id_5g; + dmn_id_2g = g_reg_dmn_pairs[j].dmn_id_2g; + + rule_size_2g = QDF_ARRAY_SIZE(regdomains_2g[dmn_id_2g].reg_rule_id); + rule_size_5g = QDF_ARRAY_SIZE(regdomains_5g[dmn_id_5g].reg_rule_id); if (((rule_size_2g + rule_size_5g) >= - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules) - ) { - reg_info->dfs_region = - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].dfs_region; + regdomains_2g[dmn_id_2g].num_reg_rules + + regdomains_5g[dmn_id_5g].num_reg_rules)) { + reg_info->dfs_region = regdomains_5g[dmn_id_5g].dfs_region; reg_info->phybitmap = g_all_countries[i].phymode_bitmap; reg_info->max_bw_2g = g_all_countries[i].max_bw_2g; reg_info->max_bw_5g = g_all_countries[i].max_bw_5g; - reg_info->min_bw_2g = - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].min_bw; - reg_info->min_bw_5g = - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].min_bw; + + reg_info->min_bw_2g = regdomains_2g[dmn_id_2g].min_bw; + reg_info->min_bw_5g = regdomains_5g[dmn_id_5g].min_bw; + reg_info->num_2g_reg_rules = - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules; + regdomains_2g[dmn_id_2g].num_reg_rules; reg_info->num_5g_reg_rules = - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules; + regdomains_5g[dmn_id_5g].num_reg_rules; reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_2g_reg_rules) * - sizeof(struct cur_reg_rule)); + qdf_mem_malloc((reg_info->num_2g_reg_rules) * + sizeof(struct cur_reg_rule)); reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_5g_reg_rules) * - sizeof(struct cur_reg_rule)); + qdf_mem_malloc((reg_info->num_5g_reg_rules) * + sizeof(struct cur_reg_rule)); - reg_regrules_assign(g_reg_dmn_pairs[j].dmn_id_2g, - g_reg_dmn_pairs[j].dmn_id_5g, reg_info); + reg_regrules_assign(dmn_id_2g, dmn_id_5g, reg_info); return QDF_STATUS_SUCCESS; } else if (!(((rule_size_2g + rule_size_5g) >= - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) + regdomains_2g[dmn_id_2g].num_reg_rules + + regdomains_5g[dmn_id_5g].num_reg_rules))) return QDF_STATUS_E_NOMEM; return QDF_STATUS_SUCCESS; @@ -215,98 +237,46 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( { uint16_t j; uint8_t rule_size_2g, rule_size_5g; + uint8_t dmn_id_5g, dmn_id_2g; j = regdmn_pair; - rule_size_2g = QDF_ARRAY_SIZE( - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].reg_rule_id); - rule_size_5g = QDF_ARRAY_SIZE( - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].reg_rule_id); + dmn_id_5g = g_reg_dmn_pairs[j].dmn_id_5g; + dmn_id_2g = g_reg_dmn_pairs[j].dmn_id_2g; + + rule_size_2g = QDF_ARRAY_SIZE(regdomains_2g[dmn_id_2g].reg_rule_id); + rule_size_5g = QDF_ARRAY_SIZE(regdomains_5g[dmn_id_5g].reg_rule_id); if (((rule_size_2g + rule_size_5g) >= - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules) - ) { + regdomains_2g[dmn_id_2g].num_reg_rules + + regdomains_5g[dmn_id_5g].num_reg_rules)) { - reg_info->dfs_region = - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].dfs_region; + reg_info->dfs_region = regdomains_5g[dmn_id_5g].dfs_region; reg_info->phybitmap = 0; reg_info->max_bw_2g = 40; reg_info->max_bw_5g = 160; - reg_info->min_bw_2g = - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].min_bw; - reg_info->min_bw_5g = - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].min_bw; + reg_info->min_bw_2g = regdomains_2g[dmn_id_2g].min_bw; + reg_info->min_bw_5g = regdomains_5g[dmn_id_5g].min_bw; + reg_info->num_2g_reg_rules = - regdomains_2g[g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules; + regdomains_2g[dmn_id_2g].num_reg_rules; reg_info->num_5g_reg_rules = - regdomains_5g[g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules; + regdomains_5g[dmn_id_5g].num_reg_rules; reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_2g_reg_rules) * - sizeof(struct cur_reg_rule)); + qdf_mem_malloc((reg_info->num_2g_reg_rules) * + sizeof(struct cur_reg_rule)); reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_5g_reg_rules) * - sizeof(struct cur_reg_rule)); + qdf_mem_malloc((reg_info->num_5g_reg_rules) * + sizeof(struct cur_reg_rule)); - reg_regrules_assign(g_reg_dmn_pairs[j].dmn_id_2g, - g_reg_dmn_pairs[j].dmn_id_5g, reg_info); - - return QDF_STATUS_SUCCESS; - } else if (!(((rule_size_2g + rule_size_5g) >= regdomains_2g[ - g_reg_dmn_pairs[j].dmn_id_2g].num_reg_rules + - regdomains_5g[ - g_reg_dmn_pairs[j].dmn_id_5g].num_reg_rules))) - return QDF_STATUS_E_NOMEM; - - return QDF_STATUS_SUCCESS; -} - -static inline QDF_STATUS reg_get_reginfo_for_default_regdmn_pair( - struct cur_regulatory_info *reg_info, - uint16_t regdmn_pair) -{ - int default_country_2g; - int default_country_5g; - uint8_t rule_size_2g, rule_size_5g; - - get_default_country_2g(&default_country_2g); - get_default_country_5g(&default_country_5g); - - rule_size_2g = - QDF_ARRAY_SIZE(regdomains_2g[default_country_2g].reg_rule_id); - rule_size_5g = - QDF_ARRAY_SIZE(regdomains_5g[default_country_5g].reg_rule_id); - - if (((rule_size_2g + rule_size_5g) >= - regdomains_2g[default_country_2g].num_reg_rules + - regdomains_5g[default_country_5g].num_reg_rules)) { - - reg_info->dfs_region = - regdomains_5g[default_country_5g].dfs_region; - reg_info->phybitmap = 0; - reg_info->max_bw_2g = 40; - reg_info->max_bw_5g = 160; - reg_info->min_bw_2g = regdomains_2g[default_country_2g].min_bw; - reg_info->min_bw_5g = regdomains_5g[default_country_5g].min_bw; - reg_info->num_2g_reg_rules = - regdomains_2g[default_country_2g].num_reg_rules; - reg_info->num_5g_reg_rules = - regdomains_5g[default_country_5g].num_reg_rules; - reg_info->reg_rules_2g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_2g_reg_rules) * - sizeof(struct cur_reg_rule)); - reg_info->reg_rules_5g_ptr = (struct cur_reg_rule *) - qdf_mem_malloc((reg_info->num_5g_reg_rules) * - sizeof(struct cur_reg_rule)); - - reg_regrules_assign(default_country_2g, - default_country_5g, reg_info); + reg_regrules_assign(dmn_id_2g, dmn_id_5g, reg_info); return QDF_STATUS_SUCCESS; } else if (!(((rule_size_2g + rule_size_5g) >= - regdomains_2g[default_country_2g].num_reg_rules + - regdomains_5g[default_country_5g].num_reg_rules))) + regdomains_2g[dmn_id_2g].num_reg_rules + + regdomains_5g[dmn_id_5g].num_reg_rules))) return QDF_STATUS_E_NOMEM; + return QDF_STATUS_SUCCESS; } @@ -321,15 +291,12 @@ QDF_STATUS reg_get_cur_reginfo(struct cur_regulatory_info *reg_info, reg_info, country_index, regdmn_pair); - else { - if (regdmn_pair != (uint16_t)(-1)) + else if (regdmn_pair != (uint16_t)(-1)) reg_get_reginfo_form_regdmn_pair( reg_info, regdmn_pair); - else - reg_get_reginfo_for_default_regdmn_pair( - reg_info); - } + else + return QDF_STATUS_E_FAILURE; return QDF_STATUS_SUCCESS; } diff --git a/umac/regulatory/core/src/reg_db_parser.h b/umac/regulatory/core/src/reg_db_parser.h index bb6f4c1789cf..f404415410e3 100644 --- a/umac/regulatory/core/src/reg_db_parser.h +++ b/umac/regulatory/core/src/reg_db_parser.h @@ -49,3 +49,5 @@ QDF_STATUS reg_get_rdpair_from_country_code(uint16_t cc, uint16_t *country_index, uint16_t *regdmn_pair); +QDF_STATUS reg_get_rdpair_from_regdmn_id(uint16_t regdmn_id, + uint16_t *regdmn_pair); diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 8211ea40d5ff..051d7d1db217 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -2016,3 +2016,72 @@ void reg_program_mas_chan_list(struct wlan_objmgr_psoc *psoc, NULL, 1, WLAN_REGULATORY_SB_ID); } + +QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, + uint16_t regdmn) +{ + struct wlan_regulatory_psoc_priv_obj *soc_reg; + struct cur_regulatory_info *reg_info; + uint16_t cc = -1; + uint16_t country_index = -1, regdmn_pair = -1; + QDF_STATUS err; + + soc_reg = (struct wlan_regulatory_psoc_priv_obj *) + wlan_objmgr_psoc_get_comp_private_obj(psoc, + WLAN_UMAC_COMP_REGULATORY); + + if (NULL == soc_reg) { + reg_err("reg soc is NULL"); + return QDF_STATUS_E_FAILURE; + } + + if (soc_reg->offload_enabled) + return QDF_STATUS_E_FAILURE; + + reg_info = (struct cur_regulatory_info *)qdf_mem_malloc + (sizeof(struct cur_regulatory_info)); + if (reg_info == NULL) { + reg_err("reg info is NULL"); + return QDF_STATUS_E_FAILURE; + } + + reg_info->psoc = psoc; + + if (regdmn == 0) { + get_default_country(®dmn); + regdmn |= COUNTRY_ERD_FLAG; + } + + if (regdmn & COUNTRY_ERD_FLAG) { + cc = regdmn & ~COUNTRY_ERD_FLAG; + + reg_get_rdpair_from_country_code(cc, + &country_index, + ®dmn_pair); + + err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair); + if (err == QDF_STATUS_E_FAILURE) { + reg_err("%s : Unable to set country code\n", __func__); + return QDF_STATUS_E_FAILURE; + } + + soc_reg->ctry_code = cc; + + } else { + reg_get_rdpair_from_regdmn_id(regdmn, + ®dmn_pair); + + err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair); + if (err == QDF_STATUS_E_FAILURE) { + reg_err("%s : Unable to set country code\n", __func__); + return QDF_STATUS_E_FAILURE; + } + + soc_reg->reg_dmn_pair = regdmn; + } + + reg_info->offload_enabled = false; + reg_process_master_chan_list(reg_info); + + return QDF_STATUS_SUCCESS; +} diff --git a/umac/regulatory/core/src/reg_services.h b/umac/regulatory/core/src/reg_services.h index f8170a491413..ad71d17ac2f5 100644 --- a/umac/regulatory/core/src/reg_services.h +++ b/umac/regulatory/core/src/reg_services.h @@ -66,6 +66,31 @@ - REG_CH_TO_FREQ(reg_get_chan_enum(curchan)) \ > REG_SBS_SEPARATION_THRESHOLD) +/* EEPROM setting is a country code */ +#define COUNTRY_ERD_FLAG 0x8000 + +/** + * enum cc_regdmn_flag: Regdomain flags + * @INVALID: Invalid flag + * @CC_IS_SET: Country code is set + * @REGDMN_IS_SET: Regdomain ID is set + * @ALPHA_IS_SET: Country ISO is set + */ +enum cc_regdmn_flag { + INVALID, + CC_IS_SET, + REGDMN_IS_SET, + ALPHA_IS_SET, +}; + +struct cc_regdmn_s { + union { + uint16_t country_code; + uint16_t regdmn_id; + uint8_t alpha[REG_ALPHA2_LEN + 1]; + } cc; + uint8_t flags; +}; extern const struct chan_map channel_map[NUM_CHANNELS]; @@ -199,4 +224,7 @@ void reg_program_mas_chan_list(struct wlan_objmgr_psoc *psoc, struct regulatory_channel *reg_channels, uint8_t *alpha2, enum dfs_reg dfs_region); + +QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, + uint16_t regdmn); #endif diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h index 0af8ff9f616f..63180b7ad3be 100644 --- a/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h +++ b/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h @@ -46,6 +46,9 @@ QDF_STATUS ucfg_reg_unregister_event_handler(uint8_t vdev_id, reg_event_cb cb, void *arg); QDF_STATUS ucfg_reg_init_handler(uint8_t pdev_id); +QDF_STATUS ucfg_reg_program_default_cc(struct wlan_objmgr_psoc *psoc, + uint16_t regdmn); + /** * ucfg_reg_set_config_vars () - Set the config vars in reg component * @psoc: psoc ptr diff --git a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c index 0ede9e922909..97e240311067 100644 --- a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c +++ b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c @@ -113,3 +113,9 @@ void ucfg_reg_program_mas_chan_list(struct wlan_objmgr_psoc *psoc, { reg_program_mas_chan_list(psoc, reg_channels, alpha2, dfs_region); } + +QDF_STATUS ucfg_reg_program_default_cc(struct wlan_objmgr_psoc *psoc, + uint16_t regdmn) +{ + return reg_program_default_cc(psoc, regdmn); +} From f9889e58d48d6210934fd78d435fec2f37609e04 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Fri, 5 May 2017 08:49:16 +0530 Subject: [PATCH 07/20] qcacmn: Set country code from ioctl The IOCTL may pass country ISO or country code or regDomain pair ID as input. In all 3 cases, get the regrules and build master channel list. Change-Id: I643734dff175709853cb013b9b58365cceffd5d4 CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db_parser.c | 34 +++++----- umac/regulatory/core/src/reg_services.c | 63 +++++++++++++++++++ umac/regulatory/core/src/reg_services.h | 3 + .../dispatcher/inc/wlan_reg_ucfg_api.h | 3 + .../dispatcher/src/wlan_reg_ucfg_api.c | 6 ++ 5 files changed, 93 insertions(+), 16 deletions(-) diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index 3f34521a015f..9f2f1c4b1e28 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -184,15 +184,11 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( uint16_t country_index, uint16_t regdmn_pair) { - uint16_t i, j; uint8_t rule_size_2g, rule_size_5g; uint8_t dmn_id_5g, dmn_id_2g; - i = country_index; - j = regdmn_pair; - - dmn_id_5g = g_reg_dmn_pairs[j].dmn_id_5g; - dmn_id_2g = g_reg_dmn_pairs[j].dmn_id_2g; + dmn_id_5g = g_reg_dmn_pairs[regdmn_pair].dmn_id_5g; + dmn_id_2g = g_reg_dmn_pairs[regdmn_pair].dmn_id_2g; rule_size_2g = QDF_ARRAY_SIZE(regdomains_2g[dmn_id_2g].reg_rule_id); rule_size_5g = QDF_ARRAY_SIZE(regdomains_5g[dmn_id_5g].reg_rule_id); @@ -200,10 +196,16 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( if (((rule_size_2g + rule_size_5g) >= regdomains_2g[dmn_id_2g].num_reg_rules + regdomains_5g[dmn_id_5g].num_reg_rules)) { + + qdf_mem_copy(reg_info->alpha2, + g_all_countries[country_index].alpha2, + sizeof(g_all_countries[country_index].alpha2)); + reg_info->dfs_region = regdomains_5g[dmn_id_5g].dfs_region; - reg_info->phybitmap = g_all_countries[i].phymode_bitmap; - reg_info->max_bw_2g = g_all_countries[i].max_bw_2g; - reg_info->max_bw_5g = g_all_countries[i].max_bw_5g; + reg_info->phybitmap = + g_all_countries[country_index].phymode_bitmap; + reg_info->max_bw_2g = g_all_countries[country_index].max_bw_2g; + reg_info->max_bw_5g = g_all_countries[country_index].max_bw_5g; reg_info->min_bw_2g = regdomains_2g[dmn_id_2g].min_bw; reg_info->min_bw_5g = regdomains_5g[dmn_id_5g].min_bw; @@ -235,13 +237,11 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( struct cur_regulatory_info *reg_info, uint16_t regdmn_pair) { - uint16_t j; uint8_t rule_size_2g, rule_size_5g; uint8_t dmn_id_5g, dmn_id_2g; - j = regdmn_pair; - dmn_id_5g = g_reg_dmn_pairs[j].dmn_id_5g; - dmn_id_2g = g_reg_dmn_pairs[j].dmn_id_2g; + dmn_id_5g = g_reg_dmn_pairs[regdmn_pair].dmn_id_5g; + dmn_id_2g = g_reg_dmn_pairs[regdmn_pair].dmn_id_2g; rule_size_2g = QDF_ARRAY_SIZE(regdomains_2g[dmn_id_2g].reg_rule_id); rule_size_5g = QDF_ARRAY_SIZE(regdomains_5g[dmn_id_5g].reg_rule_id); @@ -250,6 +250,8 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( regdomains_2g[dmn_id_2g].num_reg_rules + regdomains_5g[dmn_id_5g].num_reg_rules)) { + qdf_mem_zero(reg_info->alpha2, sizeof(reg_info->alpha2)); + reg_info->dfs_region = regdomains_5g[dmn_id_5g].dfs_region; reg_info->phybitmap = 0; reg_info->max_bw_2g = 40; @@ -292,9 +294,9 @@ QDF_STATUS reg_get_cur_reginfo(struct cur_regulatory_info *reg_info, country_index, regdmn_pair); else if (regdmn_pair != (uint16_t)(-1)) - reg_get_reginfo_form_regdmn_pair( - reg_info, - regdmn_pair); + reg_get_reginfo_form_regdmn_pair( + reg_info, + regdmn_pair); else return QDF_STATUS_E_FAILURE; diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 051d7d1db217..bbd2ed13e34f 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -2085,3 +2085,66 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_SUCCESS; } + +QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd) +{ + struct cur_regulatory_info *reg_info; + struct wlan_regulatory_psoc_priv_obj *soc_reg; + uint16_t country_index = -1, regdmn_pair = -1; + QDF_STATUS err; + + reg_info = (struct cur_regulatory_info *)qdf_mem_malloc + (sizeof(struct cur_regulatory_info)); + if (reg_info == NULL) { + reg_err("reg info is NULL"); + return QDF_STATUS_E_FAILURE; + } + + soc_reg = (struct wlan_regulatory_psoc_priv_obj *) + wlan_objmgr_psoc_get_comp_private_obj(psoc, + WLAN_UMAC_COMP_REGULATORY); + + if (NULL == soc_reg) { + reg_err("soc_reg is NULL"); + return QDF_STATUS_E_FAILURE; + } + + if (soc_reg->offload_enabled) + return QDF_STATUS_E_FAILURE; + + reg_info->psoc = psoc; + + if (rd->flags == CC_IS_SET) { + reg_get_rdpair_from_country_code(rd->cc.country_code, + &country_index, + ®dmn_pair); + } else if (rd->flags == ALPHA_IS_SET) { + reg_get_rdpair_from_country_iso(rd->cc.alpha, + &country_index, + ®dmn_pair); + } else if (rd->flags == REGDMN_IS_SET) { + reg_get_rdpair_from_regdmn_id(rd->cc.regdmn_id, + ®dmn_pair); + } + + err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair); + if (err == QDF_STATUS_E_FAILURE) { + reg_err("%s : Unable to set country code\n", __func__); + return QDF_STATUS_E_FAILURE; + } + + if (rd->flags == CC_IS_SET || + rd->flags == ALPHA_IS_SET) { + soc_reg->ctry_code = + g_all_countries[country_index].country_code; + } + + if (rd->flags == REGDMN_IS_SET) + soc_reg->reg_dmn_pair = rd->cc.regdmn_id; + + reg_info->offload_enabled = false; + reg_process_master_chan_list(reg_info); + + return QDF_STATUS_SUCCESS; +} diff --git a/umac/regulatory/core/src/reg_services.h b/umac/regulatory/core/src/reg_services.h index ad71d17ac2f5..5ef4100f7441 100644 --- a/umac/regulatory/core/src/reg_services.h +++ b/umac/regulatory/core/src/reg_services.h @@ -187,6 +187,9 @@ QDF_STATUS reg_get_current_chan_list(struct wlan_objmgr_pdev *pdev, struct regulatory_channel *chan_list); +QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd); + void reg_update_nol_ch(struct wlan_objmgr_pdev *pdev, uint8_t *ch_list, uint8_t num_ch, bool nol_ch); diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h index 63180b7ad3be..534e3b0f4eb2 100644 --- a/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h +++ b/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h @@ -49,6 +49,9 @@ QDF_STATUS ucfg_reg_init_handler(uint8_t pdev_id); QDF_STATUS ucfg_reg_program_default_cc(struct wlan_objmgr_psoc *psoc, uint16_t regdmn); +QDF_STATUS ucfg_reg_program_cc(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd); + /** * ucfg_reg_set_config_vars () - Set the config vars in reg component * @psoc: psoc ptr diff --git a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c index 97e240311067..05aaf3d99ca4 100644 --- a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c +++ b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c @@ -119,3 +119,9 @@ QDF_STATUS ucfg_reg_program_default_cc(struct wlan_objmgr_psoc *psoc, { return reg_program_default_cc(psoc, regdmn); } + +QDF_STATUS ucfg_reg_program_cc(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd) +{ + return reg_program_chan_list(psoc, rd); +} From 7644ff44b07e913da3d4a448271ae442a343fd64 Mon Sep 17 00:00:00 2001 From: "Pradhan, Abhijit" Date: Thu, 4 May 2017 19:48:31 +0530 Subject: [PATCH 08/20] qcacmn: Add antenna gain to per regdomain structure Antenna gains are added to per regdomain structure. Howerver, during parsing they are copied to per current reg rule and finally to per channel. Change-Id: Ib456248e2dee26ed3b2a9878d1b27fc5c9827e81 CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db.c | 72 ++++++++++++------------ umac/regulatory/core/src/reg_db.h | 1 + umac/regulatory/core/src/reg_db_parser.c | 21 ++++++- umac/regulatory/core/src/reg_db_parser.h | 2 + 4 files changed, 58 insertions(+), 38 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index dfffd48f0060..ae05b2853ae7 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -663,15 +663,15 @@ const struct regulatory_rule reg_rules_2g[] = { const struct regdomain regdomains_2g[] = { - [FCCA] = {CTL_FCC, DFS_UNINIT_REG, 0, 1, {CHAN_1_11_1} }, - [WORLD] = {CTL_ETSI, DFS_UNINIT_REG, 0, 1, {CHAN_1_13_1} }, - [MKKA] = {CTL_MKK, DFS_UNINIT_REG, 0, 2, {CHAN_1_13_1, CHAN_14_1} }, - [MKKC] = {CTL_MKK, DFS_UNINIT_REG, 0, 1, {CHAN_1_13_1} }, - [ETSIC] = {CTL_ETSI, DFS_UNINIT_REG, 0, 1, {CHAN_1_13_2} }, - [WORLD_2G_1] = {CTL_FCC, DFS_UNINIT_REG, 0, 1, {CHAN_1_11_2} }, - [WORLD_2G_2] = {CTL_FCC, DFS_UNINIT_REG, 0, 2, + [FCCA] = {CTL_FCC, DFS_UNINIT_REG, 0, 6, 1, {CHAN_1_11_1} }, + [WORLD] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_1} }, + [MKKA] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 2, {CHAN_1_13_1, CHAN_14_1} }, + [MKKC] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_1} }, + [ETSIC] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_2} }, + [WORLD_2G_1] = {CTL_FCC, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_11_2} }, + [WORLD_2G_2] = {CTL_FCC, DFS_UNINIT_REG, 0, 0, 2, {CHAN_1_11_2, CHAN_12_13_1} }, - [WORLD_2G_3] = {CTL_FCC, DFS_UNINIT_REG, 0, 3, + [WORLD_2G_3] = {CTL_FCC, DFS_UNINIT_REG, 0, 0, 3, {CHAN_1_11_2, CHAN_12_13_1, CHAN_14_2} }, }; @@ -745,115 +745,115 @@ const struct regulatory_rule reg_rules_5g[] = { const struct regdomain regdomains_5g[] = { - [FCC1] = {CTL_FCC, DFS_FCC_REG, 2, 3, {CHAN_5170_5250_1, + [FCC1] = {CTL_FCC, DFS_FCC_REG, 2, 6, 3, {CHAN_5170_5250_1, CHAN_5250_5330_1, CHAN_5735_5835_1} }, - [FCC2] = {CTL_FCC, DFS_CN_REG, 2, 3, {CHAN_5170_5250_2, + [FCC2] = {CTL_FCC, DFS_CN_REG, 2, 6, 3, {CHAN_5170_5250_2, CHAN_5250_5330_1, CHAN_5735_5835_1} }, - [FCC3] = {CTL_FCC, DFS_FCC_REG, 2, 4, {CHAN_5170_5250_2, + [FCC3] = {CTL_FCC, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_2, CHAN_5250_5330_1, CHAN_5490_5730_1, CHAN_5735_5835_1} }, - [FCC4] = {CTL_FCC, DFS_FCC_REG, 2, 4, {CHAN_4940_4990_1, + [FCC4] = {CTL_FCC, DFS_FCC_REG, 2, 6, 4, {CHAN_4940_4990_1, CHAN_5170_5250_1, CHAN_5250_5330_1, CHAN_5735_5835_1} }, - [FCC6] = {CTL_FCC, DFS_FCC_REG, 2, 5, {CHAN_5170_5250_2, + [FCC6] = {CTL_FCC, DFS_FCC_REG, 2, 6, 5, {CHAN_5170_5250_2, CHAN_5250_5330_1, CHAN_5490_5590_1, CHAN_5650_5730_1, CHAN_5735_5835_1} }, - [FCC8] = {CTL_FCC, DFS_FCC_REG, 2, 4, {CHAN_5170_5250_4, + [FCC8] = {CTL_FCC, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_4, CHAN_5250_5330_1, CHAN_5490_5730_1, CHAN_5735_5835_1} }, - [ETSI1] = {CTL_ETSI, DFS_ETSI_REG, 5, 3, {CHAN_5170_5250_2, + [ETSI1] = {CTL_ETSI, DFS_ETSI_REG, 5, 0, 3, {CHAN_5170_5250_2, CHAN_5250_5330_1, CHAN_5490_5710_1} }, - [ETSI3] = {CTL_ETSI, DFS_ETSI_REG, 5, 2, {CHAN_5170_5250_3, + [ETSI3] = {CTL_ETSI, DFS_ETSI_REG, 5, 0, 2, {CHAN_5170_5250_3, CHAN_5250_5330_2} }, - [ETSI4] = {CTL_ETSI, DFS_ETSI_REG, 5, 2, {CHAN_5170_5250_1, + [ETSI4] = {CTL_ETSI, DFS_ETSI_REG, 5, 0, 2, {CHAN_5170_5250_1, CHAN_5250_5330_3} }, - [ETSI8] = {CTL_ETSI, DFS_ETSI_REG, 20, 4, {CHAN_5170_5250_3, + [ETSI8] = {CTL_ETSI, DFS_ETSI_REG, 20, 0, 4, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_5490_5730_2, CHAN_5735_5835_2} }, - [ETSI9] = {CTL_ETSI, DFS_ETSI_REG, 20, 4, {CHAN_5170_5250_3, + [ETSI9] = {CTL_ETSI, DFS_ETSI_REG, 20, 0, 4, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_5490_5670_1, CHAN_5735_5835_3} }, - [APL1] = {CTL_ETSI, DFS_UNINIT_REG, 2, 1, {CHAN_5735_5835_2} }, + [APL1] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5835_2} }, - [APL2] = {CTL_ETSI, DFS_UNINIT_REG, 2, 1, {CHAN_5735_5815_1} }, + [APL2] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5815_1} }, - [APL4] = {CTL_ETSI, DFS_UNINIT_REG, 2, 2, {CHAN_5170_5250_2, + [APL4] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 2, {CHAN_5170_5250_2, CHAN_5735_5835_1} }, - [APL6] = {CTL_ETSI, DFS_ETSI_REG, 2, 3, {CHAN_5170_5250_3, + [APL6] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_5735_5835_3} }, - [APL8] = {CTL_ETSI, DFS_ETSI_REG, 2, 2, {CHAN_5250_5330_4, + [APL8] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 2, {CHAN_5250_5330_4, CHAN_5735_5835_2} }, - [APL9] = {CTL_ETSI, DFS_KR_REG, 2, 4, {CHAN_5170_5250_3, + [APL9] = {CTL_ETSI, DFS_KR_REG, 2, 6, 4, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_5490_5630_1, CHAN_5735_5815_1} }, - [APL10] = {CTL_ETSI, DFS_ETSI_REG, 2, 4, {CHAN_5170_5250_3, + [APL10] = {CTL_ETSI, DFS_ETSI_REG, 2, 6, 4, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_5490_5710_1, CHAN_5735_5815_1} }, - [APL12] = {CTL_ETSI, DFS_ETSI_REG, 2, 3, {CHAN_5170_5250_1, + [APL12] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_1, CHAN_5490_5570_1, CHAN_5735_5775_1} }, - [APL14] = {CTL_FCC, DFS_CN_REG, 2, 3, {CHAN_5170_5250_2, + [APL14] = {CTL_FCC, DFS_CN_REG, 2, 0, 3, {CHAN_5170_5250_2, CHAN_5250_5330_1, CHAN_5735_5835_4} }, - [MKK3] = {CTL_MKK, DFS_UNINIT_REG, 2, 1, {CHAN_5170_5250_3} }, + [MKK3] = {CTL_MKK, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5170_5250_3} }, - [MKK4] = {CTL_MKK, DFS_MKK_REG, 2, 2, {CHAN_5170_5250_3, + [MKK4] = {CTL_MKK, DFS_MKK_REG, 2, 0, 2, {CHAN_5170_5250_3, CHAN_5250_5330_2} }, - [MKK5] = {CTL_MKK, DFS_MKK_REG, 2, 3, {CHAN_5170_5250_3, + [MKK5] = {CTL_MKK, DFS_MKK_REG, 2, 0, 3, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_5490_5710_2} }, - [MKK9] = {CTL_MKK, DFS_UNINIT_REG, 2, 3, {CHAN_5170_5250_3, + [MKK9] = {CTL_MKK, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5250_3, CHAN_4910_4990_1, CHAN_5030_5090_1} }, - [MKK10] = {CTL_MKK, DFS_MKK_REG, 2, 4, {CHAN_5170_5250_3, + [MKK10] = {CTL_MKK, DFS_MKK_REG, 2, 0, 4, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_4910_4990_1, CHAN_5030_5090_1} }, - [MKK11] = {CTL_MKK, DFS_MKK_REG, 2, 5, {CHAN_5170_5250_3, + [MKK11] = {CTL_MKK, DFS_MKK_REG, 2, 0, 5, {CHAN_5170_5250_3, CHAN_5250_5330_2, CHAN_5490_5710_2, CHAN_4910_4990_1, CHAN_5030_5090_1} }, - [WORLD_5G_1] = {CTL_FCC, DFS_UNINIT_REG, 2, 2, {CHAN_5170_5330_1, + [WORLD_5G_1] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 2, {CHAN_5170_5330_1, CHAN_5735_5835_5} }, - [WORLD_5G_2] = {CTL_FCC, DFS_UNINIT_REG, 2, 3, {CHAN_5170_5330_1, + [WORLD_5G_2] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5330_1, CHAN_5490_5730_3, CHAN_5735_5835_5} }, }; diff --git a/umac/regulatory/core/src/reg_db.h b/umac/regulatory/core/src/reg_db.h index 8565da839301..9aa6a1a608c1 100644 --- a/umac/regulatory/core/src/reg_db.h +++ b/umac/regulatory/core/src/reg_db.h @@ -95,6 +95,7 @@ struct regdomain { uint8_t ctl_val; enum dfs_reg dfs_region; uint16_t min_bw; + uint8_t ant_gain; uint8_t num_reg_rules; uint8_t reg_rule_id[MAX_REG_RULES]; }; diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index 9f2f1c4b1e28..a642e32bf864 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -47,6 +47,8 @@ QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]) QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, uint8_t dmn_id_5g, + uint8_t ant_gain_2g, + uint8_t ant_gain_5g, struct cur_regulatory_info *reg_info) { @@ -62,6 +64,7 @@ QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, r_r_2g->max_bw = reg_rules_2g[rule_index].max_bw; r_r_2g->reg_power = reg_rules_2g[rule_index].reg_power; r_r_2g->flags = reg_rules_2g[rule_index].flags; + r_r_2g->ant_gain = ant_gain_2g; r_r_2g++; } @@ -72,6 +75,7 @@ QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, r_r_5g->max_bw = reg_rules_5g[rule_index].max_bw; r_r_5g->reg_power = reg_rules_5g[rule_index].reg_power; r_r_5g->flags = reg_rules_5g[rule_index].flags; + r_r_2g->ant_gain = ant_gain_5g; r_r_5g++; } @@ -186,6 +190,7 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( { uint8_t rule_size_2g, rule_size_5g; uint8_t dmn_id_5g, dmn_id_2g; + uint8_t ant_gain_2g, ant_gain_5g; dmn_id_5g = g_reg_dmn_pairs[regdmn_pair].dmn_id_5g; dmn_id_2g = g_reg_dmn_pairs[regdmn_pair].dmn_id_2g; @@ -204,12 +209,16 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( reg_info->dfs_region = regdomains_5g[dmn_id_5g].dfs_region; reg_info->phybitmap = g_all_countries[country_index].phymode_bitmap; + reg_info->max_bw_2g = g_all_countries[country_index].max_bw_2g; reg_info->max_bw_5g = g_all_countries[country_index].max_bw_5g; reg_info->min_bw_2g = regdomains_2g[dmn_id_2g].min_bw; reg_info->min_bw_5g = regdomains_5g[dmn_id_5g].min_bw; + ant_gain_2g = regdomains_2g[dmn_id_2g].ant_gain; + ant_gain_5g = regdomains_5g[dmn_id_5g].ant_gain; + reg_info->num_2g_reg_rules = regdomains_2g[dmn_id_2g].num_reg_rules; reg_info->num_5g_reg_rules = @@ -222,7 +231,8 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( qdf_mem_malloc((reg_info->num_5g_reg_rules) * sizeof(struct cur_reg_rule)); - reg_regrules_assign(dmn_id_2g, dmn_id_5g, reg_info); + reg_regrules_assign(dmn_id_2g, dmn_id_5g, + ant_gain_2g, ant_gain_5g, reg_info); return QDF_STATUS_SUCCESS; } else if (!(((rule_size_2g + rule_size_5g) >= @@ -239,6 +249,7 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( { uint8_t rule_size_2g, rule_size_5g; uint8_t dmn_id_5g, dmn_id_2g; + uint8_t ant_gain_2g, ant_gain_5g; dmn_id_5g = g_reg_dmn_pairs[regdmn_pair].dmn_id_5g; dmn_id_2g = g_reg_dmn_pairs[regdmn_pair].dmn_id_2g; @@ -254,11 +265,16 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( reg_info->dfs_region = regdomains_5g[dmn_id_5g].dfs_region; reg_info->phybitmap = 0; + reg_info->max_bw_2g = 40; reg_info->max_bw_5g = 160; + reg_info->min_bw_2g = regdomains_2g[dmn_id_2g].min_bw; reg_info->min_bw_5g = regdomains_5g[dmn_id_5g].min_bw; + ant_gain_2g = regdomains_2g[dmn_id_2g].ant_gain; + ant_gain_5g = regdomains_5g[dmn_id_5g].ant_gain; + reg_info->num_2g_reg_rules = regdomains_2g[dmn_id_2g].num_reg_rules; reg_info->num_5g_reg_rules = @@ -271,7 +287,8 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( qdf_mem_malloc((reg_info->num_5g_reg_rules) * sizeof(struct cur_reg_rule)); - reg_regrules_assign(dmn_id_2g, dmn_id_5g, reg_info); + reg_regrules_assign(dmn_id_2g, dmn_id_5g, + ant_gain_2g, ant_gain_5g, reg_info); return QDF_STATUS_SUCCESS; } else if (!(((rule_size_2g + rule_size_5g) >= diff --git a/umac/regulatory/core/src/reg_db_parser.h b/umac/regulatory/core/src/reg_db_parser.h index f404415410e3..f2257f1f6840 100644 --- a/umac/regulatory/core/src/reg_db_parser.h +++ b/umac/regulatory/core/src/reg_db_parser.h @@ -35,6 +35,8 @@ QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]); QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, uint8_t dmn_id_5g, + uint8_t ant_gain_2g, + uint8_t ant_gain_5g, struct cur_regulatory_info *reg_info); QDF_STATUS reg_get_cur_reginfo(struct cur_regulatory_info *reg_info, From ae499840fc25437350c472ca150849371abd851f Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Fri, 5 May 2017 08:55:10 +0530 Subject: [PATCH 09/20] qcacmn: Regdb Kernel panic fixed Some countries have no reg rules. Check is added to avoid NULL pointer dereference in cur_reg_rule. Change-Id: I1840ca85121f0f61abab8fcf288fdde6a9ca22c5 CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db_parser.c | 28 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index a642e32bf864..b03c15a17a5e 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -25,6 +25,7 @@ #include #include "reg_db_parser.h" #include +#include "reg_priv.h" QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]) { @@ -79,6 +80,10 @@ QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g, r_r_5g++; } + if ((r_r_2g == reg_info->reg_rules_2g_ptr) && + (r_r_5g == reg_info->reg_rules_5g_ptr)) + return QDF_STATUS_E_FAILURE; + return QDF_STATUS_SUCCESS; } @@ -191,6 +196,7 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( uint8_t rule_size_2g, rule_size_5g; uint8_t dmn_id_5g, dmn_id_2g; uint8_t ant_gain_2g, ant_gain_5g; + QDF_STATUS err; dmn_id_5g = g_reg_dmn_pairs[regdmn_pair].dmn_id_5g; dmn_id_2g = g_reg_dmn_pairs[regdmn_pair].dmn_id_2g; @@ -231,9 +237,15 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( qdf_mem_malloc((reg_info->num_5g_reg_rules) * sizeof(struct cur_reg_rule)); - reg_regrules_assign(dmn_id_2g, dmn_id_5g, + err = reg_regrules_assign(dmn_id_2g, dmn_id_5g, ant_gain_2g, ant_gain_5g, reg_info); + if (err == QDF_STATUS_E_FAILURE) { + reg_err("%s : No rule found for country index = %d regdmn_pair = %d\n", + __func__, country_index, regdmn_pair); + return QDF_STATUS_E_FAILURE; + } + return QDF_STATUS_SUCCESS; } else if (!(((rule_size_2g + rule_size_5g) >= regdomains_2g[dmn_id_2g].num_reg_rules + @@ -250,6 +262,7 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( uint8_t rule_size_2g, rule_size_5g; uint8_t dmn_id_5g, dmn_id_2g; uint8_t ant_gain_2g, ant_gain_5g; + QDF_STATUS err; dmn_id_5g = g_reg_dmn_pairs[regdmn_pair].dmn_id_5g; dmn_id_2g = g_reg_dmn_pairs[regdmn_pair].dmn_id_2g; @@ -287,8 +300,13 @@ static inline QDF_STATUS reg_get_reginfo_form_regdmn_pair( qdf_mem_malloc((reg_info->num_5g_reg_rules) * sizeof(struct cur_reg_rule)); - reg_regrules_assign(dmn_id_2g, dmn_id_5g, + err = reg_regrules_assign(dmn_id_2g, dmn_id_5g, ant_gain_2g, ant_gain_5g, reg_info); + if (err == QDF_STATUS_E_FAILURE) { + reg_err("%s : No rule found for regdmn_pair = %d\n", + __func__, regdmn_pair); + return QDF_STATUS_E_FAILURE; + } return QDF_STATUS_SUCCESS; } else if (!(((rule_size_2g + rule_size_5g) >= @@ -305,13 +323,13 @@ QDF_STATUS reg_get_cur_reginfo(struct cur_regulatory_info *reg_info, uint16_t regdmn_pair) { if ((country_index != (uint16_t)(-1)) && - (regdmn_pair != (uint16_t)(-1))) - reg_get_reginfo_form_country_code_and_regdmn_pair( + (regdmn_pair != (uint16_t)(-1))) + return reg_get_reginfo_form_country_code_and_regdmn_pair( reg_info, country_index, regdmn_pair); else if (regdmn_pair != (uint16_t)(-1)) - reg_get_reginfo_form_regdmn_pair( + return reg_get_reginfo_form_regdmn_pair( reg_info, regdmn_pair); else From 03816f37426eed8e27e77208ac9d1a85d37b3300 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Fri, 5 May 2017 09:02:11 +0530 Subject: [PATCH 10/20] qcacmn: Fix memory leak during channel list building Free the reg rule pointers while handing error conditions. Also free pointers when channel list building is completed. Change-Id: I4c8d67ae191f86175f9cc684ba703fea11e66f1f CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_services.c | 30 +++++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index bbd2ed13e34f..329711bddf15 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -2062,6 +2062,9 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair); if (err == QDF_STATUS_E_FAILURE) { reg_err("%s : Unable to set country code\n", __func__); + qdf_mem_free(reg_info->reg_rules_2g_ptr); + qdf_mem_free(reg_info->reg_rules_5g_ptr); + qdf_mem_free(reg_info); return QDF_STATUS_E_FAILURE; } @@ -2074,6 +2077,9 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair); if (err == QDF_STATUS_E_FAILURE) { reg_err("%s : Unable to set country code\n", __func__); + qdf_mem_free(reg_info->reg_rules_2g_ptr); + qdf_mem_free(reg_info->reg_rules_5g_ptr); + qdf_mem_free(reg_info); return QDF_STATUS_E_FAILURE; } @@ -2083,6 +2089,10 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, reg_info->offload_enabled = false; reg_process_master_chan_list(reg_info); + qdf_mem_free(reg_info->reg_rules_2g_ptr); + qdf_mem_free(reg_info->reg_rules_5g_ptr); + qdf_mem_free(reg_info); + return QDF_STATUS_SUCCESS; } @@ -2094,13 +2104,6 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc, uint16_t country_index = -1, regdmn_pair = -1; QDF_STATUS err; - reg_info = (struct cur_regulatory_info *)qdf_mem_malloc - (sizeof(struct cur_regulatory_info)); - if (reg_info == NULL) { - reg_err("reg info is NULL"); - return QDF_STATUS_E_FAILURE; - } - soc_reg = (struct wlan_regulatory_psoc_priv_obj *) wlan_objmgr_psoc_get_comp_private_obj(psoc, WLAN_UMAC_COMP_REGULATORY); @@ -2113,6 +2116,13 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc, if (soc_reg->offload_enabled) return QDF_STATUS_E_FAILURE; + reg_info = (struct cur_regulatory_info *)qdf_mem_malloc + (sizeof(struct cur_regulatory_info)); + if (reg_info == NULL) { + reg_err("reg info is NULL"); + return QDF_STATUS_E_FAILURE; + } + reg_info->psoc = psoc; if (rd->flags == CC_IS_SET) { @@ -2131,6 +2141,9 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc, err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair); if (err == QDF_STATUS_E_FAILURE) { reg_err("%s : Unable to set country code\n", __func__); + qdf_mem_free(reg_info->reg_rules_2g_ptr); + qdf_mem_free(reg_info->reg_rules_5g_ptr); + qdf_mem_free(reg_info); return QDF_STATUS_E_FAILURE; } @@ -2145,6 +2158,9 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc, reg_info->offload_enabled = false; reg_process_master_chan_list(reg_info); + qdf_mem_free(reg_info->reg_rules_2g_ptr); + qdf_mem_free(reg_info->reg_rules_5g_ptr); + qdf_mem_free(reg_info); return QDF_STATUS_SUCCESS; } From 08fd8610b3c608dd1cdff48b5d0b84e3a75c025e Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Fri, 5 May 2017 09:03:58 +0530 Subject: [PATCH 11/20] qcacmn: Added API to get the current country code API is added to get the current country code from Regdb component. Change-Id: I9c9e7027c9e99f31f72d4a0222d4db1dfa8a7baa CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db.c | 6 ++--- umac/regulatory/core/src/reg_db.h | 6 ++--- umac/regulatory/core/src/reg_db_parser.c | 12 ++++----- umac/regulatory/core/src/reg_services.c | 26 ++++++++++++++++++- umac/regulatory/core/src/reg_services.h | 3 +++ .../dispatcher/inc/wlan_reg_ucfg_api.h | 3 +++ .../dispatcher/src/wlan_reg_ucfg_api.c | 6 +++++ 7 files changed, 49 insertions(+), 13 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index ae05b2853ae7..e0d8a40d3959 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -858,21 +858,21 @@ const struct regdomain regdomains_5g[] = { CHAN_5735_5835_5} }, }; -QDF_STATUS get_num_countries(int *num_countries) +QDF_STATUS reg_get_num_countries(int *num_countries) { *num_countries = QDF_ARRAY_SIZE(g_all_countries); return QDF_STATUS_SUCCESS; } -QDF_STATUS get_num_reg_dmn_pairs(int *num_reg_dmn) +QDF_STATUS reg_get_num_reg_dmn_pairs(int *num_reg_dmn) { *num_reg_dmn = QDF_ARRAY_SIZE(g_reg_dmn_pairs); return QDF_STATUS_SUCCESS; } -QDF_STATUS get_default_country(uint16_t *default_country) +QDF_STATUS reg_get_default_country(uint16_t *default_country) { *default_country = CTRY_UNITED_STATES; diff --git a/umac/regulatory/core/src/reg_db.h b/umac/regulatory/core/src/reg_db.h index 9aa6a1a608c1..51844e59eff0 100644 --- a/umac/regulatory/core/src/reg_db.h +++ b/umac/regulatory/core/src/reg_db.h @@ -146,10 +146,10 @@ enum ctl_value { CTL_NONE = 0xff }; -QDF_STATUS get_num_countries(int *num_countries); +QDF_STATUS reg_get_num_countries(int *num_countries); -QDF_STATUS get_num_reg_dmn_pairs(int *num_reg_dmn); +QDF_STATUS reg_get_num_reg_dmn_pairs(int *num_reg_dmn); -QDF_STATUS get_default_country(uint16_t *default_country); +QDF_STATUS reg_get_default_country(uint16_t *default_country); #endif diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index b03c15a17a5e..41142f911022 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -32,7 +32,7 @@ QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]) uint16_t i; int num_countries; - get_num_countries(&num_countries); + reg_get_num_countries(&num_countries); for (i = 0; i < num_countries; i++) { if ((g_all_countries[i].alpha2[0] == alpha[0]) && @@ -95,8 +95,8 @@ QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha, int num_countries; int num_reg_dmn; - get_num_countries(&num_countries); - get_num_reg_dmn_pairs(&num_reg_dmn); + reg_get_num_countries(&num_countries); + reg_get_num_reg_dmn_pairs(&num_reg_dmn); for (i = 0; i < num_countries; i++) { if ((g_all_countries[i].alpha2[0] == alpha[0]) && @@ -133,7 +133,7 @@ QDF_STATUS reg_get_rdpair_from_regdmn_id(uint16_t regdmn_id, uint16_t j; int num_reg_dmn; - get_num_reg_dmn_pairs(&num_reg_dmn); + reg_get_num_reg_dmn_pairs(&num_reg_dmn); for (j = 0; j < num_reg_dmn; j++) { if (g_reg_dmn_pairs[j].reg_dmn_pair_id == regdmn_id) @@ -158,8 +158,8 @@ QDF_STATUS reg_get_rdpair_from_country_code(uint16_t cc, int num_countries; int num_reg_dmn; - get_num_countries(&num_countries); - get_num_reg_dmn_pairs(&num_reg_dmn); + reg_get_num_countries(&num_countries); + reg_get_num_reg_dmn_pairs(&num_reg_dmn); for (i = 0; i < num_countries; i++) { if (g_all_countries[i].country_code == cc) diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 329711bddf15..8376a957aaf4 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -2048,7 +2048,7 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, reg_info->psoc = psoc; if (regdmn == 0) { - get_default_country(®dmn); + reg_get_default_country(®dmn); regdmn |= COUNTRY_ERD_FLAG; } @@ -2164,3 +2164,27 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_SUCCESS; } + +QDF_STATUS reg_get_current_cc(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd) +{ + struct wlan_regulatory_psoc_priv_obj *soc_reg; + + soc_reg = (struct wlan_regulatory_psoc_priv_obj *) + wlan_objmgr_psoc_get_comp_private_obj(psoc, + WLAN_UMAC_COMP_REGULATORY); + + if (NULL == soc_reg) { + reg_err("reg soc is NULL"); + return QDF_STATUS_E_FAILURE; + } + + if (soc_reg->offload_enabled) + return QDF_STATUS_E_FAILURE; + + if (rd->flags == CC_IS_SET) { + rd->cc.country_code = soc_reg->ctry_code; + } + + return QDF_STATUS_SUCCESS; +} diff --git a/umac/regulatory/core/src/reg_services.h b/umac/regulatory/core/src/reg_services.h index 5ef4100f7441..d5e49fbced2a 100644 --- a/umac/regulatory/core/src/reg_services.h +++ b/umac/regulatory/core/src/reg_services.h @@ -230,4 +230,7 @@ void reg_program_mas_chan_list(struct wlan_objmgr_psoc *psoc, QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc, uint16_t regdmn); + +QDF_STATUS reg_get_current_cc(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd); #endif diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h index 534e3b0f4eb2..f6abfd1db6bc 100644 --- a/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h +++ b/umac/regulatory/dispatcher/inc/wlan_reg_ucfg_api.h @@ -52,6 +52,9 @@ QDF_STATUS ucfg_reg_program_default_cc(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_reg_program_cc(struct wlan_objmgr_psoc *psoc, struct cc_regdmn_s *rd); +QDF_STATUS ucfg_reg_get_current_cc(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd); + /** * ucfg_reg_set_config_vars () - Set the config vars in reg component * @psoc: psoc ptr diff --git a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c index 05aaf3d99ca4..51fa77dcaa2c 100644 --- a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c +++ b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c @@ -125,3 +125,9 @@ QDF_STATUS ucfg_reg_program_cc(struct wlan_objmgr_psoc *psoc, { return reg_program_chan_list(psoc, rd); } + +QDF_STATUS ucfg_reg_get_current_cc(struct wlan_objmgr_psoc *psoc, + struct cc_regdmn_s *rd) +{ + return reg_get_current_cc(psoc, rd); +} From dedc15dc74c4fc18a2bd8a1a3b2642a2043bfd95 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Fri, 5 May 2017 09:06:14 +0530 Subject: [PATCH 12/20] qcacmn: Add API to get country ISO API is added to get country ISO from regDB component. Change-Id: I264fa4ffaa87127895613ab397efbb416c440f75 CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_services.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 8376a957aaf4..a10a2f49b16b 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -2184,6 +2184,9 @@ QDF_STATUS reg_get_current_cc(struct wlan_objmgr_psoc *psoc, if (rd->flags == CC_IS_SET) { rd->cc.country_code = soc_reg->ctry_code; + } else if (rd->flags == ALPHA_IS_SET) { + qdf_mem_copy(rd->cc.alpha, soc_reg->current_country, + sizeof(rd->cc.alpha)); } return QDF_STATUS_SUCCESS; From 0e5c6c7ec7cef61902d254f317d7ee3986d05d37 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Wed, 3 May 2017 17:32:53 +0530 Subject: [PATCH 13/20] qcacmn: Add API get Regdomain ID API is added to get Regdomain ID from Regdb component. Change-Id: I78424fa4b608d00cb44033a5860403b19da0b9c8 CRs-Fixed: 2002892 --- umac/regulatory/core/src/reg_db.c | 24 ++++++++++++------------ umac/regulatory/core/src/reg_services.c | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index e0d8a40d3959..997997838418 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -623,18 +623,18 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = { {MKK11_FCCA, MKK11, FCCA}, {MKK11_MKKC, MKK11, MKKC}, - {WORLD_60, WORLD_2G_3, WORLD_5G_2}, - {WORLD_61, WORLD_2G_3, WORLD_5G_2}, - {WORLD_62, WORLD_2G_3, WORLD_5G_2}, - {WORLD_63, WORLD_2G_2, WORLD_5G_1}, - {WORLD_65, WORLD_2G_2, WORLD_5G_1}, - {WORLD_64, WORLD_2G_1, WORLD_5G_1}, - {WORLD_66, WORLD_2G_1, WORLD_5G_2}, - {WORLD_69, WORLD_2G_1, WORLD_5G_2}, - {WORLD_67, WORLD_2G_2, WORLD_5G_2}, - {WORLD_68, WORLD_2G_2, WORLD_5G_2}, - {WORLD_6A, WORLD_2G_2, WORLD_5G_2}, - {WORLD_6C, WORLD_2G_2, WORLD_5G_2}, + {WORLD_60, WORLD_5G_2, WORLD_2G_3}, + {WORLD_61, WORLD_5G_2, WORLD_2G_3}, + {WORLD_62, WORLD_5G_2, WORLD_2G_3}, + {WORLD_63, WORLD_5G_1, WORLD_2G_2}, + {WORLD_65, WORLD_5G_1, WORLD_2G_2}, + {WORLD_64, WORLD_5G_1, WORLD_2G_1}, + {WORLD_66, WORLD_5G_2, WORLD_2G_1}, + {WORLD_69, WORLD_5G_2, WORLD_2G_1}, + {WORLD_67, WORLD_5G_2, WORLD_2G_2}, + {WORLD_68, WORLD_5G_2, WORLD_2G_2}, + {WORLD_6A, WORLD_5G_2, WORLD_2G_2}, + {WORLD_6C, WORLD_5G_2, WORLD_2G_2}, }; enum reg_rules_2g { diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index a10a2f49b16b..7c30cf5e3688 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -2187,6 +2187,8 @@ QDF_STATUS reg_get_current_cc(struct wlan_objmgr_psoc *psoc, } else if (rd->flags == ALPHA_IS_SET) { qdf_mem_copy(rd->cc.alpha, soc_reg->current_country, sizeof(rd->cc.alpha)); + } else if (rd->flags == REGDMN_IS_SET) { + rd->cc.regdmn_id = soc_reg->reg_dmn_pair; } return QDF_STATUS_SUCCESS; From 922d5a4dbf34e8bc70bd03916c8ce38398a7dbab Mon Sep 17 00:00:00 2001 From: Ashok Ponnaiah Date: Tue, 25 Apr 2017 16:52:02 +0530 Subject: [PATCH 14/20] qcacmn: Add NULL check for regulatory tx ops Add NULL check for regulatory tx ops Change-Id: Ib2cc4c795948111c9405ae14de66ad1ab5ccbdd8 --- umac/regulatory/dispatcher/src/wlan_reg_services_api.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c index e182e5d1e83b..b53c6dd32962 100644 --- a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c +++ b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c @@ -347,7 +347,8 @@ QDF_STATUS regulatory_psoc_open(struct wlan_objmgr_psoc *psoc) struct wlan_lmac_if_reg_tx_ops *tx_ops; tx_ops = get_reg_psoc_tx_ops(psoc); - tx_ops->register_master_handler(psoc, NULL); + if (tx_ops->register_master_handler) + tx_ops->register_master_handler(psoc, NULL); return QDF_STATUS_SUCCESS; }; @@ -357,7 +358,8 @@ QDF_STATUS regulatory_psoc_close(struct wlan_objmgr_psoc *psoc) struct wlan_lmac_if_reg_tx_ops *tx_ops; tx_ops = get_reg_psoc_tx_ops(psoc); - tx_ops->unregister_master_handler(psoc, NULL); + if (tx_ops->unregister_master_handler) + tx_ops->unregister_master_handler(psoc, NULL); return QDF_STATUS_SUCCESS; }; From 2563e838ea1e04368067a7c8180be7fb9f30e7c3 Mon Sep 17 00:00:00 2001 From: Ajit Pal Singh Date: Thu, 4 May 2017 22:58:42 +0530 Subject: [PATCH 15/20] qcacmn: Use macro WLAN_POLICY_MGR_ENABLE around policy_mgr API usage Policy manager API usage in common scan module should be enclosed in macro WLAN_POLICY_MGR_ENABLE, so that it can be optionally used along with policy manager. Change-Id: I76602657b4945a973f30d6b129a6b3896b9fdf9e CRs-Fixed: 2042734 --- os_if/linux/scan/src/wlan_cfg80211_scan.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index 63269b128d0a..eac5daf29a14 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -34,7 +34,9 @@ #include #include #include +#ifdef WLAN_POLICY_MGR_ENABLE #include +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) static uint32_t hdd_config_sched_scan_start_delay( @@ -973,17 +975,19 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev, if (request->n_channels) { char chl[(request->n_channels * 5) + 1]; int len = 0; +#ifdef WLAN_POLICY_MGR_ENABLE bool ap_or_go_present = policy_mgr_mode_specific_connection_count( psoc, QDF_SAP_MODE, NULL) || policy_mgr_mode_specific_connection_count( psoc, QDF_P2P_GO_MODE, NULL); +#endif for (i = 0; i < request->n_channels; i++) { channel = request->channels[i]->hw_value; if (wlan_is_dsrc_channel(wlan_chan_to_freq(channel))) continue; - +#ifdef WLAN_POLICY_MGR_ENABLE if (ap_or_go_present) { bool ok; int ret; @@ -1001,6 +1005,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev, if (!ok) continue; } +#endif len += snprintf(chl + len, 5, "%d ", channel); req->scan_req.chan_list[i] = wlan_chan_to_freq(channel); From e8deb197cf242bcf83011b3f91e39111a4ae52b8 Mon Sep 17 00:00:00 2001 From: SaidiReddy Yenuga Date: Mon, 17 Apr 2017 16:53:30 +0530 Subject: [PATCH 16/20] qcacmn: Add missing vendor commands and attributes to host from hostapd Few vendor commands are missing in qca_vendor.h, compared to qca-vendor.h file present in hostapd. Add the missing vendor commands and attributes in driver qca_vendor.h file. CRs-Fixed: 2034479 Change-Id: Ib95e6cbbf163b904a22fb4eb65d96e9ff8dddf49 --- os_if/linux/qca_vendor.h | 2347 +++++++++++++++++++++++++++++--------- 1 file changed, 1788 insertions(+), 559 deletions(-) diff --git a/os_if/linux/qca_vendor.h b/os_if/linux/qca_vendor.h index 7a84ce2cdef2..596ff094aa07 100644 --- a/os_if/linux/qca_vendor.h +++ b/os_if/linux/qca_vendor.h @@ -183,6 +183,41 @@ * enum qca_vendor_attr_sar_limits attributes are used with this command. * @QCA_NL80211_VENDOR_SUBCMD_EXTERNAL_ACS: Vendor command used to get/set * configuration of vendor ACS. + * @QCA_NL80211_VENDOR_SUBCMD_CHIP_PWRSAVE_FAILURE: Vendor event carrying the + * requisite information leading to a power save failure. The information + * carried as part of this event is represented by the + * enum qca_attr_chip_power_save_failure attributes. + * @QCA_NL80211_VENDOR_SUBCMD_NUD_STATS_SET: Start/Stop the NUD statistics + * collection. Uses attributes defined in enum qca_attr_nud_stats_set. + * @QCA_NL80211_VENDOR_SUBCMD_NUD_STATS_GET: Get the NUD statistics. These + * statistics are represented by the enum qca_attr_nud_stats_get + * attributes. + * @QCA_NL80211_VENDOR_SUBCMD_FETCH_BSS_TRANSITION_STATUS: Sub-command to fetch + * the BSS transition status, whether accept or reject, for a list of + * candidate BSSIDs provided by the userspace. This uses the vendor + * attributes QCA_WLAN_VENDOR_ATTR_BTM_MBO_TRANSITION_REASON and + * QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO. The userspace shall specify + * the attributes QCA_WLAN_VENDOR_ATTR_BTM_MBO_TRANSITION_REASON and an + * array of QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_BSSID nested in + * QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO in the request. In the response + * the driver shall specify array of + * QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_BSSID and + * QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_STATUS pairs nested in + * QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO. + * @QCA_NL80211_VENDOR_SUBCMD_SET_TRACE_LEVEL: Set the trace level for a + * specific QCA module. The trace levels are represented by + * enum qca_attr_trace_level attributes. + * @QCA_NL80211_VENDOR_SUBCMD_BRP_SET_ANT_LIMIT: Set the Beam Refinement + * Protocol antenna limit in different modes. See enum + * qca_wlan_vendor_attr_brp_ant_limit_mode. + * @QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START: Start spectral scan. The scan + * parameters are specified by enum qca_wlan_vendor_attr_spectral_scan. + * This returns a cookie (%QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_COOKIE) + * identifying the operation in success case. + * @QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_STOP: Stop spectral scan. This uses + * a cookie (%QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_COOKIE) from + * @QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START to identify the scan to + * be stopped. */ enum qca_nl80211_vendor_subcmds { @@ -233,6 +268,7 @@ enum qca_nl80211_vendor_subcmds { QCA_NL80211_VENDOR_SUBCMD_KEY_MGMT_SET_KEY = 50, QCA_NL80211_VENDOR_SUBCMD_KEY_MGMT_ROAM_AUTH = 51, + QCA_NL80211_VENDOR_SUBCMD_APFIND = 52, /* Deprecated */ QCA_NL80211_VENDOR_SUBCMD_OCB_SET_SCHED = 53, @@ -281,6 +317,7 @@ enum qca_nl80211_vendor_subcmds { QCA_NL80211_VENDOR_SUBCMD_GET_WAKE_REASON_STATS = 85, + QCA_NL80211_VENDOR_SUBCMD_DATA_OFFLOAD = 91, /* OCB commands */ QCA_NL80211_VENDOR_SUBCMD_OCB_SET_CONFIG = 92, QCA_NL80211_VENDOR_SUBCMD_OCB_SET_UTC_TIME = 93, @@ -325,11 +362,29 @@ enum qca_nl80211_vendor_subcmds { QCA_NL80211_VENDOR_SUBCMD_SAP_CONDITIONAL_CHAN_SWITCH = 124, QCA_NL80211_VENDOR_SUBCMD_GPIO_CONFIG_COMMAND = 125, + QCA_NL80211_VENDOR_SUBCMD_GET_HW_CAPABILITY = 126, QCA_NL80211_VENDOR_SUBCMD_LL_STATS_EXT = 127, + /* FTM/indoor location subcommands */ + QCA_NL80211_VENDOR_SUBCMD_LOC_GET_CAPA = 128, + QCA_NL80211_VENDOR_SUBCMD_FTM_START_SESSION = 129, + QCA_NL80211_VENDOR_SUBCMD_FTM_ABORT_SESSION = 130, + QCA_NL80211_VENDOR_SUBCMD_FTM_MEAS_RESULT = 131, + QCA_NL80211_VENDOR_SUBCMD_FTM_SESSION_DONE = 132, + QCA_NL80211_VENDOR_SUBCMD_FTM_CFG_RESPONDER = 133, + QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS = 134, + QCA_NL80211_VENDOR_SUBCMD_AOA_ABORT_MEAS = 135, + QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS_RESULT = 136, /* Encrypt/Decrypt command */ QCA_NL80211_VENDOR_SUBCMD_ENCRYPTION_TEST = 137, + QCA_NL80211_VENDOR_SUBCMD_GET_CHAIN_RSSI = 138, + /* DMG low level RF sector operations */ + QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SECTOR_CFG = 139, + QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SECTOR_CFG = 140, + QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SELECTED_SECTOR = 141, + QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SELECTED_SECTOR = 142, + /* Configure the TDLS mode from user space */ QCA_NL80211_VENDOR_SUBCMD_CONFIGURE_TDLS = 143, @@ -344,8 +399,18 @@ enum qca_nl80211_vendor_subcmds { /* External Auto channel configuration setting */ QCA_NL80211_VENDOR_SUBCMD_EXTERNAL_ACS = 147, + QCA_NL80211_VENDOR_SUBCMD_CHIP_PWRSAVE_FAILURE = 148, + QCA_NL80211_VENDOR_SUBCMD_NUD_STATS_SET = 149, + QCA_NL80211_VENDOR_SUBCMD_NUD_STATS_GET = 150, + QCA_NL80211_VENDOR_SUBCMD_FETCH_BSS_TRANSITION_STATUS = 151, + /* Set the trace level for QDF */ QCA_NL80211_VENDOR_SUBCMD_SET_TRACE_LEVEL = 152, + + QCA_NL80211_VENDOR_SUBCMD_BRP_SET_ANT_LIMIT = 153, + + QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START = 154, + QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_STOP = 155, }; /** @@ -777,40 +842,206 @@ enum qca_wlan_vendor_attr_get_tdls_capabilities { QCA_WLAN_VENDOR_ATTR_TDLS_GET_CAPS_AFTER_LAST - 1, }; -/** - * enum qca_wlan_vendor_attr - wlan vendor attribute - * - * @QCA_WLAN_VENDOR_ATTR_INVALID: Initial invalid value - * @QCA_WLAN_VENDOR_ATTR_DFS: DFS attribute which is used by - * QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY - * @QCA_WLAN_VENDOR_ATTR_NAN: NAN attribute which is used by - * QCA_NL80211_VENDOR_SUBCMD_NAN - * @QCA_WLAN_VENDOR_ATTR_STATS_EXT: Ext stats attribute which is used by - * QCA_NL80211_VENDOR_SUBCMD_STATS_EXT - * @QCA_WLAN_VENDOR_ATTR_IFINDEX: After IFINDEX - * @QCA_WLAN_VENDOR_ATTR_ROAMING_POLICY: Roaming policy which is used by - * QCA_NL80211_VENDOR_SUBCMD_ROAMING - * @QCA_WLAN_VENDOR_ATTR_MAC_ADDR: MAC Address attribute which is used by - * QCA_NL80211_VENDOR_SUBCMD_LINK_PROPERTIES - * @QCA_WLAN_VENDOR_ATTR_FEATURE_FLAGS: Supported Features - *@QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE: setband attribute which is used by - * QCA_NL80211_VENDOR_SUBCMD_SETBAND - * @QCA_WLAN_VENDOR_ATTR_AFTER_LAST: After last - * @QCA_WLAN_VENDOR_ATTR_MAX: Max value - */ enum qca_wlan_vendor_attr { QCA_WLAN_VENDOR_ATTR_INVALID = 0, - QCA_WLAN_VENDOR_ATTR_DFS = 1, - QCA_WLAN_VENDOR_ATTR_NAN = 2, - QCA_WLAN_VENDOR_ATTR_STATS_EXT = 3, - QCA_WLAN_VENDOR_ATTR_IFINDEX = 4, + /* used by QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY */ + QCA_WLAN_VENDOR_ATTR_DFS = 1, + /* used by QCA_NL80211_VENDOR_SUBCMD_NAN */ + QCA_WLAN_VENDOR_ATTR_NAN = 2, + /* used by QCA_NL80211_VENDOR_SUBCMD_STATS_EXT */ + QCA_WLAN_VENDOR_ATTR_STATS_EXT = 3, + /* used by QCA_NL80211_VENDOR_SUBCMD_STATS_EXT */ + QCA_WLAN_VENDOR_ATTR_IFINDEX = 4, + /* + * used by QCA_NL80211_VENDOR_SUBCMD_ROAMING, u32 with values defined + * by enum qca_roaming_policy. + */ QCA_WLAN_VENDOR_ATTR_ROAMING_POLICY = 5, QCA_WLAN_VENDOR_ATTR_MAC_ADDR = 6, + /* used by QCA_NL80211_VENDOR_SUBCMD_GET_FEATURES */ QCA_WLAN_VENDOR_ATTR_FEATURE_FLAGS = 7, + QCA_WLAN_VENDOR_ATTR_TEST = 8, + /* + * used by QCA_NL80211_VENDOR_SUBCMD_GET_FEATURES + * Unsigned 32-bit value. + */ QCA_WLAN_VENDOR_ATTR_CONCURRENCY_CAPA = 9, + /* Unsigned 32-bit value */ QCA_WLAN_VENDOR_ATTR_MAX_CONCURRENT_CHANNELS_2_4_BAND = 10, + /* Unsigned 32-bit value */ QCA_WLAN_VENDOR_ATTR_MAX_CONCURRENT_CHANNELS_5_0_BAND = 11, + /* Unsigned 32-bit value from enum qca_set_band. */ QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE = 12, + /* Dummy (NOP) attribute for 64 bit padding */ + QCA_WLAN_VENDOR_ATTR_PAD = 13, + /* + * Unique FTM session cookie (Unsigned 64 bit). Specified in + * QCA_NL80211_VENDOR_SUBCMD_FTM_START_SESSION. Reported in + * the session in QCA_NL80211_VENDOR_SUBCMD_FTM_MEAS_RESULT and + * QCA_NL80211_VENDOR_SUBCMD_FTM_SESSION_DONE. + */ + QCA_WLAN_VENDOR_ATTR_FTM_SESSION_COOKIE = 14, + /* + * Indoor location capabilities, returned by + * QCA_NL80211_VENDOR_SUBCMD_LOC_GET_CAPA. + * see enum qca_wlan_vendor_attr_loc_capa. + */ + QCA_WLAN_VENDOR_ATTR_LOC_CAPA = 15, + /* + * Array of nested attributes containing information about each peer + * in FTM measurement session. See enum qca_wlan_vendor_attr_peer_info + * for supported attributes for each peer. + */ + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PEERS = 16, + /* + * Array of nested attributes containing measurement results for + * one or more peers, reported by the + * QCA_NL80211_VENDOR_SUBCMD_FTM_MEAS_RESULT event. + * See enum qca_wlan_vendor_attr_peer_result for list of supported + * attributes. + */ + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PEER_RESULTS = 17, + /* Flag attribute for enabling or disabling responder functionality. */ + QCA_WLAN_VENDOR_ATTR_FTM_RESPONDER_ENABLE = 18, + /* + * Used in the QCA_NL80211_VENDOR_SUBCMD_FTM_CFG_RESPONDER + * command to specify the LCI report that will be sent by + * the responder during a measurement exchange. The format is + * defined in IEEE P802.11-REVmc/D7.0, 9.4.2.22.10. + */ + QCA_WLAN_VENDOR_ATTR_FTM_LCI = 19, + /* + * Used in the QCA_NL80211_VENDOR_SUBCMD_FTM_CFG_RESPONDER + * command to specify the location civic report that will + * be sent by the responder during a measurement exchange. + * The format is defined in IEEE P802.11-REVmc/D7.0, 9.4.2.22.13. + */ + QCA_WLAN_VENDOR_ATTR_FTM_LCR = 20, + /* + * Session/measurement completion status code, + * reported in QCA_NL80211_VENDOR_SUBCMD_FTM_SESSION_DONE and + * QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS_RESULT + * see enum qca_vendor_attr_loc_session_status. + */ + QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS = 21, + /* + * Initial dialog token used by responder (0 if not specified), + * unsigned 8 bit value. + */ + QCA_WLAN_VENDOR_ATTR_FTM_INITIAL_TOKEN = 22, + /* + * AOA measurement type. Requested in QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS + * and optionally in QCA_NL80211_VENDOR_SUBCMD_FTM_START_SESSION if + * AOA measurements are needed as part of an FTM session. + * Reported by QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS_RESULT. See + * enum qca_wlan_vendor_attr_aoa_type. + */ + QCA_WLAN_VENDOR_ATTR_AOA_TYPE = 23, + /* + * A bit mask (unsigned 32 bit value) of antenna arrays used + * by indoor location measurements. Refers to the antenna + * arrays described by QCA_VENDOR_ATTR_LOC_CAPA_ANTENNA_ARRAYS. + */ + QCA_WLAN_VENDOR_ATTR_LOC_ANTENNA_ARRAY_MASK = 24, + /* + * AOA measurement data. Its contents depends on the AOA measurement + * type and antenna array mask: + * QCA_WLAN_VENDOR_ATTR_AOA_TYPE_TOP_CIR_PHASE: array of U16 values, + * phase of the strongest CIR path for each antenna in the measured + * array(s). + * QCA_WLAN_VENDOR_ATTR_AOA_TYPE_TOP_CIR_PHASE_AMP: array of 2 U16 + * values, phase and amplitude of the strongest CIR path for each + * antenna in the measured array(s). + */ + QCA_WLAN_VENDOR_ATTR_AOA_MEAS_RESULT = 25, + /* + * Used in QCA_NL80211_VENDOR_SUBCMD_GET_CHAIN_RSSI command + * to specify the chain number (unsigned 32 bit value) to inquire + * the corresponding antenna RSSI value */ + QCA_WLAN_VENDOR_ATTR_CHAIN_INDEX = 26, + /* + * Used in QCA_NL80211_VENDOR_SUBCMD_GET_CHAIN_RSSI command + * to report the specific antenna RSSI value (unsigned 32 bit value) */ + QCA_WLAN_VENDOR_ATTR_CHAIN_RSSI = 27, + /* Frequency in MHz, various uses. Unsigned 32 bit value */ + QCA_WLAN_VENDOR_ATTR_FREQ = 28, + /* + * TSF timer value, unsigned 64 bit value. + * May be returned by various commands. + */ + QCA_WLAN_VENDOR_ATTR_TSF = 29, + /* + * DMG RF sector index, unsigned 16 bit number. Valid values are + * 0..127 for sector indices or 65535 as special value used to + * unlock sector selection in + * QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SELECTED_SECTOR. + */ + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_INDEX = 30, + /* + * DMG RF sector type, unsigned 8 bit value. One of the values + * in enum qca_wlan_vendor_attr_dmg_rf_sector_type. + */ + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_TYPE = 31, + /* + * Bitmask of DMG RF modules for which information is requested. Each + * bit corresponds to an RF module with the same index as the bit + * number. Unsigned 32 bit number but only low 8 bits can be set since + * all DMG chips currently have up to 8 RF modules. + */ + QCA_WLAN_VENDOR_ATTR_DMG_RF_MODULE_MASK = 32, + /* + * Array of nested attributes where each entry is DMG RF sector + * configuration for a single RF module. + * Attributes for each entry are taken from enum + * qca_wlan_vendor_attr_dmg_rf_sector_cfg. + * Specified in QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SECTOR_CFG + * and returned by QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SECTOR_CFG. + */ + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG = 33, + /* + * Used in QCA_NL80211_VENDOR_SUBCMD_STATS_EXT command + * to report frame aggregation statistics to userspace. + */ + QCA_WLAN_VENDOR_ATTR_RX_AGGREGATION_STATS_HOLES_NUM = 34, + QCA_WLAN_VENDOR_ATTR_RX_AGGREGATION_STATS_HOLES_INFO = 35, + /* + * Unsigned 8-bit value representing MBO transition reason code as + * provided by the AP used by subcommand + * QCA_NL80211_VENDOR_SUBCMD_FETCH_BSS_TRANSITION_STATUS. This is + * specified by the userspace in the request to the driver. + */ + QCA_WLAN_VENDOR_ATTR_BTM_MBO_TRANSITION_REASON = 36, + /* + * Array of nested attributes, BSSID and status code, used by subcommand + * QCA_NL80211_VENDOR_SUBCMD_FETCH_BSS_TRANSITION_STATUS, where each + * entry is taken from enum qca_wlan_vendor_attr_btm_candidate_info. + * The userspace space specifies the list/array of candidate BSSIDs in + * the order of preference in the request. The driver specifies the + * status code, for each BSSID in the list, in the response. The + * acceptable candidates are listed in the order preferred by the + * driver. + */ + QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO = 37, + /* + * Used in QCA_NL80211_VENDOR_SUBCMD_BRP_SET_ANT_LIMIT command + * See enum qca_wlan_vendor_attr_brp_ant_limit_mode. + */ + QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE = 38, + /* + * Used in QCA_NL80211_VENDOR_SUBCMD_BRP_SET_ANT_LIMIT command + * to define the number of antennas to use for BRP. + * different purpose in each ANT_LIMIT_MODE: + * DISABLE - ignored + * EFFECTIVE - upper limit to number of antennas to be used + * FORCE - exact number of antennas to be used + * unsigned 8 bit value + */ + QCA_WLAN_VENDOR_ATTR_BRP_ANT_NUM_LIMIT = 39, + /* + * Used in QCA_NL80211_VENDOR_SUBCMD_GET_CHAIN_RSSI command + * to report the corresponding antenna index to the chain RSSI value + */ + QCA_WLAN_VENDOR_ATTR_ANTENNA_INFO = 40, /* keep last */ QCA_WLAN_VENDOR_ATTR_AFTER_LAST, @@ -818,426 +1049,420 @@ enum qca_wlan_vendor_attr { }; #ifdef FEATURE_WLAN_EXTSCAN -/** - * enum qca_wlan_vendor_attr_extscan_config_params - ext scan config params - * - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_INVALID: Invalid initial - * value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID: - * Unsigned 32-bit value; Middleware provides it to the driver. Middle ware - * either gets it from caller, e.g., framework, or generates one if - * framework doesn't provide it. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_VALID_CHANNELS_CONFIG_PARAM_WIFI_BAND: - * NL attributes for data used by - * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_VALID_CHANNELS sub command. - * It is unsigned 32-bit value. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_VALID_CHANNELS_CONFIG_PARAM_MAX_CHANNELS: - * Unsigned 32-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_CHANNEL: - * NL attributes for input params used by - * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_START sub command. Unsigned 32-bit - * value; channel frequency - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_DWELL_TIME: Unsigned 32-bit value; - * dwell time in ms - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_PASSIVE: Unsigned 8-bit value: - * 0: active; 1: passive; N/A for DFS - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_CLASS: Unsigned 8-bit value - * channel class - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_INDEX: Unsigned 8-bit value - * bucket index, 0 based - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_BAND: Unsigned 8-bit value; band - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_PERIOD: Unsigned 32-bit value; - * desired period, in ms - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_REPORT_EVENTS: Unsigned 8-bit - * value; report events semantics - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_NUM_CHANNEL_SPECS: Unsigned 32-bit - * value. Followed by a nested array of EXTSCAN_CHANNEL_SPEC_* attributes. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC: - * Array of QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_* attributes. - * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_NUM_CHANNEL_SPECS - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_BASE_PERIOD: Unsigned 32-bit - * value; base timer period in ms - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_MAX_AP_PER_SCAN: Unsigned - * 32-bit value; number of APs to store in each scan in the - * BSSID/RSSI history buffer (keep the highest RSSI APs) - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_REPORT_THRESHOLD_PERCENT: - * Unsigned 8-bit value; in %, when scan buffer is this much full, - * wake up APPS. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_NUM_BUCKETS: Unsigned 8-bit - * value; number of scan bucket specs; followed by a nested array - * of_EXTSCAN_BUCKET_SPEC_* attributes and values. The size of the array - * is determined by NUM_BUCKETS - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC: Array of - * QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_* attributes. Array size: - * QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_NUM_BUCKETS - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_CACHED_SCAN_RESULTS_CONFIG_PARAM_FLUSH: - * Unsigned 8-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_CACHED_SCAN_RESULTS_CONFIG_PARAM_MAX: - * Unsigned 32-bit value; maximum number of results to be returned - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID: An array of - * 6 x Unsigned 8-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_LOW: Signed 32-bit - * value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_HIGH: Signed 32-bit - * value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_CHANNEL: Signed 32-bit - * value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_NUM_AP: Number of hotlist - * APs as unsigned 32-bit value, followed by a nested array of - * AP_THRESHOLD_PARAM attributes and values. The size of the array is - * determined by NUM_AP. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM: Array of - * QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_* attributes. - * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_NUM_CHANNEL_SPECS - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_RSSI_SAMPLE_SIZE: - * Unsigned 32bit value; number of samples for averaging RSSI - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_LOST_AP_SAMPLE_SIZE: - * Unsigned 32bit value; number of samples to confirm AP loss - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_MIN_BREACHING: - * Unsigned 32bit value; number of APs breaching threshold. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_NUM_AP: - * Unsigned 32bit value; number of APs. Followed by an array of - * AP_THRESHOLD_PARAM attributes. Size of the array is NUM_AP. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_LOST_AP_SAMPLE_SIZE: - * Unsigned 32bit value; number of samples to confirm AP loss. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_MAX_PERIOD: - * Unsigned 32-bit value. If max_period is non zero or different than - * period, then this bucket is an exponential backoff bucket. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_BASE: - * Unsigned 32-bit value. For exponential back off bucket, - * number of scans to performed for a given period. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_STEP_COUNT: - * Unsigned 8-bit value; in number of scans, wake up AP after these - * many scans. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_REPORT_THRESHOLD_NUM_SCANS: - * Unsigned 8-bit value; in number of scans, wake up AP after these - * many scans. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_LOST_SSID_SAMPLE_SIZE: - * Unsigned 32bit value; number of samples to confirm SSID loss - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_NUM_SSID: - * Number of hotlist SSIDs as unsigned 32-bit value, followed by a nested - * array of SSID_THRESHOLD_PARAM_* attributes and values. The size of the - * array is determined by NUM_SSID - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM: - * Array of QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_* attributes - * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_NUM_SSID - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_SSID: - * An array of 33 x Unsigned 8-bit value; NULL terminated SSID - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_BAND: - * Signed 32-bit value; band - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_RSSI_LOW: - * Signed 32-bit value; low rssi - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_RSSI_HIGH: - * Signed 32-bit value; high rssi - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CONFIGURATION_FLAGS: - * Unsigned 32-bit value; a bitmask w/additional extscan config flag. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_AFTER_LAST: After last - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX: Max value - */ enum qca_wlan_vendor_attr_extscan_config_params { QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_INVALID = 0, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID = 1, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_VALID_CHANNELS_CONFIG_PARAM_WIFI_BAND, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_VALID_CHANNELS_CONFIG_PARAM_MAX_CHANNELS, + /* + * Attributes for data used by + * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_VALID_CHANNELS sub command. + */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_CHANNEL, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_DWELL_TIME, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_PASSIVE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_CLASS, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_VALID_CHANNELS_CONFIG_PARAM_WIFI_BAND + = 2, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_VALID_CHANNELS_CONFIG_PARAM_MAX_CHANNELS + = 3, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_INDEX, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_BAND, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_PERIOD, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_REPORT_EVENTS, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_NUM_CHANNEL_SPECS, + /* + * Attributes for input params used by + * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_START sub command. + */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC, + /* Unsigned 32-bit value; channel frequency */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_CHANNEL = 4, + /* Unsigned 32-bit value; dwell time in ms. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_DWELL_TIME = 5, + /* Unsigned 8-bit value; 0: active; 1: passive; N/A for DFS */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_PASSIVE = 6, + /* Unsigned 8-bit value; channel class */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_CLASS = 7, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_BASE_PERIOD, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_MAX_AP_PER_SCAN, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_REPORT_THRESHOLD_PERCENT, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_NUM_BUCKETS, + /* Unsigned 8-bit value; bucket index, 0 based */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_INDEX = 8, + /* Unsigned 8-bit value; band. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_BAND = 9, + /* Unsigned 32-bit value; desired period, in ms. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_PERIOD = 10, + /* Unsigned 8-bit value; report events semantics. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_REPORT_EVENTS = 11, + /* + * Unsigned 32-bit value. Followed by a nested array of + * EXTSCAN_CHANNEL_SPEC_* attributes. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_NUM_CHANNEL_SPECS = 12, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC, + /* + * Array of QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC_* attributes. + * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_NUM_CHANNEL_SPECS + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CHANNEL_SPEC = 13, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_CACHED_SCAN_RESULTS_CONFIG_PARAM_FLUSH, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_CACHED_SCAN_RESULTS_CONFIG_PARAM_MAX, + /* Unsigned 32-bit value; base timer period in ms. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_BASE_PERIOD = 14, + /* + * Unsigned 32-bit value; number of APs to store in each scan in the + * BSSID/RSSI history buffer (keep the highest RSSI APs). + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_MAX_AP_PER_SCAN = 15, + /* + * Unsigned 8-bit value; in %, when scan buffer is this much full, wake + * up AP. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_REPORT_THRESHOLD_PERCENT + = 16, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_LOW, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_HIGH, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_CHANNEL, + /* + * Unsigned 8-bit value; number of scan bucket specs; followed by a + * nested array of_EXTSCAN_BUCKET_SPEC_* attributes and values. The size + * of the array is determined by NUM_BUCKETS. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_NUM_BUCKETS = 17, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_NUM_AP, + /* + * Array of QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_* attributes. + * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_NUM_BUCKETS + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC = 18, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM, + /* Unsigned 8-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_CACHED_SCAN_RESULTS_CONFIG_PARAM_FLUSH + = 19, + /* Unsigned 32-bit value; maximum number of results to be returned. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_CACHED_SCAN_RESULTS_CONFIG_PARAM_MAX + = 20, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_RSSI_SAMPLE_SIZE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_LOST_AP_SAMPLE_SIZE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_MIN_BREACHING, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_NUM_AP, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_LOST_AP_SAMPLE_SIZE, + /* An array of 6 x unsigned 8-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID = 21, + /* Signed 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_LOW = 22, + /* Signed 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_HIGH = 23, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_CHANNEL = 24, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_MAX_PERIOD, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_BASE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_STEP_COUNT, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_REPORT_THRESHOLD_NUM_SCANS, + /* + * Number of hotlist APs as unsigned 32-bit value, followed by a nested + * array of AP_THRESHOLD_PARAM attributes and values. The size of the + * array is determined by NUM_AP. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_NUM_AP = 25, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_LOST_SSID_SAMPLE_SIZE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_NUM_SSID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM, + /* + * Array of QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_* attributes. + * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_NUM_CHANNEL_SPECS + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM = 26, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_SSID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_BAND, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_RSSI_LOW, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_RSSI_HIGH, + /* Unsigned 32-bit value; number of samples for averaging RSSI. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_RSSI_SAMPLE_SIZE + = 27, + /* Unsigned 32-bit value; number of samples to confirm AP loss. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_LOST_AP_SAMPLE_SIZE + = 28, + /* Unsigned 32-bit value; number of APs breaching threshold. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_MIN_BREACHING = 29, + /* + * Unsigned 32-bit value; number of APs. Followed by an array of + * AP_THRESHOLD_PARAM attributes. Size of the array is NUM_AP. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SIGNIFICANT_CHANGE_PARAMS_NUM_AP = 30, + /* Unsigned 32-bit value; number of samples to confirm AP loss. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_LOST_AP_SAMPLE_SIZE + = 31, + /* + * Unsigned 32-bit value. If max_period is non zero or different than + * period, then this bucket is an exponential backoff bucket. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_MAX_PERIOD = 32, + /* Unsigned 32-bit value. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_BASE = 33, + /* + * Unsigned 32-bit value. For exponential back off bucket, number of + * scans to perform for a given period. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_BUCKET_SPEC_STEP_COUNT = 34, + /* + * Unsigned 8-bit value; in number of scans, wake up AP after these + * many scans. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_REPORT_THRESHOLD_NUM_SCANS + = 35, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CONFIGURATION_FLAGS, + /* + * Attributes for data used by + * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_SSID_HOTLIST sub command. + */ + /* Unsigned 3-2bit value; number of samples to confirm SSID loss. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_LOST_SSID_SAMPLE_SIZE + = 36, + /* + * Number of hotlist SSIDs as unsigned 32-bit value, followed by a + * nested array of SSID_THRESHOLD_PARAM_* attributes and values. The + * size of the array is determined by NUM_SSID. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_NUM_SSID = 37, + /* + * Array of QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_* + * attributes. + * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_HOTLIST_PARAMS_NUM_SSID + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM = 38, + + /* An array of 33 x unsigned 8-bit value; NULL terminated SSID */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_SSID = 39, + /* Unsigned 8-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_BAND = 40, + /* Signed 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_RSSI_LOW = 41, + /* Signed 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SSID_THRESHOLD_PARAM_RSSI_HIGH = 42, + /* Unsigned 32-bit value; a bitmask with additional extscan config flag. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CONFIGURATION_FLAGS = 43, + + /* keep last */ QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_AFTER_LAST, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX = - QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_AFTER_LAST - 1, + QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_AFTER_LAST - 1, }; -/** - * enum qca_wlan_vendor_attr_extscan_results - vendor attribute ext scan results - * - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_INVALID: Invalid initial value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_REQUEST_ID: Unsigned 32-bit value - * must match the request Id supplied by Wi-Fi HAL in the corresponding - * subcmd NL msg - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_STATUS: Unsigned 32-bit value used to - * indicate the status response from firmware/driver for the vendor - * sub-command - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_CHANNELS: EXTSCAN Valid Channels - * attributes. Unsigned 32bit value followed by a nested array of CHANNELS - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CHANNELS: An array of NUM_CHANNELS x - * Unsigned 32bit value integers representing channel numbers. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_CACHE_SIZE: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_BUCKETS: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_AP_CACHE_PER_SCAN: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_RSSI_SAMPLE_SIZE: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_REPORTING_THRESHOLD: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_APS: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SIGNIFICANT_WIFI_CHANGE_APS: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_BSSID_HISTORY_ENTRIES: - * Unsigned 32bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE: Unsigned 32-bit - * value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST: An array of - * NUM_RESULTS_AVAILABLE x QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_* - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_TIME_STAMP: Unsigned - * 64-bit value age of sample at the time of retrieval - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_SSID: 33 x unsigned 8-bit - * value; NULL terminated SSID - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_BSSID: An array of 6 x - * Unsigned 8-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_CHANNEL: Unsigned 32-bit - * value; channel frequency in MHz - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RSSI: Signed 32-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RTT: Unsigned 32-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RTT_SD: Unsigned 32-bit - * value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_BEACON_PERIOD: - * Unsigned 16-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_CAPABILITY: - * Unsigned 16-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_IE_LENGTH: - * Unsigned 32-bit value; size of the IE DATA blob - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_IE_DATA: - * An array of IE_LENGTH x Unsigned 8-bit value; blob of all the - * information elements found in the beacon; this data should be - * a packed list of wifi_information_element objects, one after - * the other. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_MORE_DATA: - * Unsigned 8-bit value; set by driver to indicate more scan results are - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_EVENT_TYPE: Unsigned 8-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_EVENT_STATUS: Unsigned 32-bit - * value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_BSSID: - * An array of 6 x Unsigned 8-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_CHANNEL: - * Unsigned 32-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_NUM_RSSI: - * Unsigned 32-bit value - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_RSSI_LIST: - * A nested array of signed 32-bit RSSI values. Size of the array is - * determined by (NUM_RSSI of SIGNIFICANT_CHANGE_RESULT_NUM_RSSI. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_LIST: - * An array of NUM_RESULTS_AVAILABLE x - * QCA_NL80211_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_* - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_SCAN_ID: - * Unsigned 32-bit value; a unique identifier for the scan unit - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_FLAGS: - * Unsigned 32-bit value; a bitmask w/additional information about scan - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_NETWORK_FOUND_NUM_MATCHES: - * Unsigned 32-bit value; number of found network matches - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_RESULT_LIST: - * A nested array of - * QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_* - * attributes. Array size = - * *_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_NETWORK_FOUND_NUM_MATCHES. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ID: - * Unsigned 32-bit value; network block id for the matched network - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP_LEN: - * Unsigned 32-bit value; ANQP length - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP: - * An array size of PASSPOINT_MATCH_ANQP_LEN of unsigned 8-bit values; - * ANQP data in the information_element format. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_SSIDS: - * Unsigned 32bit value; Max hotlist ssids. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS: - * Unsigned 32bit value; Max number of epno networks - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS_BY_SSID: - * Unsigned 32bit value; Max number of epno networks by ssid - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_WHITELISTED_SSID: - * Unsigned 32bit value; Max number of whitelisted ssids - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_BUCKETS_SCANNED: - * Unsigned 32bit value, Bit mask of all buckets scanned in the - * current EXTSCAN CYCLE. For e.g. If fw scan is going to scan - * following buckets 0, 1, 2 in current cycle then it will be (0x111) - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_MAX_NUM_BLACKLISTED_BSSID: - * Unsigned 32bit value; a EXTSCAN Capabilities attribute to send - * maximum umber of blacklist bssid's that firmware can support. - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_AFTER_LAST: After last - * @QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_MAX: Max value - */ enum qca_wlan_vendor_attr_extscan_results { QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_INVALID = 0, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_REQUEST_ID, + /* + * Unsigned 32-bit value; must match the request Id supplied by + * Wi-Fi HAL in the corresponding subcmd NL msg. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_REQUEST_ID = 1, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_STATUS, + /* + * Unsigned 32-bit value; used to indicate the status response from + * firmware/driver for the vendor sub-command. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_STATUS = 2, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_CHANNELS, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CHANNELS, + /* + * EXTSCAN Valid Channels attributes */ + /* Unsigned 32bit value; followed by a nested array of CHANNELS. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_CHANNELS = 3, + /* + * An array of NUM_CHANNELS x unsigned 32-bit value integers + * representing channel numbers. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CHANNELS = 4, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_CACHE_SIZE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_BUCKETS, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_AP_CACHE_PER_SCAN, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_RSSI_SAMPLE_SIZE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_REPORTING_THRESHOLD, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_BSSIDS, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SIGNIFICANT_WIFI_CHANGE_APS, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_BSSID_HISTORY_ENTRIES, + /* EXTSCAN Capabilities attributes */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_CACHE_SIZE = 5, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_BUCKETS = 6, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_AP_CACHE_PER_SCAN + = 7, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_RSSI_SAMPLE_SIZE + = 8, + /* Signed 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SCAN_REPORTING_THRESHOLD + = 9, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_BSSIDS = 10, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_SIGNIFICANT_WIFI_CHANGE_APS + = 11, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_BSSID_HISTORY_ENTRIES + = 12, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST, - - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_TIME_STAMP, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_SSID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_BSSID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_CHANNEL, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RSSI, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RTT, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RTT_SD, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_BEACON_PERIOD, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_CAPABILITY, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_IE_LENGTH, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_IE_DATA, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_MORE_DATA, - - /* Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE - * to indicate number of wifi scan results/bssids retrieved by the scan. - * Also, use QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST to indicate the - * list of wifi scan results returned for each cached result block. + /* + * EXTSCAN Attributes used with + * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SCAN_RESULTS_AVAILABLE sub-command. */ - /* EXTSCAN attributes for + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_RESULTS_AVAILABLE = 13, + + /* + * EXTSCAN attributes used with + * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_FULL_SCAN_RESULT sub-command. + */ + + /* + * An array of NUM_RESULTS_AVAILABLE x + * QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_* + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST = 14, + + /* Unsigned 64-bit value; age of sample at the time of retrieval */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_TIME_STAMP = 15, + /* 33 x unsigned 8-bit value; NULL terminated SSID */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_SSID = 16, + /* An array of 6 x unsigned 8-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_BSSID = 17, + /* Unsigned 32-bit value; channel frequency in MHz */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_CHANNEL = 18, + /* Signed 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RSSI = 19, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RTT = 20, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_RTT_SD = 21, + /* Unsigned 16-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_BEACON_PERIOD = 22, + /* Unsigned 16-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_CAPABILITY = 23, + /* Unsigned 32-bit value; size of the IE DATA blob */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_IE_LENGTH = 24, + /* + * An array of IE_LENGTH x unsigned 8-bit value; blob of all the + * information elements found in the beacon; this data should be a + * packed list of wifi_information_element objects, one after the + * other. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_IE_DATA = 25, + + /* + * Unsigned 8-bit value; set by driver to indicate more scan results are + * available. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_RESULT_MORE_DATA = 26, + + /* + * EXTSCAN attributes for * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SCAN_EVENT sub-command. */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_EVENT_TYPE, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_EVENT_STATUS, + /* Unsigned 8-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_EVENT_TYPE = 27, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SCAN_EVENT_STATUS = 28, - /* EXTSCAN attributes for + /* + * EXTSCAN attributes for * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_AP_FOUND sub-command. */ - /* Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE + /* + * Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_RESULTS_AVAILABLE * to indicate number of results. + * Also, use QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST to indicate the + * list of results. */ - /* EXTSCAN attributes for + /* + * EXTSCAN attributes for * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SIGNIFICANT_CHANGE sub-command. */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_BSSID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_CHANNEL, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_NUM_RSSI, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_RSSI_LIST, + /* An array of 6 x unsigned 8-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_BSSID = 29, + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_CHANNEL + = 30, + /* Unsigned 32-bit value. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_NUM_RSSI + = 31, + /* + * A nested array of signed 32-bit RSSI values. Size of the array is + * determined by (NUM_RSSI of SIGNIFICANT_CHANGE_RESULT_NUM_RSSI. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_RSSI_LIST + = 32, - /* EXTSCAN attributes used with + /* + * EXTSCAN attributes used with * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CACHED_RESULTS sub-command. */ - /* Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE - * to indicate number of gscan cached results returned. - * Also, use QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_LIST to - * indicate the list of gscan cached results. + /* + * Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_RESULTS_AVAILABLE + * to indicate number of extscan cached results returned. + * Also, use QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_LIST to indicate + * the list of extscan cached results. */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_LIST, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_SCAN_ID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_FLAGS, - /* Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE + /* + * An array of NUM_RESULTS_AVAILABLE x + * QCA_NL80211_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_* + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_LIST = 33, + /* Unsigned 32-bit value; a unique identifier for the scan unit. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_SCAN_ID = 34, + /* + * Unsigned 32-bit value; a bitmask w/additional information about scan. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_CACHED_RESULTS_FLAGS = 35, + /* + * Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_RESULTS_AVAILABLE * to indicate number of wifi scan results/bssids retrieved by the scan. * Also, use QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST to indicate the * list of wifi scan results returned for each cached result block. */ - /* EXTSCAN attributes for + /* + * EXTSCAN attributes for * QCA_NL80211_VENDOR_SUBCMD_PNO_NETWORK_FOUND sub-command. */ - /* Use QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE for number - * of results. + /* + * Use QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_RESULTS_AVAILABLE for + * number of results. * Use QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST to indicate the nested * list of wifi scan results returned for each * wifi_passpoint_match_result block. - * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE. + * Array size: QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_NUM_RESULTS_AVAILABLE. */ - /* EXTSCAN attributes for + /* + * EXTSCAN attributes for * QCA_NL80211_VENDOR_SUBCMD_PNO_PASSPOINT_NETWORK_FOUND sub-command. */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_NETWORK_FOUND_NUM_MATCHES, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_RESULT_LIST, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ID, - /* Use QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST to indicate the nested + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_NETWORK_FOUND_NUM_MATCHES + = 36, + /* + * A nested array of + * QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_* + * attributes. Array size = + * *_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_NETWORK_FOUND_NUM_MATCHES. + */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_RESULT_LIST = 37, + + /* Unsigned 32-bit value; network block id for the matched network */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ID = 38, + /* + * Use QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_LIST to indicate the nested * list of wifi scan results returned for each * wifi_passpoint_match_result block. */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP_LEN, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP, - - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_SSIDS, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS_BY_SSID, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_WHITELISTED_SSID, - - /* EXTSCAN attributes for - * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_SSID_FOUND sub-command & - * QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_SSID_LOST sub-command + /* Unsigned 32-bit value */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP_LEN = 39, + /* + * An array size of PASSPOINT_MATCH_ANQP_LEN of unsigned 8-bit values; + * ANQP data in the information_element format. */ - /* Use attr QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE - * to indicate number of results. - */ - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_BUCKETS_SCANNED, + QCA_WLAN_VENDOR_ATTR_EXTSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP = 40, - QCA_WLAN_VENDOR_ATTR_EXTSCAN_MAX_NUM_BLACKLISTED_BSSID, + /* Unsigned 32-bit value; a EXTSCAN Capabilities attribute. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_SSIDS = 41, + /* Unsigned 32-bit value; a EXTSCAN Capabilities attribute. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS = 42, + /* Unsigned 32-bit value; a EXTSCAN Capabilities attribute. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS_BY_SSID + = 43, + /* Unsigned 32-bit value; a EXTSCAN Capabilities attribute. */ + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_CAPABILITIES_MAX_NUM_WHITELISTED_SSID + = 44, + + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_BUCKETS_SCANNED = 45, + QCA_WLAN_VENDOR_ATTR_EXTSCAN_MAX_NUM_BLACKLISTED_BSSID = 46, /* keep last */ QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_AFTER_LAST, QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_MAX = - QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_AFTER_LAST - 1, + QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_AFTER_LAST - 1, }; - #endif #ifdef WLAN_FEATURE_LINK_LAYER_STATS @@ -1496,6 +1721,11 @@ enum qca_wlan_vendor_attr_ll_stats_results_type { * @QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_AVG_NUM_FRAMES_LEAKED: * average number of frames leaked * @QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_GUARD_TIME: guard time + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_TYPE: Link Layer stats type + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_TX_LEVELS: LL Radio Number of + * Tx Levels + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME_PER_LEVEL:Number of msecs the + * radio spent in transmitting for each power level * @QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RTS_SUCC_CNT: RTS successful count * @QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RTS_FAIL_CNT: RTS fail count * @QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_PPDU_SUCC_CNT: PPDU successful count @@ -1508,110 +1738,102 @@ enum qca_wlan_vendor_attr_ll_stats_results { QCA_WLAN_VENDOR_ATTR_LL_STATS_INVALID = 0, QCA_WLAN_VENDOR_ATTR_LL_STATS_RESULTS_REQ_ID = 1, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_BEACON_RX, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_RX, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_ACTION_RX, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_ACTION_TX, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_MGMT, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_DATA, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_ACK, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MODE, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MAC_ADDR, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_STATE, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_ROAMING, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_CAPABILITIES, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_SSID, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_BSSID, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_AP_COUNTRY_STR, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_COUNTRY_STR, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_BEACON_RX = 2, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_RX = 3, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_ACTION_RX = 4, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_ACTION_TX = 5, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_MGMT = 6, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_DATA = 7, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_ACK = 8, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MODE = 9, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MAC_ADDR = 10, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_STATE = 11, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_ROAMING = 12, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_CAPABILITIES = 13, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_SSID = 14, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_BSSID = 15, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_AP_COUNTRY_STR = 16, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_COUNTRY_STR = 17, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_AC, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_MPDU, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_MPDU, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_MCAST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_MCAST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_AMPDU, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_AMPDU, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_MPDU_LOST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES_SHORT, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES_LONG, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_MIN, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_MAX, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_AVG, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_NUM_SAMPLES, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_AC = 18, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_MPDU = 19, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_MPDU = 20, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_MCAST = 21, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_MCAST = 22, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_AMPDU = 23, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_AMPDU = 24, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_MPDU_LOST = 25, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES = 26, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES_SHORT = 27, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES_LONG = 28, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_MIN = 29, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_MAX = 30, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_AVG = 31, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_NUM_SAMPLES = 32, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_NUM_PEERS, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_NUM_PEERS = 33, - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_TYPE, - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_MAC_ADDRESS, - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_CAPABILITIES, - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_NUM_RATES, + QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_TYPE = 34, + QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_MAC_ADDRESS = 35, + QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_CAPABILITIES = 36, + QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_NUM_RATES = 37, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_PREAMBLE, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_NSS, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_BW, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_MCS_INDEX, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_BIT_RATE, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_PREAMBLE = 38, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_NSS = 39, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_BW = 40, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_MCS_INDEX = 41, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_BIT_RATE = 42, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_TX_MPDU, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RX_MPDU, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_MPDU_LOST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_SHORT, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_LONG, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_TX_MPDU = 43, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RX_MPDU = 44, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_MPDU_LOST = 45, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES = 46, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_SHORT = 47, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_LONG = 48, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ID, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_RX_TIME, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_SCAN, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_NBD, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_GSCAN, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_ROAM_SCAN, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_PNO_SCAN, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_HS20, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_CHANNELS, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ID = 49, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME = 50, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME = 51, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_RX_TIME = 52, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_SCAN = 53, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_NBD = 54, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_GSCAN = 55, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_ROAM_SCAN = 56, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_PNO_SCAN = 57, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_HS20 = 58, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_CHANNELS = 59, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_WIDTH, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ0, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ1, + QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_WIDTH = 60, + QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ = 61, + QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ0 = 62, + QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ1 = 63, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_ON_TIME, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_CCA_BUSY_TIME, + QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_ON_TIME = 64, + QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_CCA_BUSY_TIME = 65, - QCA_WLAN_VENDOR_ATTR_LL_STATS_NUM_RADIOS, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CH_INFO, - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO, - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_RATE_INFO, - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_INFO, + QCA_WLAN_VENDOR_ATTR_LL_STATS_NUM_RADIOS = 66, + QCA_WLAN_VENDOR_ATTR_LL_STATS_CH_INFO = 67, + QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO = 68, + QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_RATE_INFO = 69, + QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_INFO = 70, - QCA_WLAN_VENDOR_ATTR_LL_STATS_RESULTS_MORE_DATA, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RESULTS_MORE_DATA = 71, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_AVERAGE_TSF_OFFSET, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_DETECTED, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_AVG_NUM_FRAMES_LEAKED, - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_GUARD_TIME, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_AVERAGE_TSF_OFFSET = 72, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_DETECTED = 73, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_AVG_NUM_FRAMES_LEAKED = 74, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_GUARD_TIME = 75, - /* Unsigned 32bit value to indicate ll stats result type */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_TYPE, + QCA_WLAN_VENDOR_ATTR_LL_STATS_TYPE = 76, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_TX_LEVELS, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_TX_LEVELS = 77, - /* Unsigned 32bit value - * Number of msecs the radio spent in transmitting for each power level - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME_PER_LEVEL, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RTS_SUCC_CNT, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RTS_FAIL_CNT, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_PPDU_SUCC_CNT, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_PPDU_FAIL_CNT, + QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME_PER_LEVEL = 78, + + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RTS_SUCC_CNT = 79, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RTS_FAIL_CNT = 80, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_PPDU_SUCC_CNT = 81, + QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_PPDU_FAIL_CNT = 82, /* keep last */ QCA_WLAN_VENDOR_ATTR_LL_STATS_AFTER_LAST, @@ -1619,6 +1841,18 @@ enum qca_wlan_vendor_attr_ll_stats_results { QCA_WLAN_VENDOR_ATTR_LL_STATS_AFTER_LAST - 1 }; +enum qca_wlan_vendor_attr_ll_stats_type { + QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_INVALID = 0, + QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_RADIO = 1, + QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_IFACE = 2, + QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_PEERS = 3, + + /* keep last */ + QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_AFTER_LAST, + QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_MAX = + QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_AFTER_LAST - 1, +}; + #endif /* WLAN_FEATURE_LINK_LAYER_STATS */ /** @@ -1767,6 +2001,11 @@ enum qca_vendor_attr_wisa_cmd { QCA_WLAN_VENDOR_ATTR_WISA_AFTER_LAST - 1 }; +enum qca_roaming_policy { + QCA_ROAMING_NOT_ALLOWED, + QCA_ROAMING_ALLOWED_WITHIN_ESS, +}; + /** * enum qca_wlan_vendor_attr_roam_auth - vendor event for roaming * @QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_BSSID: BSSID of the roamed AP @@ -2060,6 +2299,259 @@ enum qca_wlan_vendor_attr_get_wifi_info { QCA_WLAN_VENDOR_ATTR_WIFI_INFO_GET_AFTER_LAST - 1, }; +enum qca_wlan_vendor_attr_logger_results { + QCA_WLAN_VENDOR_ATTR_LOGGER_RESULTS_INVALID = 0, + + /* + * Unsigned 32-bit value; must match the request Id supplied by + * Wi-Fi HAL in the corresponding subcmd NL msg. + */ + QCA_WLAN_VENDOR_ATTR_LOGGER_RESULTS_REQUEST_ID = 1, + + /* + * Unsigned 32-bit value; used to indicate the size of memory + * dump to be allocated. + */ + QCA_WLAN_VENDOR_ATTR_LOGGER_RESULTS_MEMDUMP_SIZE = 2, + + /* keep last */ + QCA_WLAN_VENDOR_ATTR_LOGGER_RESULTS_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_LOGGER_RESULTS_MAX = + QCA_WLAN_VENDOR_ATTR_LOGGER_RESULTS_AFTER_LAST - 1, +}; + +/** + * qca_wlan_vendor_channel_prop_flags: This represent the flags for a channel. + * This is used by QCA_WLAN_VENDOR_EXTERNAL_ACS_EVENT_CHAN_INFO_ATTR_FLAGS. + */ +enum qca_wlan_vendor_channel_prop_flags { + /* Bits 0, 1, 2, and 3 are reserved */ + + /* Turbo channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_TURBO = 1 << 4, + /* CCK channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_CCK = 1 << 5, + /* OFDM channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_OFDM = 1 << 6, + /* 2.4 GHz spectrum channel. */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_2GHZ = 1 << 7, + /* 5 GHz spectrum channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_5GHZ = 1 << 8, + /* Only passive scan allowed */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_PASSIVE = 1 << 9, + /* Dynamic CCK-OFDM channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_DYN = 1 << 10, + /* GFSK channel (FHSS PHY) */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_GFSK = 1 << 11, + /* Radar found on channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_RADAR = 1 << 12, + /* 11a static turbo channel only */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_STURBO = 1 << 13, + /* Half rate channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_HALF = 1 << 14, + /* Quarter rate channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_QUARTER = 1 << 15, + /* HT 20 channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_HT20 = 1 << 16, + /* HT 40 with extension channel above */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_HT40PLUS = 1 << 17, + /* HT 40 with extension channel below */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_HT40MINUS = 1 << 18, + /* HT 40 intolerant */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_HT40INTOL = 1 << 19, + /* VHT 20 channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_VHT20 = 1 << 20, + /* VHT 40 with extension channel above */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_VHT40PLUS = 1 << 21, + /* VHT 40 with extension channel below */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_VHT40MINUS = 1 << 22, + /* VHT 80 channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_VHT80 = 1 << 23, + /* HT 40 intolerant mark bit for ACS use */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_HT40INTOLMARK = 1 << 24, + /* Channel temporarily blocked due to noise */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_BLOCKED = 1 << 25, + /* VHT 160 channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_VHT160 = 1 << 26, + /* VHT 80+80 channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_VHT80_80 = 1 << 27, +}; + +/** + * qca_wlan_vendor_channel_prop_flags_ext: This represent the extended flags for + * each channel. This is used by + * QCA_WLAN_VENDOR_EXTERNAL_ACS_EVENT_CHAN_INFO_ATTR_FLAG_EXT. + */ +enum qca_wlan_vendor_channel_prop_flags_ext { + /* Radar found on channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_RADAR_FOUND = 1 << 0, + /* DFS required on channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_DFS = 1 << 1, + /* DFS required on channel for 2nd band of 80+80 */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_DFS_CFREQ2 = 1 << 2, + /* If channel has been checked for DFS */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_DFS_CLEAR = 1 << 3, + /* Excluded in 802.11d */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_11D_EXCLUDED = 1 << 4, + /* Channel Switch Announcement received on this channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_CSA_RECEIVED = 1 << 5, + /* Ad-hoc is not allowed */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_DISALLOW_ADHOC = 1 << 6, + /* Station only channel */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_DISALLOW_HOSTAP = 1 << 7, + /* DFS radar history for slave device (STA mode) */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_HISTORY_RADAR = 1 << 8, + /* DFS CAC valid for slave device (STA mode) */ + QCA_WLAN_VENDOR_CHANNEL_PROP_FLAG_EXT_CAC_VALID = 1 << 9, +}; + +enum qca_chip_power_save_failure_reason { + /* + * Indicates if the reason for the failure is due to a protocol + * layer/module. + */ + QCA_CHIP_POWER_SAVE_FAILURE_REASON_PROTOCOL = 0, + /* + * Indicates if the reason for the failure is due to a hardware issue. + */ + QCA_CHIP_POWER_SAVE_FAILURE_REASON_HARDWARE = 1, +}; + +/** + * qca_attr_chip_power_save_failure: Attributes to vendor subcmd + * QCA_NL80211_VENDOR_SUBCMD_CHIP_PWRSAVE_FAILURE. This carries the requisite + * information leading to the power save failure. + */ +enum qca_attr_chip_power_save_failure { + QCA_ATTR_CHIP_POWER_SAVE_FAILURE_INVALID = 0, + /* + * Reason to cause the power save failure. + * These reasons are represented by + * enum qca_chip_power_save_failure_reason. + */ + QCA_ATTR_CHIP_POWER_SAVE_FAILURE_REASON = 1, + + /* keep last */ + QCA_ATTR_CHIP_POWER_SAVE_FAILURE_LAST, + QCA_ATTR_CHIP_POWER_SAVE_FAILURE_MAX = + QCA_ATTR_CHIP_POWER_SAVE_FAILURE_LAST - 1, +}; + +/** + * qca_wlan_vendor_attr_nud_stats_set: Attributes to vendor subcmd + * QCA_NL80211_VENDOR_SUBCMD_NUD_STATS_SET. This carries the requisite + * information to start/stop the NUD statistics collection. + */ +enum qca_attr_nud_stats_set { + QCA_ATTR_NUD_STATS_SET_INVALID = 0, + + /* + * Flag to start/stop the NUD statistics collection. + * Start - If included, Stop - If not included + */ + QCA_ATTR_NUD_STATS_SET_START = 1, + /* IPv4 address of the default gateway (in network byte order) */ + QCA_ATTR_NUD_STATS_GW_IPV4 = 2, + + /* keep last */ + QCA_ATTR_NUD_STATS_SET_LAST, + QCA_ATTR_NUD_STATS_SET_MAX = + QCA_ATTR_NUD_STATS_SET_LAST - 1, +}; + +/** + * qca_attr_nud_stats_get: Attributes to vendor subcmd + * QCA_NL80211_VENDOR_SUBCMD_NUD_STATS_GET. This carries the requisite + * NUD statistics collected when queried. + */ +enum qca_attr_nud_stats_get { + QCA_ATTR_NUD_STATS_GET_INVALID = 0, + /* ARP Request count from netdev */ + QCA_ATTR_NUD_STATS_ARP_REQ_COUNT_FROM_NETDEV = 1, + /* ARP Request count sent to lower MAC from upper MAC */ + QCA_ATTR_NUD_STATS_ARP_REQ_COUNT_TO_LOWER_MAC = 2, + /* ARP Request count received by lower MAC from upper MAC */ + QCA_ATTR_NUD_STATS_ARP_REQ_RX_COUNT_BY_LOWER_MAC = 3, + /* ARP Request count successfully transmitted by the device */ + QCA_ATTR_NUD_STATS_ARP_REQ_COUNT_TX_SUCCESS = 4, + /* ARP Response count received by lower MAC */ + QCA_ATTR_NUD_STATS_ARP_RSP_RX_COUNT_BY_LOWER_MAC = 5, + /* ARP Response count received by upper MAC */ + QCA_ATTR_NUD_STATS_ARP_RSP_RX_COUNT_BY_UPPER_MAC = 6, + /* ARP Response count delivered to netdev */ + QCA_ATTR_NUD_STATS_ARP_RSP_COUNT_TO_NETDEV = 7, + /* ARP Response count delivered to netdev */ + QCA_ATTR_NUD_STATS_ARP_RSP_COUNT_OUT_OF_ORDER_DROP = 8, + /* + * Flag indicating if the station's link to the AP is active. + * Active Link - If included, Inactive link - If not included + */ + QCA_ATTR_NUD_STATS_AP_LINK_ACTIVE = 9, + /* + * Flag indicating if there is any duplicate address detected (DAD). + * Yes - If detected, No - If not detected. + */ + QCA_ATTR_NUD_STATS_IS_DAD = 10, + + /* keep last */ + QCA_ATTR_NUD_STATS_GET_LAST, + QCA_ATTR_NUD_STATS_GET_MAX = + QCA_ATTR_NUD_STATS_GET_LAST - 1, +}; + +enum qca_wlan_btm_candidate_status { + QCA_STATUS_ACCEPT = 0, + QCA_STATUS_REJECT_EXCESSIVE_FRAME_LOSS_EXPECTED = 1, + QCA_STATUS_REJECT_EXCESSIVE_DELAY_EXPECTED = 2, + QCA_STATUS_REJECT_INSUFFICIENT_QOS_CAPACITY = 3, + QCA_STATUS_REJECT_LOW_RSSI = 4, + QCA_STATUS_REJECT_HIGH_INTERFERENCE = 5, + QCA_STATUS_REJECT_UNKNOWN = 6, +}; + +enum qca_wlan_vendor_attr_btm_candidate_info { + QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_INVALID = 0, + + /* 6-byte MAC address representing the BSSID of transition candidate */ + QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_BSSID = 1, + /* + * Unsigned 32-bit value from enum qca_wlan_btm_candidate_status + * returned by the driver. It says whether the BSSID provided in + * QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_BSSID is acceptable by + * the driver, if not it specifies the reason for rejection. + * Note that the user-space can overwrite the transition reject reason + * codes provided by driver based on more information. + */ + QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_STATUS = 2, + + /* keep last */ + QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_MAX = + QCA_WLAN_VENDOR_ATTR_BTM_CANDIDATE_INFO_AFTER_LAST - 1, +}; + +enum qca_attr_trace_level { + QCA_ATTR_TRACE_LEVEL_INVALID = 0, + /* + * Nested array of the following attributes: + * QCA_ATTR_TRACE_LEVEL_MODULE, + * QCA_ATTR_TRACE_LEVEL_MASK. + */ + QCA_ATTR_TRACE_LEVEL_PARAM = 1, + /* + * Specific QCA host driver module. Please refer to the QCA host + * driver implementation to get the specific module ID. + */ + QCA_ATTR_TRACE_LEVEL_MODULE = 2, + /* Different trace level masks represented in the QCA host driver. */ + QCA_ATTR_TRACE_LEVEL_MASK = 3, + + /* keep last */ + QCA_ATTR_TRACE_LEVEL_AFTER_LAST, + QCA_ATTR_TRACE_LEVEL_MAX = + QCA_ATTR_TRACE_LEVEL_AFTER_LAST - 1, +}; + /** * enum qca_wlan_vendor_attr_get_logger_features - value for logger * supported features @@ -2270,102 +2762,95 @@ enum qca_ignore_assoc_disallowed { QCA_IGNORE_ASSOC_DISALLOWED_ENABLE }; -/** - * enum qca_wlan_vendor_config: wifi config attr - * - * @QCA_WLAN_VENDOR_ATTR_CONFIG_INVALID: invalid config - * @QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM: modulated dtim - * @QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR: stats avg. factor - * @QCA_WLAN_VENDOR_ATTR_CONFIG_GUARD_TIME: guard time - * @QCA_WLAN_VENDOR_ATTR_CONFIG_FINE_TIME_MEASUREMENT: fine time measurement - * @QCA_WLAN_VENDOR_ATTR_CONF_TX_RATE: Configure maximum TX rate dynamically - * @QCA_WLAN_VENDOR_ATTR_CONFIG_PENALIZE_AFTER_NCONS_BEACON_MISS: - * Configure the number of continuous Beacon Miss - * @QCA_WLAN_VENDOR_ATTR_CONFIG_CHANNEL_AVOIDANCE_IND: - * Configure the channel avoidance indication - * @QCA_WLAN_VENDOR_ATTR_CONFIG_TX_MPDU_AGGREGATION: - * Tx aggregation size (8-bit unsigned value) - * @QCA_WLAN_VENDOR_ATTR_CONFIG_RX_MPDU_AGGREGATION: - * Rx aggregation size (8-bit unsigned value) - * @QCA_WLAN_VENDOR_ATTR_CONFIG_NON_AGG_RETRY: - * Non aggregrate/11g sw retry threshold - * @QCA_WLAN_VENDOR_ATTR_CONFIG_AGG_RETRY: aggregrate sw retry threshold - * @QCA_WLAN_VENDOR_ATTR_CONFIG_MGMT_RETRY: management frame sw retry threshold - * @QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY: control frame sw retry threshold - * @QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY: - * Propagation delay for 2G/5G band (units in us) - * @QCA_WLAN_VENDOR_ATTR_CONFIG_TX_FAIL_COUNT: - * Configure the number of unicast TX fail packet count - * @QCA_WLAN_VENDOR_ATTR_CONFIG_SCAN_DEFAULT_IES: Update the default scan IEs - * @QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_COMMAND: - * Unsigned 32-bit value attribute for generic commands - * @QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_VALUE: - * Unsigned 32-bit data attribute for generic command response - * @QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA: - * Unsigned 32-bit data attribute for generic command response - * @QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_LENGTH: - * Unsigned 32-bit length attribute for - * QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA - * @QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_FLAGS: - * Unsigned 32-bit flags attribute for - * QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA - * @QCA_WLAN_VENDOR_ATTR_CONFIG_ACCESS_POLICY: Vendor IE access policy - * @QCA_WLAN_VENDOR_ATTR_CONFIG_ACCESS_POLICY_IE_LIST: - * Vendor IE to be used with access policy - * @QCA_WLAN_VENDOR_ATTR_CONFIG_IFINDEX: - * interface index for vdev specific parameters - * @QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER: - * Unsigned 8bit length attribute to update power save config - * to turn off/on qpower - * @QCA_WLAN_VENDOR_ATTR_CONFIG_IGNORE_ASSOC_DISALLOWED: - * Ignore Assoc Disallowed[MBO] - * @QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_ABS_DELAY: - * 32-bit unsigned value to configure the propagation absolute - * delay for 2G/5G band (units in us) - * @QCA_WLAN_VENDOR_ATTR_CONFIG_LAST: last config - * @QCA_WLAN_VENDOR_ATTR_CONFIG_MAX: max config +/* Attributes for data used by + * QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION and + * QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_CONFIGURATION subcommands. */ -enum qca_wlan_vendor_config { +enum qca_wlan_vendor_attr_config { QCA_WLAN_VENDOR_ATTR_CONFIG_INVALID = 0, + /* + * Unsigned 32-bit value to set the DTIM period. + * Whether the wifi chipset wakes at every dtim beacon or a multiple of + * the DTIM period. If DTIM is set to 3, the STA shall wake up every 3 + * DTIM beacons. + */ QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM = 1, + /* + * Unsigned 32-bit value to set the wifi_iface stats averaging factor + * used to calculate statistics like average the TSF offset or average + * number of frame leaked. + * For instance, upon Beacon frame reception: + * current_avg = ((beacon_TSF - TBTT) * factor + previous_avg * (0x10000 - factor) ) / 0x10000 + * For instance, when evaluating leaky APs: + * current_avg = ((num frame received within guard time) * factor + previous_avg * (0x10000 - factor)) / 0x10000 + */ QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR = 2, + /* + * Unsigned 32-bit value to configure guard time, i.e., when + * implementing IEEE power management based on frame control PM bit, how + * long the driver waits before shutting down the radio and after + * receiving an ACK frame for a Data frame with PM bit set. + */ QCA_WLAN_VENDOR_ATTR_CONFIG_GUARD_TIME = 3, + /* Unsigned 32-bit value to change the FTM capability dynamically */ QCA_WLAN_VENDOR_ATTR_CONFIG_FINE_TIME_MEASUREMENT = 4, /* Unsigned 16-bit value to configure maximum TX rate dynamically */ QCA_WLAN_VENDOR_ATTR_CONF_TX_RATE = 5, + /* + * Unsigned 32-bit value to configure the number of continuous + * Beacon Miss which shall be used by the firmware to penalize + * the RSSI. + */ QCA_WLAN_VENDOR_ATTR_CONFIG_PENALIZE_AFTER_NCONS_BEACON_MISS = 6, + /* + * Unsigned 8-bit value to configure the channel avoidance indication + * behavior. Firmware to send only one indication and ignore duplicate + * indications when set to avoid multiple Apps wakeups. + */ QCA_WLAN_VENDOR_ATTR_CONFIG_CHANNEL_AVOIDANCE_IND = 7, - + /* + * 8-bit unsigned value to configure the maximum TX MPDU for + * aggregation. + */ QCA_WLAN_VENDOR_ATTR_CONFIG_TX_MPDU_AGGREGATION = 8, + /* + * 8-bit unsigned value to configure the maximum RX MPDU for + * aggregation. + */ QCA_WLAN_VENDOR_ATTR_CONFIG_RX_MPDU_AGGREGATION = 9, - - /* 8-bit unsigned value to configure the Non aggregrate/11g sw + /* + * 8-bit unsigned value to configure the Non aggregrate/11g sw * retry threshold (0 disable, 31 max). */ QCA_WLAN_VENDOR_ATTR_CONFIG_NON_AGG_RETRY = 10, - /* 8-bit unsigned value to configure the aggregrate sw + /* + * 8-bit unsigned value to configure the aggregrate sw * retry threshold (0 disable, 31 max). */ QCA_WLAN_VENDOR_ATTR_CONFIG_AGG_RETRY = 11, - /* 8-bit unsigned value to configure the MGMT frame + /* + * 8-bit unsigned value to configure the MGMT frame * retry threshold (0 disable, 31 max). */ QCA_WLAN_VENDOR_ATTR_CONFIG_MGMT_RETRY = 12, - /* 8-bit unsigned value to configure the CTRL frame + /* + * 8-bit unsigned value to configure the CTRL frame * retry threshold (0 disable, 31 max). */ QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY = 13, - /* 8-bit unsigned value to configure the propagation delay for + /* + * 8-bit unsigned value to configure the propagation delay for * 2G/5G band (0~63, units in us) */ QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY = 14, - - /* Unsigned 32-bit value to configure the number of unicast TX fail + /* + * Unsigned 32-bit value to configure the number of unicast TX fail * packet count. The peer is disconnected once this threshold is * reached. */ QCA_WLAN_VENDOR_ATTR_CONFIG_TX_FAIL_COUNT = 15, - /* Attribute used to set scan default IEs to the driver. + /* + * Attribute used to set scan default IEs to the driver. * * These IEs can be used by scan operations that will be initiated by * the driver/firmware. @@ -2383,40 +2868,111 @@ enum qca_wlan_vendor_config { QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_VALUE = 18, /* Unsigned 32-bit data attribute for generic command response */ QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA = 19, - /* Unsigned 32-bit length attribute for + /* + * Unsigned 32-bit length attribute for * QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA */ QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_LENGTH = 20, - /* Unsigned 32-bit flags attribute for + /* + * Unsigned 32-bit flags attribute for * QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA */ QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_FLAGS = 21, - /* Unsigned 32-bit, defining the access policy. + /* + * Unsigned 32-bit, defining the access policy. * See enum qca_access_policy. Used with * QCA_WLAN_VENDOR_ATTR_CONFIG_ACCESS_POLICY_IE_LIST. */ QCA_WLAN_VENDOR_ATTR_CONFIG_ACCESS_POLICY = 22, - /* Sets the list of full set of IEs for which a specific access policy + /* + * Sets the list of full set of IEs for which a specific access policy * has to be applied. Used along with * QCA_WLAN_VENDOR_ATTR_CONFIG_ACCESS_POLICY to control the access. * Zero length payload can be used to clear this access constraint. */ QCA_WLAN_VENDOR_ATTR_CONFIG_ACCESS_POLICY_IE_LIST = 23, - /* Unsigned 32-bit, specifies the interface index (netdev) for which the + /* + * Unsigned 32-bit, specifies the interface index (netdev) for which the * corresponding configurations are applied. If the interface index is * not specified, the configurations are attributed to the respective * wiphy. */ QCA_WLAN_VENDOR_ATTR_CONFIG_IFINDEX = 24, - /* Unsigned 8-bit, for setting qpower dynamically */ + /* 8-bit unsigned value to trigger QPower: 1-Enable, 0-Disable */ QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER = 25, + /* + * 8-bit unsigned value to configure the driver and below layers to + * ignore the assoc disallowed set by APs while connecting + * 1-Ignore, 0-Don't ignore + */ QCA_WLAN_VENDOR_ATTR_CONFIG_IGNORE_ASSOC_DISALLOWED = 26, + /* + * 32-bit unsigned value to trigger antenna diversity features: + * 1-Enable, 0-Disable + */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_ENA = 27, + /* 32-bit unsigned value to configure specific chain antenna */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_CHAIN = 28, + /* + * 32-bit unsigned value to trigger cycle selftest + * 1-Enable, 0-Disable + */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_SELFTEST = 29, + /* + * 32-bit unsigned to configure the cycle time of selftest + * the unit is micro-second + */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_SELFTEST_INTVL = 30, + /* 32-bit unsigned value to set reorder timeout for AC_VO */ + QCA_WLAN_VENDOR_ATTR_CONFIG_RX_REORDER_TIMEOUT_VOICE = 31, + /* 32-bit unsigned value to set reorder timeout for AC_VI */ + QCA_WLAN_VENDOR_ATTR_CONFIG_RX_REORDER_TIMEOUT_VIDEO = 32, + /* 32-bit unsigned value to set reorder timeout for AC_BE */ + QCA_WLAN_VENDOR_ATTR_CONFIG_RX_REORDER_TIMEOUT_BESTEFFORT = 33, + /* 32-bit unsigned value to set reorder timeout for AC_BK */ + QCA_WLAN_VENDOR_ATTR_CONFIG_RX_REORDER_TIMEOUT_BACKGROUND = 34, + /* 6-byte MAC address to point out the specific peer */ + QCA_WLAN_VENDOR_ATTR_CONFIG_RX_BLOCKSIZE_PEER_MAC = 35, + /* 32-bit unsigned value to set window size for specific peer */ + QCA_WLAN_VENDOR_ATTR_CONFIG_RX_BLOCKSIZE_WINLIMIT = 36, + /* 8-bit unsigned value to set the beacon miss threshold in 2.4 GHz */ + QCA_WLAN_VENDOR_ATTR_CONFIG_BEACON_MISS_THRESHOLD_24 = 37, + /* 8-bit unsigned value to set the beacon miss threshold in 5 GHz */ + QCA_WLAN_VENDOR_ATTR_CONFIG_BEACON_MISS_THRESHOLD_5 = 38, + /* + * 32-bit unsigned value to configure 5 or 10 MHz channel width for + * station device while in disconnect state. The attribute use the + * value of enum nl80211_chan_width: NL80211_CHAN_WIDTH_5 means 5 MHz, + * NL80211_CHAN_WIDTH_10 means 10 MHz. If set, the device work in 5 or + * 10 MHz channel width, the station will not connect to a BSS using 20 + * MHz or higher bandwidth. Set to NL80211_CHAN_WIDTH_20_NOHT to + * clear this constraint. + */ + QCA_WLAN_VENDOR_ATTR_CONFIG_SUB20_CHAN_WIDTH = 39, + /* + * 32-bit unsigned value to configure the propagation absolute delay + * for 2G/5G band (units in us) + */ QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_ABS_DELAY = 40, + /* 32-bit unsigned value to set probe period */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_PROBE_PERIOD = 41, + /* 32-bit unsigned value to set stay period */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_STAY_PERIOD = 42, + /* 32-bit unsigned value to set snr diff */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_SNR_DIFF = 43, + /* 32-bit unsigned value to set probe dwell time */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_PROBE_DWELL_TIME = 44, + /* 32-bit unsigned value to set mgmt snr weight */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_MGMT_SNR_WEIGHT = 45, + /* 32-bit unsigned value to set data snr weight */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_DATA_SNR_WEIGHT = 46, + /* 32-bit unsigned value to set ack snr weight */ + QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_ACK_SNR_WEIGHT = 47, /* keep last */ - QCA_WLAN_VENDOR_ATTR_CONFIG_LAST, + QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST, QCA_WLAN_VENDOR_ATTR_CONFIG_MAX = - QCA_WLAN_VENDOR_ATTR_CONFIG_LAST - 1 + QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST - 1, }; /** @@ -2467,6 +3023,28 @@ enum wlan_offloaded_packets_control { WLAN_STOP_OFFLOADED_PACKETS = 2 }; +/** + * enum qca_wlan_vendor_attr_data_offload_ind - Vendor Data Offload Indication + * + * @QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_SESSION: Session corresponding to + * the offloaded data. + * @QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_PROTOCOL: Protocol of the offloaded + * data. + * @QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_EVENT: Event type for the data offload + * indication. + */ +enum qca_wlan_vendor_attr_data_offload_ind { + QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_INVALID = 0, + QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_SESSION, + QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_PROTOCOL, + QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_EVENT, + + /* keep last */ + QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_MAX = + QCA_WLAN_VENDOR_ATTR_DATA_OFFLOAD_IND_AFTER_LAST - 1 +}; + /** * enum qca_wlan_vendor_attr_offloaded_packets - offloaded packets * @QCA_WLAN_VENDOR_ATTR_OFFLOADED_PACKETS_INVALID: invalid @@ -2596,40 +3174,42 @@ enum qca_wlan_vendor_external_acs_event_chan_info_attr { * offloaded to firmware. * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_ADD_CHAN_STATS_SUPPORT: Does driver * provides additional channel capability as part of scan operation. + * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_AP_UP:Flag attribute to indicate + * interface status is UP * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_SAP_MODE: Operating mode of * interface. It takes one of nl80211_iftype values. - * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_SAP_STATUS: Iface status: UP/Down * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_CHAN_WIDTH: This is the upper bound * of chan width. ACS logic should try to get a channel with specified width * if not found then look for lower values. - * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_MAC_ADDR: Interface MAC address. * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_BAND: nl80211_bands * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PHY_MODE: PHY/HW mode such as * a/b/g/n/ac. - * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_CHANLIST: Supported channel list - * among which ACS should choose best channel. + * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_FREQ_LIST: Supported frequency list + * among which ACS should choose best frequency. * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PCL:Preferred Chan List by the * driver which will have format as array of * nested values. * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_CHAN_INFO: Array of nested attribute * for each channel. It takes attr as defined in - * qca_wlan_vendor_start_acs_config_chan_info_attr. + * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_POLICY:External ACS policy such as + * PCL mandatory, PCL preferred, etc.It uses values defined in enum + * qca_wlan_vendor_attr_external_acs_policy. */ -enum qca_wlan_vendor_attr_start_acs_config { +enum qca_wlan_vendor_attr_external_acs_event { QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_INVALID = 0, QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_REASON = 1, QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_IS_SPECTRAL_SUPPORTED = 2, QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_IS_OFFLOAD_ENABLED = 3, QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_ADD_CHAN_STATS_SUPPORT = 4, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_SAP_MODE = 5, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_SAP_STATUS = 6, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_AP_UP = 5, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_SAP_MODE = 6, QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_CHAN_WIDTH = 7, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_MAC_ADDR = 8, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_BAND = 9, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PHY_MODE = 10, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_CHANLIST = 11, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PCL = 12, - QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_CHAN_INFO = 13, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_BAND = 8, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PHY_MODE = 9, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_FREQ_LIST = 10, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PCL = 11, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_CHAN_INFO = 12, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_POLICY = 13, /* keep last */ QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_LAST, @@ -2637,6 +3217,15 @@ enum qca_wlan_vendor_attr_start_acs_config { QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_LAST - 1, }; +enum qca_iface_type { + QCA_IFACE_TYPE_STA, + QCA_IFACE_TYPE_AP, + QCA_IFACE_TYPE_P2P_CLIENT, + QCA_IFACE_TYPE_P2P_GO, + QCA_IFACE_TYPE_IBSS, + QCA_IFACE_TYPE_TDLS, +}; + /** * enum qca_wlan_vendor_attr_pcl_config: attribute to vendor sub-command * QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PCL. @@ -2650,6 +3239,12 @@ enum qca_wlan_vendor_attr_pcl_config { QCA_WLAN_VENDOR_ATTR_PCL_CONFIG_WEIGHT = 2, }; +enum qca_set_band { + QCA_SETBAND_AUTO, + QCA_SETBAND_5G, + QCA_SETBAND_2G, +}; + /** * enum set_reset_packet_filter - set packet filter control commands * @QCA_WLAN_SET_PACKET_FILTER: Set Packet Filter @@ -2759,6 +3354,78 @@ enum qca_wlan_vendor_attr_wake_stats { QCA_WLAN_VENDOR_GET_WAKE_STATS_AFTER_LAST - 1, }; +/** + * enum qca_vendor_element_id - QCA Vendor Specific element types + * + * These values are used to identify QCA Vendor Specific elements. The + * payload of the element starts with the three octet OUI (OUI_QCA) and + * is followed by a single octet type which is defined by this enum. + * + * @QCA_VENDOR_ELEM_P2P_PREF_CHAN_LIST: P2P preferred channel list. + * This element can be used to specify preference order for supported + * channels. The channels in this list are in preference order (the first + * one has the highest preference) and are described as a pair of + * (global) Operating Class and Channel Number (each one octet) fields. + * + * This extends the standard P2P functionality by providing option to have + * more than one preferred operating channel. When this element is present, + * it replaces the preference indicated in the Operating Channel attribute. + * For supporting other implementations, the Operating Channel attribute is + * expected to be used with the highest preference channel. Similarly, all + * the channels included in this Preferred channel list element are + * expected to be included in the Channel List attribute. + * + * This vendor element may be included in GO Negotiation Request, P2P + * Invitation Request, and Provision Discovery Request frames. + * + * @QCA_VENDOR_ELEM_HE_CAPAB: HE Capabilities element. + * This element can be used for pre-standard publication testing of HE + * before P802.11ax draft assigns the element ID. The payload of this + * vendor specific element is defined by the latest P802.11ax draft. + * Please note that the draft is still work in progress and this element + * payload is subject to change. + * + * @QCA_VENDOR_ELEM_HE_OPER: HE Operation element. + * This element can be used for pre-standard publication testing of HE + * before P802.11ax draft assigns the element ID. The payload of this + * vendor specific element is defined by the latest P802.11ax draft. + * Please note that the draft is still work in progress and this element + * payload is subject to change. + * + * @QCA_VENDOR_ELEM_RAPS: RAPS element (OFDMA-based Random Access Parameter Set + * element). + * This element can be used for pre-standard publication testing of HE + * before P802.11ax draft assigns the element ID extension. The payload of + * this vendor specific element is defined by the latest P802.11ax draft + * (not including the Element ID Extension field). Please note that the + * draft is still work in progress and this element payload is subject to + * change. + * + * @QCA_VENDOR_ELEM_MU_EDCA_PARAMS: MU EDCA Parameter Set element. + * This element can be used for pre-standard publication testing of HE + * before P802.11ax draft assigns the element ID extension. The payload of + * this vendor specific element is defined by the latest P802.11ax draft + * (not including the Element ID Extension field). Please note that the + * draft is still work in progress and this element payload is subject to + * change. + * + * @QCA_VENDOR_ELEM_BSS_COLOR_CHANGE: BSS Color Change Announcement element. + * This element can be used for pre-standard publication testing of HE + * before P802.11ax draft assigns the element ID extension. The payload of + * this vendor specific element is defined by the latest P802.11ax draft + * (not including the Element ID Extension field). Please note that the + * draft is still work in progress and this element payload is subject to + * change. + */ +enum qca_vendor_element_id { + QCA_VENDOR_ELEM_P2P_PREF_CHAN_LIST = 0, + QCA_VENDOR_ELEM_HE_CAPAB = 1, + QCA_VENDOR_ELEM_HE_OPER = 2, + QCA_VENDOR_ELEM_RAPS = 3, + QCA_VENDOR_ELEM_MU_EDCA_PARAMS = 4, + QCA_VENDOR_ELEM_BSS_COLOR_CHANGE = 5, +}; + /** * enum qca_vendor_attr_get_tsf: Vendor attributes for TSF capture * @QCA_WLAN_VENDOR_ATTR_TSF_INVALID: Invalid attribute value @@ -2867,6 +3534,24 @@ enum drv_dbs_capability { DRV_DBS_CAPABILITY_2X2, }; +/** + * enum qca_vendor_attr_txpower_decr_db - Attributes for TX power decrease + * + * These attributes are used with QCA_NL80211_VENDOR_SUBCMD_SET_TXPOWER_DECR_DB. + */ +enum qca_vendor_attr_txpower_decr_db { + QCA_WLAN_VENDOR_ATTR_TXPOWER_DECR_DB_INVALID, + /* + * 8-bit unsigned value to indicate the reduction of TX power in dB for + * a virtual interface. + */ + QCA_WLAN_VENDOR_ATTR_TXPOWER_DECR_DB, + /* keep last */ + QCA_WLAN_VENDOR_ATTR_TXPOWER_DECR_DB_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_TXPOWER_DECR_DB_MAX = + QCA_WLAN_VENDOR_ATTR_TXPOWER_DECR_DB_AFTER_LAST - 1 +}; + /** * enum qca_vendor_attr_ota_test - Enable OTA test * @QCA_WLAN_VENDOR_ATTR_OTA_TEST_INVALID: invalid value @@ -2950,6 +3635,36 @@ enum qca_wlan_vendor_attr_acs_config { }; +/** + * enum qca_wlan_vendor_attr_get_hw_capability - Wi-Fi hardware capability + */ +enum qca_wlan_vendor_attr_get_hw_capability { + QCA_WLAN_VENDOR_ATTR_HW_CAPABILITY_INVALID, + /* + * Antenna isolation + * An attribute used in the response. + * The content of this attribute is encoded in a byte array. Each byte + * value is an antenna isolation value. The array length is the number + * of antennas. + */ + QCA_WLAN_VENDOR_ATTR_ANTENNA_ISOLATION, + /* + * Request HW capability + * An attribute used in the request. + * The content of this attribute is a u32 array for one or more of + * hardware capabilities (attribute IDs) that are being requested. Each + * u32 value has a value from this + * enum qca_wlan_vendor_attr_get_hw_capability + * identifying which capabilities are requested. + */ + QCA_WLAN_VENDOR_ATTR_GET_HW_CAPABILITY, + + /* keep last */ + QCA_WLAN_VENDOR_ATTR_HW_CAPABILITY_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_HW_CAPABILITY_MAX = + QCA_WLAN_VENDOR_ATTR_HW_CAPABILITY_AFTER_LAST - 1, +}; + /** * enum qca_wlan_vendor_attr_sta_connect_roam_policy_config - * config params for sta roam policy @@ -2970,6 +3685,68 @@ enum qca_wlan_vendor_attr_sta_connect_roam_policy_config { QCA_WLAN_VENDOR_ATTR_STA_CONNECT_ROAM_POLICY_AFTER_LAST - 1, }; +/* Attributes for FTM commands and events */ + +/** + * enum qca_wlan_vendor_attr_loc_capa - Indoor location capabilities + * + * @QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAGS: Various flags. See + * enum qca_wlan_vendor_attr_loc_capa_flags. + * @QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_NUM_SESSIONS: Maximum number + * of measurement sessions that can run concurrently. + * Default is one session (no session concurrency). + * @QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_NUM_PEERS: The total number of unique + * peers that are supported in running sessions. For example, + * if the value is 8 and maximum number of sessions is 2, you can + * have one session with 8 unique peers, or 2 sessions with 4 unique + * peers each, and so on. + * @QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_NUM_BURSTS_EXP: Maximum number + * of bursts per peer, as an exponent (2^value). Default is 0, + * meaning no multi-burst support. + * @QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_MEAS_PER_BURST: Maximum number + * of measurement exchanges allowed in a single burst. + * @QCA_WLAN_VENDOR_ATTR_AOA_CAPA_SUPPORTED_TYPES: Supported AOA measurement + * types. A bit mask (unsigned 32 bit value), each bit corresponds + * to an AOA type as defined by enum qca_vendor_attr_aoa_type. + */ +enum qca_wlan_vendor_attr_loc_capa { + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_INVALID, + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAGS, + QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_NUM_SESSIONS, + QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_NUM_PEERS, + QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_NUM_BURSTS_EXP, + QCA_WLAN_VENDOR_ATTR_FTM_CAPA_MAX_MEAS_PER_BURST, + QCA_WLAN_VENDOR_ATTR_AOA_CAPA_SUPPORTED_TYPES, + /* keep last */ + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_MAX = + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_AFTER_LAST - 1, +}; + +/** + * enum qca_wlan_vendor_attr_loc_capa_flags: Indoor location capability flags + * + * @QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_FTM_RESPONDER: Set if driver + * can be configured as an FTM responder (for example, an AP that + * services FTM requests). QCA_NL80211_VENDOR_SUBCMD_FTM_CFG_RESPONDER + * will be supported if set. + * @QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_FTM_INITIATOR: Set if driver + * can run FTM sessions. QCA_NL80211_VENDOR_SUBCMD_FTM_START_SESSION + * will be supported if set. +* @QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_ASAP: Set if FTM responder + * supports immediate (ASAP) response. + * @QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_AOA: Set if driver supports standalone + * AOA measurement using QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS. + * @QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_AOA_IN_FTM: Set if driver supports + * requesting AOA measurements as part of an FTM session. + */ +enum qca_wlan_vendor_attr_loc_capa_flags { + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_FTM_RESPONDER = 1 << 0, + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_FTM_INITIATOR = 1 << 1, + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_ASAP = 1 << 2, + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_AOA = 1 << 3, + QCA_WLAN_VENDOR_ATTR_LOC_CAPA_FLAG_AOA_IN_FTM = 1 << 4, +}; /** * enum qca_wlan_vendor_attr_sap_config - config params for sap configuration @@ -2993,6 +3770,242 @@ enum qca_wlan_vendor_attr_sap_config { QCA_WLAN_VENDOR_ATTR_SAP_CONFIG_AFTER_LAST - 1, }; +/** + * enum qca_wlan_vendor_attr_ftm_peer_info: Information about + * a single peer in a measurement session. + * + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MAC_ADDR: The MAC address of the peer. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAGS: Various flags related + * to measurement. See enum qca_wlan_vendor_attr_ftm_peer_meas_flags. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAMS: Nested attribute of + * FTM measurement parameters, as specified by IEEE P802.11-REVmc/D7.0 + * 9.4.2.167. See enum qca_wlan_vendor_attr_ftm_meas_param for + * list of supported attributes. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_SECURE_TOKEN_ID: Initial token ID for + * secure measurement. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_AOA_BURST_PERIOD: Request AOA + * measurement every bursts. If 0 or not specified, + * AOA measurements will be disabled for this peer. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_FREQ: Frequency in MHz where + * the measurement frames are exchanged. Optional; if not + * specified, try to locate the peer in the kernel scan + * results cache and use frequency from there. + */ +enum qca_wlan_vendor_attr_ftm_peer_info { + QCA_WLAN_VENDOR_ATTR_FTM_PEER_INVALID, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MAC_ADDR, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAGS, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAMS, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_SECURE_TOKEN_ID, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_AOA_BURST_PERIOD, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_FREQ, + /* keep last */ + QCA_WLAN_VENDOR_ATTR_FTM_PEER_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MAX = + QCA_WLAN_VENDOR_ATTR_FTM_PEER_AFTER_LAST - 1, +}; + +/** + * enum qca_wlan_vendor_attr_ftm_peer_meas_flags: Measurement request flags, + * per-peer + * + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_ASAP: If set, request + * immediate (ASAP) response from peer. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_LCI: If set, request + * LCI report from peer. The LCI report includes the absolute + * location of the peer in "official" coordinates (similar to GPS). + * See IEEE P802.11-REVmc/D7.0, 11.24.6.7 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_LCR: If set, request + * Location civic report from peer. The LCR includes the location + * of the peer in free-form format. See IEEE P802.11-REVmc/D7.0, + * 11.24.6.7 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_SECURE: If set, + * request a secure measurement. + * QCA_WLAN_VENDOR_ATTR_FTM_PEER_SECURE_TOKEN_ID must also be provided. + */ +enum qca_wlan_vendor_attr_ftm_peer_meas_flags { + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_ASAP = 1 << 0, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_LCI = 1 << 1, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_LCR = 1 << 2, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAG_SECURE = 1 << 3, +}; + +/** + * enum qca_wlan_vendor_attr_ftm_meas_param: Measurement parameters + * + * @QCA_WLAN_VENDOR_ATTR_FTM_PARAM_MEAS_PER_BURST: Number of measurements + * to perform in a single burst. + * @QCA_WLAN_VENDOR_ATTR_FTM_PARAM_NUM_BURSTS_EXP: Number of bursts to + * perform, specified as an exponent (2^value). + * @QCA_WLAN_VENDOR_ATTR_FTM_PARAM_BURST_DURATION: Duration of burst + * instance, as specified in IEEE P802.11-REVmc/D7.0, 9.4.2.167. + * @QCA_WLAN_VENDOR_ATTR_FTM_PARAM_BURST_PERIOD: Time between bursts, + * as specified in IEEE P802.11-REVmc/D7.0, 9.4.2.167. Must + * be larger than QCA_WLAN_VENDOR_ATTR_FTM_PARAM_BURST_DURATION. + */ +enum qca_wlan_vendor_attr_ftm_meas_param { + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_INVALID, + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_MEAS_PER_BURST, + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_NUM_BURSTS_EXP, + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_BURST_DURATION, + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_BURST_PERIOD, + /* keep last */ + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_MAX = + QCA_WLAN_VENDOR_ATTR_FTM_PARAM_AFTER_LAST - 1, +}; + +/** + * enum qca_wlan_vendor_attr_ftm_peer_result: Per-peer results + * + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MAC_ADDR: MAC address of the reported + * peer. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS: Status of measurement + * request for this peer. + * See enum qca_wlan_vendor_attr_ftm_peer_result_status. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_FLAGS: Various flags related + * to measurement results for this peer. + * See enum qca_wlan_vendor_attr_ftm_peer_result_flags. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_VALUE_SECONDS: Specified when + * request failed and peer requested not to send an additional request + * for this number of seconds. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_LCI: LCI report when received + * from peer. In the format specified by IEEE P802.11-REVmc/D7.0, + * 9.4.2.22.10. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_LCR: Location civic report when + * received from peer. In the format specified by IEEE P802.11-REVmc/D7.0, + * 9.4.2.22.13. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MEAS_PARAMS: Reported when peer + * overridden some measurement request parameters. See + * enum qca_wlan_vendor_attr_ftm_meas_param. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_AOA_MEAS: AOA measurement + * for this peer. Same contents as @QCA_WLAN_VENDOR_ATTR_AOA_MEAS_RESULT. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MEAS: Array of measurement + * results. Each entry is a nested attribute defined + * by enum qca_wlan_vendor_attr_ftm_meas. + */ +enum qca_wlan_vendor_attr_ftm_peer_result { + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_INVALID, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MAC_ADDR, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_FLAGS, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_VALUE_SECONDS, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_LCI, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_LCR, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MEAS_PARAMS, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_AOA_MEAS, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MEAS, + /* keep last */ + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MAX = + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_AFTER_LAST - 1, +}; + +/** + * enum qca_wlan_vendor_attr_ftm_peer_result_status + * + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_OK: Request sent ok and results + * will be provided. Peer may have overridden some measurement parameters, + * in which case overridden parameters will be report by + * QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_MEAS_PARAM attribute. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_INCAPABLE: Peer is incapable + * of performing the measurement request. No more results will be sent + * for this peer in this session. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_FAILED: Peer reported request + * failed, and requested not to send an additional request for number + * of seconds specified by QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_VALUE_SECONDS + * attribute. + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_INVALID: Request validation + * failed. Request was not sent over the air. + */ +enum qca_wlan_vendor_attr_ftm_peer_result_status { + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_OK, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_INCAPABLE, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_FAILED, + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_STATUS_INVALID, +}; + +/** + * enum qca_wlan_vendor_attr_ftm_peer_result_flags: Various flags + * for measurement result, per-peer + * + * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_FLAG_DONE: If set, + * measurement completed for this peer. No more results will be reported + * for this peer in this session. + */ +enum qca_wlan_vendor_attr_ftm_peer_result_flags { + QCA_WLAN_VENDOR_ATTR_FTM_PEER_RES_FLAG_DONE = 1 << 0, +}; + +/** + * enum qca_vendor_attr_loc_session_status: Session completion status code + * + * @QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_OK: Session completed + * successfully. + * @QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_ABORTED: Session aborted + * by request. + * @QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_INVALID: Session request + * was invalid and was not started. + * @QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_FAILED: Session had an error + * and did not complete normally (for example out of resources). + */ +enum qca_vendor_attr_loc_session_status { + QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_OK, + QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_ABORTED, + QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_INVALID, + QCA_WLAN_VENDOR_ATTR_LOC_SESSION_STATUS_FAILED, +}; + +/** + * enum qca_wlan_vendor_attr_ftm_meas: Single measurement data + * + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T1: Time of departure (TOD) of FTM packet as + * recorded by responder, in picoseconds. + * See IEEE P802.11-REVmc/D7.0, 11.24.6.4 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T2: Time of arrival (TOA) of FTM packet at + * initiator, in picoseconds. + * See IEEE P802.11-REVmc/D7.0, 11.24.6.4 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T3: TOD of ACK packet as recorded by + * initiator, in picoseconds. + * See IEEE P802.11-REVmc/D7.0, 11.24.6.4 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T4: TOA of ACK packet at + * responder, in picoseconds. + * See IEEE P802.11-REVmc/D7.0, 11.24.6.4 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_RSSI: RSSI (signal level) as recorded + * during this measurement exchange. Optional and will be provided if + * the hardware can measure it. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_TOD_ERR: TOD error reported by + * responder. Not always provided. + * See IEEE P802.11-REVmc/D7.0, 9.6.8.33 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_TOA_ERR: TOA error reported by + * responder. Not always provided. + * See IEEE P802.11-REVmc/D7.0, 9.6.8.33 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INITIATOR_TOD_ERR: TOD error measured by + * initiator. Not always provided. + * See IEEE P802.11-REVmc/D7.0, 9.6.8.33 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INITIATOR_TOA_ERR: TOA error measured by + * initiator. Not always provided. + * See IEEE P802.11-REVmc/D7.0, 9.6.8.33 for more information. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PAD: Dummy attribute for padding. + */ +enum qca_wlan_vendor_attr_ftm_meas { + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INVALID, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T1, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T2, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T3, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T4, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_RSSI, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_TOD_ERR, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_TOA_ERR, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INITIATOR_TOD_ERR, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INITIATOR_TOA_ERR, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PAD, + /* keep last */ + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_MAX = + QCA_WLAN_VENDOR_ATTR_FTM_MEAS_AFTER_LAST - 1, +}; + /** * enum qca_wlan_vendor_attr_p2p_listen_offload - vendor sub commands index * @QCA_WLAN_VENDOR_ATTR_P2P_LISTEN_OFFLOAD_INVALID: invalid value @@ -3050,6 +4063,20 @@ enum qca_wlan_vendor_drv_info { QCA_WLAN_VENDOR_ATTR_DRV_INFO_AFTER_LAST - 1, }; +/** + * enum qca_wlan_vendor_attr_aoa_type - AOA measurement type + * + * @QCA_WLAN_VENDOR_ATTR_AOA_TYPE_TOP_CIR_PHASE: Phase of the strongest + * CIR (channel impulse response) path for each antenna. + * @QCA_WLAN_VENDOR_ATTR_AOA_TYPE_TOP_CIR_PHASE_AMP: Phase and amplitude + * of the strongest CIR path for each antenna. + */ +enum qca_wlan_vendor_attr_aoa_type { + QCA_WLAN_VENDOR_ATTR_AOA_TYPE_TOP_CIR_PHASE, + QCA_WLAN_VENDOR_ATTR_AOA_TYPE_TOP_CIR_PHASE_AMP, + QCA_WLAN_VENDOR_ATTR_AOA_TYPE_MAX +}; + /** * enum qca_wlan_vendor_attr_encryption_test - Attributes to * validate encryption engine @@ -3088,6 +4115,82 @@ enum qca_wlan_vendor_attr_encryption_test { QCA_WLAN_VENDOR_ATTR_ENCRYPTION_TEST_AFTER_LAST - 1 }; +/** + * enum qca_wlan_vendor_attr_dmg_rf_sector_type - Type of + * sector for DMG RF sector operations. + * + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_TYPE_RX: RX sector + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_TYPE_TX: TX sector + */ +enum qca_wlan_vendor_attr_dmg_rf_sector_type { + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_TYPE_RX, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_TYPE_TX, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_TYPE_MAX +}; + +/** + * BRP antenna limit mode + * + * @QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE_DISABLE: Disable BRP force + * antenna limit, BRP will be performed as usual. + * @QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE_EFFECTIVE: Define maximal + * antennas limit. the hardware may use less antennas than the + * maximum limit. + * @QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE_FORCE: The hardware will + * use exactly the specified number of antennas for BRP. + */ +enum qca_wlan_vendor_attr_brp_ant_limit_mode { + QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE_DISABLE, + QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE_EFFECTIVE, + QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE_FORCE, + QCA_WLAN_VENDOR_ATTR_BRP_ANT_LIMIT_MODE_MAX +}; + +/** + * enum qca_wlan_vendor_attr_dmg_rf_sector_cfg - Attributes for + * DMG RF sector configuration for a single RF module. + * The values are defined in a compact way which closely matches + * the way it is stored in HW registers. + * The configuration provides values for 32 antennas and 8 distribution + * amplifiers, and together describes the characteristics of the RF + * sector - such as a beam in some direction with some gain. + * + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_MODULE_INDEX: Index + * of RF module for this configuration. + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_ETYPE0: Bit 0 of edge + * amplifier gain index. Unsigned 32 bit number containing + * bits for all 32 antennas. + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_ETYPE1: Bit 1 of edge + * amplifier gain index. Unsigned 32 bit number containing + * bits for all 32 antennas. + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_ETYPE2: Bit 2 of edge + * amplifier gain index. Unsigned 32 bit number containing + * bits for all 32 antennas. + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_PSH_HI: Phase values + * for first 16 antennas, 2 bits per antenna. + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_PSH_LO: Phase values + * for last 16 antennas, 2 bits per antenna. + * @QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_DTYPE_X16: Contains + * DTYPE values (3 bits) for each distribution amplifier, followed + * by X16 switch bits for each distribution amplifier. There are + * total of 8 distribution amplifiers. + */ +enum qca_wlan_vendor_attr_dmg_rf_sector_cfg { + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_INVALID = 0, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_MODULE_INDEX = 1, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_ETYPE0 = 2, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_ETYPE1 = 3, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_ETYPE2 = 4, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_PSH_HI = 5, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_PSH_LO = 6, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_DTYPE_X16 = 7, + + /* keep last */ + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_MAX = + QCA_WLAN_VENDOR_ATTR_DMG_RF_SECTOR_CFG_AFTER_LAST - 1 +}; + /** * enum qca_wlan_vendor_attr_tdls_configuration - Attributes for * @QCA_NL80211_VENDOR_SUBCMD_CONFIGURE_TDLS configuration to the host driver. @@ -3302,17 +4405,14 @@ enum qca_vendor_attr_sar_limits { * If MAC counters do not exceed the threshold, FW will report monitored * link layer counters periodically as this setting. The first report is * always triggered by this timer. - * @QCA_WLAN_VENDOR_ATTR_LL_STATS_CFG_THRESHOLD: It is a percentage(1 ~ 99). + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_CFG_THRESHOLD: It is a percentage (1-99). * For each MAC layer counter, FW holds two copies. One is the current value. * The other is the last report. Once a current counter's increment is larger - * than the theshold, FW will indicate that counter to host even the + * than the threshold, FW will indicate that counter to host even if the * monitoring timer does not expire. - * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_PEER_MAC_ADDRESS: Peer sta's MAC address - * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_PEER_PS_CHG: Peer sta power state change - * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_PEER_PS_STATE: Current power state of - * peer STA. - * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_TID: TID of msdu - * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_NUM_MSDU: Count of msdu with the same + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_PEER_PS_CHG: Peer STA power state change + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_TID: TID of MSDU + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_NUM_MSDU: Count of MSDU with the same * failure code. * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_TX_STATUS: TX failure code * 1: TX packet discarded @@ -3356,7 +4456,7 @@ enum qca_vendor_attr_sar_limits { * Bit11: Peer STA power save counter, total time in PS mode * Bit12: Probe request counter * Bit13: Other management frames counter - @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_CCA_BSS_BITMAP: bitmap for CCA + * @QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_CCA_BSS_BITMAP: bitmap for CCA * Bit0: Idle time * Bit1: TX time * Bit2: time RX in current bss @@ -3620,6 +4720,135 @@ enum qca_wlan_gpio_attr { QCA_WLAN_VENDOR_ATTR_GPIO_PARAM_LAST - 1, }; +/** + * qca_wlan_vendor_attr_external_acs_policy: Attribute values for + * QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_POLICY to the vendor subcmd + * QCA_NL80211_VENDOR_SUBCMD_EXTERNAL_ACS. This represents the + * external ACS policies to select the channels w.r.t. the PCL weights. + * (QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_EVENT_PCL represents the channels and + * their PCL weights.) + * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_POLICY_PCL_MANDATORY: Mandatory to + * select a channel with non-zero PCL weight. + * @QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_POLICY_PCL_PREFERRED: Prefer a + * channel with non-zero PCL weight. + * + */ +enum qca_wlan_vendor_attr_external_acs_policy { + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_POLICY_PCL_PREFERRED, + QCA_WLAN_VENDOR_ATTR_EXTERNAL_ACS_POLICY_PCL_MANDATORY, +}; + +/** + * enum qca_wlan_vendor_attr_spectral_scan - Spectral scan config parameters + */ +enum qca_wlan_vendor_attr_spectral_scan { + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_INVALID = 0, + /* + * Number of times the chip enters spectral scan mode before + * deactivating spectral scans. When set to 0, chip will enter spectral + * scan mode continuously. u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_SCAN_COUNT = 1, + /* + * Spectral scan period. Period increment resolution is 256*Tclk, + * where Tclk = 1/44 MHz (Gmode), 1/40 MHz (Amode). u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_SCAN_PERIOD = 2, + /* Spectral scan priority. u32 attribute. */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_PRIORITY = 3, + /* Number of FFT data points to compute. u32 attribute. */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_FFT_SIZE = 4, + /* + * Enable targeted gain change before starting the spectral scan FFT. + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_GC_ENA = 5, + /* Restart a queued spectral scan. u32 attribute. */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_RESTART_ENA = 6, + /* + * Noise floor reference number for the calculation of bin power. + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_NOISE_FLOOR_REF = 7, + /* + * Disallow spectral scan triggers after TX/RX packets by setting + * this delay value to roughly SIFS time period or greater. + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_INIT_DELAY = 8, + /* + * Number of strong bins (inclusive) per sub-channel, below + * which a signal is declared a narrow band tone. u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_NB_TONE_THR = 9, + /* + * Specify the threshold over which a bin is declared strong (for + * scan bandwidth analysis). u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_STR_BIN_THR = 10, + /* Spectral scan report mode. u32 attribute. */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_WB_RPT_MODE = 11, + /* + * RSSI report mode, if the ADC RSSI is below + * QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_RSSI_THR, + * then FFTs will not trigger, but timestamps and summaries get + * reported. u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_RSSI_RPT_MODE = 12, + /* + * ADC RSSI must be greater than or equal to this threshold (signed dB) + * to ensure spectral scan reporting with normal error code. + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_RSSI_THR = 13, + /* + * Format of frequency bin magnitude for spectral scan triggered FFTs: + * 0: linear magnitude, 1: log magnitude (20*log10(lin_mag)). + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_PWR_FORMAT = 14, + /* + * Format of FFT report to software for spectral scan triggered FFTs. + * 0: No FFT report (only spectral scan summary report) + * 1: 2-dword summary of metrics for each completed FFT + spectral scan + * report + * 2: 2-dword summary of metrics for each completed FFT + 1x-oversampled + * bins (in-band) per FFT + spectral scan summary report + * 3: 2-dword summary of metrics for each completed FFT + 2x-oversampled + * bins (all) per FFT + spectral scan summary report + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_RPT_MODE = 15, + /* + * Number of LSBs to shift out in order to scale the FFT bins. + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_BIN_SCALE = 16, + /* + * Set to 1 (with spectral_scan_pwr_format=1), to report bin magnitudes + * in dBm power. u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_DBM_ADJ = 17, + /* + * Per chain enable mask to select input ADC for search FFT. + * u32 attribute. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_CHN_MASK = 18, + /* + * An unsigned 64-bit integer provided by host driver to identify the + * spectral scan request. This attribute is included in the scan + * response message for @QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START + * and used as an attribute in + * @QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_STOP to identify the + * specific scan to be stopped. + */ + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_COOKIE = 19, + + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_MAX = + QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_AFTER_LAST - 1, +}; + #if !(defined (SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) && \ (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) && \ !(defined(WITH_BACKPORTS)) From e7148bdd675e7c9ef71bd04081638fa76af0f2bb Mon Sep 17 00:00:00 2001 From: Ravi Joshi Date: Mon, 9 Jan 2017 22:24:27 -0800 Subject: [PATCH 17/20] qcacmn: Add new files for supporting rx defragmentation on cdp Add new files for supporting receive defragmenation on converged data path. Change-Id: Ibe225cc116a10a94fd07add7964bba405b02414e CRs-Fixed: 1109359 --- dp/wifi3.0/dp_rx_defrag.c | 20 ++++++++++++++++++++ dp/wifi3.0/dp_rx_defrag.h | 24 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 dp/wifi3.0/dp_rx_defrag.c create mode 100644 dp/wifi3.0/dp_rx_defrag.h diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c new file mode 100644 index 000000000000..a8d3ecd13142 --- /dev/null +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2017 The Linux Foundation. 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 + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#include "dp_rx_defrag.h" + diff --git a/dp/wifi3.0/dp_rx_defrag.h b/dp/wifi3.0/dp_rx_defrag.h new file mode 100644 index 000000000000..2707db90e764 --- /dev/null +++ b/dp/wifi3.0/dp_rx_defrag.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2017 The Linux Foundation. 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 + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef _DP_RX_DEFRAG_H +#define _DP_RX_DEFRAG_H + +#include "hal_rx.h" + +#endif /* _DP_RX_DEFRAG_H */ From 36f68ad7cbe6f80b8367e8b5f17c480099cf3927 Mon Sep 17 00:00:00 2001 From: Ravi Joshi Date: Wed, 9 Nov 2016 17:09:47 -0800 Subject: [PATCH 18/20] qcacmn: Enable support for receive defragmentation Enable support for receive defragmentation on Lithium. Change-Id: I6c1213db29d3b6e0a11506d6945d9ea05ece2c73 CRs-Fixed: 1109359 --- dp/wifi3.0/dp_rx.h | 134 +++- dp/wifi3.0/dp_rx_defrag.c | 1345 +++++++++++++++++++++++++++++++++++ dp/wifi3.0/dp_rx_defrag.h | 109 ++- dp/wifi3.0/dp_rx_err.c | 47 +- dp/wifi3.0/dp_rx_mon_dest.c | 2 +- dp/wifi3.0/dp_types.h | 21 +- dp/wifi3.0/hal_rx.h | 430 ++++++++++- hal/wifi3.0/hal_api.h | 3 +- hal/wifi3.0/hal_internal.h | 3 + qdf/inc/qdf_status.h | 1 + 10 files changed, 2026 insertions(+), 69 deletions(-) diff --git a/dp/wifi3.0/dp_rx.h b/dp/wifi3.0/dp_rx.h index 88ef0e52d367..d5715da17526 100644 --- a/dp/wifi3.0/dp_rx.h +++ b/dp/wifi3.0/dp_rx.h @@ -80,6 +80,114 @@ struct dp_rx_desc { (((_cookie) & RX_DESC_COOKIE_INDEX_MASK) >> \ RX_DESC_COOKIE_INDEX_SHIFT) +/* + *dp_rx_xor_block() - xor block of data + *@b: destination data block + *@a: source data block + *@len: length of the data to process + * + *Returns: None + */ +static inline void dp_rx_xor_block(uint8_t *b, const uint8_t *a, qdf_size_t len) +{ + qdf_size_t i; + + for (i = 0; i < len; i++) + b[i] ^= a[i]; +} + +/* + *dp_rx_rotl() - rotate the bits left + *@val: unsigned integer input value + *@bits: number of bits + * + *Returns: Integer with left rotated by number of 'bits' + */ +static inline uint32_t dp_rx_rotl(uint32_t val, int bits) +{ + return (val << bits) | (val >> (32 - bits)); +} + +/* + *dp_rx_rotr() - rotate the bits right + *@val: unsigned integer input value + *@bits: number of bits + * + *Returns: Integer with right rotated by number of 'bits' + */ +static inline uint32_t dp_rx_rotr(uint32_t val, int bits) +{ + return (val >> bits) | (val << (32 - bits)); +} + +/* + *dp_rx_xswap() - swap the bits left + *@val: unsigned integer input value + * + *Returns: Integer with bits swapped + */ +static inline uint32_t dp_rx_xswap(uint32_t val) +{ + return ((val & 0x00ff00ff) << 8) | ((val & 0xff00ff00) >> 8); +} + +/* + *dp_rx_get_le32_split() - get little endian 32 bits split + *@b0: byte 0 + *@b1: byte 1 + *@b2: byte 2 + *@b3: byte 3 + * + *Returns: Integer with split little endian 32 bits + */ +static inline uint32_t dp_rx_get_le32_split(uint8_t b0, uint8_t b1, uint8_t b2, + uint8_t b3) +{ + return b0 | (b1 << 8) | (b2 << 16) | (b3 << 24); +} + +/* + *dp_rx_get_le32() - get little endian 32 bits + *@b0: byte 0 + *@b1: byte 1 + *@b2: byte 2 + *@b3: byte 3 + * + *Returns: Integer with little endian 32 bits + */ +static inline uint32_t dp_rx_get_le32(const uint8_t *p) +{ + return dp_rx_get_le32_split(p[0], p[1], p[2], p[3]); +} + +/* + * dp_rx_put_le32() - put little endian 32 bits + * @p: destination char array + * @v: source 32-bit integer + * + * Returns: None + */ +static inline void dp_rx_put_le32(uint8_t *p, uint32_t v) +{ + p[0] = (v) & 0xff; + p[1] = (v >> 8) & 0xff; + p[2] = (v >> 16) & 0xff; + p[3] = (v >> 24) & 0xff; +} + +/* Extract michal mic block of data */ +#define dp_rx_michael_block(l, r) \ + do { \ + r ^= dp_rx_rotl(l, 17); \ + l += r; \ + r ^= dp_rx_xswap(l); \ + l += r; \ + r ^= dp_rx_rotl(l, 3); \ + l += r; \ + r ^= dp_rx_rotr(l, 2); \ + l += r; \ + } while (0) + /** * struct dp_rx_desc_list_elem_t * @@ -340,6 +448,7 @@ static inline int check_x86_paddr(struct dp_soc *dp_soc, qdf_nbuf_t *rx_netbuf, return QDF_STATUS_E_FAILURE; } #endif + /** * dp_rx_cookie_2_link_desc_va() - Converts cookie to a virtual address of * the MSDU Link Descriptor @@ -392,10 +501,33 @@ void *dp_rx_cookie_2_mon_link_desc_va(struct dp_pdev *pdev, link_desc_va = pdev->link_desc_banks[buf_info->sw_cookie].base_vaddr + (buf_info->paddr - pdev->link_desc_banks[buf_info->sw_cookie].base_paddr); - return link_desc_va; } +/** + * dp_rx_defrag_concat() - Concatenate the fragments + * + * @dst: destination pointer to the buffer + * @src: source pointer from where the fragment payload is to be copied + * + * Return: QDF_STATUS + */ +static inline QDF_STATUS dp_rx_defrag_concat(qdf_nbuf_t dst, qdf_nbuf_t src) +{ + /* + * Inside qdf_nbuf_cat, if it is necessary to reallocate dst + * to provide space for src, the headroom portion is copied from + * the original dst buffer to the larger new dst buffer. + * (This is needed, because the headroom of the dst buffer + * contains the rx desc.) + */ + if (qdf_nbuf_cat(dst, src)) + return QDF_STATUS_E_DEFRAG_ERROR; + + return QDF_STATUS_SUCCESS; +} + + /* * dp_rx_buffers_replenish() - replenish rxdma ring with rx nbufs * called during dp rx initialization diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index a8d3ecd13142..75e9863ae255 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -16,5 +16,1350 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#include "dp_types.h" +#include "dp_rx.h" +#include "dp_peer.h" +#include "hal_api.h" +#include "qdf_trace.h" +#include "qdf_nbuf.h" +#include "dp_rx_defrag.h" +#include /* LLC_SNAP_HDR_LEN */ #include "dp_rx_defrag.h" +const struct dp_rx_defrag_cipher dp_f_ccmp = { + "AES-CCM", + IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_EXTIVLEN, + IEEE80211_WEP_MICLEN, + 0, +}; + +const struct dp_rx_defrag_cipher dp_f_tkip = { + "TKIP", + IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_EXTIVLEN, + IEEE80211_WEP_CRCLEN, + IEEE80211_WEP_MICLEN, +}; + +const struct dp_rx_defrag_cipher dp_f_wep = { + "WEP", + IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN, + IEEE80211_WEP_CRCLEN, + 0, +}; + +/* + * dp_rx_defrag_frames_free(): Free fragment chain + * @frames: Fragment chain + * + * Iterates through the fragment chain and frees them + * Returns: None + */ +static void dp_rx_defrag_frames_free(qdf_nbuf_t frames) +{ + qdf_nbuf_t next, frag = frames; + + while (frag) { + next = qdf_nbuf_next(frag); + qdf_nbuf_free(frag); + frag = next; + } +} + +/* + * dp_rx_clear_saved_desc_info(): Clears descriptor info + * @peer: Pointer to the peer data structure + * @tid: Transmit ID (TID) + * + * Saves MPDU descriptor info and MSDU link pointer from REO + * ring descriptor. The cache is created per peer, per TID + * + * Returns: None + */ +static void dp_rx_clear_saved_desc_info(struct dp_peer *peer, unsigned tid) +{ + hal_rx_clear_mpdu_desc_info( + &peer->rx_tid[tid].transcap_rx_mpdu_desc_info); + + hal_rx_clear_msdu_link_ptr( + &peer->rx_tid[tid].transcap_msdu_link_ptr[0], + HAL_RX_MAX_SAVED_RING_DESC); +} + +/* + * dp_rx_defrag_waitlist_add(): Update per-PDEV defrag wait list + * @peer: Pointer to the peer data structure + * @tid: Transmit ID (TID) + * + * Appends per-tid fragments to global fragment wait list + * + * Returns: None + */ +static void dp_rx_defrag_waitlist_add(struct dp_peer *peer, unsigned tid) +{ + struct dp_soc *psoc = peer->vdev->pdev->soc; + struct dp_rx_tid *rx_reorder = &peer->rx_tid[tid]; + + /* TODO: use LIST macros instead of TAIL macros */ + TAILQ_INSERT_TAIL(&psoc->rx.defrag.waitlist, rx_reorder, + defrag_waitlist_elem); +} + +/* + * dp_rx_defrag_waitlist_remove(): Remove fragments from waitlist + * @peer: Pointer to the peer data structure + * @tid: Transmit ID (TID) + * + * Remove fragments from waitlist + * + * Returns: None + */ +static void dp_rx_defrag_waitlist_remove(struct dp_peer *peer, unsigned tid) +{ + struct dp_pdev *pdev = peer->vdev->pdev; + struct dp_soc *soc = pdev->soc; + struct dp_rx_tid *rx_reorder; + + if (tid > DP_MAX_TIDS) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "TID out of bounds: %d", tid); + qdf_assert(0); + return; + } + + rx_reorder = &peer->rx_tid[tid]; + + if (rx_reorder->defrag_waitlist_elem.tqe_next != NULL) { + + TAILQ_REMOVE(&soc->rx.defrag.waitlist, rx_reorder, + defrag_waitlist_elem); + rx_reorder->defrag_waitlist_elem.tqe_next = NULL; + rx_reorder->defrag_waitlist_elem.tqe_prev = NULL; + } else if (rx_reorder->defrag_waitlist_elem.tqe_prev == NULL) { + + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "waitlist->tqe_prev is NULL"); + rx_reorder->defrag_waitlist_elem.tqe_next = NULL; + qdf_assert(0); + } +} + +/* + * dp_rx_defrag_fraglist_insert(): Create a per-sequence fragment list + * @peer: Pointer to the peer data structure + * @tid: Transmit ID (TID) + * @head_addr: Pointer to head list + * @tail_addr: Pointer to tail list + * @frag: Incoming fragment + * @all_frag_present: Flag to indicate whether all fragments are received + * + * Build a per-tid, per-sequence fragment list. + * + * Returns: None + */ +static void dp_rx_defrag_fraglist_insert(struct dp_peer *peer, unsigned tid, + qdf_nbuf_t *head_addr, qdf_nbuf_t *tail_addr, qdf_nbuf_t frag, + uint8_t *all_frag_present) +{ + qdf_nbuf_t next; + qdf_nbuf_t prev = NULL; + qdf_nbuf_t cur; + uint16_t head_fragno, cur_fragno, next_fragno; + uint8_t last_morefrag = 1, count = 0; + struct dp_rx_tid *rx_tid = &peer->rx_tid[tid]; + uint8_t *rx_desc_info; + + qdf_assert(frag); + qdf_assert(head_addr); + qdf_assert(tail_addr); + + rx_desc_info = qdf_nbuf_data(frag); + cur_fragno = dp_rx_frag_get_mpdu_frag_number(rx_desc_info); + + /* If this is the first fragment */ + if (!(*head_addr)) { + *head_addr = *tail_addr = frag; + qdf_nbuf_set_next(*tail_addr, NULL); + rx_tid->curr_frag_num = cur_fragno; + + goto end; + } + + /* In sequence fragment */ + if (cur_fragno > rx_tid->curr_frag_num) { + qdf_nbuf_set_next(*tail_addr, frag); + *tail_addr = frag; + qdf_nbuf_set_next(*tail_addr, NULL); + rx_tid->curr_frag_num = cur_fragno; + } else { + /* Out of sequence fragment */ + cur = *head_addr; + rx_desc_info = qdf_nbuf_data(cur); + head_fragno = dp_rx_frag_get_mpdu_frag_number(rx_desc_info); + + if (cur_fragno == head_fragno) { + qdf_nbuf_free(frag); + *all_frag_present = 0; + } else if (head_fragno > cur_fragno) { + qdf_nbuf_set_next(frag, cur); + cur = frag; + *head_addr = frag; /* head pointer to be updated */ + } else { + while ((cur_fragno > head_fragno) && cur != NULL) { + prev = cur; + cur = qdf_nbuf_next(cur); + rx_desc_info = qdf_nbuf_data(cur); + head_fragno = + dp_rx_frag_get_mpdu_frag_number( + rx_desc_info); + } + qdf_nbuf_set_next(prev, frag); + qdf_nbuf_set_next(frag, cur); + } + } + + next = qdf_nbuf_next(*head_addr); + + rx_desc_info = qdf_nbuf_data(*tail_addr); + last_morefrag = hal_rx_get_rx_more_frag_bit(rx_desc_info); + + /* TODO: optimize the loop */ + if (!last_morefrag) { + /* Check if all fragments are present */ + do { + rx_desc_info = qdf_nbuf_data(next); + next_fragno = + dp_rx_frag_get_mpdu_frag_number(rx_desc_info); + count++; + + if (next_fragno != count) + break; + + next = qdf_nbuf_next(next); + } while (next); + + if (!next) { + *all_frag_present = 1; + return; + } + } + +end: + *all_frag_present = 0; +} + + +/* + * dp_rx_defrag_tkip_decap(): decap tkip encrypted fragment + * @msdu: Pointer to the fragment + * @hdrlen: 802.11 header length (mostly useful in 4 addr frames) + * + * decap tkip encrypted fragment + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_tkip_decap(qdf_nbuf_t msdu, uint16_t hdrlen) +{ + uint8_t *ivp, *orig_hdr; + int rx_desc_len = sizeof(struct rx_pkt_tlvs); + + /* start of 802.11 header info */ + orig_hdr = (uint8_t *)(qdf_nbuf_data(msdu) + rx_desc_len); + + /* TKIP header is located post 802.11 header */ + ivp = orig_hdr + hdrlen; + if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "IEEE80211_WEP_EXTIV is missing in TKIP fragment"); + return QDF_STATUS_E_DEFRAG_ERROR; + } + + qdf_mem_move(orig_hdr + dp_f_tkip.ic_header, orig_hdr, hdrlen); + + qdf_nbuf_pull_head(msdu, dp_f_tkip.ic_header); + qdf_nbuf_trim_tail(msdu, dp_f_tkip.ic_trailer); + + return QDF_STATUS_SUCCESS; +} + +/* + * dp_rx_defrag_ccmp_demic(): Remove MIC information from CCMP fragment + * @nbuf: Pointer to the fragment buffer + * @hdrlen: 802.11 header length (mostly useful in 4 addr frames) + * + * Remove MIC information from CCMP fragment + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_ccmp_demic(qdf_nbuf_t nbuf, uint16_t hdrlen) +{ + uint8_t *ivp, *orig_hdr; + int rx_desc_len = sizeof(struct rx_pkt_tlvs); + + /* start of the 802.11 header */ + orig_hdr = (uint8_t *)(qdf_nbuf_data(nbuf) + rx_desc_len); + + /* CCMP header is located after 802.11 header */ + ivp = orig_hdr + hdrlen; + if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) + return QDF_STATUS_E_DEFRAG_ERROR; + + qdf_nbuf_trim_tail(nbuf, dp_f_ccmp.ic_trailer); + + return QDF_STATUS_SUCCESS; +} + +/* + * dp_rx_defrag_ccmp_decap(): decap CCMP encrypted fragment + * @nbuf: Pointer to the fragment + * @hdrlen: length of the header information + * + * decap CCMP encrypted fragment + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_ccmp_decap(qdf_nbuf_t nbuf, uint16_t hdrlen) +{ + uint8_t *ivp, *origHdr; + int rx_desc_len = sizeof(struct rx_pkt_tlvs); + + origHdr = (uint8_t *) (qdf_nbuf_data(nbuf) + rx_desc_len); + ivp = origHdr + hdrlen; + + if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) + return QDF_STATUS_E_DEFRAG_ERROR; + + qdf_mem_move(origHdr + dp_f_ccmp.ic_header, origHdr, hdrlen); + qdf_nbuf_pull_head(nbuf, dp_f_ccmp.ic_header); + + return QDF_STATUS_SUCCESS; +} + +/* + * dp_rx_defrag_wep_decap(): decap WEP encrypted fragment + * @msdu: Pointer to the fragment + * @hdrlen: length of the header information + * + * decap WEP encrypted fragment + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_wep_decap(qdf_nbuf_t msdu, uint16_t hdrlen) +{ + uint8_t *origHdr; + int rx_desc_len = sizeof(struct rx_pkt_tlvs); + + origHdr = (uint8_t *) (qdf_nbuf_data(msdu) + rx_desc_len); + qdf_mem_move(origHdr + dp_f_wep.ic_header, origHdr, hdrlen); + + qdf_nbuf_pull_head(msdu, dp_f_wep.ic_header); + qdf_nbuf_trim_tail(msdu, dp_f_wep.ic_trailer); + + return QDF_STATUS_SUCCESS; +} + +/* + * dp_rx_defrag_hdrsize(): Calculate the header size of the received fragment + * @nbuf: Pointer to the fragment + * + * Calculate the header size of the received fragment + * + * Returns: header size (uint16_t) + */ +static uint16_t dp_rx_defrag_hdrsize(qdf_nbuf_t nbuf) +{ + uint8_t *rx_tlv_hdr = qdf_nbuf_data(nbuf); + uint16_t size = sizeof(struct ieee80211_frame); + uint16_t fc = 0; + uint32_t to_ds, fr_ds; + uint8_t frm_ctrl_valid; + uint16_t frm_ctrl_field; + + to_ds = hal_rx_mpdu_get_to_ds(rx_tlv_hdr); + fr_ds = hal_rx_mpdu_get_fr_ds(rx_tlv_hdr); + frm_ctrl_valid = hal_rx_get_mpdu_frame_control_valid(rx_tlv_hdr); + frm_ctrl_field = hal_rx_get_frame_ctrl_field(rx_tlv_hdr); + + if (to_ds && fr_ds) + size += IEEE80211_ADDR_LEN; + + if (frm_ctrl_valid) { + fc = frm_ctrl_field; + + /* use 1-st byte for validation */ + if (DP_RX_DEFRAG_IEEE80211_QOS_HAS_SEQ(fc & 0xff)) { + size += sizeof(uint16_t); + /* use 2-nd byte for validation */ + if (((fc & 0xff00) >> 8) & IEEE80211_FC1_ORDER) + size += sizeof(struct ieee80211_htc); + } + } + + return size; +} + +/* + * dp_rx_defrag_michdr(): Calculate a psuedo MIC header + * @wh0: Pointer to the wireless header of the fragment + * @hdr: Array to hold the psuedo header + * + * Calculate a psuedo MIC header + * + * Returns: None + */ +static void dp_rx_defrag_michdr(const struct ieee80211_frame *wh0, + uint8_t hdr[]) +{ + const struct ieee80211_frame_addr4 *wh = + (const struct ieee80211_frame_addr4 *)wh0; + + switch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) { + case IEEE80211_FC1_DIR_NODS: + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr1); /* DA */ + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + wh->i_addr2); + break; + case IEEE80211_FC1_DIR_TODS: + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr3); /* DA */ + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + wh->i_addr2); + break; + case IEEE80211_FC1_DIR_FROMDS: + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr1); /* DA */ + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + wh->i_addr3); + break; + case IEEE80211_FC1_DIR_DSTODS: + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr3); /* DA */ + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + wh->i_addr4); + break; + } + + /* + * Bit 7 is IEEE80211_FC0_SUBTYPE_QOS for data frame, but + * it could also be set for deauth, disassoc, action, etc. for + * a mgt type frame. It comes into picture for MFP. + */ + if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) { + const struct ieee80211_qosframe *qwh = + (const struct ieee80211_qosframe *)wh; + hdr[12] = qwh->i_qos[0] & IEEE80211_QOS_TID; + } else { + hdr[12] = 0; + } + + hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */ +} + +/* + * dp_rx_defrag_mic(): Calculate MIC header + * @key: Pointer to the key + * @wbuf: fragment buffer + * @off: Offset + * @data_len: Data lengh + * @mic: Array to hold MIC + * + * Calculate a psuedo MIC header + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_mic(const uint8_t *key, qdf_nbuf_t wbuf, + uint16_t off, uint16_t data_len, uint8_t mic[]) +{ + uint8_t hdr[16] = { 0, }; + uint32_t l, r; + const uint8_t *data; + uint32_t space; + int rx_desc_len = sizeof(struct rx_pkt_tlvs); + + dp_rx_defrag_michdr((struct ieee80211_frame *)(qdf_nbuf_data(wbuf) + + rx_desc_len), hdr); + l = dp_rx_get_le32(key); + r = dp_rx_get_le32(key + 4); + + /* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */ + l ^= dp_rx_get_le32(hdr); + dp_rx_michael_block(l, r); + l ^= dp_rx_get_le32(&hdr[4]); + dp_rx_michael_block(l, r); + l ^= dp_rx_get_le32(&hdr[8]); + dp_rx_michael_block(l, r); + l ^= dp_rx_get_le32(&hdr[12]); + dp_rx_michael_block(l, r); + + /* first buffer has special handling */ + data = (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len + off; + space = qdf_nbuf_len(wbuf) - rx_desc_len - off; + + for (;; ) { + if (space > data_len) + space = data_len; + + /* collect 32-bit blocks from current buffer */ + while (space >= sizeof(uint32_t)) { + l ^= dp_rx_get_le32(data); + dp_rx_michael_block(l, r); + data += sizeof(uint32_t); + space -= sizeof(uint32_t); + data_len -= sizeof(uint32_t); + } + if (data_len < sizeof(uint32_t)) + break; + + wbuf = qdf_nbuf_next(wbuf); + if (wbuf == NULL) + return QDF_STATUS_E_DEFRAG_ERROR; + + if (space != 0) { + const uint8_t *data_next; + /* + * Block straddles buffers, split references. + */ + data_next = + (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len; + if ((qdf_nbuf_len(wbuf) - rx_desc_len) < + sizeof(uint32_t) - space) { + return QDF_STATUS_E_DEFRAG_ERROR; + } + switch (space) { + case 1: + l ^= dp_rx_get_le32_split(data[0], + data_next[0], data_next[1], + data_next[2]); + data = data_next + 3; + space = (qdf_nbuf_len(wbuf) - rx_desc_len) + - 3; + break; + case 2: + l ^= dp_rx_get_le32_split(data[0], data[1], + data_next[0], data_next[1]); + data = data_next + 2; + space = (qdf_nbuf_len(wbuf) - rx_desc_len) + - 2; + break; + case 3: + l ^= dp_rx_get_le32_split(data[0], data[1], + data[2], data_next[0]); + data = data_next + 1; + space = (qdf_nbuf_len(wbuf) - rx_desc_len) + - 1; + break; + } + dp_rx_michael_block(l, r); + data_len -= sizeof(uint32_t); + } else { + /* + * Setup for next buffer. + */ + data = (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len; + space = qdf_nbuf_len(wbuf) - rx_desc_len; + } + } + /* Last block and padding (0x5a, 4..7 x 0) */ + switch (data_len) { + case 0: + l ^= dp_rx_get_le32_split(0x5a, 0, 0, 0); + break; + case 1: + l ^= dp_rx_get_le32_split(data[0], 0x5a, 0, 0); + break; + case 2: + l ^= dp_rx_get_le32_split(data[0], data[1], 0x5a, 0); + break; + case 3: + l ^= dp_rx_get_le32_split(data[0], data[1], data[2], 0x5a); + break; + } + dp_rx_michael_block(l, r); + dp_rx_michael_block(l, r); + dp_rx_put_le32(mic, l); + dp_rx_put_le32(mic + 4, r); + + return QDF_STATUS_SUCCESS; +} + +/* + * dp_rx_defrag_tkip_demic(): Remove MIC header from the TKIP frame + * @key: Pointer to the key + * @msdu: fragment buffer + * @hdrlen: Length of the header information + * + * Remove MIC information from the TKIP frame + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_tkip_demic(const uint8_t *key, + qdf_nbuf_t msdu, uint16_t hdrlen) +{ + QDF_STATUS status; + uint32_t pktlen; + uint8_t mic[IEEE80211_WEP_MICLEN]; + uint8_t mic0[IEEE80211_WEP_MICLEN]; + int rx_desc_len = sizeof(struct rx_pkt_tlvs); + + pktlen = qdf_nbuf_len(msdu) - rx_desc_len; + + status = dp_rx_defrag_mic(key, msdu, hdrlen, + pktlen - (hdrlen + dp_f_tkip.ic_miclen), mic); + + if (QDF_IS_STATUS_ERROR(status)) + return status; + + qdf_nbuf_copy_bits(msdu, pktlen - dp_f_tkip.ic_miclen + rx_desc_len, + dp_f_tkip.ic_miclen, (caddr_t)mic0); + + if (!qdf_mem_cmp(mic, mic0, dp_f_tkip.ic_miclen)) + return QDF_STATUS_E_DEFRAG_ERROR; + + qdf_nbuf_trim_tail(msdu, dp_f_tkip.ic_miclen); + + return QDF_STATUS_SUCCESS; +} + +/* + * dp_rx_defrag_decap_recombine(): Recombine the fragments + * @peer: Pointer to the peer + * @frag_list: list of fragments + * @tid: Transmit identifier + * @hdrsize: Header size + * + * Recombine fragments + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_decap_recombine(struct dp_peer *peer, + qdf_nbuf_t head_msdu, unsigned tid, uint16_t hdrsize) +{ + qdf_nbuf_t msdu = head_msdu; + uint8_t i; + uint8_t num_ring_desc_saved = peer->rx_tid[tid].curr_ring_desc_idx; + uint8_t num_msdus; + + /* Stitch fragments together */ + for (i = 0; (i < num_ring_desc_saved) && msdu; i++) { + + struct hal_rx_msdu_link_ptr_info *msdu_link_ptr_info = + &peer->rx_tid[tid].transcap_msdu_link_ptr[i]; + + struct hal_rx_mpdu_desc_info *mpdu_desc_info = + &peer->rx_tid[tid].transcap_rx_mpdu_desc_info; + + num_msdus = hal_rx_chain_msdu_links(msdu, msdu_link_ptr_info, + mpdu_desc_info); + + msdu = qdf_nbuf_next(msdu); + } + + return QDF_STATUS_SUCCESS; +} + +/** + * dp_rx_defrag_err() - rx err handler + * @pdev: handle to pdev object + * @vdev_id: vdev id + * @peer_mac_addr: peer mac address + * @tid: TID + * @tsf32: TSF + * @err_type: error type + * @rx_frame: rx frame + * @pn: PN Number + * @key_id: key id + * + * This function handles rx error and send MIC error notification + * + * Return: None + */ +static void dp_rx_defrag_err(uint8_t vdev_id, uint8_t *peer_mac_addr, + int tid, uint32_t tsf32, uint32_t err_type, qdf_nbuf_t rx_frame, + uint64_t *pn, uint8_t key_id) +{ + /* TODO: Who needs to know about the TKIP MIC error */ +} + +/* + * dp_rx_defrag_qos_decap(): Remove QOS header from the frame + * @nbuf: Pointer to the frame buffer + * @hdrlen: Length of the header information + * + * Recombine fragments + * + * Returns: None + */ +static void dp_rx_defrag_qos_decap(qdf_nbuf_t nbuf, uint16_t hdrlen) +{ + struct ieee80211_frame *wh; + uint16_t qoslen; + int pkt_tlv_size = sizeof(struct rx_pkt_tlvs); /* pkt TLV hdr size */ + uint16_t fc = 0; + + uint8_t *rx_tlv_hdr = qdf_nbuf_data(nbuf); + + /* Get the frame control field if it is valid */ + if (hal_rx_get_mpdu_frame_control_valid(rx_tlv_hdr)) + fc = hal_rx_get_frame_ctrl_field(rx_tlv_hdr); + + wh = (struct ieee80211_frame *)(qdf_nbuf_data(nbuf) + pkt_tlv_size); + + if (DP_RX_DEFRAG_IEEE80211_QOS_HAS_SEQ(fc & 0xff)) { + qoslen = sizeof(struct ieee80211_qoscntl); + + /* Qos frame with Order bit set indicates a HTC frame */ + if (((fc & 0xff00) >> 8) & IEEE80211_FC1_ORDER) + qoslen += sizeof(struct ieee80211_htc); + + /* remove QoS field from header */ + hdrlen -= qoslen; + qdf_mem_move((uint8_t *)wh + qoslen, wh, hdrlen); + + wh = (struct ieee80211_frame *)qdf_nbuf_pull_head(nbuf, + pkt_tlv_size + + qoslen); + /* clear QoS bit */ + if (wh) + wh->i_fc[0] &= ~IEEE80211_FC0_SUBTYPE_QOS; + } +} + +/* + * dp_rx_defrag_nwifi_to_8023(): Transcap 802.11 to 802.3 + * @msdu: Pointer to the fragment buffer + * + * Transcap the fragment from 802.11 to 802.3 + * + * Returns: None + */ +static void dp_rx_defrag_nwifi_to_8023(qdf_nbuf_t msdu) +{ + struct ieee80211_frame wh; + uint32_t hdrsize; + struct llc_snap_hdr_t llchdr; + struct ethernet_hdr_t *eth_hdr; + int rx_desc_len = sizeof(struct rx_pkt_tlvs); + struct ieee80211_frame *wh_ptr; + + wh_ptr = (struct ieee80211_frame *)(qdf_nbuf_data(msdu) + + rx_desc_len); + qdf_mem_copy(&wh, wh_ptr, sizeof(wh)); + hdrsize = sizeof(struct ieee80211_frame); + qdf_mem_copy(&llchdr, ((uint8_t *) (qdf_nbuf_data(msdu) + + rx_desc_len)) + hdrsize, + sizeof(struct llc_snap_hdr_t)); + + /* + * Now move the data pointer to the beginning of the mac header : + * new-header = old-hdr + (wifihdrsize + llchdrsize - ethhdrsize) + */ + qdf_nbuf_pull_head(msdu, (rx_desc_len + hdrsize + + sizeof(struct llc_snap_hdr_t) - + sizeof(struct ethernet_hdr_t))); + eth_hdr = (struct ethernet_hdr_t *)(qdf_nbuf_data(msdu)); + + switch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) { + case IEEE80211_FC1_DIR_NODS: + qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1, + IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->src_addr, wh.i_addr2, + IEEE80211_ADDR_LEN); + break; + case IEEE80211_FC1_DIR_TODS: + qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr3, + IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->src_addr, wh.i_addr2, + IEEE80211_ADDR_LEN); + break; + case IEEE80211_FC1_DIR_FROMDS: + qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1, + IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->src_addr, wh.i_addr3, + IEEE80211_ADDR_LEN); + break; + case IEEE80211_FC1_DIR_DSTODS: + break; + } + + /* TODO: Is it requried to copy rx_pkt_tlvs + * to the start of data buffer? + */ + qdf_mem_copy(eth_hdr->ethertype, llchdr.ethertype, + sizeof(llchdr.ethertype)); +} + +/* + * dp_rx_defrag_reo_reinject(): Reinject the fragment chain back into REO + * @peer: Pointer to the peer + * @tid: Transmit Identifier + * + * Reinject the fragment chain back into REO + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_reo_reinject(struct dp_peer *peer, + unsigned tid) +{ + struct dp_pdev *pdev = peer->vdev->pdev; + struct dp_soc *soc = pdev->soc; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + void *ring_desc; + enum hal_reo_error_status error; + struct hal_rx_mpdu_desc_info *saved_mpdu_desc_info; + void *hal_srng = soc->reo_reinject_ring.hal_srng; + struct hal_rx_msdu_link_ptr_info *saved_msdu_link_ptr; + + if (qdf_unlikely(hal_srng_access_start(soc->hal_soc, hal_srng))) { + + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "HAL RING Access For WBM Release SRNG Failed: %p", + hal_srng); + goto done; + } + + ring_desc = hal_srng_src_get_next(soc->hal_soc, hal_srng); + + qdf_assert(ring_desc); + + error = HAL_RX_ERROR_STATUS_GET(ring_desc); + + if (qdf_unlikely(error == HAL_REO_ERROR_DETECTED)) { + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, + "HAL RING 0x%p:error %d", hal_srng, error); + + /* Don't know how to deal with this condition -- assert */ + qdf_assert(0); + goto done; + } + + saved_mpdu_desc_info = + &peer->rx_tid[tid].transcap_rx_mpdu_desc_info; + + /* first msdu link pointer */ + saved_msdu_link_ptr = + &peer->rx_tid[tid].transcap_msdu_link_ptr[0]; + + hal_rx_defrag_update_src_ring_desc(ring_desc, + saved_mpdu_desc_info, saved_msdu_link_ptr); + + status = QDF_STATUS_SUCCESS; +done: + hal_srng_access_end(soc->hal_soc, hal_srng); + return status; +} + +/* + * dp_rx_defrag(): Defragment the fragment chain + * @peer: Pointer to the peer + * @tid: Transmit Identifier + * @frag_list: Pointer to head list + * @frag_list_tail: Pointer to tail list + * + * Defragment the fragment chain + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag(struct dp_peer *peer, unsigned tid, + qdf_nbuf_t frag_list, qdf_nbuf_t frag_list_tail) +{ + qdf_nbuf_t tmp_next; + qdf_nbuf_t cur = frag_list, msdu; + + uint32_t index, tkip_demic = 0; + uint16_t hdr_space; + QDF_STATUS status; + uint8_t key[DEFRAG_IEEE80211_KEY_LEN]; + struct dp_vdev *vdev = peer->vdev; + + cur = frag_list; + hdr_space = dp_rx_defrag_hdrsize(cur); + index = hal_rx_msdu_is_wlan_mcast(cur) ? + dp_sec_mcast : dp_sec_ucast; + + switch (peer->security[index].sec_type) { + case htt_sec_type_tkip: + tkip_demic = 1; + + case htt_sec_type_tkip_nomic: + while (cur) { + tmp_next = qdf_nbuf_next(cur); + if (dp_rx_defrag_tkip_decap(cur, hdr_space)) { + + /* TKIP decap failed, discard frags */ + dp_rx_defrag_frames_free(frag_list); + + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_ERROR, + "dp_rx_defrag: TKIP decap failed"); + + return QDF_STATUS_E_DEFRAG_ERROR; + } + cur = tmp_next; + } + break; + + case htt_sec_type_aes_ccmp: + while (cur) { + tmp_next = qdf_nbuf_next(cur); + if (dp_rx_defrag_ccmp_demic(cur, hdr_space)) { + + /* CCMP demic failed, discard frags */ + dp_rx_defrag_frames_free(frag_list); + + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_ERROR, + "dp_rx_defrag: CCMP demic failed"); + + return QDF_STATUS_E_DEFRAG_ERROR; + } + if (dp_rx_defrag_ccmp_decap(cur, hdr_space)) { + + /* CCMP decap failed, discard frags */ + dp_rx_defrag_frames_free(frag_list); + + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_ERROR, + "dp_rx_defrag: CCMP decap failed"); + + return QDF_STATUS_E_DEFRAG_ERROR; + } + cur = tmp_next; + } + break; + case htt_sec_type_wep40: + case htt_sec_type_wep104: + case htt_sec_type_wep128: + while (cur) { + tmp_next = qdf_nbuf_next(cur); + if (dp_rx_defrag_wep_decap(cur, hdr_space)) { + + /* WEP decap failed, discard frags */ + dp_rx_defrag_frames_free(frag_list); + + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_ERROR, + "dp_rx_defrag: WEP decap failed"); + + return QDF_STATUS_E_DEFRAG_ERROR; + } + cur = tmp_next; + } + break; + default: + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_ERROR, + "dp_rx_defrag: Did not match any security type"); + break; + } + + if (tkip_demic) { + msdu = frag_list_tail; /* Only last fragment has the MIC */ + + qdf_mem_copy(key, + peer->security[index].michael_key, + sizeof(peer->security[index].michael_key)); + if (dp_rx_defrag_tkip_demic(key, msdu, hdr_space)) { + qdf_nbuf_free(msdu); + dp_rx_defrag_err(vdev->vdev_id, peer->mac_addr.raw, + tid, 0, QDF_STATUS_E_DEFRAG_ERROR, msdu, + NULL, 0); + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "dp_rx_defrag: TKIP demic failed"); + return QDF_STATUS_E_DEFRAG_ERROR; + } + } + + dp_rx_defrag_qos_decap(cur, hdr_space); + + /* Convert the header to 802.3 header */ + dp_rx_defrag_nwifi_to_8023(cur); + + status = dp_rx_defrag_decap_recombine(peer, cur, tid, hdr_space); + + if (QDF_IS_STATUS_ERROR(status)) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "dp_rx_defrag_decap_recombine failed"); + + qdf_assert(0); + } + + return status; +} + +/* + * dp_rx_defrag_cleanup(): Clean up activities + * @peer: Pointer to the peer + * @tid: Transmit Identifier + * @seq: Sequence number + * + * Returns: None + */ +static void dp_rx_defrag_cleanup(struct dp_peer *peer, unsigned tid, + uint16_t seq) +{ + struct dp_rx_reorder_array_elem *rx_reorder_array_elem = + &peer->rx_tid[tid].array[seq]; + + /* Free up nbufs */ + dp_rx_defrag_frames_free(rx_reorder_array_elem->head); + + /* Free up saved ring descriptors */ + dp_rx_clear_saved_desc_info(peer, tid); + + rx_reorder_array_elem->head = NULL; + rx_reorder_array_elem->tail = NULL; + peer->rx_tid[tid].defrag_timeout_ms = 0; + peer->rx_tid[tid].curr_frag_num = 0; + peer->rx_tid[tid].curr_seq_num = 0; + peer->rx_tid[tid].curr_ring_desc_idx = 0; +} + +/* + * dp_rx_defrag_save_info_from_ring_desc(): Save info from REO ring descriptor + * @ring_desc: Pointer to the ring descriptor + * @peer: Pointer to the peer + * @tid: Transmit Identifier + * @mpdu_desc_info: MPDU descriptor info + * + * Returns: None + */ +static void dp_rx_defrag_save_info_from_ring_desc(void *ring_desc, + struct dp_peer *peer, unsigned tid, + struct hal_rx_mpdu_desc_info *mpdu_desc_info) +{ + struct dp_pdev *pdev = peer->vdev->pdev; + void *msdu_link_desc_va = NULL; + uint8_t idx = peer->rx_tid[tid].curr_ring_desc_idx; + uint8_t rbm; + + struct hal_rx_msdu_link_ptr_info *msdu_link_ptr_info = + &peer->rx_tid[tid].transcap_msdu_link_ptr[++idx]; + struct hal_rx_mpdu_desc_info *tmp_mpdu_desc_info = + &peer->rx_tid[tid].transcap_rx_mpdu_desc_info; + struct hal_buf_info hbi; + + rbm = hal_rx_ret_buf_manager_get(ring_desc); + if (qdf_unlikely(rbm != HAL_RX_BUF_RBM_SW3_BM)) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Invalid RBM while chaining frag MSDUs"); + return; + } + + hal_rx_reo_buf_paddr_get(ring_desc, &hbi); + + msdu_link_desc_va = + dp_rx_cookie_2_link_desc_va(pdev->soc, &hbi); + + hal_rx_defrag_save_info_from_ring_desc(msdu_link_desc_va, + msdu_link_ptr_info, &hbi); + + qdf_mem_copy(tmp_mpdu_desc_info, mpdu_desc_info, + sizeof(*tmp_mpdu_desc_info)); +} + +/* + * dp_rx_defrag_store_fragment(): Store incoming fragments + * @soc: Pointer to the SOC data structure + * @ring_desc: Pointer to the ring descriptor + * @mpdu_desc_info: MPDU descriptor info + * @msdu_info: Pointer to MSDU descriptor info + * @tid: Traffic Identifier + * @rx_desc: Pointer to rx descriptor + * + * Returns: QDF_STATUS + */ +static QDF_STATUS dp_rx_defrag_store_fragment(struct dp_soc *soc, + void *ring_desc, + union dp_rx_desc_list_elem_t **head, + union dp_rx_desc_list_elem_t **tail, + struct hal_rx_mpdu_desc_info *mpdu_desc_info, + struct hal_rx_msdu_desc_info *msdu_info, + unsigned tid, struct dp_rx_desc *rx_desc) +{ + uint8_t idx; + struct dp_rx_reorder_array_elem *rx_reorder_array_elem; + struct dp_pdev *pdev; + struct dp_peer *peer; + uint16_t peer_id; + uint16_t rxseq, seq; + uint8_t fragno, more_frag, all_frag_present = 0; + uint16_t seq_num = mpdu_desc_info->mpdu_seq; + QDF_STATUS status; + struct dp_rx_tid *rx_tid; + uint8_t mpdu_sequence_control_valid; + uint8_t mpdu_frame_control_valid; + qdf_nbuf_t frag = rx_desc->nbuf; + uint8_t *rx_desc_info; + + /* Check if the packet is from a valid peer */ + peer_id = DP_PEER_METADATA_PEER_ID_GET( + mpdu_desc_info->peer_meta_data); + peer = dp_peer_find_by_id(soc, peer_id); + + if (!peer) { + /* We should not recieve anything from unknown peer + * however, that might happen while we are in the monitor mode. + * We don't need to handle that here + */ + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Unknown peer, dropping the fragment"); + + qdf_nbuf_free(frag); + dp_rx_add_to_free_desc_list(head, tail, rx_desc); + + return QDF_STATUS_E_DEFRAG_ERROR; + } + + pdev = peer->vdev->pdev; + rx_tid = &peer->rx_tid[tid]; + + seq = seq_num & (peer->rx_tid[tid].ba_win_size - 1); + qdf_assert(seq == 0); + rx_reorder_array_elem = &peer->rx_tid[tid].array[seq]; + + rx_desc_info = qdf_nbuf_data(frag); + mpdu_sequence_control_valid = + hal_rx_get_mpdu_sequence_control_valid(rx_desc_info); + + /* Invalid MPDU sequence control field, MPDU is of no use */ + if (!mpdu_sequence_control_valid) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Invalid MPDU seq control field, dropping MPDU"); + qdf_nbuf_free(frag); + dp_rx_add_to_free_desc_list(head, tail, rx_desc); + + qdf_assert(0); + goto end; + } + + mpdu_frame_control_valid = + hal_rx_get_mpdu_frame_control_valid(rx_desc_info); + + /* Invalid frame control field */ + if (!mpdu_frame_control_valid) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Invalid frame control field, dropping MPDU"); + qdf_nbuf_free(frag); + dp_rx_add_to_free_desc_list(head, tail, rx_desc); + + qdf_assert(0); + goto end; + } + + /* Current mpdu sequence */ + rxseq = hal_rx_get_rx_sequence(rx_desc_info); + more_frag = hal_rx_get_rx_more_frag_bit(rx_desc_info); + + /* HW does not populate the fragment number as of now + * need to get from the 802.11 header + */ + fragno = dp_rx_frag_get_mpdu_frag_number(rx_desc_info); + + /* + * !more_frag: no more fragments to be delivered + * !frag_no: packet is not fragmented + * !rx_reorder_array_elem->head: no saved fragments so far + */ + if ((!more_frag) && (!fragno) && (!rx_reorder_array_elem->head)) { + /* We should not get into this situation here. + * It means an unfragmented packet with fragment flag + * is delivered over the REO exception ring. + * Typically it follows normal rx path. + */ + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Rcvd unfragmented pkt on REO Err srng, dropping"); + qdf_nbuf_free(frag); + dp_rx_add_to_free_desc_list(head, tail, rx_desc); + + qdf_assert(0); + goto end; + } + + /* Check if the fragment is for the same sequence or a different one */ + if (rx_reorder_array_elem->head) { + + if (rxseq != rx_tid->curr_seq_num) { + + /* Drop stored fragments if out of sequence + * fragment is received + */ + dp_rx_defrag_frames_free(rx_reorder_array_elem->head); + + rx_reorder_array_elem->head = NULL; + rx_reorder_array_elem->tail = NULL; + + /* + * The sequence number for this fragment becomes the + * new sequence number to be processed + */ + rx_tid->curr_seq_num = rxseq; + + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "%s mismatch, dropping earlier sequence ", + (rxseq == rx_tid->curr_seq_num) + ? "address" + : "seq number"); + } + } else { + /* Start of a new sequence */ + rx_tid->curr_seq_num = rxseq; + } + + /* + * If the earlier sequence was dropped, this will be the fresh start. + * Else, continue with next fragment in a given sequence + */ + dp_rx_defrag_fraglist_insert(peer, tid, &rx_reorder_array_elem->head, + &rx_reorder_array_elem->tail, frag, + &all_frag_present); + + /* + * Currently, we can have only 6 MSDUs per-MPDU, if the current + * packet sequence has more than 6 MSDUs for some reason, we will + * have to use the next MSDU link descriptor and chain them together + * before reinjection + */ + if (more_frag == 0 || fragno == HAL_RX_NUM_MSDU_DESC) { + /* + * Deep copy of MSDU link pointer and msdu descriptor structs + */ + idx = peer->rx_tid[tid].curr_ring_desc_idx; + if (idx < HAL_RX_MAX_SAVED_RING_DESC) { + dp_rx_defrag_save_info_from_ring_desc(ring_desc, + peer, tid, mpdu_desc_info); + + peer->rx_tid[tid].curr_ring_desc_idx++; + } else { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Max ring descr saved, dropping fragment"); + /* + * Free up saved fragments and ring descriptors if any + */ + goto end; + } + } + + /* TODO: handle fragment timeout gracefully */ + if (pdev->soc->rx.flags.defrag_timeout_check) { + dp_rx_defrag_waitlist_remove(peer, tid); + goto end; + } + + /* Yet to receive more fragments for this sequence number */ + if (!all_frag_present) { + uint32_t now_ms = + qdf_system_ticks_to_msecs(qdf_system_ticks()); + + peer->rx_tid[tid].defrag_timeout_ms = + now_ms + pdev->soc->rx.defrag.timeout_ms; + + dp_rx_defrag_waitlist_add(peer, tid); + goto end; + } + + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + "All fragments received for sequence: %d", rxseq); + + /* Process the fragments */ + status = dp_rx_defrag(peer, tid, rx_reorder_array_elem->head, + rx_reorder_array_elem->tail); + if (QDF_IS_STATUS_ERROR(status)) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Fragment processing failed"); + goto end; + } + + /* Re-inject the fragments back to REO for further processing */ + status = dp_rx_defrag_reo_reinject(peer, tid); + if (QDF_IS_STATUS_SUCCESS(status)) + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + "Fragmented sequence successfully reinjected"); + else + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Fragmented sequence reinjection failed"); + +end: + dp_rx_defrag_cleanup(peer, tid, seq); + return QDF_STATUS_E_DEFRAG_ERROR; +} + +/** + * dp_rx_frag_handle() - Handles fragmented Rx frames + * + * @soc: core txrx main context + * @ring_desc: opaque pointer to the REO error ring descriptor + * @mpdu_desc_info: MPDU descriptor information from ring descriptor + * @head: head of the local descriptor free-list + * @tail: tail of the local descriptor free-list + * @quota: No. of units (packets) that can be serviced in one shot. + * + * This function implements RX 802.11 fragmentation handling + * The handling is mostly same as legacy fragmentation handling. + * If required, this function can re-inject the frames back to + * REO ring (with proper setting to by-pass fragmentation check + * but use duplicate detection / re-ordering and routing these frames + * to a different core. + * + * Return: uint32_t: No. of elements processed + */ +uint32_t dp_rx_frag_handle(struct dp_soc *soc, void *ring_desc, + struct hal_rx_mpdu_desc_info *mpdu_desc_info, + union dp_rx_desc_list_elem_t **head, + union dp_rx_desc_list_elem_t **tail, + uint32_t quota) +{ + uint32_t rx_bufs_used = 0; + void *link_desc_va; + struct hal_buf_info buf_info; + struct hal_rx_msdu_list msdu_list; /* per MPDU list of MSDUs */ + uint32_t tid; + int idx; + QDF_STATUS status; + + qdf_assert(soc); + qdf_assert(mpdu_desc_info); + + /* Fragment from a valid peer */ + hal_rx_reo_buf_paddr_get(ring_desc, &buf_info); + + link_desc_va = dp_rx_cookie_2_link_desc_va(soc, &buf_info); + + qdf_assert(link_desc_va); + + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, + "Number of MSDUs to process, num_msdus: %d", + mpdu_desc_info->msdu_count); + + + if (qdf_unlikely(mpdu_desc_info->msdu_count == 0)) { + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Not sufficient MSDUs to process"); + return rx_bufs_used; + } + + /* Get msdu_list for the given MPDU */ + hal_rx_msdu_list_get(link_desc_va, &msdu_list, + mpdu_desc_info->msdu_count); + + /* Process all MSDUs in the current MPDU */ + for (idx = 0; (idx < mpdu_desc_info->msdu_count) && quota--; idx++) { + struct dp_rx_desc *rx_desc = + dp_rx_cookie_2_va_rxdma_buf(soc, + msdu_list.sw_cookie[idx]); + + qdf_assert(rx_desc); + + tid = hal_rx_mpdu_start_tid_get(rx_desc->rx_buf_start); + + /* Process fragment-by-fragment */ + status = dp_rx_defrag_store_fragment(soc, ring_desc, + head, tail, mpdu_desc_info, + &msdu_list.msdu_info[idx], tid, + rx_desc); + if (QDF_IS_STATUS_SUCCESS(status)) + rx_bufs_used++; + else + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, + "Rx Defragmentation error. mpdu_seq: 0x%x msdu_count: %d mpdu_flags: %d", + mpdu_desc_info->mpdu_seq, mpdu_desc_info->msdu_count, + mpdu_desc_info->mpdu_flags); + } + + return rx_bufs_used; +} diff --git a/dp/wifi3.0/dp_rx_defrag.h b/dp/wifi3.0/dp_rx_defrag.h index 2707db90e764..12def6822b11 100644 --- a/dp/wifi3.0/dp_rx_defrag.h +++ b/dp/wifi3.0/dp_rx_defrag.h @@ -16,9 +16,116 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef _DP_RX_DEFRAG_H +#ifndef _DP_RX_DEFRAG_H #define _DP_RX_DEFRAG_H #include "hal_rx.h" +#ifdef CONFIG_MCL +#include +#else +#include +#endif + +#define DEFRAG_IEEE80211_ADDR_LEN 6 +#define DEFRAG_IEEE80211_KEY_LEN 8 +#define DEFRAG_IEEE80211_FCS_LEN 4 + +#define DP_RX_DEFRAG_IEEE80211_ADDR_COPY(dst, src) \ + qdf_mem_copy(dst, src, IEEE80211_ADDR_LEN) + +#define DP_RX_DEFRAG_IEEE80211_QOS_HAS_SEQ(wh) \ + (((wh) & \ + (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \ + (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS)) + +/** + * struct dp_rx_defrag_cipher: structure to indicate cipher header + * @ic_name: Name + * @ic_header: header length + * @ic_trailer: trail length + * @ic_miclen: MIC length + */ +struct dp_rx_defrag_cipher { + const char *ic_name; + uint16_t ic_header; + uint8_t ic_trailer; + uint8_t ic_miclen; +}; + +uint32_t dp_rx_frag_handle(struct dp_soc *soc, void *ring_desc, + struct hal_rx_mpdu_desc_info *mpdu_desc_info, + union dp_rx_desc_list_elem_t **head, + union dp_rx_desc_list_elem_t **tail, + uint32_t quota); + +/* + * dp_rx_frag_get_mac_hdr() - Return pointer to the mac hdr + * @rx_desc_info: Pointer to the pkt_tlvs in the + * nbuf (pkt_tlvs->mac_hdr->data) + * + * It is inefficient to peek into the packet for received + * frames but these APIs are required to get to some of + * 802.11 fields that hardware does not populate in the + * rx meta data. + * + * Returns: pointer to ieee80211_frame + */ +static inline +struct ieee80211_frame *dp_rx_frag_get_mac_hdr(uint8_t *rx_desc_info) +{ + int rx_desc_len = hal_rx_get_desc_len(); + return (struct ieee80211_frame *)(rx_desc_info + rx_desc_len); +} + +/* + * dp_rx_frag_get_mpdu_seq_number() - Get mpdu sequence number + * @rx_desc_info: Pointer to the pkt_tlvs in the + * nbuf (pkt_tlvs->mac_hdr->data) + * + * Returns: uint16_t, rx sequence number + */ +static inline +uint16_t dp_rx_frag_get_mpdu_seq_number(uint8_t *rx_desc_info) +{ + struct ieee80211_frame *mac_hdr; + mac_hdr = dp_rx_frag_get_mac_hdr(rx_desc_info); + + return qdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) >> + IEEE80211_SEQ_SEQ_SHIFT; +} + +/* + * dp_rx_frag_get_mpdu_frag_number() - Get mpdu fragment number + * @rx_desc_info: Pointer to the pkt_tlvs in the + * nbuf (pkt_tlvs->mac_hdr->data) + * + * Returns: uint8_t, receive fragment number + */ +static inline +uint8_t dp_rx_frag_get_mpdu_frag_number(uint8_t *rx_desc_info) +{ + struct ieee80211_frame *mac_hdr; + mac_hdr = dp_rx_frag_get_mac_hdr(rx_desc_info); + + return qdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) & + IEEE80211_SEQ_FRAG_MASK; +} + +/* + * dp_rx_frag_get_more_frag_bit() - Get more fragment bit + * @rx_desc_info: Pointer to the pkt_tlvs in the + * nbuf (pkt_tlvs->mac_hdr->data) + * + * Returns: uint8_t, get more fragment bit + */ +static inline +uint8_t dp_rx_frag_get_more_frag_bit(uint8_t *rx_desc_info) +{ + struct ieee80211_frame *mac_hdr; + mac_hdr = dp_rx_frag_get_mac_hdr(rx_desc_info); + + return mac_hdr->i_fc[1] & IEEE80211_FC1_MORE_FRAG; +} + #endif /* _DP_RX_DEFRAG_H */ diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index 9997be316e31..6a65be9369fc 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -28,38 +28,8 @@ #else #include #endif - - -/** - * dp_rx_frag_handle() - Handles fragmented Rx frames - * - * @soc: core txrx main context - * @ring_desc: opaque pointer to the REO error ring descriptor - * @mpdu_desc_info: MPDU descriptor information from ring descriptor - * @head: head of the local descriptor free-list - * @tail: tail of the local descriptor free-list - * @quota: No. of units (packets) that can be serviced in one shot. - * - * This function implements RX 802.11 fragmentation handling - * The handling is mostly same as legacy fragmentation handling. - * If required, this function can re-inject the frames back to - * REO ring (with proper setting to by-pass fragmentation check - * but use duplicate detection / re-ordering and routing these frames - * to a different core. - * - * Return: uint32_t: No. of elements processed - */ -static uint32_t -dp_rx_frag_handle(struct dp_soc *soc, void *ring_desc, - struct hal_rx_mpdu_desc_info *mpdu_desc_info, - union dp_rx_desc_list_elem_t **head, - union dp_rx_desc_list_elem_t **tail, - uint32_t quota) -{ - uint32_t rx_bufs_used = 0; - - return rx_bufs_used; -} +#include "dp_rx_defrag.h" +#include /* LLC_SNAP_HDR_LEN */ /** * dp_rx_msdus_drop() - Drops all MSDU's per MPDU @@ -75,14 +45,12 @@ dp_rx_frag_handle(struct dp_soc *soc, void *ring_desc, * * Return: uint32_t: No. of elements processed */ -static uint32_t -dp_rx_msdus_drop(struct dp_soc *soc, void *ring_desc, +static uint32_t dp_rx_msdus_drop(struct dp_soc *soc, void *ring_desc, struct hal_rx_mpdu_desc_info *mpdu_desc_info, union dp_rx_desc_list_elem_t **head, union dp_rx_desc_list_elem_t **tail, uint32_t quota) { - uint8_t num_msdus; uint32_t rx_bufs_used = 0; void *link_desc_va; struct hal_buf_info buf_info; @@ -93,11 +61,9 @@ dp_rx_msdus_drop(struct dp_soc *soc, void *ring_desc, link_desc_va = dp_rx_cookie_2_link_desc_va(soc, &buf_info); - qdf_assert(rx_msdu_link_desc); - /* No UNMAP required -- this is "malloc_consistent" memory */ - - hal_rx_msdu_list_get(link_desc_va, &msdu_list, &num_msdus); + hal_rx_msdu_list_get(link_desc_va, &msdu_list, + mpdu_desc_info->msdu_count); for (i = 0; (i < HAL_RX_NUM_MSDU_DESC) && quota--; i++) { struct dp_rx_desc *rx_desc = @@ -521,7 +487,7 @@ dp_rx_err_process(struct dp_soc *soc, void *hal_ring, uint32_t quota) /* Call appropriate handler */ DP_STATS_INC(soc, rx.err.invalid_rbm, 1); QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid RBM %d"), rbm); + FL("Invalid RBM %d"), rbm); continue; } @@ -657,7 +623,6 @@ dp_rx_wbm_err_process(struct dp_soc *soc, void *hal_ring, uint32_t quota) if (qdf_unlikely(rbm != HAL_RX_BUF_RBM_SW3_BM)) { /* TODO */ /* Call appropriate handler */ - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, FL("Invalid RBM %d"), rbm); continue; diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c index 206de87477ea..1ffa37b83425 100644 --- a/dp/wifi3.0/dp_rx_mon_dest.c +++ b/dp/wifi3.0/dp_rx_mon_dest.c @@ -138,7 +138,7 @@ dp_rx_mon_mpdu_pop(struct dp_soc *soc, uint32_t mac_id, num_msdus = msdu_cnt; - hal_rx_msdu_list_get(rx_msdu_link_desc, &msdu_list, &num_msdus); + hal_rx_msdu_list_get(rx_msdu_link_desc, &msdu_list, num_msdus); msdu_cnt -= num_msdus; diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h index 136cd1f6c5b9..10f27d35ea52 100644 --- a/dp/wifi3.0/dp_types.h +++ b/dp/wifi3.0/dp_types.h @@ -30,6 +30,12 @@ #include #include +#ifdef CONFIG_MCL +#include +#else +#include +#endif + #ifndef CONFIG_WIN #include /* WDI subscriber event list */ #endif @@ -40,6 +46,7 @@ #include "hal_rx.h" #include #include +#include "hal_rx.h" #define MAX_TCL_RING 3 #define MAX_RXDMA_ERRORS 32 @@ -305,6 +312,18 @@ struct dp_rx_tid { /* only used for defrag right now */ TAILQ_ENTRY(dp_rx_tid) defrag_waitlist_elem; + + /* MSDU link pointers used for reinjection */ + struct hal_rx_msdu_link_ptr_info + transcap_msdu_link_ptr[HAL_RX_MAX_SAVED_RING_DESC]; + + struct hal_rx_mpdu_desc_info transcap_rx_mpdu_desc_info; + uint8_t curr_ring_desc_idx; + + /* Sequence and fragments that are being processed currently */ + uint32_t curr_seq_num; + uint32_t curr_frag_num; + uint32_t defrag_timeout_ms; uint16_t dialogtoken; uint16_t statuscode; @@ -903,9 +922,7 @@ struct dp_peer { struct { enum htt_sec_type sec_type; -#ifdef notyet /* TODO: See if this is required for defrag support */ u_int32_t michael_key[2]; /* relevant for TKIP */ -#endif } security[2]; /* 0 -> multicast, 1 -> unicast */ /* diff --git a/dp/wifi3.0/hal_rx.h b/dp/wifi3.0/hal_rx.h index 73bd64b48cfb..d7214b14422c 100644 --- a/dp/wifi3.0/hal_rx.h +++ b/dp/wifi3.0/hal_rx.h @@ -357,7 +357,6 @@ static inline void hal_rx_mpdu_desc_info_get(void *desc_addr, HAL_RX_MPDU_DESC_PEER_META_DATA_GET(mpdu_info); } - /* * @ hal_rx_msdu_desc_info_get: Gets the flags related to MSDU desciptor. * @ Specifically flags needed are: @@ -1081,7 +1080,7 @@ hal_rx_msdu_get_keyid(uint8_t *buf) return (keyid_octet >> 6) & 0x3; } -#define HAL_RX_MSDU_START_RSSI_GET(_rx_msdu_start) \ +#define HAL_RX_MSDU_START_RSSI_GET(_rx_msdu_start) \ (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_start, \ RX_MSDU_START_5_USER_RSSI_OFFSET)), \ RX_MSDU_START_5_USER_RSSI_MASK, \ @@ -1107,10 +1106,10 @@ hal_rx_msdu_start_get_rssi(uint8_t *buf) } -#define HAL_RX_MSDU_START_FREQ_GET(_rx_msdu_start) \ - (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_start, \ +#define HAL_RX_MSDU_START_FREQ_GET(_rx_msdu_start) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_start, \ RX_MSDU_START_7_SW_PHY_META_DATA_OFFSET)), \ - RX_MSDU_START_7_SW_PHY_META_DATA_MASK, \ + RX_MSDU_START_7_SW_PHY_META_DATA_MASK, \ RX_MSDU_START_7_SW_PHY_META_DATA_LSB)) /* @@ -1135,10 +1134,10 @@ hal_rx_msdu_start_get_freq(uint8_t *buf) } -#define HAL_RX_MSDU_START_PKT_TYPE_GET(_rx_msdu_start) \ +#define HAL_RX_MSDU_START_PKT_TYPE_GET(_rx_msdu_start) \ (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_start, \ RX_MSDU_START_5_PKT_TYPE_OFFSET)), \ - RX_MSDU_START_5_PKT_TYPE_MASK, \ + RX_MSDU_START_5_PKT_TYPE_MASK, \ RX_MSDU_START_5_PKT_TYPE_LSB)) /* @@ -1161,10 +1160,10 @@ hal_rx_msdu_start_get_pkt_type(uint8_t *buf) return pkt_type; } -#define HAL_RX_MSDU_START_NSS_GET(_rx_msdu_start) \ +#define HAL_RX_MSDU_START_NSS_GET(_rx_msdu_start) \ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\ - RX_MSDU_START_5_NSS_OFFSET)), \ - RX_MSDU_START_5_NSS_MASK, \ + RX_MSDU_START_5_NSS_OFFSET)), \ + RX_MSDU_START_5_NSS_MASK, \ RX_MSDU_START_5_NSS_LSB)) /* @@ -1540,7 +1539,9 @@ hal_rx_mpdu_end_mic_err_get(uint8_t *buf) RX_MSDU_LINK_8_RX_MSDU_DETAILS_MSDU_0_OFFSET)) #define HAL_RX_NUM_MSDU_DESC 6 +#define HAL_RX_MAX_SAVED_RING_DESC 16 +/* TODO: rework the structure */ struct hal_rx_msdu_list { struct hal_rx_msdu_desc_info msdu_info[HAL_RX_NUM_MSDU_DESC]; uint32_t sw_cookie[HAL_RX_NUM_MSDU_DESC]; @@ -1552,24 +1553,28 @@ struct hal_buf_info { }; /** - * hal_rx_msdu_link_desc_get: API to get the MSDU information + * hal_rx_msdu_link_desc_get(): API to get the MSDU information * from the MSDU link descriptor * - * @ msdu_link_desc: Opaque pointer used by HAL to get to the + * @msdu_link_desc: Opaque pointer used by HAL to get to the * MSDU link descriptor (struct rx_msdu_link) - * @ msdu_list: Return the list of MSDUs contained in this link descriptor + * + * @msdu_list: Return the list of MSDUs contained in this link descriptor + * + * @num_msdus: Number of MSDUs in the MPDU + * * Return: void */ static inline void hal_rx_msdu_list_get(void *msdu_link_desc, - struct hal_rx_msdu_list *msdu_list, uint8_t *num_msdus) + struct hal_rx_msdu_list *msdu_list, uint8_t num_msdus) { struct rx_msdu_details *msdu_details; struct rx_msdu_desc_info *msdu_desc_info; struct rx_msdu_link *msdu_link = (struct rx_msdu_link *)msdu_link_desc; int i; - if (*num_msdus > HAL_RX_NUM_MSDU_DESC) - *num_msdus = HAL_RX_NUM_MSDU_DESC; + if (num_msdus > HAL_RX_NUM_MSDU_DESC) + num_msdus = HAL_RX_NUM_MSDU_DESC; msdu_details = HAL_RX_LINK_DESC_MSDU0_PTR(msdu_link); @@ -1577,8 +1582,7 @@ static inline void hal_rx_msdu_list_get(void *msdu_link_desc, "[%s][%d] msdu_link=%p msdu_details=%p\n", __func__, __LINE__, msdu_link, msdu_details); - - for (i = 0; i < *num_msdus; i++) { + for (i = 0; i < num_msdus; i++) { msdu_desc_info = HAL_RX_MSDU_DESC_INFO_GET(&msdu_details[i]); msdu_list->msdu_info[i].msdu_flags = HAL_RX_MSDU_FLAGS_GET(msdu_desc_info); @@ -1592,7 +1596,6 @@ static inline void hal_rx_msdu_list_get(void *msdu_link_desc, "[%s][%d] i=%d sw_cookie=%d\n", __func__, __LINE__, i, msdu_list->sw_cookie[i]); } - } /** @@ -1919,7 +1922,7 @@ enum hal_rx_wbm_rxdma_push_reason { /** * hal_rx_dump_rx_attention_tlv: dump RX attention TLV in structured - * humman readable format. + * humman readable format. * @ rx_attn: pointer the rx_attention TLV in pkt. * @ dbg_level: log level. * @@ -2527,6 +2530,389 @@ static inline uint8_t hal_srng_ring_id_get(void *hal_ring) return ((struct hal_srng *)hal_ring)->ring_id; } +/* Rx MSDU link pointer info */ +struct hal_rx_msdu_link_ptr_info { + struct rx_msdu_link msdu_link; + struct hal_buf_info msdu_link_buf_info; +}; + +/** + * hal_rx_get_pkt_tlvs(): Function to retrieve pkt tlvs from nbuf + * + * @nbuf: Pointer to data buffer field + * Returns: pointer to rx_pkt_tlvs + */ +static inline +struct rx_pkt_tlvs *hal_rx_get_pkt_tlvs(uint8_t *rx_buf_start) +{ + return (struct rx_pkt_tlvs *)rx_buf_start; +} + +/** + * hal_rx_get_mpdu_info(): Function to retrieve mpdu info from pkt tlvs + * + * @pkt_tlvs: Pointer to pkt_tlvs + * Returns: pointer to rx_mpdu_info structure + */ +static inline +struct rx_mpdu_info *hal_rx_get_mpdu_info(struct rx_pkt_tlvs *pkt_tlvs) +{ + return &pkt_tlvs->mpdu_start_tlv.rx_mpdu_start.rx_mpdu_info_details; +} + +/** + * hal_rx_get_rx_sequence(): Function to retrieve rx sequence number + * + * @nbuf: Network buffer + * Returns: rx sequence number + */ +#define DOT11_SEQ_FRAG_MASK 0x000f +#define DOT11_FC1_MORE_FRAG_OFFSET 0x04 + +#define HAL_RX_MPDU_GET_SEQUENCE_NUMBER(_rx_mpdu_info) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \ + RX_MPDU_INFO_2_MPDU_SEQUENCE_NUMBER_OFFSET)), \ + RX_MPDU_INFO_2_MPDU_SEQUENCE_NUMBER_MASK, \ + RX_MPDU_INFO_2_MPDU_SEQUENCE_NUMBER_LSB)) +static inline +uint16_t hal_rx_get_rx_sequence(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf); + struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs); + uint16_t seq_number = 0; + + seq_number = + HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info) >> 4; + + /* Skip first 4-bits for fragment number */ + return seq_number; +} + +/** + * hal_rx_get_rx_fragment_number(): Function to retrieve rx fragment number + * + * @nbuf: Network buffer + * Returns: rx fragment number + */ +static inline +uint8_t hal_rx_get_rx_fragment_number(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf); + struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs); + uint8_t frag_number = 0; + + frag_number = HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info) & + DOT11_SEQ_FRAG_MASK; + + /* Return first 4 bits as fragment number */ + return frag_number; +} + +#define HAL_RX_MPDU_GET_FRAME_CONTROL_FIELD(_rx_mpdu_info) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \ + RX_MPDU_INFO_14_MPDU_FRAME_CONTROL_FIELD_OFFSET)), \ + RX_MPDU_INFO_14_MPDU_FRAME_CONTROL_FIELD_MASK, \ + RX_MPDU_INFO_14_MPDU_FRAME_CONTROL_FIELD_LSB)) +/** + * hal_rx_get_rx_more_frag_bit(): Function to retrieve more fragment bit + * + * @nbuf: Network buffer + * Returns: rx more fragment bit + */ +static inline +uint8_t hal_rx_get_rx_more_frag_bit(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf); + struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs); + uint16_t frame_ctrl = 0; + + frame_ctrl = HAL_RX_MPDU_GET_FRAME_CONTROL_FIELD(rx_mpdu_info) >> + DOT11_FC1_MORE_FRAG_OFFSET; + + /* more fragment bit if at offset bit 4 */ + return frame_ctrl; +} + +/** + * hal_rx_get_frame_ctrl_field(): Function to retrieve frame control field + * + * @nbuf: Network buffer + * Returns: rx more fragment bit + * + */ +static inline +uint8_t hal_rx_get_frame_ctrl_field(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf); + struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs); + uint16_t frame_ctrl = 0; + + frame_ctrl = HAL_RX_MPDU_GET_FRAME_CONTROL_FIELD(rx_mpdu_info); + + return frame_ctrl; +} + +/* + * hal_rx_msdu_is_wlan_mcast(): Check if the buffer is for multicast address + * + * @nbuf: Network buffer + * Returns: flag to indicate whether the nbuf has MC/BC address + */ +static inline +uint32_t hal_rx_msdu_is_wlan_mcast(qdf_nbuf_t nbuf) +{ + uint8 *buf = qdf_nbuf_data(nbuf); + + struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; + struct rx_attention *rx_attn = &pkt_tlvs->attn_tlv.rx_attn; + + return rx_attn->mcast_bcast; +} + +#define HAL_RX_MPDU_GET_SEQUENCE_CONTROL_VALID(_rx_mpdu_info) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \ + RX_MPDU_INFO_2_MPDU_SEQUENCE_CONTROL_VALID_OFFSET)), \ + RX_MPDU_INFO_2_MPDU_SEQUENCE_CONTROL_VALID_MASK, \ + RX_MPDU_INFO_2_MPDU_SEQUENCE_CONTROL_VALID_LSB)) +/* + * hal_rx_get_mpdu_sequence_control_valid(): Get mpdu sequence control valid + * + * @nbuf: Network buffer + * Returns: value of sequence control valid field + */ +static inline +uint8_t hal_rx_get_mpdu_sequence_control_valid(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf); + struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs); + uint8_t seq_ctrl_valid = 0; + + seq_ctrl_valid = + HAL_RX_MPDU_GET_SEQUENCE_CONTROL_VALID(rx_mpdu_info); + + return seq_ctrl_valid; +} + +#define HAL_RX_MPDU_GET_FRAME_CONTROL_VALID(_rx_mpdu_info) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \ + RX_MPDU_INFO_2_MPDU_FRAME_CONTROL_VALID_OFFSET)), \ + RX_MPDU_INFO_2_MPDU_FRAME_CONTROL_VALID_MASK, \ + RX_MPDU_INFO_2_MPDU_FRAME_CONTROL_VALID_LSB)) +/* + * hal_rx_get_mpdu_frame_control_valid(): Retrieves mpdu frame control valid + * + * @nbuf: Network buffer + * Returns: value of frame control valid field + */ +static inline +uint8_t hal_rx_get_mpdu_frame_control_valid(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf); + struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs); + uint8_t frm_ctrl_valid = 0; + + frm_ctrl_valid = + HAL_RX_MPDU_GET_FRAME_CONTROL_VALID(rx_mpdu_info); + + return frm_ctrl_valid; +} + +/* + * hal_rx_clear_mpdu_desc_info(): Clears mpdu_desc_info + * + * @rx_mpdu_desc_info: HAL view of rx mpdu desc info + * Returns: None + */ +static inline +void hal_rx_clear_mpdu_desc_info( + struct hal_rx_mpdu_desc_info *rx_mpdu_desc_info) +{ + qdf_mem_zero(rx_mpdu_desc_info, + sizeof(*rx_mpdu_desc_info)); +} + +/* + * hal_rx_clear_msdu_link_ptr(): Clears msdu_link_ptr + * + * @msdu_link_ptr: HAL view of msdu link ptr + * @size: number of msdu link pointers + * Returns: None + */ +static inline +void hal_rx_clear_msdu_link_ptr(struct hal_rx_msdu_link_ptr_info *msdu_link_ptr, + int size) +{ + qdf_mem_zero(msdu_link_ptr, + (sizeof(*msdu_link_ptr) * size)); +} + +/* + * hal_rx_chain_msdu_links() - Chains msdu link pointers + * @msdu_link_ptr: msdu link pointer + * @mpdu_desc_info: mpdu descriptor info + * + * Build a list of msdus using msdu link pointer. If the + * number of msdus are more, chain them together + * + * Returns: Number of processed msdus + */ +static inline +int hal_rx_chain_msdu_links(qdf_nbuf_t msdu, + struct hal_rx_msdu_link_ptr_info *msdu_link_ptr_info, + struct hal_rx_mpdu_desc_info *mpdu_desc_info) +{ + int j; + struct rx_msdu_link *msdu_link_ptr = + &msdu_link_ptr_info->msdu_link; + struct rx_msdu_link *prev_msdu_link_ptr = NULL; + struct rx_msdu_details *msdu_details = + HAL_RX_LINK_DESC_MSDU0_PTR(msdu_link_ptr); + uint8_t num_msdus = mpdu_desc_info->msdu_count; + struct rx_msdu_desc_info *msdu_desc_info; + uint8_t fragno, more_frag; + uint8_t *rx_desc_info; + struct hal_rx_msdu_list msdu_list; + + for (j = 0; j < num_msdus; j++) { + msdu_desc_info = + HAL_RX_MSDU_DESC_INFO_GET(&msdu_details[j]); + msdu_list.msdu_info[j].msdu_flags = + HAL_RX_MSDU_FLAGS_GET(msdu_desc_info); + msdu_list.msdu_info[j].msdu_len = + HAL_RX_MSDU_PKT_LENGTH_GET(msdu_desc_info); + msdu_list.sw_cookie[j] = HAL_RX_BUF_COOKIE_GET( + &msdu_details[j].buffer_addr_info_details); + } + + /* Chain msdu links together */ + if (prev_msdu_link_ptr) { + /* 31-0 bits of the physical address */ + prev_msdu_link_ptr-> + next_msdu_link_desc_addr_info.buffer_addr_31_0 = + msdu_link_ptr_info->msdu_link_buf_info.paddr & + BUFFER_ADDR_INFO_0_BUFFER_ADDR_31_0_MASK; + /* 39-32 bits of the physical address */ + prev_msdu_link_ptr-> + next_msdu_link_desc_addr_info.buffer_addr_39_32 + = ((msdu_link_ptr_info->msdu_link_buf_info.paddr + >> 32) && + BUFFER_ADDR_INFO_1_BUFFER_ADDR_39_32_MASK); + prev_msdu_link_ptr-> + next_msdu_link_desc_addr_info.sw_buffer_cookie = + msdu_link_ptr_info->msdu_link_buf_info.sw_cookie; + } + + /* There is space for only 6 MSDUs in a MSDU link descriptor */ + if (num_msdus < HAL_RX_NUM_MSDU_DESC) { + /* mark first and last MSDUs */ + rx_desc_info = qdf_nbuf_data(msdu); + fragno = hal_rx_get_rx_fragment_number(rx_desc_info); + more_frag = hal_rx_get_rx_more_frag_bit(rx_desc_info); + + /* TODO: create skb->fragslist[] */ + + if (more_frag == 0) { + msdu_list.msdu_info[num_msdus].msdu_flags |= + RX_MSDU_DESC_INFO_0_LAST_MSDU_IN_MPDU_FLAG_MASK; + } else if (fragno == 1) { + msdu_list.msdu_info[num_msdus].msdu_flags |= + RX_MSDU_DESC_INFO_0_FIRST_MSDU_IN_MPDU_FLAG_MASK; + + msdu_list.msdu_info[num_msdus].msdu_flags |= + RX_MSDU_DESC_INFO_0_MSDU_CONTINUATION_MASK; + } + + num_msdus++; + + /* Number of MSDUs per mpdu descriptor is updated */ + mpdu_desc_info->msdu_count += num_msdus; + } else { + num_msdus = 0; + prev_msdu_link_ptr = msdu_link_ptr; + } + + return num_msdus; +} + +/* + * hal_rx_defrag_update_src_ring_desc(): updates reo src ring desc + * + * @ring_desc: HAL view of ring descriptor + * @mpdu_des_info: saved mpdu desc info + * @msdu_link_ptr: saved msdu link ptr + * + * API used explicitely for rx defrag to update ring desc with + * mpdu desc info and msdu link ptr before reinjecting the + * packet back to REO + * + * Returns: None + */ +static inline +void hal_rx_defrag_update_src_ring_desc(void *ring_desc, + void *saved_mpdu_desc_info, + struct hal_rx_msdu_link_ptr_info *saved_msdu_link_ptr) +{ + struct reo_entrance_ring *reo_ent_ring; + struct rx_mpdu_desc_info *reo_ring_mpdu_desc_info; + struct hal_buf_info buf_info; + + reo_ent_ring = (struct reo_entrance_ring *)ring_desc; + reo_ring_mpdu_desc_info = &reo_ent_ring-> + reo_level_mpdu_frame_info.rx_mpdu_desc_info_details; + + qdf_mem_copy(&reo_ring_mpdu_desc_info, saved_mpdu_desc_info, + sizeof(*reo_ring_mpdu_desc_info)); + + /* + * TODO: Check for additional fields that need configuration in + * reo_ring_mpdu_desc_info + */ + + /* Update msdu_link_ptr in the reo entrance ring */ + hal_rx_reo_buf_paddr_get(ring_desc, &buf_info); + buf_info.paddr = saved_msdu_link_ptr->msdu_link_buf_info.paddr; + buf_info.sw_cookie = + saved_msdu_link_ptr->msdu_link_buf_info.sw_cookie; +} + +/* + * hal_rx_defrag_save_info_from_ring_desc(): Saves info from ring desc + * + * @msdu_link_desc_va: msdu link descriptor handle + * @msdu_link_ptr_info: HAL view of msdu link pointer info + * + * API used to save msdu link information along with physical + * address. The API also copues the sw cookie. + * + * Returns: None + */ +static inline +void hal_rx_defrag_save_info_from_ring_desc(void *msdu_link_desc_va, + struct hal_rx_msdu_link_ptr_info *msdu_link_ptr_info, + struct hal_buf_info *hbi) +{ + struct rx_msdu_link *msdu_link_ptr = + (struct rx_msdu_link *)msdu_link_desc_va; + + qdf_mem_copy(&msdu_link_ptr_info->msdu_link, msdu_link_ptr, + sizeof(struct rx_msdu_link)); + + msdu_link_ptr_info->msdu_link_buf_info.paddr = hbi->paddr; + msdu_link_ptr_info->msdu_link_buf_info.sw_cookie = hbi->sw_cookie; +} + +/* + * hal_rx_get_desc_len(): Returns rx descriptor length + * + * Returns the size of rx_pkt_tlvs which follows the + * data in the nbuf + * + * Returns: Length of rx descriptor + */ +static inline +uint16_t hal_rx_get_desc_len(void) +{ + return sizeof(struct rx_pkt_tlvs); +} + #endif /* _HAL_RX_H */ - - diff --git a/hal/wifi3.0/hal_api.h b/hal/wifi3.0/hal_api.h index d14d8cdd2c91..0acc65e16eb2 100644 --- a/hal/wifi3.0/hal_api.h +++ b/hal/wifi3.0/hal_api.h @@ -947,4 +947,5 @@ static inline qdf_dma_addr_t hal_srng_get_tp_addr(void *hal_soc, void *hal_ring) */ extern void hal_get_srng_params(void *hal_soc, void *hal_ring, struct hal_srng_params *ring_params); -#endif /* _HAL_API_H_ */ + +#endif /* _HAL_APIH_ */ diff --git a/hal/wifi3.0/hal_internal.h b/hal/wifi3.0/hal_internal.h index 87e36f7a9b76..120bed6db9ae 100644 --- a/hal/wifi3.0/hal_internal.h +++ b/hal/wifi3.0/hal_internal.h @@ -33,6 +33,7 @@ #include "qdf_types.h" #include "qdf_lock.h" #include "qdf_mem.h" +#include "qdf_nbuf.h" #include "wcss_seq_hwiobase.h" #include "tlv_hdr.h" #include "tlv_tag_def.h" @@ -62,9 +63,11 @@ #include "rx_ppdu_start_user_info.h" #include "rx_ppdu_end_user_stats.h" #include "rx_ppdu_end_user_stats_ext.h" +#include "rx_mpdu_desc_info.h" #include "tx_msdu_extension.h" #include "wcss_version.h" #include "pld_common.h" +#include "rx_msdu_link.h" /* TBD: This should be movded to shared HW header file */ enum hal_srng_ring_id { diff --git a/qdf/inc/qdf_status.h b/qdf/inc/qdf_status.h index 8210212f81f0..3529cb9b77a9 100644 --- a/qdf/inc/qdf_status.h +++ b/qdf/inc/qdf_status.h @@ -139,6 +139,7 @@ typedef enum { QDF_STATUS_CRYPTO_MIC_FAILURE, QDF_STATUS_CRYPTO_ENCRYPT_FAILED, QDF_STATUS_CRYPTO_DECRYPT_FAILED, + QDF_STATUS_E_DEFRAG_ERROR, QDF_STATUS_MAX } QDF_STATUS; From 6e0cfd9494069e21b3a1c7cff7feec6907ab68f2 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 9 Mar 2017 15:49:59 -0800 Subject: [PATCH 19/20] qcacmn: HIF: Reduce the log spam in kmsg Move the logs to appropriate log levels to reduce the log spam in kmsg. Change-Id: I29121bb4cc1272aa1fb88183914530dd21c64272 CRs-Fixed: 2017427 --- hif/src/ce/ce_main.c | 16 ++++++++-------- hif/src/dispatcher/dummy.c | 2 +- hif/src/hif_main.c | 4 ++-- hif/src/hif_napi.c | 28 ++++++++++++++-------------- hif/src/pcie/if_pci.c | 4 ++-- hif/src/snoc/if_snoc.c | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c index 7581cb0d6030..408fd80d38ed 100644 --- a/hif/src/ce/ce_main.c +++ b/hif/src/ce/ce_main.c @@ -1113,7 +1113,7 @@ void hif_enable_fastpath(struct hif_opaque_softc *hif_ctx) HIF_INFO("%s, srng rings do not support fastpath", __func__); return; } - HIF_INFO("%s, Enabling fastpath mode", __func__); + HIF_DBG("%s, Enabling fastpath mode", __func__); scn->fastpath_mode_on = true; } @@ -1172,7 +1172,7 @@ void ce_h2t_tx_ce_cleanup(struct CE_handle *ce_hdl) return; if (sc->fastpath_mode_on && ce_state->htt_tx_data) { - HIF_INFO("%s %d Fastpath mode ON, Cleaning up HTT Tx CE", + HIF_DBG("%s %d Fastpath mode ON, Cleaning up HTT Tx CE", __func__, __LINE__); sw_index = src_ring->sw_index; write_index = src_ring->sw_index; @@ -1666,7 +1666,7 @@ static int hif_completion_thread_startup(struct HIF_CE_state *hif_state) attr = hif_state->host_ce_config[pipe_num]; if (attr.src_nentries) { /* pipe used to send to target */ - HIF_INFO_MED("%s: pipe_num:%d pipe_info:0x%p", + HIF_DBG("%s: pipe_num:%d pipe_info:0x%p", __func__, pipe_num, pipe_info); ce_send_cb_register(pipe_info->ce_hdl, hif_pci_ce_send_done, pipe_info, @@ -2499,17 +2499,17 @@ int hif_config_ce(struct hif_softc *scn) } scn->athdiag_procfs_inited = true; - HIF_INFO_MED("%s: ce_init done", __func__); + HIF_DBG("%s: ce_init done", __func__); init_tasklet_workers(hif_hdl); hif_fake_apps_init_ctx(scn); - HIF_TRACE("%s: X, ret = %d", __func__, rv); + HIF_DBG("%s: X, ret = %d", __func__, rv); #ifdef ADRASTEA_SHADOW_REGISTERS - HIF_INFO("%s, Using Shadow Registers instead of CE Registers", __func__); + HIF_DBG("%s, Using Shadow Registers instead of CE Registers", __func__); for (i = 0; i < NUM_SHADOW_REGISTERS; i++) { - HIF_INFO("%s Shadow Register%d is mapped to address %x", + HIF_DBG("%s Shadow Register%d is mapped to address %x", __func__, i, (A_TARGET_READ(scn, (SHADOW_ADDRESS(i))) << 2)); } @@ -3010,7 +3010,7 @@ static inline void hif_config_rri_on_ddr(struct hif_softc *scn) low_paddr = BITS0_TO_31(paddr_rri_on_ddr); high_paddr = BITS32_TO_35(paddr_rri_on_ddr); - HIF_INFO("%s using srri and drri from DDR", __func__); + HIF_DBG("%s using srri and drri from DDR", __func__); WRITE_CE_DDR_ADDRESS_FOR_RRI_LOW(scn, low_paddr); WRITE_CE_DDR_ADDRESS_FOR_RRI_HIGH(scn, high_paddr); diff --git a/hif/src/dispatcher/dummy.c b/hif/src/dispatcher/dummy.c index dcd9ee83463a..a1c6c7433883 100644 --- a/hif/src/dispatcher/dummy.c +++ b/hif/src/dispatcher/dummy.c @@ -39,7 +39,7 @@ */ void hif_dummy_bus_prevent_linkdown(struct hif_softc *scn, bool flag) { - HIF_ERROR("wlan: %s pcie power collapse ignored", + HIF_DBG("wlan: %s pcie power collapse ignored", (flag ? "disable" : "enable")); } diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c index 957b46ff916b..ef407067237a 100644 --- a/hif/src/hif_main.c +++ b/hif/src/hif_main.c @@ -544,7 +544,7 @@ QDF_STATUS hif_enable(struct hif_opaque_softc *hif_ctx, struct device *dev, scn->hif_init_done = true; - HIF_TRACE("%s: OK", __func__); + HIF_DBG("%s: OK", __func__); return QDF_STATUS_SUCCESS; } @@ -568,7 +568,7 @@ void hif_disable(struct hif_opaque_softc *hif_ctx, enum hif_disable_type type) scn->notice_send = false; - HIF_INFO("%s: X", __func__); + HIF_DBG("%s: X", __func__); } void hif_display_stats(struct hif_opaque_softc *hif_ctx) diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c index 18e9bf8dc761..dbf9d64fea1d 100644 --- a/hif/src/hif_napi.c +++ b/hif/src/hif_napi.c @@ -140,7 +140,7 @@ int hif_napi_create(struct hif_opaque_softc *hif_ctx, goto hnc_err; } - HIF_INFO("%s: NAPI structures initialized, rc=%d", + HIF_DBG("%s: NAPI structures initialized, rc=%d", __func__, rc); } for (i = 0; i < hif->ce_count; i++) { @@ -186,7 +186,7 @@ int hif_napi_create(struct hif_opaque_softc *hif_ctx, * protection as there should be no-one around yet */ napid->ce_map |= (0x01 << i); - HIF_INFO("%s: NAPI id %d created for pipe %d", __func__, + HIF_DBG("%s: NAPI id %d created for pipe %d", __func__, napii->id, i); } NAPI_DEBUG("NAPI ids created for all applicable pipes"); @@ -242,7 +242,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx, if (hif->napi_data.state == HIF_NAPI_CONF_UP) { if (force) { napi_disable(&(napii->napi)); - HIF_INFO("%s: NAPI entry %d force disabled", + HIF_DBG("%s: NAPI entry %d force disabled", __func__, id); NAPI_DEBUG("NAPI %d force disabled", id); } else { @@ -265,7 +265,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx, napid->ce_map &= ~(0x01 << ce); napii->scale = 0; - HIF_INFO("%s: NAPI %d destroyed\n", __func__, id); + HIF_DBG("%s: NAPI %d destroyed\n", __func__, id); /* if there are no active instances and * if they are all destroyed, @@ -278,7 +278,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx, qdf_spinlock_destroy(&(napid->lock)); memset(napid, 0, sizeof(struct qca_napi_data)); - HIF_INFO("%s: no NAPI instances. Zapped.", + HIF_DBG("%s: no NAPI instances. Zapped.", __func__); } } @@ -323,7 +323,7 @@ int hif_napi_lro_flush_cb_register(struct hif_opaque_softc *hif_hdl, napii = &(napid->napis[i]); napii->lro_flush_cb = lro_flush_handler; napii->lro_ctx = data; - HIF_ERROR("Registering LRO for ce_id %d NAPI callback for %d flush_cb %p, lro_data %p\n", + HIF_DBG("Registering LRO for ce_id %d NAPI callback for %d flush_cb %p, lro_data %p\n", i, napii->id, napii->lro_flush_cb, napii->lro_ctx); rc++; @@ -359,7 +359,7 @@ void hif_napi_lro_flush_cb_deregister(struct hif_opaque_softc *hif_hdl, ce_state = scn->ce_id_to_state[i]; if ((ce_state != NULL) && (ce_state->htt_rx_data)) { napii = &(napid->napis[i]); - HIF_ERROR("deRegistering LRO for ce_id %d NAPI callback for %d flush_cb %p, lro_data %p\n", + HIF_DBG("deRegistering LRO for ce_id %d NAPI callback for %d flush_cb %p, lro_data %p\n", i, napii->id, napii->lro_flush_cb, napii->lro_ctx); qdf_spin_lock_bh(&napii->lro_unloading_lock); @@ -492,25 +492,25 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event, case NAPI_EVT_INT_STATE: { int on = (data != ((void *)0)); - HIF_INFO("%s: recved evnt: STATE_CMD %d; v = %d (state=0x%0x)", + HIF_DBG("%s: recved evnt: STATE_CMD %d; v = %d (state=0x%0x)", __func__, event, on, prev_state); if (on) if (prev_state & HIF_NAPI_CONF_UP) { - HIF_INFO("%s: duplicate NAPI conf ON msg", + HIF_DBG("%s: duplicate NAPI conf ON msg", __func__); } else { - HIF_INFO("%s: setting state to ON", + HIF_DBG("%s: setting state to ON", __func__); napid->state |= HIF_NAPI_CONF_UP; } else /* off request */ if (prev_state & HIF_NAPI_CONF_UP) { - HIF_INFO("%s: setting state to OFF", + HIF_DBG("%s: setting state to OFF", __func__); napid->state &= ~HIF_NAPI_CONF_UP; } else { - HIF_INFO("%s: duplicate NAPI conf OFF msg", + HIF_DBG("%s: duplicate NAPI conf OFF msg", __func__); } break; @@ -640,7 +640,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event, } } } else { - HIF_INFO("%s: no change in hif napi state (still %d)", + HIF_DBG("%s: no change in hif napi state (still %d)", __func__, prev_state); } @@ -1520,7 +1520,7 @@ static inline void hif_napi_bl_irq(struct qca_napi_data *napid, bool bl_flag) else irq_modify_status(napid->napis[i].irq, IRQ_NO_BALANCING, 0); - HIF_INFO("%s: bl_flag %d CE %d", __func__, bl_flag, i); + HIF_DBG("%s: bl_flag %d CE %d", __func__, bl_flag, i); } } diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index 3c3c21c28f58..d03aa5411111 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -2723,7 +2723,7 @@ static void hif_runtime_prevent_linkdown(struct hif_softc *scn, bool flag) */ void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag) { - HIF_ERROR("wlan: %s pcie power collapse", + HIF_DBG("wlan: %s pcie power collapse", (flag ? "disable" : "enable")); hif_runtime_prevent_linkdown(scn, flag); pld_wlan_pm_control(scn->qdf_dev->dev, flag); @@ -2731,7 +2731,7 @@ void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag) #else void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag) { - HIF_ERROR("wlan: %s pcie power collapse", + HIF_DBG("wlan: %s pcie power collapse", (flag ? "disable" : "enable")); hif_runtime_prevent_linkdown(scn, flag); } diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c index f1eec33c7a99..66f2f90f7033 100644 --- a/hif/src/snoc/if_snoc.c +++ b/hif/src/snoc/if_snoc.c @@ -289,7 +289,7 @@ QDF_STATUS hif_snoc_enable_bus(struct hif_softc *ol_sc, /* the bus should remain on durring suspend for snoc */ hif_vote_link_up(GET_HIF_OPAQUE_HDL(ol_sc)); - HIF_TRACE("%s: X - hif_type = 0x%x, target_type = 0x%x", + HIF_DBG("%s: X - hif_type = 0x%x, target_type = 0x%x", __func__, hif_type, target_type); return QDF_STATUS_SUCCESS; From 1f1ccf7b8b4354ed2cb43cc5db79785e68c27031 Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Fri, 5 May 2017 13:01:51 -0700 Subject: [PATCH 20/20] qcacmn: Move the lock initialization to module open for policy manager Move the lock initialization to module open from module enable for policy manager. Change-Id: I44716537dcb3f559c1c27401bb579239c98a9f02 CRs-Fixed: 2009818 --- .../inc/wlan_policy_mgr_public_struct.h | 2 +- .../src/wlan_policy_mgr_init_deinit.c | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h b/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h index 156e4c6ef677..f0c73e983817 100644 --- a/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h +++ b/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h @@ -35,7 +35,7 @@ */ /* Include files */ -#include "wmi_unified.h" +#include #define POLICY_MGR_MAX_CHANNEL_LIST 128 diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c index 55957cf61333..43f325412fdd 100644 --- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c +++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c @@ -318,7 +318,21 @@ QDF_STATUS policy_mgr_deinit(void) QDF_STATUS policy_mgr_psoc_open(struct wlan_objmgr_psoc *psoc) { - /* placeholder for now */ + struct policy_mgr_psoc_priv_obj *pm_ctx; + + pm_ctx = policy_mgr_get_context(psoc); + if (!pm_ctx) { + policy_mgr_err("Invalid Context"); + return QDF_STATUS_E_FAILURE; + } + + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create( + &pm_ctx->qdf_conc_list_lock))) { + policy_mgr_err("Failed to init qdf_conc_list_lock"); + QDF_ASSERT(0); + return QDF_STATUS_E_FAILURE; + } + return QDF_STATUS_SUCCESS; } @@ -332,6 +346,13 @@ QDF_STATUS policy_mgr_psoc_close(struct wlan_objmgr_psoc *psoc) return QDF_STATUS_E_FAILURE; } + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy( + &pm_ctx->qdf_conc_list_lock))) { + policy_mgr_err("Failed to destroy qdf_conc_list_lock"); + QDF_ASSERT(0); + return QDF_STATUS_E_FAILURE; + } + if (pm_ctx->hw_mode.hw_mode_list) { qdf_mem_free(pm_ctx->hw_mode.hw_mode_list); pm_ctx->hw_mode.hw_mode_list = NULL; @@ -374,13 +395,6 @@ QDF_STATUS policy_mgr_psoc_enable(struct wlan_objmgr_psoc *psoc) return status; } - if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create( - &pm_ctx->qdf_conc_list_lock))) { - policy_mgr_err("Failed to init qdf_conc_list_lock"); - QDF_ASSERT(0); - return status; - } - pm_ctx->do_hw_mode_change = false; pm_ctx->hw_mode_change_in_progress = POLICY_MGR_HW_MODE_NOT_IN_PROGRESS; /* reset sap mandatory channels */ @@ -440,13 +454,6 @@ QDF_STATUS policy_mgr_psoc_disable(struct wlan_objmgr_psoc *psoc) return QDF_STATUS_E_FAILURE; } - if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy( - &pm_ctx->qdf_conc_list_lock))) { - policy_mgr_err("Failed to destroy qdf_conc_list_lock"); - status = QDF_STATUS_E_FAILURE; - QDF_ASSERT(0); - } - /* destroy connection_update_done_evt */ if (!QDF_IS_STATUS_SUCCESS(qdf_event_destroy (&pm_ctx->connection_update_done_evt))) {