1 files changed, 36 insertions, 7 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 525b26e0f65e..3f37fb64e71c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1623,6 +1623,7 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm)
         struct iwl_mvm_mc_iter_data iter_data = {
                 .mvm = mvm,
         };
+        int ret;
 
         lockdep_assert_held(&mvm->mutex);
 
@@ -1632,6 +1633,22 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm)
         ieee80211_iterate_active_interfaces_atomic(
                 mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
                 iwl_mvm_mc_iface_iterator, &iter_data);
+
+        /*
+         * Send a (synchronous) ech command so that we wait for the
+         * multiple asynchronous MCAST_FILTER_CMD commands sent by
+         * the interface iterator. Otherwise, we might get here over
+         * and over again (by userspace just sending a lot of these)
+         * and the CPU can send them faster than the firmware can
+         * process them.
+         * Note that the CPU is still faster - but with this we'll
+         * actually send fewer commands overall because the CPU will
+         * not schedule the work in mac80211 as frequently if it's
+         * still running when rescheduled (possibly multiple times).
+         */
+        ret = iwl_mvm_send_cmd_pdu(mvm, ECHO_CMD, 0, 0, NULL);
+        if (ret)
+                IWL_ERR(mvm, "Failed to synchronize multicast groups update\n");
 }
 
 static u64 iwl_mvm_prepare_multicast(struct ieee80211_hw *hw,
@@ -2880,7 +2897,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
 
         /* this would be a mac80211 bug ... but don't crash */
         if (WARN_ON_ONCE(!mvmvif->phy_ctxt))
-                return -EINVAL;
+                return test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status) ? 0 : -EINVAL;
 
         /*
          * If we are in a STA removal flow and in DQA mode:
@@ -3496,6 +3513,7 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct cfg80211_chan_def chandef;
         struct iwl_mvm_phy_ctxt *phy_ctxt;
+        bool band_change_removal;
         int ret, i;
 
         IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel->hw_value,
@@ -3565,19 +3583,30 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,
         cfg80211_chandef_create(&chandef, channel, NL80211_CHAN_NO_HT);
 
         /*
-         * Change the PHY context configuration as it is currently referenced
-         * only by the P2P Device MAC
+         * Check if the remain-on-channel is on a different band and that
+         * requires context removal, see iwl_mvm_phy_ctxt_changed(). If
+         * so, we'll need to release and then re-configure here, since we
+         * must not remove a PHY context that's part of a binding.
          */
-        if (mvmvif->phy_ctxt->ref == 1) {
+        band_change_removal =
+                fw_has_capa(&mvm->fw->ucode_capa,
+                            IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT) &&
+                mvmvif->phy_ctxt->channel->band != chandef.chan->band;
+
+        if (mvmvif->phy_ctxt->ref == 1 && !band_change_removal) {
+                /*
+                 * Change the PHY context configuration as it is currently
+                 * referenced only by the P2P Device MAC (and we can modify it)
+                 */
                 ret = iwl_mvm_phy_ctxt_changed(mvm, mvmvif->phy_ctxt,
                                                &chandef, 1, 1);
                 if (ret)
                         goto out_unlock;
         } else {
                 /*
-                 * The PHY context is shared with other MACs. Need to remove the
-                 * P2P Device from the binding, allocate an new PHY context and
-                 * create a new binding
+                 * The PHY context is shared with other MACs (or we're trying to
+                 * switch bands), so remove the P2P Device from the binding,
+                 * allocate an new PHY context and create a new binding.
                  */
                 phy_ctxt = iwl_mvm_get_free_phy_ctxt(mvm);
                 if (!phy_ctxt) {