qcacld-3.0: Add new params in ACS calc process
qcacld-2.0 to qcacld-3.0 propagation
Before this change the ACS calc process only consider the
channel's rssi and bss count in this channel, in this change
add noise floor, channel free statistics and tx power in the
ACS calc process.
Change-Id: I654e53fa2441e03723f150d973c124985c67f2b4
CRs-fixed: 1050316
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 1d9abc8..e075112 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -85,6 +85,49 @@
#define GET_IE_LEN_IN_BSS_DESC(lenInBss) (lenInBss + sizeof(lenInBss) - \
((uintptr_t)OFFSET_OF(tSirBssDescription, ieFields)))
+#define ACS_WEIGHT_AMOUNT_LOCAL 240
+
+#define ACS_WEIGHT_AMOUNT_CONFIG(weights) \
+ (((weights) & 0xf) + \
+ (((weights) & 0xf0) >> 4) + \
+ (((weights) & 0xf00) >> 8) + \
+ (((weights) & 0xf000) >> 12) + \
+ (((weights) & 0xf0000) >> 16) + \
+ (((weights) & 0xf00000) >> 20))
+
+/*
+ * LSH/RSH 4 to enhance the accurate since
+ * need to do modulation to ACS_WEIGHT_AMOUNT_LOCAL.
+ */
+#define ACS_WEIGHT_COMPUTE(weights, weight, factor, base) \
+ (((((((((weight) << 4) * ACS_WEIGHT_AMOUNT_LOCAL * (factor)) + \
+ (ACS_WEIGHT_AMOUNT_CONFIG((weights)) >> 1)) / \
+ ACS_WEIGHT_AMOUNT_CONFIG((weights))) + \
+ ((base) >> 1)) / (base)) + 8) >> 4)
+
+#define ACS_WEIGHT_CFG_TO_LOCAL(weights, weight) \
+ (((((((weight) << 4) * ACS_WEIGHT_AMOUNT_LOCAL) + \
+ (ACS_WEIGHT_AMOUNT_CONFIG((weights)) >> 1)) / \
+ ACS_WEIGHT_AMOUNT_CONFIG((weights))) + 8) >> 4)
+
+#define ACS_WEIGHT_SOFTAP_RSSI_CFG(weights) \
+ ((weights) & 0xf)
+
+#define ACS_WEIGHT_SOFTAP_COUNT_CFG(weights) \
+ (((weights) & 0xf0) >> 4)
+
+#define ACS_WEIGHT_SOFTAP_NOISE_FLOOR_CFG(weights) \
+ (((weights) & 0xf00) >> 8)
+
+#define ACS_WEIGHT_SOFTAP_CHANNEL_FREE_CFG(weights) \
+ (((weights) & 0xf000) >> 12)
+
+#define ACS_WEIGHT_SOFTAP_TX_POWER_RANGE_CFG(weights) \
+ (((weights) & 0xf0000) >> 16)
+
+#define ACS_WEIGHT_SOFTAP_TX_POWER_THROUGHPUT_CFG(weights) \
+ (((weights) & 0xf00000) >> 20)
+
#ifdef FEATURE_WLAN_CH_AVOID
sapSafeChannelType safe_channels[NUM_CHANNELS] = {
{1, true},
@@ -492,6 +535,39 @@
}
/**
+ * sap_channel_in_acs_channel_list() - check if channel in acs channel list
+ * @channel_num: channel to check
+ * @sap_ctx: struct ptSapContext
+ * @spect_info_params: strcut tSapChSelSpectInfo
+ *
+ * This function checks if specified channel is in the configured ACS channel
+ * list.
+ *
+ * Return: channel number if in acs channel list or SAP_CHANNEL_NOT_SELECTED
+ */
+static
+uint8_t sap_channel_in_acs_channel_list(uint8_t channel_num,
+ ptSapContext sap_ctx,
+ tSapChSelSpectInfo *spect_info_params)
+{
+ uint8_t i = 0;
+
+ if ((NULL == sap_ctx->acs_cfg->ch_list) ||
+ (NULL == spect_info_params))
+ return channel_num;
+
+ if (channel_num > 0 && channel_num <= 252) {
+ for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++) {
+ if ((sap_ctx->acs_cfg->ch_list[i]) == channel_num)
+ return channel_num;
+ }
+ return SAP_CHANNEL_NOT_SELECTED;
+ } else {
+ return SAP_CHANNEL_NOT_SELECTED;
+ }
+}
+
+/**
* sap_select_preferred_channel_from_channel_list() - to calc best cahnnel
* @best_chnl: best channel already calculated among all the chanels
* @sap_ctx: sap context
@@ -675,48 +751,59 @@
return true;
}
-/*==========================================================================
- FUNCTION sapweight_rssi_count
-
- DESCRIPTION
- Function weightRssiCount calculates the channel weight due to rssi
+/**
+ * sapweight_rssi_count() - calculates the channel weight due to rssi
and data count(here number of BSS observed)
-
- DEPENDENCIES
- NA.
-
- PARAMETERS
-
- IN
- rssi : Max signal strength receieved from a BSS for the channel
- count : Number of BSS observed in the channel
-
- RETURN VALUE
- uint32_t : Calculated channel weight based on above two
-
- SIDE EFFECTS
- ============================================================================*/
-static uint32_t sapweight_rssi_count(int8_t rssi, uint16_t count)
+ * @sap_ctx : Softap context
+ * @rssi : Max signal strength receieved from a BSS for the channel
+ * @count : Number of BSS observed in the channel
+ *
+ * Return: uint32_t Calculated channel weight based on above two
+ */
+static
+uint32_t sapweight_rssi_count(ptSapContext sap_ctx, int8_t rssi,
+ uint16_t count)
{
int32_t rssiWeight = 0;
int32_t countWeight = 0;
uint32_t rssicountWeight = 0;
+ uint8_t softap_rssi_weight_cfg, softap_count_weight_cfg;
+ uint8_t softap_rssi_weight_local, softap_count_weight_local;
+
+ softap_rssi_weight_cfg =
+ ACS_WEIGHT_SOFTAP_RSSI_CFG(sap_ctx->auto_channel_select_weight);
+
+ softap_count_weight_cfg =
+ ACS_WEIGHT_SOFTAP_COUNT_CFG(sap_ctx->auto_channel_select_weight);
+
+ softap_rssi_weight_local =
+ ACS_WEIGHT_CFG_TO_LOCAL(sap_ctx->auto_channel_select_weight,
+ softap_rssi_weight_cfg);
+
+ softap_count_weight_local =
+ ACS_WEIGHT_CFG_TO_LOCAL(sap_ctx->auto_channel_select_weight,
+ softap_count_weight_cfg);
/* Weight from RSSI */
- rssiWeight = SOFTAP_RSSI_WEIGHT * (rssi - SOFTAP_MIN_RSSI)
- / (SOFTAP_MAX_RSSI - SOFTAP_MIN_RSSI);
+ rssiWeight = ACS_WEIGHT_COMPUTE(sap_ctx->auto_channel_select_weight,
+ softap_rssi_weight_cfg,
+ rssi - SOFTAP_MIN_RSSI,
+ SOFTAP_MAX_RSSI - SOFTAP_MIN_RSSI);
- if (rssiWeight > SOFTAP_RSSI_WEIGHT)
- rssiWeight = SOFTAP_RSSI_WEIGHT;
+ if (rssiWeight > softap_rssi_weight_local)
+ rssiWeight = softap_rssi_weight_local;
+
else if (rssiWeight < 0)
rssiWeight = 0;
/* Weight from data count */
- countWeight = SOFTAP_COUNT_WEIGHT * (count - SOFTAP_MIN_COUNT)
- / (SOFTAP_MAX_COUNT - SOFTAP_MIN_COUNT);
+ countWeight = ACS_WEIGHT_COMPUTE(sap_ctx->auto_channel_select_weight,
+ softap_count_weight_cfg,
+ count - SOFTAP_MIN_COUNT,
+ SOFTAP_MAX_COUNT - SOFTAP_MIN_COUNT);
- if (countWeight > SOFTAP_COUNT_WEIGHT)
- countWeight = SOFTAP_COUNT_WEIGHT;
+ if (countWeight > softap_count_weight_local)
+ countWeight = softap_count_weight_local;
rssicountWeight = rssiWeight + countWeight;
@@ -728,6 +815,265 @@
}
/**
+ * sap_get_channel_status() - get channel info via channel number
+ * @p_mac: Pointer to Global MAC structure
+ * @channel_id: channel id
+ *
+ * Return: chan status info
+ */
+static struct lim_channel_status *sap_get_channel_status
+ (tpAniSirGlobal p_mac, uint32_t channel_id)
+{
+ return csr_get_channel_status(p_mac, channel_id);
+}
+
+/**
+ * sap_clear_channel_status() - clear chan info
+ * @p_mac: Pointer to Global MAC structure
+ *
+ * Return: none
+ */
+static void sap_clear_channel_status(tpAniSirGlobal p_mac)
+{
+ csr_clear_channel_status(p_mac);
+}
+
+/**
+ * sap_weight_channel_noise_floor() - compute noise floor weight
+ * @sap_ctx: sap context
+ * @chn_stat: Pointer to chan status info
+ *
+ * Return: channel noise floor weight
+ */
+static uint32_t sap_weight_channel_noise_floor(ptSapContext sap_ctx,
+ struct lim_channel_status
+ *channel_stat)
+{
+ uint32_t noise_floor_weight;
+ uint8_t softap_nf_weight_cfg;
+ uint8_t softap_nf_weight_local;
+
+ softap_nf_weight_cfg =
+ ACS_WEIGHT_SOFTAP_NOISE_FLOOR_CFG
+ (sap_ctx->auto_channel_select_weight);
+
+ softap_nf_weight_local =
+ ACS_WEIGHT_CFG_TO_LOCAL(sap_ctx->auto_channel_select_weight,
+ softap_nf_weight_cfg);
+
+ if (channel_stat == NULL || channel_stat->channelfreq == 0) {
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
+ "In %s, sanity check failed return max weight",
+ __func__);
+ return softap_nf_weight_local;
+ }
+
+ noise_floor_weight = (channel_stat->noise_floor == 0) ? 0 :
+ (ACS_WEIGHT_COMPUTE(
+ sap_ctx->auto_channel_select_weight,
+ softap_nf_weight_cfg,
+ channel_stat->noise_floor -
+ SOFTAP_MIN_NF,
+ SOFTAP_MAX_NF - SOFTAP_MIN_NF));
+
+ if (noise_floor_weight > softap_nf_weight_local)
+ noise_floor_weight = softap_nf_weight_local;
+ else if (noise_floor_weight < 0)
+ noise_floor_weight = 0;
+
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
+ "In %s, nf=%d, nfwc=%d, nfwl=%d, nfw=%d",
+ __func__, channel_stat->noise_floor,
+ softap_nf_weight_cfg, softap_nf_weight_local,
+ noise_floor_weight);
+
+ return noise_floor_weight;
+}
+
+/**
+ * sap_weight_channel_free() - compute channel free weight
+ * @sap_ctx: sap context
+ * @chn_stat: Pointer to chan status info
+ *
+ * Return: channel free weight
+ */
+static uint32_t sap_weight_channel_free(ptSapContext sap_ctx,
+ struct lim_channel_status
+ *channel_stat)
+{
+ uint32_t channel_free_weight;
+ uint8_t softap_channel_free_weight_cfg;
+ uint8_t softap_channel_free_weight_local;
+ uint32_t rx_clear_count = 0;
+ uint32_t cycle_count = 0;
+
+ softap_channel_free_weight_cfg =
+ ACS_WEIGHT_SOFTAP_CHANNEL_FREE_CFG
+ (sap_ctx->auto_channel_select_weight);
+
+ softap_channel_free_weight_local =
+ ACS_WEIGHT_CFG_TO_LOCAL(sap_ctx->auto_channel_select_weight,
+ softap_channel_free_weight_cfg);
+
+ if (channel_stat == NULL || channel_stat->channelfreq == 0) {
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
+ "In %s, sanity check failed return max weight",
+ __func__);
+ return softap_channel_free_weight_local;
+ }
+
+ rx_clear_count = channel_stat->rx_clear_count -
+ channel_stat->tx_frame_count -
+ channel_stat->rx_frame_count;
+ cycle_count = channel_stat->cycle_count;
+
+ /* LSH 4, otherwise it is always 0. */
+ channel_free_weight = (cycle_count == 0) ? 0 :
+ (ACS_WEIGHT_COMPUTE(
+ sap_ctx->auto_channel_select_weight,
+ softap_channel_free_weight_cfg,
+ ((rx_clear_count << 8) +
+ (cycle_count >> 1))/cycle_count -
+ (SOFTAP_MIN_CHNFREE << 8),
+ (SOFTAP_MAX_CHNFREE -
+ SOFTAP_MIN_CHNFREE) << 8));
+
+ if (channel_free_weight > softap_channel_free_weight_local)
+ channel_free_weight = softap_channel_free_weight_local;
+
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
+ "In %s, rcc=%d, cc=%d, tc=%d, rc=%d, cfwc=%d, cfwl=%d, cfw=%d",
+ __func__, rx_clear_count, cycle_count,
+ channel_stat->tx_frame_count,
+ channel_stat->rx_frame_count,
+ softap_channel_free_weight_cfg,
+ softap_channel_free_weight_local,
+ channel_free_weight);
+
+ return channel_free_weight;
+}
+
+/**
+ * sap_weight_channel_txpwr_range() - compute channel tx power range weight
+ * @sap_ctx: sap context
+ * @chn_stat: Pointer to chan status info
+ *
+ * Return: tx power range weight
+ */
+static uint32_t sap_weight_channel_txpwr_range(ptSapContext sap_ctx,
+ struct lim_channel_status
+ *channel_stat)
+{
+ uint32_t txpwr_weight_low_speed;
+ uint8_t softap_txpwr_range_weight_cfg;
+ uint8_t softap_txpwr_range_weight_local;
+
+ softap_txpwr_range_weight_cfg =
+ ACS_WEIGHT_SOFTAP_TX_POWER_RANGE_CFG
+ (sap_ctx->auto_channel_select_weight);
+
+ softap_txpwr_range_weight_local =
+ ACS_WEIGHT_CFG_TO_LOCAL(sap_ctx->auto_channel_select_weight,
+ softap_txpwr_range_weight_cfg);
+
+ if (channel_stat == NULL || channel_stat->channelfreq == 0) {
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
+ "In %s, sanity check failed return max weight",
+ __func__);
+ return softap_txpwr_range_weight_local;
+ }
+
+ txpwr_weight_low_speed = (channel_stat->chan_tx_pwr_range == 0) ? 0 :
+ (ACS_WEIGHT_COMPUTE(
+ sap_ctx->auto_channel_select_weight,
+ softap_txpwr_range_weight_cfg,
+ SOFTAP_MAX_TXPWR -
+ channel_stat->chan_tx_pwr_range,
+ SOFTAP_MAX_TXPWR - SOFTAP_MIN_TXPWR));
+
+ if (txpwr_weight_low_speed > softap_txpwr_range_weight_local)
+ txpwr_weight_low_speed = softap_txpwr_range_weight_local;
+
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
+ "In %s, tpr=%d, tprwc=%d, tprwl=%d, tprw=%d",
+ __func__, channel_stat->chan_tx_pwr_range,
+ softap_txpwr_range_weight_cfg,
+ softap_txpwr_range_weight_local,
+ txpwr_weight_low_speed);
+
+ return txpwr_weight_low_speed;
+}
+
+/**
+ * sap_weight_channel_txpwr_tput() - compute channel tx power
+ * throughput weight
+ * @sap_ctx: sap context
+ * @chn_stat: Pointer to chan status info
+ *
+ * Return: tx power throughput weight
+ */
+static uint32_t sap_weight_channel_txpwr_tput(ptSapContext sap_ctx,
+ struct lim_channel_status
+ *channel_stat)
+{
+ uint32_t txpwr_weight_high_speed;
+ uint8_t softap_txpwr_tput_weight_cfg;
+ uint8_t softap_txpwr_tput_weight_local;
+
+ softap_txpwr_tput_weight_cfg =
+ ACS_WEIGHT_SOFTAP_TX_POWER_THROUGHPUT_CFG
+ (sap_ctx->auto_channel_select_weight);
+
+ softap_txpwr_tput_weight_local =
+ ACS_WEIGHT_CFG_TO_LOCAL(sap_ctx->auto_channel_select_weight,
+ softap_txpwr_tput_weight_cfg);
+
+ if (channel_stat == NULL || channel_stat->channelfreq == 0) {
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
+ "In %s, sanity check failed return max weight",
+ __func__);
+ return softap_txpwr_tput_weight_local;
+ }
+
+ txpwr_weight_high_speed = (channel_stat->chan_tx_pwr_throughput == 0)
+ ? 0 : (ACS_WEIGHT_COMPUTE(
+ sap_ctx->auto_channel_select_weight,
+ softap_txpwr_tput_weight_cfg,
+ SOFTAP_MAX_TXPWR -
+ channel_stat->chan_tx_pwr_throughput,
+ SOFTAP_MAX_TXPWR - SOFTAP_MIN_TXPWR));
+
+ if (txpwr_weight_high_speed > softap_txpwr_tput_weight_local)
+ txpwr_weight_high_speed = softap_txpwr_tput_weight_local;
+
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
+ "In %s, tpt=%d, tptwc=%d, tptwl=%d, tptw=%d",
+ __func__, channel_stat->chan_tx_pwr_throughput,
+ softap_txpwr_tput_weight_cfg,
+ softap_txpwr_tput_weight_local,
+ txpwr_weight_high_speed);
+
+ return txpwr_weight_high_speed;
+}
+
+/**
+ * sap_weight_channel_status() - compute chan status weight
+ * @sap_ctx: sap context
+ * @chn_stat: Pointer to chan status info
+ *
+ * Return: chan status weight
+ */
+static
+uint32_t sap_weight_channel_status(ptSapContext sap_ctx,
+ struct lim_channel_status *channel_stat)
+{
+ return sap_weight_channel_noise_floor(sap_ctx, channel_stat) +
+ sap_weight_channel_free(sap_ctx, channel_stat) +
+ sap_weight_channel_txpwr_range(sap_ctx, channel_stat) +
+ sap_weight_channel_txpwr_tput(sap_ctx, channel_stat);
+}
+
+/**
* sap_update_rssi_bsscount() - updates bss count and rssi effect.
*
* @pSpectCh: Channel Information
@@ -1356,9 +1702,13 @@
rssi -= PCL_RSSI_DISCOUNT;
pSpectCh->weight =
- SAPDFS_NORMALISE_1000 * sapweight_rssi_count(rssi,
- pSpectCh->
- bssCount);
+ SAPDFS_NORMALISE_1000 *
+ (sapweight_rssi_count(sap_ctx, rssi,
+ pSpectCh->bssCount) + sap_weight_channel_status(
+ sap_ctx, sap_get_channel_status(pMac,
+ pSpectCh->chNum)));
+ if (pSpectCh->weight > SAP_ACS_WEIGHT_MAX)
+ pSpectCh->weight = SAP_ACS_WEIGHT_MAX;
pSpectCh->weight_copy = pSpectCh->weight;
/* ------ Debug Info ------ */
@@ -1369,6 +1719,7 @@
/* ------ Debug Info ------ */
pSpectCh++;
}
+ sap_clear_channel_status(pMac);
qdf_mem_free(pBeaconStruct);
}
@@ -2237,7 +2588,12 @@
sap_update_unsafe_channel_list(hal, sap_ctx);
#endif
- if (NULL == scan_result) {
+ /*
+ * If ACS weight is not enabled on noise_floor/channel_free/tx_power,
+ * then skip acs process if no bss found.
+ */
+ if (NULL == scan_result &&
+ !(sap_ctx->auto_channel_select_weight & 0xffff00)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("No external AP present"));
@@ -2342,7 +2698,7 @@
continue;
tmp_ch_num = spect_info->pSpectCh[count].chNum;
- tmp_ch_num = sap_select_preferred_channel_from_channel_list(
+ tmp_ch_num = sap_channel_in_acs_channel_list(
tmp_ch_num, sap_ctx, spect_info);
if (tmp_ch_num == SAP_CHANNEL_NOT_SELECTED)
continue;