|
|
@@ -15,10 +15,13 @@
|
|
|
*/
|
|
|
|
|
|
#include "wlan_ll_lt_sap_main.h"
|
|
|
-#include "wlan_scan_ucfg_api.h"
|
|
|
+#include "wlan_reg_services_api.h"
|
|
|
+#include "wlan_ll_sap_public_structs.h"
|
|
|
+#include "wlan_policy_mgr_i.h"
|
|
|
#include "wlan_mlme_vdev_mgr_interface.h"
|
|
|
#include "wlan_ll_sap_main.h"
|
|
|
#include "wlan_ll_lt_sap_bearer_switch.h"
|
|
|
+#include "wlan_scan_api.h"
|
|
|
|
|
|
bool ll_lt_sap_is_supported(void)
|
|
|
{
|
|
|
@@ -28,10 +31,20 @@ bool ll_lt_sap_is_supported(void)
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
-QDF_STATUS
|
|
|
-ll_lt_sap_get_sorted_user_config_acs_ch_list(struct wlan_objmgr_psoc *psoc,
|
|
|
- uint8_t vdev_id,
|
|
|
- struct sap_sel_ch_info *ch_info)
|
|
|
+/**
|
|
|
+ * ll_lt_sap_get_sorted_user_config_acs_ch_list() - API to get sorted user
|
|
|
+ * configured ACS channel list
|
|
|
+ * @psoc: Pointer to psoc object
|
|
|
+ * @vdev_id: Vdev Id
|
|
|
+ * @ch_info: Pointer to ch_info
|
|
|
+ *
|
|
|
+ * Return: None
|
|
|
+ */
|
|
|
+static
|
|
|
+QDF_STATUS ll_lt_sap_get_sorted_user_config_acs_ch_list(
|
|
|
+ struct wlan_objmgr_psoc *psoc,
|
|
|
+ uint8_t vdev_id,
|
|
|
+ struct sap_sel_ch_info *ch_info)
|
|
|
{
|
|
|
struct scan_filter *filter;
|
|
|
qdf_list_t *list = NULL;
|
|
|
@@ -146,6 +159,249 @@ QDF_STATUS ll_lt_sap_deinit(struct wlan_objmgr_vdev *vdev)
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
|
|
|
|
+static
|
|
|
+void ll_lt_sap_update_mac_freq(struct wlan_ll_lt_sap_mac_freq *freq_list,
|
|
|
+ qdf_freq_t sbs_cut_off_freq,
|
|
|
+ qdf_freq_t given_freq)
|
|
|
+{
|
|
|
+ if (WLAN_REG_IS_5GHZ_CH_FREQ(given_freq) &&
|
|
|
+ ((sbs_cut_off_freq && given_freq < sbs_cut_off_freq) ||
|
|
|
+ !sbs_cut_off_freq) && !freq_list->freq_5GHz_low) {
|
|
|
+ freq_list->freq_5GHz_low = given_freq;
|
|
|
+ /*
|
|
|
+ * Update same freq in 5GHz high freq if sbs_cut_off_freq
|
|
|
+ * is not present
|
|
|
+ */
|
|
|
+ if (!sbs_cut_off_freq)
|
|
|
+ freq_list->freq_5GHz_high = given_freq;
|
|
|
+ } else if (WLAN_REG_IS_5GHZ_CH_FREQ(given_freq) &&
|
|
|
+ ((sbs_cut_off_freq && given_freq > sbs_cut_off_freq) ||
|
|
|
+ !sbs_cut_off_freq) && !freq_list->freq_5GHz_high) {
|
|
|
+ freq_list->freq_5GHz_high = given_freq;
|
|
|
+ /*
|
|
|
+ * Update same freq for 5GHz low freq if sbs_cut_off_freq
|
|
|
+ * is not present
|
|
|
+ */
|
|
|
+ if (!sbs_cut_off_freq)
|
|
|
+ freq_list->freq_5GHz_low = given_freq;
|
|
|
+ } else if (WLAN_REG_IS_6GHZ_CHAN_FREQ(given_freq) &&
|
|
|
+ !freq_list->freq_6GHz) {
|
|
|
+ freq_list->freq_6GHz = given_freq;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/* Threshold value of channel weight */
|
|
|
+#define CHANNEL_WEIGHT_THRESHOLD_VALUE 20000
|
|
|
+static
|
|
|
+void ll_lt_sap_update_freq_list(struct wlan_objmgr_psoc *psoc,
|
|
|
+ struct sap_sel_ch_info *ch_param,
|
|
|
+ struct wlan_ll_lt_sap_freq_list *freq_list,
|
|
|
+ struct policy_mgr_pcl_list *pcl,
|
|
|
+ struct connection_info *info,
|
|
|
+ uint8_t connection_count,
|
|
|
+ uint8_t vdev_id)
|
|
|
+{
|
|
|
+ qdf_freq_t freq, sbs_cut_off_freq;
|
|
|
+ qdf_freq_t same_mac_freq, standalone_mac_freq;
|
|
|
+ uint8_t i = 0, count;
|
|
|
+ enum policy_mgr_con_mode con_mode = PM_MAX_NUM_OF_MODE;
|
|
|
+
|
|
|
+ sbs_cut_off_freq = policy_mgr_get_sbs_cut_off_freq(psoc);
|
|
|
+
|
|
|
+ for (i = 0; i < ch_param->num_ch; i++) {
|
|
|
+ if (!ch_param->ch_info[i].valid)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ freq = ch_param->ch_info[i].chan_freq;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Do not select same channel where LL_LT_SAP was
|
|
|
+ * present earlier
|
|
|
+ */
|
|
|
+ if (freq_list->prev_freq == freq)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ /* Check if channel is present in PCL or not */
|
|
|
+ if (!wlan_ll_sap_freq_present_in_pcl(pcl, freq))
|
|
|
+ continue;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Store first valid best channel from ACS final list
|
|
|
+ * This will be used if there is no valid freq present
|
|
|
+ * within threshold value or no concurrency present
|
|
|
+ */
|
|
|
+ if (!freq_list->best_freq)
|
|
|
+ freq_list->best_freq = freq;
|
|
|
+
|
|
|
+ if (!connection_count)
|
|
|
+ break;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Instead of selecting random channel, select those
|
|
|
+ * channel whose weight is less than
|
|
|
+ * CHANNEL_WEIGHT_THRESHOLD_VALUE value. This will help
|
|
|
+ * to get the best channel compartively and avoid multiple
|
|
|
+ * times of channel switch.
|
|
|
+ */
|
|
|
+ if (ch_param->ch_info[i].weight > CHANNEL_WEIGHT_THRESHOLD_VALUE)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ same_mac_freq = 0;
|
|
|
+ standalone_mac_freq = 0;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Loop through all existing connections before updating
|
|
|
+ * channels for LL_LT_SAP.
|
|
|
+ */
|
|
|
+ for (count = 0; count < connection_count; count++) {
|
|
|
+ /* Do not select SCC channel to update freq_list */
|
|
|
+ if (freq == info[count].ch_freq) {
|
|
|
+ same_mac_freq = 0;
|
|
|
+ standalone_mac_freq = 0;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ /*
|
|
|
+ * Check whether ch_param frequency is in same mac
|
|
|
+ * or not.
|
|
|
+ */
|
|
|
+ if (policy_mgr_2_freq_always_on_same_mac(
|
|
|
+ psoc, freq,
|
|
|
+ info[count].ch_freq)) {
|
|
|
+ con_mode = policy_mgr_get_mode_by_vdev_id(
|
|
|
+ psoc, info[count].vdev_id);
|
|
|
+ /*
|
|
|
+ * Check whether SAP is present in same mac or
|
|
|
+ * not. If yes then do not select that frequency
|
|
|
+ * because two beacon entity can't be in same
|
|
|
+ * mac.
|
|
|
+ * Also, do not fill same_mac_freq if it's
|
|
|
+ * already filled i.e two existing connection
|
|
|
+ * are present on same mac.
|
|
|
+ */
|
|
|
+ if (con_mode == PM_SAP_MODE || same_mac_freq) {
|
|
|
+ same_mac_freq = 0;
|
|
|
+ standalone_mac_freq = 0;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ same_mac_freq = freq;
|
|
|
+ } else if (!standalone_mac_freq) {
|
|
|
+ /*
|
|
|
+ * Fill standalone_mac_freq only if it's not
|
|
|
+ * filled
|
|
|
+ */
|
|
|
+ standalone_mac_freq = freq;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Scenario: Let say two concurrent connection(other than
|
|
|
+ * LL_LT_SAP) are present in both mac and one channel from
|
|
|
+ * ch_param structure needs to select to fill in freq_list for
|
|
|
+ * LL_LT_SAP.
|
|
|
+ * Since, there is an existing connection present in both mac
|
|
|
+ * then there is chance that channel from ch_param structure
|
|
|
+ * may get select for both same_mac_freq and standalone_mac_freq
|
|
|
+ *
|
|
|
+ * But ideally standalone_mac_freq is not free, some existing
|
|
|
+ * connection is already present in it.
|
|
|
+ * So, instead of giving priority to fill standalone_mac_freq
|
|
|
+ * first, fill same_mac_freq first.
|
|
|
+ *
|
|
|
+ * Example: Let say 2 concurrent interface present in channel
|
|
|
+ * 36 and 149. Now channel 48 from ch_param structure needs to
|
|
|
+ * be validate and fill based on existing interface.
|
|
|
+ * With respect to channel 36, it will fit to same_mac_freq
|
|
|
+ * and with respect to channel 149, it will fit to
|
|
|
+ * standalone_mac_freq. But in standalone_mac_freq, there is
|
|
|
+ * already existing interface present. So, give priority to
|
|
|
+ * same_mac_freq to fill the freq list.
|
|
|
+ */
|
|
|
+ if (same_mac_freq)
|
|
|
+ ll_lt_sap_update_mac_freq(&freq_list->shared_mac,
|
|
|
+ sbs_cut_off_freq,
|
|
|
+ same_mac_freq);
|
|
|
+ else if (standalone_mac_freq)
|
|
|
+ ll_lt_sap_update_mac_freq(&freq_list->standalone_mac,
|
|
|
+ sbs_cut_off_freq,
|
|
|
+ standalone_mac_freq);
|
|
|
+
|
|
|
+ if (freq_list->shared_mac.freq_5GHz_low &&
|
|
|
+ freq_list->shared_mac.freq_5GHz_high &&
|
|
|
+ freq_list->shared_mac.freq_6GHz &&
|
|
|
+ freq_list->standalone_mac.freq_5GHz_low &&
|
|
|
+ freq_list->standalone_mac.freq_5GHz_high &&
|
|
|
+ freq_list->standalone_mac.freq_6GHz)
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ ll_sap_debug("vdev %d, best %d Shared: low %d high %d 6Ghz %d, Standalone: low %d high %d 6Ghz %d, prev %d, existing connection cnt %d",
|
|
|
+ vdev_id, freq_list->best_freq,
|
|
|
+ freq_list->shared_mac.freq_5GHz_low,
|
|
|
+ freq_list->shared_mac.freq_5GHz_high,
|
|
|
+ freq_list->shared_mac.freq_6GHz,
|
|
|
+ freq_list->standalone_mac.freq_5GHz_low,
|
|
|
+ freq_list->standalone_mac.freq_5GHz_high,
|
|
|
+ freq_list->standalone_mac.freq_6GHz,
|
|
|
+ freq_list->prev_freq, connection_count);
|
|
|
+}
|
|
|
+
|
|
|
+static
|
|
|
+QDF_STATUS ll_lt_sap_get_allowed_freq_list(
|
|
|
+ struct wlan_objmgr_psoc *psoc,
|
|
|
+ uint8_t vdev_id,
|
|
|
+ struct sap_sel_ch_info *ch_param,
|
|
|
+ struct wlan_ll_lt_sap_freq_list *freq_list)
|
|
|
+{
|
|
|
+ struct connection_info conn_info[MAX_NUMBER_OF_CONC_CONNECTIONS];
|
|
|
+ uint8_t count;
|
|
|
+ struct policy_mgr_pcl_list *pcl;
|
|
|
+ QDF_STATUS status;
|
|
|
+
|
|
|
+ pcl = qdf_mem_malloc(sizeof(*pcl));
|
|
|
+ if (!pcl)
|
|
|
+ return QDF_STATUS_E_FAILURE;
|
|
|
+
|
|
|
+ status = policy_mgr_get_pcl_ch_list_for_ll_sap(psoc, pcl, vdev_id,
|
|
|
+ conn_info, &count);
|
|
|
+ if (QDF_IS_STATUS_ERROR(status))
|
|
|
+ goto end;
|
|
|
+
|
|
|
+ ll_lt_sap_update_freq_list(psoc, ch_param, freq_list, pcl,
|
|
|
+ conn_info, count, vdev_id);
|
|
|
+
|
|
|
+ status = QDF_STATUS_SUCCESS;
|
|
|
+end:
|
|
|
+ qdf_mem_free(pcl);
|
|
|
+ return status;
|
|
|
+}
|
|
|
+
|
|
|
+QDF_STATUS ll_lt_sap_get_freq_list(struct wlan_objmgr_psoc *psoc,
|
|
|
+ struct wlan_ll_lt_sap_freq_list *freq_list,
|
|
|
+ uint8_t vdev_id)
|
|
|
+{
|
|
|
+ struct sap_sel_ch_info ch_param = { NULL, 0 };
|
|
|
+ QDF_STATUS status;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * This memory will be allocated in sap_chan_sel_init() as part
|
|
|
+ * of sap_sort_channel_list(). But the caller has to free up the
|
|
|
+ * allocated memory
|
|
|
+ */
|
|
|
+
|
|
|
+ status = ll_lt_sap_get_sorted_user_config_acs_ch_list(psoc, vdev_id,
|
|
|
+ &ch_param);
|
|
|
+
|
|
|
+ if (!ch_param.num_ch || QDF_IS_STATUS_ERROR(status))
|
|
|
+ goto release_mem;
|
|
|
+
|
|
|
+ status = ll_lt_sap_get_allowed_freq_list(psoc, vdev_id, &ch_param,
|
|
|
+ freq_list);
|
|
|
+
|
|
|
+release_mem:
|
|
|
+ wlan_ll_sap_free_chan_info(&ch_param);
|
|
|
+ return status;
|
|
|
+}
|
|
|
+
|
|
|
QDF_STATUS ll_lt_sap_switch_bearer_to_ble(struct wlan_objmgr_psoc *psoc,
|
|
|
struct wlan_bearer_switch_request *bs_request)
|
|
|
{
|
Jyoti Kumari