Merge tag 'wireless-drivers-next-for-davem-2018-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 4.21

First set of patches for 4.21. Most notable here is support for
Quantenna's QSR1000/QSR2000 chipsets and more flexible ways to provide
nvram files for brcmfmac.

Major changes:

brcmfmac

* add support for first trying to get a board specific nvram file

* add support for getting nvram contents from EFI variables

qtnfmac

* use single PCIe driver for all platforms and rename
  Kconfig option CONFIG_QTNFMAC_PEARL_PCIE to CONFIG_QTNFMAC_PCIE

* add support for QSR1000/QSR2000 (Topaz) family of chipsets

ath10k

* add support for WCN3990 firmware crash recovery

* add firmware memory dump support for QCA4019

wil6210

* add firmware error recovery while in AP mode

ath9k

* remove experimental notice from dynack feature

iwlwifi

* PCI IDs for some new 9000-series cards

* improve antenna usage on connection problems

* new firmware debugging infrastructure

* some more work on 802.11ax

* improve support for multiple RF modules with 22000 devices

cordic

* move cordic macros and defines to a public header file

* convert brcmsmac and b43 to fully use cordic library
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index af3fba10abc1..a31dc99b63f7 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -676,7 +676,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         INIT_LIST_HEAD(&mvm->aux_roc_te_list);
         INIT_LIST_HEAD(&mvm->async_handlers_list);
         spin_lock_init(&mvm->time_event_lock);
-        spin_lock_init(&mvm->queue_info_lock);
 
         INIT_WORK(&mvm->async_handlers_wk, iwl_mvm_async_handlers_wk);
         INIT_WORK(&mvm->roc_done_wk, iwl_mvm_roc_done_wk);
@@ -770,7 +769,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         memcpy(trans->dbg_conf_tlv, mvm->fw->dbg.conf_tlv,
                sizeof(trans->dbg_conf_tlv));
         trans->dbg_trigger_tlv = mvm->fw->dbg.trigger_tlv;
-        trans->dbg_dump_mask = mvm->fw->dbg.dump_mask;
 
         trans->iml = mvm->fw->iml;
         trans->iml_len = mvm->fw->iml_len;
@@ -846,6 +844,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
         iwl_mvm_tof_init(mvm);
 
+        iwl_mvm_toggle_tx_ant(mvm, &mvm->mgmt_last_antenna_idx);
+
         return op_mode;
 
  out_unregister:
@@ -1110,11 +1110,7 @@ static void iwl_mvm_async_cb(struct iwl_op_mode *op_mode,
 static void iwl_mvm_stop_sw_queue(struct iwl_op_mode *op_mode, int hw_queue)
 {
         struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
-        unsigned long mq;
-
-        spin_lock_bh(&mvm->queue_info_lock);
-        mq = mvm->hw_queue_to_mac80211[hw_queue];
-        spin_unlock_bh(&mvm->queue_info_lock);
+        unsigned long mq = mvm->hw_queue_to_mac80211[hw_queue];
 
         iwl_mvm_stop_mac_queues(mvm, mq);
 }
@@ -1140,11 +1136,7 @@ void iwl_mvm_start_mac_queues(struct iwl_mvm *mvm, unsigned long mq)
 static void iwl_mvm_wake_sw_queue(struct iwl_op_mode *op_mode, int hw_queue)
 {
         struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
-        unsigned long mq;
-
-        spin_lock_bh(&mvm->queue_info_lock);
-        mq = mvm->hw_queue_to_mac80211[hw_queue];
-        spin_unlock_bh(&mvm->queue_info_lock);
+        unsigned long mq = mvm->hw_queue_to_mac80211[hw_queue];
 
         iwl_mvm_start_mac_queues(mvm, mq);
 }
@@ -1242,7 +1234,7 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
          */
         if (!mvm->fw_restart && fw_error) {
                 iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,
-                                        NULL, 0);
+                                        false, 0);
         } else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
                 struct iwl_mvm_reprobe *reprobe;