mirror of https://gitee.com/openkylin/linux.git
iwlwifi: mvm: BT Coex - make the primary / secondary pick traffic aware
The primary channel is the channel that will be untouched by BT. The secondary channel might be touched by BT. Hence, we want the primary to be the most active channel. To do so, use the TCM infrastructure. Since the BT keeps sending notifications, we can rely on them to trigger the check. Every 10 seconds, we will check what is the most active context and chose the right primary. We need to wait 10 seconds before we modify the settings because frequent changes in these settings can confuse BT. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
parent
85207c66a2
commit
bde1492d4a
|
@ -279,6 +279,8 @@ struct iwl_bt_iterator_data {
|
|||
struct ieee80211_chanctx_conf *primary;
|
||||
struct ieee80211_chanctx_conf *secondary;
|
||||
bool primary_ll;
|
||||
u8 primary_load;
|
||||
u8 secondary_load;
|
||||
};
|
||||
|
||||
static inline
|
||||
|
@ -295,6 +297,30 @@ void iwl_mvm_bt_coex_enable_rssi_event(struct iwl_mvm *mvm,
|
|||
enable ? -IWL_MVM_BT_COEX_DIS_RED_TXP_THRESH : 0;
|
||||
}
|
||||
|
||||
#define MVM_COEX_TCM_PERIOD (HZ * 10)
|
||||
|
||||
static void iwl_mvm_bt_coex_tcm_based_ci(struct iwl_mvm *mvm,
|
||||
struct iwl_bt_iterator_data *data)
|
||||
{
|
||||
unsigned long now = jiffies;
|
||||
|
||||
if (!time_after(now, mvm->bt_coex_last_tcm_ts + MVM_COEX_TCM_PERIOD))
|
||||
return;
|
||||
|
||||
mvm->bt_coex_last_tcm_ts = now;
|
||||
|
||||
/* We assume here that we don't have more than 2 vifs on 2.4GHz */
|
||||
|
||||
/* if the primary is low latency, it will stay primary */
|
||||
if (data->primary_ll)
|
||||
return;
|
||||
|
||||
if (data->primary_load >= data->secondary_load)
|
||||
return;
|
||||
|
||||
swap(data->primary, data->secondary);
|
||||
}
|
||||
|
||||
/* must be called under rcu_read_lock */
|
||||
static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
|
||||
struct ieee80211_vif *vif)
|
||||
|
@ -385,6 +411,11 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
|
|||
/* there is low latency vif - we will be secondary */
|
||||
data->secondary = chanctx_conf;
|
||||
}
|
||||
|
||||
if (data->primary == chanctx_conf)
|
||||
data->primary_load = mvm->tcm.result.load[mvmvif->id];
|
||||
else if (data->secondary == chanctx_conf)
|
||||
data->secondary_load = mvm->tcm.result.load[mvmvif->id];
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -398,6 +429,10 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
|
|||
/* if secondary is not NULL, it might be a GO */
|
||||
data->secondary = chanctx_conf;
|
||||
|
||||
if (data->primary == chanctx_conf)
|
||||
data->primary_load = mvm->tcm.result.load[mvmvif->id];
|
||||
else if (data->secondary == chanctx_conf)
|
||||
data->secondary_load = mvm->tcm.result.load[mvmvif->id];
|
||||
/*
|
||||
* don't reduce the Tx power if one of these is true:
|
||||
* we are in LOOSE
|
||||
|
@ -449,6 +484,8 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)
|
|||
mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
|
||||
iwl_mvm_bt_notif_iterator, &data);
|
||||
|
||||
iwl_mvm_bt_coex_tcm_based_ci(mvm, &data);
|
||||
|
||||
if (data.primary) {
|
||||
struct ieee80211_chanctx_conf *chan = data.primary;
|
||||
if (WARN_ON(!chan->def.chan)) {
|
||||
|
|
Loading…
Reference in New Issue