A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-26 06:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Convert primary, secondary channel for acs cfg to freq

Browse source 
Convert primary, secondary channel for acs cfg to freq as part
of ACS 6Ghz changes.

Change-Id: I4f6220b39dae91df070b0764fa8b048cdc6ad00f
CRs-Fixed: 2555988
This commit is contained in:
gaurank kathpalia 2019-10-30 17:21:48 +05:30 • committed by nshrivas
commit 92b81ceb99
6 changed files with 87 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

71
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -1722,12 +1722,12 @@ int wlan_hdd_sap_cfg_dfs_override(struct hdd_adapter *adapter)
sap_config->chan_freq = con_ch_freq;
if (con_sap_config->acs_cfg.acs_mode == true) {
if (con_ch != con_sap_config->acs_cfg.pri_ch &&
con_ch != con_sap_config->acs_cfg.ht_sec_ch) {
if (con_ch_freq != con_sap_config->acs_cfg.pri_ch_freq &&
con_ch_freq != con_sap_config->acs_cfg.ht_sec_ch_freq) {
hdd_err("Primary AP channel config error");
hdd_err("Operating ch: %d ACS ch: %d %d",
con_ch, con_sap_config->acs_cfg.pri_ch,
con_sap_config->acs_cfg.ht_sec_ch);
hdd_err("Operating ch: %d ACS ch freq: %d Sec Freq %d",
con_ch, con_sap_config->acs_cfg.pri_ch_freq,
con_sap_config->acs_cfg.ht_sec_ch_freq);
return -EINVAL;
}
/* Sec AP ACS info is overwritten with Pri AP due to DFS
@ -1755,11 +1755,10 @@ int wlan_hdd_sap_cfg_dfs_override(struct hdd_adapter *adapter)
con_sap_config->acs_cfg.ch_list_count;
} else {
sap_config->acs_cfg.pri_ch = con_ch;
sap_config->acs_cfg.pri_ch_freq = con_ch_freq;
if (sap_config->acs_cfg.ch_width > eHT_CHANNEL_WIDTH_20MHZ)
sap_config->acs_cfg.ht_sec_ch = wlan_reg_freq_to_chan(
hdd_ctx->pdev,
con_sap_config->sec_ch_freq);
sap_config->acs_cfg.ht_sec_ch_freq =
con_sap_config->sec_ch_freq;
}
return con_ch;
@ -2941,18 +2940,18 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
/* if it is only one channel, send ACS event to upper layer */
if (sap_config->acs_cfg.ch_list_count == 1) {
sap_config->acs_cfg.pri_ch =
wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_config->acs_cfg.freq_list[0]);
sap_config->acs_cfg.pri_ch_freq =
sap_config->acs_cfg.freq_list[0];
wlan_sap_set_sap_ctx_acs_cfg(
WLAN_HDD_GET_SAP_CTX_PTR(adapter), sap_config);
sap_config_acs_result(hdd_ctx->mac_handle,
WLAN_HDD_GET_SAP_CTX_PTR(adapter),
sap_config->acs_cfg.ht_sec_ch);
sap_config->acs_cfg.ht_sec_ch_freq);
sap_config->ch_params.ch_width =
sap_config->acs_cfg.ch_width;
sap_config->ch_params.sec_ch_offset =
sap_config->acs_cfg.ht_sec_ch;
wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_config->acs_cfg.ht_sec_ch_freq);
sap_config->ch_params.center_freq_seg0 =
sap_config->acs_cfg.vht_seg0_center_ch;
sap_config->ch_params.center_freq_seg1 =
@ -3149,6 +3148,8 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
int ret_val;
struct hdd_adapter *con_sap_adapter;
uint16_t ch_width;
uint8_t pri_channel;
uint8_t ht_sec_channel;
vendor_event = cfg80211_vendor_event_alloc(hdd_ctx->wiphy,
&(adapter->wdev),
@ -3161,9 +3162,15 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
return;
}
pri_channel = wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_cfg->acs_cfg.pri_ch_freq);
ht_sec_channel = wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_cfg->acs_cfg.ht_sec_ch_freq);
ret_val = nla_put_u8(vendor_event,
QCA_WLAN_VENDOR_ATTR_ACS_PRIMARY_CHANNEL,
sap_cfg->acs_cfg.pri_ch);
pri_channel);
if (ret_val) {
hdd_err("QCA_WLAN_VENDOR_ATTR_ACS_PRIMARY_CHANNEL put fail");
kfree_skb(vendor_event);
@ -3171,8 +3178,8 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
}
ret_val = nla_put_u8(vendor_event,
QCA_WLAN_VENDOR_ATTR_ACS_SECONDARY_CHANNEL,
sap_cfg->acs_cfg.ht_sec_ch);
QCA_WLAN_VENDOR_ATTR_ACS_SECONDARY_CHANNEL,
ht_sec_channel);
if (ret_val) {
hdd_err("QCA_WLAN_VENDOR_ATTR_ACS_SECONDARY_CHANNEL put fail");
kfree_skb(vendor_event);
@ -3214,14 +3221,14 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
kfree_skb(vendor_event);
return;
}
if (sap_cfg->acs_cfg.pri_ch > 14)
ret_val = nla_put_u8(vendor_event,
QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE,
QCA_ACS_MODE_IEEE80211A);
else
if (WLAN_REG_IS_24GHZ_CH_FREQ(sap_cfg->acs_cfg.pri_ch_freq))
ret_val = nla_put_u8(vendor_event,
QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE,
QCA_ACS_MODE_IEEE80211G);
else
ret_val = nla_put_u8(vendor_event,
QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE,
QCA_ACS_MODE_IEEE80211A);
if (ret_val) {
hdd_err("QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE put fail");
@ -3229,9 +3236,10 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
return;
}
hdd_debug("ACS result for %s: PRI_CH: %d SEC_CH: %d VHT_SEG0: %d VHT_SEG1: %d ACS_BW: %d",
adapter->dev->name, sap_cfg->acs_cfg.pri_ch,
sap_cfg->acs_cfg.ht_sec_ch, sap_cfg->acs_cfg.vht_seg0_center_ch,
hdd_debug("ACS result for %s: PRI_CH_FREQ: %d SEC_CH_FREQ: %d VHT_SEG0: %d VHT_SEG1: %d ACS_BW: %d",
adapter->dev->name, sap_cfg->acs_cfg.pri_ch_freq,
sap_cfg->acs_cfg.ht_sec_ch_freq,
sap_cfg->acs_cfg.vht_seg0_center_ch,
sap_cfg->acs_cfg.vht_seg1_center_ch, ch_width);
cfg80211_vendor_event(vendor_event, GFP_KERNEL);
@ -10946,13 +10954,15 @@ static void hdd_update_acs_sap_config(struct hdd_context *hdd_ctx,
sap_config->ch_width_orig = channel_bonding_mode ?
eHT_CHANNEL_WIDTH_40MHZ : eHT_CHANNEL_WIDTH_20MHZ;
}
sap_config->acs_cfg.pri_ch = channel_list->pri_ch;
sap_config->acs_cfg.pri_ch_freq =
wlan_reg_chan_to_freq(hdd_ctx->pdev, channel_list->pri_ch);
sap_config->acs_cfg.ch_width = channel_list->chan_width;
sap_config->acs_cfg.vht_seg0_center_ch =
channel_list->vht_seg0_center_ch;
sap_config->acs_cfg.vht_seg1_center_ch =
channel_list->vht_seg1_center_ch;
sap_config->acs_cfg.ht_sec_ch = channel_list->ht_sec_ch;
sap_config->acs_cfg.ht_sec_ch_freq =
wlan_reg_chan_to_freq(hdd_ctx->pdev, channel_list->ht_sec_ch);
}
static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason,
@ -11010,14 +11020,15 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason,
/* LTE coex event on current channel */
case QCA_WLAN_VENDOR_ACS_SELECT_REASON_LTE_COEX:
sap_config->acs_cfg.pri_ch = channel_list->pri_ch;
sap_config->acs_cfg.pri_ch_freq =
wlan_reg_chan_to_freq(hdd_ctx->pdev,
channel_list->pri_ch);
sap_config->acs_cfg.ch_width = channel_list->chan_width;
hdd_ap_ctx->sap_config.ch_width_orig =
channel_list->chan_width;
wlan_hdd_set_sap_csa_reason(hdd_ctx->psoc, adapter->vdev_id,
CSA_REASON_LTE_COEX);
hdd_switch_sap_channel(adapter, sap_config->acs_cfg.pri_ch,
true);
hdd_switch_sap_channel(adapter, channel_list->pri_ch, true);
break;
default:

20
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -2523,12 +2523,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
*/
ap_ctx->operating_chan_freq =
sap_event->sapevt.sap_ch_selected.pri_ch_freq;
ap_ctx->sap_config.acs_cfg.pri_ch =
wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_event->sapevt.sap_ch_selected.pri_ch_freq);
ap_ctx->sap_config.acs_cfg.ht_sec_ch =
wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_event->sapevt.sap_ch_selected.ht_sec_ch_freq);
ap_ctx->sap_config.acs_cfg.pri_ch_freq =
sap_event->sapevt.sap_ch_selected.pri_ch_freq;
ap_ctx->sap_config.acs_cfg.ht_sec_ch_freq =
sap_event->sapevt.sap_ch_selected.ht_sec_ch_freq;
ap_ctx->sap_config.acs_cfg.vht_seg0_center_ch =
sap_event->sapevt.sap_ch_selected.vht_seg0_center_ch;
ap_ctx->sap_config.acs_cfg.vht_seg1_center_ch =
@ -2593,12 +2591,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
adapter->dev->ifindex);
clear_bit(ACS_PENDING, &adapter->event_flags);
clear_bit(ACS_IN_PROGRESS, &hdd_ctx->g_event_flags);
ap_ctx->sap_config.acs_cfg.pri_ch =
wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_event->sapevt.sap_ch_selected.pri_ch_freq);
ap_ctx->sap_config.acs_cfg.ht_sec_ch =
wlan_reg_freq_to_chan(hdd_ctx->pdev,
sap_event->sapevt.sap_ch_selected.ht_sec_ch_freq);
ap_ctx->sap_config.acs_cfg.pri_ch_freq =
sap_event->sapevt.sap_ch_selected.pri_ch_freq;
ap_ctx->sap_config.acs_cfg.ht_sec_ch_freq =
sap_event->sapevt.sap_ch_selected.ht_sec_ch_freq;
ap_ctx->sap_config.acs_cfg.vht_seg0_center_ch =
sap_event->sapevt.sap_ch_selected.vht_seg0_center_ch;
ap_ctx->sap_config.acs_cfg.vht_seg1_center_ch =

6
core/sap/inc/sap_api.h
View file

@ -450,8 +450,8 @@ struct sap_acs_cfg {
uint8_t is_ht_enabled;
uint8_t is_vht_enabled;
/* ACS Algo Output */
uint8_t pri_ch;
uint8_t ht_sec_ch;
uint32_t pri_ch_freq;
uint32_t ht_sec_ch_freq;
uint8_t vht_seg0_center_ch;
uint8_t vht_seg1_center_ch;
uint32_t band;
@ -1249,7 +1249,7 @@ void wlan_sap_set_sap_ctx_acs_cfg(struct sap_context *sap_ctx,
void sap_config_acs_result(mac_handle_t mac_handle,
struct sap_context *sap_ctx,
uint32_t sec_ch);
uint32_t sec_ch_freq);
QDF_STATUS wlansap_update_sap_config_add_ie(struct sap_config *config,
const uint8_t *pAdditionIEBuffer,

27
core/sap/src/sap_api_link_cntl.c
View file

@ -95,12 +95,14 @@
void sap_config_acs_result(mac_handle_t mac_handle,
struct sap_context *sap_ctx,
uint32_t sec_ch)
uint32_t sec_ch_freq)
{
uint32_t channel = sap_ctx->acs_cfg->pri_ch;
uint32_t channel = wlan_freq_to_chan(sap_ctx->acs_cfg->pri_ch_freq);
struct ch_params ch_params = {0};
struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t sec_ch;
sec_ch = wlan_freq_to_chan(sec_ch_freq);
ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
wlan_reg_set_channel_params(mac_ctx->pdev, channel, sec_ch,
&ch_params);
@ -118,11 +120,13 @@ void sap_config_acs_result(mac_handle_t mac_handle,
sap_ctx->acs_cfg->vht_seg1_center_ch = 0;
if (ch_params.sec_ch_offset == PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)
sap_ctx->acs_cfg->ht_sec_ch = sap_ctx->acs_cfg->pri_ch - 4;
sap_ctx->acs_cfg->ht_sec_ch_freq =
sap_ctx->acs_cfg->pri_ch_freq - 20;
else if (ch_params.sec_ch_offset == PHY_DOUBLE_CHANNEL_LOW_PRIMARY)
sap_ctx->acs_cfg->ht_sec_ch = sap_ctx->acs_cfg->pri_ch + 4;
sap_ctx->acs_cfg->ht_sec_ch_freq =
sap_ctx->acs_cfg->pri_ch_freq + 20;
else
sap_ctx->acs_cfg->ht_sec_ch = 0;
sap_ctx->acs_cfg->ht_sec_ch_freq = 0;
}
/**
@ -289,7 +293,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
if (!sap_ctx->acs_cfg->ch_list_count) {
sap_err("No channel left for SAP operation, hotspot fail");
sap_ctx->chan_freq = SAP_CHANNEL_NOT_SELECTED;
sap_ctx->acs_cfg->pri_ch = SAP_CHANNEL_NOT_SELECTED;
sap_ctx->acs_cfg->pri_ch_freq = SAP_CHANNEL_NOT_SELECTED;
sap_config_acs_result(mac_handle, sap_ctx, 0);
sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED;
sap_ctx->sap_status = eSAP_START_BSS_CHANNEL_NOT_SELECTED;
@ -303,10 +307,9 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
oper_channel =
sap_select_default_oper_chan(sap_ctx->acs_cfg);
sap_ctx->chan_freq = oper_channel;
sap_ctx->acs_cfg->pri_ch =
wlan_reg_freq_to_chan(mac_ctx->pdev, oper_channel);
sap_ctx->acs_cfg->pri_ch_freq = oper_channel;
sap_config_acs_result(mac_handle, sap_ctx,
sap_ctx->acs_cfg->ht_sec_ch);
sap_ctx->acs_cfg->ht_sec_ch_freq);
sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED;
sap_ctx->sap_status = eSAP_STATUS_SUCCESS;
goto close_session;
@ -324,9 +327,9 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
}
sap_ctx->chan_freq = oper_channel;
sap_ctx->acs_cfg->pri_ch = wlan_reg_freq_to_chan(mac_ctx->pdev,
oper_channel);
sap_config_acs_result(mac_handle, sap_ctx, sap_ctx->acs_cfg->ht_sec_ch);
sap_ctx->acs_cfg->pri_ch_freq = oper_channel;
sap_config_acs_result(mac_handle, sap_ctx,
sap_ctx->acs_cfg->ht_sec_ch_freq);
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("Channel freq selected = %d"), sap_ctx->chan_freq);

22
core/sap/src/sap_ch_select.c
View file

@ -2537,7 +2537,8 @@ uint32_t sap_select_channel(mac_handle_t mac_handle,
break;
}
sap_ctx->acs_cfg->pri_ch = best_ch_num;
sap_ctx->acs_cfg->pri_ch_freq =
wlan_reg_chan_to_freq(mac_ctx->pdev, best_ch_num);
/* determine secondary channel for 2.4G channel 5, 6, 7 in HT40 */
if ((operating_band != eCSR_DOT11_MODE_11g) ||
(sap_ctx->acs_cfg->ch_width != CH_WIDTH_40MHZ))
@ -2561,21 +2562,22 @@ uint32_t sap_select_channel(mac_handle_t mac_handle,
}
if (weight_below < weight_above)
sap_ctx->acs_cfg->ht_sec_ch =
sap_ctx->acs_cfg->pri_ch - 4;
sap_ctx->acs_cfg->ht_sec_ch_freq =
sap_ctx->acs_cfg->pri_ch_freq - 20;
else
sap_ctx->acs_cfg->ht_sec_ch =
sap_ctx->acs_cfg->pri_ch + 4;
sap_ctx->acs_cfg->ht_sec_ch_freq =
sap_ctx->acs_cfg->pri_ch_freq + 20;
} else if (best_ch_num >= 1 && best_ch_num <= 4) {
sap_ctx->acs_cfg->ht_sec_ch = sap_ctx->acs_cfg->pri_ch + 4;
sap_ctx->acs_cfg->ht_sec_ch_freq =
sap_ctx->acs_cfg->pri_ch_freq + 20;
} else if (best_ch_num >= ht40plus2gendch && best_ch_num <=
HT40MINUS_2G_CH_END) {
sap_ctx->acs_cfg->ht_sec_ch = sap_ctx->acs_cfg->pri_ch - 4;
sap_ctx->acs_cfg->ht_sec_ch_freq =
sap_ctx->acs_cfg->pri_ch_freq - 20;
} else if (best_ch_num == 14) {
sap_ctx->acs_cfg->ht_sec_ch = 0;
sap_ctx->acs_cfg->ht_sec_ch_freq = 0;
}
sap_ctx->sec_ch_freq = wlan_reg_chan_to_freq(
mac_ctx->pdev, sap_ctx->acs_cfg->ht_sec_ch);
sap_ctx->sec_ch_freq = sap_ctx->acs_cfg->ht_sec_ch_freq;
sap_ch_sel_end:
/* Free all the allocated memory */

22
core/sap/src/sap_fsm.c
View file

@ -810,7 +810,7 @@ validation_done:
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("for configured channel, Ch_freq = %d"),
sap_context->chan_freq);
sap_ch = wlan_reg_freq_to_chan(mac_ctx->pdev, sap_context->chan_freq);
if (check_for_connection_update) {
/* This wait happens in the hostapd context. The event
* is set in the MC thread context.
@ -826,9 +826,9 @@ validation_done:
if (pre_start_bss) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL("ACS end due to Ch override. Sel Ch = %d"),
sap_ch);
sap_context->acs_cfg->pri_ch = sap_ch;
FL("ACS end due to Ch override. Sel Ch freq = %d"),
sap_context->chan_freq);
sap_context->acs_cfg->pri_ch_freq = sap_context->chan_freq;
sap_context->acs_cfg->ch_width =
sap_context->ch_width_orig;
sap_config_acs_result(mac_handle, sap_context, 0);
@ -1500,10 +1500,10 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
sap_ap_event.sapHddEventCode = sap_hddevent;
acs_selected = &sap_ap_event.sapevt.sap_ch_selected;
if (eSAP_STATUS_SUCCESS == (eSapStatus)context) {
acs_selected->pri_ch_freq = wlan_reg_chan_to_freq(
mac_ctx->pdev, sap_ctx->acs_cfg->pri_ch);
acs_selected->ht_sec_ch_freq = wlan_reg_chan_to_freq(
mac_ctx->pdev, sap_ctx->acs_cfg->ht_sec_ch);
acs_selected->pri_ch_freq =
sap_ctx->acs_cfg->pri_ch_freq;
acs_selected->ht_sec_ch_freq =
sap_ctx->acs_cfg->ht_sec_ch_freq;
acs_selected->ch_width = sap_ctx->acs_cfg->ch_width;
acs_selected->vht_seg0_center_ch =
sap_ctx->acs_cfg->vht_seg0_center_ch;
@ -1737,13 +1737,11 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
* Reconfig ACS result info. For DFS AP-AP Mode Sec AP ACS
* follows pri AP
*/
sap_ctx->acs_cfg->pri_ch = wlan_reg_freq_to_chan(mac_ctx->pdev,
sap_ctx->chan_freq);
sap_ctx->acs_cfg->pri_ch_freq = sap_ctx->chan_freq;
sap_ctx->acs_cfg->ch_width =
sap_ctx->csr_roamProfile.ch_params.ch_width;
sap_config_acs_result(MAC_HANDLE(mac_ctx), sap_ctx,
wlan_reg_freq_to_chan(mac_ctx->pdev,
sap_ctx->sec_ch_freq));
sap_ctx->sec_ch_freq);
sap_ap_event.sapHddEventCode = eSAP_CHANNEL_CHANGE_EVENT;