mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
wifi: iwlwifi: mvm: add mvm-specific guard
Add and use an mvm-specific guard for the mvm mutex. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://msgid.link/20240512152312.7391425b3af2.I1b109f56753dd3f35602dd2c5cf6e1e35aee313d@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
parent
9d42be9b18
commit
3f3126515f
@ -1258,7 +1258,7 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
|
||||
|
||||
@ -1274,8 +1274,6 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)
|
||||
* of packets the FW sent out, so we must reconnect.
|
||||
*/
|
||||
iwl_mvm_teardown_tdls_peers(mvm);
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
void iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw,
|
||||
@ -1621,9 +1619,8 @@ static void iwl_mvm_prevent_esr_done_wk(struct wiphy *wiphy,
|
||||
struct iwl_mvm *mvm = mvmvif->mvm;
|
||||
struct ieee80211_vif *vif = iwl_mvm_get_bss_vif(mvm);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_unblock_esr(mvm, vif, IWL_MVM_ESR_BLOCKED_PREVENTION);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_mlo_int_scan_wk(struct wiphy *wiphy, struct wiphy_work *wk)
|
||||
@ -1633,11 +1630,8 @@ static void iwl_mvm_mlo_int_scan_wk(struct wiphy *wiphy, struct wiphy_work *wk)
|
||||
struct ieee80211_vif *vif =
|
||||
container_of((void *)mvmvif, struct ieee80211_vif, drv_priv);
|
||||
|
||||
mutex_lock(&mvmvif->mvm->mutex);
|
||||
|
||||
guard(mvm)(mvmvif->mvm);
|
||||
iwl_mvm_int_mlo_scan(mvmvif->mvm, vif);
|
||||
|
||||
mutex_unlock(&mvmvif->mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_unblock_esr_tpt(struct wiphy *wiphy, struct wiphy_work *wk)
|
||||
@ -1647,9 +1641,8 @@ static void iwl_mvm_unblock_esr_tpt(struct wiphy *wiphy, struct wiphy_work *wk)
|
||||
struct iwl_mvm *mvm = mvmvif->mvm;
|
||||
struct ieee80211_vif *vif = iwl_mvm_get_bss_vif(mvm);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_unblock_esr(mvm, vif, IWL_MVM_ESR_BLOCKED_TPT);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
void iwl_mvm_mac_init_mvmvif(struct iwl_mvm *mvm, struct iwl_mvm_vif *mvmvif)
|
||||
@ -2039,7 +2032,7 @@ void iwl_mvm_configure_filter(struct ieee80211_hw *hw,
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
struct iwl_mcast_filter_cmd *cmd = (void *)(unsigned long)multicast;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
/* replace previous configuration */
|
||||
kfree(mvm->mcast_filter_cmd);
|
||||
@ -2056,7 +2049,6 @@ void iwl_mvm_configure_filter(struct ieee80211_hw *hw,
|
||||
|
||||
iwl_mvm_recalc_multicast(mvm);
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
*total_flags = 0;
|
||||
}
|
||||
|
||||
@ -2076,9 +2068,8 @@ static void iwl_mvm_config_iface_filter(struct ieee80211_hw *hw,
|
||||
!vif->p2p)
|
||||
return;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
int iwl_mvm_update_mu_groups(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
|
||||
@ -3123,7 +3114,7 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
iwl_mvm_stop_ap_ibss_common(mvm, vif);
|
||||
|
||||
@ -3153,8 +3144,6 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,
|
||||
iwl_mvm_power_update_mac(mvm);
|
||||
|
||||
iwl_mvm_mac_ctxt_remove(mvm, vif);
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_stop_ap(struct ieee80211_hw *hw,
|
||||
@ -3209,7 +3198,7 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (changes & BSS_CHANGED_IDLE && !vif->cfg.idle)
|
||||
iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, true);
|
||||
@ -3236,25 +3225,19 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
|
||||
bss_conf->txpower);
|
||||
iwl_mvm_set_tx_power(mvm, vif, bss_conf->txpower);
|
||||
}
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
struct ieee80211_scan_request *hw_req)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
if (hw_req->req.n_channels == 0 ||
|
||||
hw_req->req.n_channels > mvm->fw->ucode_capa.n_scan_channels)
|
||||
return -EINVAL;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_reg_scan_start(mvm, vif, &hw_req->req, &hw_req->ies);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_reg_scan_start(mvm, vif, &hw_req->req, &hw_req->ies);
|
||||
}
|
||||
|
||||
void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,
|
||||
@ -3262,7 +3245,7 @@ void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
/* Due to a race condition, it's possible that mac80211 asks
|
||||
* us to stop a hw_scan when it's already stopped. This can
|
||||
@ -3273,8 +3256,6 @@ void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,
|
||||
*/
|
||||
if (mvm->scan_status & IWL_MVM_SCAN_REGULAR)
|
||||
iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
void
|
||||
@ -3443,7 +3424,7 @@ void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw,
|
||||
* Since there's mvm->mutex here, no need to have RCU lock for
|
||||
* mvm_sta->link access.
|
||||
*/
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
for (link_id = 0; link_id < ARRAY_SIZE(mvm_sta->link); link_id++) {
|
||||
struct iwl_mvm_link_sta *link_sta;
|
||||
u32 sta_id;
|
||||
@ -3460,7 +3441,6 @@ void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw,
|
||||
RCU_INIT_POINTER(mvm->fw_id_to_link_sta[sta_id], NULL);
|
||||
}
|
||||
}
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_check_uapsd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
|
||||
@ -4207,12 +4187,8 @@ static int iwl_mvm_mac_conf_tx(struct ieee80211_hw *hw,
|
||||
* The exception is P2P_DEVICE interface which needs immediate update.
|
||||
*/
|
||||
if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -4223,9 +4199,8 @@ void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_protect_assoc(mvm, vif, info->duration, info->link_id);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
void iwl_mvm_mac_mgd_complete_tx(struct ieee80211_hw *hw,
|
||||
@ -4238,9 +4213,8 @@ void iwl_mvm_mac_mgd_complete_tx(struct ieee80211_hw *hw,
|
||||
if (info->success)
|
||||
return;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_stop_session_protection(mvm, vif);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
|
||||
@ -4250,20 +4224,12 @@ int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
int ret;
|
||||
guard(mvm)(mvm);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
if (!vif->cfg.idle)
|
||||
return -EBUSY;
|
||||
|
||||
if (!vif->cfg.idle) {
|
||||
ret = -EBUSY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = iwl_mvm_sched_scan_start(mvm, vif, req, ies, IWL_MVM_SCAN_SCHED);
|
||||
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
return iwl_mvm_sched_scan_start(mvm, vif, req, ies, IWL_MVM_SCAN_SCHED);
|
||||
}
|
||||
|
||||
int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,
|
||||
@ -4541,13 +4507,9 @@ int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
||||
struct ieee80211_key_conf *key)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = __iwl_mvm_mac_set_key(hw, cmd, vif, sta, key);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return __iwl_mvm_mac_set_key(hw, cmd, vif, sta, key);
|
||||
}
|
||||
|
||||
void iwl_mvm_mac_update_tkip_key(struct ieee80211_hw *hw,
|
||||
@ -4838,7 +4800,7 @@ int iwl_mvm_roc_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
switch (vif->type) {
|
||||
case NL80211_IFTYPE_STATION:
|
||||
@ -4848,30 +4810,25 @@ int iwl_mvm_roc_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
ret = ops->add_aux_sta_for_hs20(mvm, lmac_id);
|
||||
if (!ret)
|
||||
ret = iwl_mvm_roc_station(mvm, channel, vif, duration);
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
case NL80211_IFTYPE_P2P_DEVICE:
|
||||
/* handle below */
|
||||
break;
|
||||
default:
|
||||
IWL_ERR(mvm, "ROC: Invalid vif type=%u\n", vif->type);
|
||||
ret = -EINVAL;
|
||||
goto out_unlock;
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
ret = iwl_mvm_p2p_find_phy_ctxt(mvm, vif, channel);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
|
||||
ret = ops->link(mvm, vif);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
|
||||
ret = iwl_mvm_start_p2p_roc(mvm, vif, duration, type);
|
||||
out_unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
IWL_DEBUG_MAC80211(mvm, "leave\n");
|
||||
return ret;
|
||||
return iwl_mvm_start_p2p_roc(mvm, vif, duration, type);
|
||||
}
|
||||
|
||||
int iwl_mvm_cancel_roc(struct ieee80211_hw *hw,
|
||||
@ -4952,13 +4909,9 @@ int iwl_mvm_add_chanctx(struct ieee80211_hw *hw,
|
||||
struct ieee80211_chanctx_conf *ctx)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = __iwl_mvm_add_chanctx(mvm, ctx);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return __iwl_mvm_add_chanctx(mvm, ctx);
|
||||
}
|
||||
|
||||
static void __iwl_mvm_remove_chanctx(struct iwl_mvm *mvm,
|
||||
@ -4977,9 +4930,8 @@ void iwl_mvm_remove_chanctx(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
__iwl_mvm_remove_chanctx(mvm, ctx);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,
|
||||
@ -4999,26 +4951,23 @@ void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,
|
||||
phy_ctxt->ref, changed))
|
||||
return;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
/* we are only changing the min_width, may be a noop */
|
||||
if (changed == IEEE80211_CHANCTX_CHANGE_MIN_WIDTH) {
|
||||
if (phy_ctxt->width == def->width)
|
||||
goto out_unlock;
|
||||
return;
|
||||
|
||||
/* we are just toggling between 20_NOHT and 20 */
|
||||
if (phy_ctxt->width <= NL80211_CHAN_WIDTH_20 &&
|
||||
def->width <= NL80211_CHAN_WIDTH_20)
|
||||
goto out_unlock;
|
||||
return;
|
||||
}
|
||||
|
||||
iwl_mvm_bt_coex_vif_change(mvm);
|
||||
iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, def, &ctx->ap,
|
||||
ctx->rx_chains_static,
|
||||
ctx->rx_chains_dynamic);
|
||||
|
||||
out_unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -5157,13 +5106,9 @@ static int iwl_mvm_assign_vif_chanctx(struct ieee80211_hw *hw,
|
||||
struct ieee80211_chanctx_conf *ctx)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = __iwl_mvm_assign_vif_chanctx(mvm, vif, link_conf, ctx, false);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return __iwl_mvm_assign_vif_chanctx(mvm, vif, link_conf, ctx, false);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -5251,9 +5196,8 @@ static void iwl_mvm_unassign_vif_chanctx(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
__iwl_mvm_unassign_vif_chanctx(mvm, vif, link_conf, ctx, false);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -5263,7 +5207,7 @@ iwl_mvm_switch_vif_chanctx_swap(struct iwl_mvm *mvm,
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
ops->__unassign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,
|
||||
vifs[0].old_ctx, true);
|
||||
__iwl_mvm_remove_chanctx(mvm, vifs[0].old_ctx);
|
||||
@ -5286,7 +5230,7 @@ iwl_mvm_switch_vif_chanctx_swap(struct iwl_mvm *mvm,
|
||||
if (iwl_mvm_phy_ctx_count(mvm) > 1)
|
||||
iwl_mvm_teardown_tdls_peers(mvm);
|
||||
|
||||
goto out;
|
||||
return 0;
|
||||
|
||||
out_remove:
|
||||
__iwl_mvm_remove_chanctx(mvm, vifs[0].new_ctx);
|
||||
@ -5303,15 +5247,11 @@ out_reassign:
|
||||
goto out_restart;
|
||||
}
|
||||
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
out_restart:
|
||||
/* things keep failing, better restart the hw */
|
||||
iwl_mvm_nic_restart(mvm, false);
|
||||
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -5322,7 +5262,7 @@ iwl_mvm_switch_vif_chanctx_reassign(struct iwl_mvm *mvm,
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
ops->__unassign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,
|
||||
vifs[0].old_ctx, true);
|
||||
|
||||
@ -5334,7 +5274,7 @@ iwl_mvm_switch_vif_chanctx_reassign(struct iwl_mvm *mvm,
|
||||
goto out_reassign;
|
||||
}
|
||||
|
||||
goto out;
|
||||
return 0;
|
||||
|
||||
out_reassign:
|
||||
if (ops->__assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,
|
||||
@ -5343,15 +5283,11 @@ out_reassign:
|
||||
goto out_restart;
|
||||
}
|
||||
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
out_restart:
|
||||
/* things keep failing, better restart the hw */
|
||||
iwl_mvm_nic_restart(mvm, false);
|
||||
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -5478,13 +5414,9 @@ int iwl_mvm_mac_testmode_cmd(struct ieee80211_hw *hw,
|
||||
void *data, int len)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int err;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
err = __iwl_mvm_mac_testmode_cmd(mvm, vif, data, len);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return err;
|
||||
guard(mvm)(mvm);
|
||||
return __iwl_mvm_mac_testmode_cmd(mvm, vif, data, len);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -5701,13 +5633,9 @@ static int iwl_mvm_mac_pre_channel_switch(struct ieee80211_hw *hw,
|
||||
struct ieee80211_channel_switch *chsw)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_pre_channel_switch(mvm, vif, chsw);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_pre_channel_switch(mvm, vif, chsw);
|
||||
}
|
||||
|
||||
void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,
|
||||
@ -5759,16 +5687,14 @@ void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,
|
||||
}
|
||||
mvmvif->csa_count = chsw->count;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
if (mvmvif->csa_failed)
|
||||
goto out_unlock;
|
||||
return;
|
||||
|
||||
WARN_ON(iwl_mvm_send_cmd_pdu(mvm,
|
||||
WIDE_ID(MAC_CONF_GROUP,
|
||||
CHANNEL_SWITCH_TIME_EVENT_CMD),
|
||||
0, sizeof(cmd), &cmd));
|
||||
out_unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
|
||||
@ -5777,17 +5703,16 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
|
||||
|
||||
if (!iwl_mvm_has_new_tx_api(mvm)) {
|
||||
if (drop) {
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_flush_tx_path(mvm,
|
||||
iwl_mvm_flushable_queues(mvm) & queues);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
} else {
|
||||
iwl_trans_wait_tx_queues_empty(mvm->trans, queues);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
for (i = 0; i < mvm->fw->ucode_capa.num_stations; i++) {
|
||||
struct ieee80211_sta *sta;
|
||||
|
||||
@ -5802,7 +5727,6 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
|
||||
iwl_mvm_wait_sta_queues_empty(mvm,
|
||||
iwl_mvm_sta_from_mac80211(sta));
|
||||
}
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
void iwl_mvm_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
@ -5885,7 +5809,7 @@ void iwl_mvm_mac_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
struct ieee80211_link_sta *link_sta;
|
||||
int link_id;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
for_each_sta_active_link(vif, sta, link_sta, link_id) {
|
||||
mvm_link_sta = rcu_dereference_protected(mvmsta->link[link_id],
|
||||
lockdep_is_held(&mvm->mutex));
|
||||
@ -5896,7 +5820,6 @@ void iwl_mvm_mac_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
mvmsta->tfd_queue_msk))
|
||||
IWL_ERR(mvm, "flush request fail\n");
|
||||
}
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static int iwl_mvm_mac_get_acs_survey(struct iwl_mvm *mvm, int idx,
|
||||
@ -5962,7 +5885,6 @@ int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,
|
||||
struct survey_info *survey)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret = 0;
|
||||
u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,
|
||||
WIDE_ID(SYSTEM_GROUP,
|
||||
SYSTEM_STATISTICS_CMD),
|
||||
@ -5982,12 +5904,13 @@ int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,
|
||||
if (idx > 0)
|
||||
return iwl_mvm_mac_get_acs_survey(mvm, idx - 1, survey);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (iwl_mvm_firmware_running(mvm)) {
|
||||
ret = iwl_mvm_request_statistics(mvm, false);
|
||||
int ret = iwl_mvm_request_statistics(mvm, false);
|
||||
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
}
|
||||
|
||||
survey->filled = SURVEY_INFO_TIME_RX |
|
||||
@ -6003,7 +5926,7 @@ int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,
|
||||
|
||||
/* the new fw api doesn't support the following fields */
|
||||
if (cmd_ver != IWL_FW_CMD_VER_UNKNOWN)
|
||||
goto out;
|
||||
return 0;
|
||||
|
||||
survey->filled |= SURVEY_INFO_TIME |
|
||||
SURVEY_INFO_TIME_SCAN;
|
||||
@ -6015,9 +5938,7 @@ int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,
|
||||
mvm->radio_stats.on_time_scan;
|
||||
do_div(survey->time_scan, USEC_PER_MSEC);
|
||||
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)
|
||||
@ -6184,13 +6105,13 @@ void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,
|
||||
if (!vif->cfg.assoc)
|
||||
return;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (mvmvif->deflink.ap_sta_id != mvmsta->deflink.sta_id)
|
||||
goto unlock;
|
||||
return;
|
||||
|
||||
if (iwl_mvm_request_statistics(mvm, false))
|
||||
goto unlock;
|
||||
return;
|
||||
|
||||
sinfo->rx_beacon = 0;
|
||||
for_each_mvm_vif_valid_link(mvmvif, i)
|
||||
@ -6204,8 +6125,6 @@ void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,
|
||||
mvmvif->deflink.beacon_stats.avg_signal;
|
||||
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG);
|
||||
}
|
||||
unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_event_mlme_callback_ini(struct iwl_mvm *mvm,
|
||||
@ -6393,9 +6312,8 @@ void iwl_mvm_sync_rx_queues(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_sync_rx_queues_internal(mvm, IWL_MVM_RXQ_EMPTY, true, NULL, 0);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
int
|
||||
@ -6431,13 +6349,9 @@ int iwl_mvm_start_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
struct cfg80211_pmsr_request *request)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_ftm_start(mvm, vif, request);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_ftm_start(mvm, vif, request);
|
||||
}
|
||||
|
||||
void iwl_mvm_abort_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
@ -6445,9 +6359,8 @@ void iwl_mvm_abort_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_ftm_abort(mvm, request);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static bool iwl_mvm_can_hw_csum(struct sk_buff *skb)
|
||||
@ -6482,7 +6395,6 @@ int iwl_mvm_set_hw_timestamp(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
u32 protocols = 0;
|
||||
int ret;
|
||||
|
||||
/* HW timestamping is only supported for a specific station */
|
||||
if (!hwts->macaddr)
|
||||
@ -6492,11 +6404,8 @@ int iwl_mvm_set_hw_timestamp(struct ieee80211_hw *hw,
|
||||
protocols =
|
||||
IWL_TIME_SYNC_PROTOCOL_TM | IWL_TIME_SYNC_PROTOCOL_FTM;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_time_sync_config(mvm, hwts->macaddr, protocols);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_time_sync_config(mvm, hwts->macaddr, protocols);
|
||||
}
|
||||
|
||||
const struct ieee80211_ops iwl_mvm_hw_ops = {
|
||||
|
||||
@ -12,7 +12,7 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
iwl_mvm_mac_init_mvmvif(mvm, mvmvif);
|
||||
|
||||
@ -32,7 +32,7 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,
|
||||
/* Allocate resources for the MAC context, and add it to the fw */
|
||||
ret = iwl_mvm_mac_ctxt_init(mvm, vif);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
|
||||
rcu_assign_pointer(mvm->vif_id_to_mac[mvmvif->id], vif);
|
||||
|
||||
@ -46,7 +46,7 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,
|
||||
|
||||
ret = iwl_mvm_mld_mac_ctxt_add(mvm, vif);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
|
||||
/* beacon filtering */
|
||||
ret = iwl_mvm_disable_beacon_filter(mvm, vif);
|
||||
@ -97,7 +97,7 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,
|
||||
if (vif->p2p || iwl_fw_lookup_cmd_ver(mvm->fw, PHY_CONTEXT_CMD, 1) < 5)
|
||||
vif->driver_flags |= IEEE80211_VIF_IGNORE_OFDMA_WIDER_BW;
|
||||
|
||||
goto out_unlock;
|
||||
return 0;
|
||||
|
||||
out_free_bf:
|
||||
if (mvm->bf_allowed_vif == mvmvif) {
|
||||
@ -108,9 +108,6 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,
|
||||
out_remove_mac:
|
||||
mvmvif->link[0] = NULL;
|
||||
iwl_mvm_mld_mac_ctxt_remove(mvm, vif);
|
||||
out_unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -127,7 +124,7 @@ static void iwl_mvm_mld_mac_remove_interface(struct ieee80211_hw *hw,
|
||||
vif->type == NL80211_IFTYPE_ADHOC))
|
||||
iwl_mvm_tcm_rm_vif(mvm, vif);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (vif == mvm->csme_vif) {
|
||||
iwl_mei_set_netdev(NULL);
|
||||
@ -190,8 +187,6 @@ static void iwl_mvm_mld_mac_remove_interface(struct ieee80211_hw *hw,
|
||||
mvm->monitor_on = false;
|
||||
__clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, mvm->hw->flags);
|
||||
}
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static unsigned int iwl_mvm_mld_count_active_links(struct iwl_mvm_vif *mvmvif)
|
||||
@ -389,10 +384,11 @@ static int iwl_mvm_mld_assign_vif_chanctx(struct ieee80211_hw *hw,
|
||||
struct ieee80211_chanctx_conf *ctx)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
/* update EMLSR mode */
|
||||
if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_STATION) {
|
||||
int ret;
|
||||
|
||||
ret = iwl_mvm_esr_non_bss_link(mvm, vif, link_conf->link_id,
|
||||
true);
|
||||
/*
|
||||
@ -403,11 +399,8 @@ static int iwl_mvm_mld_assign_vif_chanctx(struct ieee80211_hw *hw,
|
||||
return ret;
|
||||
}
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = __iwl_mvm_mld_assign_vif_chanctx(mvm, vif, link_conf, ctx, false);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return __iwl_mvm_mld_assign_vif_chanctx(mvm, vif, link_conf, ctx, false);
|
||||
}
|
||||
|
||||
static int iwl_mvm_esr_mode_inactive(struct iwl_mvm *mvm,
|
||||
@ -586,7 +579,7 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw,
|
||||
struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (vif->type == NL80211_IFTYPE_AP)
|
||||
iwl_mvm_send_ap_tx_power_constraint_cmd(mvm, vif, link_conf);
|
||||
@ -594,7 +587,7 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw,
|
||||
/* Send the beacon template */
|
||||
ret = iwl_mvm_mac_ctxt_beacon_changed(mvm, vif, link_conf);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
|
||||
/* the link should be already activated when assigning chan context */
|
||||
ret = iwl_mvm_link_changed(mvm, vif, link_conf,
|
||||
@ -602,11 +595,11 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw,
|
||||
~LINK_CONTEXT_MODIFY_ACTIVE,
|
||||
true);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
|
||||
ret = iwl_mvm_mld_add_mcast_sta(mvm, vif, link_conf);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
return ret;
|
||||
|
||||
/* Send the bcast station. At this stage the TBTT and DTIM time
|
||||
* events are added and applied to the scheduler
|
||||
@ -630,7 +623,7 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw,
|
||||
|
||||
iwl_mvm_ftm_restart_responder(mvm, vif, link_conf);
|
||||
|
||||
goto out_unlock;
|
||||
return 0;
|
||||
|
||||
out_failed:
|
||||
iwl_mvm_power_update_mac(mvm);
|
||||
@ -638,8 +631,6 @@ out_failed:
|
||||
iwl_mvm_mld_rm_bcast_sta(mvm, vif, link_conf);
|
||||
out_rm_mcast:
|
||||
iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf);
|
||||
out_unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -662,7 +653,7 @@ static void iwl_mvm_mld_stop_ap_ibss(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
iwl_mvm_stop_ap_ibss_common(mvm, vif);
|
||||
|
||||
@ -676,7 +667,6 @@ static void iwl_mvm_mld_stop_ap_ibss(struct ieee80211_hw *hw,
|
||||
iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf);
|
||||
|
||||
iwl_mvm_power_update_mac(mvm);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_mld_stop_ap(struct ieee80211_hw *hw,
|
||||
@ -979,7 +969,7 @@ static void iwl_mvm_mld_link_info_changed(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
switch (vif->type) {
|
||||
case NL80211_IFTYPE_STATION:
|
||||
@ -1005,8 +995,6 @@ static void iwl_mvm_mld_link_info_changed(struct ieee80211_hw *hw,
|
||||
link_conf->txpower);
|
||||
iwl_mvm_set_tx_power(mvm, vif, link_conf->txpower);
|
||||
}
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_mld_vif_cfg_changed(struct ieee80211_hw *hw,
|
||||
@ -1015,15 +1003,13 @@ static void iwl_mvm_mld_vif_cfg_changed(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (changes & BSS_CHANGED_IDLE && !vif->cfg.idle)
|
||||
iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, true);
|
||||
|
||||
if (vif->type == NL80211_IFTYPE_STATION)
|
||||
iwl_mvm_mld_vif_cfg_changed_station(mvm, vif, changes);
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -1056,9 +1042,8 @@ static void iwl_mvm_mld_config_iface_filter(struct ieee80211_hw *hw,
|
||||
!vif->p2p)
|
||||
return;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
iwl_mvm_mld_mac_ctxt_changed(mvm, vif, false);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -1080,14 +1065,10 @@ iwl_mvm_mld_mac_conf_tx(struct ieee80211_hw *hw,
|
||||
* The exception is P2P_DEVICE interface which needs immediate update.
|
||||
*/
|
||||
if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_link_changed(mvm, vif, &vif->bss_conf,
|
||||
LINK_CONTEXT_MODIFY_QOS_PARAMS,
|
||||
true);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_link_changed(mvm, vif, &vif->bss_conf,
|
||||
LINK_CONTEXT_MODIFY_QOS_PARAMS,
|
||||
true);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -1232,13 +1213,9 @@ iwl_mvm_mld_change_sta_links(struct ieee80211_hw *hw,
|
||||
u16 old_links, u16 new_links)
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_mld_update_sta_links(mvm, vif, sta, old_links, new_links);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_mld_update_sta_links(mvm, vif, sta, old_links, new_links);
|
||||
}
|
||||
|
||||
bool iwl_mvm_vif_has_esr_cap(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
|
||||
@ -1266,26 +1243,19 @@ static bool iwl_mvm_mld_can_activate_links(struct ieee80211_hw *hw,
|
||||
{
|
||||
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
||||
int n_links = hweight16(desired_links);
|
||||
bool ret = true;
|
||||
|
||||
if (n_links <= 1)
|
||||
return true;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
/* Check if HW supports the wanted number of links */
|
||||
if (n_links > iwl_mvm_max_active_links(mvm, vif)) {
|
||||
ret = false;
|
||||
goto unlock;
|
||||
}
|
||||
if (n_links > iwl_mvm_max_active_links(mvm, vif))
|
||||
return false;
|
||||
|
||||
/* If it is an eSR device, check that we can enter eSR */
|
||||
ret = iwl_mvm_is_esr_supported(mvm->fwrt.trans) &&
|
||||
iwl_mvm_vif_has_esr_cap(mvm, vif);
|
||||
|
||||
unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
return iwl_mvm_is_esr_supported(mvm->fwrt.trans) &&
|
||||
iwl_mvm_vif_has_esr_cap(mvm, vif);
|
||||
}
|
||||
|
||||
static enum ieee80211_neg_ttlm_res
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
|
||||
#include <linux/list.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/cleanup.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/in6.h>
|
||||
|
||||
@ -1332,6 +1333,8 @@ struct iwl_mvm {
|
||||
#define IWL_MAC80211_GET_MVM(_hw) \
|
||||
IWL_OP_MODE_GET_MVM((struct iwl_op_mode *)((_hw)->priv))
|
||||
|
||||
DEFINE_GUARD(mvm, struct iwl_mvm *, mutex_lock(&_T->mutex), mutex_unlock(&_T->mutex))
|
||||
|
||||
/**
|
||||
* enum iwl_mvm_status - MVM status bits
|
||||
* @IWL_MVM_STATUS_HW_RFKILL: HW RF-kill is asserted
|
||||
|
||||
@ -765,20 +765,18 @@ static void iwl_mvm_tx_unblock_dwork(struct work_struct *work)
|
||||
struct ieee80211_vif *tx_blocked_vif;
|
||||
struct iwl_mvm_vif *mvmvif;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
tx_blocked_vif =
|
||||
rcu_dereference_protected(mvm->csa_tx_blocked_vif,
|
||||
lockdep_is_held(&mvm->mutex));
|
||||
|
||||
if (!tx_blocked_vif)
|
||||
goto unlock;
|
||||
return;
|
||||
|
||||
mvmvif = iwl_mvm_vif_from_mac80211(tx_blocked_vif);
|
||||
iwl_mvm_modify_all_sta_disable_tx(mvm, mvmvif, false);
|
||||
RCU_INIT_POINTER(mvm->csa_tx_blocked_vif, NULL);
|
||||
unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_fwrt_dump_start(void *ctx)
|
||||
@ -798,13 +796,9 @@ static void iwl_mvm_fwrt_dump_end(void *ctx)
|
||||
static int iwl_mvm_fwrt_send_hcmd(void *ctx, struct iwl_host_cmd *host_cmd)
|
||||
{
|
||||
struct iwl_mvm *mvm = (struct iwl_mvm *)ctx;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
ret = iwl_mvm_send_cmd(mvm, host_cmd);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
|
||||
return ret;
|
||||
guard(mvm)(mvm);
|
||||
return iwl_mvm_send_cmd(mvm, host_cmd);
|
||||
}
|
||||
|
||||
static bool iwl_mvm_d3_debug_enable(void *ctx)
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Intel Mobile Communications GmbH
|
||||
* Copyright (C) 2017 Intel Deutschland GmbH
|
||||
* Copyright (C) 2018-2020, 2022-2023 Intel Corporation
|
||||
* Copyright (C) 2018-2020, 2022-2024 Intel Corporation
|
||||
*/
|
||||
#include <linux/etherdevice.h>
|
||||
#include "mvm.h"
|
||||
@ -151,7 +151,7 @@ void iwl_mvm_mac_mgd_protect_tdls_discover(struct ieee80211_hw *hw,
|
||||
u32 duration = 2 * vif->bss_conf.dtim_period * vif->bss_conf.beacon_int;
|
||||
|
||||
/* Protect the session to hear the TDLS setup response on the channel */
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
if (fw_has_capa(&mvm->fw->ucode_capa,
|
||||
IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD))
|
||||
iwl_mvm_schedule_session_protection(mvm, vif, duration,
|
||||
@ -159,7 +159,6 @@ void iwl_mvm_mac_mgd_protect_tdls_discover(struct ieee80211_hw *hw,
|
||||
else
|
||||
iwl_mvm_protect_session(mvm, vif, duration,
|
||||
duration, 100, true);
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static const char *
|
||||
@ -460,21 +459,21 @@ void iwl_mvm_tdls_ch_switch_work(struct work_struct *work)
|
||||
int ret;
|
||||
|
||||
mvm = container_of(work, struct iwl_mvm, tdls_cs.dwork.work);
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
/* called after an active channel switch has finished or timed-out */
|
||||
iwl_mvm_tdls_update_cs_state(mvm, IWL_MVM_TDLS_SW_IDLE);
|
||||
|
||||
/* station might be gone, in that case do nothing */
|
||||
if (mvm->tdls_cs.peer.sta_id == IWL_MVM_INVALID_STA)
|
||||
goto out;
|
||||
return;
|
||||
|
||||
sta = rcu_dereference_protected(
|
||||
mvm->fw_id_to_mac_id[mvm->tdls_cs.peer.sta_id],
|
||||
lockdep_is_held(&mvm->mutex));
|
||||
/* the station may not be here, but if it is, it must be a TDLS peer */
|
||||
if (!sta || IS_ERR(sta) || WARN_ON(!sta->tdls))
|
||||
goto out;
|
||||
return;
|
||||
|
||||
mvmsta = iwl_mvm_sta_from_mac80211(sta);
|
||||
vif = mvmsta->vif;
|
||||
@ -493,8 +492,6 @@ void iwl_mvm_tdls_ch_switch_work(struct work_struct *work)
|
||||
/* retry after a DTIM if we failed sending now */
|
||||
delay = TU_TO_MS(vif->bss_conf.dtim_period * vif->bss_conf.beacon_int);
|
||||
schedule_delayed_work(&mvm->tdls_cs.dwork, msecs_to_jiffies(delay));
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
int
|
||||
@ -509,7 +506,7 @@ iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,
|
||||
unsigned int delay;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
IWL_DEBUG_TDLS(mvm, "TDLS channel switch with %pM ch %d width %d\n",
|
||||
sta->addr, chandef->chan->center_freq, chandef->width);
|
||||
@ -519,8 +516,7 @@ iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,
|
||||
IWL_DEBUG_TDLS(mvm,
|
||||
"Existing peer. Can't start switch with %pM\n",
|
||||
sta->addr);
|
||||
ret = -EBUSY;
|
||||
goto out;
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
ret = iwl_mvm_tdls_config_channel_switch(mvm, vif,
|
||||
@ -529,17 +525,15 @@ iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,
|
||||
oper_class, chandef, 0, 0, 0,
|
||||
tmpl_skb, ch_sw_tm_ie);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* Mark the peer as "in tdls switch" for this vif. We only allow a
|
||||
* single such peer per vif.
|
||||
*/
|
||||
mvm->tdls_cs.peer.skb = skb_copy(tmpl_skb, GFP_KERNEL);
|
||||
if (!mvm->tdls_cs.peer.skb) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
if (!mvm->tdls_cs.peer.skb)
|
||||
return -ENOMEM;
|
||||
|
||||
mvmsta = iwl_mvm_sta_from_mac80211(sta);
|
||||
mvm->tdls_cs.peer.sta_id = mvmsta->deflink.sta_id;
|
||||
@ -556,10 +550,7 @@ iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,
|
||||
vif->bss_conf.beacon_int);
|
||||
mod_delayed_work(system_wq, &mvm->tdls_cs.dwork,
|
||||
msecs_to_jiffies(delay));
|
||||
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void iwl_mvm_tdls_cancel_channel_switch(struct ieee80211_hw *hw,
|
||||
@ -626,7 +617,7 @@ iwl_mvm_tdls_recv_channel_switch(struct ieee80211_hw *hw,
|
||||
params->action_code == WLAN_TDLS_CHANNEL_SWITCH_REQUEST ?
|
||||
"REQ" : "RESP";
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
IWL_DEBUG_TDLS(mvm,
|
||||
"Received TDLS ch switch action %s from %pM status %d\n",
|
||||
@ -670,5 +661,4 @@ retry:
|
||||
1024 / 1000;
|
||||
mod_delayed_work(system_wq, &mvm->tdls_cs.dwork,
|
||||
msecs_to_jiffies(delay));
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
||||
/*
|
||||
* Copyright (C) 2012-2014, 2019-2022 Intel Corporation
|
||||
* Copyright (C) 2012-2014, 2019-2022, 2024 Intel Corporation
|
||||
* Copyright (C) 2013-2014 Intel Mobile Communications GmbH
|
||||
* Copyright (C) 2015-2016 Intel Deutschland GmbH
|
||||
*/
|
||||
@ -618,48 +618,35 @@ static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device,
|
||||
int ret;
|
||||
int temp;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (!iwl_mvm_firmware_running(mvm) ||
|
||||
mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR) {
|
||||
ret = -ENODATA;
|
||||
goto out;
|
||||
}
|
||||
mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR)
|
||||
return -ENODATA;
|
||||
|
||||
ret = iwl_mvm_get_temp(mvm, &temp);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
*temperature = temp * 1000;
|
||||
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int iwl_mvm_tzone_set_trip_temp(struct thermal_zone_device *device,
|
||||
int trip, int temp)
|
||||
{
|
||||
struct iwl_mvm *mvm = thermal_zone_device_priv(device);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (!iwl_mvm_firmware_running(mvm) ||
|
||||
mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR) {
|
||||
ret = -EIO;
|
||||
goto out;
|
||||
}
|
||||
mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR)
|
||||
return -EIO;
|
||||
|
||||
if ((temp / 1000) > S16_MAX) {
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if ((temp / 1000) > S16_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
ret = iwl_mvm_send_temp_report_ths_cmd(mvm);
|
||||
out:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
return iwl_mvm_send_temp_report_ths_cmd(mvm);
|
||||
}
|
||||
|
||||
static struct thermal_zone_device_ops tzone_ops = {
|
||||
@ -733,27 +720,18 @@ static int iwl_mvm_tcool_set_cur_state(struct thermal_cooling_device *cdev,
|
||||
unsigned long new_state)
|
||||
{
|
||||
struct iwl_mvm *mvm = (struct iwl_mvm *)(cdev->devdata);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
if (!iwl_mvm_firmware_running(mvm) ||
|
||||
mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR) {
|
||||
ret = -EIO;
|
||||
goto unlock;
|
||||
}
|
||||
mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR)
|
||||
return -EIO;
|
||||
|
||||
if (new_state >= ARRAY_SIZE(iwl_mvm_cdev_budgets)) {
|
||||
ret = -EINVAL;
|
||||
goto unlock;
|
||||
}
|
||||
if (new_state >= ARRAY_SIZE(iwl_mvm_cdev_budgets))
|
||||
return -EINVAL;
|
||||
|
||||
ret = iwl_mvm_ctdp_command(mvm, CTDP_CMD_OPERATION_START,
|
||||
new_state);
|
||||
|
||||
unlock:
|
||||
mutex_unlock(&mvm->mutex);
|
||||
return ret;
|
||||
return iwl_mvm_ctdp_command(mvm, CTDP_CMD_OPERATION_START,
|
||||
new_state);
|
||||
}
|
||||
|
||||
static const struct thermal_cooling_device_ops tcooling_ops = {
|
||||
|
||||
@ -892,7 +892,7 @@ static void iwl_mvm_tcm_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)
|
||||
|
||||
static void iwl_mvm_tcm_results(struct iwl_mvm *mvm)
|
||||
{
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
|
||||
ieee80211_iterate_active_interfaces(
|
||||
mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
|
||||
@ -900,8 +900,6 @@ static void iwl_mvm_tcm_results(struct iwl_mvm *mvm)
|
||||
|
||||
if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))
|
||||
iwl_mvm_config_scan(mvm);
|
||||
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
static void iwl_mvm_tcm_uapsd_nonagg_detected_wk(struct work_struct *wk)
|
||||
@ -1130,10 +1128,9 @@ void iwl_mvm_recalc_tcm(struct iwl_mvm *mvm)
|
||||
spin_unlock(&mvm->tcm.lock);
|
||||
|
||||
if (handle_uapsd && iwl_mvm_has_new_rx_api(mvm)) {
|
||||
mutex_lock(&mvm->mutex);
|
||||
guard(mvm)(mvm);
|
||||
if (iwl_mvm_request_statistics(mvm, true))
|
||||
handle_uapsd = false;
|
||||
mutex_unlock(&mvm->mutex);
|
||||
}
|
||||
|
||||
spin_lock(&mvm->tcm.lock);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user