Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:

 1) Add BQL support to via-rhine, from Tino Reichardt.

 2) Integrate SWITCHDEV layer support into the DSA layer, so DSA drivers
    can support hw switch offloading.  From Floria Fainelli.

 3) Allow 'ip address' commands to initiate multicast group join/leave,
    from Madhu Challa.

 4) Many ipv4 FIB lookup optimizations from Alexander Duyck.

 5) Support EBPF in cls_bpf classifier and act_bpf action, from Daniel
    Borkmann.

 6) Remove the ugly compat support in ARP for ugly layers like ax25,
    rose, etc.  And use this to clean up the neigh layer, then use it to
    implement MPLS support.  All from Eric Biederman.

 7) Support L3 forwarding offloading in switches, from Scott Feldman.

 8) Collapse the LOCAL and MAIN ipv4 FIB tables when possible, to speed
    up route lookups even further.  From Alexander Duyck.

 9) Many improvements and bug fixes to the rhashtable implementation,
    from Herbert Xu and Thomas Graf.  In particular, in the case where
    an rhashtable user bulk adds a large number of items into an empty
    table, we expand the table much more sanely.

10) Don't make the tcp_metrics hash table per-namespace, from Eric
    Biederman.

11) Extend EBPF to access SKB fields, from Alexei Starovoitov.

12) Split out new connection request sockets so that they can be
    established in the main hash table.  Much less false sharing since
    hash lookups go direct to the request sockets instead of having to
    go first to the listener then to the request socks hashed
    underneath.  From Eric Dumazet.

13) Add async I/O support for crytpo AF_ALG sockets, from Tadeusz Struk.

14) Support stable privacy address generation for RFC7217 in IPV6.  From
    Hannes Frederic Sowa.

15) Hash network namespace into IP frag IDs, also from Hannes Frederic
    Sowa.

16) Convert PTP get/set methods to use 64-bit time, from Richard
    Cochran.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1816 commits)
  fm10k: Bump driver version to 0.15.2
  fm10k: corrected VF multicast update
  fm10k: mbx_update_max_size does not drop all oversized messages
  fm10k: reset head instead of calling update_max_size
  fm10k: renamed mbx_tx_dropped to mbx_tx_oversized
  fm10k: update xcast mode before synchronizing multicast addresses
  fm10k: start service timer on probe
  fm10k: fix function header comment
  fm10k: comment next_vf_mbx flow
  fm10k: don't handle mailbox events in iov_event path and always process mailbox
  fm10k: use separate workqueue for fm10k driver
  fm10k: Set PF queues to unlimited bandwidth during virtualization
  fm10k: expose tx_timeout_count as an ethtool stat
  fm10k: only increment tx_timeout_count in Tx hang path
  fm10k: remove extraneous "Reset interface" message
  fm10k: separate PF only stats so that VF does not display them
  fm10k: use hw->mac.max_queues for stats
  fm10k: only show actual queues, not the maximum in hardware
  fm10k: allow creation of VLAN on default vid
  fm10k: fix unused warnings
  ...

257 files changed, 8421 insertions, 3959 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index b97367d50717..d0c97c220026 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2676,7 +2676,7 @@ static void wifi_setup(struct net_device *dev)
         dev->addr_len           = ETH_ALEN;
         dev->tx_queue_len       = 100; 
 
-        memset(dev->broadcast,0xFF, ETH_ALEN);
+        eth_broadcast_addr(dev->broadcast);
 
         dev->flags              = IFF_BROADCAST|IFF_MULTICAST;
 }
@@ -3273,7 +3273,7 @@ static void airo_handle_link(struct airo_info *ai)
                 }
 
                 /* Send event to user space */
-                memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
+                eth_zero_addr(wrqu.ap_addr.sa_data);
                 wrqu.ap_addr.sa_family = ARPHRD_ETHER;
                 wireless_send_event(ai->dev, SIOCGIWAP, &wrqu, NULL);
         }
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index da92bfa76b7c..49219c508963 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1166,7 +1166,7 @@ static int at76_start_monitor(struct at76_priv *priv)
         int ret;
 
         memset(&scan, 0, sizeof(struct at76_req_scan));
-        memset(scan.bssid, 0xff, ETH_ALEN);
+        eth_broadcast_addr(scan.bssid);
 
         scan.channel = priv->channel;
         scan.scan_type = SCAN_TYPE_PASSIVE;
@@ -1427,7 +1427,7 @@ static int at76_startup_device(struct at76_priv *priv)
         at76_wait_completion(priv, CMD_STARTUP);
 
         /* remove BSSID from previous run */
-        memset(priv->bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->bssid);
 
         priv->scanning = false;
 
@@ -1973,7 +1973,7 @@ static int at76_hw_scan(struct ieee80211_hw *hw,
         ieee80211_stop_queues(hw);
 
         memset(&scan, 0, sizeof(struct at76_req_scan));
-        memset(scan.bssid, 0xFF, ETH_ALEN);
+        eth_broadcast_addr(scan.bssid);
 
         if (req->n_ssids) {
                 scan.scan_type = SCAN_TYPE_ACTIVE;
diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c
index f92050617ae6..5147ebe4cd05 100644
--- a/drivers/net/wireless/ath/ar5523/ar5523.c
+++ b/drivers/net/wireless/ath/ar5523/ar5523.c
@@ -779,8 +779,6 @@ static void ar5523_tx(struct ieee80211_hw *hw,
                 ieee80211_stop_queues(hw);
         }
 
-        data->skb = skb;
-
         spin_lock_irqsave(&ar->tx_data_list_lock, flags);
         list_add_tail(&data->list, &ar->tx_queue_pending);
         spin_unlock_irqrestore(&ar->tx_data_list_lock, flags);
@@ -817,10 +815,13 @@ static void ar5523_tx_work_locked(struct ar5523 *ar)
                 if (!data)
                         break;
 
-                skb = data->skb;
+                txi = container_of((void *)data, struct ieee80211_tx_info,
+                                   driver_data);
                 txqid = 0;
-                txi = IEEE80211_SKB_CB(skb);
+
+                skb = container_of((void *)txi, struct sk_buff, cb);
                 paylen = skb->len;
+
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
                         ar5523_err(ar, "Failed to allocate TX urb\n");
diff --git a/drivers/net/wireless/ath/ar5523/ar5523.h b/drivers/net/wireless/ath/ar5523/ar5523.h
index 00c6fd346d48..9a322a65cdb5 100644
--- a/drivers/net/wireless/ath/ar5523/ar5523.h
+++ b/drivers/net/wireless/ath/ar5523/ar5523.h
@@ -74,7 +74,6 @@ struct ar5523_tx_cmd {
 struct ar5523_tx_data {
         struct list_head        list;
         struct ar5523           *ar;
-        struct sk_buff          *skb;
         struct urb              *urb;
 };
 
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 1eebe2ea3dfb..7e9481099a8e 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -131,6 +131,9 @@ struct ath_ops {
         void (*enable_write_buffer)(void *);
         void (*write_flush) (void *);
         u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
+        void (*enable_rmw_buffer)(void *);
+        void (*rmw_flush) (void *);
+
 };
 
 struct ath_common;
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index c18647b87f71..0eddb204d85b 100644
--- a/drivers/net/wireless/ath/ath10k/ce.h
+++ b/drivers/net/wireless/ath/ath10k/ce.h
@@ -39,7 +39,7 @@ struct ath10k_ce_pipe;
 #define CE_DESC_FLAGS_GATHER         (1 << 0)
 #define CE_DESC_FLAGS_BYTE_SWAP      (1 << 1)
 #define CE_DESC_FLAGS_META_DATA_MASK 0xFFFC
-#define CE_DESC_FLAGS_META_DATA_LSB  3
+#define CE_DESC_FLAGS_META_DATA_LSB  2
 
 struct ce_desc {
         __le32 addr;
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 310e12bc078a..c0e454bb6a8d 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -436,16 +436,16 @@ static int ath10k_download_fw(struct ath10k *ar, enum ath10k_firmware_mode mode)
 
 static void ath10k_core_free_firmware_files(struct ath10k *ar)
 {
-        if (ar->board && !IS_ERR(ar->board))
+        if (!IS_ERR(ar->board))
                 release_firmware(ar->board);
 
-        if (ar->otp && !IS_ERR(ar->otp))
+        if (!IS_ERR(ar->otp))
                 release_firmware(ar->otp);
 
-        if (ar->firmware && !IS_ERR(ar->firmware))
+        if (!IS_ERR(ar->firmware))
                 release_firmware(ar->firmware);
 
-        if (ar->cal_file && !IS_ERR(ar->cal_file))
+        if (!IS_ERR(ar->cal_file))
                 release_firmware(ar->cal_file);
 
         ar->board = NULL;
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index d60e46fe6d19..f65310c3ba5f 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -159,6 +159,25 @@ struct ath10k_fw_stats_peer {
         u32 peer_rx_rate; /* 10x only */
 };
 
+struct ath10k_fw_stats_vdev {
+        struct list_head list;
+
+        u32 vdev_id;
+        u32 beacon_snr;
+        u32 data_snr;
+        u32 num_tx_frames[4];
+        u32 num_rx_frames;
+        u32 num_tx_frames_retries[4];
+        u32 num_tx_frames_failures[4];
+        u32 num_rts_fail;
+        u32 num_rts_success;
+        u32 num_rx_err;
+        u32 num_rx_discard;
+        u32 num_tx_not_acked;
+        u32 tx_rate_history[10];
+        u32 beacon_rssi_history[10];
+};
+
 struct ath10k_fw_stats_pdev {
         struct list_head list;
 
@@ -220,6 +239,7 @@ struct ath10k_fw_stats_pdev {
 
 struct ath10k_fw_stats {
         struct list_head pdevs;
+        struct list_head vdevs;
         struct list_head peers;
 };
 
@@ -288,6 +308,7 @@ struct ath10k_vif {
         bool is_started;
         bool is_up;
         bool spectral_enabled;
+        bool ps;
         u32 aid;
         u8 bssid[ETH_ALEN];
 
@@ -413,6 +434,12 @@ enum ath10k_fw_features {
          */
         ATH10K_FW_FEATURE_WMI_10_2 = 4,
 
+        /* Some firmware revisions lack proper multi-interface client powersave
+         * implementation. Enabling PS could result in connection drops,
+         * traffic stalls, etc.
+         */
+        ATH10K_FW_FEATURE_MULTI_VIF_PS_SUPPORT = 5,
+
         /* keep last */
         ATH10K_FW_FEATURE_COUNT,
 };
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index d2281e5c2ffe..301081db1ef6 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -243,6 +243,16 @@ static void ath10k_debug_fw_stats_pdevs_free(struct list_head *head)
         }
 }
 
+static void ath10k_debug_fw_stats_vdevs_free(struct list_head *head)
+{
+        struct ath10k_fw_stats_vdev *i, *tmp;
+
+        list_for_each_entry_safe(i, tmp, head, list) {
+                list_del(&i->list);
+                kfree(i);
+        }
+}
+
 static void ath10k_debug_fw_stats_peers_free(struct list_head *head)
 {
         struct ath10k_fw_stats_peer *i, *tmp;
@@ -258,6 +268,7 @@ static void ath10k_debug_fw_stats_reset(struct ath10k *ar)
         spin_lock_bh(&ar->data_lock);
         ar->debug.fw_stats_done = false;
         ath10k_debug_fw_stats_pdevs_free(&ar->debug.fw_stats.pdevs);
+        ath10k_debug_fw_stats_vdevs_free(&ar->debug.fw_stats.vdevs);
         ath10k_debug_fw_stats_peers_free(&ar->debug.fw_stats.peers);
         spin_unlock_bh(&ar->data_lock);
 }
@@ -273,14 +284,27 @@ static size_t ath10k_debug_fw_stats_num_peers(struct list_head *head)
         return num;
 }
 
+static size_t ath10k_debug_fw_stats_num_vdevs(struct list_head *head)
+{
+        struct ath10k_fw_stats_vdev *i;
+        size_t num = 0;
+
+        list_for_each_entry(i, head, list)
+                ++num;
+
+        return num;
+}
+
 void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)
 {
         struct ath10k_fw_stats stats = {};
         bool is_start, is_started, is_end;
         size_t num_peers;
+        size_t num_vdevs;
         int ret;
 
         INIT_LIST_HEAD(&stats.pdevs);
+        INIT_LIST_HEAD(&stats.vdevs);
         INIT_LIST_HEAD(&stats.peers);
 
         spin_lock_bh(&ar->data_lock);
@@ -308,6 +332,7 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)
         }
 
         num_peers = ath10k_debug_fw_stats_num_peers(&ar->debug.fw_stats.peers);
+        num_vdevs = ath10k_debug_fw_stats_num_vdevs(&ar->debug.fw_stats.vdevs);
         is_start = (list_empty(&ar->debug.fw_stats.pdevs) &&
                     !list_empty(&stats.pdevs));
         is_end = (!list_empty(&ar->debug.fw_stats.pdevs) &&
@@ -330,7 +355,13 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)
                         goto free;
                 }
 
+                if (num_vdevs >= BITS_PER_LONG) {
+                        ath10k_warn(ar, "dropping fw vdev stats\n");
+                        goto free;
+                }
+
                 list_splice_tail_init(&stats.peers, &ar->debug.fw_stats.peers);
+                list_splice_tail_init(&stats.vdevs, &ar->debug.fw_stats.vdevs);
         }
 
         complete(&ar->debug.fw_stats_complete);
@@ -340,6 +371,7 @@ free:
          * resources if that is not the case.
          */
         ath10k_debug_fw_stats_pdevs_free(&stats.pdevs);
+        ath10k_debug_fw_stats_vdevs_free(&stats.vdevs);
         ath10k_debug_fw_stats_peers_free(&stats.peers);
 
 unlock:
@@ -363,7 +395,10 @@ static int ath10k_debug_fw_stats_request(struct ath10k *ar)
 
                 reinit_completion(&ar->debug.fw_stats_complete);
 
-                ret = ath10k_wmi_request_stats(ar, WMI_REQUEST_PEER_STAT);
+                ret = ath10k_wmi_request_stats(ar,
+                                               WMI_STAT_PDEV |
+                                               WMI_STAT_VDEV |
+                                               WMI_STAT_PEER);
                 if (ret) {
                         ath10k_warn(ar, "could not request stats (%d)\n", ret);
                         return ret;
@@ -395,8 +430,11 @@ static void ath10k_fw_stats_fill(struct ath10k *ar,
         unsigned int len = 0;
         unsigned int buf_len = ATH10K_FW_STATS_BUF_SIZE;
         const struct ath10k_fw_stats_pdev *pdev;
+        const struct ath10k_fw_stats_vdev *vdev;
         const struct ath10k_fw_stats_peer *peer;
         size_t num_peers;
+        size_t num_vdevs;
+        int i;
 
         spin_lock_bh(&ar->data_lock);
 
@@ -408,6 +446,7 @@ static void ath10k_fw_stats_fill(struct ath10k *ar,
         }
 
         num_peers = ath10k_debug_fw_stats_num_peers(&fw_stats->peers);
+        num_vdevs = ath10k_debug_fw_stats_num_vdevs(&fw_stats->vdevs);
 
         len += scnprintf(buf + len, buf_len - len, "\n");
         len += scnprintf(buf + len, buf_len - len, "%30s\n",
@@ -531,6 +570,65 @@ static void ath10k_fw_stats_fill(struct ath10k *ar,
 
         len += scnprintf(buf + len, buf_len - len, "\n");
         len += scnprintf(buf + len, buf_len - len, "%30s (%zu)\n",
+                         "ath10k VDEV stats", num_vdevs);
+        len += scnprintf(buf + len, buf_len - len, "%30s\n\n",
+                                 "=================");
+
+        list_for_each_entry(vdev, &fw_stats->vdevs, list) {
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "vdev id", vdev->vdev_id);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "beacon snr", vdev->beacon_snr);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "data snr", vdev->data_snr);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "num rx frames", vdev->num_rx_frames);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "num rts fail", vdev->num_rts_fail);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "num rts success", vdev->num_rts_success);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "num rx err", vdev->num_rx_err);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "num rx discard", vdev->num_rx_discard);
+                len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
+                                 "num tx not acked", vdev->num_tx_not_acked);
+
+                for (i = 0 ; i < ARRAY_SIZE(vdev->num_tx_frames); i++)
+                        len += scnprintf(buf + len, buf_len - len,
+                                        "%25s [%02d] %u\n",
+                                         "num tx frames", i,
+                                         vdev->num_tx_frames[i]);
+
+                for (i = 0 ; i < ARRAY_SIZE(vdev->num_tx_frames_retries); i++)
+                        len += scnprintf(buf + len, buf_len - len,
+                                        "%25s [%02d] %u\n",
+                                         "num tx frames retries", i,
+                                         vdev->num_tx_frames_retries[i]);
+
+                for (i = 0 ; i < ARRAY_SIZE(vdev->num_tx_frames_failures); i++)
+                        len += scnprintf(buf + len, buf_len - len,
+                                        "%25s [%02d] %u\n",
+                                         "num tx frames failures", i,
+                                         vdev->num_tx_frames_failures[i]);
+
+                for (i = 0 ; i < ARRAY_SIZE(vdev->tx_rate_history); i++)
+                        len += scnprintf(buf + len, buf_len - len,
+                                        "%25s [%02d] 0x%08x\n",
+                                         "tx rate history", i,
+                                         vdev->tx_rate_history[i]);
+
+                for (i = 0 ; i < ARRAY_SIZE(vdev->beacon_rssi_history); i++)
+                        len += scnprintf(buf + len, buf_len - len,
+                                        "%25s [%02d] %u\n",
+                                         "beacon rssi history", i,
+                                         vdev->beacon_rssi_history[i]);
+
+                len += scnprintf(buf + len, buf_len - len, "\n");
+        }
+
+        len += scnprintf(buf + len, buf_len - len, "\n");
+        len += scnprintf(buf + len, buf_len - len, "%30s (%zu)\n",
                          "ath10k PEER stats", num_peers);
         len += scnprintf(buf + len, buf_len - len, "%30s\n\n",
                                  "=================");
@@ -1900,6 +1998,7 @@ int ath10k_debug_create(struct ath10k *ar)
                 return -ENOMEM;
 
         INIT_LIST_HEAD(&ar->debug.fw_stats.pdevs);
+        INIT_LIST_HEAD(&ar->debug.fw_stats.vdevs);
         INIT_LIST_HEAD(&ar->debug.fw_stats.peers);
 
         return 0;
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index c1da44f65a4d..01a2b384f358 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -176,7 +176,7 @@ static void ath10k_htt_rx_msdu_buff_replenish(struct ath10k_htt *htt)
          * automatically balances load wrt to CPU power.
          *
          * This probably comes at a cost of lower maximum throughput but
-         * improves the avarage and stability. */
+         * improves the average and stability. */
         spin_lock_bh(&htt->rx_ring.lock);
         num_deficit = htt->rx_ring.fill_level - htt->rx_ring.fill_cnt;
         num_to_fill = min(ATH10K_HTT_MAX_NUM_REFILL, num_deficit);
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 4ce433f1c1fb..973485bd4121 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -611,7 +611,7 @@ static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id)
 
         ret = ath10k_vdev_setup_sync(ar);
         if (ret) {
-                ath10k_warn(ar, "failed to synchronize setup for monitor vdev %i: %d\n",
+                ath10k_warn(ar, "failed to synchronize setup for monitor vdev %i start: %d\n",
                             vdev_id, ret);
                 return ret;
         }
@@ -658,7 +658,7 @@ static int ath10k_monitor_vdev_stop(struct ath10k *ar)
 
         ret = ath10k_vdev_setup_sync(ar);
         if (ret)
-                ath10k_warn(ar, "failed to synchronise monitor vdev %i: %d\n",
+                ath10k_warn(ar, "failed to synchronize monitor vdev %i stop: %d\n",
                             ar->monitor_vdev_id, ret);
 
         ath10k_dbg(ar, ATH10K_DBG_MAC, "mac monitor vdev %i stopped\n",
@@ -927,8 +927,9 @@ static int ath10k_vdev_start_restart(struct ath10k_vif *arvif, bool restart)
 
         ret = ath10k_vdev_setup_sync(ar);
         if (ret) {
-                ath10k_warn(ar, "failed to synchronise setup for vdev %i: %d\n",
-                            arg.vdev_id, ret);
+                ath10k_warn(ar,
+                            "failed to synchronize setup for vdev %i restart %d: %d\n",
+                            arg.vdev_id, restart, ret);
                 return ret;
         }
 
@@ -966,7 +967,7 @@ static int ath10k_vdev_stop(struct ath10k_vif *arvif)
 
         ret = ath10k_vdev_setup_sync(ar);
         if (ret) {
-                ath10k_warn(ar, "failed to syncronise setup for vdev %i: %d\n",
+                ath10k_warn(ar, "failed to synchronize setup for vdev %i stop: %d\n",
                             arvif->vdev_id, ret);
                 return ret;
         }
@@ -1182,7 +1183,7 @@ static void ath10k_control_ibss(struct ath10k_vif *arvif,
                 if (is_zero_ether_addr(arvif->bssid))
                         return;
 
-                memset(arvif->bssid, 0, ETH_ALEN);
+                eth_zero_addr(arvif->bssid);
 
                 return;
         }
@@ -1253,6 +1254,20 @@ static int ath10k_mac_vif_recalc_ps_poll_count(struct ath10k_vif *arvif)
         return 0;
 }
 
+static int ath10k_mac_ps_vif_count(struct ath10k *ar)
+{
+        struct ath10k_vif *arvif;
+        int num = 0;
+
+        lockdep_assert_held(&ar->conf_mutex);
+
+        list_for_each_entry(arvif, &ar->arvifs, list)
+                if (arvif->ps)
+                        num++;
+
+        return num;
+}
+
 static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
 {
         struct ath10k *ar = arvif->ar;
@@ -1262,13 +1277,24 @@ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
         enum wmi_sta_ps_mode psmode;
         int ret;
         int ps_timeout;
+        bool enable_ps;
 
         lockdep_assert_held(&arvif->ar->conf_mutex);
 
         if (arvif->vif->type != NL80211_IFTYPE_STATION)
                 return 0;
 
-        if (vif->bss_conf.ps) {
+        enable_ps = arvif->ps;
+
+        if (enable_ps && ath10k_mac_ps_vif_count(ar) > 1 &&
+            !test_bit(ATH10K_FW_FEATURE_MULTI_VIF_PS_SUPPORT,
+                      ar->fw_features)) {
+                ath10k_warn(ar, "refusing to enable ps on vdev %i: not supported by fw\n",
+                            arvif->vdev_id);
+                enable_ps = false;
+        }
+
+        if (enable_ps) {
                 psmode = WMI_STA_PS_MODE_ENABLED;
                 param = WMI_STA_PS_PARAM_INACTIVITY_TIME;
 
@@ -1386,7 +1412,8 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,
         lockdep_assert_held(&ar->conf_mutex);
 
         bss = cfg80211_get_bss(ar->hw->wiphy, ar->hw->conf.chandef.chan,
-                               info->bssid, NULL, 0, 0, 0);
+                               info->bssid, NULL, 0, IEEE80211_BSS_TYPE_ANY,
+                               IEEE80211_PRIVACY_ANY);
         if (bss) {
                 const struct cfg80211_bss_ies *ies;
 
@@ -1781,6 +1808,68 @@ static int ath10k_setup_peer_smps(struct ath10k *ar, struct ath10k_vif *arvif,
                                          ath10k_smps_map[smps]);
 }
 
+static int ath10k_mac_vif_recalc_txbf(struct ath10k *ar,
+                                      struct ieee80211_vif *vif,
+                                      struct ieee80211_sta_vht_cap vht_cap)
+{
+        struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
+        int ret;
+        u32 param;
+        u32 value;
+
+        if (!(ar->vht_cap_info &
+              (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
+               IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |
+               IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
+               IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)))
+                return 0;
+
+        param = ar->wmi.vdev_param->txbf;
+        value = 0;
+
+        if (WARN_ON(param == WMI_VDEV_PARAM_UNSUPPORTED))
+                return 0;
+
+        /* The following logic is correct. If a remote STA advertises support
+         * for being a beamformer then we should enable us being a beamformee.
+         */
+
+        if (ar->vht_cap_info &
+            (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
+             IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE)) {
+                if (vht_cap.cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)
+                        value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFEE;
+
+                if (vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)
+                        value |= WMI_VDEV_PARAM_TXBF_MU_TX_BFEE;
+        }
+
+        if (ar->vht_cap_info &
+            (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
+             IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)) {
+                if (vht_cap.cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE)
+                        value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFER;
+
+                if (vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE)
+                        value |= WMI_VDEV_PARAM_TXBF_MU_TX_BFER;
+        }
+
+        if (value & WMI_VDEV_PARAM_TXBF_MU_TX_BFEE)
+                value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFEE;
+
+        if (value & WMI_VDEV_PARAM_TXBF_MU_TX_BFER)
+                value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFER;
+
+        ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, param, value);
+        if (ret) {
+                ath10k_warn(ar, "failed to submit vdev param txbf 0x%x: %d\n",
+                            value, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
 /* can be called only in mac80211 callbacks due to `key_count` usage */
 static void ath10k_bss_assoc(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif,
@@ -1789,6 +1878,7 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,
         struct ath10k *ar = hw->priv;
         struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
         struct ieee80211_sta_ht_cap ht_cap;
+        struct ieee80211_sta_vht_cap vht_cap;
         struct wmi_peer_assoc_complete_arg peer_arg;
         struct ieee80211_sta *ap_sta;
         int ret;
@@ -1811,6 +1901,7 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,
         /* ap_sta must be accessed only within rcu section which must be left
          * before calling ath10k_setup_peer_smps() which might sleep. */
         ht_cap = ap_sta->ht_cap;
+        vht_cap = ap_sta->vht_cap;
 
         ret = ath10k_peer_assoc_prepare(ar, vif, ap_sta, &peer_arg);
         if (ret) {
@@ -1836,6 +1927,13 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,
                 return;
         }
 
+        ret = ath10k_mac_vif_recalc_txbf(ar, vif, vht_cap);
+        if (ret) {
+                ath10k_warn(ar, "failed to recalc txbf for vdev %i on bss %pM: %d\n",
+                            arvif->vdev_id, bss_conf->bssid, ret);
+                return;
+        }
+
         ath10k_dbg(ar, ATH10K_DBG_MAC,
                    "mac vdev %d up (associated) bssid %pM aid %d\n",
                    arvif->vdev_id, bss_conf->bssid, bss_conf->aid);
@@ -1853,6 +1951,18 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,
         }
 
         arvif->is_up = true;
+
+        /* Workaround: Some firmware revisions (tested with qca6174
+         * WLAN.RM.2.0-00073) have buggy powersave state machine and must be
+         * poked with peer param command.
+         */
+        ret = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, arvif->bssid,
+                                        WMI_PEER_DUMMY_VAR, 1);
+        if (ret) {
+                ath10k_warn(ar, "failed to poke peer %pM param for ps workaround on vdev %i: %d\n",
+                            arvif->bssid, arvif->vdev_id, ret);
+                return;
+        }
 }
 
 static void ath10k_bss_disassoc(struct ieee80211_hw *hw,
@@ -1860,6 +1970,7 @@ static void ath10k_bss_disassoc(struct ieee80211_hw *hw,
 {
         struct ath10k *ar = hw->priv;
         struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
+        struct ieee80211_sta_vht_cap vht_cap = {};
         int ret;
 
         lockdep_assert_held(&ar->conf_mutex);
@@ -1874,6 +1985,13 @@ static void ath10k_bss_disassoc(struct ieee80211_hw *hw,
 
         arvif->def_wep_key_idx = -1;
 
+        ret = ath10k_mac_vif_recalc_txbf(ar, vif, vht_cap);
+        if (ret) {
+                ath10k_warn(ar, "failed to recalc txbf for vdev %i: %d\n",
+                            arvif->vdev_id, ret);
+                return;
+        }
+
         arvif->is_up = false;
 }
 
@@ -2554,6 +2672,17 @@ static int ath10k_start_scan(struct ath10k *ar,
                 return -ETIMEDOUT;
         }
 
+        /* If we failed to start the scan, return error code at
+         * this point.  This is probably due to some issue in the
+         * firmware, but no need to wedge the driver due to that...
+         */
+        spin_lock_bh(&ar->data_lock);
+        if (ar->scan.state == ATH10K_SCAN_IDLE) {
+                spin_unlock_bh(&ar->data_lock);
+                return -EINVAL;
+        }
+        spin_unlock_bh(&ar->data_lock);
+
         /* Add a 200ms margin to account for event/command processing */
         ieee80211_queue_delayed_work(ar->hw, &ar->scan.timeout,
                                      msecs_to_jiffies(arg->max_scan_time+200));
@@ -3323,9 +3452,10 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
         list_del(&arvif->list);
 
         if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
-                ret = ath10k_peer_delete(arvif->ar, arvif->vdev_id, vif->addr);
+                ret = ath10k_wmi_peer_delete(arvif->ar, arvif->vdev_id,
+                                             vif->addr);
                 if (ret)
-                        ath10k_warn(ar, "failed to remove peer for AP vdev %i: %d\n",
+                        ath10k_warn(ar, "failed to submit AP self-peer removal on vdev %i: %d\n",
                                     arvif->vdev_id, ret);
 
                 kfree(arvif->u.ap.noa_data);
@@ -3339,6 +3469,21 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
                 ath10k_warn(ar, "failed to delete WMI vdev %i: %d\n",
                             arvif->vdev_id, ret);
 
+        /* Some firmware revisions don't notify host about self-peer removal
+         * until after associated vdev is deleted.
+         */
+        if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
+                ret = ath10k_wait_for_peer_deleted(ar, arvif->vdev_id,
+                                                   vif->addr);
+                if (ret)
+                        ath10k_warn(ar, "failed to remove AP self-peer on vdev %i: %d\n",
+                                    arvif->vdev_id, ret);
+
+                spin_lock_bh(&ar->data_lock);
+                ar->num_peers--;
+                spin_unlock_bh(&ar->data_lock);
+        }
+
         ath10k_peer_cleanup(ar, arvif->vdev_id);
 
         mutex_unlock(&ar->conf_mutex);
@@ -3534,7 +3679,9 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_PS) {
-                ret = ath10k_mac_vif_setup_ps(arvif);
+                arvif->ps = vif->bss_conf.ps;
+
+                ret = ath10k_config_ps(ar);
                 if (ret)
                         ath10k_warn(ar, "failed to setup ps on vdev %i: %d\n",
                                     arvif->vdev_id, ret);
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index e6972b09333e..7681237fe298 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -104,7 +104,7 @@ static const struct ce_attr host_ce_config_wlan[] = {
         {
                 .flags = CE_ATTR_FLAGS,
                 .src_nentries = 0,
-                .src_sz_max = 512,
+                .src_sz_max = 2048,
                 .dest_nentries = 512,
         },
 
@@ -174,7 +174,7 @@ static const struct ce_pipe_config target_ce_config_wlan[] = {
                 .pipenum = __cpu_to_le32(1),
                 .pipedir = __cpu_to_le32(PIPEDIR_IN),
                 .nentries = __cpu_to_le32(32),
-                .nbytes_max = __cpu_to_le32(512),
+                .nbytes_max = __cpu_to_le32(2048),
                 .flags = __cpu_to_le32(CE_ATTR_FLAGS),
                 .reserved = __cpu_to_le32(0),
         },
diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h
index 04dc4b9db04e..c8b64e7a6089 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-ops.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h
@@ -110,8 +110,7 @@ struct wmi_ops {
                                           bool deliver_cab);
         struct sk_buff *(*gen_pdev_set_wmm)(struct ath10k *ar,
                                             const struct wmi_wmm_params_all_arg *arg);
-        struct sk_buff *(*gen_request_stats)(struct ath10k *ar,
-                                             enum wmi_stats_id stats_id);
+        struct sk_buff *(*gen_request_stats)(struct ath10k *ar, u32 stats_mask);
         struct sk_buff *(*gen_force_fw_hang)(struct ath10k *ar,
                                              enum wmi_force_fw_hang_type type,
                                              u32 delay_ms);
@@ -816,14 +815,14 @@ ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
 }
 
 static inline int
-ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
+ath10k_wmi_request_stats(struct ath10k *ar, u32 stats_mask)
 {
         struct sk_buff *skb;
 
         if (!ar->wmi.ops->gen_request_stats)
                 return -EOPNOTSUPP;
 
-        skb = ar->wmi.ops->gen_request_stats(ar, stats_id);
+        skb = ar->wmi.ops->gen_request_stats(ar, stats_mask);
         if (IS_ERR(skb))
                 return PTR_ERR(skb);
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 71614ba1b145..ee0c5f602e29 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -869,16 +869,57 @@ static int ath10k_wmi_tlv_op_pull_rdy_ev(struct ath10k *ar,
         return 0;
 }
 
+static void ath10k_wmi_tlv_pull_vdev_stats(const struct wmi_tlv_vdev_stats *src,
+                                           struct ath10k_fw_stats_vdev *dst)
+{
+        int i;
+
+        dst->vdev_id = __le32_to_cpu(src->vdev_id);
+        dst->beacon_snr = __le32_to_cpu(src->beacon_snr);
+        dst->data_snr = __le32_to_cpu(src->data_snr);
+        dst->num_rx_frames = __le32_to_cpu(src->num_rx_frames);
+        dst->num_rts_fail = __le32_to_cpu(src->num_rts_fail);
+        dst->num_rts_success = __le32_to_cpu(src->num_rts_success);
+        dst->num_rx_err = __le32_to_cpu(src->num_rx_err);
+        dst->num_rx_discard = __le32_to_cpu(src->num_rx_discard);
+        dst->num_tx_not_acked = __le32_to_cpu(src->num_tx_not_acked);
+
+        for (i = 0; i < ARRAY_SIZE(src->num_tx_frames); i++)
+                dst->num_tx_frames[i] =
+                        __le32_to_cpu(src->num_tx_frames[i]);
+
+        for (i = 0; i < ARRAY_SIZE(src->num_tx_frames_retries); i++)
+                dst->num_tx_frames_retries[i] =
+                        __le32_to_cpu(src->num_tx_frames_retries[i]);
+
+        for (i = 0; i < ARRAY_SIZE(src->num_tx_frames_failures); i++)
+                dst->num_tx_frames_failures[i] =
+                        __le32_to_cpu(src->num_tx_frames_failures[i]);
+
+        for (i = 0; i < ARRAY_SIZE(src->tx_rate_history); i++)
+                dst->tx_rate_history[i] =
+                        __le32_to_cpu(src->tx_rate_history[i]);
+
+        for (i = 0; i < ARRAY_SIZE(src->beacon_rssi_history); i++)
+                dst->beacon_rssi_history[i] =
+                        __le32_to_cpu(src->beacon_rssi_history[i]);
+}
+
 static int ath10k_wmi_tlv_op_pull_fw_stats(struct ath10k *ar,
                                            struct sk_buff *skb,
                                            struct ath10k_fw_stats *stats)
 {
         const void **tb;
-        const struct wmi_stats_event *ev;
+        const struct wmi_tlv_stats_ev *ev;
         const void *data;
-        u32 num_pdev_stats, num_vdev_stats, num_peer_stats;
+        u32 num_pdev_stats;
+        u32 num_vdev_stats;
+        u32 num_peer_stats;
+        u32 num_bcnflt_stats;
+        u32 num_chan_stats;
         size_t data_len;
         int ret;
+        int i;
 
         tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
         if (IS_ERR(tb)) {
@@ -899,8 +940,73 @@ static int ath10k_wmi_tlv_op_pull_fw_stats(struct ath10k *ar,
         num_pdev_stats = __le32_to_cpu(ev->num_pdev_stats);
         num_vdev_stats = __le32_to_cpu(ev->num_vdev_stats);
         num_peer_stats = __le32_to_cpu(ev->num_peer_stats);
+        num_bcnflt_stats = __le32_to_cpu(ev->num_bcnflt_stats);
+        num_chan_stats = __le32_to_cpu(ev->num_chan_stats);
+
+        ath10k_dbg(ar, ATH10K_DBG_WMI,
+                   "wmi tlv stats update pdev %i vdev %i peer %i bcnflt %i chan %i\n",
+                   num_pdev_stats, num_vdev_stats, num_peer_stats,
+                   num_bcnflt_stats, num_chan_stats);
+
+        for (i = 0; i < num_pdev_stats; i++) {
+                const struct wmi_pdev_stats *src;
+                struct ath10k_fw_stats_pdev *dst;
+
+                src = data;
+                if (data_len < sizeof(*src))
+                        return -EPROTO;
+
+                data += sizeof(*src);
+                data_len -= sizeof(*src);
+
+                dst = kzalloc(sizeof(*dst), GFP_ATOMIC);
+                if (!dst)
+                        continue;
+
+                ath10k_wmi_pull_pdev_stats_base(&src->base, dst);
+                ath10k_wmi_pull_pdev_stats_tx(&src->tx, dst);
+                ath10k_wmi_pull_pdev_stats_rx(&src->rx, dst);
+                list_add_tail(&dst->list, &stats->pdevs);
+        }
+
+        for (i = 0; i < num_vdev_stats; i++) {
+                const struct wmi_tlv_vdev_stats *src;
+                struct ath10k_fw_stats_vdev *dst;
+
+                src = data;
+                if (data_len < sizeof(*src))
+                        return -EPROTO;
+
+                data += sizeof(*src);
+                data_len -= sizeof(*src);
+
+                dst = kzalloc(sizeof(*dst), GFP_ATOMIC);
+                if (!dst)
+                        continue;
 
-        WARN_ON(1); /* FIXME: not implemented yet */
+                ath10k_wmi_tlv_pull_vdev_stats(src, dst);
+                list_add_tail(&dst->list, &stats->vdevs);
+        }
+
+        for (i = 0; i < num_peer_stats; i++) {
+                const struct wmi_10x_peer_stats *src;
+                struct ath10k_fw_stats_peer *dst;
+
+                src = data;
+                if (data_len < sizeof(*src))
+                        return -EPROTO;
+
+                data += sizeof(*src);
+                data_len -= sizeof(*src);
+
+                dst = kzalloc(sizeof(*dst), GFP_ATOMIC);
+                if (!dst)
+                        continue;
+
+                ath10k_wmi_pull_peer_stats(&src->old, dst);
+                dst->peer_rx_rate = __le32_to_cpu(src->peer_rx_rate);
+                list_add_tail(&dst->list, &stats->peers);
+        }
 
         kfree(tb);
         return 0;
@@ -1604,14 +1710,12 @@ ath10k_wmi_tlv_op_gen_vdev_wmm_conf(struct ath10k *ar, u32 vdev_id,
                                     const struct wmi_wmm_params_all_arg *arg)
 {
         struct wmi_tlv_vdev_set_wmm_cmd *cmd;
-        struct wmi_wmm_params *wmm;
         struct wmi_tlv *tlv;
         struct sk_buff *skb;
         size_t len;
         void *ptr;
 
-        len = (sizeof(*tlv) + sizeof(*cmd)) +
-              (4 * (sizeof(*tlv) + sizeof(*wmm)));
+        len = sizeof(*tlv) + sizeof(*cmd);
         skb = ath10k_wmi_alloc_skb(ar, len);
         if (!skb)
                 return ERR_PTR(-ENOMEM);
@@ -1623,13 +1727,10 @@ ath10k_wmi_tlv_op_gen_vdev_wmm_conf(struct ath10k *ar, u32 vdev_id,
         cmd = (void *)tlv->value;
         cmd->vdev_id = __cpu_to_le32(vdev_id);
 
-        ptr += sizeof(*tlv);
-        ptr += sizeof(*cmd);
-
-        ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_be);
-        ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_bk);
-        ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_vi);
-        ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_vo);
+        ath10k_wmi_set_wmm_param(&cmd->vdev_wmm_params[0].params, &arg->ac_be);
+        ath10k_wmi_set_wmm_param(&cmd->vdev_wmm_params[1].params, &arg->ac_bk);
+        ath10k_wmi_set_wmm_param(&cmd->vdev_wmm_params[2].params, &arg->ac_vi);
+        ath10k_wmi_set_wmm_param(&cmd->vdev_wmm_params[3].params, &arg->ac_vo);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev wmm conf\n");
         return skb;
@@ -2080,8 +2181,7 @@ ath10k_wmi_tlv_op_gen_pdev_set_wmm(struct ath10k *ar,
 }
 
 static struct sk_buff *
-ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar,
-                                    enum wmi_stats_id stats_id)
+ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar, u32 stats_mask)
 {
         struct wmi_request_stats_cmd *cmd;
         struct wmi_tlv *tlv;
@@ -2095,7 +2195,7 @@ ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar,
         tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_REQUEST_STATS_CMD);
         tlv->len = __cpu_to_le16(sizeof(*cmd));
         cmd = (void *)tlv->value;
-        cmd->stats_id = __cpu_to_le32(stats_id);
+        cmd->stats_id = __cpu_to_le32(stats_mask);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv request stats\n");
         return skb;
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
index de68fe76eae6..a6c8280cc4b1 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
@@ -1302,8 +1302,14 @@ struct wmi_tlv_pdev_set_wmm_cmd {
         __le32 dg_type; /* no idea.. */
 } __packed;
 
+struct wmi_tlv_vdev_wmm_params {
+        __le32 dummy;
+        struct wmi_wmm_params params;
+} __packed;
+
 struct wmi_tlv_vdev_set_wmm_cmd {
         __le32 vdev_id;
+        struct wmi_tlv_vdev_wmm_params vdev_wmm_params[4];
 } __packed;
 
 struct wmi_tlv_phyerr_ev {
@@ -1439,6 +1445,15 @@ struct wmi_tlv_sta_keepalive_cmd {
         __le32 interval; /* in seconds */
 } __packed;
 
+struct wmi_tlv_stats_ev {
+        __le32 stats_id; /* WMI_STAT_ */
+        __le32 num_pdev_stats;
+        __le32 num_vdev_stats;
+        __le32 num_peer_stats;
+        __le32 num_bcnflt_stats;
+        __le32 num_chan_stats;
+} __packed;
+
 void ath10k_wmi_tlv_attach(struct ath10k *ar);
 
 #endif
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index aeea1c793943..c7ea77edce24 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1125,6 +1125,25 @@ static void ath10k_wmi_event_scan_started(struct ath10k *ar)
         }
 }
 
+static void ath10k_wmi_event_scan_start_failed(struct ath10k *ar)
+{
+        lockdep_assert_held(&ar->data_lock);
+
+        switch (ar->scan.state) {
+        case ATH10K_SCAN_IDLE:
+        case ATH10K_SCAN_RUNNING:
+        case ATH10K_SCAN_ABORTING:
+                ath10k_warn(ar, "received scan start failed event in an invalid scan state: %s (%d)\n",
+                            ath10k_scan_state_str(ar->scan.state),
+                            ar->scan.state);
+                break;
+        case ATH10K_SCAN_STARTING:
+                complete(&ar->scan.started);
+                __ath10k_scan_finish(ar);
+                break;
+        }
+}
+
 static void ath10k_wmi_event_scan_completed(struct ath10k *ar)
 {
         lockdep_assert_held(&ar->data_lock);
@@ -1292,6 +1311,7 @@ int ath10k_wmi_event_scan(struct ath10k *ar, struct sk_buff *skb)
                 break;
         case WMI_SCAN_EVENT_START_FAILED:
                 ath10k_warn(ar, "received scan start failure event\n");
+                ath10k_wmi_event_scan_start_failed(ar);
                 break;
         case WMI_SCAN_EVENT_DEQUEUED:
         case WMI_SCAN_EVENT_PREEMPTED:
@@ -4954,7 +4974,7 @@ ath10k_wmi_op_gen_pdev_set_wmm(struct ath10k *ar,
 }
 
 static struct sk_buff *
-ath10k_wmi_op_gen_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
+ath10k_wmi_op_gen_request_stats(struct ath10k *ar, u32 stats_mask)
 {
         struct wmi_request_stats_cmd *cmd;
         struct sk_buff *skb;
@@ -4964,9 +4984,10 @@ ath10k_wmi_op_gen_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
                 return ERR_PTR(-ENOMEM);
 
         cmd = (struct wmi_request_stats_cmd *)skb->data;
-        cmd->stats_id = __cpu_to_le32(stats_id);
+        cmd->stats_id = __cpu_to_le32(stats_mask);
 
-        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi request stats %d\n", (int)stats_id);
+        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi request stats 0x%08x\n",
+                   stats_mask);
         return skb;
 }
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 20ce3603e64b..adf935bf0580 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -3057,8 +3057,12 @@ struct wmi_pdev_stats_peer {
 } __packed;
 
 enum wmi_stats_id {
-        WMI_REQUEST_PEER_STAT   = 0x01,
-        WMI_REQUEST_AP_STAT     = 0x02
+        WMI_STAT_PEER = BIT(0),
+        WMI_STAT_AP = BIT(1),
+        WMI_STAT_PDEV = BIT(2),
+        WMI_STAT_VDEV = BIT(3),
+        WMI_STAT_BCNFLT = BIT(4),
+        WMI_STAT_VDEV_RATE = BIT(5),
 };
 
 struct wlan_inst_rssi_args {
@@ -3093,7 +3097,7 @@ struct wmi_pdev_suspend_cmd {
 } __packed;
 
 struct wmi_stats_event {
-        __le32 stats_id; /* %WMI_REQUEST_ */
+        __le32 stats_id; /* WMI_STAT_ */
         /*
          * number of pdev stats event structures
          * (wmi_pdev_stats) 0 or 1
@@ -3745,6 +3749,11 @@ enum wmi_10x_vdev_param {
         WMI_10X_VDEV_PARAM_VHT80_RATEMASK,
 };
 
+#define WMI_VDEV_PARAM_TXBF_SU_TX_BFEE BIT(0)
+#define WMI_VDEV_PARAM_TXBF_MU_TX_BFEE BIT(1)
+#define WMI_VDEV_PARAM_TXBF_SU_TX_BFER BIT(2)
+#define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3)
+
 /* slot time long */
 #define WMI_VDEV_SLOT_TIME_LONG         0x1
 /* slot time short */
@@ -4436,7 +4445,8 @@ enum wmi_peer_param {
         WMI_PEER_AUTHORIZE  = 0x3,
         WMI_PEER_CHAN_WIDTH = 0x4,
         WMI_PEER_NSS        = 0x5,
-        WMI_PEER_USE_4ADDR  = 0x6
+        WMI_PEER_USE_4ADDR  = 0x6,
+        WMI_PEER_DUMMY_VAR  = 0xff, /* dummy parameter for STA PS workaround */
 };
 
 struct wmi_peer_set_param_cmd {
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 1ed7a88aeea9..7ca0d6f930fd 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -1283,6 +1283,7 @@ struct ath5k_hw {
 #define ATH_STAT_PROMISC        1
 #define ATH_STAT_LEDSOFT        2               /* enable LED gpio status */
 #define ATH_STAT_STARTED        3               /* opened & irqs enabled */
+#define ATH_STAT_RESET          4               /* hw reset */
 
         unsigned int            filter_flags;   /* HW flags, AR5K_RX_FILTER_* */
         unsigned int            fif_filter_flags; /* Current FIF_* filter flags */
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index bc9cb356fa69..a6131825c9f6 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -528,7 +528,7 @@ ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah,
          * together with the BSSID mask when matching addresses.
          */
         iter_data.hw_macaddr = common->macaddr;
-        memset(&iter_data.mask, 0xff, ETH_ALEN);
+        eth_broadcast_addr(iter_data.mask);
         iter_data.found_active = false;
         iter_data.need_set_hw_addr = true;
         iter_data.opmode = NL80211_IFTYPE_UNSPECIFIED;
@@ -1523,6 +1523,9 @@ ath5k_set_current_imask(struct ath5k_hw *ah)
         enum ath5k_int imask;
         unsigned long flags;
 
+        if (test_bit(ATH_STAT_RESET, ah->status))
+                return;
+
         spin_lock_irqsave(&ah->irqlock, flags);
         imask = ah->imask;
         if (ah->rx_pending)
@@ -2858,10 +2861,12 @@ ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan,
 {
         struct ath_common *common = ath5k_hw_common(ah);
         int ret, ani_mode;
-        bool fast;
+        bool fast = chan && modparam_fastchanswitch ? 1 : 0;
 
         ATH5K_DBG(ah, ATH5K_DEBUG_RESET, "resetting\n");
 
+        __set_bit(ATH_STAT_RESET, ah->status);
+
         ath5k_hw_set_imr(ah, 0);
         synchronize_irq(ah->irq);
         ath5k_stop_tasklets(ah);
@@ -2876,11 +2881,29 @@ ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan,
          * so we should also free any remaining
          * tx buffers */
         ath5k_drain_tx_buffs(ah);
+
+        /* Stop PCU */
+        ath5k_hw_stop_rx_pcu(ah);
+
+        /* Stop DMA
+         *
+         * Note: If DMA didn't stop continue
+         * since only a reset will fix it.
+         */
+        ret = ath5k_hw_dma_stop(ah);
+
+        /* RF Bus grant won't work if we have pending
+         * frames
+         */
+        if (ret && fast) {
+                ATH5K_DBG(ah, ATH5K_DEBUG_RESET,
+                          "DMA didn't stop, falling back to normal reset\n");
+                fast = false;
+        }
+
         if (chan)
                 ah->curchan = chan;
 
-        fast = ((chan != NULL) && modparam_fastchanswitch) ? 1 : 0;
-
         ret = ath5k_hw_reset(ah, ah->opmode, ah->curchan, fast, skip_pcu);
         if (ret) {
                 ATH5K_ERR(ah, "can't reset hardware (%d)\n", ret);
@@ -2934,6 +2957,8 @@ ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan,
          */
 /*      ath5k_chan_change(ah, c); */
 
+        __clear_bit(ATH_STAT_RESET, ah->status);
+
         ath5k_beacon_config(ah);
         /* intrs are enabled by ath5k_beacon_config */
 
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index b9b651ea9851..99e62f99a182 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -1169,30 +1169,6 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
         if (ah->ah_version == AR5K_AR5212)
                 ath5k_hw_set_sleep_clock(ah, false);
 
-        /*
-         * Stop PCU
-         */
-        ath5k_hw_stop_rx_pcu(ah);
-
-        /*
-         * Stop DMA
-         *
-         * Note: If DMA didn't stop continue
-         * since only a reset will fix it.
-         */
-        ret = ath5k_hw_dma_stop(ah);
-
-        /* RF Bus grant won't work if we have pending
-         * frames */
-        if (ret && fast) {
-                ATH5K_DBG(ah, ATH5K_DEBUG_RESET,
-                        "DMA didn't stop, falling back to normal reset\n");
-                fast = false;
-                /* Non fatal, just continue with
-                 * normal reset */
-                ret = 0;
-        }
-
         mode = channel->hw_value;
         switch (mode) {
         case AR5K_MODE_11A:
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 85da63a67faf..cce4625a53ad 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -686,20 +686,21 @@ ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,
 {
         struct ath6kl *ar = vif->ar;
         struct cfg80211_bss *bss;
-        u16 cap_mask, cap_val;
+        u16 cap_val;
+        enum ieee80211_bss_type bss_type;
         u8 *ie;
 
         if (nw_type & ADHOC_NETWORK) {
-                cap_mask = WLAN_CAPABILITY_IBSS;
                 cap_val = WLAN_CAPABILITY_IBSS;
+                bss_type = IEEE80211_BSS_TYPE_IBSS;
         } else {
-                cap_mask = WLAN_CAPABILITY_ESS;
                 cap_val = WLAN_CAPABILITY_ESS;
+                bss_type = IEEE80211_BSS_TYPE_ESS;
         }
 
         bss = cfg80211_get_bss(ar->wiphy, chan, bssid,
                                vif->ssid, vif->ssid_len,
-                               cap_mask, cap_val);
+                               bss_type, IEEE80211_PRIVACY_ANY);
         if (bss == NULL) {
                 /*
                  * Since cfg80211 may not yet know about the BSS,
@@ -1495,6 +1496,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 
 static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,
                                                       const char *name,
+                                                      unsigned char name_assign_type,
                                                       enum nl80211_iftype type,
                                                       u32 *flags,
                                                       struct vif_params *params)
@@ -1513,7 +1515,7 @@ static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,
                 return ERR_PTR(-EINVAL);
         }
 
-        wdev = ath6kl_interface_add(ar, name, type, if_idx, nw_type);
+        wdev = ath6kl_interface_add(ar, name, name_assign_type, type, if_idx, nw_type);
         if (!wdev)
                 return ERR_PTR(-ENOMEM);
 
@@ -2033,7 +2035,7 @@ static int ath6kl_wow_sta(struct ath6kl *ar, struct ath6kl_vif *vif)
         int ret;
 
         /* Setup unicast pkt pattern */
-        memset(mac_mask, 0xff, ETH_ALEN);
+        eth_broadcast_addr(mac_mask);
         ret = ath6kl_wmi_add_wow_pattern_cmd(ar->wmi,
                                 vif->fw_vif_idx, WOW_LIST_ID,
                                 ETH_ALEN, 0, ndev->dev_addr,
@@ -3633,13 +3635,14 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif)
 }
 
 struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
+                                          unsigned char name_assign_type,
                                           enum nl80211_iftype type,
                                           u8 fw_vif_idx, u8 nw_type)
 {
         struct net_device *ndev;
         struct ath6kl_vif *vif;
 
-        ndev = alloc_netdev(sizeof(*vif), name, NET_NAME_UNKNOWN, ether_setup);
+        ndev = alloc_netdev(sizeof(*vif), name, name_assign_type, ether_setup);
         if (!ndev)
                 return NULL;
 
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h
index b59becd91aea..5aa57a7639bf 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.h
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h
@@ -25,6 +25,7 @@ enum ath6kl_cfg_suspend_mode {
 };
 
 struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
+                                          unsigned char name_assign_type,
                                           enum nl80211_iftype type,
                                           u8 fw_vif_idx, u8 nw_type);
 void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,
diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c
index 0df74b245af4..4ec02cea0f43 100644
--- a/drivers/net/wireless/ath/ath6kl/core.c
+++ b/drivers/net/wireless/ath/ath6kl/core.c
@@ -211,8 +211,8 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)
         rtnl_lock();
 
         /* Add an initial station interface */
-        wdev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,
-                                    INFRA_NETWORK);
+        wdev = ath6kl_interface_add(ar, "wlan%d", NET_NAME_ENUM,
+                                    NL80211_IFTYPE_STATION, 0, INFRA_NETWORK);
 
         rtnl_unlock();
 
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index b42ba46b5030..1af3fed5a72c 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -105,7 +105,7 @@ static void ath6kl_sta_cleanup(struct ath6kl *ar, u8 i)
 
         memset(&ar->ap_stats.sta[sta->aid - 1], 0,
                sizeof(struct wmi_per_sta_stat));
-        memset(sta->mac, 0, ETH_ALEN);
+        eth_zero_addr(sta->mac);
         memset(sta->wpa_ie, 0, ATH6KL_MAX_IE);
         sta->aid = 0;
         sta->sta_flags = 0;
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 473972288a84..ecda613c2d54 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -46,7 +46,8 @@ ath9k_hw-y:=	\
 ath9k_hw-$(CONFIG_ATH9K_WOW) += ar9003_wow.o
 
 ath9k_hw-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += btcoex.o \
-                                           ar9003_mci.o
+                                           ar9003_mci.o \
+                                           ar9003_aic.o
 
 ath9k_hw-$(CONFIG_ATH9K_PCOEM) += ar9003_rtt.o
 
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index ca01d17d130f..25e45e4d1a60 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -107,11 +107,21 @@ static const struct ani_cck_level_entry cck_level_table[] = {
 static void ath9k_hw_update_mibstats(struct ath_hw *ah,
                                      struct ath9k_mib_stats *stats)
 {
-        stats->ackrcv_bad += REG_READ(ah, AR_ACK_FAIL);
-        stats->rts_bad += REG_READ(ah, AR_RTS_FAIL);
-        stats->fcs_bad += REG_READ(ah, AR_FCS_FAIL);
-        stats->rts_good += REG_READ(ah, AR_RTS_OK);
-        stats->beacons += REG_READ(ah, AR_BEACON_CNT);
+        u32 addr[5] = {AR_RTS_OK, AR_RTS_FAIL, AR_ACK_FAIL,
+                       AR_FCS_FAIL, AR_BEACON_CNT};
+        u32 data[5];
+
+        REG_READ_MULTI(ah, &addr[0], &data[0], 5);
+        /* AR_RTS_OK */
+        stats->rts_good += data[0];
+        /* AR_RTS_FAIL */
+        stats->rts_bad += data[1];
+        /* AR_ACK_FAIL */
+        stats->ackrcv_bad += data[2];
+        /* AR_FCS_FAIL */
+        stats->fcs_bad += data[3];
+        /* AR_BEACON_CNT */
+        stats->beacons += data[4];
 }
 
 static void ath9k_ani_restart(struct ath_hw *ah)
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index f273427fdd29..6c23d279525f 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -681,12 +681,13 @@ static void ar5008_hw_set_channel_regs(struct ath_hw *ah,
                         phymode |= AR_PHY_FC_DYN2040_PRI_CH;
 
         }
+        ENABLE_REGWRITE_BUFFER(ah);
         REG_WRITE(ah, AR_PHY_TURBO, phymode);
 
+        /* This function do only REG_WRITE, so
+         * we can include it to REGWRITE_BUFFER. */
         ath9k_hw_set11nmac2040(ah, chan);
 
-        ENABLE_REGWRITE_BUFFER(ah);
-
         REG_WRITE(ah, AR_GTXTO, 25 << AR_GTXTO_TIMEOUT_LIMIT_S);
         REG_WRITE(ah, AR_CST, 0xF << AR_CST_TIMEOUT_LIMIT_S);
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 42190b67c671..50fcd343c41a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -430,46 +430,43 @@ static void ar9271_hw_pa_cal(struct ath_hw *ah, bool is_reset)
         u32 regVal;
         unsigned int i;
         u32 regList[][2] = {
-                { 0x786c, 0 },
-                { 0x7854, 0 },
-                { 0x7820, 0 },
-                { 0x7824, 0 },
-                { 0x7868, 0 },
-                { 0x783c, 0 },
-                { 0x7838, 0 } ,
-                { 0x7828, 0 } ,
+                { AR9285_AN_TOP3, 0 },
+                { AR9285_AN_RXTXBB1, 0 },
+                { AR9285_AN_RF2G1, 0 },
+                { AR9285_AN_RF2G2, 0 },
+                { AR9285_AN_TOP2, 0 },
+                { AR9285_AN_RF2G8, 0 },
+                { AR9285_AN_RF2G7, 0 },
+                { AR9285_AN_RF2G3, 0 },
         };
 
-        for (i = 0; i < ARRAY_SIZE(regList); i++)
-                regList[i][1] = REG_READ(ah, regList[i][0]);
-
-        regVal = REG_READ(ah, 0x7834);
-        regVal &= (~(0x1));
-        REG_WRITE(ah, 0x7834, regVal);
-        regVal = REG_READ(ah, 0x9808);
-        regVal |= (0x1 << 27);
-        REG_WRITE(ah, 0x9808, regVal);
+        REG_READ_ARRAY(ah, regList, ARRAY_SIZE(regList));
 
+        ENABLE_REG_RMW_BUFFER(ah);
+        /* 7834, b1=0 */
+        REG_CLR_BIT(ah, AR9285_AN_RF2G6, 1 << 0);
+        /* 9808, b27=1 */
+        REG_SET_BIT(ah, 0x9808, 1 << 27);
         /* 786c,b23,1, pwddac=1 */
-        REG_RMW_FIELD(ah, AR9285_AN_TOP3, AR9285_AN_TOP3_PWDDAC, 1);
+        REG_SET_BIT(ah, AR9285_AN_TOP3, AR9285_AN_TOP3_PWDDAC);
         /* 7854, b5,1, pdrxtxbb=1 */
-        REG_RMW_FIELD(ah, AR9285_AN_RXTXBB1, AR9285_AN_RXTXBB1_PDRXTXBB1, 1);
+        REG_SET_BIT(ah, AR9285_AN_RXTXBB1, AR9285_AN_RXTXBB1_PDRXTXBB1);
         /* 7854, b7,1, pdv2i=1 */
-        REG_RMW_FIELD(ah, AR9285_AN_RXTXBB1, AR9285_AN_RXTXBB1_PDV2I, 1);
+        REG_SET_BIT(ah, AR9285_AN_RXTXBB1, AR9285_AN_RXTXBB1_PDV2I);
         /* 7854, b8,1, pddacinterface=1 */
-        REG_RMW_FIELD(ah, AR9285_AN_RXTXBB1, AR9285_AN_RXTXBB1_PDDACIF, 1);
+        REG_SET_BIT(ah, AR9285_AN_RXTXBB1, AR9285_AN_RXTXBB1_PDDACIF);
         /* 7824,b12,0, offcal=0 */
-        REG_RMW_FIELD(ah, AR9285_AN_RF2G2, AR9285_AN_RF2G2_OFFCAL, 0);
+        REG_CLR_BIT(ah, AR9285_AN_RF2G2, AR9285_AN_RF2G2_OFFCAL);
         /* 7838, b1,0, pwddb=0 */
-        REG_RMW_FIELD(ah, AR9285_AN_RF2G7, AR9285_AN_RF2G7_PWDDB, 0);
+        REG_CLR_BIT(ah, AR9285_AN_RF2G7, AR9285_AN_RF2G7_PWDDB);
         /* 7820,b11,0, enpacal=0 */
-        REG_RMW_FIELD(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_ENPACAL, 0);
+        REG_CLR_BIT(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_ENPACAL);
         /* 7820,b25,1, pdpadrv1=0 */
-        REG_RMW_FIELD(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_PDPADRV1, 0);
+        REG_CLR_BIT(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_PDPADRV1);
         /* 7820,b24,0, pdpadrv2=0 */
-        REG_RMW_FIELD(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_PDPADRV2, 0);
+        REG_CLR_BIT(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_PDPADRV2);
         /* 7820,b23,0, pdpaout=0 */
-        REG_RMW_FIELD(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_PDPAOUT, 0);
+        REG_CLR_BIT(ah, AR9285_AN_RF2G1, AR9285_AN_RF2G1_PDPAOUT);
         /* 783c,b14-16,7, padrvgn2tab_0=7 */
         REG_RMW_FIELD(ah, AR9285_AN_RF2G8, AR9285_AN_RF2G8_PADRVGN2TAB0, 7);
         /*
@@ -477,8 +474,9 @@ static void ar9271_hw_pa_cal(struct ath_hw *ah, bool is_reset)
          * does not matter since we turn it off
          */
         REG_RMW_FIELD(ah, AR9285_AN_RF2G7, AR9285_AN_RF2G7_PADRVGN2TAB0, 0);
-
+        /* 7828, b0-11, ccom=fff */
         REG_RMW_FIELD(ah, AR9285_AN_RF2G3, AR9271_AN_RF2G3_CCOMP, 0xfff);
+        REG_RMW_BUFFER_FLUSH(ah);
 
         /* Set:
          * localmode=1,bmode=1,bmoderxtx=1,synthon=1,
@@ -490,15 +488,16 @@ static void ar9271_hw_pa_cal(struct ath_hw *ah, bool is_reset)
 
         /* find off_6_1; */
         for (i = 6; i > 0; i--) {
-                regVal = REG_READ(ah, 0x7834);
+                regVal = REG_READ(ah, AR9285_AN_RF2G6);
                 regVal |= (1 << (20 + i));
-                REG_WRITE(ah, 0x7834, regVal);
+                REG_WRITE(ah, AR9285_AN_RF2G6, regVal);
                 udelay(1);
                 /* regVal = REG_READ(ah, 0x7834); */
                 regVal &= (~(0x1 << (20 + i)));
-                regVal |= (MS(REG_READ(ah, 0x7840), AR9285_AN_RXTXBB1_SPARE9)
+                regVal |= (MS(REG_READ(ah, AR9285_AN_RF2G9),
+                              AR9285_AN_RXTXBB1_SPARE9)
                             << (20 + i));
-                REG_WRITE(ah, 0x7834, regVal);
+                REG_WRITE(ah, AR9285_AN_RF2G6, regVal);
         }
 
         regVal = (regVal >> 20) & 0x7f;
@@ -515,15 +514,15 @@ static void ar9271_hw_pa_cal(struct ath_hw *ah, bool is_reset)
                 ah->pacal_info.prev_offset = regVal;
         }
 
-        ENABLE_REGWRITE_BUFFER(ah);
 
-        regVal = REG_READ(ah, 0x7834);
-        regVal |= 0x1;
-        REG_WRITE(ah, 0x7834, regVal);
-        regVal = REG_READ(ah, 0x9808);
-        regVal &= (~(0x1 << 27));
-        REG_WRITE(ah, 0x9808, regVal);
+        ENABLE_REG_RMW_BUFFER(ah);
+        /* 7834, b1=1 */
+        REG_SET_BIT(ah, AR9285_AN_RF2G6, 1 << 0);
+        /* 9808, b27=0 */
+        REG_CLR_BIT(ah, 0x9808, 1 << 27);
+        REG_RMW_BUFFER_FLUSH(ah);
 
+        ENABLE_REGWRITE_BUFFER(ah);
         for (i = 0; i < ARRAY_SIZE(regList); i++)
                 REG_WRITE(ah, regList[i][0], regList[i][1]);
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_aic.c b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
new file mode 100644
index 000000000000..1db119d77783
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
@@ -0,0 +1,599 @@
+/*
+ * Copyright (c) 2015 Qualcomm Atheros Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "hw.h"
+#include "hw-ops.h"
+#include "ar9003_mci.h"
+#include "ar9003_aic.h"
+#include "ar9003_phy.h"
+#include "reg_aic.h"
+
+static const u8 com_att_db_table[ATH_AIC_MAX_COM_ATT_DB_TABLE] = {
+        0, 3, 9, 15, 21, 27
+};
+
+static const u16 aic_lin_table[ATH_AIC_MAX_AIC_LIN_TABLE] = {
+        8191, 7300, 6506, 5799, 5168, 4606, 4105, 3659,
+        3261, 2906, 2590, 2309, 2057, 1834, 1634, 1457,
+        1298, 1157, 1031, 919,  819,  730,  651,  580,
+        517,  461,  411,  366,  326,  291,  259,  231,
+        206,  183,  163,  146,  130,  116,  103,  92,
+        82,   73,   65,   58,   52,   46,   41,   37,
+        33,   29,   26,   23,   21,   18,   16,   15,
+        13,   12,   10,   9,    8,    7,    7,    6,
+        5,    5,    4,    4,    3
+};
+
+static bool ar9003_hw_is_aic_enabled(struct ath_hw *ah)
+{
+        struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
+
+        /*
+         * Disable AIC for now, until we have all the
+         * HW code and the driver-layer support ready.
+         */
+        return false;
+
+        if (mci_hw->config & ATH_MCI_CONFIG_DISABLE_AIC)
+                return false;
+
+        return true;
+}
+
+static int16_t ar9003_aic_find_valid(struct ath_aic_sram_info *cal_sram,
+                                     bool dir, u8 index)
+{
+        int16_t i;
+
+        if (dir) {
+                for (i = index + 1; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                        if (cal_sram[i].valid)
+                                break;
+                }
+        } else {
+                for (i = index - 1; i >= 0; i--) {
+                        if (cal_sram[i].valid)
+                                break;
+                }
+        }
+
+        if ((i >= ATH_AIC_MAX_BT_CHANNEL) || (i < 0))
+                i = -1;
+
+        return i;
+}
+
+/*
+ * type 0: aic_lin_table, 1: com_att_db_table
+ */
+static int16_t ar9003_aic_find_index(u8 type, int16_t value)
+{
+        int16_t i = -1;
+
+        if (type == 0) {
+                for (i = ATH_AIC_MAX_AIC_LIN_TABLE - 1; i >= 0; i--) {
+                        if (aic_lin_table[i] >= value)
+                                break;
+                }
+        } else if (type == 1) {
+                for (i = 0; i < ATH_AIC_MAX_COM_ATT_DB_TABLE; i++) {
+                        if (com_att_db_table[i] > value) {
+                                i--;
+                                break;
+                        }
+                }
+
+                if (i >= ATH_AIC_MAX_COM_ATT_DB_TABLE)
+                        i = -1;
+        }
+
+        return i;
+}
+
+static void ar9003_aic_gain_table(struct ath_hw *ah)
+{
+        u32 aic_atten_word[19], i;
+
+        /* Config LNA gain difference */
+        REG_WRITE(ah, AR_PHY_BT_COEX_4, 0x2c200a00);
+        REG_WRITE(ah, AR_PHY_BT_COEX_5, 0x5c4e4438);
+
+        /* Program gain table */
+        aic_atten_word[0] = (0x1 & 0xf) << 14 | (0x1f & 0x1f) << 9 | (0x0 & 0xf) << 5 |
+                (0x1f & 0x1f); /* -01 dB: 4'd1, 5'd31,  00 dB: 4'd0, 5'd31 */
+        aic_atten_word[1] = (0x3 & 0xf) << 14 | (0x1f & 0x1f) << 9 | (0x2 & 0xf) << 5 |
+                (0x1f & 0x1f); /* -03 dB: 4'd3, 5'd31, -02 dB: 4'd2, 5'd31 */
+        aic_atten_word[2] = (0x5 & 0xf) << 14 | (0x1f & 0x1f) << 9 | (0x4 & 0xf) << 5 |
+                (0x1f & 0x1f); /* -05 dB: 4'd5, 5'd31, -04 dB: 4'd4, 5'd31 */
+        aic_atten_word[3] = (0x1 & 0xf) << 14 | (0x1e & 0x1f) << 9 | (0x0 & 0xf) << 5 |
+                (0x1e & 0x1f); /* -07 dB: 4'd1, 5'd30, -06 dB: 4'd0, 5'd30 */
+        aic_atten_word[4] = (0x3 & 0xf) << 14 | (0x1e & 0x1f) << 9 | (0x2 & 0xf) << 5 |
+                (0x1e & 0x1f); /* -09 dB: 4'd3, 5'd30, -08 dB: 4'd2, 5'd30 */
+        aic_atten_word[5] = (0x5 & 0xf) << 14 | (0x1e & 0x1f) << 9 | (0x4 & 0xf) << 5 |
+                (0x1e & 0x1f); /* -11 dB: 4'd5, 5'd30, -10 dB: 4'd4, 5'd30 */
+        aic_atten_word[6] = (0x1 & 0xf) << 14 | (0xf & 0x1f) << 9  | (0x0 & 0xf) << 5 |
+                (0xf & 0x1f);  /* -13 dB: 4'd1, 5'd15, -12 dB: 4'd0, 5'd15 */
+        aic_atten_word[7] = (0x3 & 0xf) << 14 | (0xf & 0x1f) << 9  | (0x2 & 0xf) << 5 |
+                (0xf & 0x1f);  /* -15 dB: 4'd3, 5'd15, -14 dB: 4'd2, 5'd15 */
+        aic_atten_word[8] = (0x5 & 0xf) << 14 | (0xf & 0x1f) << 9  | (0x4 & 0xf) << 5 |
+                (0xf & 0x1f);  /* -17 dB: 4'd5, 5'd15, -16 dB: 4'd4, 5'd15 */
+        aic_atten_word[9] = (0x1 & 0xf) << 14 | (0x7 & 0x1f) << 9  | (0x0 & 0xf) << 5 |
+                (0x7 & 0x1f);  /* -19 dB: 4'd1, 5'd07, -18 dB: 4'd0, 5'd07 */
+        aic_atten_word[10] = (0x3 & 0xf) << 14 | (0x7 & 0x1f) << 9  | (0x2 & 0xf) << 5 |
+                (0x7 & 0x1f);  /* -21 dB: 4'd3, 5'd07, -20 dB: 4'd2, 5'd07 */
+        aic_atten_word[11] = (0x5 & 0xf) << 14 | (0x7 & 0x1f) << 9  | (0x4 & 0xf) << 5 |
+                (0x7 & 0x1f);  /* -23 dB: 4'd5, 5'd07, -22 dB: 4'd4, 5'd07 */
+        aic_atten_word[12] = (0x7 & 0xf) << 14 | (0x7 & 0x1f) << 9  | (0x6 & 0xf) << 5 |
+                (0x7 & 0x1f);  /* -25 dB: 4'd7, 5'd07, -24 dB: 4'd6, 5'd07 */
+        aic_atten_word[13] = (0x3 & 0xf) << 14 | (0x3 & 0x1f) << 9  | (0x2 & 0xf) << 5 |
+                (0x3 & 0x1f);  /* -27 dB: 4'd3, 5'd03, -26 dB: 4'd2, 5'd03 */
+        aic_atten_word[14] = (0x5 & 0xf) << 14 | (0x3 & 0x1f) << 9  | (0x4 & 0xf) << 5 |
+                (0x3 & 0x1f);  /* -29 dB: 4'd5, 5'd03, -28 dB: 4'd4, 5'd03 */
+        aic_atten_word[15] = (0x1 & 0xf) << 14 | (0x1 & 0x1f) << 9  | (0x0 & 0xf) << 5 |
+                (0x1 & 0x1f);  /* -31 dB: 4'd1, 5'd01, -30 dB: 4'd0, 5'd01 */
+        aic_atten_word[16] = (0x3 & 0xf) << 14 | (0x1 & 0x1f) << 9  | (0x2 & 0xf) << 5 |
+                (0x1 & 0x1f);  /* -33 dB: 4'd3, 5'd01, -32 dB: 4'd2, 5'd01 */
+        aic_atten_word[17] = (0x5 & 0xf) << 14 | (0x1 & 0x1f) << 9  | (0x4 & 0xf) << 5 |
+                (0x1 & 0x1f);  /* -35 dB: 4'd5, 5'd01, -34 dB: 4'd4, 5'd01 */
+        aic_atten_word[18] = (0x7 & 0xf) << 14 | (0x1 & 0x1f) << 9  | (0x6 & 0xf) << 5 |
+                (0x1 & 0x1f);  /* -37 dB: 4'd7, 5'd01, -36 dB: 4'd6, 5'd01 */
+
+        /* Write to Gain table with auto increment enabled. */
+        REG_WRITE(ah, (AR_PHY_AIC_SRAM_ADDR_B0 + 0x3000),
+                  (ATH_AIC_SRAM_AUTO_INCREMENT |
+                   ATH_AIC_SRAM_GAIN_TABLE_OFFSET));
+
+        for (i = 0; i < 19; i++) {
+                REG_WRITE(ah, (AR_PHY_AIC_SRAM_DATA_B0 + 0x3000),
+                          aic_atten_word[i]);
+        }
+}
+
+static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)
+{
+        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+        int i;
+
+        /* Write to Gain table with auto increment enabled. */
+        REG_WRITE(ah, (AR_PHY_AIC_SRAM_ADDR_B0 + 0x3000),
+                  (ATH_AIC_SRAM_AUTO_INCREMENT |
+                   ATH_AIC_SRAM_CAL_OFFSET));
+
+        for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                REG_WRITE(ah, (AR_PHY_AIC_SRAM_DATA_B0 + 0x3000), 0);
+                aic->aic_sram[i] = 0;
+        }
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_0_B0,
+                  (SM(0, AR_PHY_AIC_MON_ENABLE) |
+                   SM(127, AR_PHY_AIC_CAL_MAX_HOP_COUNT) |
+                   SM(min_valid_count, AR_PHY_AIC_CAL_MIN_VALID_COUNT) |
+                   SM(37, AR_PHY_AIC_F_WLAN) |
+                   SM(1, AR_PHY_AIC_CAL_CH_VALID_RESET) |
+                   SM(0, AR_PHY_AIC_CAL_ENABLE) |
+                   SM(0x40, AR_PHY_AIC_BTTX_PWR_THR) |
+                   SM(0, AR_PHY_AIC_ENABLE)));
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_0_B1,
+                  (SM(0, AR_PHY_AIC_MON_ENABLE) |
+                   SM(1, AR_PHY_AIC_CAL_CH_VALID_RESET) |
+                   SM(0, AR_PHY_AIC_CAL_ENABLE) |
+                   SM(0x40, AR_PHY_AIC_BTTX_PWR_THR) |
+                   SM(0, AR_PHY_AIC_ENABLE)));
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_1_B0,
+                  (SM(8, AR_PHY_AIC_CAL_BT_REF_DELAY) |
+                   SM(0, AR_PHY_AIC_BT_IDLE_CFG) |
+                   SM(1, AR_PHY_AIC_STDBY_COND) |
+                   SM(37, AR_PHY_AIC_STDBY_ROT_ATT_DB) |
+                   SM(5, AR_PHY_AIC_STDBY_COM_ATT_DB) |
+                   SM(15, AR_PHY_AIC_RSSI_MAX) |
+                   SM(0, AR_PHY_AIC_RSSI_MIN)));
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_1_B1,
+                  (SM(15, AR_PHY_AIC_RSSI_MAX) |
+                   SM(0, AR_PHY_AIC_RSSI_MIN)));
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_2_B0,
+                  (SM(44, AR_PHY_AIC_RADIO_DELAY) |
+                   SM(8, AR_PHY_AIC_CAL_STEP_SIZE_CORR) |
+                   SM(12, AR_PHY_AIC_CAL_ROT_IDX_CORR) |
+                   SM(2, AR_PHY_AIC_CAL_CONV_CHECK_FACTOR) |
+                   SM(5, AR_PHY_AIC_ROT_IDX_COUNT_MAX) |
+                   SM(0, AR_PHY_AIC_CAL_SYNTH_TOGGLE) |
+                   SM(0, AR_PHY_AIC_CAL_SYNTH_AFTER_BTRX) |
+                   SM(200, AR_PHY_AIC_CAL_SYNTH_SETTLING)));
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_3_B0,
+                  (SM(2, AR_PHY_AIC_MON_MAX_HOP_COUNT) |
+                   SM(1, AR_PHY_AIC_MON_MIN_STALE_COUNT) |
+                   SM(1, AR_PHY_AIC_MON_PWR_EST_LONG) |
+                   SM(2, AR_PHY_AIC_MON_PD_TALLY_SCALING) |
+                   SM(10, AR_PHY_AIC_MON_PERF_THR) |
+                   SM(2, AR_PHY_AIC_CAL_TARGET_MAG_SETTING) |
+                   SM(1, AR_PHY_AIC_CAL_PERF_CHECK_FACTOR) |
+                   SM(1, AR_PHY_AIC_CAL_PWR_EST_LONG)));
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_4_B0,
+                  (SM(2, AR_PHY_AIC_CAL_ROT_ATT_DB_EST_ISO) |
+                   SM(3, AR_PHY_AIC_CAL_COM_ATT_DB_EST_ISO) |
+                   SM(0, AR_PHY_AIC_CAL_ISO_EST_INIT_SETTING) |
+                   SM(2, AR_PHY_AIC_CAL_COM_ATT_DB_BACKOFF) |
+                   SM(1, AR_PHY_AIC_CAL_COM_ATT_DB_FIXED)));
+
+        REG_WRITE(ah, AR_PHY_AIC_CTRL_4_B1,
+                  (SM(2, AR_PHY_AIC_CAL_ROT_ATT_DB_EST_ISO) |
+                   SM(3, AR_PHY_AIC_CAL_COM_ATT_DB_EST_ISO) |
+                   SM(0, AR_PHY_AIC_CAL_ISO_EST_INIT_SETTING) |
+                   SM(2, AR_PHY_AIC_CAL_COM_ATT_DB_BACKOFF) |
+                   SM(1, AR_PHY_AIC_CAL_COM_ATT_DB_FIXED)));
+
+        ar9003_aic_gain_table(ah);
+
+        /* Need to enable AIC reference signal in BT modem. */
+        REG_WRITE(ah, ATH_AIC_BT_JUPITER_CTRL,
+                  (REG_READ(ah, ATH_AIC_BT_JUPITER_CTRL) |
+                   ATH_AIC_BT_AIC_ENABLE));
+
+        aic->aic_cal_start_time = REG_READ(ah, AR_TSF_L32);
+
+        /* Start calibration */
+        REG_CLR_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
+        REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_CH_VALID_RESET);
+        REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
+
+        aic->aic_caled_chan = 0;
+        aic->aic_cal_state = AIC_CAL_STATE_STARTED;
+
+        return aic->aic_cal_state;
+}
+
+static bool ar9003_aic_cal_post_process(struct ath_hw *ah)
+{
+        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+        struct ath_aic_sram_info cal_sram[ATH_AIC_MAX_BT_CHANNEL];
+        struct ath_aic_out_info aic_sram[ATH_AIC_MAX_BT_CHANNEL];
+        u32 dir_path_gain_idx, quad_path_gain_idx, value;
+        u32 fixed_com_att_db;
+        int8_t dir_path_sign, quad_path_sign;
+        int16_t i;
+        bool ret = true;
+
+        memset(&cal_sram, 0, sizeof(cal_sram));
+        memset(&aic_sram, 0, sizeof(aic_sram));
+
+        for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                value = aic->aic_sram[i];
+
+                cal_sram[i].valid =
+                        MS(value, AR_PHY_AIC_SRAM_VALID);
+                cal_sram[i].rot_quad_att_db =
+                        MS(value, AR_PHY_AIC_SRAM_ROT_QUAD_ATT_DB);
+                cal_sram[i].vga_quad_sign =
+                        MS(value, AR_PHY_AIC_SRAM_VGA_QUAD_SIGN);
+                cal_sram[i].rot_dir_att_db =
+                        MS(value, AR_PHY_AIC_SRAM_ROT_DIR_ATT_DB);
+                cal_sram[i].vga_dir_sign =
+                        MS(value, AR_PHY_AIC_SRAM_VGA_DIR_SIGN);
+                cal_sram[i].com_att_6db =
+                        MS(value, AR_PHY_AIC_SRAM_COM_ATT_6DB);
+
+                if (cal_sram[i].valid) {
+                        dir_path_gain_idx = cal_sram[i].rot_dir_att_db +
+                                com_att_db_table[cal_sram[i].com_att_6db];
+                        quad_path_gain_idx = cal_sram[i].rot_quad_att_db +
+                                com_att_db_table[cal_sram[i].com_att_6db];
+
+                        dir_path_sign = (cal_sram[i].vga_dir_sign) ? 1 : -1;
+                        quad_path_sign = (cal_sram[i].vga_quad_sign) ? 1 : -1;
+
+                        aic_sram[i].dir_path_gain_lin = dir_path_sign *
+                                aic_lin_table[dir_path_gain_idx];
+                        aic_sram[i].quad_path_gain_lin = quad_path_sign *
+                                aic_lin_table[quad_path_gain_idx];
+                }
+        }
+
+        for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                int16_t start_idx, end_idx;
+
+                if (cal_sram[i].valid)
+                        continue;
+
+                start_idx = ar9003_aic_find_valid(cal_sram, 0, i);
+                end_idx = ar9003_aic_find_valid(cal_sram, 1, i);
+
+                if (start_idx < 0) {
+                        /* extrapolation */
+                        start_idx = end_idx;
+                        end_idx = ar9003_aic_find_valid(cal_sram, 1, start_idx);
+
+                        if (end_idx < 0) {
+                                ret = false;
+                                break;
+                        }
+
+                        aic_sram[i].dir_path_gain_lin =
+                                ((aic_sram[start_idx].dir_path_gain_lin -
+                                  aic_sram[end_idx].dir_path_gain_lin) *
+                                 (start_idx - i) + ((end_idx - i) >> 1)) /
+                                (end_idx - i) +
+                                aic_sram[start_idx].dir_path_gain_lin;
+                        aic_sram[i].quad_path_gain_lin =
+                                ((aic_sram[start_idx].quad_path_gain_lin -
+                                  aic_sram[end_idx].quad_path_gain_lin) *
+                                 (start_idx - i) + ((end_idx - i) >> 1)) /
+                                (end_idx - i) +
+                                aic_sram[start_idx].quad_path_gain_lin;
+                }
+
+                if (end_idx < 0) {
+                        /* extrapolation */
+                        end_idx = ar9003_aic_find_valid(cal_sram, 0, start_idx);
+
+                        if (end_idx < 0) {
+                                ret = false;
+                                break;
+                        }
+
+                        aic_sram[i].dir_path_gain_lin =
+                                ((aic_sram[start_idx].dir_path_gain_lin -
+                                  aic_sram[end_idx].dir_path_gain_lin) *
+                                 (i - start_idx) + ((start_idx - end_idx) >> 1)) /
+                                (start_idx - end_idx) +
+                                aic_sram[start_idx].dir_path_gain_lin;
+                        aic_sram[i].quad_path_gain_lin =
+                                ((aic_sram[start_idx].quad_path_gain_lin -
+                                  aic_sram[end_idx].quad_path_gain_lin) *
+                                 (i - start_idx) + ((start_idx - end_idx) >> 1)) /
+                                (start_idx - end_idx) +
+                                aic_sram[start_idx].quad_path_gain_lin;
+
+                } else if (start_idx >= 0){
+                        /* interpolation */
+                        aic_sram[i].dir_path_gain_lin =
+                                (((end_idx - i) * aic_sram[start_idx].dir_path_gain_lin) +
+                                 ((i - start_idx) * aic_sram[end_idx].dir_path_gain_lin) +
+                                 ((end_idx - start_idx) >> 1)) /
+                                (end_idx - start_idx);
+                        aic_sram[i].quad_path_gain_lin =
+                                (((end_idx - i) * aic_sram[start_idx].quad_path_gain_lin) +
+                                 ((i - start_idx) * aic_sram[end_idx].quad_path_gain_lin) +
+                                 ((end_idx - start_idx) >> 1))/
+                                (end_idx - start_idx);
+                }
+        }
+
+        /* From dir/quad_path_gain_lin to sram. */
+        i = ar9003_aic_find_valid(cal_sram, 1, 0);
+        if (i < 0) {
+                i = 0;
+                ret = false;
+        }
+        fixed_com_att_db = com_att_db_table[cal_sram[i].com_att_6db];
+
+        for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                int16_t rot_dir_path_att_db, rot_quad_path_att_db;
+
+                aic_sram[i].sram.vga_dir_sign =
+                        (aic_sram[i].dir_path_gain_lin >= 0) ? 1 : 0;
+                aic_sram[i].sram.vga_quad_sign=
+                        (aic_sram[i].quad_path_gain_lin >= 0) ? 1 : 0;
+
+                rot_dir_path_att_db =
+                        ar9003_aic_find_index(0, abs(aic_sram[i].dir_path_gain_lin)) -
+                        fixed_com_att_db;
+                rot_quad_path_att_db =
+                        ar9003_aic_find_index(0, abs(aic_sram[i].quad_path_gain_lin)) -
+                        fixed_com_att_db;
+
+                aic_sram[i].sram.com_att_6db =
+                        ar9003_aic_find_index(1, fixed_com_att_db);
+
+                aic_sram[i].sram.valid = 1;
+
+                aic_sram[i].sram.rot_dir_att_db =
+                        min(max(rot_dir_path_att_db,
+                                (int16_t)ATH_AIC_MIN_ROT_DIR_ATT_DB),
+                            ATH_AIC_MAX_ROT_DIR_ATT_DB);
+                aic_sram[i].sram.rot_quad_att_db =
+                        min(max(rot_quad_path_att_db,
+                                (int16_t)ATH_AIC_MIN_ROT_QUAD_ATT_DB),
+                            ATH_AIC_MAX_ROT_QUAD_ATT_DB);
+        }
+
+        for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                aic->aic_sram[i] = (SM(aic_sram[i].sram.vga_dir_sign,
+                                       AR_PHY_AIC_SRAM_VGA_DIR_SIGN) |
+                                    SM(aic_sram[i].sram.vga_quad_sign,
+                                       AR_PHY_AIC_SRAM_VGA_QUAD_SIGN) |
+                                    SM(aic_sram[i].sram.com_att_6db,
+                                       AR_PHY_AIC_SRAM_COM_ATT_6DB) |
+                                    SM(aic_sram[i].sram.valid,
+                                       AR_PHY_AIC_SRAM_VALID) |
+                                    SM(aic_sram[i].sram.rot_dir_att_db,
+                                       AR_PHY_AIC_SRAM_ROT_DIR_ATT_DB) |
+                                    SM(aic_sram[i].sram.rot_quad_att_db,
+                                       AR_PHY_AIC_SRAM_ROT_QUAD_ATT_DB));
+        }
+
+        return ret;
+}
+
+static void ar9003_aic_cal_done(struct ath_hw *ah)
+{
+        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+
+        /* Disable AIC reference signal in BT modem. */
+        REG_WRITE(ah, ATH_AIC_BT_JUPITER_CTRL,
+                  (REG_READ(ah, ATH_AIC_BT_JUPITER_CTRL) &
+                   ~ATH_AIC_BT_AIC_ENABLE));
+
+        if (ar9003_aic_cal_post_process(ah))
+                aic->aic_cal_state = AIC_CAL_STATE_DONE;
+        else
+                aic->aic_cal_state = AIC_CAL_STATE_ERROR;
+}
+
+static u8 ar9003_aic_cal_continue(struct ath_hw *ah, bool cal_once)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
+        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+        int i, num_chan;
+
+        num_chan = MS(mci_hw->config, ATH_MCI_CONFIG_AIC_CAL_NUM_CHAN);
+
+        if (!num_chan) {
+                aic->aic_cal_state = AIC_CAL_STATE_ERROR;
+                return aic->aic_cal_state;
+        }
+
+        if (cal_once) {
+                for (i = 0; i < 10000; i++) {
+                        if ((REG_READ(ah, AR_PHY_AIC_CTRL_0_B1) &
+                             AR_PHY_AIC_CAL_ENABLE) == 0)
+                                break;
+
+                        udelay(100);
+                }
+        }
+
+        /*
+         * Use AR_PHY_AIC_CAL_ENABLE bit instead of AR_PHY_AIC_CAL_DONE.
+         * Sometimes CAL_DONE bit is not asserted.
+         */
+        if ((REG_READ(ah, AR_PHY_AIC_CTRL_0_B1) &
+             AR_PHY_AIC_CAL_ENABLE) != 0) {
+                ath_dbg(common, MCI, "AIC cal is not done after 40ms");
+                goto exit;
+        }
+
+        REG_WRITE(ah, AR_PHY_AIC_SRAM_ADDR_B1,
+                  (ATH_AIC_SRAM_CAL_OFFSET | ATH_AIC_SRAM_AUTO_INCREMENT));
+
+        for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                u32 value;
+
+                value = REG_READ(ah, AR_PHY_AIC_SRAM_DATA_B1);
+
+                if (value & 0x01) {
+                        if (aic->aic_sram[i] == 0)
+                                aic->aic_caled_chan++;
+
+                        aic->aic_sram[i] = value;
+
+                        if (!cal_once)
+                                break;
+                }
+        }
+
+        if ((aic->aic_caled_chan >= num_chan) || cal_once) {
+                ar9003_aic_cal_done(ah);
+        } else {
+                /* Start calibration */
+                REG_CLR_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
+                REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1,
+                            AR_PHY_AIC_CAL_CH_VALID_RESET);
+                REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
+        }
+exit:
+        return aic->aic_cal_state;
+
+}
+
+u8 ar9003_aic_calibration(struct ath_hw *ah)
+{
+        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+        u8 cal_ret = AIC_CAL_STATE_ERROR;
+
+        switch (aic->aic_cal_state) {
+        case AIC_CAL_STATE_IDLE:
+                cal_ret = ar9003_aic_cal_start(ah, 1);
+                break;
+        case AIC_CAL_STATE_STARTED:
+                cal_ret = ar9003_aic_cal_continue(ah, false);
+                break;
+        case AIC_CAL_STATE_DONE:
+                cal_ret = AIC_CAL_STATE_DONE;
+                break;
+        default:
+                break;
+        }
+
+        return cal_ret;
+}
+
+u8 ar9003_aic_start_normal(struct ath_hw *ah)
+{
+        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+        int16_t i;
+
+        if (aic->aic_cal_state != AIC_CAL_STATE_DONE)
+                return 1;
+
+        ar9003_aic_gain_table(ah);
+
+        REG_WRITE(ah, AR_PHY_AIC_SRAM_ADDR_B1, ATH_AIC_SRAM_AUTO_INCREMENT);
+
+        for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+                REG_WRITE(ah, AR_PHY_AIC_SRAM_DATA_B1, aic->aic_sram[i]);
+        }
+
+        /* FIXME: Replace these with proper register names */
+        REG_WRITE(ah, 0xa6b0, 0x80);
+        REG_WRITE(ah, 0xa6b4, 0x5b2df0);
+        REG_WRITE(ah, 0xa6b8, 0x10762cc8);
+        REG_WRITE(ah, 0xa6bc, 0x1219a4b);
+        REG_WRITE(ah, 0xa6c0, 0x1e01);
+        REG_WRITE(ah, 0xb6b4, 0xf0);
+        REG_WRITE(ah, 0xb6c0, 0x1e01);
+        REG_WRITE(ah, 0xb6b0, 0x81);
+        REG_WRITE(ah, AR_PHY_65NM_CH1_RXTX4, 0x40000000);
+
+        aic->aic_enabled = true;
+
+        return 0;
+}
+
+u8 ar9003_aic_cal_reset(struct ath_hw *ah)
+{
+        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+
+        aic->aic_cal_state = AIC_CAL_STATE_IDLE;
+        return aic->aic_cal_state;
+}
+
+u8 ar9003_aic_calibration_single(struct ath_hw *ah)
+{
+        struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
+        u8 cal_ret;
+        int num_chan;
+
+        num_chan = MS(mci_hw->config, ATH_MCI_CONFIG_AIC_CAL_NUM_CHAN);
+
+        (void) ar9003_aic_cal_start(ah, num_chan);
+        cal_ret = ar9003_aic_cal_continue(ah, true);
+
+        return cal_ret;
+}
+
+void ar9003_hw_attach_aic_ops(struct ath_hw *ah)
+{
+        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+
+        priv_ops->is_aic_enabled = ar9003_hw_is_aic_enabled;
+}
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_aic.h b/drivers/net/wireless/ath/ath9k/ar9003_aic.h
new file mode 100644
index 000000000000..86f40644be43
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar9003_aic.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015 Qualcomm Atheros Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef AR9003_AIC_H
+#define AR9003_AIC_H
+
+#define ATH_AIC_MAX_COM_ATT_DB_TABLE    6
+#define ATH_AIC_MAX_AIC_LIN_TABLE       69
+#define ATH_AIC_MIN_ROT_DIR_ATT_DB      0
+#define ATH_AIC_MIN_ROT_QUAD_ATT_DB     0
+#define ATH_AIC_MAX_ROT_DIR_ATT_DB      37
+#define ATH_AIC_MAX_ROT_QUAD_ATT_DB     37
+#define ATH_AIC_SRAM_AUTO_INCREMENT     0x80000000
+#define ATH_AIC_SRAM_GAIN_TABLE_OFFSET  0x280
+#define ATH_AIC_SRAM_CAL_OFFSET         0x140
+#define ATH_AIC_SRAM_OFFSET             0x00
+#define ATH_AIC_MEAS_MAG_THRESH         20
+#define ATH_AIC_BT_JUPITER_CTRL         0x66820
+#define ATH_AIC_BT_AIC_ENABLE           0x02
+
+enum aic_cal_state {
+        AIC_CAL_STATE_IDLE = 0,
+        AIC_CAL_STATE_STARTED,
+        AIC_CAL_STATE_DONE,
+        AIC_CAL_STATE_ERROR
+};
+
+struct ath_aic_sram_info {
+        bool valid:1;
+        bool vga_quad_sign:1;
+        bool vga_dir_sign:1;
+        u8 rot_quad_att_db;
+        u8 rot_dir_att_db;
+        u8 com_att_6db;
+};
+
+struct ath_aic_out_info {
+        int16_t dir_path_gain_lin;
+        int16_t quad_path_gain_lin;
+        struct ath_aic_sram_info sram;
+};
+
+u8 ar9003_aic_calibration(struct ath_hw *ah);
+u8 ar9003_aic_start_normal(struct ath_hw *ah);
+u8 ar9003_aic_cal_reset(struct ath_hw *ah);
+u8 ar9003_aic_calibration_single(struct ath_hw *ah);
+
+#endif /* AR9003_AIC_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 4335ccbe7d7e..79fd3b2dcbde 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -195,16 +195,16 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
                                ar9485_1_1_baseband_core_txfir_coeff_japan_2484);
 
-                if (ah->config.no_pll_pwrsave) {
+                if (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) {
                         INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                                       ar9485_1_1_pcie_phy_clkreq_disable_L1);
+                                       ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
                         INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                                       ar9485_1_1_pcie_phy_clkreq_disable_L1);
+                                       ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
                 } else {
                         INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                                       ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
+                                       ar9485_1_1_pcie_phy_clkreq_disable_L1);
                         INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                                       ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
+                                       ar9485_1_1_pcie_phy_clkreq_disable_L1);
                 }
         } else if (AR_SREV_9462_21(ah)) {
                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
@@ -231,10 +231,20 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                                ar9462_2p1_modes_fast_clock);
                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
                                ar9462_2p1_baseband_core_txfir_coeff_japan_2484);
-                INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                               ar9462_2p1_pciephy_clkreq_disable_L1);
-                INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                               ar9462_2p1_pciephy_clkreq_disable_L1);
+
+                /* Awake -> Sleep Setting */
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D3)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
+                                       ar9462_2p1_pciephy_clkreq_disable_L1);
+                }
+
+                /* Sleep -> Awake Setting */
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D0)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+                                       ar9462_2p1_pciephy_clkreq_disable_L1);
+                }
         } else if (AR_SREV_9462_20(ah)) {
 
                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE], ar9462_2p0_mac_core);
@@ -262,11 +272,18 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                                 ar9462_2p0_common_rx_gain);
 
                 /* Awake -> Sleep Setting */
-                INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                               ar9462_2p0_pciephy_clkreq_disable_L1);
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D3)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
+                                       ar9462_2p0_pciephy_clkreq_disable_L1);
+                }
+
                 /* Sleep -> Awake Setting */
-                INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                               ar9462_2p0_pciephy_clkreq_disable_L1);
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D0)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+                                       ar9462_2p0_pciephy_clkreq_disable_L1);
+                }
 
                 /* Fast clock modal settings */
                 INIT_INI_ARRAY(&ah->iniModesFastClock,
@@ -456,10 +473,19 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                                ar9565_1p1_Modes_lowest_ob_db_tx_gain_table);
 
-                INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                               ar9565_1p1_pciephy_clkreq_disable_L1);
-                INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                               ar9565_1p1_pciephy_clkreq_disable_L1);
+                /* Awake -> Sleep Setting */
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D3)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
+                                       ar9565_1p1_pciephy_clkreq_disable_L1);
+                }
+
+                /* Sleep -> Awake Setting */
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D0)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+                                       ar9565_1p1_pciephy_clkreq_disable_L1);
+                }
 
                 INIT_INI_ARRAY(&ah->iniModesFastClock,
                                 ar9565_1p1_modes_fast_clock);
@@ -491,10 +517,19 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                                ar9565_1p0_Modes_lowest_ob_db_tx_gain_table);
 
-                INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                               ar9565_1p0_pciephy_clkreq_disable_L1);
-                INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                               ar9565_1p0_pciephy_clkreq_disable_L1);
+                /* Awake -> Sleep Setting */
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D3)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
+                                       ar9565_1p0_pciephy_clkreq_disable_L1);
+                }
+
+                /* Sleep -> Awake Setting */
+                if ((ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_CONTROL) &&
+                    (ah->config.pll_pwrsave & AR_PCIE_PLL_PWRSAVE_ON_D0)) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+                                       ar9565_1p0_pciephy_clkreq_disable_L1);
+                }
 
                 INIT_INI_ARRAY(&ah->iniModesFastClock,
                                 ar9565_1p0_modes_fast_clock);
@@ -1130,6 +1165,12 @@ void ar9003_hw_attach_ops(struct ath_hw *ah)
         struct ath_hw_ops *ops = ath9k_hw_ops(ah);
 
         ar9003_hw_init_mode_regs(ah);
+
+        if (AR_SREV_9003_PCOEM(ah)) {
+                WARN_ON(!ah->iniPcieSerdes.ia_array);
+                WARN_ON(!ah->iniPcieSerdesLowPower.ia_array);
+        }
+
         priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs;
         priv_ops->init_hang_checks = ar9003_hw_init_hang_checks;
         priv_ops->detect_mac_hang = ar9003_hw_detect_mac_hang;
@@ -1139,4 +1180,5 @@ void ar9003_hw_attach_ops(struct ath_hw *ah)
         ar9003_hw_attach_phy_ops(ah);
         ar9003_hw_attach_calib_ops(ah);
         ar9003_hw_attach_mac_ops(ah);
+        ar9003_hw_attach_aic_ops(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index 7b94a6c7db3d..af5ee416a560 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -19,6 +19,7 @@
 #include "hw-ops.h"
 #include "ar9003_phy.h"
 #include "ar9003_mci.h"
+#include "ar9003_aic.h"
 
 static void ar9003_mci_reset_req_wakeup(struct ath_hw *ah)
 {
@@ -284,12 +285,12 @@ static void ar9003_mci_prep_interface(struct ath_hw *ah)
                   AR_MCI_INTERRUPT_RX_MSG_CONT_RST);
         REG_WRITE(ah, AR_MCI_INTERRUPT_RAW, AR_MCI_INTERRUPT_BT_PRI);
 
-        if (mci->is_2g) {
+        if (mci->is_2g && MCI_ANT_ARCH_PA_LNA_SHARED(mci)) {
                 ar9003_mci_send_lna_transfer(ah, true);
                 udelay(5);
         }
 
-        if ((mci->is_2g && !mci->update_2g5g)) {
+        if (mci->is_2g && !mci->update_2g5g && MCI_ANT_ARCH_PA_LNA_SHARED(mci)) {
                 if (ar9003_mci_wait_for_interrupt(ah,
                                         AR_MCI_INTERRUPT_RX_MSG_RAW,
                                         AR_MCI_INTERRUPT_RX_MSG_LNA_INFO,
@@ -593,7 +594,7 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
                 if (!time_out)
                         break;
 
-                offset = ar9003_mci_get_next_gpm_offset(ah, false, &more_data);
+                offset = ar9003_mci_get_next_gpm_offset(ah, &more_data);
 
                 if (offset == MCI_GPM_INVALID)
                         continue;
@@ -657,7 +658,7 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
                 time_out = 0;
 
         while (more_data == MCI_GPM_MORE) {
-                offset = ar9003_mci_get_next_gpm_offset(ah, false, &more_data);
+                offset = ar9003_mci_get_next_gpm_offset(ah, &more_data);
                 if (offset == MCI_GPM_INVALID)
                         break;
 
@@ -771,8 +772,14 @@ exit:
 
 static void ar9003_mci_mute_bt(struct ath_hw *ah)
 {
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
         /* disable all MCI messages */
         REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE, 0xffff0000);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS0, 0xffffffff);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS1, 0xffffffff);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS2, 0xffffffff);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS3, 0xffffffff);
         REG_SET_BIT(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
 
         /* wait pending HW messages to flush out */
@@ -783,9 +790,10 @@ static void ar9003_mci_mute_bt(struct ath_hw *ah)
          * 1. reset not after resuming from full sleep
          * 2. before reset MCI RX, to quiet BT and avoid MCI RX misalignment
          */
-        ar9003_mci_send_lna_take(ah, true);
-
-        udelay(5);
+        if (MCI_ANT_ARCH_PA_LNA_SHARED(mci)) {
+                ar9003_mci_send_lna_take(ah, true);
+                udelay(5);
+        }
 
         ar9003_mci_send_sys_sleeping(ah, true);
 }
@@ -821,6 +829,80 @@ static void ar9003_mci_osla_setup(struct ath_hw *ah, bool enable)
                       AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN, 1);
 }
 
+static void ar9003_mci_stat_setup(struct ath_hw *ah)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
+        if (!AR_SREV_9565(ah))
+                return;
+
+        if (mci->config & ATH_MCI_CONFIG_MCI_STAT_DBG) {
+                REG_RMW_FIELD(ah, AR_MCI_DBG_CNT_CTRL,
+                              AR_MCI_DBG_CNT_CTRL_ENABLE, 1);
+                REG_RMW_FIELD(ah, AR_MCI_DBG_CNT_CTRL,
+                              AR_MCI_DBG_CNT_CTRL_BT_LINKID,
+                              MCI_STAT_ALL_BT_LINKID);
+        } else {
+                REG_RMW_FIELD(ah, AR_MCI_DBG_CNT_CTRL,
+                              AR_MCI_DBG_CNT_CTRL_ENABLE, 0);
+        }
+}
+
+static void ar9003_mci_set_btcoex_ctrl_9565_1ANT(struct ath_hw *ah)
+{
+        u32 regval;
+
+        regval = SM(1, AR_BTCOEX_CTRL_AR9462_MODE) |
+                 SM(1, AR_BTCOEX_CTRL_WBTIMER_EN) |
+                 SM(1, AR_BTCOEX_CTRL_PA_SHARED) |
+                 SM(1, AR_BTCOEX_CTRL_LNA_SHARED) |
+                 SM(1, AR_BTCOEX_CTRL_NUM_ANTENNAS) |
+                 SM(1, AR_BTCOEX_CTRL_RX_CHAIN_MASK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_ACK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_BCN) |
+                 SM(0, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+
+        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2,
+                      AR_BTCOEX_CTRL2_TX_CHAIN_MASK, 0x1);
+        REG_WRITE(ah, AR_BTCOEX_CTRL, regval);
+}
+
+static void ar9003_mci_set_btcoex_ctrl_9565_2ANT(struct ath_hw *ah)
+{
+        u32 regval;
+
+        regval = SM(1, AR_BTCOEX_CTRL_AR9462_MODE) |
+                 SM(1, AR_BTCOEX_CTRL_WBTIMER_EN) |
+                 SM(0, AR_BTCOEX_CTRL_PA_SHARED) |
+                 SM(0, AR_BTCOEX_CTRL_LNA_SHARED) |
+                 SM(2, AR_BTCOEX_CTRL_NUM_ANTENNAS) |
+                 SM(1, AR_BTCOEX_CTRL_RX_CHAIN_MASK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_ACK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_BCN) |
+                 SM(0, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+
+        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2,
+                      AR_BTCOEX_CTRL2_TX_CHAIN_MASK, 0x0);
+        REG_WRITE(ah, AR_BTCOEX_CTRL, regval);
+}
+
+static void ar9003_mci_set_btcoex_ctrl_9462(struct ath_hw *ah)
+{
+        u32 regval;
+
+        regval = SM(1, AR_BTCOEX_CTRL_AR9462_MODE) |
+                 SM(1, AR_BTCOEX_CTRL_WBTIMER_EN) |
+                 SM(1, AR_BTCOEX_CTRL_PA_SHARED) |
+                 SM(1, AR_BTCOEX_CTRL_LNA_SHARED) |
+                 SM(2, AR_BTCOEX_CTRL_NUM_ANTENNAS) |
+                 SM(3, AR_BTCOEX_CTRL_RX_CHAIN_MASK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_ACK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_BCN) |
+                 SM(0, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+
+        REG_WRITE(ah, AR_BTCOEX_CTRL, regval);
+}
+
 int ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
                      bool is_full_sleep)
 {
@@ -831,11 +913,6 @@ int ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
         ath_dbg(common, MCI, "MCI Reset (full_sleep = %d, is_2g = %d)\n",
                 is_full_sleep, is_2g);
 
-        if (!mci->gpm_addr && !mci->sched_addr) {
-                ath_err(common, "MCI GPM and schedule buffers are not allocated\n");
-                return -ENOMEM;
-        }
-
         if (REG_READ(ah, AR_BTCOEX_CTRL) == 0xdeadbeef) {
                 ath_err(common, "BTCOEX control register is dead\n");
                 return -EINVAL;
@@ -850,26 +927,17 @@ int ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
         * To avoid MCI state machine be affected by incoming remote MCI msgs,
         * MCI mode will be enabled later, right before reset the MCI TX and RX.
         */
-
-        regval = SM(1, AR_BTCOEX_CTRL_AR9462_MODE) |
-                 SM(1, AR_BTCOEX_CTRL_WBTIMER_EN) |
-                 SM(1, AR_BTCOEX_CTRL_PA_SHARED) |
-                 SM(1, AR_BTCOEX_CTRL_LNA_SHARED) |
-                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_ACK) |
-                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_BCN) |
-                 SM(0, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
         if (AR_SREV_9565(ah)) {
-                regval |= SM(1, AR_BTCOEX_CTRL_NUM_ANTENNAS) |
-                          SM(1, AR_BTCOEX_CTRL_RX_CHAIN_MASK);
-                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2,
-                              AR_BTCOEX_CTRL2_TX_CHAIN_MASK, 0x1);
+                u8 ant = MS(mci->config, ATH_MCI_CONFIG_ANT_ARCH);
+
+                if (ant == ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED)
+                        ar9003_mci_set_btcoex_ctrl_9565_1ANT(ah);
+                else
+                        ar9003_mci_set_btcoex_ctrl_9565_2ANT(ah);
         } else {
-                regval |= SM(2, AR_BTCOEX_CTRL_NUM_ANTENNAS) |
-                          SM(3, AR_BTCOEX_CTRL_RX_CHAIN_MASK);
+                ar9003_mci_set_btcoex_ctrl_9462(ah);
         }
 
-        REG_WRITE(ah, AR_BTCOEX_CTRL, regval);
-
         if (is_2g && !(mci->config & ATH_MCI_CONFIG_DISABLE_OSLA))
                 ar9003_mci_osla_setup(ah, true);
         else
@@ -926,26 +994,32 @@ int ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
         regval &= ~SM(1, AR_MCI_COMMAND2_RESET_RX);
         REG_WRITE(ah, AR_MCI_COMMAND2, regval);
 
-        ar9003_mci_get_next_gpm_offset(ah, true, NULL);
+        /* Init GPM offset after MCI Reset Rx */
+        ar9003_mci_state(ah, MCI_STATE_INIT_GPM_OFFSET);
 
         REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE,
                   (SM(0xe801, AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR) |
                    SM(0x0000, AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM)));
 
-        REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
-                    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+        if (MCI_ANT_ARCH_PA_LNA_SHARED(mci))
+                REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
+                            AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+        else
+                REG_SET_BIT(ah, AR_MCI_TX_CTRL,
+                            AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
 
         ar9003_mci_observation_set_up(ah);
 
         mci->ready = true;
         ar9003_mci_prep_interface(ah);
+        ar9003_mci_stat_setup(ah);
 
-        if (AR_SREV_9565(ah))
-                REG_RMW_FIELD(ah, AR_MCI_DBG_CNT_CTRL,
-                              AR_MCI_DBG_CNT_CTRL_ENABLE, 0);
         if (en_int)
                 ar9003_mci_enable_interrupt(ah);
 
+        if (ath9k_hw_is_aic_enabled(ah))
+                ar9003_aic_start_normal(ah);
+
         return 0;
 }
 
@@ -1218,6 +1292,14 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
                 }
                 value &= AR_BTCOEX_CTRL_MCI_MODE_EN;
                 break;
+        case MCI_STATE_INIT_GPM_OFFSET:
+                value = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
+
+                if (value < mci->gpm_len)
+                        mci->gpm_idx = value;
+                else
+                        mci->gpm_idx = 0;
+                break;
         case MCI_STATE_LAST_SCHD_MSG_OFFSET:
                 value = MS(REG_READ(ah, AR_MCI_RX_STATUS),
                                     AR_MCI_RX_LAST_SCHD_MSG_INDEX);
@@ -1284,6 +1366,22 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
                 value = (!mci->unhalt_bt_gpm && mci->need_flush_btinfo) ? 1 : 0;
                 mci->need_flush_btinfo = false;
                 break;
+        case MCI_STATE_AIC_CAL:
+                if (ath9k_hw_is_aic_enabled(ah))
+                        value = ar9003_aic_calibration(ah);
+                break;
+        case MCI_STATE_AIC_START:
+                if (ath9k_hw_is_aic_enabled(ah))
+                        ar9003_aic_start_normal(ah);
+                break;
+        case MCI_STATE_AIC_CAL_RESET:
+                if (ath9k_hw_is_aic_enabled(ah))
+                        value = ar9003_aic_cal_reset(ah);
+                break;
+        case MCI_STATE_AIC_CAL_SINGLE:
+                if (ath9k_hw_is_aic_enabled(ah))
+                        value = ar9003_aic_calibration_single(ah);
+                break;
         default:
                 break;
         }
@@ -1364,21 +1462,11 @@ void ar9003_mci_check_gpm_offset(struct ath_hw *ah)
         mci->gpm_idx = 0;
 }
 
-u32 ar9003_mci_get_next_gpm_offset(struct ath_hw *ah, bool first, u32 *more)
+u32 ar9003_mci_get_next_gpm_offset(struct ath_hw *ah, u32 *more)
 {
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 offset, more_gpm = 0, gpm_ptr;
 
-        if (first) {
-                gpm_ptr = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
-
-                if (gpm_ptr >= mci->gpm_len)
-                        gpm_ptr = 0;
-
-                mci->gpm_idx = gpm_ptr;
-                return gpm_ptr;
-        }
-
         /*
          * This could be useful to avoid new GPM message interrupt which
          * may lead to spurious interrupt after power sleep, or multiple
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
index 66d7ab9f920d..e288611c12d5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
@@ -92,14 +92,36 @@ enum mci_gpm_coex_bt_update_flags_op {
 #define ATH_MCI_CONFIG_CLK_DIV              0x00003000
 #define ATH_MCI_CONFIG_CLK_DIV_S            12
 #define ATH_MCI_CONFIG_DISABLE_TUNING       0x00004000
+#define ATH_MCI_CONFIG_DISABLE_AIC          0x00008000
+#define ATH_MCI_CONFIG_AIC_CAL_NUM_CHAN     0x007f0000
+#define ATH_MCI_CONFIG_AIC_CAL_NUM_CHAN_S   16
+#define ATH_MCI_CONFIG_NO_QUIET_ACK         0x00800000
+#define ATH_MCI_CONFIG_NO_QUIET_ACK_S       23
+#define ATH_MCI_CONFIG_ANT_ARCH             0x07000000
+#define ATH_MCI_CONFIG_ANT_ARCH_S           24
+#define ATH_MCI_CONFIG_FORCE_QUIET_ACK      0x08000000
+#define ATH_MCI_CONFIG_FORCE_QUIET_ACK_S    27
+#define ATH_MCI_CONFIG_FORCE_2CHAIN_ACK     0x10000000
+#define ATH_MCI_CONFIG_MCI_STAT_DBG         0x20000000
 #define ATH_MCI_CONFIG_MCI_WEIGHT_DBG       0x40000000
 #define ATH_MCI_CONFIG_DISABLE_MCI          0x80000000
 
 #define ATH_MCI_CONFIG_MCI_OBS_MASK     (ATH_MCI_CONFIG_MCI_OBS_MCI  | \
                                          ATH_MCI_CONFIG_MCI_OBS_TXRX | \
                                          ATH_MCI_CONFIG_MCI_OBS_BT)
+
 #define ATH_MCI_CONFIG_MCI_OBS_GPIO     0x0000002F
 
+#define ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_NON_SHARED 0x00
+#define ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED     0x01
+#define ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_NON_SHARED 0x02
+#define ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_SHARED     0x03
+#define ATH_MCI_ANT_ARCH_3_ANT                   0x04
+
+#define MCI_ANT_ARCH_PA_LNA_SHARED(mci)                                 \
+        ((MS(mci->config, ATH_MCI_CONFIG_ANT_ARCH) == ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED) || \
+         (MS(mci->config, ATH_MCI_CONFIG_ANT_ARCH) == ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_SHARED))
+
 enum mci_message_header {               /* length of payload */
         MCI_LNA_CTRL     = 0x10,        /* len = 0 */
         MCI_CONT_NACK    = 0x20,        /* len = 0 */
@@ -188,20 +210,55 @@ enum mci_bt_state {
         MCI_BT_CAL
 };
 
+enum mci_ps_state {
+        MCI_PS_DISABLE,
+        MCI_PS_ENABLE,
+        MCI_PS_ENABLE_OFF,
+        MCI_PS_ENABLE_ON
+};
+
 /* Type of state query */
 enum mci_state_type {
         MCI_STATE_ENABLE,
+        MCI_STATE_INIT_GPM_OFFSET,
+        MCI_STATE_CHECK_GPM_OFFSET,
+        MCI_STATE_NEXT_GPM_OFFSET,
+        MCI_STATE_LAST_GPM_OFFSET,
+        MCI_STATE_BT,
+        MCI_STATE_SET_BT_SLEEP,
         MCI_STATE_SET_BT_AWAKE,
+        MCI_STATE_SET_BT_CAL_START,
+        MCI_STATE_SET_BT_CAL,
         MCI_STATE_LAST_SCHD_MSG_OFFSET,
         MCI_STATE_REMOTE_SLEEP,
+        MCI_STATE_CONT_STATUS,
         MCI_STATE_RESET_REQ_WAKE,
         MCI_STATE_SEND_WLAN_COEX_VERSION,
+        MCI_STATE_SET_BT_COEX_VERSION,
+        MCI_STATE_SEND_WLAN_CHANNELS,
         MCI_STATE_SEND_VERSION_QUERY,
         MCI_STATE_SEND_STATUS_QUERY,
+        MCI_STATE_NEED_FLUSH_BT_INFO,
+        MCI_STATE_SET_CONCUR_TX_PRI,
         MCI_STATE_RECOVER_RX,
         MCI_STATE_NEED_FTP_STOMP,
+        MCI_STATE_NEED_TUNING,
+        MCI_STATE_NEED_STAT_DEBUG,
+        MCI_STATE_SHARED_CHAIN_CONCUR_TX,
+        MCI_STATE_AIC_CAL,
+        MCI_STATE_AIC_START,
+        MCI_STATE_AIC_CAL_RESET,
+        MCI_STATE_AIC_CAL_SINGLE,
+        MCI_STATE_IS_AR9462,
+        MCI_STATE_IS_AR9565_1ANT,
+        MCI_STATE_IS_AR9565_2ANT,
+        MCI_STATE_WLAN_WEAK_SIGNAL,
+        MCI_STATE_SET_WLAN_PS_STATE,
+        MCI_STATE_GET_WLAN_PS_STATE,
         MCI_STATE_DEBUG,
-        MCI_STATE_NEED_FLUSH_BT_INFO,
+        MCI_STATE_STAT_DEBUG,
+        MCI_STATE_ALLOW_FCS,
+        MCI_STATE_SET_2G_CONTENTION,
         MCI_STATE_MAX
 };
 
@@ -255,7 +312,7 @@ int ar9003_mci_setup(struct ath_hw *ah, u32 gpm_addr, void *gpm_buf,
 void ar9003_mci_cleanup(struct ath_hw *ah);
 void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,
                               u32 *rx_msg_intr);
-u32 ar9003_mci_get_next_gpm_offset(struct ath_hw *ah, bool first, u32 *more);
+u32 ar9003_mci_get_next_gpm_offset(struct ath_hw *ah, u32 *more);
 void ar9003_mci_set_bt_version(struct ath_hw *ah, u8 major, u8 minor);
 void ar9003_mci_send_wlan_channels(struct ath_hw *ah);
 /*
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index c311b2bfdb00..fc595b92ac56 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -640,16 +640,6 @@
 #define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE         0x0000ff00
 #define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE_S       8
 
-/* AIC Registers */
-#define AR_PHY_AIC_CTRL_0_B0    (AR_SM_BASE + 0x4b0)
-#define AR_PHY_AIC_CTRL_1_B0    (AR_SM_BASE + 0x4b4)
-#define AR_PHY_AIC_CTRL_2_B0    (AR_SM_BASE + 0x4b8)
-#define AR_PHY_AIC_CTRL_3_B0    (AR_SM_BASE + 0x4bc)
-#define AR_PHY_AIC_STAT_0_B0    (AR_SM_BASE + 0x4c4))
-#define AR_PHY_AIC_STAT_1_B0    (AR_SM_BASE + 0x4c8))
-#define AR_PHY_AIC_CTRL_4_B0    (AR_SM_BASE + 0x4c0)
-#define AR_PHY_AIC_STAT_2_B0    (AR_SM_BASE + 0x4cc)
-
 #define AR_PHY_65NM_CH0_TXRF3       0x16048
 #define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G          0x0000001e
 #define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G_S        1
@@ -989,21 +979,6 @@
 #define AR_PHY_TX_IQCAL_STATUS_B1   (AR_SM1_BASE + 0x48c)
 #define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i)    (AR_SM1_BASE + 0x450 + ((_i) << 2))
 
-/* SM 1 AIC Registers */
-
-#define AR_PHY_AIC_CTRL_0_B1    (AR_SM1_BASE + 0x4b0)
-#define AR_PHY_AIC_CTRL_1_B1    (AR_SM1_BASE + 0x4b4)
-#define AR_PHY_AIC_CTRL_2_B1    (AR_SM1_BASE + 0x4b8)
-#define AR_PHY_AIC_STAT_0_B1    (AR_SM1_BASE + (AR_SREV_9462_10(ah) ? \
-                                        0x4c0 : 0x4c4))
-#define AR_PHY_AIC_STAT_1_B1    (AR_SM1_BASE + (AR_SREV_9462_10(ah) ? \
-                                        0x4c4 : 0x4c8))
-#define AR_PHY_AIC_CTRL_4_B1    (AR_SM1_BASE + 0x4c0)
-#define AR_PHY_AIC_STAT_2_B1    (AR_SM1_BASE + 0x4cc)
-
-#define AR_PHY_AIC_SRAM_ADDR_B1 (AR_SM1_BASE + 0x5f0)
-#define AR_PHY_AIC_SRAM_DATA_B1 (AR_SM1_BASE + 0x5f4)
-
 #define AR_PHY_RTT_TABLE_SW_INTF_B(i)   (0x384 + ((i) ? \
                                         AR_SM1_BASE : AR_SM_BASE))
 #define AR_PHY_RTT_TABLE_SW_INTF_1_B(i) (0x388 + ((i) ? \
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_rtt.c b/drivers/net/wireless/ath/ath9k/ar9003_rtt.c
index 934418872e8e..e4d11fa7fe8c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_rtt.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_rtt.c
@@ -106,7 +106,7 @@ void ar9003_hw_rtt_load_hist(struct ath_hw *ah)
         int chain, i;
 
         for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-                if (!(ah->rxchainmask & (1 << chain)))
+                if (!(ah->caps.rx_chainmask & (1 << chain)))
                         continue;
                 for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++) {
                         ar9003_hw_rtt_load_hist_entry(ah, chain, i,
@@ -171,7 +171,7 @@ void ar9003_hw_rtt_fill_hist(struct ath_hw *ah)
         int chain, i;
 
         for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-                if (!(ah->rxchainmask & (1 << chain)))
+                if (!(ah->caps.rx_chainmask & (1 << chain)))
                         continue;
                 for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++) {
                         ah->caldata->rtt_table[chain][i] =
@@ -193,7 +193,7 @@ void ar9003_hw_rtt_clear_hist(struct ath_hw *ah)
         int chain, i;
 
         for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-                if (!(ah->rxchainmask & (1 << chain)))
+                if (!(ah->caps.rx_chainmask & (1 << chain)))
                         continue;
                 for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++)
                         ar9003_hw_rtt_load_hist_entry(ah, chain, i, 0);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_wow.c b/drivers/net/wireless/ath/ath9k/ar9003_wow.c
index 86bfc9604dca..bea41df9fbd7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_wow.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_wow.c
@@ -20,11 +20,25 @@
 #include "reg_wow.h"
 #include "hw-ops.h"
 
+static void ath9k_hw_set_sta_powersave(struct ath_hw *ah)
+{
+        if (!ath9k_hw_mci_is_enabled(ah))
+                goto set;
+        /*
+         * If MCI is being used, set PWR_SAV only when MCI's
+         * PS state is disabled.
+         */
+        if (ar9003_mci_state(ah, MCI_STATE_GET_WLAN_PS_STATE) != MCI_PS_DISABLE)
+                return;
+set:
+        REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
+}
+
 static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
 
-        REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
+        ath9k_hw_set_sta_powersave(ah);
 
         /* set rx disable bit */
         REG_WRITE(ah, AR_CR, AR_CR_RXD);
@@ -44,6 +58,9 @@ static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)
                         REG_CLR_BIT(ah, AR_DIRECT_CONNECT, AR_DC_TSF2_ENABLE);
         }
 
+        if (ath9k_hw_mci_is_enabled(ah))
+                REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
+
         REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_ON_INT);
 }
 
@@ -74,8 +91,6 @@ static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
         for (i = 0; i < KAL_NUM_DESC_WORDS; i++)
                 REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
 
-        REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
-
         data_word[0] = (KAL_FRAME_TYPE << 2) | (KAL_FRAME_SUB_TYPE << 4) |
                        (KAL_TO_DS << 8) | (KAL_DURATION_ID << 16);
         data_word[1] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
@@ -88,9 +103,11 @@ static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
                        (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
         data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
 
-        if (AR_SREV_9462_20(ah)) {
-                /* AR9462 2.0 has an extra descriptor word (time based
-                 * discard) compared to other chips */
+        if (AR_SREV_9462_20_OR_LATER(ah) || AR_SREV_9565(ah)) {
+                /*
+                 * AR9462 2.0 and AR9565 have an extra descriptor word
+                 * (time based discard) compared to other chips.
+                 */
                 REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0);
                 wow_ka_data_word0 = AR_WOW_TXBUF(13);
         } else {
@@ -99,7 +116,6 @@ static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
 
         for (i = 0; i < KAL_NUM_DATA_WORDS; i++)
                 REG_WRITE(ah, (wow_ka_data_word0 + i*4), data_word[i]);
-
 }
 
 int ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
@@ -170,18 +186,17 @@ u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
         u32 val = 0, rval;
 
         /*
-         * read the WoW status register to know
-         * the wakeup reason
+         * Read the WoW status register to know
+         * the wakeup reason.
          */
         rval = REG_READ(ah, AR_WOW_PATTERN);
         val = AR_WOW_STATUS(rval);
 
         /*
-         * mask only the WoW events that we have enabled. Sometimes
+         * Mask only the WoW events that we have enabled. Sometimes
          * we have spurious WoW events from the AR_WOW_PATTERN
          * register. This mask will clean it up.
          */
-
         val &= ah->wow.wow_event_mask;
 
         if (val) {
@@ -195,6 +210,15 @@ u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
                         wow_status |= AH_WOW_BEACON_MISS;
         }
 
+        rval = REG_READ(ah, AR_MAC_PCU_WOW4);
+        val = AR_WOW_STATUS2(rval);
+        val &= ah->wow.wow_event_mask2;
+
+        if (val) {
+                if (AR_WOW2_PATTERN_FOUND(val))
+                        wow_status |= AH_WOW_USER_PATTERN_EN;
+        }
+
         /*
          * set and clear WOW_PME_CLEAR registers for the chip to
          * generate next wow signal.
@@ -206,10 +230,12 @@ u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
                 AR_PMCTRL_PWR_STATE_D1D3);
 
         /*
-         * clear all events
+         * Clear all events.
          */
         REG_WRITE(ah, AR_WOW_PATTERN,
                   AR_WOW_CLEAR_EVENTS(REG_READ(ah, AR_WOW_PATTERN)));
+        REG_WRITE(ah, AR_MAC_PCU_WOW4,
+                  AR_WOW_CLEAR_EVENTS2(REG_READ(ah, AR_MAC_PCU_WOW4)));
 
         /*
          * restore the beacon threshold to init value
@@ -226,7 +252,15 @@ u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
         if (ah->is_pciexpress)
                 ath9k_hw_configpcipowersave(ah, false);
 
+        if (AR_SREV_9462(ah) || AR_SREV_9565(ah) || AR_SREV_9485(ah)) {
+                u32 dc = REG_READ(ah, AR_DIRECT_CONNECT);
+
+                if (!(dc & AR_DC_TSF2_ENABLE))
+                        ath9k_hw_gen_timer_start_tsf2(ah);
+        }
+
         ah->wow.wow_event_mask = 0;
+        ah->wow.wow_event_mask2 = 0;
 
         return wow_status;
 }
@@ -408,6 +442,9 @@ void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)
 
         ath9k_hw_wow_set_arwr_reg(ah);
 
+        if (ath9k_hw_mci_is_enabled(ah))
+                REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
+
         /* HW WoW */
         REG_CLR_BIT(ah, AR_PCU_MISC_MODE3, BIT(5));
 
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 0f8e9464e4ab..a7a81b3969ce 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -184,12 +184,12 @@ struct ath_frame_info {
         struct ath_buf *bf;
         u16 framelen;
         s8 txq;
-        enum ath9k_key_type keytype;
         u8 keyix;
         u8 rtscts_rate;
         u8 retries : 7;
         u8 baw_tracked : 1;
         u8 tx_power;
+        enum ath9k_key_type keytype:2;
 };
 
 struct ath_rxbuf {
@@ -645,6 +645,7 @@ void ath9k_calculate_iter_data(struct ath_softc *sc,
                                struct ath9k_vif_iter_data *iter_data);
 void ath9k_calculate_summary_state(struct ath_softc *sc,
                                    struct ath_chanctx *ctx);
+void ath9k_set_txpower(struct ath_softc *sc, struct ieee80211_vif *vif);
 
 /*******************/
 /* Beacon Handling */
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index 3dfc2c7f1f07..5a084d94ed90 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -103,7 +103,9 @@ void ath9k_hw_btcoex_init_scheme(struct ath_hw *ah)
                 return;
         }
 
-        if (AR_SREV_9300_20_OR_LATER(ah)) {
+        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI) {
+                btcoex_hw->scheme = ATH_BTCOEX_CFG_MCI;
+        } else if (AR_SREV_9300_20_OR_LATER(ah)) {
                 btcoex_hw->scheme = ATH_BTCOEX_CFG_3WIRE;
                 btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO_9300;
                 btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO_9300;
@@ -307,6 +309,18 @@ static void ath9k_hw_btcoex_enable_mci(struct ath_hw *ah)
         btcoex->enabled = true;
 }
 
+static void ath9k_hw_btcoex_disable_mci(struct ath_hw *ah)
+{
+        struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
+        int i;
+
+        ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
+
+        for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
+                REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i),
+                          btcoex_hw->wlan_weight[i]);
+}
+
 void ath9k_hw_btcoex_enable(struct ath_hw *ah)
 {
         struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
@@ -318,17 +332,18 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah)
                 ath9k_hw_btcoex_enable_2wire(ah);
                 break;
         case ATH_BTCOEX_CFG_3WIRE:
-                if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
-                        ath9k_hw_btcoex_enable_mci(ah);
-                        return;
-                }
                 ath9k_hw_btcoex_enable_3wire(ah);
                 break;
+        case ATH_BTCOEX_CFG_MCI:
+                ath9k_hw_btcoex_enable_mci(ah);
+                break;
         }
 
-        REG_RMW(ah, AR_GPIO_PDPU,
-                (0x2 << (btcoex_hw->btactive_gpio * 2)),
-                (0x3 << (btcoex_hw->btactive_gpio * 2)));
+        if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_MCI) {
+                REG_RMW(ah, AR_GPIO_PDPU,
+                        (0x2 << (btcoex_hw->btactive_gpio * 2)),
+                        (0x3 << (btcoex_hw->btactive_gpio * 2)));
+        }
 
         ah->btcoex_hw.enabled = true;
 }
@@ -340,14 +355,14 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah)
         int i;
 
         btcoex_hw->enabled = false;
-        if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
-                ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
-                for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
-                        REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i),
-                                  btcoex_hw->wlan_weight[i]);
+
+        if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_MCI) {
+                ath9k_hw_btcoex_disable_mci(ah);
                 return;
         }
-        ath9k_hw_set_gpio(ah, btcoex_hw->wlanactive_gpio, 0);
+
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                ath9k_hw_set_gpio(ah, btcoex_hw->wlanactive_gpio, 0);
 
         ath9k_hw_cfg_output(ah, btcoex_hw->wlanactive_gpio,
                         AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index 6de26ea5d5fa..cd2f0a2373cb 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -44,6 +44,9 @@
 
 #define AR9300_NUM_BT_WEIGHTS   4
 #define AR9300_NUM_WLAN_WEIGHTS 4
+
+#define ATH_AIC_MAX_BT_CHANNEL  79
+
 /* Defines the BT AR_BT_COEX_WGHT used */
 enum ath_stomp_type {
         ATH_BTCOEX_STOMP_ALL,
@@ -58,6 +61,7 @@ enum ath_btcoex_scheme {
         ATH_BTCOEX_CFG_NONE,
         ATH_BTCOEX_CFG_2WIRE,
         ATH_BTCOEX_CFG_3WIRE,
+        ATH_BTCOEX_CFG_MCI,
 };
 
 struct ath9k_hw_mci {
@@ -92,9 +96,18 @@ struct ath9k_hw_mci {
         u32 last_recovery;
 };
 
+struct ath9k_hw_aic {
+        bool aic_enabled;
+        u8 aic_cal_state;
+        u8 aic_caled_chan;
+        u32 aic_sram[ATH_AIC_MAX_BT_CHANNEL];
+        u32 aic_cal_start_time;
+};
+
 struct ath_btcoex_hw {
         enum ath_btcoex_scheme scheme;
         struct ath9k_hw_mci mci;
+        struct ath9k_hw_aic aic;
         bool enabled;
         u8 wlanactive_gpio;
         u8 btactive_gpio;
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index e200a6e3aca5..3e2e24e4843f 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -238,7 +238,6 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
 {
         struct ath9k_nfcal_hist *h = NULL;
         unsigned i, j;
-        int32_t val;
         u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
         struct ath_common *common = ath9k_hw_common(ah);
         s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
@@ -246,6 +245,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
         if (ah->caldata)
                 h = ah->caldata->nfCalHist;
 
+        ENABLE_REG_RMW_BUFFER(ah);
         for (i = 0; i < NUM_NF_READINGS; i++) {
                 if (chainmask & (1 << i)) {
                         s16 nfval;
@@ -258,10 +258,8 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
                         else
                                 nfval = default_nf;
 
-                        val = REG_READ(ah, ah->nf_regs[i]);
-                        val &= 0xFFFFFE00;
-                        val |= (((u32) nfval << 1) & 0x1ff);
-                        REG_WRITE(ah, ah->nf_regs[i], val);
+                        REG_RMW(ah, ah->nf_regs[i],
+                                (((u32) nfval << 1) & 0x1ff), 0x1ff);
                 }
         }
 
@@ -274,6 +272,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
         REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
                     AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
         REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
+        REG_RMW_BUFFER_FLUSH(ah);
 
         /*
          * Wait for load to complete, should be fast, a few 10s of us.
@@ -309,19 +308,17 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
          * by the median we just loaded.  This will be initial (and max) value
          * of next noise floor calibration the baseband does.
          */
-        ENABLE_REGWRITE_BUFFER(ah);
+        ENABLE_REG_RMW_BUFFER(ah);
         for (i = 0; i < NUM_NF_READINGS; i++) {
                 if (chainmask & (1 << i)) {
                         if ((i >= AR5416_MAX_CHAINS) && !IS_CHAN_HT40(chan))
                                 continue;
 
-                        val = REG_READ(ah, ah->nf_regs[i]);
-                        val &= 0xFFFFFE00;
-                        val |= (((u32) (-50) << 1) & 0x1ff);
-                        REG_WRITE(ah, ah->nf_regs[i], val);
+                        REG_RMW(ah, ah->nf_regs[i],
+                                        (((u32) (-50) << 1) & 0x1ff), 0x1ff);
                 }
         }
-        REGWRITE_BUFFER_FLUSH(ah);
+        REG_RMW_BUFFER_FLUSH(ah);
 
         return 0;
 }
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 50a2e0ac3b8b..dbf8f4959642 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1156,7 +1156,10 @@ static ssize_t write_file_tpc(struct file *file, const char __user *user_buf,
 
         if (tpc_enabled != ah->tpc_enabled) {
                 ah->tpc_enabled = tpc_enabled;
-                ath9k_hw_set_txpowerlimit(ah, sc->cur_chan->txpower, false);
+
+                mutex_lock(&sc->mutex);
+                ath9k_set_txpower(sc, NULL);
+                mutex_unlock(&sc->mutex);
         }
 
         return count;
diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c
index 726271c7c330..e98a9eaba7ff 100644
--- a/drivers/net/wireless/ath/ath9k/dfs.c
+++ b/drivers/net/wireless/ath/ath9k/dfs.c
@@ -126,8 +126,19 @@ ath9k_postprocess_radar_event(struct ath_softc *sc,
         DFS_STAT_INC(sc, pulses_detected);
         return true;
 }
-#undef PRI_CH_RADAR_FOUND
-#undef EXT_CH_RADAR_FOUND
+
+static void
+ath9k_dfs_process_radar_pulse(struct ath_softc *sc, struct pulse_event *pe)
+{
+        struct dfs_pattern_detector *pd = sc->dfs_detector;
+        DFS_STAT_INC(sc, pulses_processed);
+        if (pd == NULL)
+                return;
+        if (!pd->add_pulse(pd, pe))
+                return;
+        DFS_STAT_INC(sc, radar_detected);
+        ieee80211_radar_detected(sc->hw);
+}
 
 /*
  * DFS: check PHY-error for radar pulse and feed the detector
@@ -176,18 +187,21 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
         ard.pulse_length_pri = vdata_end[-3];
         pe.freq = ah->curchan->channel;
         pe.ts = mactime;
-        if (ath9k_postprocess_radar_event(sc, &ard, &pe)) {
-                struct dfs_pattern_detector *pd = sc->dfs_detector;
-                ath_dbg(common, DFS,
-                        "ath9k_dfs_process_phyerr: channel=%d, ts=%llu, "
-                        "width=%d, rssi=%d, delta_ts=%llu\n",
-                        pe.freq, pe.ts, pe.width, pe.rssi,
-                        pe.ts - sc->dfs_prev_pulse_ts);
-                sc->dfs_prev_pulse_ts = pe.ts;
-                DFS_STAT_INC(sc, pulses_processed);
-                if (pd != NULL && pd->add_pulse(pd, &pe)) {
-                        DFS_STAT_INC(sc, radar_detected);
-                        ieee80211_radar_detected(sc->hw);
-                }
+        if (!ath9k_postprocess_radar_event(sc, &ard, &pe))
+                return;
+
+        ath_dbg(common, DFS,
+                "ath9k_dfs_process_phyerr: type=%d, freq=%d, ts=%llu, "
+                "width=%d, rssi=%d, delta_ts=%llu\n",
+                ard.pulse_bw_info, pe.freq, pe.ts, pe.width, pe.rssi,
+                pe.ts - sc->dfs_prev_pulse_ts);
+        sc->dfs_prev_pulse_ts = pe.ts;
+        if (ard.pulse_bw_info & PRI_CH_RADAR_FOUND)
+                ath9k_dfs_process_radar_pulse(sc, &pe);
+        if (ard.pulse_bw_info & EXT_CH_RADAR_FOUND) {
+                pe.freq += IS_CHAN_HT40PLUS(ah->curchan) ? 20 : -20;
+                ath9k_dfs_process_radar_pulse(sc, &pe);
         }
 }
+#undef PRI_CH_RADAR_FOUND
+#undef EXT_CH_RADAR_FOUND
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
index 971d770722cf..cc81482c934d 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
@@ -27,12 +27,7 @@ void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val)
 void ath9k_hw_analog_shift_rmw(struct ath_hw *ah, u32 reg, u32 mask,
                                u32 shift, u32 val)
 {
-        u32 regVal;
-
-        regVal = REG_READ(ah, reg) & ~mask;
-        regVal |= (val << shift) & mask;
-
-        REG_WRITE(ah, reg, regVal);
+        REG_RMW(ah, reg, ((val << shift) & mask), mask);
 
         if (ah->config.analog_shiftreg)
                 udelay(100);
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index e5a78d4fd66e..4773da6dc6f2 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -389,6 +389,7 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
                 }
         }
 
+        ENABLE_REG_RMW_BUFFER(ah);
         REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_NUM_PD_GAIN,
                       (numXpdGain - 1) & 0x3);
         REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_GAIN_1,
@@ -396,6 +397,7 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
         REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_GAIN_2,
                       xpdGainValues[1]);
         REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_GAIN_3, 0);
+        REG_RMW_BUFFER_FLUSH(ah);
 
         for (i = 0; i < AR5416_EEP4K_MAX_CHAINS; i++) {
                 regChainOffset = i * 0x1000;
@@ -770,15 +772,14 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah,
                                  struct ar5416_eeprom_4k *eep,
                                  u8 txRxAttenLocal)
 {
-        REG_WRITE(ah, AR_PHY_SWITCH_CHAIN_0,
-                  pModal->antCtrlChain[0]);
+        ENABLE_REG_RMW_BUFFER(ah);
+        REG_RMW(ah, AR_PHY_SWITCH_CHAIN_0,
+                pModal->antCtrlChain[0], 0);
 
-        REG_WRITE(ah, AR_PHY_TIMING_CTRL4(0),
-                  (REG_READ(ah, AR_PHY_TIMING_CTRL4(0)) &
-                   ~(AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF |
-                     AR_PHY_TIMING_CTRL4_IQCORR_Q_I_COFF)) |
-                  SM(pModal->iqCalICh[0], AR_PHY_TIMING_CTRL4_IQCORR_Q_I_COFF) |
-                  SM(pModal->iqCalQCh[0], AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF));
+        REG_RMW(ah, AR_PHY_TIMING_CTRL4(0),
+                SM(pModal->iqCalICh[0], AR_PHY_TIMING_CTRL4_IQCORR_Q_I_COFF) |
+                SM(pModal->iqCalQCh[0], AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF),
+                AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF | AR_PHY_TIMING_CTRL4_IQCORR_Q_I_COFF);
 
         if ((eep->baseEepHeader.version & AR5416_EEP_VER_MINOR_MASK) >=
             AR5416_EEP_MINOR_VER_3) {
@@ -817,6 +818,7 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah,
                       AR9280_PHY_RXGAIN_TXRX_ATTEN, txRxAttenLocal);
         REG_RMW_FIELD(ah, AR_PHY_RXGAIN + 0x1000,
                       AR9280_PHY_RXGAIN_TXRX_MARGIN, pModal->rxTxMarginCh[0]);
+        REG_RMW_BUFFER_FLUSH(ah);
 }
 
 /*
@@ -928,6 +930,7 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
                 }
         }
 
+        ENABLE_REG_RMW_BUFFER(ah);
         if (AR_SREV_9271(ah)) {
                 ath9k_hw_analog_shift_rmw(ah,
                                           AR9285_AN_RF2G3,
@@ -1032,18 +1035,19 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
                                           AR9285_AN_RF2G4_DB2_4_S,
                                           db2[4]);
         }
+        REG_RMW_BUFFER_FLUSH(ah);
 
-
+        ENABLE_REG_RMW_BUFFER(ah);
         REG_RMW_FIELD(ah, AR_PHY_SETTLING, AR_PHY_SETTLING_SWITCH,
                       pModal->switchSettling);
         REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ, AR_PHY_DESIRED_SZ_ADC,
                       pModal->adcDesiredSize);
 
-        REG_WRITE(ah, AR_PHY_RF_CTL4,
-                  SM(pModal->txEndToXpaOff, AR_PHY_RF_CTL4_TX_END_XPAA_OFF) |
-                  SM(pModal->txEndToXpaOff, AR_PHY_RF_CTL4_TX_END_XPAB_OFF) |
-                  SM(pModal->txFrameToXpaOn, AR_PHY_RF_CTL4_FRAME_XPAA_ON)  |
-                  SM(pModal->txFrameToXpaOn, AR_PHY_RF_CTL4_FRAME_XPAB_ON));
+        REG_RMW(ah, AR_PHY_RF_CTL4,
+                SM(pModal->txEndToXpaOff, AR_PHY_RF_CTL4_TX_END_XPAA_OFF) |
+                SM(pModal->txEndToXpaOff, AR_PHY_RF_CTL4_TX_END_XPAB_OFF) |
+                SM(pModal->txFrameToXpaOn, AR_PHY_RF_CTL4_FRAME_XPAA_ON)  |
+                SM(pModal->txFrameToXpaOn, AR_PHY_RF_CTL4_FRAME_XPAB_ON), 0);
 
         REG_RMW_FIELD(ah, AR_PHY_RF_CTL3, AR_PHY_TX_END_TO_A2_RX_ON,
                       pModal->txEndToRxOn);
@@ -1072,6 +1076,8 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
                                       pModal->swSettleHt40);
         }
 
+        REG_RMW_BUFFER_FLUSH(ah);
+
         bb_desired_scale = (pModal->bb_scale_smrt_antenna &
                         EEP_4K_BB_DESIRED_SCALE_MASK);
         if ((pBase->txGainType == 0) && (bb_desired_scale != 0)) {
@@ -1080,6 +1086,7 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
                 mask = BIT(0)|BIT(5)|BIT(10)|BIT(15)|BIT(20)|BIT(25);
                 pwrctrl = mask * bb_desired_scale;
                 clr = mask * 0x1f;
+                ENABLE_REG_RMW_BUFFER(ah);
                 REG_RMW(ah, AR_PHY_TX_PWRCTRL8, pwrctrl, clr);
                 REG_RMW(ah, AR_PHY_TX_PWRCTRL10, pwrctrl, clr);
                 REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL12, pwrctrl, clr);
@@ -1094,6 +1101,7 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
                 clr = mask * 0x1f;
                 REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL11, pwrctrl, clr);
                 REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL13, pwrctrl, clr);
+                REG_RMW_BUFFER_FLUSH(ah);
         }
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 098059039351..056f516bf017 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -466,6 +466,7 @@ static void ath9k_hw_def_set_gain(struct ath_hw *ah,
                                   struct ar5416_eeprom_def *eep,
                                   u8 txRxAttenLocal, int regChainOffset, int i)
 {
+        ENABLE_REG_RMW_BUFFER(ah);
         if (AR5416_VER_MASK >= AR5416_EEP_MINOR_VER_3) {
                 txRxAttenLocal = pModal->txRxAttenCh[i];
 
@@ -483,16 +484,12 @@ static void ath9k_hw_def_set_gain(struct ath_hw *ah,
                               AR_PHY_GAIN_2GHZ_XATTEN2_DB,
                               pModal->xatten2Db[i]);
                 } else {
-                        REG_WRITE(ah, AR_PHY_GAIN_2GHZ + regChainOffset,
-                          (REG_READ(ah, AR_PHY_GAIN_2GHZ + regChainOffset) &
-                           ~AR_PHY_GAIN_2GHZ_BSW_MARGIN)
-                          | SM(pModal-> bswMargin[i],
-                               AR_PHY_GAIN_2GHZ_BSW_MARGIN));
-                        REG_WRITE(ah, AR_PHY_GAIN_2GHZ + regChainOffset,
-                          (REG_READ(ah, AR_PHY_GAIN_2GHZ + regChainOffset) &
-                           ~AR_PHY_GAIN_2GHZ_BSW_ATTEN)
-                          | SM(pModal->bswAtten[i],
-                               AR_PHY_GAIN_2GHZ_BSW_ATTEN));
+                        REG_RMW(ah, AR_PHY_GAIN_2GHZ + regChainOffset,
+                                SM(pModal-> bswMargin[i], AR_PHY_GAIN_2GHZ_BSW_MARGIN),
+                                AR_PHY_GAIN_2GHZ_BSW_MARGIN);
+                        REG_RMW(ah, AR_PHY_GAIN_2GHZ + regChainOffset,
+                                SM(pModal->bswAtten[i], AR_PHY_GAIN_2GHZ_BSW_ATTEN),
+                                AR_PHY_GAIN_2GHZ_BSW_ATTEN);
                 }
         }
 
@@ -504,17 +501,14 @@ static void ath9k_hw_def_set_gain(struct ath_hw *ah,
                       AR_PHY_RXGAIN + regChainOffset,
                       AR9280_PHY_RXGAIN_TXRX_MARGIN, pModal->rxTxMarginCh[i]);
         } else {
-                REG_WRITE(ah,
-                          AR_PHY_RXGAIN + regChainOffset,
-                          (REG_READ(ah, AR_PHY_RXGAIN + regChainOffset) &
-                           ~AR_PHY_RXGAIN_TXRX_ATTEN)
-                          | SM(txRxAttenLocal, AR_PHY_RXGAIN_TXRX_ATTEN));
-                REG_WRITE(ah,
-                          AR_PHY_GAIN_2GHZ + regChainOffset,
-                          (REG_READ(ah, AR_PHY_GAIN_2GHZ + regChainOffset) &
-                           ~AR_PHY_GAIN_2GHZ_RXTX_MARGIN) |
-                          SM(pModal->rxTxMarginCh[i], AR_PHY_GAIN_2GHZ_RXTX_MARGIN));
+                REG_RMW(ah, AR_PHY_RXGAIN + regChainOffset,
+                        SM(txRxAttenLocal, AR_PHY_RXGAIN_TXRX_ATTEN),
+                        AR_PHY_RXGAIN_TXRX_ATTEN);
+                REG_RMW(ah, AR_PHY_GAIN_2GHZ + regChainOffset,
+                        SM(pModal->rxTxMarginCh[i], AR_PHY_GAIN_2GHZ_RXTX_MARGIN),
+                        AR_PHY_GAIN_2GHZ_RXTX_MARGIN);
         }
+        REG_RMW_BUFFER_FLUSH(ah);
 }
 
 static void ath9k_hw_def_set_board_values(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index da344b27326c..284706798c71 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -69,9 +69,15 @@ void ath_fill_led_pin(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
 
-        if (AR_SREV_9100(ah) || (ah->led_pin >= 0))
+        if (AR_SREV_9100(ah))
                 return;
 
+        if (ah->led_pin >= 0) {
+                if (!((1 << ah->led_pin) & AR_GPIO_OE_OUT_MASK))
+                        ath9k_hw_request_gpio(ah, ah->led_pin, "ath9k-led");
+                return;
+        }
+
         if (AR_SREV_9287(ah))
                 ah->led_pin = ATH_LED_PIN_9287;
         else if (AR_SREV_9485(sc->sc_ah))
@@ -202,17 +208,16 @@ static void ath_btcoex_period_timer(unsigned long data)
         }
         spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
 
-        ath9k_mci_update_rssi(sc);
-
         ath9k_ps_wakeup(sc);
+        spin_lock_bh(&btcoex->btcoex_lock);
 
-        if (!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
-                ath_detect_bt_priority(sc);
-
-        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI) {
+                ath9k_mci_update_rssi(sc);
                 ath_mci_ftp_adjust(sc);
+        }
 
-        spin_lock_bh(&btcoex->btcoex_lock);
+        if (!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
+                ath_detect_bt_priority(sc);
 
         stomp_type = btcoex->bt_stomp_type;
         timer_period = btcoex->btcoex_no_stomp;
@@ -252,9 +257,6 @@ static void ath_btcoex_no_stomp_timer(unsigned long arg)
         struct ath_softc *sc = (struct ath_softc *)arg;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_btcoex *btcoex = &sc->btcoex;
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        ath_dbg(common, BTCOEX, "no stomp timer running\n");
 
         ath9k_ps_wakeup(sc);
         spin_lock_bh(&btcoex->btcoex_lock);
@@ -271,7 +273,7 @@ static void ath_btcoex_no_stomp_timer(unsigned long arg)
         ath9k_ps_restore(sc);
 }
 
-static int ath_init_btcoex_timer(struct ath_softc *sc)
+static void ath_init_btcoex_timer(struct ath_softc *sc)
 {
         struct ath_btcoex *btcoex = &sc->btcoex;
 
@@ -280,6 +282,7 @@ static int ath_init_btcoex_timer(struct ath_softc *sc)
                 btcoex->btcoex_period / 100;
         btcoex->btscan_no_stomp = (100 - ATH_BTCOEX_BTSCAN_DUTY_CYCLE) *
                                    btcoex->btcoex_period / 100;
+        btcoex->bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
 
         setup_timer(&btcoex->period_timer, ath_btcoex_period_timer,
                         (unsigned long) sc);
@@ -287,8 +290,6 @@ static int ath_init_btcoex_timer(struct ath_softc *sc)
                         (unsigned long) sc);
 
         spin_lock_init(&btcoex->btcoex_lock);
-
-        return 0;
 }
 
 /*
@@ -299,6 +300,10 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)
         struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_hw *ah = sc->sc_ah;
 
+        if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_3WIRE &&
+            ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_MCI)
+                return;
+
         ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex timers\n");
 
         /* make sure duty cycle timer is also stopped when resuming */
@@ -312,13 +317,19 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)
         mod_timer(&btcoex->period_timer, jiffies);
 }
 
-
 /*
  * Pause btcoex timer and bt duty cycle timer
  */
 void ath9k_btcoex_timer_pause(struct ath_softc *sc)
 {
         struct ath_btcoex *btcoex = &sc->btcoex;
+        struct ath_hw *ah = sc->sc_ah;
+
+        if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_3WIRE &&
+            ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_MCI)
+                return;
+
+        ath_dbg(ath9k_hw_common(ah), BTCOEX, "Stopping btcoex timers\n");
 
         del_timer_sync(&btcoex->period_timer);
         del_timer_sync(&btcoex->no_stomp_timer);
@@ -356,33 +367,33 @@ void ath9k_start_btcoex(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
 
-        if ((ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) &&
-            !ah->btcoex_hw.enabled) {
-                if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
-                        ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,
-                                                   AR_STOMP_LOW_WLAN_WGHT, 0);
-                else
-                        ath9k_hw_btcoex_set_weight(ah, 0, 0,
-                                                   ATH_BTCOEX_STOMP_NONE);
-                ath9k_hw_btcoex_enable(ah);
+        if (ah->btcoex_hw.enabled ||
+            ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)
+                return;
 
-                if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)
-                        ath9k_btcoex_timer_resume(sc);
-        }
+        if (!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
+                ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,
+                                           AR_STOMP_LOW_WLAN_WGHT, 0);
+        else
+                ath9k_hw_btcoex_set_weight(ah, 0, 0,
+                                           ATH_BTCOEX_STOMP_NONE);
+        ath9k_hw_btcoex_enable(ah);
+        ath9k_btcoex_timer_resume(sc);
 }
 
 void ath9k_stop_btcoex(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
 
-        if (ah->btcoex_hw.enabled &&
-            ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {
-                if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)
-                        ath9k_btcoex_timer_pause(sc);
-                ath9k_hw_btcoex_disable(ah);
-                if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
-                        ath_mci_flush_profile(&sc->btcoex.mci);
-        }
+        if (!ah->btcoex_hw.enabled ||
+            ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)
+                return;
+
+        ath9k_btcoex_timer_pause(sc);
+        ath9k_hw_btcoex_disable(ah);
+
+        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                ath_mci_flush_profile(&sc->btcoex.mci);
 }
 
 void ath9k_deinit_btcoex(struct ath_softc *sc)
@@ -409,22 +420,20 @@ int ath9k_init_btcoex(struct ath_softc *sc)
                 break;
         case ATH_BTCOEX_CFG_3WIRE:
                 ath9k_hw_btcoex_init_3wire(sc->sc_ah);
-                r = ath_init_btcoex_timer(sc);
-                if (r)
-                        return -1;
+                ath_init_btcoex_timer(sc);
                 txq = sc->tx.txq_map[IEEE80211_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
-                sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-                if (ath9k_hw_mci_is_enabled(ah)) {
-                        sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
-                        INIT_LIST_HEAD(&sc->btcoex.mci.info);
+                break;
+        case ATH_BTCOEX_CFG_MCI:
+                ath_init_btcoex_timer(sc);
 
-                        r = ath_mci_setup(sc);
-                        if (r)
-                                return r;
+                sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
+                INIT_LIST_HEAD(&sc->btcoex.mci.info);
+                ath9k_hw_btcoex_init_mci(ah);
 
-                        ath9k_hw_btcoex_init_mci(ah);
-                }
+                r = ath_mci_setup(sc);
+                if (r)
+                        return r;
 
                 break;
         default:
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 8e7153b186ed..10c02f5cbc5e 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -40,6 +40,7 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
         { USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */
         { USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
         { USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
+        { USB_DEVICE(0x0471, 0x209e) }, /* Philips (or NXP) PTA01 */
 
         { USB_DEVICE(0x0cf3, 0x7015),
           .driver_info = AR9287_USB },  /* Atheros */
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 300d3671d0ef..e82a0d4ce23f 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -444,6 +444,10 @@ static inline void ath9k_htc_stop_btcoex(struct ath9k_htc_priv *priv)
 #define OP_BT_SCAN                 BIT(4)
 #define OP_TSF_RESET               BIT(6)
 
+enum htc_op_flags {
+        HTC_FWFLAG_NO_RMW,
+};
+
 struct ath9k_htc_priv {
         struct device *dev;
         struct ieee80211_hw *hw;
@@ -482,6 +486,7 @@ struct ath9k_htc_priv {
         bool reconfig_beacon;
         unsigned int rxfilter;
         unsigned long op_flags;
+        unsigned long fw_flags;
 
         struct ath9k_hw_cal_data caldata;
         struct ath_spec_scan_priv spec_priv;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index fd229409f676..d7beefe60683 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -376,17 +376,139 @@ static void ath9k_regwrite_flush(void *hw_priv)
         mutex_unlock(&priv->wmi->multi_write_mutex);
 }
 
-static u32 ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)
+static void ath9k_reg_rmw_buffer(void *hw_priv,
+                                 u32 reg_offset, u32 set, u32 clr)
+{
+        struct ath_hw *ah = (struct ath_hw *) hw_priv;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
+        u32 rsp_status;
+        int r;
+
+        mutex_lock(&priv->wmi->multi_rmw_mutex);
+
+        /* Store the register/value */
+        priv->wmi->multi_rmw[priv->wmi->multi_rmw_idx].reg =
+                cpu_to_be32(reg_offset);
+        priv->wmi->multi_rmw[priv->wmi->multi_rmw_idx].set =
+                cpu_to_be32(set);
+        priv->wmi->multi_rmw[priv->wmi->multi_rmw_idx].clr =
+                cpu_to_be32(clr);
+
+        priv->wmi->multi_rmw_idx++;
+
+        /* If the buffer is full, send it out. */
+        if (priv->wmi->multi_rmw_idx == MAX_RMW_CMD_NUMBER) {
+                r = ath9k_wmi_cmd(priv->wmi, WMI_REG_RMW_CMDID,
+                          (u8 *) &priv->wmi->multi_rmw,
+                          sizeof(struct register_write) * priv->wmi->multi_rmw_idx,
+                          (u8 *) &rsp_status, sizeof(rsp_status),
+                          100);
+                if (unlikely(r)) {
+                        ath_dbg(common, WMI,
+                                "REGISTER RMW FAILED, multi len: %d\n",
+                                priv->wmi->multi_rmw_idx);
+                }
+                priv->wmi->multi_rmw_idx = 0;
+        }
+
+        mutex_unlock(&priv->wmi->multi_rmw_mutex);
+}
+
+static void ath9k_reg_rmw_flush(void *hw_priv)
 {
-        u32 val;
+        struct ath_hw *ah = (struct ath_hw *) hw_priv;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
+        u32 rsp_status;
+        int r;
+
+        if (test_bit(HTC_FWFLAG_NO_RMW, &priv->fw_flags))
+                return;
+
+        atomic_dec(&priv->wmi->m_rmw_cnt);
 
-        val = ath9k_regread(hw_priv, reg_offset);
-        val &= ~clr;
-        val |= set;
-        ath9k_regwrite(hw_priv, val, reg_offset);
+        mutex_lock(&priv->wmi->multi_rmw_mutex);
+
+        if (priv->wmi->multi_rmw_idx) {
+                r = ath9k_wmi_cmd(priv->wmi, WMI_REG_RMW_CMDID,
+                          (u8 *) &priv->wmi->multi_rmw,
+                          sizeof(struct register_rmw) * priv->wmi->multi_rmw_idx,
+                          (u8 *) &rsp_status, sizeof(rsp_status),
+                          100);
+                if (unlikely(r)) {
+                        ath_dbg(common, WMI,
+                                "REGISTER RMW FAILED, multi len: %d\n",
+                                priv->wmi->multi_rmw_idx);
+                }
+                priv->wmi->multi_rmw_idx = 0;
+        }
+
+        mutex_unlock(&priv->wmi->multi_rmw_mutex);
+}
+
+static void ath9k_enable_rmw_buffer(void *hw_priv)
+{
+        struct ath_hw *ah = (struct ath_hw *) hw_priv;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
+
+        if (test_bit(HTC_FWFLAG_NO_RMW, &priv->fw_flags))
+                return;
+
+        atomic_inc(&priv->wmi->m_rmw_cnt);
+}
+
+static u32 ath9k_reg_rmw_single(void *hw_priv,
+                                 u32 reg_offset, u32 set, u32 clr)
+{
+        struct ath_hw *ah = (struct ath_hw *) hw_priv;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
+        struct register_rmw buf, buf_ret;
+        int ret;
+        u32 val = 0;
+
+        buf.reg = cpu_to_be32(reg_offset);
+        buf.set = cpu_to_be32(set);
+        buf.clr = cpu_to_be32(clr);
+
+        ret = ath9k_wmi_cmd(priv->wmi, WMI_REG_RMW_CMDID,
+                          (u8 *) &buf, sizeof(buf),
+                          (u8 *) &buf_ret, sizeof(buf_ret),
+                          100);
+        if (unlikely(ret)) {
+                ath_dbg(common, WMI, "REGISTER RMW FAILED:(0x%04x, %d)\n",
+                        reg_offset, ret);
+        }
         return val;
 }
 
+static u32 ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)
+{
+        struct ath_hw *ah = (struct ath_hw *) hw_priv;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
+
+        if (test_bit(HTC_FWFLAG_NO_RMW, &priv->fw_flags)) {
+                u32 val;
+
+                val = REG_READ(ah, reg_offset);
+                val &= ~clr;
+                val |= set;
+                REG_WRITE(ah, reg_offset, val);
+
+                return 0;
+        }
+
+        if (atomic_read(&priv->wmi->m_rmw_cnt))
+                ath9k_reg_rmw_buffer(hw_priv, reg_offset, set, clr);
+        else
+                ath9k_reg_rmw_single(hw_priv, reg_offset, set, clr);
+
+        return 0;
+}
+
 static void ath_usb_read_cachesize(struct ath_common *common, int *csz)
 {
         *csz = L1_CACHE_BYTES >> 2;
@@ -501,6 +623,8 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
         ah->reg_ops.write = ath9k_regwrite;
         ah->reg_ops.enable_write_buffer = ath9k_enable_regwrite_buffer;
         ah->reg_ops.write_flush = ath9k_regwrite_flush;
+        ah->reg_ops.enable_rmw_buffer = ath9k_enable_rmw_buffer;
+        ah->reg_ops.rmw_flush = ath9k_reg_rmw_flush;
         ah->reg_ops.rmw = ath9k_reg_rmw;
         priv->ah = ah;
 
@@ -686,6 +810,12 @@ static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv)
                 return -EINVAL;
         }
 
+        if (priv->fw_version_major == 1 && priv->fw_version_minor < 4)
+                set_bit(HTC_FWFLAG_NO_RMW, &priv->fw_flags);
+
+        dev_info(priv->dev, "FW RMW support: %s\n",
+                test_bit(HTC_FWFLAG_NO_RMW, &priv->fw_flags) ? "Off" : "On");
+
         return 0;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 92d5a6c5a225..564923c0df87 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -149,7 +149,7 @@ static void ath9k_htc_set_mac_bssid_mask(struct ath9k_htc_priv *priv,
          * when matching addresses.
          */
         iter_data.hw_macaddr = NULL;
-        memset(&iter_data.mask, 0xff, ETH_ALEN);
+        eth_broadcast_addr(iter_data.mask);
 
         if (vif)
                 ath9k_htc_bssid_iter(&iter_data, vif->addr, vif);
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h
index 88769b64b20b..232339b05540 100644
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
@@ -108,6 +108,14 @@ static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
                 ath9k_hw_ops(ah)->set_bt_ant_diversity(ah, enable);
 }
 
+static inline bool ath9k_hw_is_aic_enabled(struct ath_hw *ah)
+{
+        if (ath9k_hw_private_ops(ah)->is_aic_enabled)
+                return ath9k_hw_private_ops(ah)->is_aic_enabled(ah);
+
+        return false;
+}
+
 #endif
 
 /* Private hardware call ops */
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 8529014e1a5e..5e15e8e10ed3 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -20,6 +20,7 @@
 #include <linux/time.h>
 #include <linux/bitops.h>
 #include <linux/etherdevice.h>
+#include <linux/gpio.h>
 #include <asm/unaligned.h>
 
 #include "hw.h"
@@ -121,6 +122,36 @@ void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array,
         REGWRITE_BUFFER_FLUSH(ah);
 }
 
+void ath9k_hw_read_array(struct ath_hw *ah, u32 array[][2], int size)
+{
+        u32 *tmp_reg_list, *tmp_data;
+        int i;
+
+        tmp_reg_list = kmalloc(size * sizeof(u32), GFP_KERNEL);
+        if (!tmp_reg_list) {
+                dev_err(ah->dev, "%s: tmp_reg_list: alloc filed\n", __func__);
+                return;
+        }
+
+        tmp_data = kmalloc(size * sizeof(u32), GFP_KERNEL);
+        if (!tmp_data) {
+                dev_err(ah->dev, "%s tmp_data: alloc filed\n", __func__);
+                goto error_tmp_data;
+        }
+
+        for (i = 0; i < size; i++)
+                tmp_reg_list[i] = array[i][0];
+
+        REG_READ_MULTI(ah, tmp_reg_list, tmp_data, size);
+
+        for (i = 0; i < size; i++)
+                array[i][1] = tmp_data[i];
+
+        kfree(tmp_data);
+error_tmp_data:
+        kfree(tmp_reg_list);
+}
+
 u32 ath9k_hw_reverse_bits(u32 val, u32 n)
 {
         u32 retval;
@@ -366,6 +397,9 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
                 ah->config.rimt_first = 700;
         }
 
+        if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
+                ah->config.pll_pwrsave = 7;
+
         /*
          * We need this for PCI devices only (Cardbus, PCI, miniPCI)
          * _and_ if on non-uniprocessor systems (Multiprocessor/HT).
@@ -1197,6 +1231,7 @@ static void ath9k_hw_set_operating_mode(struct ath_hw *ah, int opmode)
         u32 mask = AR_STA_ID1_STA_AP | AR_STA_ID1_ADHOC;
         u32 set = AR_STA_ID1_KSRCH_MODE;
 
+        ENABLE_REG_RMW_BUFFER(ah);
         switch (opmode) {
         case NL80211_IFTYPE_ADHOC:
                 if (!AR_SREV_9340_13(ah)) {
@@ -1218,6 +1253,7 @@ static void ath9k_hw_set_operating_mode(struct ath_hw *ah, int opmode)
                 break;
         }
         REG_RMW(ah, AR_STA_ID1, set, mask);
+        REG_RMW_BUFFER_FLUSH(ah);
 }
 
 void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
@@ -1930,6 +1966,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (!ath9k_hw_mci_is_enabled(ah))
                 REG_WRITE(ah, AR_OBS, 8);
 
+        ENABLE_REG_RMW_BUFFER(ah);
         if (ah->config.rx_intr_mitigation) {
                 REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, ah->config.rimt_last);
                 REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, ah->config.rimt_first);
@@ -1939,6 +1976,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                 REG_RMW_FIELD(ah, AR_TIMT, AR_TIMT_LAST, 300);
                 REG_RMW_FIELD(ah, AR_TIMT, AR_TIMT_FIRST, 750);
         }
+        REG_RMW_BUFFER_FLUSH(ah);
 
         ath9k_hw_init_bb(ah, chan);
 
@@ -2674,11 +2712,23 @@ void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val)
         if (AR_SREV_9271(ah))
                 val = ~val;
 
-        REG_RMW(ah, AR_GPIO_IN_OUT, ((val & 1) << gpio),
-                AR_GPIO_BIT(gpio));
+        if ((1 << gpio) & AR_GPIO_OE_OUT_MASK)
+                REG_RMW(ah, AR_GPIO_IN_OUT, ((val & 1) << gpio),
+                        AR_GPIO_BIT(gpio));
+        else
+                gpio_set_value(gpio, val & 1);
 }
 EXPORT_SYMBOL(ath9k_hw_set_gpio);
 
+void ath9k_hw_request_gpio(struct ath_hw *ah, u32 gpio, const char *label)
+{
+        if (gpio >= ah->caps.num_gpio_pins)
+                return;
+
+        gpio_request_one(gpio, GPIOF_DIR_OUT | GPIOF_INIT_LOW, label);
+}
+EXPORT_SYMBOL(ath9k_hw_request_gpio);
+
 void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna)
 {
         REG_WRITE(ah, AR_DEF_ANTENNA, (antenna & 0x7));
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index e82e570de330..c1d2d0340feb 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -27,6 +27,7 @@
 #include "eeprom.h"
 #include "calib.h"
 #include "reg.h"
+#include "reg_mci.h"
 #include "phy.h"
 #include "btcoex.h"
 #include "dynack.h"
@@ -99,6 +100,18 @@
                         (_ah)->reg_ops.write_flush((_ah));      \
         } while (0)
 
+#define ENABLE_REG_RMW_BUFFER(_ah)                                      \
+        do {                                                            \
+                if ((_ah)->reg_ops.enable_rmw_buffer)   \
+                        (_ah)->reg_ops.enable_rmw_buffer((_ah)); \
+        } while (0)
+
+#define REG_RMW_BUFFER_FLUSH(_ah)                                       \
+        do {                                                            \
+                if ((_ah)->reg_ops.rmw_flush)           \
+                        (_ah)->reg_ops.rmw_flush((_ah));        \
+        } while (0)
+
 #define PR_EEP(_s, _val)                                                \
         do {                                                            \
                 len += scnprintf(buf + len, size - len, "%20s : %10d\n",\
@@ -125,6 +138,8 @@
 
 #define REG_WRITE_ARRAY(iniarray, column, regWr) \
         ath9k_hw_write_array(ah, iniarray, column, &(regWr))
+#define REG_READ_ARRAY(ah, array, size) \
+        ath9k_hw_read_array(ah, array, size)
 
 #define AR_GPIO_OUTPUT_MUX_AS_OUTPUT             0
 #define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1
@@ -308,6 +323,12 @@ enum ath9k_hw_hang_checks {
         HW_MAC_HANG               = BIT(5),
 };
 
+#define AR_PCIE_PLL_PWRSAVE_CONTROL BIT(0)
+#define AR_PCIE_PLL_PWRSAVE_ON_D3   BIT(1)
+#define AR_PCIE_PLL_PWRSAVE_ON_D0   BIT(2)
+#define AR_PCIE_CDR_PWRSAVE_ON_D3   BIT(3)
+#define AR_PCIE_CDR_PWRSAVE_ON_D0   BIT(4)
+
 struct ath9k_ops_config {
         int dma_beacon_response_time;
         int sw_beacon_response_time;
@@ -334,7 +355,7 @@ struct ath9k_ops_config {
         u32 ant_ctrl_comm2g_switch_enable;
         bool xatten_margin_cfg;
         bool alt_mingainidx;
-        bool no_pll_pwrsave;
+        u8 pll_pwrsave;
         bool tx_gain_buffalo;
         bool led_active_high;
 };
@@ -646,6 +667,10 @@ struct ath_hw_private_ops {
 
         /* ANI */
         void (*ani_cache_ini_regs)(struct ath_hw *ah);
+
+#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
+        bool (*is_aic_enabled)(struct ath_hw *ah);
+#endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
 };
 
 /**
@@ -999,6 +1024,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio);
 void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio,
                          u32 ah_signal_type);
 void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val);
+void ath9k_hw_request_gpio(struct ath_hw *ah, u32 gpio, const char *label);
 void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna);
 
 /* General Operation */
@@ -1007,6 +1033,7 @@ void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
 bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout);
 void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array,
                           int column, unsigned int *writecnt);
+void ath9k_hw_read_array(struct ath_hw *ah, u32 array[][2], int size);
 u32 ath9k_hw_reverse_bits(u32 val, u32 n);
 u16 ath9k_hw_computetxtime(struct ath_hw *ah,
                            u8 phy, int kbps,
@@ -1116,6 +1143,7 @@ void ath9k_hw_set_cts_timeout(struct ath_hw *ah, u32 us);
 void ath9k_hw_setslottime(struct ath_hw *ah, u32 us);
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
+void ar9003_hw_attach_aic_ops(struct ath_hw *ah);
 static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah)
 {
         return ah->btcoex_hw.enabled;
@@ -1133,6 +1161,9 @@ ath9k_hw_get_btcoex_scheme(struct ath_hw *ah)
         return ah->btcoex_hw.scheme;
 }
 #else
+static inline void ar9003_hw_attach_aic_ops(struct ath_hw *ah)
+{
+}
 static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah)
 {
         return false;
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 6c6e88495394..f8d11efa7b0f 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -141,6 +141,16 @@ static unsigned int ath9k_ioread32(void *hw_priv, u32 reg_offset)
         return val;
 }
 
+static void ath9k_multi_ioread32(void *hw_priv, u32 *addr,
+                                u32 *val, u16 count)
+{
+        int i;
+
+        for (i = 0; i < count; i++)
+                val[i] = ath9k_ioread32(hw_priv, addr[i]);
+}
+
+
 static unsigned int __ath9k_reg_rmw(struct ath_softc *sc, u32 reg_offset,
                                     u32 set, u32 clr)
 {
@@ -437,8 +447,15 @@ static void ath9k_init_pcoem_platform(struct ath_softc *sc)
                 ath_info(common, "Enable WAR for ASPM D3/L1\n");
         }
 
+        /*
+         * The default value of pll_pwrsave is 1.
+         * For certain AR9485 cards, it is set to 0.
+         * For AR9462, AR9565 it's set to 7.
+         */
+        ah->config.pll_pwrsave = 1;
+
         if (sc->driver_data & ATH9K_PCI_NO_PLL_PWRSAVE) {
-                ah->config.no_pll_pwrsave = true;
+                ah->config.pll_pwrsave = 0;
                 ath_info(common, "Disable PLL PowerSave\n");
         }
 
@@ -530,6 +547,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         ah->hw = sc->hw;
         ah->hw_version.devid = devid;
         ah->reg_ops.read = ath9k_ioread32;
+        ah->reg_ops.multi_read = ath9k_multi_ioread32;
         ah->reg_ops.write = ath9k_iowrite32;
         ah->reg_ops.rmw = ath9k_reg_rmw;
         pCap = &ah->caps;
@@ -763,7 +781,8 @@ static const struct ieee80211_iface_combination if_comb[] = {
                 .num_different_channels = 1,
                 .beacon_int_infra_match = true,
                 .radar_detect_widths =  BIT(NL80211_CHAN_WIDTH_20_NOHT) |
-                                        BIT(NL80211_CHAN_WIDTH_20),
+                                        BIT(NL80211_CHAN_WIDTH_20) |
+                                        BIT(NL80211_CHAN_WIDTH_40),
         }
 #endif
 };
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 9ede991b8d76..b0badef71ce7 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -994,7 +994,7 @@ void ath9k_calculate_iter_data(struct ath_softc *sc,
          * BSSID mask when matching addresses.
          */
         memset(iter_data, 0, sizeof(*iter_data));
-        memset(&iter_data->mask, 0xff, ETH_ALEN);
+        eth_broadcast_addr(iter_data->mask);
         iter_data->slottime = ATH9K_SLOT_TIME_9;
 
         list_for_each_entry(avp, &ctx->vifs, list)
@@ -1139,7 +1139,7 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
                         ctx->primary_sta = iter_data.primary_sta;
                 } else {
                         ctx->primary_sta = NULL;
-                        memset(common->curbssid, 0, ETH_ALEN);
+                        eth_zero_addr(common->curbssid);
                         common->curaid = 0;
                         ath9k_hw_write_associd(sc->sc_ah);
                         if (ath9k_hw_mci_is_enabled(sc->sc_ah))
@@ -1172,6 +1172,38 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
         ath9k_ps_restore(sc);
 }
 
+static void ath9k_tpc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
+{
+        int *power = (int *)data;
+
+        if (*power < vif->bss_conf.txpower)
+                *power = vif->bss_conf.txpower;
+}
+
+/* Called with sc->mutex held. */
+void ath9k_set_txpower(struct ath_softc *sc, struct ieee80211_vif *vif)
+{
+        int power;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
+
+        ath9k_ps_wakeup(sc);
+        if (ah->tpc_enabled) {
+                power = (vif) ? vif->bss_conf.txpower : -1;
+                ieee80211_iterate_active_interfaces_atomic(
+                                sc->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                                ath9k_tpc_vif_iter, &power);
+                if (power == -1)
+                        power = sc->hw->conf.power_level;
+        } else {
+                power = sc->hw->conf.power_level;
+        }
+        sc->cur_chan->txpower = 2 * power;
+        ath9k_hw_set_txpowerlimit(ah, sc->cur_chan->txpower, false);
+        sc->cur_chan->cur_txpower = reg->max_power_level;
+        ath9k_ps_restore(sc);
+}
+
 static void ath9k_assign_hw_queues(struct ieee80211_hw *hw,
                                    struct ieee80211_vif *vif)
 {
@@ -1225,6 +1257,8 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
 
         ath9k_assign_hw_queues(hw, vif);
 
+        ath9k_set_txpower(sc, vif);
+
         an->sc = sc;
         an->sta = NULL;
         an->vif = vif;
@@ -1265,6 +1299,8 @@ static int ath9k_change_interface(struct ieee80211_hw *hw,
         ath9k_assign_hw_queues(hw, vif);
         ath9k_calculate_summary_state(sc, avp->chanctx);
 
+        ath9k_set_txpower(sc, vif);
+
         mutex_unlock(&sc->mutex);
         return 0;
 }
@@ -1294,6 +1330,8 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
 
         ath9k_calculate_summary_state(sc, avp->chanctx);
 
+        ath9k_set_txpower(sc, NULL);
+
         mutex_unlock(&sc->mutex);
 }
 
@@ -1397,14 +1435,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 ath_chanctx_set_channel(sc, ctx, &hw->conf.chandef);
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_POWER) {
-                ath_dbg(common, CONFIG, "Set power: %d\n", conf->power_level);
-                sc->cur_chan->txpower = 2 * conf->power_level;
-                ath9k_cmn_update_txpow(ah, sc->cur_chan->cur_txpower,
-                                       sc->cur_chan->txpower,
-                                       &sc->cur_chan->cur_txpower);
-        }
-
         mutex_unlock(&sc->mutex);
         ath9k_ps_restore(sc);
 
@@ -1764,6 +1794,12 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
         if (changed & CHECK_ANI)
                 ath_check_ani(sc);
 
+        if (changed & BSS_CHANGED_TXPOWER) {
+                ath_dbg(common, CONFIG, "vif %pM power %d dbm power_type %d\n",
+                        vif->addr, bss_conf->txpower, bss_conf->txpower_type);
+                ath9k_set_txpower(sc, vif);
+        }
+
         mutex_unlock(&sc->mutex);
         ath9k_ps_restore(sc);
 
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 3f7a11edb82a..66596b95273f 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -495,7 +495,7 @@ void ath_mci_intr(struct ath_softc *sc)
         ar9003_mci_get_interrupt(sc->sc_ah, &mci_int, &mci_int_rxmsg);
 
         if (ar9003_mci_state(ah, MCI_STATE_ENABLE) == 0) {
-                ar9003_mci_get_next_gpm_offset(ah, true, NULL);
+                ar9003_mci_state(ah, MCI_STATE_INIT_GPM_OFFSET);
                 return;
         }
 
@@ -559,8 +559,7 @@ void ath_mci_intr(struct ath_softc *sc)
                                 return;
 
                         pgpm = mci->gpm_buf.bf_addr;
-                        offset = ar9003_mci_get_next_gpm_offset(ah, false,
-                                                                &more_data);
+                        offset = ar9003_mci_get_next_gpm_offset(ah, &more_data);
 
                         if (offset == MCI_GPM_INVALID)
                                 break;
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 9587ec655680..caba54ddad25 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -958,6 +958,8 @@
 
 #define AR_SREV_9550(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9550))
+#define AR_SREV_9550_OR_LATER(_ah) \
+        (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9550))
 
 #define AR_SREV_9580(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \
@@ -1128,6 +1130,8 @@ enum {
 
 #define AR_GPIO_OE_OUT                           (AR_SREV_9340(ah) ? 0x4030 : \
                                                   (AR_SREV_9300_20_OR_LATER(ah) ? 0x4050 : 0x404c))
+#define AR_GPIO_OE_OUT_MASK                      (AR_SREV_9550_OR_LATER(ah) ? \
+                                                  0x0000000F : 0xFFFFFFFF)
 #define AR_GPIO_OE_OUT_DRV                       0x3
 #define AR_GPIO_OE_OUT_DRV_NO                    0x0
 #define AR_GPIO_OE_OUT_DRV_LOW                   0x1
@@ -2044,279 +2048,4 @@ enum {
 #define AR_PHY_AGC_CONTROL_YCOK_MAX             0x000003c0
 #define AR_PHY_AGC_CONTROL_YCOK_MAX_S           6
 
-/* MCI Registers */
-
-#define AR_MCI_COMMAND0                         0x1800
-#define AR_MCI_COMMAND0_HEADER                  0xFF
-#define AR_MCI_COMMAND0_HEADER_S                0
-#define AR_MCI_COMMAND0_LEN                     0x1f00
-#define AR_MCI_COMMAND0_LEN_S                   8
-#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP       0x2000
-#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP_S     13
-
-#define AR_MCI_COMMAND1                         0x1804
-
-#define AR_MCI_COMMAND2                         0x1808
-#define AR_MCI_COMMAND2_RESET_TX                0x01
-#define AR_MCI_COMMAND2_RESET_TX_S              0
-#define AR_MCI_COMMAND2_RESET_RX                0x02
-#define AR_MCI_COMMAND2_RESET_RX_S              1
-#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES     0x3FC
-#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES_S   2
-#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP        0x400
-#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP_S      10
-
-#define AR_MCI_RX_CTRL                          0x180c
-
-#define AR_MCI_TX_CTRL                          0x1810
-/* 0 = no division, 1 = divide by 2, 2 = divide by 4, 3 = divide by 8 */
-#define AR_MCI_TX_CTRL_CLK_DIV                  0x03
-#define AR_MCI_TX_CTRL_CLK_DIV_S                0
-#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE       0x04
-#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE_S     2
-#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ         0xFFFFF8
-#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ_S       3
-#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM          0xF000000
-#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM_S        24
-
-#define AR_MCI_MSG_ATTRIBUTES_TABLE                     0x1814
-#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM            0xFFFF
-#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM_S          0
-#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR         0xFFFF0000
-#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR_S       16
-
-#define AR_MCI_SCHD_TABLE_0                             0x1818
-#define AR_MCI_SCHD_TABLE_1                             0x181c
-#define AR_MCI_GPM_0                                    0x1820
-#define AR_MCI_GPM_1                                    0x1824
-#define AR_MCI_GPM_WRITE_PTR                            0xFFFF0000
-#define AR_MCI_GPM_WRITE_PTR_S                          16
-#define AR_MCI_GPM_BUF_LEN                              0x0000FFFF
-#define AR_MCI_GPM_BUF_LEN_S                            0
-
-#define AR_MCI_INTERRUPT_RAW                            0x1828
-#define AR_MCI_INTERRUPT_EN                             0x182c
-#define AR_MCI_INTERRUPT_SW_MSG_DONE                    0x00000001
-#define AR_MCI_INTERRUPT_SW_MSG_DONE_S                  0
-#define AR_MCI_INTERRUPT_CPU_INT_MSG                    0x00000002
-#define AR_MCI_INTERRUPT_CPU_INT_MSG_S                  1
-#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL                  0x00000004
-#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL_S                2
-#define AR_MCI_INTERRUPT_RX_INVALID_HDR                 0x00000008
-#define AR_MCI_INTERRUPT_RX_INVALID_HDR_S               3
-#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL                 0x00000010
-#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL_S               4
-#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL                 0x00000020
-#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL_S               5
-#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL                 0x00000080
-#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL_S               7
-#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL                 0x00000100
-#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL_S               8
-#define AR_MCI_INTERRUPT_RX_MSG                         0x00000200
-#define AR_MCI_INTERRUPT_RX_MSG_S                       9
-#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE            0x00000400
-#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE_S          10
-#define AR_MCI_INTERRUPT_BT_PRI                         0x07fff800
-#define AR_MCI_INTERRUPT_BT_PRI_S                       11
-#define AR_MCI_INTERRUPT_BT_PRI_THRESH                  0x08000000
-#define AR_MCI_INTERRUPT_BT_PRI_THRESH_S                27
-#define AR_MCI_INTERRUPT_BT_FREQ                        0x10000000
-#define AR_MCI_INTERRUPT_BT_FREQ_S                      28
-#define AR_MCI_INTERRUPT_BT_STOMP                       0x20000000
-#define AR_MCI_INTERRUPT_BT_STOMP_S                     29
-#define AR_MCI_INTERRUPT_BB_AIC_IRQ                     0x40000000
-#define AR_MCI_INTERRUPT_BB_AIC_IRQ_S                   30
-#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT              0x80000000
-#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT_S            31
-
-#define AR_MCI_INTERRUPT_DEFAULT    (AR_MCI_INTERRUPT_SW_MSG_DONE         | \
-                                     AR_MCI_INTERRUPT_RX_INVALID_HDR      | \
-                                     AR_MCI_INTERRUPT_RX_HW_MSG_FAIL      | \
-                                     AR_MCI_INTERRUPT_RX_SW_MSG_FAIL      | \
-                                     AR_MCI_INTERRUPT_TX_HW_MSG_FAIL      | \
-                                     AR_MCI_INTERRUPT_TX_SW_MSG_FAIL      | \
-                                     AR_MCI_INTERRUPT_RX_MSG              | \
-                                     AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE | \
-                                     AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)
-
-#define AR_MCI_INTERRUPT_MSG_FAIL_MASK (AR_MCI_INTERRUPT_RX_HW_MSG_FAIL | \
-                                        AR_MCI_INTERRUPT_RX_SW_MSG_FAIL | \
-                                        AR_MCI_INTERRUPT_TX_HW_MSG_FAIL | \
-                                        AR_MCI_INTERRUPT_TX_SW_MSG_FAIL)
-
-#define AR_MCI_REMOTE_CPU_INT                           0x1830
-#define AR_MCI_REMOTE_CPU_INT_EN                        0x1834
-#define AR_MCI_INTERRUPT_RX_MSG_RAW                     0x1838
-#define AR_MCI_INTERRUPT_RX_MSG_EN                      0x183c
-#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET            0x00000001
-#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET_S          0
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL             0x00000002
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL_S           1
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK               0x00000004
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK_S             2
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO               0x00000008
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO_S             3
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST                0x00000010
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST_S              4
-#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO               0x00000020
-#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO_S             5
-#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT                 0x00000040
-#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT_S               6
-#define AR_MCI_INTERRUPT_RX_MSG_GPM                     0x00000100
-#define AR_MCI_INTERRUPT_RX_MSG_GPM_S                   8
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO                0x00000200
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO_S              9
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING            0x00000400
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING_S          10
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING              0x00000800
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING_S            11
-#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE                0x00001000
-#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE_S              12
-#define AR_MCI_INTERRUPT_RX_HW_MSG_MASK  (AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO  | \
-                                          AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL| \
-                                          AR_MCI_INTERRUPT_RX_MSG_LNA_INFO   | \
-                                          AR_MCI_INTERRUPT_RX_MSG_CONT_NACK  | \
-                                          AR_MCI_INTERRUPT_RX_MSG_CONT_INFO  | \
-                                          AR_MCI_INTERRUPT_RX_MSG_CONT_RST)
-
-#define AR_MCI_INTERRUPT_RX_MSG_DEFAULT (AR_MCI_INTERRUPT_RX_MSG_GPM     | \
-                                         AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET| \
-                                         AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING  | \
-                                         AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING| \
-                                         AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
-
-#define AR_MCI_CPU_INT                                  0x1840
-
-#define AR_MCI_RX_STATUS                        0x1844
-#define AR_MCI_RX_LAST_SCHD_MSG_INDEX           0x00000F00
-#define AR_MCI_RX_LAST_SCHD_MSG_INDEX_S         8
-#define AR_MCI_RX_REMOTE_SLEEP                  0x00001000
-#define AR_MCI_RX_REMOTE_SLEEP_S                12
-#define AR_MCI_RX_MCI_CLK_REQ                   0x00002000
-#define AR_MCI_RX_MCI_CLK_REQ_S                 13
-
-#define AR_MCI_CONT_STATUS                      0x1848
-#define AR_MCI_CONT_RSSI_POWER                  0x000000FF
-#define AR_MCI_CONT_RSSI_POWER_S                0
-#define AR_MCI_CONT_PRIORITY                    0x0000FF00
-#define AR_MCI_CONT_PRIORITY_S                  8
-#define AR_MCI_CONT_TXRX                        0x00010000
-#define AR_MCI_CONT_TXRX_S                      16
-
-#define AR_MCI_BT_PRI0                          0x184c
-#define AR_MCI_BT_PRI1                          0x1850
-#define AR_MCI_BT_PRI2                          0x1854
-#define AR_MCI_BT_PRI3                          0x1858
-#define AR_MCI_BT_PRI                           0x185c
-#define AR_MCI_WL_FREQ0                         0x1860
-#define AR_MCI_WL_FREQ1                         0x1864
-#define AR_MCI_WL_FREQ2                         0x1868
-#define AR_MCI_GAIN                             0x186c
-#define AR_MCI_WBTIMER1                         0x1870
-#define AR_MCI_WBTIMER2                         0x1874
-#define AR_MCI_WBTIMER3                         0x1878
-#define AR_MCI_WBTIMER4                         0x187c
-#define AR_MCI_MAXGAIN                          0x1880
-#define AR_MCI_HW_SCHD_TBL_CTL                  0x1884
-#define AR_MCI_HW_SCHD_TBL_D0                   0x1888
-#define AR_MCI_HW_SCHD_TBL_D1                   0x188c
-#define AR_MCI_HW_SCHD_TBL_D2                   0x1890
-#define AR_MCI_HW_SCHD_TBL_D3                   0x1894
-#define AR_MCI_TX_PAYLOAD0                      0x1898
-#define AR_MCI_TX_PAYLOAD1                      0x189c
-#define AR_MCI_TX_PAYLOAD2                      0x18a0
-#define AR_MCI_TX_PAYLOAD3                      0x18a4
-#define AR_BTCOEX_WBTIMER                       0x18a8
-
-#define AR_BTCOEX_CTRL                                  0x18ac
-#define AR_BTCOEX_CTRL_AR9462_MODE                      0x00000001
-#define AR_BTCOEX_CTRL_AR9462_MODE_S                    0
-#define AR_BTCOEX_CTRL_WBTIMER_EN                       0x00000002
-#define AR_BTCOEX_CTRL_WBTIMER_EN_S                     1
-#define AR_BTCOEX_CTRL_MCI_MODE_EN                      0x00000004
-#define AR_BTCOEX_CTRL_MCI_MODE_EN_S                    2
-#define AR_BTCOEX_CTRL_LNA_SHARED                       0x00000008
-#define AR_BTCOEX_CTRL_LNA_SHARED_S                     3
-#define AR_BTCOEX_CTRL_PA_SHARED                        0x00000010
-#define AR_BTCOEX_CTRL_PA_SHARED_S                      4
-#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN           0x00000020
-#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN_S         5
-#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN        0x00000040
-#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN_S      6
-#define AR_BTCOEX_CTRL_NUM_ANTENNAS                     0x00000180
-#define AR_BTCOEX_CTRL_NUM_ANTENNAS_S                   7
-#define AR_BTCOEX_CTRL_RX_CHAIN_MASK                    0x00000E00
-#define AR_BTCOEX_CTRL_RX_CHAIN_MASK_S                  9
-#define AR_BTCOEX_CTRL_AGGR_THRESH                      0x00007000
-#define AR_BTCOEX_CTRL_AGGR_THRESH_S                    12
-#define AR_BTCOEX_CTRL_1_CHAIN_BCN                      0x00080000
-#define AR_BTCOEX_CTRL_1_CHAIN_BCN_S                    19
-#define AR_BTCOEX_CTRL_1_CHAIN_ACK                      0x00100000
-#define AR_BTCOEX_CTRL_1_CHAIN_ACK_S                    20
-#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN                   0x1FE00000
-#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN_S                 28
-#define AR_BTCOEX_CTRL_REDUCE_TXPWR                     0x20000000
-#define AR_BTCOEX_CTRL_REDUCE_TXPWR_S                   29
-#define AR_BTCOEX_CTRL_SPDT_ENABLE_10                   0x40000000
-#define AR_BTCOEX_CTRL_SPDT_ENABLE_10_S                 30
-#define AR_BTCOEX_CTRL_SPDT_POLARITY                    0x80000000
-#define AR_BTCOEX_CTRL_SPDT_POLARITY_S                  31
-
-#define AR_BTCOEX_MAX_TXPWR(_x)                         (0x18c0 + ((_x) << 2))
-#define AR_BTCOEX_WL_LNA                                0x1940
-#define AR_BTCOEX_RFGAIN_CTRL                           0x1944
-#define AR_BTCOEX_WL_LNA_TIMEOUT                        0x003FFFFF
-#define AR_BTCOEX_WL_LNA_TIMEOUT_S                      0
-
-#define AR_BTCOEX_CTRL2                                 0x1948
-#define AR_BTCOEX_CTRL2_TXPWR_THRESH                    0x0007F800
-#define AR_BTCOEX_CTRL2_TXPWR_THRESH_S                  11
-#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK                   0x00380000
-#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK_S                 19
-#define AR_BTCOEX_CTRL2_RX_DEWEIGHT                     0x00400000
-#define AR_BTCOEX_CTRL2_RX_DEWEIGHT_S                   22
-#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL                    0x00800000
-#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL_S                  23
-#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL                  0x01000000
-#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL_S                24
-#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE         0x02000000
-#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE_S       25
-
-#define AR_BTCOEX_CTRL_SPDT_ENABLE          0x00000001
-#define AR_BTCOEX_CTRL_SPDT_ENABLE_S        0
-#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL     0x00000002
-#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL_S   1
-#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT   0x00000004
-#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT_S 2
-#define AR_GLB_WLAN_UART_INTF_EN            0x00020000
-#define AR_GLB_WLAN_UART_INTF_EN_S          17
-#define AR_GLB_DS_JTAG_DISABLE              0x00040000
-#define AR_GLB_DS_JTAG_DISABLE_S            18
-
-#define AR_BTCOEX_RC                    0x194c
-#define AR_BTCOEX_MAX_RFGAIN(_x)        (0x1950 + ((_x) << 2))
-#define AR_BTCOEX_DBG                   0x1a50
-#define AR_MCI_LAST_HW_MSG_HDR          0x1a54
-#define AR_MCI_LAST_HW_MSG_BDY          0x1a58
-
-#define AR_MCI_SCHD_TABLE_2             0x1a5c
-#define AR_MCI_SCHD_TABLE_2_MEM_BASED   0x00000001
-#define AR_MCI_SCHD_TABLE_2_MEM_BASED_S 0
-#define AR_MCI_SCHD_TABLE_2_HW_BASED    0x00000002
-#define AR_MCI_SCHD_TABLE_2_HW_BASED_S  1
-
-#define AR_BTCOEX_CTRL3               0x1a60
-#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT       0x00000fff
-#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT_S     0
-
-#define AR_GLB_SWREG_DISCONT_MODE         0x2002c
-#define AR_GLB_SWREG_DISCONT_EN_BT_WLAN   0x3
-
-#define AR_MCI_MISC                    0x1a74
-#define AR_MCI_MISC_HW_FIX_EN          0x00000001
-#define AR_MCI_MISC_HW_FIX_EN_S        0
-#define AR_MCI_DBG_CNT_CTRL            0x1a78
-#define AR_MCI_DBG_CNT_CTRL_ENABLE     0x00000001
-#define AR_MCI_DBG_CNT_CTRL_ENABLE_S   0
-
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/reg_aic.h b/drivers/net/wireless/ath/ath9k/reg_aic.h
new file mode 100644
index 000000000000..955147ab48a2
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/reg_aic.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2015 Qualcomm Atheros Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef REG_AIC_H
+#define REG_AIC_H
+
+#define AR_SM_BASE                              0xa200
+#define AR_SM1_BASE                             0xb200
+#define AR_AGC_BASE                             0x9e00
+
+#define AR_PHY_AIC_CTRL_0_B0                    (AR_SM_BASE + 0x4b0)
+#define AR_PHY_AIC_CTRL_1_B0                    (AR_SM_BASE + 0x4b4)
+#define AR_PHY_AIC_CTRL_2_B0                    (AR_SM_BASE + 0x4b8)
+#define AR_PHY_AIC_CTRL_3_B0                    (AR_SM_BASE + 0x4bc)
+#define AR_PHY_AIC_CTRL_4_B0                    (AR_SM_BASE + 0x4c0)
+
+#define AR_PHY_AIC_STAT_0_B0                    (AR_SM_BASE + 0x4c4)
+#define AR_PHY_AIC_STAT_1_B0                    (AR_SM_BASE + 0x4c8)
+#define AR_PHY_AIC_STAT_2_B0                    (AR_SM_BASE + 0x4cc)
+
+#define AR_PHY_AIC_CTRL_0_B1                    (AR_SM1_BASE + 0x4b0)
+#define AR_PHY_AIC_CTRL_1_B1                    (AR_SM1_BASE + 0x4b4)
+#define AR_PHY_AIC_CTRL_4_B1                    (AR_SM1_BASE + 0x4c0)
+
+#define AR_PHY_AIC_STAT_0_B1                    (AR_SM1_BASE + 0x4c4)
+#define AR_PHY_AIC_STAT_1_B1                    (AR_SM1_BASE + 0x4c8)
+#define AR_PHY_AIC_STAT_2_B1                    (AR_SM1_BASE + 0x4cc)
+
+#define AR_PHY_AIC_SRAM_ADDR_B0                 (AR_SM_BASE + 0x5f0)
+#define AR_PHY_AIC_SRAM_DATA_B0                 (AR_SM_BASE + 0x5f4)
+
+#define AR_PHY_AIC_SRAM_ADDR_B1                 (AR_SM1_BASE + 0x5f0)
+#define AR_PHY_AIC_SRAM_DATA_B1                 (AR_SM1_BASE + 0x5f4)
+
+#define AR_PHY_BT_COEX_4                        (AR_AGC_BASE + 0x60)
+#define AR_PHY_BT_COEX_5                        (AR_AGC_BASE + 0x64)
+
+/* AIC fields */
+#define AR_PHY_AIC_MON_ENABLE                   0x80000000
+#define AR_PHY_AIC_MON_ENABLE_S                 31
+#define AR_PHY_AIC_CAL_MAX_HOP_COUNT            0x7F000000
+#define AR_PHY_AIC_CAL_MAX_HOP_COUNT_S          24
+#define AR_PHY_AIC_CAL_MIN_VALID_COUNT          0x00FE0000
+#define AR_PHY_AIC_CAL_MIN_VALID_COUNT_S        17
+#define AR_PHY_AIC_F_WLAN                       0x0001FC00
+#define AR_PHY_AIC_F_WLAN_S                     10
+#define AR_PHY_AIC_CAL_CH_VALID_RESET           0x00000200
+#define AR_PHY_AIC_CAL_CH_VALID_RESET_S         9
+#define AR_PHY_AIC_CAL_ENABLE                   0x00000100
+#define AR_PHY_AIC_CAL_ENABLE_S                 8
+#define AR_PHY_AIC_BTTX_PWR_THR                 0x000000FE
+#define AR_PHY_AIC_BTTX_PWR_THR_S               1
+#define AR_PHY_AIC_ENABLE                       0x00000001
+#define AR_PHY_AIC_ENABLE_S                     0
+#define AR_PHY_AIC_CAL_BT_REF_DELAY             0x00F00000
+#define AR_PHY_AIC_CAL_BT_REF_DELAY_S           20
+#define AR_PHY_AIC_BT_IDLE_CFG                  0x00080000
+#define AR_PHY_AIC_BT_IDLE_CFG_S                19
+#define AR_PHY_AIC_STDBY_COND                   0x00060000
+#define AR_PHY_AIC_STDBY_COND_S                 17
+#define AR_PHY_AIC_STDBY_ROT_ATT_DB             0x0001F800
+#define AR_PHY_AIC_STDBY_ROT_ATT_DB_S           11
+#define AR_PHY_AIC_STDBY_COM_ATT_DB             0x00000700
+#define AR_PHY_AIC_STDBY_COM_ATT_DB_S           8
+#define AR_PHY_AIC_RSSI_MAX                     0x000000F0
+#define AR_PHY_AIC_RSSI_MAX_S                   4
+#define AR_PHY_AIC_RSSI_MIN                     0x0000000F
+#define AR_PHY_AIC_RSSI_MIN_S                   0
+#define AR_PHY_AIC_RADIO_DELAY                  0x7F000000
+#define AR_PHY_AIC_RADIO_DELAY_S                24
+#define AR_PHY_AIC_CAL_STEP_SIZE_CORR           0x00F00000
+#define AR_PHY_AIC_CAL_STEP_SIZE_CORR_S         20
+#define AR_PHY_AIC_CAL_ROT_IDX_CORR             0x000F8000
+#define AR_PHY_AIC_CAL_ROT_IDX_CORR_S           15
+#define AR_PHY_AIC_CAL_CONV_CHECK_FACTOR        0x00006000
+#define AR_PHY_AIC_CAL_CONV_CHECK_FACTOR_S      13
+#define AR_PHY_AIC_ROT_IDX_COUNT_MAX            0x00001C00
+#define AR_PHY_AIC_ROT_IDX_COUNT_MAX_S          10
+#define AR_PHY_AIC_CAL_SYNTH_TOGGLE             0x00000200
+#define AR_PHY_AIC_CAL_SYNTH_TOGGLE_S           9
+#define AR_PHY_AIC_CAL_SYNTH_AFTER_BTRX         0x00000100
+#define AR_PHY_AIC_CAL_SYNTH_AFTER_BTRX_S       8
+#define AR_PHY_AIC_CAL_SYNTH_SETTLING           0x000000FF
+#define AR_PHY_AIC_CAL_SYNTH_SETTLING_S         0
+#define AR_PHY_AIC_MON_MAX_HOP_COUNT            0x07F00000
+#define AR_PHY_AIC_MON_MAX_HOP_COUNT_S          20
+#define AR_PHY_AIC_MON_MIN_STALE_COUNT          0x000FE000
+#define AR_PHY_AIC_MON_MIN_STALE_COUNT_S        13
+#define AR_PHY_AIC_MON_PWR_EST_LONG             0x00001000
+#define AR_PHY_AIC_MON_PWR_EST_LONG_S           12
+#define AR_PHY_AIC_MON_PD_TALLY_SCALING         0x00000C00
+#define AR_PHY_AIC_MON_PD_TALLY_SCALING_S       10
+#define AR_PHY_AIC_MON_PERF_THR                 0x000003E0
+#define AR_PHY_AIC_MON_PERF_THR_S               5
+#define AR_PHY_AIC_CAL_TARGET_MAG_SETTING       0x00000018
+#define AR_PHY_AIC_CAL_TARGET_MAG_SETTING_S     3
+#define AR_PHY_AIC_CAL_PERF_CHECK_FACTOR        0x00000006
+#define AR_PHY_AIC_CAL_PERF_CHECK_FACTOR_S      1
+#define AR_PHY_AIC_CAL_PWR_EST_LONG             0x00000001
+#define AR_PHY_AIC_CAL_PWR_EST_LONG_S           0
+#define AR_PHY_AIC_MON_DONE                     0x80000000
+#define AR_PHY_AIC_MON_DONE_S                   31
+#define AR_PHY_AIC_MON_ACTIVE                   0x40000000
+#define AR_PHY_AIC_MON_ACTIVE_S                 30
+#define AR_PHY_AIC_MEAS_COUNT                   0x3F000000
+#define AR_PHY_AIC_MEAS_COUNT_S                 24
+#define AR_PHY_AIC_CAL_ANT_ISO_EST              0x00FC0000
+#define AR_PHY_AIC_CAL_ANT_ISO_EST_S            18
+#define AR_PHY_AIC_CAL_HOP_COUNT                0x0003F800
+#define AR_PHY_AIC_CAL_HOP_COUNT_S              11
+#define AR_PHY_AIC_CAL_VALID_COUNT              0x000007F0
+#define AR_PHY_AIC_CAL_VALID_COUNT_S            4
+#define AR_PHY_AIC_CAL_BT_TOO_WEAK_ERR          0x00000008
+#define AR_PHY_AIC_CAL_BT_TOO_WEAK_ERR_S        3
+#define AR_PHY_AIC_CAL_BT_TOO_STRONG_ERR        0x00000004
+#define AR_PHY_AIC_CAL_BT_TOO_STRONG_ERR_S      2
+#define AR_PHY_AIC_CAL_DONE                     0x00000002
+#define AR_PHY_AIC_CAL_DONE_S                   1
+#define AR_PHY_AIC_CAL_ACTIVE                   0x00000001
+#define AR_PHY_AIC_CAL_ACTIVE_S                 0
+
+#define AR_PHY_AIC_MEAS_MAG_MIN                 0xFFC00000
+#define AR_PHY_AIC_MEAS_MAG_MIN_S               22
+#define AR_PHY_AIC_MON_STALE_COUNT              0x003F8000
+#define AR_PHY_AIC_MON_STALE_COUNT_S            15
+#define AR_PHY_AIC_MON_HOP_COUNT                0x00007F00
+#define AR_PHY_AIC_MON_HOP_COUNT_S              8
+#define AR_PHY_AIC_CAL_AIC_SM                   0x000000F8
+#define AR_PHY_AIC_CAL_AIC_SM_S                 3
+#define AR_PHY_AIC_SM                           0x00000007
+#define AR_PHY_AIC_SM_S                         0
+#define AR_PHY_AIC_SRAM_VALID                   0x00000001
+#define AR_PHY_AIC_SRAM_VALID_S                 0
+#define AR_PHY_AIC_SRAM_ROT_QUAD_ATT_DB         0x0000007E
+#define AR_PHY_AIC_SRAM_ROT_QUAD_ATT_DB_S       1
+#define AR_PHY_AIC_SRAM_VGA_QUAD_SIGN           0x00000080
+#define AR_PHY_AIC_SRAM_VGA_QUAD_SIGN_S         7
+#define AR_PHY_AIC_SRAM_ROT_DIR_ATT_DB          0x00003F00
+#define AR_PHY_AIC_SRAM_ROT_DIR_ATT_DB_S        8
+#define AR_PHY_AIC_SRAM_VGA_DIR_SIGN            0x00004000
+#define AR_PHY_AIC_SRAM_VGA_DIR_SIGN_S          14
+#define AR_PHY_AIC_SRAM_COM_ATT_6DB             0x00038000
+#define AR_PHY_AIC_SRAM_COM_ATT_6DB_S           15
+#define AR_PHY_AIC_CAL_ROT_ATT_DB_EST_ISO       0x0000E000
+#define AR_PHY_AIC_CAL_ROT_ATT_DB_EST_ISO_S     13
+#define AR_PHY_AIC_CAL_COM_ATT_DB_EST_ISO       0x00001E00
+#define AR_PHY_AIC_CAL_COM_ATT_DB_EST_ISO_S     9
+#define AR_PHY_AIC_CAL_ISO_EST_INIT_SETTING     0x000001F8
+#define AR_PHY_AIC_CAL_ISO_EST_INIT_SETTING_S   3
+#define AR_PHY_AIC_CAL_COM_ATT_DB_BACKOFF       0x00000006
+#define AR_PHY_AIC_CAL_COM_ATT_DB_BACKOFF_S     1
+#define AR_PHY_AIC_CAL_COM_ATT_DB_FIXED         0x00000001
+#define AR_PHY_AIC_CAL_COM_ATT_DB_FIXED_S       0
+
+#endif /* REG_AIC_H */
diff --git a/drivers/net/wireless/ath/ath9k/reg_mci.h b/drivers/net/wireless/ath/ath9k/reg_mci.h
new file mode 100644
index 000000000000..6251310704e3
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/reg_mci.h
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 2015 Qualcomm Atheros Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef REG_MCI_H
+#define REG_MCI_H
+
+#define AR_MCI_COMMAND0                                 0x1800
+#define AR_MCI_COMMAND0_HEADER                          0xFF
+#define AR_MCI_COMMAND0_HEADER_S                        0
+#define AR_MCI_COMMAND0_LEN                             0x1f00
+#define AR_MCI_COMMAND0_LEN_S                           8
+#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP               0x2000
+#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP_S             13
+
+#define AR_MCI_COMMAND1                                 0x1804
+
+#define AR_MCI_COMMAND2                                 0x1808
+#define AR_MCI_COMMAND2_RESET_TX                        0x01
+#define AR_MCI_COMMAND2_RESET_TX_S                      0
+#define AR_MCI_COMMAND2_RESET_RX                        0x02
+#define AR_MCI_COMMAND2_RESET_RX_S                      1
+#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES             0x3FC
+#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES_S           2
+#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP                0x400
+#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP_S              10
+
+#define AR_MCI_RX_CTRL                                  0x180c
+
+#define AR_MCI_TX_CTRL                                  0x1810
+/*
+ * 0 = no division,
+ * 1 = divide by 2,
+ * 2 = divide by 4,
+ * 3 = divide by 8
+ */
+#define AR_MCI_TX_CTRL_CLK_DIV                          0x03
+#define AR_MCI_TX_CTRL_CLK_DIV_S                        0
+#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE               0x04
+#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE_S             2
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ                 0xFFFFF8
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ_S               3
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM                  0xF000000
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM_S                24
+
+#define AR_MCI_MSG_ATTRIBUTES_TABLE                     0x1814
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM            0xFFFF
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM_S          0
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR         0xFFFF0000
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR_S       16
+
+#define AR_MCI_SCHD_TABLE_0                             0x1818
+#define AR_MCI_SCHD_TABLE_1                             0x181c
+#define AR_MCI_GPM_0                                    0x1820
+#define AR_MCI_GPM_1                                    0x1824
+#define AR_MCI_GPM_WRITE_PTR                            0xFFFF0000
+#define AR_MCI_GPM_WRITE_PTR_S                          16
+#define AR_MCI_GPM_BUF_LEN                              0x0000FFFF
+#define AR_MCI_GPM_BUF_LEN_S                            0
+
+#define AR_MCI_INTERRUPT_RAW                            0x1828
+
+#define AR_MCI_INTERRUPT_EN                             0x182c
+#define AR_MCI_INTERRUPT_SW_MSG_DONE                    0x00000001
+#define AR_MCI_INTERRUPT_SW_MSG_DONE_S                  0
+#define AR_MCI_INTERRUPT_CPU_INT_MSG                    0x00000002
+#define AR_MCI_INTERRUPT_CPU_INT_MSG_S                  1
+#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL                  0x00000004
+#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL_S                2
+#define AR_MCI_INTERRUPT_RX_INVALID_HDR                 0x00000008
+#define AR_MCI_INTERRUPT_RX_INVALID_HDR_S               3
+#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL                 0x00000010
+#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL_S               4
+#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL                 0x00000020
+#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL_S               5
+#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL                 0x00000080
+#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL_S               7
+#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL                 0x00000100
+#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL_S               8
+#define AR_MCI_INTERRUPT_RX_MSG                         0x00000200
+#define AR_MCI_INTERRUPT_RX_MSG_S                       9
+#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE            0x00000400
+#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE_S          10
+#define AR_MCI_INTERRUPT_BT_PRI                         0x07fff800
+#define AR_MCI_INTERRUPT_BT_PRI_S                       11
+#define AR_MCI_INTERRUPT_BT_PRI_THRESH                  0x08000000
+#define AR_MCI_INTERRUPT_BT_PRI_THRESH_S                27
+#define AR_MCI_INTERRUPT_BT_FREQ                        0x10000000
+#define AR_MCI_INTERRUPT_BT_FREQ_S                      28
+#define AR_MCI_INTERRUPT_BT_STOMP                       0x20000000
+#define AR_MCI_INTERRUPT_BT_STOMP_S                     29
+#define AR_MCI_INTERRUPT_BB_AIC_IRQ                     0x40000000
+#define AR_MCI_INTERRUPT_BB_AIC_IRQ_S                   30
+#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT              0x80000000
+#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT_S            31
+
+#define AR_MCI_REMOTE_CPU_INT                           0x1830
+#define AR_MCI_REMOTE_CPU_INT_EN                        0x1834
+#define AR_MCI_INTERRUPT_RX_MSG_RAW                     0x1838
+#define AR_MCI_INTERRUPT_RX_MSG_EN                      0x183c
+#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET            0x00000001
+#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET_S          0
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL             0x00000002
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL_S           1
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK               0x00000004
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK_S             2
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO               0x00000008
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO_S             3
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST                0x00000010
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST_S              4
+#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO               0x00000020
+#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO_S             5
+#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT                 0x00000040
+#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT_S               6
+#define AR_MCI_INTERRUPT_RX_MSG_GPM                     0x00000100
+#define AR_MCI_INTERRUPT_RX_MSG_GPM_S                   8
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO                0x00000200
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO_S              9
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING            0x00000400
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING_S          10
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING              0x00000800
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING_S            11
+#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE                0x00001000
+#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE_S              12
+
+#define AR_MCI_CPU_INT                                  0x1840
+
+#define AR_MCI_RX_STATUS                                0x1844
+#define AR_MCI_RX_LAST_SCHD_MSG_INDEX                   0x00000F00
+#define AR_MCI_RX_LAST_SCHD_MSG_INDEX_S                 8
+#define AR_MCI_RX_REMOTE_SLEEP                          0x00001000
+#define AR_MCI_RX_REMOTE_SLEEP_S                        12
+#define AR_MCI_RX_MCI_CLK_REQ                           0x00002000
+#define AR_MCI_RX_MCI_CLK_REQ_S                         13
+
+#define AR_MCI_CONT_STATUS                              0x1848
+#define AR_MCI_CONT_RSSI_POWER                          0x000000FF
+#define AR_MCI_CONT_RSSI_POWER_S                        0
+#define AR_MCI_CONT_PRIORITY                            0x0000FF00
+#define AR_MCI_CONT_PRIORITY_S                          8
+#define AR_MCI_CONT_TXRX                                0x00010000
+#define AR_MCI_CONT_TXRX_S                              16
+
+#define AR_MCI_BT_PRI0                                  0x184c
+#define AR_MCI_BT_PRI1                                  0x1850
+#define AR_MCI_BT_PRI2                                  0x1854
+#define AR_MCI_BT_PRI3                                  0x1858
+#define AR_MCI_BT_PRI                                   0x185c
+#define AR_MCI_WL_FREQ0                                 0x1860
+#define AR_MCI_WL_FREQ1                                 0x1864
+#define AR_MCI_WL_FREQ2                                 0x1868
+#define AR_MCI_GAIN                                     0x186c
+#define AR_MCI_WBTIMER1                                 0x1870
+#define AR_MCI_WBTIMER2                                 0x1874
+#define AR_MCI_WBTIMER3                                 0x1878
+#define AR_MCI_WBTIMER4                                 0x187c
+#define AR_MCI_MAXGAIN                                  0x1880
+#define AR_MCI_HW_SCHD_TBL_CTL                          0x1884
+#define AR_MCI_HW_SCHD_TBL_D0                           0x1888
+#define AR_MCI_HW_SCHD_TBL_D1                           0x188c
+#define AR_MCI_HW_SCHD_TBL_D2                           0x1890
+#define AR_MCI_HW_SCHD_TBL_D3                           0x1894
+#define AR_MCI_TX_PAYLOAD0                              0x1898
+#define AR_MCI_TX_PAYLOAD1                              0x189c
+#define AR_MCI_TX_PAYLOAD2                              0x18a0
+#define AR_MCI_TX_PAYLOAD3                              0x18a4
+#define AR_BTCOEX_WBTIMER                               0x18a8
+
+#define AR_BTCOEX_CTRL                                  0x18ac
+#define AR_BTCOEX_CTRL_AR9462_MODE                      0x00000001
+#define AR_BTCOEX_CTRL_AR9462_MODE_S                    0
+#define AR_BTCOEX_CTRL_WBTIMER_EN                       0x00000002
+#define AR_BTCOEX_CTRL_WBTIMER_EN_S                     1
+#define AR_BTCOEX_CTRL_MCI_MODE_EN                      0x00000004
+#define AR_BTCOEX_CTRL_MCI_MODE_EN_S                    2
+#define AR_BTCOEX_CTRL_LNA_SHARED                       0x00000008
+#define AR_BTCOEX_CTRL_LNA_SHARED_S                     3
+#define AR_BTCOEX_CTRL_PA_SHARED                        0x00000010
+#define AR_BTCOEX_CTRL_PA_SHARED_S                      4
+#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN           0x00000020
+#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN_S         5
+#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN        0x00000040
+#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN_S      6
+#define AR_BTCOEX_CTRL_NUM_ANTENNAS                     0x00000180
+#define AR_BTCOEX_CTRL_NUM_ANTENNAS_S                   7
+#define AR_BTCOEX_CTRL_RX_CHAIN_MASK                    0x00000E00
+#define AR_BTCOEX_CTRL_RX_CHAIN_MASK_S                  9
+#define AR_BTCOEX_CTRL_AGGR_THRESH                      0x00007000
+#define AR_BTCOEX_CTRL_AGGR_THRESH_S                    12
+#define AR_BTCOEX_CTRL_1_CHAIN_BCN                      0x00080000
+#define AR_BTCOEX_CTRL_1_CHAIN_BCN_S                    19
+#define AR_BTCOEX_CTRL_1_CHAIN_ACK                      0x00100000
+#define AR_BTCOEX_CTRL_1_CHAIN_ACK_S                    20
+#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN                   0x1FE00000
+#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN_S                 28
+#define AR_BTCOEX_CTRL_REDUCE_TXPWR                     0x20000000
+#define AR_BTCOEX_CTRL_REDUCE_TXPWR_S                   29
+#define AR_BTCOEX_CTRL_SPDT_ENABLE_10                   0x40000000
+#define AR_BTCOEX_CTRL_SPDT_ENABLE_10_S                 30
+#define AR_BTCOEX_CTRL_SPDT_POLARITY                    0x80000000
+#define AR_BTCOEX_CTRL_SPDT_POLARITY_S                  31
+
+#define AR_BTCOEX_WL_WEIGHTS0                           0x18b0
+#define AR_BTCOEX_WL_WEIGHTS1                           0x18b4
+#define AR_BTCOEX_WL_WEIGHTS2                           0x18b8
+#define AR_BTCOEX_WL_WEIGHTS3                           0x18bc
+
+#define AR_BTCOEX_MAX_TXPWR(_x)                         (0x18c0 + ((_x) << 2))
+#define AR_BTCOEX_WL_LNA                                0x1940
+#define AR_BTCOEX_RFGAIN_CTRL                           0x1944
+#define AR_BTCOEX_WL_LNA_TIMEOUT                        0x003FFFFF
+#define AR_BTCOEX_WL_LNA_TIMEOUT_S                      0
+
+#define AR_BTCOEX_CTRL2                                 0x1948
+#define AR_BTCOEX_CTRL2_TXPWR_THRESH                    0x0007F800
+#define AR_BTCOEX_CTRL2_TXPWR_THRESH_S                  11
+#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK                   0x00380000
+#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK_S                 19
+#define AR_BTCOEX_CTRL2_RX_DEWEIGHT                     0x00400000
+#define AR_BTCOEX_CTRL2_RX_DEWEIGHT_S                   22
+#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL                    0x00800000
+#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL_S                  23
+#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL                  0x01000000
+#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL_S                24
+#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE         0x02000000
+#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE_S       25
+
+#define AR_BTCOEX_CTRL_SPDT_ENABLE                      0x00000001
+#define AR_BTCOEX_CTRL_SPDT_ENABLE_S                    0
+#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL                 0x00000002
+#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL_S               1
+#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT               0x00000004
+#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT_S             2
+#define AR_GLB_WLAN_UART_INTF_EN                        0x00020000
+#define AR_GLB_WLAN_UART_INTF_EN_S                      17
+#define AR_GLB_DS_JTAG_DISABLE                          0x00040000
+#define AR_GLB_DS_JTAG_DISABLE_S                        18
+
+#define AR_BTCOEX_RC                                    0x194c
+#define AR_BTCOEX_MAX_RFGAIN(_x)                        (0x1950 + ((_x) << 2))
+#define AR_BTCOEX_DBG                                   0x1a50
+#define AR_MCI_LAST_HW_MSG_HDR                          0x1a54
+#define AR_MCI_LAST_HW_MSG_BDY                          0x1a58
+
+#define AR_MCI_SCHD_TABLE_2                             0x1a5c
+#define AR_MCI_SCHD_TABLE_2_MEM_BASED                   0x00000001
+#define AR_MCI_SCHD_TABLE_2_MEM_BASED_S                 0
+#define AR_MCI_SCHD_TABLE_2_HW_BASED                    0x00000002
+#define AR_MCI_SCHD_TABLE_2_HW_BASED_S                  1
+
+#define AR_BTCOEX_CTRL3                                 0x1a60
+#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT               0x00000fff
+#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT_S             0
+
+#define AR_GLB_SWREG_DISCONT_MODE                       0x2002c
+#define AR_GLB_SWREG_DISCONT_EN_BT_WLAN                 0x3
+
+#define AR_MCI_MISC                                     0x1a74
+#define AR_MCI_MISC_HW_FIX_EN                           0x00000001
+#define AR_MCI_MISC_HW_FIX_EN_S                         0
+
+#define AR_MCI_DBG_CNT_CTRL                             0x1a78
+#define AR_MCI_DBG_CNT_CTRL_ENABLE                      0x00000001
+#define AR_MCI_DBG_CNT_CTRL_ENABLE_S                    0
+#define AR_MCI_DBG_CNT_CTRL_BT_LINKID                   0x000007f8
+#define AR_MCI_DBG_CNT_CTRL_BT_LINKID_S                 3
+
+#define MCI_STAT_ALL_BT_LINKID                          0xffff
+
+#define AR_MCI_INTERRUPT_DEFAULT (AR_MCI_INTERRUPT_SW_MSG_DONE         | \
+                                  AR_MCI_INTERRUPT_RX_INVALID_HDR      | \
+                                  AR_MCI_INTERRUPT_RX_HW_MSG_FAIL      | \
+                                  AR_MCI_INTERRUPT_RX_SW_MSG_FAIL      | \
+                                  AR_MCI_INTERRUPT_TX_HW_MSG_FAIL      | \
+                                  AR_MCI_INTERRUPT_TX_SW_MSG_FAIL      | \
+                                  AR_MCI_INTERRUPT_RX_MSG              | \
+                                  AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE | \
+                                  AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)
+
+#define AR_MCI_INTERRUPT_MSG_FAIL_MASK (AR_MCI_INTERRUPT_RX_HW_MSG_FAIL | \
+                                        AR_MCI_INTERRUPT_RX_SW_MSG_FAIL | \
+                                        AR_MCI_INTERRUPT_TX_HW_MSG_FAIL | \
+                                        AR_MCI_INTERRUPT_TX_SW_MSG_FAIL)
+
+#define AR_MCI_INTERRUPT_RX_HW_MSG_MASK (AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO   | \
+                                         AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL | \
+                                         AR_MCI_INTERRUPT_RX_MSG_LNA_INFO    | \
+                                         AR_MCI_INTERRUPT_RX_MSG_CONT_NACK   | \
+                                         AR_MCI_INTERRUPT_RX_MSG_CONT_INFO   | \
+                                         AR_MCI_INTERRUPT_RX_MSG_CONT_RST)
+
+#define AR_MCI_INTERRUPT_RX_MSG_DEFAULT (AR_MCI_INTERRUPT_RX_MSG_GPM           | \
+                                         AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET  | \
+                                         AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING    | \
+                                         AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING  | \
+                                         AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
+
+#endif /* REG_MCI_H */
diff --git a/drivers/net/wireless/ath/ath9k/reg_wow.h b/drivers/net/wireless/ath/ath9k/reg_wow.h
index 3abfca56ca58..453054078cc4 100644
--- a/drivers/net/wireless/ath/ath9k/reg_wow.h
+++ b/drivers/net/wireless/ath/ath9k/reg_wow.h
@@ -72,7 +72,7 @@
 #define AR_WOW_MAC_INTR_EN              0x00040000
 #define AR_WOW_MAGIC_EN                 0x00010000
 #define AR_WOW_PATTERN_EN(x)            (x & 0xff)
-#define AR_WOW_PAT_FOUND_SHIFT  8
+#define AR_WOW_PAT_FOUND_SHIFT          8
 #define AR_WOW_PATTERN_FOUND(x)         (x & (0xff << AR_WOW_PAT_FOUND_SHIFT))
 #define AR_WOW_PATTERN_FOUND_MASK       ((0xff) << AR_WOW_PAT_FOUND_SHIFT)
 #define AR_WOW_MAGIC_PAT_FOUND          0x00020000
@@ -90,6 +90,14 @@
                                                AR_WOW_BEACON_FAIL |     \
                                                AR_WOW_KEEP_ALIVE_FAIL))
 
+#define AR_WOW2_PATTERN_EN(x)           ((x & 0xff) << 0)
+#define AR_WOW2_PATTERN_FOUND_SHIFT     8
+#define AR_WOW2_PATTERN_FOUND(x)        (x & (0xff << AR_WOW2_PATTERN_FOUND_SHIFT))
+#define AR_WOW2_PATTERN_FOUND_MASK      ((0xff) << AR_WOW2_PATTERN_FOUND_SHIFT)
+
+#define AR_WOW_STATUS2(x)               (x & AR_WOW2_PATTERN_FOUND_MASK)
+#define AR_WOW_CLEAR_EVENTS2(x)         (x & ~(AR_WOW2_PATTERN_EN(0xff)))
+
 #define AR_WOW_AIFS_CNT(x)              (x & 0xff)
 #define AR_WOW_SLOT_CNT(x)              ((x & 0xff) << 8)
 #define AR_WOW_KEEP_ALIVE_CNT(x)        ((x & 0xff) << 16)
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index 65c8894c5f81..ca533b4321bd 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -61,6 +61,8 @@ static const char *wmi_cmd_to_name(enum wmi_cmd_id wmi_cmd)
                 return "WMI_REG_READ_CMDID";
         case WMI_REG_WRITE_CMDID:
                 return "WMI_REG_WRITE_CMDID";
+        case WMI_REG_RMW_CMDID:
+                return "WMI_REG_RMW_CMDID";
         case WMI_RC_STATE_CHANGE_CMDID:
                 return "WMI_RC_STATE_CHANGE_CMDID";
         case WMI_RC_RATE_UPDATE_CMDID:
@@ -101,6 +103,7 @@ struct wmi *ath9k_init_wmi(struct ath9k_htc_priv *priv)
         spin_lock_init(&wmi->event_lock);
         mutex_init(&wmi->op_mutex);
         mutex_init(&wmi->multi_write_mutex);
+        mutex_init(&wmi->multi_rmw_mutex);
         init_completion(&wmi->cmd_wait);
         INIT_LIST_HEAD(&wmi->pending_tx_events);
         tasklet_init(&wmi->wmi_event_tasklet, ath9k_wmi_event_tasklet,
@@ -224,7 +227,7 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
 
         /* Check if there has been a timeout. */
         spin_lock(&wmi->wmi_lock);
-        if (cmd_id != wmi->last_cmd_id) {
+        if (be16_to_cpu(hdr->seq_no) != wmi->last_seq_id) {
                 spin_unlock(&wmi->wmi_lock);
                 goto free_skb;
         }
@@ -272,11 +275,16 @@ static int ath9k_wmi_cmd_issue(struct wmi *wmi,
                                enum wmi_cmd_id cmd, u16 len)
 {
         struct wmi_cmd_hdr *hdr;
+        unsigned long flags;
 
         hdr = (struct wmi_cmd_hdr *) skb_push(skb, sizeof(struct wmi_cmd_hdr));
         hdr->command_id = cpu_to_be16(cmd);
         hdr->seq_no = cpu_to_be16(++wmi->tx_seq_id);
 
+        spin_lock_irqsave(&wmi->wmi_lock, flags);
+        wmi->last_seq_id = wmi->tx_seq_id;
+        spin_unlock_irqrestore(&wmi->wmi_lock, flags);
+
         return htc_send_epid(wmi->htc, skb, wmi->ctrl_epid);
 }
 
@@ -292,7 +300,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
         struct sk_buff *skb;
         u8 *data;
         int time_left, ret = 0;
-        unsigned long flags;
 
         if (ah->ah_flags & AH_UNPLUGGED)
                 return 0;
@@ -320,10 +327,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
         wmi->cmd_rsp_buf = rsp_buf;
         wmi->cmd_rsp_len = rsp_len;
 
-        spin_lock_irqsave(&wmi->wmi_lock, flags);
-        wmi->last_cmd_id = cmd_id;
-        spin_unlock_irqrestore(&wmi->wmi_lock, flags);
-
         ret = ath9k_wmi_cmd_issue(wmi, skb, cmd_id, cmd_len);
         if (ret)
                 goto out;
diff --git a/drivers/net/wireless/ath/ath9k/wmi.h b/drivers/net/wireless/ath/ath9k/wmi.h
index 0db37f230018..380175d5ecd7 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.h
+++ b/drivers/net/wireless/ath/ath9k/wmi.h
@@ -112,6 +112,7 @@ enum wmi_cmd_id {
         WMI_TX_STATS_CMDID,
         WMI_RX_STATS_CMDID,
         WMI_BITRATE_MASK_CMDID,
+        WMI_REG_RMW_CMDID,
 };
 
 enum wmi_event_id {
@@ -125,12 +126,19 @@ enum wmi_event_id {
 };
 
 #define MAX_CMD_NUMBER 62
+#define MAX_RMW_CMD_NUMBER 15
 
 struct register_write {
         __be32 reg;
         __be32 val;
 };
 
+struct register_rmw {
+        __be32 reg;
+        __be32 set;
+        __be32 clr;
+} __packed;
+
 struct ath9k_htc_tx_event {
         int count;
         struct __wmi_event_txstatus txs;
@@ -143,7 +151,7 @@ struct wmi {
         enum htc_endpoint_id ctrl_epid;
         struct mutex op_mutex;
         struct completion cmd_wait;
-        enum wmi_cmd_id last_cmd_id;
+        u16 last_seq_id;
         struct sk_buff_head wmi_event_queue;
         struct tasklet_struct wmi_event_tasklet;
         u16 tx_seq_id;
@@ -156,10 +164,18 @@ struct wmi {
 
         spinlock_t wmi_lock;
 
+        /* multi write section */
         atomic_t mwrite_cnt;
         struct register_write multi_write[MAX_CMD_NUMBER];
         u32 multi_write_idx;
         struct mutex multi_write_mutex;
+
+        /* multi rmw section */
+        atomic_t m_rmw_cnt;
+        struct register_rmw multi_rmw[MAX_RMW_CMD_NUMBER];
+        u32 multi_rmw_idx;
+        struct mutex multi_rmw_mutex;
+
 };
 
 struct wmi *ath9k_init_wmi(struct ath9k_htc_priv *priv);
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 1b8e75c4d2c2..0acd079ba96b 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1103,14 +1103,28 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,
         struct sk_buff *skb;
         struct ath_frame_info *fi;
         struct ieee80211_tx_info *info;
+        struct ieee80211_vif *vif;
         struct ath_hw *ah = sc->sc_ah;
 
         if (sc->tx99_state || !ah->tpc_enabled)
                 return MAX_RATE_POWER;
 
         skb = bf->bf_mpdu;
-        fi = get_frame_info(skb);
         info = IEEE80211_SKB_CB(skb);
+        vif = info->control.vif;
+
+        if (!vif) {
+                max_power = sc->cur_chan->cur_txpower;
+                goto out;
+        }
+
+        if (vif->bss_conf.txpower_type != NL80211_TX_POWER_LIMITED) {
+                max_power = min_t(u8, sc->cur_chan->cur_txpower,
+                                  2 * vif->bss_conf.txpower);
+                goto out;
+        }
+
+        fi = get_frame_info(skb);
 
         if (!AR_SREV_9300_20_OR_LATER(ah)) {
                 int txpower = fi->tx_power;
@@ -1147,25 +1161,25 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,
                         txpower -= 2;
 
                 txpower = max(txpower, 0);
-                max_power = min_t(u8, ah->tx_power[rateidx], txpower);
-
-                /* XXX: clamp minimum TX power at 1 for AR9160 since if
-                 * max_power is set to 0, frames are transmitted at max
-                 * TX power
-                 */
-                if (!max_power && !AR_SREV_9280_20_OR_LATER(ah))
-                        max_power = 1;
+                max_power = min_t(u8, ah->tx_power[rateidx],
+                                  2 * vif->bss_conf.txpower);
+                max_power = min_t(u8, max_power, txpower);
         } else if (!bf->bf_state.bfs_paprd) {
                 if (rateidx < 8 && (info->flags & IEEE80211_TX_CTL_STBC))
-                        max_power = min(ah->tx_power_stbc[rateidx],
-                                        fi->tx_power);
+                        max_power = min_t(u8, ah->tx_power_stbc[rateidx],
+                                          2 * vif->bss_conf.txpower);
                 else
-                        max_power = min(ah->tx_power[rateidx], fi->tx_power);
+                        max_power = min_t(u8, ah->tx_power[rateidx],
+                                          2 * vif->bss_conf.txpower);
+                max_power = min(max_power, fi->tx_power);
         } else {
                 max_power = ah->paprd_training_power;
         }
-
-        return max_power;
+out:
+        /* XXX: clamp minimum TX power at 1 for AR9160 since if max_power
+         * is set to 0, frames are transmitted at max TX power
+         */
+        return (!max_power && !AR_SREV_9280_20_OR_LATER(ah)) ? 1 : max_power;
 }
 
 static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
diff --git a/drivers/net/wireless/ath/dfs_pattern_detector.c b/drivers/net/wireless/ath/dfs_pattern_detector.c
index 3d57f8772389..c657ca26a71a 100644
--- a/drivers/net/wireless/ath/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/dfs_pattern_detector.c
@@ -289,7 +289,7 @@ dpd_add_pulse(struct dfs_pattern_detector *dpd, struct pulse_event *event)
                                 "count=%d, count_false=%d\n",
                                 event->freq, pd->rs->type_id,
                                 ps->pri, ps->count, ps->count_falses);
-                        channel_detector_reset(dpd, cd);
+                        pd->reset(pd, dpd->last_pulse_ts);
                         return true;
                 }
         }
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 2d5ea21be47e..b97172667bc7 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/etherdevice.h>
 #include "wil6210.h"
 #include "wmi.h"
 
@@ -217,7 +218,7 @@ static int wil_cfg80211_dump_station(struct wiphy *wiphy,
         if (cid < 0)
                 return -ENOENT;
 
-        memcpy(mac, wil->sta[cid].addr, ETH_ALEN);
+        ether_addr_copy(mac, wil->sta[cid].addr);
         wil_dbg_misc(wil, "%s(%pM) CID %d\n", __func__, mac, cid);
 
         rc = wil_cid_fill_sinfo(wil, cid, sinfo);
@@ -387,15 +388,29 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
         int ch;
         int rc = 0;
 
+        wil_print_connect_params(wil, sme);
+
         if (test_bit(wil_status_fwconnecting, wil->status) ||
             test_bit(wil_status_fwconnected, wil->status))
                 return -EALREADY;
 
-        wil_print_connect_params(wil, sme);
+        if (sme->ie_len > WMI_MAX_IE_LEN) {
+                wil_err(wil, "IE too large (%td bytes)\n", sme->ie_len);
+                return -ERANGE;
+        }
+
+        rsn_eid = sme->ie ?
+                        cfg80211_find_ie(WLAN_EID_RSN, sme->ie, sme->ie_len) :
+                        NULL;
+
+        if (sme->privacy && !rsn_eid) {
+                wil_err(wil, "Missing RSN IE for secure connection\n");
+                return -EINVAL;
+        }
 
         bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid,
                                sme->ssid, sme->ssid_len,
-                               WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+                               IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY);
         if (!bss) {
                 wil_err(wil, "Unable to find BSS\n");
                 return -ENOENT;
@@ -407,17 +422,9 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
                 rc = -ENOENT;
                 goto out;
         }
+        wil->privacy = sme->privacy;
 
-        rsn_eid = sme->ie ?
-                        cfg80211_find_ie(WLAN_EID_RSN, sme->ie, sme->ie_len) :
-                        NULL;
-        if (rsn_eid) {
-                if (sme->ie_len > WMI_MAX_IE_LEN) {
-                        rc = -ERANGE;
-                        wil_err(wil, "IE too large (%td bytes)\n",
-                                sme->ie_len);
-                        goto out;
-                }
+        if (wil->privacy) {
                 /* For secure assoc, send WMI_DELETE_CIPHER_KEY_CMD */
                 rc = wmi_del_cipher_key(wil, 0, bss->bssid);
                 if (rc) {
@@ -450,7 +457,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
                         bss->capability);
                 goto out;
         }
-        if (rsn_eid) {
+        if (wil->privacy) {
                 conn.dot11_auth_mode = WMI_AUTH11_SHARED;
                 conn.auth_mode = WMI_AUTH_WPA2_PSK;
                 conn.pairwise_crypto_type = WMI_CRYPT_AES_GCMP;
@@ -472,8 +479,8 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
         }
         conn.channel = ch - 1;
 
-        memcpy(conn.bssid, bss->bssid, ETH_ALEN);
-        memcpy(conn.dst_mac, bss->bssid, ETH_ALEN);
+        ether_addr_copy(conn.bssid, bss->bssid);
+        ether_addr_copy(conn.dst_mac, bss->bssid);
 
         set_bit(wil_status_fwconnecting, wil->status);
 
@@ -769,15 +776,24 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
         wmi_set_ie(wil, WMI_FRAME_ASSOC_RESP, bcon->assocresp_ies_len,
                    bcon->assocresp_ies);
 
-        wil->secure_pcp = info->privacy;
+        wil->privacy = info->privacy;
 
         netif_carrier_on(ndev);
 
         rc = wmi_pcp_start(wil, info->beacon_interval, wmi_nettype,
                            channel->hw_value);
         if (rc)
-                netif_carrier_off(ndev);
+                goto err_pcp_start;
+
+        rc = wil_bcast_init(wil);
+        if (rc)
+                goto err_bcast;
 
+        goto out; /* success */
+err_bcast:
+        wmi_pcp_stop(wil);
+err_pcp_start:
+        netif_carrier_off(ndev);
 out:
         mutex_unlock(&wil->mutex);
         return rc;
@@ -911,6 +927,21 @@ static int wil_cfg80211_probe_client(struct wiphy *wiphy,
         return 0;
 }
 
+static int wil_cfg80211_change_bss(struct wiphy *wiphy,
+                                   struct net_device *dev,
+                                   struct bss_parameters *params)
+{
+        struct wil6210_priv *wil = wiphy_to_wil(wiphy);
+
+        if (params->ap_isolate >= 0) {
+                wil_dbg_misc(wil, "%s(ap_isolate %d => %d)\n", __func__,
+                             wil->ap_isolate, params->ap_isolate);
+                wil->ap_isolate = params->ap_isolate;
+        }
+
+        return 0;
+}
+
 static struct cfg80211_ops wil_cfg80211_ops = {
         .scan = wil_cfg80211_scan,
         .connect = wil_cfg80211_connect,
@@ -931,6 +962,7 @@ static struct cfg80211_ops wil_cfg80211_ops = {
         .stop_ap = wil_cfg80211_stop_ap,
         .del_station = wil_cfg80211_del_station,
         .probe_client = wil_cfg80211_probe_client,
+        .change_bss = wil_cfg80211_change_bss,
 };
 
 static void wil_wiphy_init(struct wiphy *wiphy)
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 45c3558ec804..bbc22d88f78f 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -29,6 +29,7 @@
 static u32 mem_addr;
 static u32 dbg_txdesc_index;
 static u32 dbg_vring_index; /* 24+ for Rx, 0..23 for Tx */
+u32 vring_idle_trsh = 16; /* HW fetches up to 16 descriptors at once */
 
 enum dbg_off_type {
         doff_u32 = 0,
@@ -102,23 +103,36 @@ static int wil_vring_debugfs_show(struct seq_file *s, void *data)
                                    % vring->size;
                         int avail = vring->size - used - 1;
                         char name[10];
+                        char sidle[10];
                         /* performance monitoring */
                         cycles_t now = get_cycles();
                         uint64_t idle = txdata->idle * 100;
                         uint64_t total = now - txdata->begin;
 
-                        do_div(idle, total);
+                        if (total != 0) {
+                                do_div(idle, total);
+                                snprintf(sidle, sizeof(sidle), "%3d%%",
+                                         (int)idle);
+                        } else {
+                                snprintf(sidle, sizeof(sidle), "N/A");
+                        }
                         txdata->begin = now;
                         txdata->idle = 0ULL;
 
                         snprintf(name, sizeof(name), "tx_%2d", i);
 
-                        seq_printf(s,
-                                   "\n%pM CID %d TID %d BACK([%d] %d TU A%s) [%3d|%3d] idle %3d%%\n",
-                                   wil->sta[cid].addr, cid, tid,
-                                   txdata->agg_wsize, txdata->agg_timeout,
-                                   txdata->agg_amsdu ? "+" : "-",
-                                   used, avail, (int)idle);
+                        if (cid < WIL6210_MAX_CID)
+                                seq_printf(s,
+                                           "\n%pM CID %d TID %d BACK([%u] %u TU A%s) [%3d|%3d] idle %s\n",
+                                           wil->sta[cid].addr, cid, tid,
+                                           txdata->agg_wsize,
+                                           txdata->agg_timeout,
+                                           txdata->agg_amsdu ? "+" : "-",
+                                           used, avail, sidle);
+                        else
+                                seq_printf(s,
+                                           "\nBroadcast [%3d|%3d] idle %s\n",
+                                           used, avail, sidle);
 
                         wil_print_vring(s, wil, name, vring, '_', 'H');
                 }
@@ -549,7 +563,7 @@ static ssize_t wil_write_file_reset(struct file *file, const char __user *buf,
         dev_close(ndev);
         ndev->flags &= ~IFF_UP;
         rtnl_unlock();
-        wil_reset(wil);
+        wil_reset(wil, true);
 
         return len;
 }
@@ -618,7 +632,7 @@ static ssize_t wil_write_back(struct file *file, const char __user *buf,
         struct wil6210_priv *wil = file->private_data;
         int rc;
         char *kbuf = kmalloc(len + 1, GFP_KERNEL);
-        char cmd[8];
+        char cmd[9];
         int p1, p2, p3;
 
         if (!kbuf)
@@ -1392,11 +1406,12 @@ static void wil6210_debugfs_init_isr(struct wil6210_priv *wil,
 
 /* fields in struct wil6210_priv */
 static const struct dbg_off dbg_wil_off[] = {
-        WIL_FIELD(secure_pcp,   S_IRUGO | S_IWUSR,      doff_u32),
+        WIL_FIELD(privacy,      S_IRUGO,                doff_u32),
         WIL_FIELD(status[0],    S_IRUGO | S_IWUSR,      doff_ulong),
         WIL_FIELD(fw_version,   S_IRUGO,                doff_u32),
         WIL_FIELD(hw_version,   S_IRUGO,                doff_x32),
         WIL_FIELD(recovery_count, S_IRUGO,              doff_u32),
+        WIL_FIELD(ap_isolate,   S_IRUGO,                doff_u32),
         {},
 };
 
@@ -1412,6 +1427,8 @@ static const struct dbg_off dbg_statics[] = {
         {"desc_index",  S_IRUGO | S_IWUSR, (ulong)&dbg_txdesc_index, doff_u32},
         {"vring_index", S_IRUGO | S_IWUSR, (ulong)&dbg_vring_index, doff_u32},
         {"mem_addr",    S_IRUGO | S_IWUSR, (ulong)&mem_addr, doff_u32},
+        {"vring_idle_trsh", S_IRUGO | S_IWUSR, (ulong)&vring_idle_trsh,
+         doff_u32},
         {},
 };
 
diff --git a/drivers/net/wireless/ath/wil6210/ethtool.c b/drivers/net/wireless/ath/wil6210/ethtool.c
index 4c44a82c34d7..0ea695ff98ad 100644
--- a/drivers/net/wireless/ath/wil6210/ethtool.c
+++ b/drivers/net/wireless/ath/wil6210/ethtool.c
@@ -50,27 +50,19 @@ static int wil_ethtoolops_get_coalesce(struct net_device *ndev,
 
         wil_dbg_misc(wil, "%s()\n", __func__);
 
-        if (test_bit(hw_capability_advanced_itr_moderation,
-                     wil->hw_capabilities)) {
-                tx_itr_en = ioread32(wil->csr +
-                                     HOSTADDR(RGF_DMA_ITR_TX_CNT_CTL));
-                if (tx_itr_en & BIT_DMA_ITR_TX_CNT_CTL_EN)
-                        tx_itr_val =
-                                ioread32(wil->csr +
-                                         HOSTADDR(RGF_DMA_ITR_TX_CNT_TRSH));
-
-                rx_itr_en = ioread32(wil->csr +
-                                     HOSTADDR(RGF_DMA_ITR_RX_CNT_CTL));
-                if (rx_itr_en & BIT_DMA_ITR_RX_CNT_CTL_EN)
-                        rx_itr_val =
-                                ioread32(wil->csr +
-                                         HOSTADDR(RGF_DMA_ITR_RX_CNT_TRSH));
-        } else {
-                rx_itr_en = ioread32(wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
-                if (rx_itr_en & BIT_DMA_ITR_CNT_CRL_EN)
-                        rx_itr_val = ioread32(wil->csr +
-                                              HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
-        }
+        tx_itr_en = ioread32(wil->csr +
+                             HOSTADDR(RGF_DMA_ITR_TX_CNT_CTL));
+        if (tx_itr_en & BIT_DMA_ITR_TX_CNT_CTL_EN)
+                tx_itr_val =
+                        ioread32(wil->csr +
+                                 HOSTADDR(RGF_DMA_ITR_TX_CNT_TRSH));
+
+        rx_itr_en = ioread32(wil->csr +
+                             HOSTADDR(RGF_DMA_ITR_RX_CNT_CTL));
+        if (rx_itr_en & BIT_DMA_ITR_RX_CNT_CTL_EN)
+                rx_itr_val =
+                        ioread32(wil->csr +
+                                 HOSTADDR(RGF_DMA_ITR_RX_CNT_TRSH));
 
         cp->tx_coalesce_usecs = tx_itr_val;
         cp->rx_coalesce_usecs = rx_itr_val;
diff --git a/drivers/net/wireless/ath/wil6210/fw.c b/drivers/net/wireless/ath/wil6210/fw.c
index 93c5cc16c515..4428345e5a47 100644
--- a/drivers/net/wireless/ath/wil6210/fw.c
+++ b/drivers/net/wireless/ath/wil6210/fw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ * Copyright (c) 2014-2015 Qualcomm Atheros, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,6 +20,7 @@
 #include "fw.h"
 
 MODULE_FIRMWARE(WIL_FW_NAME);
+MODULE_FIRMWARE(WIL_FW2_NAME);
 
 /* target operations */
 /* register read */
diff --git a/drivers/net/wireless/ath/wil6210/fw_inc.c b/drivers/net/wireless/ath/wil6210/fw_inc.c
index d4acf93a9a02..157f5ef384e0 100644
--- a/drivers/net/wireless/ath/wil6210/fw_inc.c
+++ b/drivers/net/wireless/ath/wil6210/fw_inc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ * Copyright (c) 2014-2015 Qualcomm Atheros, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -451,8 +451,6 @@ static int wil_fw_load(struct wil6210_priv *wil, const void *data, size_t size)
                 }
                 return -EINVAL;
         }
-        /* Mark FW as loaded from host */
-        S(RGF_USER_USAGE_6, 1);
 
         return rc;
 }
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
index a6f923086f31..28ffc18466c4 100644
--- a/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -166,9 +166,16 @@ void wil_unmask_irq(struct wil6210_priv *wil)
 /* target write operation */
 #define W(a, v) do { iowrite32(v, wil->csr + HOSTADDR(a)); wmb(); } while (0)
 
-static
-void wil_configure_interrupt_moderation_new(struct wil6210_priv *wil)
+void wil_configure_interrupt_moderation(struct wil6210_priv *wil)
 {
+        wil_dbg_irq(wil, "%s()\n", __func__);
+
+        /* disable interrupt moderation for monitor
+         * to get better timestamp precision
+         */
+        if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR)
+                return;
+
         /* Disable and clear tx counter before (re)configuration */
         W(RGF_DMA_ITR_TX_CNT_CTL, BIT_DMA_ITR_TX_CNT_CTL_CLR);
         W(RGF_DMA_ITR_TX_CNT_TRSH, wil->tx_max_burst_duration);
@@ -206,42 +213,8 @@ void wil_configure_interrupt_moderation_new(struct wil6210_priv *wil)
                                       BIT_DMA_ITR_RX_IDL_CNT_CTL_EXT_TIC_SEL);
 }
 
-static
-void wil_configure_interrupt_moderation_lgc(struct wil6210_priv *wil)
-{
-        /* disable, use usec resolution */
-        W(RGF_DMA_ITR_CNT_CRL, BIT_DMA_ITR_CNT_CRL_CLR);
-
-        wil_info(wil, "set ITR_TRSH = %d usec\n", wil->rx_max_burst_duration);
-        W(RGF_DMA_ITR_CNT_TRSH, wil->rx_max_burst_duration);
-        /* start it */
-        W(RGF_DMA_ITR_CNT_CRL,
-          BIT_DMA_ITR_CNT_CRL_EN | BIT_DMA_ITR_CNT_CRL_EXT_TICK);
-}
-
 #undef W
 
-void wil_configure_interrupt_moderation(struct wil6210_priv *wil)
-{
-        wil_dbg_irq(wil, "%s()\n", __func__);
-
-        /* disable interrupt moderation for monitor
-         * to get better timestamp precision
-         */
-        if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR)
-                return;
-
-        if (test_bit(hw_capability_advanced_itr_moderation,
-                     wil->hw_capabilities))
-                wil_configure_interrupt_moderation_new(wil);
-        else {
-                /* Advanced interrupt moderation is not available before
-                 * Sparrow v2. Will use legacy interrupt moderation
-                 */
-                wil_configure_interrupt_moderation_lgc(wil);
-        }
-}
-
 static irqreturn_t wil6210_irq_rx(int irq, void *cookie)
 {
         struct wil6210_priv *wil = cookie;
@@ -253,7 +226,7 @@ static irqreturn_t wil6210_irq_rx(int irq, void *cookie)
         trace_wil6210_irq_rx(isr);
         wil_dbg_irq(wil, "ISR RX 0x%08x\n", isr);
 
-        if (!isr) {
+        if (unlikely(!isr)) {
                 wil_err(wil, "spurious IRQ: RX\n");
                 return IRQ_NONE;
         }
@@ -266,17 +239,18 @@ static irqreturn_t wil6210_irq_rx(int irq, void *cookie)
          * action is always the same - should empty the accumulated
          * packets from the RX ring.
          */
-        if (isr & (BIT_DMA_EP_RX_ICR_RX_DONE | BIT_DMA_EP_RX_ICR_RX_HTRSH)) {
+        if (likely(isr & (BIT_DMA_EP_RX_ICR_RX_DONE |
+                          BIT_DMA_EP_RX_ICR_RX_HTRSH))) {
                 wil_dbg_irq(wil, "RX done\n");
 
-                if (isr & BIT_DMA_EP_RX_ICR_RX_HTRSH)
+                if (unlikely(isr & BIT_DMA_EP_RX_ICR_RX_HTRSH))
                         wil_err_ratelimited(wil,
                                             "Received \"Rx buffer is in risk of overflow\" interrupt\n");
 
                 isr &= ~(BIT_DMA_EP_RX_ICR_RX_DONE |
                          BIT_DMA_EP_RX_ICR_RX_HTRSH);
-                if (test_bit(wil_status_reset_done, wil->status)) {
-                        if (test_bit(wil_status_napi_en, wil->status)) {
+                if (likely(test_bit(wil_status_reset_done, wil->status))) {
+                        if (likely(test_bit(wil_status_napi_en, wil->status))) {
                                 wil_dbg_txrx(wil, "NAPI(Rx) schedule\n");
                                 need_unmask = false;
                                 napi_schedule(&wil->napi_rx);
@@ -289,7 +263,7 @@ static irqreturn_t wil6210_irq_rx(int irq, void *cookie)
                 }
         }
 
-        if (isr)
+        if (unlikely(isr))
                 wil_err(wil, "un-handled RX ISR bits 0x%08x\n", isr);
 
         /* Rx IRQ will be enabled when NAPI processing finished */
@@ -313,19 +287,19 @@ static irqreturn_t wil6210_irq_tx(int irq, void *cookie)
         trace_wil6210_irq_tx(isr);
         wil_dbg_irq(wil, "ISR TX 0x%08x\n", isr);
 
-        if (!isr) {
+        if (unlikely(!isr)) {
                 wil_err(wil, "spurious IRQ: TX\n");
                 return IRQ_NONE;
         }
 
         wil6210_mask_irq_tx(wil);
 
-        if (isr & BIT_DMA_EP_TX_ICR_TX_DONE) {
+        if (likely(isr & BIT_DMA_EP_TX_ICR_TX_DONE)) {
                 wil_dbg_irq(wil, "TX done\n");
                 isr &= ~BIT_DMA_EP_TX_ICR_TX_DONE;
                 /* clear also all VRING interrupts */
                 isr &= ~(BIT(25) - 1UL);
-                if (test_bit(wil_status_reset_done, wil->status)) {
+                if (likely(test_bit(wil_status_reset_done, wil->status))) {
                         wil_dbg_txrx(wil, "NAPI(Tx) schedule\n");
                         need_unmask = false;
                         napi_schedule(&wil->napi_tx);
@@ -334,7 +308,7 @@ static irqreturn_t wil6210_irq_tx(int irq, void *cookie)
                 }
         }
 
-        if (isr)
+        if (unlikely(isr))
                 wil_err(wil, "un-handled TX ISR bits 0x%08x\n", isr);
 
         /* Tx IRQ will be enabled when NAPI processing finished */
@@ -523,11 +497,11 @@ static irqreturn_t wil6210_hardirq(int irq, void *cookie)
         /**
          * pseudo_cause is Clear-On-Read, no need to ACK
          */
-        if ((pseudo_cause == 0) || ((pseudo_cause & 0xff) == 0xff))
+        if (unlikely((pseudo_cause == 0) || ((pseudo_cause & 0xff) == 0xff)))
                 return IRQ_NONE;
 
         /* FIXME: IRQ mask debug */
-        if (wil6210_debug_irq_mask(wil, pseudo_cause))
+        if (unlikely(wil6210_debug_irq_mask(wil, pseudo_cause)))
                 return IRQ_NONE;
 
         trace_wil6210_irq_pseudo(pseudo_cause);
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index b04e0afdcb21..c2a238426425 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -29,10 +29,6 @@ bool no_fw_recovery;
 module_param(no_fw_recovery, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(no_fw_recovery, " disable automatic FW error recovery");
 
-static bool no_fw_load = true;
-module_param(no_fw_load, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(no_fw_load, " do not download FW, use one in on-card flash.");
-
 /* if not set via modparam, will be set to default value of 1/8 of
  * rx ring size during init flow
  */
@@ -72,6 +68,7 @@ MODULE_PARM_DESC(mtu_max, " Max MTU value.");
 
 static uint rx_ring_order = WIL_RX_RING_SIZE_ORDER_DEFAULT;
 static uint tx_ring_order = WIL_TX_RING_SIZE_ORDER_DEFAULT;
+static uint bcast_ring_order = WIL_BCAST_RING_SIZE_ORDER_DEFAULT;
 
 static int ring_order_set(const char *val, const struct kernel_param *kp)
 {
@@ -220,6 +217,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid,
         switch (wdev->iftype) {
         case NL80211_IFTYPE_STATION:
         case NL80211_IFTYPE_P2P_CLIENT:
+                wil_bcast_fini(wil);
                 netif_tx_stop_all_queues(ndev);
                 netif_carrier_off(ndev);
 
@@ -364,6 +362,35 @@ static int wil_find_free_vring(struct wil6210_priv *wil)
         return -EINVAL;
 }
 
+int wil_bcast_init(struct wil6210_priv *wil)
+{
+        int ri = wil->bcast_vring, rc;
+
+        if ((ri >= 0) && wil->vring_tx[ri].va)
+                return 0;
+
+        ri = wil_find_free_vring(wil);
+        if (ri < 0)
+                return ri;
+
+        rc = wil_vring_init_bcast(wil, ri, 1 << bcast_ring_order);
+        if (rc == 0)
+                wil->bcast_vring = ri;
+
+        return rc;
+}
+
+void wil_bcast_fini(struct wil6210_priv *wil)
+{
+        int ri = wil->bcast_vring;
+
+        if (ri < 0)
+                return;
+
+        wil->bcast_vring = -1;
+        wil_vring_fini_tx(wil, ri);
+}
+
 static void wil_connect_worker(struct work_struct *work)
 {
         int rc;
@@ -411,6 +438,7 @@ int wil_priv_init(struct wil6210_priv *wil)
         init_completion(&wil->wmi_call);
 
         wil->pending_connect_cid = -1;
+        wil->bcast_vring = -1;
         setup_timer(&wil->connect_timer, wil_connect_timer_fn, (ulong)wil);
         setup_timer(&wil->scan_timer, wil_scan_timer_fn, (ulong)wil);
 
@@ -520,8 +548,6 @@ static int wil_target_reset(struct wil6210_priv *wil)
 {
         int delay = 0;
         u32 x;
-        bool is_reset_v2 = test_bit(hw_capability_reset_v2,
-                                    wil->hw_capabilities);
 
         wil_dbg_misc(wil, "Resetting \"%s\"...\n", wil->hw_name);
 
@@ -532,82 +558,67 @@ static int wil_target_reset(struct wil6210_priv *wil)
 
         wil_halt_cpu(wil);
 
+        /* clear all boot loader "ready" bits */
+        W(RGF_USER_BL + offsetof(struct RGF_BL, ready), 0);
         /* Clear Fw Download notification */
         C(RGF_USER_USAGE_6, BIT(0));
 
-        if (is_reset_v2) {
-                S(RGF_CAF_OSC_CONTROL, BIT_CAF_OSC_XTAL_EN);
-                /* XTAL stabilization should take about 3ms */
-                usleep_range(5000, 7000);
-                x = R(RGF_CAF_PLL_LOCK_STATUS);
-                if (!(x & BIT_CAF_OSC_DIG_XTAL_STABLE)) {
-                        wil_err(wil, "Xtal stabilization timeout\n"
-                                "RGF_CAF_PLL_LOCK_STATUS = 0x%08x\n", x);
-                        return -ETIME;
-                }
-                /* switch 10k to XTAL*/
-                C(RGF_USER_SPARROW_M_4, BIT_SPARROW_M_4_SEL_SLEEP_OR_REF);
-                /* 40 MHz */
-                C(RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_CAR_AHB_SW_SEL);
-
-                W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_0, 0x3ff81f);
-                W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_1, 0xf);
+        S(RGF_CAF_OSC_CONTROL, BIT_CAF_OSC_XTAL_EN);
+        /* XTAL stabilization should take about 3ms */
+        usleep_range(5000, 7000);
+        x = R(RGF_CAF_PLL_LOCK_STATUS);
+        if (!(x & BIT_CAF_OSC_DIG_XTAL_STABLE)) {
+                wil_err(wil, "Xtal stabilization timeout\n"
+                        "RGF_CAF_PLL_LOCK_STATUS = 0x%08x\n", x);
+                return -ETIME;
         }
+        /* switch 10k to XTAL*/
+        C(RGF_USER_SPARROW_M_4, BIT_SPARROW_M_4_SEL_SLEEP_OR_REF);
+        /* 40 MHz */
+        C(RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_CAR_AHB_SW_SEL);
+
+        W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_0, 0x3ff81f);
+        W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_1, 0xf);
 
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0xFE000000);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_1, 0x0000003F);
-        W(RGF_USER_CLKS_CTL_SW_RST_VEC_3,
-          is_reset_v2 ? 0x000000f0 : 0x00000170);
+        W(RGF_USER_CLKS_CTL_SW_RST_VEC_3, 0x000000f0);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0xFFE7FE00);
 
-        if (is_reset_v2) {
-                W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_0, 0x0);
-                W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_1, 0x0);
-        }
+        W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_0, 0x0);
+        W(RGF_USER_CLKS_CTL_EXT_SW_RST_VEC_1, 0x0);
 
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_3, 0);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_1, 0);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0);
 
-        if (is_reset_v2) {
-                W(RGF_USER_CLKS_CTL_SW_RST_VEC_3, 0x00000003);
-                /* reset A2 PCIE AHB */
-                W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0x00008000);
-        } else {
-                W(RGF_USER_CLKS_CTL_SW_RST_VEC_3, 0x00000001);
-                W(RGF_PCIE_LOS_COUNTER_CTL, BIT(6) | BIT(8));
-                W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0x00008000);
-        }
+        W(RGF_USER_CLKS_CTL_SW_RST_VEC_3, 0x00000003);
+        W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0x00008000); /* reset A2 PCIE AHB */
 
-        /* TODO: check order here!!! Erez code is different */
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0);
 
-        /* wait until device ready. typical time is 200..250 msec */
+        /* wait until device ready. typical time is 20..80 msec */
         do {
                 msleep(RST_DELAY);
-                x = R(RGF_USER_HW_MACHINE_STATE);
+                x = R(RGF_USER_BL + offsetof(struct RGF_BL, ready));
                 if (delay++ > RST_COUNT) {
-                        wil_err(wil, "Reset not completed, hw_state 0x%08x\n",
+                        wil_err(wil, "Reset not completed, bl.ready 0x%08x\n",
                                 x);
                         return -ETIME;
                 }
-        } while (x != HW_MACHINE_BOOT_DONE);
-
-        if (!is_reset_v2)
-                W(RGF_PCIE_LOS_COUNTER_CTL, BIT(8));
+        } while (!(x & BIT_BL_READY));
 
         C(RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);
 
+        /* enable fix for HW bug related to the SA/DA swap in AP Rx */
+        S(RGF_DMA_OFUL_NID_0, BIT_DMA_OFUL_NID_0_RX_EXT_TR_EN |
+          BIT_DMA_OFUL_NID_0_RX_EXT_A3_SRC);
+
         wil_dbg_misc(wil, "Reset completed in %d ms\n", delay * RST_DELAY);
         return 0;
 }
 
-#undef R
-#undef W
-#undef S
-#undef C
-
 void wil_mbox_ring_le2cpus(struct wil6210_mbox_ring *r)
 {
         le32_to_cpus(&r->base);
@@ -617,6 +628,32 @@ void wil_mbox_ring_le2cpus(struct wil6210_mbox_ring *r)
         le32_to_cpus(&r->head);
 }
 
+static int wil_get_bl_info(struct wil6210_priv *wil)
+{
+        struct net_device *ndev = wil_to_ndev(wil);
+        struct RGF_BL bl;
+
+        wil_memcpy_fromio_32(&bl, wil->csr + HOSTADDR(RGF_USER_BL), sizeof(bl));
+        le32_to_cpus(&bl.ready);
+        le32_to_cpus(&bl.version);
+        le32_to_cpus(&bl.rf_type);
+        le32_to_cpus(&bl.baseband_type);
+
+        if (!is_valid_ether_addr(bl.mac_address)) {
+                wil_err(wil, "BL: Invalid MAC %pM\n", bl.mac_address);
+                return -EINVAL;
+        }
+
+        ether_addr_copy(ndev->perm_addr, bl.mac_address);
+        if (!is_valid_ether_addr(ndev->dev_addr))
+                ether_addr_copy(ndev->dev_addr, bl.mac_address);
+        wil_info(wil,
+                 "Boot Loader: ver = %d MAC = %pM RF = 0x%08x bband = 0x%08x\n",
+                 bl.version, bl.mac_address, bl.rf_type, bl.baseband_type);
+
+        return 0;
+}
+
 static int wil_wait_for_fw_ready(struct wil6210_priv *wil)
 {
         ulong to = msecs_to_jiffies(1000);
@@ -637,7 +674,7 @@ static int wil_wait_for_fw_ready(struct wil6210_priv *wil)
  * After calling this routine, you're expected to reload
  * the firmware.
  */
-int wil_reset(struct wil6210_priv *wil)
+int wil_reset(struct wil6210_priv *wil, bool load_fw)
 {
         int rc;
 
@@ -651,6 +688,7 @@ int wil_reset(struct wil6210_priv *wil)
 
         cancel_work_sync(&wil->disconnect_worker);
         wil6210_disconnect(wil, NULL, WLAN_REASON_DEAUTH_LEAVING, false);
+        wil_bcast_fini(wil);
 
         /* prevent NAPI from being scheduled */
         bitmap_zero(wil->status, wil_status_last);
@@ -675,46 +713,62 @@ int wil_reset(struct wil6210_priv *wil)
         if (rc)
                 return rc;
 
-        if (!no_fw_load) {
-                wil_info(wil, "Use firmware <%s>\n", WIL_FW_NAME);
+        rc = wil_get_bl_info(wil);
+        if (rc)
+                return rc;
+
+        if (load_fw) {
+                wil_info(wil, "Use firmware <%s> + board <%s>\n", WIL_FW_NAME,
+                         WIL_FW2_NAME);
+
                 wil_halt_cpu(wil);
                 /* Loading f/w from the file */
                 rc = wil_request_firmware(wil, WIL_FW_NAME);
                 if (rc)
                         return rc;
+                rc = wil_request_firmware(wil, WIL_FW2_NAME);
+                if (rc)
+                        return rc;
+
+                /* Mark FW as loaded from host */
+                S(RGF_USER_USAGE_6, 1);
 
-                /* clear any interrupts which on-card-firmware may have set */
+                /* clear any interrupts which on-card-firmware
+                 * may have set
+                 */
                 wil6210_clear_irq(wil);
-                { /* CAF_ICR - clear and mask */
-                        u32 a = HOSTADDR(RGF_CAF_ICR) +
-                                offsetof(struct RGF_ICR, ICR);
-                        u32 m = HOSTADDR(RGF_CAF_ICR) +
-                                offsetof(struct RGF_ICR, IMV);
-                        u32 icr = ioread32(wil->csr + a);
-
-                        iowrite32(icr, wil->csr + a); /* W1C */
-                        iowrite32(~0, wil->csr + m);
-                        wmb(); /* wait for completion */
-                }
+                /* CAF_ICR - clear and mask */
+                /* it is W1C, clear by writing back same value */
+                S(RGF_CAF_ICR + offsetof(struct RGF_ICR, ICR), 0);
+                W(RGF_CAF_ICR + offsetof(struct RGF_ICR, IMV), ~0);
+
                 wil_release_cpu(wil);
-        } else {
-                wil_info(wil, "Use firmware from on-card flash\n");
         }
 
         /* init after reset */
         wil->pending_connect_cid = -1;
+        wil->ap_isolate = 0;
         reinit_completion(&wil->wmi_ready);
         reinit_completion(&wil->wmi_call);
 
-        wil_configure_interrupt_moderation(wil);
-        wil_unmask_irq(wil);
+        if (load_fw) {
+                wil_configure_interrupt_moderation(wil);
+                wil_unmask_irq(wil);
 
-        /* we just started MAC, wait for FW ready */
-        rc = wil_wait_for_fw_ready(wil);
+                /* we just started MAC, wait for FW ready */
+                rc = wil_wait_for_fw_ready(wil);
+                if (rc == 0) /* check FW is responsive */
+                        rc = wmi_echo(wil);
+        }
 
         return rc;
 }
 
+#undef R
+#undef W
+#undef S
+#undef C
+
 void wil_fw_error_recovery(struct wil6210_priv *wil)
 {
         wil_dbg_misc(wil, "starting fw error recovery\n");
@@ -730,7 +784,7 @@ int __wil_up(struct wil6210_priv *wil)
 
         WARN_ON(!mutex_is_locked(&wil->mutex));
 
-        rc = wil_reset(wil);
+        rc = wil_reset(wil, true);
         if (rc)
                 return rc;
 
@@ -837,7 +891,7 @@ int __wil_down(struct wil6210_priv *wil)
         if (!iter)
                 wil_err(wil, "timeout waiting for idle FW/HW\n");
 
-        wil_rx_fini(wil);
+        wil_reset(wil, false);
 
         return 0;
 }
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index ace30c1b5c64..f2f7ea29558e 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -82,7 +82,7 @@ static int wil6210_netdev_poll_rx(struct napi_struct *napi, int budget)
         wil_rx_handle(wil, &quota);
         done = budget - quota;
 
-        if (done <= 1) { /* burst ends - only one packet processed */
+        if (done < budget) {
                 napi_complete(napi);
                 wil6210_unmask_irq_rx(wil);
                 wil_dbg_txrx(wil, "NAPI RX complete\n");
@@ -110,7 +110,7 @@ static int wil6210_netdev_poll_tx(struct napi_struct *napi, int budget)
                 tx_done += wil_tx_complete(wil, i);
         }
 
-        if (tx_done <= 1) { /* burst ends - only one packet processed */
+        if (tx_done < budget) {
                 napi_complete(napi);
                 wil6210_unmask_irq_tx(wil);
                 wil_dbg_txrx(wil, "NAPI TX complete\n");
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index 3dd26709ccb2..109986114abf 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -39,18 +39,6 @@ void wil_set_capabilities(struct wil6210_priv *wil)
         bitmap_zero(wil->hw_capabilities, hw_capability_last);
 
         switch (rev_id) {
-        case JTAG_DEV_ID_MARLON_B0:
-                wil->hw_name = "Marlon B0";
-                wil->hw_version = HW_VER_MARLON_B0;
-                break;
-        case JTAG_DEV_ID_SPARROW_A0:
-                wil->hw_name = "Sparrow A0";
-                wil->hw_version = HW_VER_SPARROW_A0;
-                break;
-        case JTAG_DEV_ID_SPARROW_A1:
-                wil->hw_name = "Sparrow A1";
-                wil->hw_version = HW_VER_SPARROW_A1;
-                break;
         case JTAG_DEV_ID_SPARROW_B0:
                 wil->hw_name = "Sparrow B0";
                 wil->hw_version = HW_VER_SPARROW_B0;
@@ -62,13 +50,6 @@ void wil_set_capabilities(struct wil6210_priv *wil)
         }
 
         wil_info(wil, "Board hardware is %s\n", wil->hw_name);
-
-        if (wil->hw_version >= HW_VER_SPARROW_A0)
-                set_bit(hw_capability_reset_v2, wil->hw_capabilities);
-
-        if (wil->hw_version >= HW_VER_SPARROW_B0)
-                set_bit(hw_capability_advanced_itr_moderation,
-                        wil->hw_capabilities);
 }
 
 void wil_disable_irq(struct wil6210_priv *wil)
@@ -150,7 +131,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
 
         /* need reset here to obtain MAC */
         mutex_lock(&wil->mutex);
-        rc = wil_reset(wil);
+        rc = wil_reset(wil, false);
         mutex_unlock(&wil->mutex);
         if (debug_fw)
                 rc = 0;
@@ -265,8 +246,6 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         wil6210_debugfs_init(wil);
 
-        /* check FW is alive */
-        wmi_echo(wil);
 
         return 0;
 
@@ -305,7 +284,6 @@ static void wil_pcie_remove(struct pci_dev *pdev)
 }
 
 static const struct pci_device_id wil6210_pcie_ids[] = {
-        { PCI_DEVICE(0x1ae9, 0x0301) },
         { PCI_DEVICE(0x1ae9, 0x0310) },
         { PCI_DEVICE(0x1ae9, 0x0302) }, /* same as above, firmware broken */
         { /* end: all zeroes */ },
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index 8439f65db259..e8bd512d81a9 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -33,6 +33,15 @@ module_param(rtap_include_phy_info, bool, S_IRUGO);
 MODULE_PARM_DESC(rtap_include_phy_info,
                  " Include PHY info in the radiotap header, default - no");
 
+bool rx_align_2;
+module_param(rx_align_2, bool, S_IRUGO);
+MODULE_PARM_DESC(rx_align_2, " align Rx buffers on 4*n+2, default - no");
+
+static inline uint wil_rx_snaplen(void)
+{
+        return rx_align_2 ? 6 : 0;
+}
+
 static inline int wil_vring_is_empty(struct vring *vring)
 {
         return vring->swhead == vring->swtail;
@@ -53,34 +62,38 @@ static inline int wil_vring_is_full(struct vring *vring)
         return wil_vring_next_tail(vring) == vring->swhead;
 }
 
-/*
- * Available space in Tx Vring
- */
-static inline int wil_vring_avail_tx(struct vring *vring)
+/* Used space in Tx Vring */
+static inline int wil_vring_used_tx(struct vring *vring)
 {
         u32 swhead = vring->swhead;
         u32 swtail = vring->swtail;
-        int used = (vring->size + swhead - swtail) % vring->size;
+        return (vring->size + swhead - swtail) % vring->size;
+}
 
-        return vring->size - used - 1;
+/* Available space in Tx Vring */
+static inline int wil_vring_avail_tx(struct vring *vring)
+{
+        return vring->size - wil_vring_used_tx(vring) - 1;
 }
 
-/**
- * wil_vring_wmark_low - low watermark for available descriptor space
- */
+/* wil_vring_wmark_low - low watermark for available descriptor space */
 static inline int wil_vring_wmark_low(struct vring *vring)
 {
         return vring->size/8;
 }
 
-/**
- * wil_vring_wmark_high - high watermark for available descriptor space
- */
+/* wil_vring_wmark_high - high watermark for available descriptor space */
 static inline int wil_vring_wmark_high(struct vring *vring)
 {
         return vring->size/4;
 }
 
+/* wil_val_in_range - check if value in [min,max) */
+static inline bool wil_val_in_range(int val, int min, int max)
+{
+        return val >= min && val < max;
+}
+
 static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
 {
         struct device *dev = wil_to_dev(wil);
@@ -98,8 +111,7 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
                 vring->va = NULL;
                 return -ENOMEM;
         }
-        /*
-         * vring->va should be aligned on its size rounded up to power of 2
+        /* vring->va should be aligned on its size rounded up to power of 2
          * This is granted by the dma_alloc_coherent
          */
         vring->va = dma_alloc_coherent(dev, sz, &vring->pa, GFP_KERNEL);
@@ -206,7 +218,7 @@ static int wil_vring_alloc_skb(struct wil6210_priv *wil, struct vring *vring,
                                u32 i, int headroom)
 {
         struct device *dev = wil_to_dev(wil);
-        unsigned int sz = mtu_max + ETH_HLEN;
+        unsigned int sz = mtu_max + ETH_HLEN + wil_rx_snaplen();
         struct vring_rx_desc dd, *d = &dd;
         volatile struct vring_rx_desc *_d = &vring->va[i].rx;
         dma_addr_t pa;
@@ -346,27 +358,6 @@ static void wil_rx_add_radiotap_header(struct wil6210_priv *wil,
         }
 }
 
-/*
- * Fast swap in place between 2 registers
- */
-static void wil_swap_u16(u16 *a, u16 *b)
-{
-        *a ^= *b;
-        *b ^= *a;
-        *a ^= *b;
-}
-
-static void wil_swap_ethaddr(void *data)
-{
-        struct ethhdr *eth = data;
-        u16 *s = (u16 *)eth->h_source;
-        u16 *d = (u16 *)eth->h_dest;
-
-        wil_swap_u16(s++, d++);
-        wil_swap_u16(s++, d++);
-        wil_swap_u16(s, d);
-}
-
 /**
  * reap 1 frame from @swhead
  *
@@ -383,40 +374,45 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
         struct vring_rx_desc *d;
         struct sk_buff *skb;
         dma_addr_t pa;
-        unsigned int sz = mtu_max + ETH_HLEN;
+        unsigned int snaplen = wil_rx_snaplen();
+        unsigned int sz = mtu_max + ETH_HLEN + snaplen;
         u16 dmalen;
         u8 ftype;
-        u8 ds_bits;
         int cid;
+        int i = (int)vring->swhead;
         struct wil_net_stats *stats;
 
         BUILD_BUG_ON(sizeof(struct vring_rx_desc) > sizeof(skb->cb));
 
-        if (wil_vring_is_empty(vring))
+        if (unlikely(wil_vring_is_empty(vring)))
                 return NULL;
 
-        _d = &vring->va[vring->swhead].rx;
-        if (!(_d->dma.status & RX_DMA_STATUS_DU)) {
+        _d = &vring->va[i].rx;
+        if (unlikely(!(_d->dma.status & RX_DMA_STATUS_DU))) {
                 /* it is not error, we just reached end of Rx done area */
                 return NULL;
         }
 
-        skb = vring->ctx[vring->swhead].skb;
+        skb = vring->ctx[i].skb;
+        vring->ctx[i].skb = NULL;
+        wil_vring_advance_head(vring, 1);
+        if (!skb) {
+                wil_err(wil, "No Rx skb at [%d]\n", i);
+                return NULL;
+        }
         d = wil_skb_rxdesc(skb);
         *d = *_d;
         pa = wil_desc_addr(&d->dma.addr);
-        vring->ctx[vring->swhead].skb = NULL;
-        wil_vring_advance_head(vring, 1);
 
         dma_unmap_single(dev, pa, sz, DMA_FROM_DEVICE);
         dmalen = le16_to_cpu(d->dma.length);
 
-        trace_wil6210_rx(vring->swhead, d);
-        wil_dbg_txrx(wil, "Rx[%3d] : %d bytes\n", vring->swhead, dmalen);
+        trace_wil6210_rx(i, d);
+        wil_dbg_txrx(wil, "Rx[%3d] : %d bytes\n", i, dmalen);
         wil_hex_dump_txrx("Rx ", DUMP_PREFIX_NONE, 32, 4,
                           (const void *)d, sizeof(*d), false);
 
-        if (dmalen > sz) {
+        if (unlikely(dmalen > sz)) {
                 wil_err(wil, "Rx size too large: %d bytes!\n", dmalen);
                 kfree_skb(skb);
                 return NULL;
@@ -445,14 +441,14 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
          * in Rx descriptor. If type is not data, it is 802.11 frame as is
          */
         ftype = wil_rxdesc_ftype(d) << 2;
-        if (ftype != IEEE80211_FTYPE_DATA) {
+        if (unlikely(ftype != IEEE80211_FTYPE_DATA)) {
                 wil_dbg_txrx(wil, "Non-data frame ftype 0x%08x\n", ftype);
                 /* TODO: process it */
                 kfree_skb(skb);
                 return NULL;
         }
 
-        if (skb->len < ETH_HLEN) {
+        if (unlikely(skb->len < ETH_HLEN + snaplen)) {
                 wil_err(wil, "Short frame, len = %d\n", skb->len);
                 /* TODO: process it (i.e. BAR) */
                 kfree_skb(skb);
@@ -463,9 +459,9 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
          * and in case of error drop the packet
          * higher stack layers will handle retransmission (if required)
          */
-        if (d->dma.status & RX_DMA_STATUS_L4I) {
+        if (likely(d->dma.status & RX_DMA_STATUS_L4I)) {
                 /* L4 protocol identified, csum calculated */
-                if ((d->dma.error & RX_DMA_ERROR_L4_ERR) == 0)
+                if (likely((d->dma.error & RX_DMA_ERROR_L4_ERR) == 0))
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                 /* If HW reports bad checksum, let IP stack re-check it
                  * For example, HW don't understand Microsoft IP stack that
@@ -474,13 +470,15 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
                  */
         }
 
-        ds_bits = wil_rxdesc_ds_bits(d);
-        if (ds_bits == 1) {
-                /*
-                 * HW bug - in ToDS mode, i.e. Rx on AP side,
-                 * addresses get swapped
+        if (snaplen) {
+                /* Packet layout
+                 * +-------+-------+---------+------------+------+
+                 * | SA(6) | DA(6) | SNAP(6) | ETHTYPE(2) | DATA |
+                 * +-------+-------+---------+------------+------+
+                 * Need to remove SNAP, shifting SA and DA forward
                  */
-                wil_swap_ethaddr(skb->data);
+                memmove(skb->data + snaplen, skb->data, 2 * ETH_ALEN);
+                skb_pull(skb, snaplen);
         }
 
         return skb;
@@ -503,7 +501,7 @@ static int wil_rx_refill(struct wil6210_priv *wil, int count)
                         (next_tail != v->swhead) && (count-- > 0);
                         v->swtail = next_tail) {
                 rc = wil_vring_alloc_skb(wil, v, v->swtail, headroom);
-                if (rc) {
+                if (unlikely(rc)) {
                         wil_err(wil, "Error %d in wil_rx_refill[%d]\n",
                                 rc, v->swtail);
                         break;
@@ -520,17 +518,71 @@ static int wil_rx_refill(struct wil6210_priv *wil, int count)
  */
 void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)
 {
-        gro_result_t rc;
+        gro_result_t rc = GRO_NORMAL;
         struct wil6210_priv *wil = ndev_to_wil(ndev);
+        struct wireless_dev *wdev = wil_to_wdev(wil);
         unsigned int len = skb->len;
         struct vring_rx_desc *d = wil_skb_rxdesc(skb);
-        int cid = wil_rxdesc_cid(d);
+        int cid = wil_rxdesc_cid(d); /* always 0..7, no need to check */
+        struct ethhdr *eth = (void *)skb->data;
+        /* here looking for DA, not A1, thus Rxdesc's 'mcast' indication
+         * is not suitable, need to look at data
+         */
+        int mcast = is_multicast_ether_addr(eth->h_dest);
         struct wil_net_stats *stats = &wil->sta[cid].stats;
+        struct sk_buff *xmit_skb = NULL;
+        static const char * const gro_res_str[] = {
+                [GRO_MERGED]            = "GRO_MERGED",
+                [GRO_MERGED_FREE]       = "GRO_MERGED_FREE",
+                [GRO_HELD]              = "GRO_HELD",
+                [GRO_NORMAL]            = "GRO_NORMAL",
+                [GRO_DROP]              = "GRO_DROP",
+        };
 
         skb_orphan(skb);
 
-        rc = napi_gro_receive(&wil->napi_rx, skb);
+        if (wdev->iftype == NL80211_IFTYPE_AP && !wil->ap_isolate) {
+                if (mcast) {
+                        /* send multicast frames both to higher layers in
+                         * local net stack and back to the wireless medium
+                         */
+                        xmit_skb = skb_copy(skb, GFP_ATOMIC);
+                } else {
+                        int xmit_cid = wil_find_cid(wil, eth->h_dest);
+
+                        if (xmit_cid >= 0) {
+                                /* The destination station is associated to
+                                 * this AP (in this VLAN), so send the frame
+                                 * directly to it and do not pass it to local
+                                 * net stack.
+                                 */
+                                xmit_skb = skb;
+                                skb = NULL;
+                        }
+                }
+        }
+        if (xmit_skb) {
+                /* Send to wireless media and increase priority by 256 to
+                 * keep the received priority instead of reclassifying
+                 * the frame (see cfg80211_classify8021d).
+                 */
+                xmit_skb->dev = ndev;
+                xmit_skb->priority += 256;
+                xmit_skb->protocol = htons(ETH_P_802_3);
+                skb_reset_network_header(xmit_skb);
+                skb_reset_mac_header(xmit_skb);
+                wil_dbg_txrx(wil, "Rx -> Tx %d bytes\n", len);
+                dev_queue_xmit(xmit_skb);
+        }
 
+        if (skb) { /* deliver to local stack */
+
+                skb->protocol = eth_type_trans(skb, ndev);
+                rc = napi_gro_receive(&wil->napi_rx, skb);
+                wil_dbg_txrx(wil, "Rx complete %d bytes => %s\n",
+                             len, gro_res_str[rc]);
+        }
+        /* statistics. rc set to GRO_NORMAL for AP bridging */
         if (unlikely(rc == GRO_DROP)) {
                 ndev->stats.rx_dropped++;
                 stats->rx_dropped++;
@@ -540,17 +592,8 @@ void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)
                 stats->rx_packets++;
                 ndev->stats.rx_bytes += len;
                 stats->rx_bytes += len;
-        }
-        {
-                static const char * const gro_res_str[] = {
-                        [GRO_MERGED]            = "GRO_MERGED",
-                        [GRO_MERGED_FREE]       = "GRO_MERGED_FREE",
-                        [GRO_HELD]              = "GRO_HELD",
-                        [GRO_NORMAL]            = "GRO_NORMAL",
-                        [GRO_DROP]              = "GRO_DROP",
-                };
-                wil_dbg_txrx(wil, "Rx complete %d bytes => %s\n",
-                             len, gro_res_str[rc]);
+                if (mcast)
+                        ndev->stats.multicast++;
         }
 }
 
@@ -565,7 +608,7 @@ void wil_rx_handle(struct wil6210_priv *wil, int *quota)
         struct vring *v = &wil->vring_rx;
         struct sk_buff *skb;
 
-        if (!v->va) {
+        if (unlikely(!v->va)) {
                 wil_err(wil, "Rx IRQ while Rx not yet initialized\n");
                 return;
         }
@@ -581,7 +624,6 @@ void wil_rx_handle(struct wil6210_priv *wil, int *quota)
                         skb->protocol = htons(ETH_P_802_2);
                         wil_netif_rx_any(skb, ndev);
                 } else {
-                        skb->protocol = eth_type_trans(skb, ndev);
                         wil_rx_reorder(wil, skb);
                 }
         }
@@ -707,6 +749,72 @@ int wil_vring_init_tx(struct wil6210_priv *wil, int id, int size,
         return rc;
 }
 
+int wil_vring_init_bcast(struct wil6210_priv *wil, int id, int size)
+{
+        int rc;
+        struct wmi_bcast_vring_cfg_cmd cmd = {
+                .action = cpu_to_le32(WMI_VRING_CMD_ADD),
+                .vring_cfg = {
+                        .tx_sw_ring = {
+                                .max_mpdu_size =
+                                        cpu_to_le16(wil_mtu2macbuf(mtu_max)),
+                                .ring_size = cpu_to_le16(size),
+                        },
+                        .ringid = id,
+                        .encap_trans_type = WMI_VRING_ENC_TYPE_802_3,
+                },
+        };
+        struct {
+                struct wil6210_mbox_hdr_wmi wmi;
+                struct wmi_vring_cfg_done_event cmd;
+        } __packed reply;
+        struct vring *vring = &wil->vring_tx[id];
+        struct vring_tx_data *txdata = &wil->vring_tx_data[id];
+
+        wil_dbg_misc(wil, "%s() max_mpdu_size %d\n", __func__,
+                     cmd.vring_cfg.tx_sw_ring.max_mpdu_size);
+
+        if (vring->va) {
+                wil_err(wil, "Tx ring [%d] already allocated\n", id);
+                rc = -EINVAL;
+                goto out;
+        }
+
+        memset(txdata, 0, sizeof(*txdata));
+        spin_lock_init(&txdata->lock);
+        vring->size = size;
+        rc = wil_vring_alloc(wil, vring);
+        if (rc)
+                goto out;
+
+        wil->vring2cid_tid[id][0] = WIL6210_MAX_CID; /* CID */
+        wil->vring2cid_tid[id][1] = 0; /* TID */
+
+        cmd.vring_cfg.tx_sw_ring.ring_mem_base = cpu_to_le64(vring->pa);
+
+        rc = wmi_call(wil, WMI_BCAST_VRING_CFG_CMDID, &cmd, sizeof(cmd),
+                      WMI_VRING_CFG_DONE_EVENTID, &reply, sizeof(reply), 100);
+        if (rc)
+                goto out_free;
+
+        if (reply.cmd.status != WMI_FW_STATUS_SUCCESS) {
+                wil_err(wil, "Tx config failed, status 0x%02x\n",
+                        reply.cmd.status);
+                rc = -EINVAL;
+                goto out_free;
+        }
+        vring->hwtail = le32_to_cpu(reply.cmd.tx_vring_tail_ptr);
+
+        txdata->enabled = 1;
+
+        return 0;
+ out_free:
+        wil_vring_free(wil, vring, 1);
+ out:
+
+        return rc;
+}
+
 void wil_vring_fini_tx(struct wil6210_priv *wil, int id)
 {
         struct vring *vring = &wil->vring_tx[id];
@@ -730,7 +838,7 @@ void wil_vring_fini_tx(struct wil6210_priv *wil, int id)
         memset(txdata, 0, sizeof(*txdata));
 }
 
-static struct vring *wil_find_tx_vring(struct wil6210_priv *wil,
+static struct vring *wil_find_tx_ucast(struct wil6210_priv *wil,
                                        struct sk_buff *skb)
 {
         int i;
@@ -763,15 +871,6 @@ static struct vring *wil_find_tx_vring(struct wil6210_priv *wil,
         return NULL;
 }
 
-static void wil_set_da_for_vring(struct wil6210_priv *wil,
-                                 struct sk_buff *skb, int vring_index)
-{
-        struct ethhdr *eth = (void *)skb->data;
-        int cid = wil->vring2cid_tid[vring_index][0];
-
-        memcpy(eth->h_dest, wil->sta[cid].addr, ETH_ALEN);
-}
-
 static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
                         struct sk_buff *skb);
 
@@ -792,6 +891,9 @@ static struct vring *wil_find_tx_vring_sta(struct wil6210_priv *wil,
                         continue;
 
                 cid = wil->vring2cid_tid[i][0];
+                if (cid >= WIL6210_MAX_CID) /* skip BCAST */
+                        continue;
+
                 if (!wil->sta[cid].data_port_open &&
                     (skb->protocol != cpu_to_be16(ETH_P_PAE)))
                         break;
@@ -806,17 +908,51 @@ static struct vring *wil_find_tx_vring_sta(struct wil6210_priv *wil,
         return NULL;
 }
 
-/*
- * Find 1-st vring and return it; set dest address for this vring in skb
- * duplicate skb and send it to other active vrings
+/* Use one of 2 strategies:
+ *
+ * 1. New (real broadcast):
+ *    use dedicated broadcast vring
+ * 2. Old (pseudo-DMS):
+ *    Find 1-st vring and return it;
+ *    duplicate skb and send it to other active vrings;
+ *    in all cases override dest address to unicast peer's address
+ * Use old strategy when new is not supported yet:
+ *  - for PBSS
+ *  - for secure link
  */
-static struct vring *wil_tx_bcast(struct wil6210_priv *wil,
-                                  struct sk_buff *skb)
+static struct vring *wil_find_tx_bcast_1(struct wil6210_priv *wil,
+                                         struct sk_buff *skb)
+{
+        struct vring *v;
+        int i = wil->bcast_vring;
+
+        if (i < 0)
+                return NULL;
+        v = &wil->vring_tx[i];
+        if (!v->va)
+                return NULL;
+
+        return v;
+}
+
+static void wil_set_da_for_vring(struct wil6210_priv *wil,
+                                 struct sk_buff *skb, int vring_index)
+{
+        struct ethhdr *eth = (void *)skb->data;
+        int cid = wil->vring2cid_tid[vring_index][0];
+
+        ether_addr_copy(eth->h_dest, wil->sta[cid].addr);
+}
+
+static struct vring *wil_find_tx_bcast_2(struct wil6210_priv *wil,
+                                         struct sk_buff *skb)
 {
         struct vring *v, *v2;
         struct sk_buff *skb2;
         int i;
         u8 cid;
+        struct ethhdr *eth = (void *)skb->data;
+        char *src = eth->h_source;
 
         /* find 1-st vring eligible for data */
         for (i = 0; i < WIL6210_MAX_TX_RINGS; i++) {
@@ -825,9 +961,15 @@ static struct vring *wil_tx_bcast(struct wil6210_priv *wil,
                         continue;
 
                 cid = wil->vring2cid_tid[i][0];
+                if (cid >= WIL6210_MAX_CID) /* skip BCAST */
+                        continue;
                 if (!wil->sta[cid].data_port_open)
                         continue;
 
+                /* don't Tx back to source when re-routing Rx->Tx at the AP */
+                if (0 == memcmp(wil->sta[cid].addr, src, ETH_ALEN))
+                        continue;
+
                 goto found;
         }
 
@@ -845,9 +987,14 @@ found:
                 if (!v2->va)
                         continue;
                 cid = wil->vring2cid_tid[i][0];
+                if (cid >= WIL6210_MAX_CID) /* skip BCAST */
+                        continue;
                 if (!wil->sta[cid].data_port_open)
                         continue;
 
+                if (0 == memcmp(wil->sta[cid].addr, src, ETH_ALEN))
+                        continue;
+
                 skb2 = skb_copy(skb, GFP_ATOMIC);
                 if (skb2) {
                         wil_dbg_txrx(wil, "BCAST DUP -> ring %d\n", i);
@@ -861,6 +1008,20 @@ found:
         return v;
 }
 
+static struct vring *wil_find_tx_bcast(struct wil6210_priv *wil,
+                                       struct sk_buff *skb)
+{
+        struct wireless_dev *wdev = wil->wdev;
+
+        if (wdev->iftype != NL80211_IFTYPE_AP)
+                return wil_find_tx_bcast_2(wil, skb);
+
+        if (wil->privacy)
+                return wil_find_tx_bcast_2(wil, skb);
+
+        return wil_find_tx_bcast_1(wil, skb);
+}
+
 static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len,
                            int vring_index)
 {
@@ -952,13 +1113,16 @@ static int __wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
         struct vring_tx_data *txdata = &wil->vring_tx_data[vring_index];
         uint i = swhead;
         dma_addr_t pa;
+        int used;
+        bool mcast = (vring_index == wil->bcast_vring);
+        uint len = skb_headlen(skb);
 
         wil_dbg_txrx(wil, "%s()\n", __func__);
 
         if (unlikely(!txdata->enabled))
                 return -EINVAL;
 
-        if (avail < 1 + nr_frags) {
+        if (unlikely(avail < 1 + nr_frags)) {
                 wil_err_ratelimited(wil,
                                     "Tx ring[%2d] full. No space for %d fragments\n",
                                     vring_index, 1 + nr_frags);
@@ -977,9 +1141,19 @@ static int __wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
                 return -EINVAL;
         vring->ctx[i].mapped_as = wil_mapped_as_single;
         /* 1-st segment */
-        wil_tx_desc_map(d, pa, skb_headlen(skb), vring_index);
+        wil_tx_desc_map(d, pa, len, vring_index);
+        if (unlikely(mcast)) {
+                d->mac.d[0] |= BIT(MAC_CFG_DESC_TX_0_MCS_EN_POS); /* MCS 0 */
+                if (unlikely(len > WIL_BCAST_MCS0_LIMIT)) {
+                        /* set MCS 1 */
+                        d->mac.d[0] |= (1 << MAC_CFG_DESC_TX_0_MCS_INDEX_POS);
+                        /* packet mode 2 */
+                        d->mac.d[1] |= BIT(MAC_CFG_DESC_TX_1_PKT_MODE_EN_POS) |
+                                       (2 << MAC_CFG_DESC_TX_1_PKT_MODE_POS);
+                }
+        }
         /* Process TCP/UDP checksum offloading */
-        if (wil_tx_desc_offload_cksum_set(wil, d, skb)) {
+        if (unlikely(wil_tx_desc_offload_cksum_set(wil, d, skb))) {
                 wil_err(wil, "Tx[%2d] Failed to set cksum, drop packet\n",
                         vring_index);
                 goto dma_error;
@@ -1027,8 +1201,14 @@ static int __wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
          */
         vring->ctx[i].skb = skb_get(skb);
 
-        if (wil_vring_is_empty(vring)) /* performance monitoring */
+        /* performance monitoring */
+        used = wil_vring_used_tx(vring);
+        if (wil_val_in_range(vring_idle_trsh,
+                             used, used + nr_frags + 1)) {
                 txdata->idle += get_cycles() - txdata->last_idle;
+                wil_dbg_txrx(wil,  "Ring[%2d] not idle %d -> %d\n",
+                             vring_index, used, used + nr_frags + 1);
+        }
 
         /* advance swhead */
         wil_vring_advance_head(vring, nr_frags + 1);
@@ -1077,23 +1257,24 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
         struct wil6210_priv *wil = ndev_to_wil(ndev);
         struct ethhdr *eth = (void *)skb->data;
+        bool bcast = is_multicast_ether_addr(eth->h_dest);
         struct vring *vring;
         static bool pr_once_fw;
         int rc;
 
         wil_dbg_txrx(wil, "%s()\n", __func__);
-        if (!test_bit(wil_status_fwready, wil->status)) {
+        if (unlikely(!test_bit(wil_status_fwready, wil->status))) {
                 if (!pr_once_fw) {
                         wil_err(wil, "FW not ready\n");
                         pr_once_fw = true;
                 }
                 goto drop;
         }
-        if (!test_bit(wil_status_fwconnected, wil->status)) {
+        if (unlikely(!test_bit(wil_status_fwconnected, wil->status))) {
                 wil_err(wil, "FW not connected\n");
                 goto drop;
         }
-        if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) {
+        if (unlikely(wil->wdev->iftype == NL80211_IFTYPE_MONITOR)) {
                 wil_err(wil, "Xmit in monitor mode not supported\n");
                 goto drop;
         }
@@ -1104,12 +1285,10 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 /* in STA mode (ESS), all to same VRING */
                 vring = wil_find_tx_vring_sta(wil, skb);
         } else { /* direct communication, find matching VRING */
-                if (is_unicast_ether_addr(eth->h_dest))
-                        vring = wil_find_tx_vring(wil, skb);
-                else
-                        vring = wil_tx_bcast(wil, skb);
+                vring = bcast ? wil_find_tx_bcast(wil, skb) :
+                                wil_find_tx_ucast(wil, skb);
         }
-        if (!vring) {
+        if (unlikely(!vring)) {
                 wil_dbg_txrx(wil, "No Tx VRING found for %pM\n", eth->h_dest);
                 goto drop;
         }
@@ -1117,7 +1296,7 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         rc = wil_tx_vring(wil, vring, skb);
 
         /* do we still have enough room in the vring? */
-        if (wil_vring_avail_tx(vring) < wil_vring_wmark_low(vring)) {
+        if (unlikely(wil_vring_avail_tx(vring) < wil_vring_wmark_low(vring))) {
                 netif_tx_stop_all_queues(wil_to_ndev(wil));
                 wil_dbg_txrx(wil, "netif_tx_stop : ring full\n");
         }
@@ -1170,21 +1349,28 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid)
         struct vring_tx_data *txdata = &wil->vring_tx_data[ringid];
         int done = 0;
         int cid = wil->vring2cid_tid[ringid][0];
-        struct wil_net_stats *stats = &wil->sta[cid].stats;
+        struct wil_net_stats *stats = NULL;
         volatile struct vring_tx_desc *_d;
+        int used_before_complete;
+        int used_new;
 
-        if (!vring->va) {
+        if (unlikely(!vring->va)) {
                 wil_err(wil, "Tx irq[%d]: vring not initialized\n", ringid);
                 return 0;
         }
 
-        if (!txdata->enabled) {
+        if (unlikely(!txdata->enabled)) {
                 wil_info(wil, "Tx irq[%d]: vring disabled\n", ringid);
                 return 0;
         }
 
         wil_dbg_txrx(wil, "%s(%d)\n", __func__, ringid);
 
+        used_before_complete = wil_vring_used_tx(vring);
+
+        if (cid < WIL6210_MAX_CID)
+                stats = &wil->sta[cid].stats;
+
         while (!wil_vring_is_empty(vring)) {
                 int new_swtail;
                 struct wil_ctx *ctx = &vring->ctx[vring->swtail];
@@ -1196,7 +1382,7 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid)
                 /* TODO: check we are not past head */
 
                 _d = &vring->va[lf].tx;
-                if (!(_d->dma.status & TX_DMA_STATUS_DU))
+                if (unlikely(!(_d->dma.status & TX_DMA_STATUS_DU)))
                         break;
 
                 new_swtail = (lf + 1) % vring->size;
@@ -1224,14 +1410,17 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid)
                         wil_txdesc_unmap(dev, d, ctx);
 
                         if (skb) {
-                                if (d->dma.error == 0) {
+                                if (likely(d->dma.error == 0)) {
                                         ndev->stats.tx_packets++;
-                                        stats->tx_packets++;
                                         ndev->stats.tx_bytes += skb->len;
-                                        stats->tx_bytes += skb->len;
+                                        if (stats) {
+                                                stats->tx_packets++;
+                                                stats->tx_bytes += skb->len;
+                                        }
                                 } else {
                                         ndev->stats.tx_errors++;
-                                        stats->tx_errors++;
+                                        if (stats)
+                                                stats->tx_errors++;
                                 }
                                 wil_consume_skb(skb, d->dma.error == 0);
                         }
@@ -1246,8 +1435,12 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid)
                 }
         }
 
-        if (wil_vring_is_empty(vring)) { /* performance monitoring */
-                wil_dbg_txrx(wil, "Ring[%2d] empty\n", ringid);
+        /* performance monitoring */
+        used_new = wil_vring_used_tx(vring);
+        if (wil_val_in_range(vring_idle_trsh,
+                             used_new, used_before_complete)) {
+                wil_dbg_txrx(wil, "Ring[%2d] idle %d -> %d\n",
+                             ringid, used_before_complete, used_new);
                 txdata->last_idle = get_cycles();
         }
 
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 94611568fc9a..4310972c9e16 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -27,9 +27,12 @@ extern bool no_fw_recovery;
 extern unsigned int mtu_max;
 extern unsigned short rx_ring_overflow_thrsh;
 extern int agg_wsize;
+extern u32 vring_idle_trsh;
+extern bool rx_align_2;
 
 #define WIL_NAME "wil6210"
-#define WIL_FW_NAME "wil6210.fw"
+#define WIL_FW_NAME "wil6210.fw" /* code */
+#define WIL_FW2_NAME "wil6210.board" /* board & radio parameters */
 
 #define WIL_MAX_BUS_REQUEST_KBPS 800000 /* ~6.1Gbps */
 
@@ -47,6 +50,8 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1)
 #define WIL_TX_Q_LEN_DEFAULT            (4000)
 #define WIL_RX_RING_SIZE_ORDER_DEFAULT  (10)
 #define WIL_TX_RING_SIZE_ORDER_DEFAULT  (10)
+#define WIL_BCAST_RING_SIZE_ORDER_DEFAULT       (7)
+#define WIL_BCAST_MCS0_LIMIT            (1024) /* limit for MCS0 frame size */
 /* limit ring size in range [32..32k] */
 #define WIL_RING_SIZE_ORDER_MIN (5)
 #define WIL_RING_SIZE_ORDER_MAX (15)
@@ -120,6 +125,16 @@ struct RGF_ICR {
         u32 IMC; /* Mask Clear, write 1 to clear */
 } __packed;
 
+struct RGF_BL {
+        u32 ready;              /* 0x880A3C bit [0] */
+#define BIT_BL_READY    BIT(0)
+        u32 version;            /* 0x880A40 version of the BL struct */
+        u32 rf_type;            /* 0x880A44 ID of the connected RF */
+        u32 baseband_type;      /* 0x880A48 ID of the baseband */
+        u8  mac_address[ETH_ALEN]; /* 0x880A4C permanent MAC */
+        u8 pad[2];
+} __packed;
+
 /* registers - FW addresses */
 #define RGF_USER_USAGE_1                (0x880004)
 #define RGF_USER_USAGE_6                (0x880018)
@@ -130,6 +145,7 @@ struct RGF_ICR {
 #define RGF_USER_MAC_CPU_0              (0x8801fc)
         #define BIT_USER_MAC_CPU_MAN_RST        BIT(1) /* mac_cpu_man_rst */
 #define RGF_USER_USER_SCRATCH_PAD       (0x8802bc)
+#define RGF_USER_BL                     (0x880A3C) /* Boot Loader */
 #define RGF_USER_FW_REV_ID              (0x880a8c) /* chip revision */
 #define RGF_USER_CLKS_CTL_0             (0x880abc)
         #define BIT_USER_CLKS_CAR_AHB_SW_SEL    BIT(1) /* ref clk/PLL */
@@ -169,6 +185,13 @@ struct RGF_ICR {
         #define BIT_DMA_ITR_CNT_CRL_CLR         BIT(3)
         #define BIT_DMA_ITR_CNT_CRL_REACH_TRSH  BIT(4)
 
+/* Offload control (Sparrow B0+) */
+#define RGF_DMA_OFUL_NID_0              (0x881cd4)
+        #define BIT_DMA_OFUL_NID_0_RX_EXT_TR_EN         BIT(0)
+        #define BIT_DMA_OFUL_NID_0_TX_EXT_TR_EN         BIT(1)
+        #define BIT_DMA_OFUL_NID_0_RX_EXT_A3_SRC        BIT(2)
+        #define BIT_DMA_OFUL_NID_0_TX_EXT_A3_SRC        BIT(3)
+
 /* New (sparrow v2+) interrupt moderation control */
 #define RGF_DMA_ITR_TX_DESQ_NO_MOD              (0x881d40)
 #define RGF_DMA_ITR_TX_CNT_TRSH                 (0x881d34)
@@ -229,16 +252,10 @@ struct RGF_ICR {
         #define BIT_CAF_OSC_DIG_XTAL_STABLE     BIT(0)
 
 #define RGF_USER_JTAG_DEV_ID    (0x880b34) /* device ID */
-        #define JTAG_DEV_ID_MARLON_B0   (0x0612072f)
-        #define JTAG_DEV_ID_SPARROW_A0  (0x0632072f)
-        #define JTAG_DEV_ID_SPARROW_A1  (0x1632072f)
         #define JTAG_DEV_ID_SPARROW_B0  (0x2632072f)
 
 enum {
         HW_VER_UNKNOWN,
-        HW_VER_MARLON_B0,  /* JTAG_DEV_ID_MARLON_B0  */
-        HW_VER_SPARROW_A0, /* JTAG_DEV_ID_SPARROW_A0 */
-        HW_VER_SPARROW_A1, /* JTAG_DEV_ID_SPARROW_A1 */
         HW_VER_SPARROW_B0, /* JTAG_DEV_ID_SPARROW_B0 */
 };
 
@@ -482,8 +499,6 @@ enum {
 };
 
 enum {
-        hw_capability_reset_v2 = 0,
-        hw_capability_advanced_itr_moderation = 1,
         hw_capability_last
 };
 
@@ -528,8 +543,9 @@ struct wil6210_priv {
         wait_queue_head_t wq; /* for all wait_event() use */
         /* profile */
         u32 monitor_flags;
-        u32 secure_pcp; /* create secure PCP? */
+        u32 privacy; /* secure connection? */
         int sinfo_gen;
+        u32 ap_isolate; /* no intra-BSS communication */
         /* interrupt moderation */
         u32 tx_max_burst_duration;
         u32 tx_interframe_timeout;
@@ -581,6 +597,7 @@ struct wil6210_priv {
         struct vring_tx_data vring_tx_data[WIL6210_MAX_TX_RINGS];
         u8 vring2cid_tid[WIL6210_MAX_TX_RINGS][2]; /* [0] - CID, [1] - TID */
         struct wil_sta_info sta[WIL6210_MAX_CID];
+        int bcast_vring;
         /* scan */
         struct cfg80211_scan_request *scan_request;
 
@@ -658,7 +675,7 @@ int wil_if_add(struct wil6210_priv *wil);
 void wil_if_remove(struct wil6210_priv *wil);
 int wil_priv_init(struct wil6210_priv *wil);
 void wil_priv_deinit(struct wil6210_priv *wil);
-int wil_reset(struct wil6210_priv *wil);
+int wil_reset(struct wil6210_priv *wil, bool no_fw);
 void wil_fw_error_recovery(struct wil6210_priv *wil);
 void wil_set_recovery_state(struct wil6210_priv *wil, int state);
 int wil_up(struct wil6210_priv *wil);
@@ -743,6 +760,9 @@ void wil_rx_fini(struct wil6210_priv *wil);
 int wil_vring_init_tx(struct wil6210_priv *wil, int id, int size,
                       int cid, int tid);
 void wil_vring_fini_tx(struct wil6210_priv *wil, int id);
+int wil_vring_init_bcast(struct wil6210_priv *wil, int id, int size);
+int wil_bcast_init(struct wil6210_priv *wil);
+void wil_bcast_fini(struct wil6210_priv *wil);
 
 netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev);
 int wil_tx_complete(struct wil6210_priv *wil, int ringid);
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 0f3e4334c8e3..9fe2085be2c5 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -281,7 +281,6 @@ int wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len)
 /*=== Event handlers ===*/
 static void wmi_evt_ready(struct wil6210_priv *wil, int id, void *d, int len)
 {
-        struct net_device *ndev = wil_to_ndev(wil);
         struct wireless_dev *wdev = wil->wdev;
         struct wmi_ready_event *evt = d;
 
@@ -290,11 +289,7 @@ static void wmi_evt_ready(struct wil6210_priv *wil, int id, void *d, int len)
 
         wil_info(wil, "FW ver. %d; MAC %pM; %d MID's\n", wil->fw_version,
                  evt->mac, wil->n_mids);
-
-        if (!is_valid_ether_addr(ndev->dev_addr)) {
-                memcpy(ndev->dev_addr, evt->mac, ETH_ALEN);
-                memcpy(ndev->perm_addr, evt->mac, ETH_ALEN);
-        }
+        /* ignore MAC address, we already have it from the boot loader */
         snprintf(wdev->wiphy->fw_version, sizeof(wdev->wiphy->fw_version),
                  "%d", wil->fw_version);
 }
@@ -471,7 +466,7 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len)
 
         /* FIXME FW can transmit only ucast frames to peer */
         /* FIXME real ring_id instead of hard coded 0 */
-        memcpy(wil->sta[evt->cid].addr, evt->bssid, ETH_ALEN);
+        ether_addr_copy(wil->sta[evt->cid].addr, evt->bssid);
         wil->sta[evt->cid].status = wil_sta_conn_pending;
 
         wil->pending_connect_cid = evt->cid;
@@ -529,8 +524,8 @@ static void wmi_evt_eapol_rx(struct wil6210_priv *wil, int id,
         }
 
         eth = (struct ethhdr *)skb_put(skb, ETH_HLEN);
-        memcpy(eth->h_dest, ndev->dev_addr, ETH_ALEN);
-        memcpy(eth->h_source, evt->src_mac, ETH_ALEN);
+        ether_addr_copy(eth->h_dest, ndev->dev_addr);
+        ether_addr_copy(eth->h_source, evt->src_mac);
         eth->h_proto = cpu_to_be16(ETH_P_PAE);
         memcpy(skb_put(skb, eapol_len), evt->eapol, eapol_len);
         skb->protocol = eth_type_trans(skb, ndev);
@@ -856,7 +851,7 @@ int wmi_set_mac_address(struct wil6210_priv *wil, void *addr)
 {
         struct wmi_set_mac_address_cmd cmd;
 
-        memcpy(cmd.mac, addr, ETH_ALEN);
+        ether_addr_copy(cmd.mac, addr);
 
         wil_dbg_wmi(wil, "Set MAC %pM\n", addr);
 
@@ -879,7 +874,7 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
                 struct wmi_pcp_started_event evt;
         } __packed reply;
 
-        if (!wil->secure_pcp)
+        if (!wil->privacy)
                 cmd.disable_sec = 1;
 
         if ((cmd.pcp_max_assoc_sta > WIL6210_MAX_CID) ||
@@ -1114,6 +1109,11 @@ int wmi_rx_chain_add(struct wil6210_priv *wil, struct vring *vring)
                  */
                 cmd.l3_l4_ctrl |= (1 << L3_L4_CTRL_TCPIP_CHECKSUM_EN_POS);
         }
+
+        if (rx_align_2)
+                cmd.l2_802_3_offload_ctrl |=
+                                L2_802_3_OFFLOAD_CTRL_SNAP_KEEP_MSK;
+
         /* typical time for secure PCP is 840ms */
         rc = wmi_call(wil, WMI_CFG_RX_CHAIN_CMDID, &cmd, sizeof(cmd),
                       WMI_CFG_RX_CHAIN_DONE_EVENTID, &evt, sizeof(evt), 2000);
@@ -1162,7 +1162,8 @@ int wmi_disconnect_sta(struct wil6210_priv *wil, const u8 *mac, u16 reason)
         struct wmi_disconnect_sta_cmd cmd = {
                 .disconnect_reason = cpu_to_le16(reason),
         };
-        memcpy(cmd.dst_mac, mac, ETH_ALEN);
+
+        ether_addr_copy(cmd.dst_mac, mac);
 
         wil_dbg_wmi(wil, "%s(%pM, reason %d)\n", __func__, mac, reason);
 
diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 8a4af613e191..b29055315350 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -70,7 +70,6 @@ enum wmi_command_id {
         WMI_SET_UCODE_IDLE_CMDID        = 0x0813,
         WMI_SET_WORK_MODE_CMDID         = 0x0815,
         WMI_LO_LEAKAGE_CALIB_CMDID      = 0x0816,
-        WMI_MARLON_R_ACTIVATE_CMDID     = 0x0817,
         WMI_MARLON_R_READ_CMDID         = 0x0818,
         WMI_MARLON_R_WRITE_CMDID        = 0x0819,
         WMI_MARLON_R_TXRX_SEL_CMDID     = 0x081a,
@@ -80,6 +79,7 @@ enum wmi_command_id {
         WMI_RF_RX_TEST_CMDID            = 0x081e,
         WMI_CFG_RX_CHAIN_CMDID          = 0x0820,
         WMI_VRING_CFG_CMDID             = 0x0821,
+        WMI_BCAST_VRING_CFG_CMDID       = 0x0822,
         WMI_VRING_BA_EN_CMDID           = 0x0823,
         WMI_VRING_BA_DIS_CMDID          = 0x0824,
         WMI_RCP_ADDBA_RESP_CMDID        = 0x0825,
@@ -99,6 +99,7 @@ enum wmi_command_id {
         WMI_BF_TXSS_MGMT_CMDID          = 0x0837,
         WMI_BF_SM_MGMT_CMDID            = 0x0838,
         WMI_BF_RXSS_MGMT_CMDID          = 0x0839,
+        WMI_BF_TRIG_CMDID               = 0x083A,
         WMI_SET_SECTORS_CMDID           = 0x0849,
         WMI_MAINTAIN_PAUSE_CMDID        = 0x0850,
         WMI_MAINTAIN_RESUME_CMDID       = 0x0851,
@@ -596,6 +597,22 @@ struct wmi_vring_cfg_cmd {
 } __packed;
 
 /*
+ * WMI_BCAST_VRING_CFG_CMDID
+ */
+struct wmi_bcast_vring_cfg {
+        struct wmi_sw_ring_cfg tx_sw_ring;
+        u8 ringid;                              /* 0-23 vrings */
+        u8 encap_trans_type;
+        u8 ds_cfg;                              /* 802.3 DS cfg */
+        u8 nwifi_ds_trans_type;
+} __packed;
+
+struct wmi_bcast_vring_cfg_cmd {
+        __le32 action;
+        struct wmi_bcast_vring_cfg vring_cfg;
+} __packed;
+
+/*
  * WMI_VRING_BA_EN_CMDID
  */
 struct wmi_vring_ba_en_cmd {
@@ -687,6 +704,9 @@ struct wmi_cfg_rx_chain_cmd {
         #define L2_802_3_OFFLOAD_CTRL_VLAN_TAG_INSERTION_POS (0)
         #define L2_802_3_OFFLOAD_CTRL_VLAN_TAG_INSERTION_LEN (1)
         #define L2_802_3_OFFLOAD_CTRL_VLAN_TAG_INSERTION_MSK (0x1)
+        #define L2_802_3_OFFLOAD_CTRL_SNAP_KEEP_POS (1)
+        #define L2_802_3_OFFLOAD_CTRL_SNAP_KEEP_LEN (1)
+        #define L2_802_3_OFFLOAD_CTRL_SNAP_KEEP_MSK (0x2)
         u8 l2_802_3_offload_ctrl;
 
         #define L2_NWIFI_OFFLOAD_CTRL_REMOVE_QOS_POS (0)
@@ -841,7 +861,6 @@ enum wmi_event_id {
         WMI_IQ_RX_CALIB_DONE_EVENTID            = 0x1812,
         WMI_SET_WORK_MODE_DONE_EVENTID          = 0x1815,
         WMI_LO_LEAKAGE_CALIB_DONE_EVENTID       = 0x1816,
-        WMI_MARLON_R_ACTIVATE_DONE_EVENTID      = 0x1817,
         WMI_MARLON_R_READ_DONE_EVENTID          = 0x1818,
         WMI_MARLON_R_WRITE_DONE_EVENTID         = 0x1819,
         WMI_MARLON_R_TXRX_SEL_DONE_EVENTID      = 0x181a,
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 55db9f03eb2a..6a1f03c271c1 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1004,7 +1004,7 @@ static void frag_rx_path(struct atmel_private *priv,
                         atmel_copy_to_host(priv->dev, (void *)&netcrc, rx_packet_loc + msdu_size, 4);
                         if ((crc ^ 0xffffffff) != netcrc) {
                                 priv->dev->stats.rx_crc_errors++;
-                                memset(priv->frag_source, 0xff, ETH_ALEN);
+                                eth_broadcast_addr(priv->frag_source);
                         }
                 }
 
@@ -1022,7 +1022,7 @@ static void frag_rx_path(struct atmel_private *priv,
                         atmel_copy_to_host(priv->dev, (void *)&netcrc, rx_packet_loc + msdu_size, 4);
                         if ((crc ^ 0xffffffff) != netcrc) {
                                 priv->dev->stats.rx_crc_errors++;
-                                memset(priv->frag_source, 0xff, ETH_ALEN);
+                                eth_broadcast_addr(priv->frag_source);
                                 more_frags = 1; /* don't send broken assembly */
                         }
                 }
@@ -1031,7 +1031,7 @@ static void frag_rx_path(struct atmel_private *priv,
                 priv->frag_no++;
 
                 if (!more_frags) { /* last one */
-                        memset(priv->frag_source, 0xff, ETH_ALEN);
+                        eth_broadcast_addr(priv->frag_source);
                         if (!(skb = dev_alloc_skb(priv->frag_len + 14))) {
                                 priv->dev->stats.rx_dropped++;
                         } else {
@@ -1127,7 +1127,7 @@ static void rx_done_irq(struct atmel_private *priv)
                         atmel_copy_to_host(priv->dev, (unsigned char *)&priv->rx_buf, rx_packet_loc + 24, msdu_size);
 
                         /* we use the same buffer for frag reassembly and control packets */
-                        memset(priv->frag_source, 0xff, ETH_ALEN);
+                        eth_broadcast_addr(priv->frag_source);
 
                         if (priv->do_rx_crc) {
                                 /* last 4 octets is crc */
@@ -1379,7 +1379,7 @@ static int atmel_close(struct net_device *dev)
                 wrqu.data.length = 0;
                 wrqu.data.flags = 0;
                 wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+                eth_zero_addr(wrqu.ap_addr.sa_data);
                 wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
         }
 
@@ -1555,7 +1555,7 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
         priv->last_qual = jiffies;
         priv->last_beacon_timestamp = 0;
         memset(priv->frag_source, 0xff, sizeof(priv->frag_source));
-        memset(priv->BSSID, 0, ETH_ALEN);
+        eth_zero_addr(priv->BSSID);
         priv->CurrentBSSID[0] = 0xFF; /* Initialize to something invalid.... */
         priv->station_was_associated = 0;
 
@@ -2760,7 +2760,7 @@ static void atmel_scan(struct atmel_private *priv, int specific_ssid)
                 u8 SSID_size;
         } cmd;
 
-        memset(cmd.BSSID, 0xff, ETH_ALEN);
+        eth_broadcast_addr(cmd.BSSID);
 
         if (priv->fast_scan) {
                 cmd.SSID_size = priv->SSID_size;
@@ -4049,7 +4049,7 @@ static int reset_atmel_card(struct net_device *dev)
                 wrqu.data.length = 0;
                 wrqu.data.flags = 0;
                 wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+                eth_zero_addr(wrqu.ap_addr.sa_data);
                 wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
         }
 
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 1d7982afc0ad..6837064908be 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -553,7 +553,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
                                   size_t buffersize, bool dma_to_device)
 {
         if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr)))
-                return 1;
+                return true;
 
         switch (ring->type) {
         case B43_DMA_30BIT:
@@ -571,13 +571,13 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
         }
 
         /* The address is OK. */
-        return 0;
+        return false;
 
 address_error:
         /* We can't support this address. Unmap it again. */
         unmap_descbuffer(ring, addr, buffersize, dma_to_device);
 
-        return 1;
+        return true;
 }
 
 static bool b43_rx_buffer_is_poisoned(struct b43_dmaring *ring, struct sk_buff *skb)
@@ -1099,16 +1099,16 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev,
                                             enum b43_dmatype type)
 {
         if (type != B43_DMA_64BIT)
-                return 1;
+                return true;
 
 #ifdef CONFIG_B43_SSB
         if (dev->dev->bus_type == B43_BUS_SSB &&
             dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
             !(pci_is_pcie(dev->dev->sdev->bus->host_pci) &&
               ssb_read32(dev->dev->sdev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64))
-                        return 1;
+                        return true;
 #endif
-        return 0;
+        return false;
 }
 
 int b43_dma_init(struct b43_wldev *dev)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 75345c1e8c34..b2f9521fe551 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4132,7 +4132,7 @@ static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
                 if (conf->bssid)
                         memcpy(wl->bssid, conf->bssid, ETH_ALEN);
                 else
-                        memset(wl->bssid, 0, ETH_ALEN);
+                        eth_zero_addr(wl->bssid);
         }
 
         if (b43_status(dev) >= B43_STAT_INITIALIZED) {
@@ -4819,7 +4819,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
         switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA
         case B43_BUS_BCMA:
-                bcma_core_pci_down(dev->dev->bdev->bus);
+                bcma_host_pci_down(dev->dev->bdev->bus);
                 break;
 #endif
 #ifdef CONFIG_B43_SSB
@@ -4866,9 +4866,9 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
         switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA
         case B43_BUS_BCMA:
-                bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],
+                bcma_host_pci_irq_ctl(dev->dev->bdev->bus,
                                       dev->dev->bdev, true);
-                bcma_core_pci_up(dev->dev->bdev->bus);
+                bcma_host_pci_up(dev->dev->bdev->bus);
                 break;
 #endif
 #ifdef CONFIG_B43_SSB
@@ -5051,7 +5051,7 @@ static void b43_op_remove_interface(struct ieee80211_hw *hw,
         wl->operating = false;
 
         b43_adjust_opmode(dev);
-        memset(wl->mac_addr, 0, ETH_ALEN);
+        eth_zero_addr(wl->mac_addr);
         b43_upload_card_macaddress(dev);
 
         mutex_unlock(&wl->mutex);
@@ -5067,8 +5067,8 @@ static int b43_op_start(struct ieee80211_hw *hw)
         /* Kill all old instance specific information to make sure
          * the card won't use it in the short timeframe between start
          * and mac80211 reconfiguring it. */
-        memset(wl->bssid, 0, ETH_ALEN);
-        memset(wl->mac_addr, 0, ETH_ALEN);
+        eth_zero_addr(wl->bssid);
+        eth_zero_addr(wl->mac_addr);
         wl->filter_flags = 0;
         wl->radiotap_enabled = false;
         b43_qos_clear(wl);
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index b2ed1795130b..f9dd892b9f27 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -427,7 +427,7 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring,
                                          bool dma_to_device)
 {
         if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr)))
-                return 1;
+                return true;
 
         switch (ring->type) {
         case B43legacy_DMA_30BIT:
@@ -441,13 +441,13 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring,
         }
 
         /* The address is OK. */
-        return 0;
+        return false;
 
 address_error:
         /* We can't support this address. Unmap it again. */
         unmap_descbuffer(ring, addr, buffersize, dma_to_device);
 
-        return 1;
+        return true;
 }
 
 static int setup_rx_descbuffer(struct b43legacy_dmaring *ring,
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 4e58c0069830..c77b7f59505c 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2866,7 +2866,7 @@ static void b43legacy_op_bss_info_changed(struct ieee80211_hw *hw,
                 if (conf->bssid)
                         memcpy(wl->bssid, conf->bssid, ETH_ALEN);
                 else
-                        memset(wl->bssid, 0, ETH_ALEN);
+                        eth_zero_addr(wl->bssid);
         }
 
         if (b43legacy_status(dev) >= B43legacy_STAT_INITIALIZED) {
@@ -3470,7 +3470,7 @@ static void b43legacy_op_remove_interface(struct ieee80211_hw *hw,
 
         spin_lock_irqsave(&wl->irq_lock, flags);
         b43legacy_adjust_opmode(dev);
-        memset(wl->mac_addr, 0, ETH_ALEN);
+        eth_zero_addr(wl->mac_addr);
         b43legacy_upload_card_macaddress(dev);
         spin_unlock_irqrestore(&wl->irq_lock, flags);
 
@@ -3487,8 +3487,8 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
         /* Kill all old instance specific information to make sure
          * the card won't use it in the short timeframe between start
          * and mac80211 reconfiguring it. */
-        memset(wl->bssid, 0, ETH_ALEN);
-        memset(wl->mac_addr, 0, ETH_ALEN);
+        eth_zero_addr(wl->bssid);
+        eth_zero_addr(wl->mac_addr);
         wl->filter_flags = 0;
         wl->beacon0_uploaded = false;
         wl->beacon1_uploaded = false;
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c
index c4559bcbc707..7c1bdbc02569 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -32,7 +32,7 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)
         if (dev->dev->id.revision >= 3) {
                 if (!(b43legacy_read32(dev, B43legacy_MMIO_RADIO_HWENABLED_HI)
                       & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK))
-                        return 1;
+                        return true;
         } else {
                 /* To prevent CPU fault on PPC, do not read a register
                  * unless the interface is started; however, on resume
@@ -40,12 +40,12 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)
                  * that happens, unconditionally return TRUE.
                  */
                 if (b43legacy_status(dev) < B43legacy_STAT_STARTED)
-                        return 1;
+                        return true;
                 if (b43legacy_read16(dev, B43legacy_MMIO_RADIO_HWENABLED_LO)
                     & B43legacy_MMIO_RADIO_HWENABLED_LO_MASK)
-                        return 1;
+                        return true;
         }
-        return 0;
+        return false;
 }
 
 /* The poll callback for the hardware button. */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 7944224e3fc9..9b508bd3b839 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -29,6 +29,7 @@
 #include <linux/mmc/host.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/brcmfmac-sdio.h>
+#include <linux/pm_runtime.h>
 #include <linux/suspend.h>
 #include <linux/errno.h>
 #include <linux/module.h>
@@ -58,6 +59,14 @@
 #define BRCMF_DEFAULT_TXGLOM_SIZE       32  /* max tx frames in glom chain */
 #define BRCMF_DEFAULT_RXGLOM_SIZE       32  /* max rx frames in glom chain */
 
+struct brcmf_sdiod_freezer {
+        atomic_t freezing;
+        atomic_t thread_count;
+        u32 frozen_count;
+        wait_queue_head_t thread_freeze;
+        struct completion resumed;
+};
+
 static int brcmf_sdiod_txglomsz = BRCMF_DEFAULT_TXGLOM_SIZE;
 module_param_named(txglomsz, brcmf_sdiod_txglomsz, int, 0);
 MODULE_PARM_DESC(txglomsz, "maximum tx packet chain size [SDIO]");
@@ -197,6 +206,30 @@ int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)
         return 0;
 }
 
+void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
+                              enum brcmf_sdiod_state state)
+{
+        if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM ||
+            state == sdiodev->state)
+                return;
+
+        brcmf_dbg(TRACE, "%d -> %d\n", sdiodev->state, state);
+        switch (sdiodev->state) {
+        case BRCMF_SDIOD_DATA:
+                /* any other state means bus interface is down */
+                brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN);
+                break;
+        case BRCMF_SDIOD_DOWN:
+                /* transition from DOWN to DATA means bus interface is up */
+                if (state == BRCMF_SDIOD_DATA)
+                        brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_UP);
+                break;
+        default:
+                break;
+        }
+        sdiodev->state = state;
+}
+
 static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func,
                                         uint regaddr, u8 byte)
 {
@@ -269,12 +302,6 @@ static int brcmf_sdiod_request_data(struct brcmf_sdio_dev *sdiodev, u8 fn,
         return ret;
 }
 
-static void brcmf_sdiod_nomedium_state(struct brcmf_sdio_dev *sdiodev)
-{
-        sdiodev->state = BRCMF_STATE_NOMEDIUM;
-        brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN);
-}
-
 static int brcmf_sdiod_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
                                    u8 regsz, void *data, bool write)
 {
@@ -282,7 +309,7 @@ static int brcmf_sdiod_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
         s32 retry = 0;
         int ret;
 
-        if (sdiodev->state == BRCMF_STATE_NOMEDIUM)
+        if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
                 return -ENOMEDIUM;
 
         /*
@@ -308,7 +335,7 @@ static int brcmf_sdiod_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
                  retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
 
         if (ret == -ENOMEDIUM)
-                brcmf_sdiod_nomedium_state(sdiodev);
+                brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);
         else if (ret != 0) {
                 /*
                  * SleepCSR register access can fail when
@@ -331,7 +358,7 @@ brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)
         int err = 0, i;
         u8 addr[3];
 
-        if (sdiodev->state == BRCMF_STATE_NOMEDIUM)
+        if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
                 return -ENOMEDIUM;
 
         addr[0] = (address >> 8) & SBSDIO_SBADDRLOW_MASK;
@@ -460,7 +487,7 @@ static int brcmf_sdiod_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn,
                 err = sdio_readsb(sdiodev->func[fn], ((u8 *)(pkt->data)), addr,
                                   req_sz);
         if (err == -ENOMEDIUM)
-                brcmf_sdiod_nomedium_state(sdiodev);
+                brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);
         return err;
 }
 
@@ -595,7 +622,7 @@ static int brcmf_sdiod_sglist_rw(struct brcmf_sdio_dev *sdiodev, uint fn,
 
                 ret = mmc_cmd.error ? mmc_cmd.error : mmc_dat.error;
                 if (ret == -ENOMEDIUM) {
-                        brcmf_sdiod_nomedium_state(sdiodev);
+                        brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);
                         break;
                 } else if (ret != 0) {
                         brcmf_err("CMD53 sg block %s failed %d\n",
@@ -877,6 +904,87 @@ static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
         sdiodev->txglomsz = brcmf_sdiod_txglomsz;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int brcmf_sdiod_freezer_attach(struct brcmf_sdio_dev *sdiodev)
+{
+        sdiodev->freezer = kzalloc(sizeof(*sdiodev->freezer), GFP_KERNEL);
+        if (!sdiodev->freezer)
+                return -ENOMEM;
+        atomic_set(&sdiodev->freezer->thread_count, 0);
+        atomic_set(&sdiodev->freezer->freezing, 0);
+        init_waitqueue_head(&sdiodev->freezer->thread_freeze);
+        init_completion(&sdiodev->freezer->resumed);
+        return 0;
+}
+
+static void brcmf_sdiod_freezer_detach(struct brcmf_sdio_dev *sdiodev)
+{
+        if (sdiodev->freezer) {
+                WARN_ON(atomic_read(&sdiodev->freezer->freezing));
+                kfree(sdiodev->freezer);
+        }
+}
+
+static int brcmf_sdiod_freezer_on(struct brcmf_sdio_dev *sdiodev)
+{
+        atomic_t *expect = &sdiodev->freezer->thread_count;
+        int res = 0;
+
+        sdiodev->freezer->frozen_count = 0;
+        reinit_completion(&sdiodev->freezer->resumed);
+        atomic_set(&sdiodev->freezer->freezing, 1);
+        brcmf_sdio_trigger_dpc(sdiodev->bus);
+        wait_event(sdiodev->freezer->thread_freeze,
+                   atomic_read(expect) == sdiodev->freezer->frozen_count);
+        sdio_claim_host(sdiodev->func[1]);
+        res = brcmf_sdio_sleep(sdiodev->bus, true);
+        sdio_release_host(sdiodev->func[1]);
+        return res;
+}
+
+static void brcmf_sdiod_freezer_off(struct brcmf_sdio_dev *sdiodev)
+{
+        sdio_claim_host(sdiodev->func[1]);
+        brcmf_sdio_sleep(sdiodev->bus, false);
+        sdio_release_host(sdiodev->func[1]);
+        atomic_set(&sdiodev->freezer->freezing, 0);
+        complete_all(&sdiodev->freezer->resumed);
+}
+
+bool brcmf_sdiod_freezing(struct brcmf_sdio_dev *sdiodev)
+{
+        return atomic_read(&sdiodev->freezer->freezing);
+}
+
+void brcmf_sdiod_try_freeze(struct brcmf_sdio_dev *sdiodev)
+{
+        if (!brcmf_sdiod_freezing(sdiodev))
+                return;
+        sdiodev->freezer->frozen_count++;
+        wake_up(&sdiodev->freezer->thread_freeze);
+        wait_for_completion(&sdiodev->freezer->resumed);
+}
+
+void brcmf_sdiod_freezer_count(struct brcmf_sdio_dev *sdiodev)
+{
+        atomic_inc(&sdiodev->freezer->thread_count);
+}
+
+void brcmf_sdiod_freezer_uncount(struct brcmf_sdio_dev *sdiodev)
+{
+        atomic_dec(&sdiodev->freezer->thread_count);
+}
+#else
+static int brcmf_sdiod_freezer_attach(struct brcmf_sdio_dev *sdiodev)
+{
+        return 0;
+}
+
+static void brcmf_sdiod_freezer_detach(struct brcmf_sdio_dev *sdiodev)
+{
+}
+#endif /* CONFIG_PM_SLEEP */
+
 static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)
 {
         if (sdiodev->bus) {
@@ -884,6 +992,8 @@ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)
                 sdiodev->bus = NULL;
         }
 
+        brcmf_sdiod_freezer_detach(sdiodev);
+
         /* Disable Function 2 */
         sdio_claim_host(sdiodev->func[2]);
         sdio_disable_func(sdiodev->func[2]);
@@ -897,6 +1007,7 @@ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)
         sg_free_table(&sdiodev->sgtable);
         sdiodev->sbwad = 0;
 
+        pm_runtime_allow(sdiodev->func[1]->card->host->parent);
         return 0;
 }
 
@@ -955,13 +1066,17 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
          */
         brcmf_sdiod_sgtable_alloc(sdiodev);
 
+        ret = brcmf_sdiod_freezer_attach(sdiodev);
+        if (ret)
+                goto out;
+
         /* try to attach to the target device */
         sdiodev->bus = brcmf_sdio_probe(sdiodev);
         if (!sdiodev->bus) {
                 ret = -ENODEV;
                 goto out;
         }
-
+        pm_runtime_forbid(host->parent);
 out:
         if (ret)
                 brcmf_sdiod_remove(sdiodev);
@@ -983,6 +1098,8 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341),
         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362),
         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339),
+        BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430),
+        BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),
         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
         { /* end: all zeroes */ }
 };
@@ -1050,9 +1167,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
                 bus_if->wowl_supported = true;
 #endif
 
-        sdiodev->sleeping = false;
-        atomic_set(&sdiodev->suspend, false);
-        init_waitqueue_head(&sdiodev->idle_wait);
+        brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_DOWN);
 
         brcmf_dbg(SDIO, "F2 found, calling brcmf_sdiod_probe...\n");
         err = brcmf_sdiod_probe(sdiodev);
@@ -1083,7 +1198,7 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
         brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
         brcmf_dbg(SDIO, "Function: %d\n", func->num);
 
-        if (func->num != 1 && func->num != 2)
+        if (func->num != 1)
                 return;
 
         bus_if = dev_get_drvdata(&func->dev);
@@ -1114,24 +1229,22 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled)
 #ifdef CONFIG_PM_SLEEP
 static int brcmf_ops_sdio_suspend(struct device *dev)
 {
+        struct sdio_func *func;
         struct brcmf_bus *bus_if;
         struct brcmf_sdio_dev *sdiodev;
         mmc_pm_flag_t sdio_flags;
 
-        brcmf_dbg(SDIO, "Enter\n");
+        func = container_of(dev, struct sdio_func, dev);
+        brcmf_dbg(SDIO, "Enter: F%d\n", func->num);
+        if (func->num != SDIO_FUNC_1)
+                return 0;
+
 
         bus_if = dev_get_drvdata(dev);
         sdiodev = bus_if->bus_priv.sdio;
 
-        /* wait for watchdog to go idle */
-        if (wait_event_timeout(sdiodev->idle_wait, sdiodev->sleeping,
-                               msecs_to_jiffies(3 * BRCMF_WD_POLL_MS)) == 0) {
-                brcmf_err("bus still active\n");
-                return -EBUSY;
-        }
-        /* disable watchdog */
+        brcmf_sdiod_freezer_on(sdiodev);
         brcmf_sdio_wd_timer(sdiodev->bus, 0);
-        atomic_set(&sdiodev->suspend, true);
 
         if (sdiodev->wowl_enabled) {
                 sdio_flags = MMC_PM_KEEP_POWER;
@@ -1149,12 +1262,13 @@ static int brcmf_ops_sdio_resume(struct device *dev)
 {
         struct brcmf_bus *bus_if = dev_get_drvdata(dev);
         struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+        struct sdio_func *func = container_of(dev, struct sdio_func, dev);
 
-        brcmf_dbg(SDIO, "Enter\n");
-        if (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)
-                disable_irq_wake(sdiodev->pdata->oob_irq_nr);
-        brcmf_sdio_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS);
-        atomic_set(&sdiodev->suspend, false);
+        brcmf_dbg(SDIO, "Enter: F%d\n", func->num);
+        if (func->num != SDIO_FUNC_2)
+                return 0;
+
+        brcmf_sdiod_freezer_off(sdiodev);
         return 0;
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
index b59b8c6c42ab..8a15ebbce4a3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
@@ -625,6 +625,7 @@ static bool brcmf_is_ibssmode(struct brcmf_cfg80211_vif *vif)
 
 static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,
                                                      const char *name,
+                                                     unsigned char name_assign_type,
                                                      enum nl80211_iftype type,
                                                      u32 *flags,
                                                      struct vif_params *params)
@@ -648,7 +649,7 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,
         case NL80211_IFTYPE_P2P_CLIENT:
         case NL80211_IFTYPE_P2P_GO:
         case NL80211_IFTYPE_P2P_DEVICE:
-                wdev = brcmf_p2p_add_vif(wiphy, name, type, flags, params);
+                wdev = brcmf_p2p_add_vif(wiphy, name, name_assign_type, type, flags, params);
                 if (!IS_ERR(wdev))
                         brcmf_cfg80211_update_proto_addr_mode(wdev);
                 return wdev;
@@ -700,7 +701,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
                 /* Do a scan abort to stop the driver's scan engine */
                 brcmf_dbg(SCAN, "ABORT scan in firmware\n");
                 memset(&params_le, 0, sizeof(params_le));
-                memset(params_le.bssid, 0xFF, ETH_ALEN);
+                eth_broadcast_addr(params_le.bssid);
                 params_le.bss_type = DOT11_BSSTYPE_ANY;
                 params_le.scan_type = 0;
                 params_le.channel_num = cpu_to_le32(1);
@@ -866,7 +867,7 @@ static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,
         char *ptr;
         struct brcmf_ssid_le ssid_le;
 
-        memset(params_le->bssid, 0xFF, ETH_ALEN);
+        eth_broadcast_addr(params_le->bssid);
         params_le->bss_type = DOT11_BSSTYPE_ANY;
         params_le->scan_type = 0;
         params_le->channel_num = 0;
@@ -1050,10 +1051,6 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif,
         if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
                 vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
 
-        /* Arm scan timeout timer */
-        mod_timer(&cfg->escan_timeout, jiffies +
-                        WL_ESCAN_TIMER_INTERVAL_MS * HZ / 1000);
-
         escan_req = false;
         if (request) {
                 /* scan bss */
@@ -1112,12 +1109,14 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif,
                 }
         }
 
+        /* Arm scan timeout timer */
+        mod_timer(&cfg->escan_timeout, jiffies +
+                        WL_ESCAN_TIMER_INTERVAL_MS * HZ / 1000);
+
         return 0;
 
 scan_out:
         clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
-        if (timer_pending(&cfg->escan_timeout))
-                del_timer_sync(&cfg->escan_timeout);
         cfg->scan_request = NULL;
         return err;
 }
@@ -1375,8 +1374,8 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
                                    BRCMF_ASSOC_PARAMS_FIXED_SIZE;
                 memcpy(profile->bssid, params->bssid, ETH_ALEN);
         } else {
-                memset(join_params.params_le.bssid, 0xFF, ETH_ALEN);
-                memset(profile->bssid, 0, ETH_ALEN);
+                eth_broadcast_addr(join_params.params_le.bssid);
+                eth_zero_addr(profile->bssid);
         }
 
         /* Channel */
@@ -1850,7 +1849,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
         if (sme->bssid)
                 memcpy(&ext_join_params->assoc_le.bssid, sme->bssid, ETH_ALEN);
         else
-                memset(&ext_join_params->assoc_le.bssid, 0xFF, ETH_ALEN);
+                eth_broadcast_addr(ext_join_params->assoc_le.bssid);
 
         if (cfg->channel) {
                 ext_join_params->assoc_le.chanspec_num = cpu_to_le32(1);
@@ -1895,7 +1894,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
         if (sme->bssid)
                 memcpy(join_params.params_le.bssid, sme->bssid, ETH_ALEN);
         else
-                memset(join_params.params_le.bssid, 0xFF, ETH_ALEN);
+                eth_broadcast_addr(join_params.params_le.bssid);
 
         if (cfg->channel) {
                 join_params.params_le.chanspec_list[0] = cpu_to_le16(chanspec);
@@ -2252,7 +2251,6 @@ brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
 
         if (key_idx >= BRCMF_MAX_DEFAULT_KEYS) {
                 /* we ignore this key index in this case */
-                brcmf_err("invalid key index (%d)\n", key_idx);
                 return -EINVAL;
         }
 
@@ -4272,7 +4270,7 @@ brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev,
                 return -EIO;
 
         memcpy(&scbval.ea, params->mac, ETH_ALEN);
-        scbval.val = cpu_to_le32(WLAN_REASON_DEAUTH_LEAVING);
+        scbval.val = cpu_to_le32(params->reason_code);
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,
                                      &scbval, sizeof(scbval));
         if (err)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
index 04d2ca0d87d6..ab2fac8b2760 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
@@ -100,9 +100,6 @@
 #define BCM4329_CORE_SOCRAM_BASE        0x18003000
 /* ARM Cortex M3 core, ID 0x82a */
 #define BCM4329_CORE_ARM_BASE           0x18002000
-#define BCM4329_RAMSIZE                 0x48000
-/* bcm43143 */
-#define BCM43143_RAMSIZE                0x70000
 
 #define CORE_SB(base, field) \
                 (base + SBCONFIGOFF + offsetof(struct sbconfig, field))
@@ -150,6 +147,78 @@ struct sbconfig {
         u32 sbidhigh;   /* identification */
 };
 
+/* bankidx and bankinfo reg defines corerev >= 8 */
+#define SOCRAM_BANKINFO_RETNTRAM_MASK   0x00010000
+#define SOCRAM_BANKINFO_SZMASK          0x0000007f
+#define SOCRAM_BANKIDX_ROM_MASK         0x00000100
+
+#define SOCRAM_BANKIDX_MEMTYPE_SHIFT    8
+/* socram bankinfo memtype */
+#define SOCRAM_MEMTYPE_RAM              0
+#define SOCRAM_MEMTYPE_R0M              1
+#define SOCRAM_MEMTYPE_DEVRAM           2
+
+#define SOCRAM_BANKINFO_SZBASE          8192
+#define SRCI_LSS_MASK           0x00f00000
+#define SRCI_LSS_SHIFT          20
+#define SRCI_SRNB_MASK          0xf0
+#define SRCI_SRNB_SHIFT         4
+#define SRCI_SRBSZ_MASK         0xf
+#define SRCI_SRBSZ_SHIFT        0
+#define SR_BSZ_BASE             14
+
+struct sbsocramregs {
+        u32 coreinfo;
+        u32 bwalloc;
+        u32 extracoreinfo;
+        u32 biststat;
+        u32 bankidx;
+        u32 standbyctrl;
+
+        u32 errlogstatus;       /* rev 6 */
+        u32 errlogaddr; /* rev 6 */
+        /* used for patching rev 3 & 5 */
+        u32 cambankidx;
+        u32 cambankstandbyctrl;
+        u32 cambankpatchctrl;
+        u32 cambankpatchtblbaseaddr;
+        u32 cambankcmdreg;
+        u32 cambankdatareg;
+        u32 cambankmaskreg;
+        u32 PAD[1];
+        u32 bankinfo;   /* corev 8 */
+        u32 bankpda;
+        u32 PAD[14];
+        u32 extmemconfig;
+        u32 extmemparitycsr;
+        u32 extmemparityerrdata;
+        u32 extmemparityerrcnt;
+        u32 extmemwrctrlandsize;
+        u32 PAD[84];
+        u32 workaround;
+        u32 pwrctl;             /* corerev >= 2 */
+        u32 PAD[133];
+        u32 sr_control;     /* corerev >= 15 */
+        u32 sr_status;      /* corerev >= 15 */
+        u32 sr_address;     /* corerev >= 15 */
+        u32 sr_data;        /* corerev >= 15 */
+};
+
+#define SOCRAMREGOFFS(_f)       offsetof(struct sbsocramregs, _f)
+
+#define ARMCR4_CAP              (0x04)
+#define ARMCR4_BANKIDX          (0x40)
+#define ARMCR4_BANKINFO         (0x44)
+#define ARMCR4_BANKPDA          (0x4C)
+
+#define ARMCR4_TCBBNB_MASK      0xf0
+#define ARMCR4_TCBBNB_SHIFT     4
+#define ARMCR4_TCBANB_MASK      0xf
+#define ARMCR4_TCBANB_SHIFT     0
+
+#define ARMCR4_BSZ_MASK         0x3f
+#define ARMCR4_BSZ_MULT         8192
+
 struct brcmf_core_priv {
         struct brcmf_core pub;
         u32 wrapbase;
@@ -419,13 +488,13 @@ static struct brcmf_core *brcmf_chip_add_core(struct brcmf_chip_priv *ci,
         return &core->pub;
 }
 
-#ifdef DEBUG
 /* safety check for chipinfo */
 static int brcmf_chip_cores_check(struct brcmf_chip_priv *ci)
 {
         struct brcmf_core_priv *core;
         bool need_socram = false;
         bool has_socram = false;
+        bool cpu_found = false;
         int idx = 1;
 
         list_for_each_entry(core, &ci->cores, list) {
@@ -435,22 +504,24 @@ static int brcmf_chip_cores_check(struct brcmf_chip_priv *ci)
 
                 switch (core->pub.id) {
                 case BCMA_CORE_ARM_CM3:
+                        cpu_found = true;
                         need_socram = true;
                         break;
                 case BCMA_CORE_INTERNAL_MEM:
                         has_socram = true;
                         break;
                 case BCMA_CORE_ARM_CR4:
-                        if (ci->pub.rambase == 0) {
-                                brcmf_err("RAM base not provided with ARM CR4 core\n");
-                                return -ENOMEM;
-                        }
+                        cpu_found = true;
                         break;
                 default:
                         break;
                 }
         }
 
+        if (!cpu_found) {
+                brcmf_err("CPU core not detected\n");
+                return -ENXIO;
+        }
         /* check RAM core presence for ARM CM3 core */
         if (need_socram && !has_socram) {
                 brcmf_err("RAM core not provided with ARM CM3 core\n");
@@ -458,56 +529,164 @@ static int brcmf_chip_cores_check(struct brcmf_chip_priv *ci)
         }
         return 0;
 }
-#else   /* DEBUG */
-static inline int brcmf_chip_cores_check(struct brcmf_chip_priv *ci)
+
+static u32 brcmf_chip_core_read32(struct brcmf_core_priv *core, u16 reg)
 {
-        return 0;
+        return core->chip->ops->read32(core->chip->ctx, core->pub.base + reg);
 }
-#endif
 
-static void brcmf_chip_get_raminfo(struct brcmf_chip_priv *ci)
+static void brcmf_chip_core_write32(struct brcmf_core_priv *core,
+                                    u16 reg, u32 val)
 {
-        switch (ci->pub.chip) {
-        case BRCM_CC_4329_CHIP_ID:
-                ci->pub.ramsize = BCM4329_RAMSIZE;
-                break;
-        case BRCM_CC_43143_CHIP_ID:
-                ci->pub.ramsize = BCM43143_RAMSIZE;
-                break;
-        case BRCM_CC_43241_CHIP_ID:
-                ci->pub.ramsize = 0x90000;
-                break;
-        case BRCM_CC_4330_CHIP_ID:
-                ci->pub.ramsize = 0x48000;
-                break;
+        core->chip->ops->write32(core->chip->ctx, core->pub.base + reg, val);
+}
+
+static bool brcmf_chip_socram_banksize(struct brcmf_core_priv *core, u8 idx,
+                                       u32 *banksize)
+{
+        u32 bankinfo;
+        u32 bankidx = (SOCRAM_MEMTYPE_RAM << SOCRAM_BANKIDX_MEMTYPE_SHIFT);
+
+        bankidx |= idx;
+        brcmf_chip_core_write32(core, SOCRAMREGOFFS(bankidx), bankidx);
+        bankinfo = brcmf_chip_core_read32(core, SOCRAMREGOFFS(bankinfo));
+        *banksize = (bankinfo & SOCRAM_BANKINFO_SZMASK) + 1;
+        *banksize *= SOCRAM_BANKINFO_SZBASE;
+        return !!(bankinfo & SOCRAM_BANKINFO_RETNTRAM_MASK);
+}
+
+static void brcmf_chip_socram_ramsize(struct brcmf_core_priv *sr, u32 *ramsize,
+                                      u32 *srsize)
+{
+        u32 coreinfo;
+        uint nb, banksize, lss;
+        bool retent;
+        int i;
+
+        *ramsize = 0;
+        *srsize = 0;
+
+        if (WARN_ON(sr->pub.rev < 4))
+                return;
+
+        if (!brcmf_chip_iscoreup(&sr->pub))
+                brcmf_chip_resetcore(&sr->pub, 0, 0, 0);
+
+        /* Get info for determining size */
+        coreinfo = brcmf_chip_core_read32(sr, SOCRAMREGOFFS(coreinfo));
+        nb = (coreinfo & SRCI_SRNB_MASK) >> SRCI_SRNB_SHIFT;
+
+        if ((sr->pub.rev <= 7) || (sr->pub.rev == 12)) {
+                banksize = (coreinfo & SRCI_SRBSZ_MASK);
+                lss = (coreinfo & SRCI_LSS_MASK) >> SRCI_LSS_SHIFT;
+                if (lss != 0)
+                        nb--;
+                *ramsize = nb * (1 << (banksize + SR_BSZ_BASE));
+                if (lss != 0)
+                        *ramsize += (1 << ((lss - 1) + SR_BSZ_BASE));
+        } else {
+                nb = (coreinfo & SRCI_SRNB_MASK) >> SRCI_SRNB_SHIFT;
+                for (i = 0; i < nb; i++) {
+                        retent = brcmf_chip_socram_banksize(sr, i, &banksize);
+                        *ramsize += banksize;
+                        if (retent)
+                                *srsize += banksize;
+                }
+        }
+
+        /* hardcoded save&restore memory sizes */
+        switch (sr->chip->pub.chip) {
         case BRCM_CC_4334_CHIP_ID:
-        case BRCM_CC_43340_CHIP_ID:
-                ci->pub.ramsize = 0x80000;
+                if (sr->chip->pub.chiprev < 2)
+                        *srsize = (32 * 1024);
                 break;
-        case BRCM_CC_4335_CHIP_ID:
-                ci->pub.ramsize = 0xc0000;
-                ci->pub.rambase = 0x180000;
+        case BRCM_CC_43430_CHIP_ID:
+                /* assume sr for now as we can not check
+                 * firmware sr capability at this point.
+                 */
+                *srsize = (64 * 1024);
                 break;
-        case BRCM_CC_43362_CHIP_ID:
-                ci->pub.ramsize = 0x3c000;
+        default:
                 break;
+        }
+}
+
+/** Return the TCM-RAM size of the ARMCR4 core. */
+static u32 brcmf_chip_tcm_ramsize(struct brcmf_core_priv *cr4)
+{
+        u32 corecap;
+        u32 memsize = 0;
+        u32 nab;
+        u32 nbb;
+        u32 totb;
+        u32 bxinfo;
+        u32 idx;
+
+        corecap = brcmf_chip_core_read32(cr4, ARMCR4_CAP);
+
+        nab = (corecap & ARMCR4_TCBANB_MASK) >> ARMCR4_TCBANB_SHIFT;
+        nbb = (corecap & ARMCR4_TCBBNB_MASK) >> ARMCR4_TCBBNB_SHIFT;
+        totb = nab + nbb;
+
+        for (idx = 0; idx < totb; idx++) {
+                brcmf_chip_core_write32(cr4, ARMCR4_BANKIDX, idx);
+                bxinfo = brcmf_chip_core_read32(cr4, ARMCR4_BANKINFO);
+                memsize += ((bxinfo & ARMCR4_BSZ_MASK) + 1) * ARMCR4_BSZ_MULT;
+        }
+
+        return memsize;
+}
+
+static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
+{
+        switch (ci->pub.chip) {
+        case BRCM_CC_4345_CHIP_ID:
+                return 0x198000;
+        case BRCM_CC_4335_CHIP_ID:
         case BRCM_CC_4339_CHIP_ID:
         case BRCM_CC_4354_CHIP_ID:
         case BRCM_CC_4356_CHIP_ID:
         case BRCM_CC_43567_CHIP_ID:
         case BRCM_CC_43569_CHIP_ID:
         case BRCM_CC_43570_CHIP_ID:
-                ci->pub.ramsize = 0xc0000;
-                ci->pub.rambase = 0x180000;
-                break;
         case BRCM_CC_43602_CHIP_ID:
-                ci->pub.ramsize = 0xf0000;
-                ci->pub.rambase = 0x180000;
-                break;
+                return 0x180000;
         default:
                 brcmf_err("unknown chip: %s\n", ci->pub.name);
                 break;
         }
+        return 0;
+}
+
+static int brcmf_chip_get_raminfo(struct brcmf_chip_priv *ci)
+{
+        struct brcmf_core_priv *mem_core;
+        struct brcmf_core *mem;
+
+        mem = brcmf_chip_get_core(&ci->pub, BCMA_CORE_ARM_CR4);
+        if (mem) {
+                mem_core = container_of(mem, struct brcmf_core_priv, pub);
+                ci->pub.ramsize = brcmf_chip_tcm_ramsize(mem_core);
+                ci->pub.rambase = brcmf_chip_tcm_rambase(ci);
+                if (!ci->pub.rambase) {
+                        brcmf_err("RAM base not provided with ARM CR4 core\n");
+                        return -EINVAL;
+                }
+        } else {
+                mem = brcmf_chip_get_core(&ci->pub, BCMA_CORE_INTERNAL_MEM);
+                mem_core = container_of(mem, struct brcmf_core_priv, pub);
+                brcmf_chip_socram_ramsize(mem_core, &ci->pub.ramsize,
+                                          &ci->pub.srsize);
+        }
+        brcmf_dbg(INFO, "RAM: base=0x%x size=%d (0x%x) sr=%d (0x%x)\n",
+                  ci->pub.rambase, ci->pub.ramsize, ci->pub.ramsize,
+                  ci->pub.srsize, ci->pub.srsize);
+
+        if (!ci->pub.ramsize) {
+                brcmf_err("RAM size is undetermined\n");
+                return -ENOMEM;
+        }
+        return 0;
 }
 
 static u32 brcmf_chip_dmp_get_desc(struct brcmf_chip_priv *ci, u32 *eromaddr,
@@ -660,6 +839,7 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv *ci)
         struct brcmf_core *core;
         u32 regdata;
         u32 socitype;
+        int ret;
 
         /* Get CC core rev
          * Chipid is assume to be at offset 0 from SI_ENUM_BASE
@@ -712,9 +892,13 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv *ci)
                 return -ENODEV;
         }
 
-        brcmf_chip_get_raminfo(ci);
+        ret = brcmf_chip_cores_check(ci);
+        if (ret)
+                return ret;
 
-        return brcmf_chip_cores_check(ci);
+        /* assure chip is passive for core access */
+        brcmf_chip_set_passive(&ci->pub);
+        return brcmf_chip_get_raminfo(ci);
 }
 
 static void brcmf_chip_disable_arm(struct brcmf_chip_priv *chip, u16 id)
@@ -778,12 +962,6 @@ static int brcmf_chip_setup(struct brcmf_chip_priv *chip)
         if (chip->ops->setup)
                 ret = chip->ops->setup(chip->ctx, pub);
 
-        /*
-         * Make sure any on-chip ARM is off (in case strapping is wrong),
-         * or downloaded code was already running.
-         */
-        brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CM3);
-        brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CR4);
         return ret;
 }
 
@@ -799,7 +977,7 @@ struct brcmf_chip *brcmf_chip_attach(void *ctx,
                 err = -EINVAL;
         if (WARN_ON(!ops->prepare))
                 err = -EINVAL;
-        if (WARN_ON(!ops->exit_dl))
+        if (WARN_ON(!ops->activate))
                 err = -EINVAL;
         if (err < 0)
                 return ERR_PTR(-EINVAL);
@@ -897,9 +1075,10 @@ void brcmf_chip_resetcore(struct brcmf_core *pub, u32 prereset, u32 reset,
 }
 
 static void
-brcmf_chip_cm3_enterdl(struct brcmf_chip_priv *chip)
+brcmf_chip_cm3_set_passive(struct brcmf_chip_priv *chip)
 {
         struct brcmf_core *core;
+        struct brcmf_core_priv *sr;
 
         brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CM3);
         core = brcmf_chip_get_core(&chip->pub, BCMA_CORE_80211);
@@ -909,9 +1088,16 @@ brcmf_chip_cm3_enterdl(struct brcmf_chip_priv *chip)
                              D11_BCMA_IOCTL_PHYCLOCKEN);
         core = brcmf_chip_get_core(&chip->pub, BCMA_CORE_INTERNAL_MEM);
         brcmf_chip_resetcore(core, 0, 0, 0);
+
+        /* disable bank #3 remap for this device */
+        if (chip->pub.chip == BRCM_CC_43430_CHIP_ID) {
+                sr = container_of(core, struct brcmf_core_priv, pub);
+                brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankidx), 3);
+                brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankpda), 0);
+        }
 }
 
-static bool brcmf_chip_cm3_exitdl(struct brcmf_chip_priv *chip)
+static bool brcmf_chip_cm3_set_active(struct brcmf_chip_priv *chip)
 {
         struct brcmf_core *core;
 
@@ -921,7 +1107,7 @@ static bool brcmf_chip_cm3_exitdl(struct brcmf_chip_priv *chip)
                 return false;
         }
 
-        chip->ops->exit_dl(chip->ctx, &chip->pub, 0);
+        chip->ops->activate(chip->ctx, &chip->pub, 0);
 
         core = brcmf_chip_get_core(&chip->pub, BCMA_CORE_ARM_CM3);
         brcmf_chip_resetcore(core, 0, 0, 0);
@@ -930,7 +1116,7 @@ static bool brcmf_chip_cm3_exitdl(struct brcmf_chip_priv *chip)
 }
 
 static inline void
-brcmf_chip_cr4_enterdl(struct brcmf_chip_priv *chip)
+brcmf_chip_cr4_set_passive(struct brcmf_chip_priv *chip)
 {
         struct brcmf_core *core;
 
@@ -943,11 +1129,11 @@ brcmf_chip_cr4_enterdl(struct brcmf_chip_priv *chip)
                              D11_BCMA_IOCTL_PHYCLOCKEN);
 }
 
-static bool brcmf_chip_cr4_exitdl(struct brcmf_chip_priv *chip, u32 rstvec)
+static bool brcmf_chip_cr4_set_active(struct brcmf_chip_priv *chip, u32 rstvec)
 {
         struct brcmf_core *core;
 
-        chip->ops->exit_dl(chip->ctx, &chip->pub, rstvec);
+        chip->ops->activate(chip->ctx, &chip->pub, rstvec);
 
         /* restore ARM */
         core = brcmf_chip_get_core(&chip->pub, BCMA_CORE_ARM_CR4);
@@ -956,7 +1142,7 @@ static bool brcmf_chip_cr4_exitdl(struct brcmf_chip_priv *chip, u32 rstvec)
         return true;
 }
 
-void brcmf_chip_enter_download(struct brcmf_chip *pub)
+void brcmf_chip_set_passive(struct brcmf_chip *pub)
 {
         struct brcmf_chip_priv *chip;
         struct brcmf_core *arm;
@@ -966,14 +1152,14 @@ void brcmf_chip_enter_download(struct brcmf_chip *pub)
         chip = container_of(pub, struct brcmf_chip_priv, pub);
         arm = brcmf_chip_get_core(pub, BCMA_CORE_ARM_CR4);
         if (arm) {
-                brcmf_chip_cr4_enterdl(chip);
+                brcmf_chip_cr4_set_passive(chip);
                 return;
         }
 
-        brcmf_chip_cm3_enterdl(chip);
+        brcmf_chip_cm3_set_passive(chip);
 }
 
-bool brcmf_chip_exit_download(struct brcmf_chip *pub, u32 rstvec)
+bool brcmf_chip_set_active(struct brcmf_chip *pub, u32 rstvec)
 {
         struct brcmf_chip_priv *chip;
         struct brcmf_core *arm;
@@ -983,9 +1169,9 @@ bool brcmf_chip_exit_download(struct brcmf_chip *pub, u32 rstvec)
         chip = container_of(pub, struct brcmf_chip_priv, pub);
         arm = brcmf_chip_get_core(pub, BCMA_CORE_ARM_CR4);
         if (arm)
-                return brcmf_chip_cr4_exitdl(chip, rstvec);
+                return brcmf_chip_cr4_set_active(chip, rstvec);
 
-        return brcmf_chip_cm3_exitdl(chip);
+        return brcmf_chip_cm3_set_active(chip);
 }
 
 bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
@@ -1016,6 +1202,10 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
                 addr = CORE_CC_REG(base, chipcontrol_data);
                 reg = chip->ops->read32(chip->ctx, addr);
                 return (reg & pmu_cc3_mask) != 0;
+        case BRCM_CC_43430_CHIP_ID:
+                addr = CORE_CC_REG(base, sr_control1);
+                reg = chip->ops->read32(chip->ctx, addr);
+                return reg != 0;
         default:
                 addr = CORE_CC_REG(base, pmucapabilities_ext);
                 reg = chip->ops->read32(chip->ctx, addr);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.h b/drivers/net/wireless/brcm80211/brcmfmac/chip.h
index c32908da90c8..60dcb38fc77a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.h
@@ -30,7 +30,8 @@
  * @pmucaps: PMU capabilities.
  * @pmurev: PMU revision.
  * @rambase: RAM base address (only applicable for ARM CR4 chips).
- * @ramsize: amount of RAM on chip.
+ * @ramsize: amount of RAM on chip including retention.
+ * @srsize: amount of retention RAM on chip.
  * @name: string representation of the chip identifier.
  */
 struct brcmf_chip {
@@ -41,6 +42,7 @@ struct brcmf_chip {
         u32 pmurev;
         u32 rambase;
         u32 ramsize;
+        u32 srsize;
         char name[8];
 };
 
@@ -64,7 +66,7 @@ struct brcmf_core {
  * @write32: write 32-bit value over bus.
  * @prepare: prepare bus for core configuration.
  * @setup: bus-specific core setup.
- * @exit_dl: exit download state.
+ * @active: chip becomes active.
  *      The callback should use the provided @rstvec when non-zero.
  */
 struct brcmf_buscore_ops {
@@ -72,7 +74,7 @@ struct brcmf_buscore_ops {
         void (*write32)(void *ctx, u32 addr, u32 value);
         int (*prepare)(void *ctx);
         int (*setup)(void *ctx, struct brcmf_chip *chip);
-        void (*exit_dl)(void *ctx, struct brcmf_chip *chip, u32 rstvec);
+        void (*activate)(void *ctx, struct brcmf_chip *chip, u32 rstvec);
 };
 
 struct brcmf_chip *brcmf_chip_attach(void *ctx,
@@ -84,8 +86,8 @@ bool brcmf_chip_iscoreup(struct brcmf_core *core);
 void brcmf_chip_coredisable(struct brcmf_core *core, u32 prereset, u32 reset);
 void brcmf_chip_resetcore(struct brcmf_core *core, u32 prereset, u32 reset,
                           u32 postreset);
-void brcmf_chip_enter_download(struct brcmf_chip *ci);
-bool brcmf_chip_exit_download(struct brcmf_chip *ci, u32 rstvec);
+void brcmf_chip_set_passive(struct brcmf_chip *ci);
+bool brcmf_chip_set_active(struct brcmf_chip *ci, u32 rstvec);
 bool brcmf_chip_sr_capable(struct brcmf_chip *pub);
 
 #endif /* BRCMF_AXIDMP_H */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/core.c b/drivers/net/wireless/brcm80211/brcmfmac/core.c
index 2d6e2cc1b12c..f8f47dcfa886 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
@@ -944,6 +944,34 @@ fail:
         return ret;
 }
 
+static int brcmf_revinfo_read(struct seq_file *s, void *data)
+{
+        struct brcmf_bus *bus_if = dev_get_drvdata(s->private);
+        struct brcmf_rev_info *ri = &bus_if->drvr->revinfo;
+        char drev[BRCMU_DOTREV_LEN];
+        char brev[BRCMU_BOARDREV_LEN];
+
+        seq_printf(s, "vendorid: 0x%04x\n", ri->vendorid);
+        seq_printf(s, "deviceid: 0x%04x\n", ri->deviceid);
+        seq_printf(s, "radiorev: %s\n", brcmu_dotrev_str(ri->radiorev, drev));
+        seq_printf(s, "chipnum: %u (%x)\n", ri->chipnum, ri->chipnum);
+        seq_printf(s, "chiprev: %u\n", ri->chiprev);
+        seq_printf(s, "chippkg: %u\n", ri->chippkg);
+        seq_printf(s, "corerev: %u\n", ri->corerev);
+        seq_printf(s, "boardid: 0x%04x\n", ri->boardid);
+        seq_printf(s, "boardvendor: 0x%04x\n", ri->boardvendor);
+        seq_printf(s, "boardrev: %s\n", brcmu_boardrev_str(ri->boardrev, brev));
+        seq_printf(s, "driverrev: %s\n", brcmu_dotrev_str(ri->driverrev, drev));
+        seq_printf(s, "ucoderev: %u\n", ri->ucoderev);
+        seq_printf(s, "bus: %u\n", ri->bus);
+        seq_printf(s, "phytype: %u\n", ri->phytype);
+        seq_printf(s, "phyrev: %u\n", ri->phyrev);
+        seq_printf(s, "anarev: %u\n", ri->anarev);
+        seq_printf(s, "nvramrev: %08x\n", ri->nvramrev);
+
+        return 0;
+}
+
 int brcmf_bus_start(struct device *dev)
 {
         int ret = -1;
@@ -974,6 +1002,8 @@ int brcmf_bus_start(struct device *dev)
         if (ret < 0)
                 goto fail;
 
+        brcmf_debugfs_add_entry(drvr, "revinfo", brcmf_revinfo_read);
+
         /* assure we have chipid before feature attach */
         if (!bus_if->chip) {
                 bus_if->chip = drvr->revinfo.chipnum;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/flowring.c b/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
index 910fbb561469..eb1325371d3a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
@@ -236,7 +236,7 @@ void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid)
         brcmf_flowring_block(flow, flowid, false);
         hash_idx = ring->hash_id;
         flow->hash[hash_idx].ifidx = BRCMF_FLOWRING_INVALID_IFIDX;
-        memset(flow->hash[hash_idx].mac, 0, ETH_ALEN);
+        eth_zero_addr(flow->hash[hash_idx].mac);
         flow->rings[flowid] = NULL;
 
         skb = skb_dequeue(&ring->skblist);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
index 6262612dec45..4ec9811f49c8 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
@@ -481,10 +481,9 @@ static int brcmf_msgbuf_ioctl_resp_wait(struct brcmf_msgbuf *msgbuf)
 
 static void brcmf_msgbuf_ioctl_resp_wake(struct brcmf_msgbuf *msgbuf)
 {
-        if (waitqueue_active(&msgbuf->ioctl_resp_wait)) {
-                msgbuf->ctl_completed = true;
+        msgbuf->ctl_completed = true;
+        if (waitqueue_active(&msgbuf->ioctl_resp_wait))
                 wake_up(&msgbuf->ioctl_resp_wait);
-        }
 }
 
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h
index 77a51b8c1e12..3d513e407e3d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h
@@ -17,11 +17,11 @@
 
 #ifdef CONFIG_BRCMFMAC_PROTO_MSGBUF
 
-#define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_MAX_ITEM       20
-#define BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM        256
-#define BRCMF_D2H_MSGRING_CONTROL_COMPLETE_MAX_ITEM     20
+#define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_MAX_ITEM       64
+#define BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM        512
+#define BRCMF_D2H_MSGRING_CONTROL_COMPLETE_MAX_ITEM     64
 #define BRCMF_D2H_MSGRING_TX_COMPLETE_MAX_ITEM          1024
-#define BRCMF_D2H_MSGRING_RX_COMPLETE_MAX_ITEM          256
+#define BRCMF_D2H_MSGRING_RX_COMPLETE_MAX_ITEM          512
 #define BRCMF_H2D_TXFLOWRING_MAX_ITEM                   512
 
 #define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_ITEMSIZE       40
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index effb48ebd864..710fbe570eb2 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -697,7 +697,7 @@ static s32 brcmf_p2p_escan(struct brcmf_p2p_info *p2p, u32 num_chans,
         else
                 sparams->scan_type = 1;
 
-        memset(&sparams->bssid, 0xFF, ETH_ALEN);
+        eth_broadcast_addr(sparams->bssid);
         if (ssid.SSID_len)
                 memcpy(sparams->ssid_le.SSID, ssid.SSID, ssid.SSID_len);
         sparams->ssid_le.SSID_len = cpu_to_le32(ssid.SSID_len);
@@ -2246,11 +2246,13 @@ static void brcmf_p2p_delete_p2pdev(struct brcmf_p2p_info *p2p,
  *
  * @wiphy: wiphy device of new interface.
  * @name: name of the new interface.
+ * @name_assign_type: origin of the interface name
  * @type: nl80211 interface type.
  * @flags: not used.
  * @params: contains mac address for P2P device.
  */
 struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
+                                       unsigned char name_assign_type,
                                        enum nl80211_iftype type, u32 *flags,
                                        struct vif_params *params)
 {
@@ -2310,6 +2312,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
         }
 
         strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
+        ifp->ndev->name_assign_type = name_assign_type;
         err = brcmf_net_attach(ifp, true);
         if (err) {
                 brcmf_err("Registering netdevice failed\n");
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h b/drivers/net/wireless/brcm80211/brcmfmac/p2p.h
index 6821b26224be..872f382d9e49 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.h
@@ -149,6 +149,7 @@ struct brcmf_p2p_info {
 s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg);
 void brcmf_p2p_detach(struct brcmf_p2p_info *p2p);
 struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
+                                       unsigned char name_assign_type,
                                        enum nl80211_iftype type, u32 *flags,
                                        struct vif_params *params);
 int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
index 61c053a729be..1831ecd0813e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
@@ -47,8 +47,6 @@ enum brcmf_pcie_state {
 
 #define BRCMF_PCIE_43602_FW_NAME                "brcm/brcmfmac43602-pcie.bin"
 #define BRCMF_PCIE_43602_NVRAM_NAME             "brcm/brcmfmac43602-pcie.txt"
-#define BRCMF_PCIE_4354_FW_NAME                 "brcm/brcmfmac4354-pcie.bin"
-#define BRCMF_PCIE_4354_NVRAM_NAME              "brcm/brcmfmac4354-pcie.txt"
 #define BRCMF_PCIE_4356_FW_NAME                 "brcm/brcmfmac4356-pcie.bin"
 #define BRCMF_PCIE_4356_NVRAM_NAME              "brcm/brcmfmac4356-pcie.txt"
 #define BRCMF_PCIE_43570_FW_NAME                "brcm/brcmfmac43570-pcie.bin"
@@ -187,8 +185,8 @@ enum brcmf_pcie_state {
 
 MODULE_FIRMWARE(BRCMF_PCIE_43602_FW_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_43602_NVRAM_NAME);
-MODULE_FIRMWARE(BRCMF_PCIE_4354_FW_NAME);
-MODULE_FIRMWARE(BRCMF_PCIE_4354_NVRAM_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4356_FW_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4356_NVRAM_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_43570_FW_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_43570_NVRAM_NAME);
 
@@ -509,8 +507,6 @@ static void brcmf_pcie_attach(struct brcmf_pciedev_info *devinfo)
 
 static int brcmf_pcie_enter_download_state(struct brcmf_pciedev_info *devinfo)
 {
-        brcmf_chip_enter_download(devinfo->ci);
-
         if (devinfo->ci->chip == BRCM_CC_43602_CHIP_ID) {
                 brcmf_pcie_select_core(devinfo, BCMA_CORE_ARM_CR4);
                 brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX,
@@ -536,7 +532,7 @@ static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo,
                 brcmf_chip_resetcore(core, 0, 0, 0);
         }
 
-        return !brcmf_chip_exit_download(devinfo->ci, resetintr);
+        return !brcmf_chip_set_active(devinfo->ci, resetintr);
 }
 
 
@@ -653,10 +649,9 @@ static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo)
                         console->log_str[console->log_idx] = ch;
                         console->log_idx++;
                 }
-
                 if (ch == '\n') {
                         console->log_str[console->log_idx] = 0;
-                        brcmf_dbg(PCIE, "CONSOLE: %s\n", console->log_str);
+                        brcmf_dbg(PCIE, "CONSOLE: %s", console->log_str);
                         console->log_idx = 0;
                 }
         }
@@ -1328,10 +1323,6 @@ static int brcmf_pcie_get_fwnames(struct brcmf_pciedev_info *devinfo)
                 fw_name = BRCMF_PCIE_43602_FW_NAME;
                 nvram_name = BRCMF_PCIE_43602_NVRAM_NAME;
                 break;
-        case BRCM_CC_4354_CHIP_ID:
-                fw_name = BRCMF_PCIE_4354_FW_NAME;
-                nvram_name = BRCMF_PCIE_4354_NVRAM_NAME;
-                break;
         case BRCM_CC_4356_CHIP_ID:
                 fw_name = BRCMF_PCIE_4356_FW_NAME;
                 nvram_name = BRCMF_PCIE_4356_NVRAM_NAME;
@@ -1566,8 +1557,8 @@ static int brcmf_pcie_buscoreprep(void *ctx)
 }
 
 
-static void brcmf_pcie_buscore_exitdl(void *ctx, struct brcmf_chip *chip,
-                                      u32 rstvec)
+static void brcmf_pcie_buscore_activate(void *ctx, struct brcmf_chip *chip,
+                                        u32 rstvec)
 {
         struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
 
@@ -1577,7 +1568,7 @@ static void brcmf_pcie_buscore_exitdl(void *ctx, struct brcmf_chip *chip,
 
 static const struct brcmf_buscore_ops brcmf_pcie_buscore_ops = {
         .prepare = brcmf_pcie_buscoreprep,
-        .exit_dl = brcmf_pcie_buscore_exitdl,
+        .activate = brcmf_pcie_buscore_activate,
         .read32 = brcmf_pcie_buscore_read32,
         .write32 = brcmf_pcie_buscore_write32,
 };
@@ -1856,7 +1847,6 @@ cleanup:
         PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
 
 static struct pci_device_id brcmf_pcie_devid_table[] = {
-        BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_DEVICE_ID),
         BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID),
         BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID),
         BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID),
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
index faec35c899ec..ab0c89833013 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
@@ -432,8 +432,6 @@ struct brcmf_sdio {
         struct brcmf_sdio_dev *sdiodev; /* sdio device handler */
         struct brcmf_chip *ci;  /* Chip info struct */
 
-        u32 ramsize;            /* Size of RAM in SOCRAM (bytes) */
-
         u32 hostintmask;        /* Copy of Host Interrupt Mask */
         atomic_t intstatus;     /* Intstatus bits (events) pending */
         atomic_t fcstate;       /* State of dongle flow-control */
@@ -485,10 +483,9 @@ struct brcmf_sdio {
 #endif                          /* DEBUG */
 
         uint clkstate;          /* State of sd and backplane clock(s) */
-        bool activity;          /* Activity flag for clock down */
         s32 idletime;           /* Control for activity timeout */
-        s32 idlecount;  /* Activity timeout counter */
-        s32 idleclock;  /* How to set bus driver when idle */
+        s32 idlecount;          /* Activity timeout counter */
+        s32 idleclock;          /* How to set bus driver when idle */
         bool rxflow_mode;       /* Rx flow control mode */
         bool rxflow;            /* Is rx flow control on */
         bool alp_only;          /* Don't use HT clock (ALP only) */
@@ -510,11 +507,13 @@ struct brcmf_sdio {
 
         struct workqueue_struct *brcmf_wq;
         struct work_struct datawork;
-        atomic_t dpc_tskcnt;
+        bool dpc_triggered;
+        bool dpc_running;
 
         bool txoff;             /* Transmit flow-controlled */
         struct brcmf_sdio_count sdcnt;
         bool sr_enabled; /* SaveRestore enabled */
+        bool sleeping;
 
         u8 tx_hdrlen;           /* sdio bus header length for tx packet */
         bool txglom;            /* host tx glomming enable flag */
@@ -616,6 +615,10 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = {
 #define BCM43362_NVRAM_NAME             "brcm/brcmfmac43362-sdio.txt"
 #define BCM4339_FIRMWARE_NAME           "brcm/brcmfmac4339-sdio.bin"
 #define BCM4339_NVRAM_NAME              "brcm/brcmfmac4339-sdio.txt"
+#define BCM43430_FIRMWARE_NAME          "brcm/brcmfmac43430-sdio.bin"
+#define BCM43430_NVRAM_NAME             "brcm/brcmfmac43430-sdio.txt"
+#define BCM43455_FIRMWARE_NAME          "brcm/brcmfmac43455-sdio.bin"
+#define BCM43455_NVRAM_NAME             "brcm/brcmfmac43455-sdio.txt"
 #define BCM4354_FIRMWARE_NAME           "brcm/brcmfmac4354-sdio.bin"
 #define BCM4354_NVRAM_NAME              "brcm/brcmfmac4354-sdio.txt"
 
@@ -639,6 +642,10 @@ MODULE_FIRMWARE(BCM43362_FIRMWARE_NAME);
 MODULE_FIRMWARE(BCM43362_NVRAM_NAME);
 MODULE_FIRMWARE(BCM4339_FIRMWARE_NAME);
 MODULE_FIRMWARE(BCM4339_NVRAM_NAME);
+MODULE_FIRMWARE(BCM43430_FIRMWARE_NAME);
+MODULE_FIRMWARE(BCM43430_NVRAM_NAME);
+MODULE_FIRMWARE(BCM43455_FIRMWARE_NAME);
+MODULE_FIRMWARE(BCM43455_NVRAM_NAME);
 MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME);
 MODULE_FIRMWARE(BCM4354_NVRAM_NAME);
 
@@ -668,6 +675,8 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = {
         { BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },
         { BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
         { BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) },
+        { BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43430) },
+        { BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43455) },
         { BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4354) }
 };
 
@@ -958,13 +967,8 @@ static int brcmf_sdio_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
         brcmf_dbg(SDIO, "Enter\n");
 
         /* Early exit if we're already there */
-        if (bus->clkstate == target) {
-                if (target == CLK_AVAIL) {
-                        brcmf_sdio_wd_timer(bus, BRCMF_WD_POLL_MS);
-                        bus->activity = true;
-                }
+        if (bus->clkstate == target)
                 return 0;
-        }
 
         switch (target) {
         case CLK_AVAIL:
@@ -973,8 +977,6 @@ static int brcmf_sdio_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
                         brcmf_sdio_sdclk(bus, true);
                 /* Now request HT Avail on the backplane */
                 brcmf_sdio_htclk(bus, true, pendok);
-                brcmf_sdio_wd_timer(bus, BRCMF_WD_POLL_MS);
-                bus->activity = true;
                 break;
 
         case CLK_SDONLY:
@@ -986,7 +988,6 @@ static int brcmf_sdio_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
                 else
                         brcmf_err("request for %d -> %d\n",
                                   bus->clkstate, target);
-                brcmf_sdio_wd_timer(bus, BRCMF_WD_POLL_MS);
                 break;
 
         case CLK_NONE:
@@ -995,7 +996,6 @@ static int brcmf_sdio_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
                         brcmf_sdio_htclk(bus, false, false);
                 /* Now remove the SD clock */
                 brcmf_sdio_sdclk(bus, false);
-                brcmf_sdio_wd_timer(bus, 0);
                 break;
         }
 #ifdef DEBUG
@@ -1013,26 +1013,16 @@ brcmf_sdio_bus_sleep(struct brcmf_sdio *bus, bool sleep, bool pendok)
 
         brcmf_dbg(SDIO, "Enter: request %s currently %s\n",
                   (sleep ? "SLEEP" : "WAKE"),
-                  (bus->sdiodev->sleeping ? "SLEEP" : "WAKE"));
+                  (bus->sleeping ? "SLEEP" : "WAKE"));
 
         /* If SR is enabled control bus state with KSO */
         if (bus->sr_enabled) {
                 /* Done if we're already in the requested state */
-                if (sleep == bus->sdiodev->sleeping)
+                if (sleep == bus->sleeping)
                         goto end;
 
                 /* Going to sleep */
                 if (sleep) {
-                        /* Don't sleep if something is pending */
-                        if (atomic_read(&bus->intstatus) ||
-                            atomic_read(&bus->ipend) > 0 ||
-                            (!atomic_read(&bus->fcstate) &&
-                            brcmu_pktq_mlen(&bus->txq, ~bus->flowcontrol) &&
-                            data_ok(bus))) {
-                                 err = -EBUSY;
-                                 goto done;
-                        }
-
                         clkcsr = brcmf_sdiod_regrb(bus->sdiodev,
                                                    SBSDIO_FUNC1_CHIPCLKCSR,
                                                    &err);
@@ -1043,11 +1033,7 @@ brcmf_sdio_bus_sleep(struct brcmf_sdio *bus, bool sleep, bool pendok)
                                                   SBSDIO_ALP_AVAIL_REQ, &err);
                         }
                         err = brcmf_sdio_kso_control(bus, false);
-                        /* disable watchdog */
-                        if (!err)
-                                brcmf_sdio_wd_timer(bus, 0);
                 } else {
-                        bus->idlecount = 0;
                         err = brcmf_sdio_kso_control(bus, true);
                 }
                 if (err) {
@@ -1064,10 +1050,9 @@ end:
                         brcmf_sdio_clkctl(bus, CLK_NONE, pendok);
         } else {
                 brcmf_sdio_clkctl(bus, CLK_AVAIL, pendok);
+                brcmf_sdio_wd_timer(bus, BRCMF_WD_POLL_MS);
         }
-        bus->sdiodev->sleeping = sleep;
-        if (sleep)
-                wake_up(&bus->sdiodev->idle_wait);
+        bus->sleeping = sleep;
         brcmf_dbg(SDIO, "new state %s\n",
                   (sleep ? "SLEEP" : "WAKE"));
 done:
@@ -1085,44 +1070,47 @@ static inline bool brcmf_sdio_valid_shared_address(u32 addr)
 static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
                                  struct sdpcm_shared *sh)
 {
-        u32 addr;
+        u32 addr = 0;
         int rv;
         u32 shaddr = 0;
         struct sdpcm_shared_le sh_le;
         __le32 addr_le;
 
-        shaddr = bus->ci->rambase + bus->ramsize - 4;
+        sdio_claim_host(bus->sdiodev->func[1]);
+        brcmf_sdio_bus_sleep(bus, false, false);
 
         /*
          * Read last word in socram to determine
          * address of sdpcm_shared structure
          */
-        sdio_claim_host(bus->sdiodev->func[1]);
-        brcmf_sdio_bus_sleep(bus, false, false);
-        rv = brcmf_sdiod_ramrw(bus->sdiodev, false, shaddr, (u8 *)&addr_le, 4);
-        sdio_release_host(bus->sdiodev->func[1]);
+        shaddr = bus->ci->rambase + bus->ci->ramsize - 4;
+        if (!bus->ci->rambase && brcmf_chip_sr_capable(bus->ci))
+                shaddr -= bus->ci->srsize;
+        rv = brcmf_sdiod_ramrw(bus->sdiodev, false, shaddr,
+                               (u8 *)&addr_le, 4);
         if (rv < 0)
-                return rv;
-
-        addr = le32_to_cpu(addr_le);
-
-        brcmf_dbg(SDIO, "sdpcm_shared address 0x%08X\n", addr);
+                goto fail;
 
         /*
          * Check if addr is valid.
          * NVRAM length at the end of memory should have been overwritten.
          */
+        addr = le32_to_cpu(addr_le);
         if (!brcmf_sdio_valid_shared_address(addr)) {
-                        brcmf_err("invalid sdpcm_shared address 0x%08X\n",
-                                  addr);
-                        return -EINVAL;
+                brcmf_err("invalid sdpcm_shared address 0x%08X\n", addr);
+                rv = -EINVAL;
+                goto fail;
         }
 
+        brcmf_dbg(INFO, "sdpcm_shared address 0x%08X\n", addr);
+
         /* Read hndrte_shared structure */
         rv = brcmf_sdiod_ramrw(bus->sdiodev, false, addr, (u8 *)&sh_le,
                                sizeof(struct sdpcm_shared_le));
         if (rv < 0)
-                return rv;
+                goto fail;
+
+        sdio_release_host(bus->sdiodev->func[1]);
 
         /* Endianness */
         sh->flags = le32_to_cpu(sh_le.flags);
@@ -1139,8 +1127,13 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
                           sh->flags & SDPCM_SHARED_VERSION_MASK);
                 return -EPROTO;
         }
-
         return 0;
+
+fail:
+        brcmf_err("unable to obtain sdpcm_shared info: rv=%d (addr=0x%x)\n",
+                  rv, addr);
+        sdio_release_host(bus->sdiodev->func[1]);
+        return rv;
 }
 
 static void brcmf_sdio_get_console_addr(struct brcmf_sdio *bus)
@@ -1909,7 +1902,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
         bus->rxpending = true;
 
         for (rd->seq_num = bus->rx_seq, rxleft = maxframes;
-             !bus->rxskip && rxleft && bus->sdiodev->state == BRCMF_STATE_DATA;
+             !bus->rxskip && rxleft && bus->sdiodev->state == BRCMF_SDIOD_DATA;
              rd->seq_num++, rxleft--) {
 
                 /* Handle glomming separately */
@@ -2415,7 +2408,7 @@ static uint brcmf_sdio_sendfromq(struct brcmf_sdio *bus, uint maxframes)
         }
 
         /* Deflow-control stack if needed */
-        if ((bus->sdiodev->state == BRCMF_STATE_DATA) &&
+        if ((bus->sdiodev->state == BRCMF_SDIOD_DATA) &&
             bus->txoff && (pktq_len(&bus->txq) < TXLOW)) {
                 bus->txoff = false;
                 brcmf_txflowblock(bus->sdiodev->dev, false);
@@ -2503,7 +2496,7 @@ static void brcmf_sdio_bus_stop(struct device *dev)
                 bus->watchdog_tsk = NULL;
         }
 
-        if (sdiodev->state != BRCMF_STATE_NOMEDIUM) {
+        if (sdiodev->state != BRCMF_SDIOD_NOMEDIUM) {
                 sdio_claim_host(sdiodev->func[1]);
 
                 /* Enable clock for device interrupts */
@@ -2603,21 +2596,6 @@ static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus)
         return ret;
 }
 
-static int brcmf_sdio_pm_resume_wait(struct brcmf_sdio_dev *sdiodev)
-{
-#ifdef CONFIG_PM_SLEEP
-        int retry;
-
-        /* Wait for possible resume to complete */
-        retry = 0;
-        while ((atomic_read(&sdiodev->suspend)) && (retry++ != 50))
-                msleep(20);
-        if (atomic_read(&sdiodev->suspend))
-                return -EIO;
-#endif
-        return 0;
-}
-
 static void brcmf_sdio_dpc(struct brcmf_sdio *bus)
 {
         u32 newstatus = 0;
@@ -2628,9 +2606,6 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus)
 
         brcmf_dbg(TRACE, "Enter\n");
 
-        if (brcmf_sdio_pm_resume_wait(bus->sdiodev))
-                return;
-
         sdio_claim_host(bus->sdiodev->func[1]);
 
         /* If waiting for HTAVAIL, check status */
@@ -2739,11 +2714,14 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus)
         if (bus->ctrl_frame_stat && (bus->clkstate == CLK_AVAIL) &&
             data_ok(bus)) {
                 sdio_claim_host(bus->sdiodev->func[1]);
-                err = brcmf_sdio_tx_ctrlframe(bus,  bus->ctrl_frame_buf,
-                                              bus->ctrl_frame_len);
+                if (bus->ctrl_frame_stat) {
+                        err = brcmf_sdio_tx_ctrlframe(bus,  bus->ctrl_frame_buf,
+                                                      bus->ctrl_frame_len);
+                        bus->ctrl_frame_err = err;
+                        wmb();
+                        bus->ctrl_frame_stat = false;
+                }
                 sdio_release_host(bus->sdiodev->func[1]);
-                bus->ctrl_frame_err = err;
-                bus->ctrl_frame_stat = false;
                 brcmf_sdio_wait_event_wakeup(bus);
         }
         /* Send queued frames (limit 1 if rx may still be pending) */
@@ -2755,15 +2733,25 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus)
                 brcmf_sdio_sendfromq(bus, framecnt);
         }
 
-        if ((bus->sdiodev->state != BRCMF_STATE_DATA) || (err != 0)) {
+        if ((bus->sdiodev->state != BRCMF_SDIOD_DATA) || (err != 0)) {
                 brcmf_err("failed backplane access over SDIO, halting operation\n");
                 atomic_set(&bus->intstatus, 0);
+                if (bus->ctrl_frame_stat) {
+                        sdio_claim_host(bus->sdiodev->func[1]);
+                        if (bus->ctrl_frame_stat) {
+                                bus->ctrl_frame_err = -ENODEV;
+                                wmb();
+                                bus->ctrl_frame_stat = false;
+                                brcmf_sdio_wait_event_wakeup(bus);
+                        }
+                        sdio_release_host(bus->sdiodev->func[1]);
+                }
         } else if (atomic_read(&bus->intstatus) ||
                    atomic_read(&bus->ipend) > 0 ||
                    (!atomic_read(&bus->fcstate) &&
                     brcmu_pktq_mlen(&bus->txq, ~bus->flowcontrol) &&
                     data_ok(bus))) {
-                atomic_inc(&bus->dpc_tskcnt);
+                bus->dpc_triggered = true;
         }
 }
 
@@ -2862,11 +2850,7 @@ static int brcmf_sdio_bus_txdata(struct device *dev, struct sk_buff *pkt)
                 qcount[prec] = pktq_plen(&bus->txq, prec);
 #endif
 
-        if (atomic_read(&bus->dpc_tskcnt) == 0) {
-                atomic_inc(&bus->dpc_tskcnt);
-                queue_work(bus->brcmf_wq, &bus->datawork);
-        }
-
+        brcmf_sdio_trigger_dpc(bus);
         return ret;
 }
 
@@ -2963,23 +2947,27 @@ brcmf_sdio_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
         /* Send from dpc */
         bus->ctrl_frame_buf = msg;
         bus->ctrl_frame_len = msglen;
+        wmb();
         bus->ctrl_frame_stat = true;
-        if (atomic_read(&bus->dpc_tskcnt) == 0) {
-                atomic_inc(&bus->dpc_tskcnt);
-                queue_work(bus->brcmf_wq, &bus->datawork);
-        }
 
+        brcmf_sdio_trigger_dpc(bus);
         wait_event_interruptible_timeout(bus->ctrl_wait, !bus->ctrl_frame_stat,
                                          msecs_to_jiffies(CTL_DONE_TIMEOUT));
-
-        if (!bus->ctrl_frame_stat) {
+        ret = 0;
+        if (bus->ctrl_frame_stat) {
+                sdio_claim_host(bus->sdiodev->func[1]);
+                if (bus->ctrl_frame_stat) {
+                        brcmf_dbg(SDIO, "ctrl_frame timeout\n");
+                        bus->ctrl_frame_stat = false;
+                        ret = -ETIMEDOUT;
+                }
+                sdio_release_host(bus->sdiodev->func[1]);
+        }
+        if (!ret) {
                 brcmf_dbg(SDIO, "ctrl_frame complete, err=%d\n",
                           bus->ctrl_frame_err);
+                rmb();
                 ret = bus->ctrl_frame_err;
-        } else {
-                brcmf_dbg(SDIO, "ctrl_frame timeout\n");
-                bus->ctrl_frame_stat = false;
-                ret = -ETIMEDOUT;
         }
 
         if (ret)
@@ -3383,9 +3371,6 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,
         sdio_claim_host(bus->sdiodev->func[1]);
         brcmf_sdio_clkctl(bus, CLK_AVAIL, false);
 
-        /* Keep arm in reset */
-        brcmf_chip_enter_download(bus->ci);
-
         rstvec = get_unaligned_le32(fw->data);
         brcmf_dbg(SDIO, "firmware rstvec: %x\n", rstvec);
 
@@ -3405,13 +3390,13 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,
         }
 
         /* Take arm out of reset */
-        if (!brcmf_chip_exit_download(bus->ci, rstvec)) {
+        if (!brcmf_chip_set_active(bus->ci, rstvec)) {
                 brcmf_err("error getting out of ARM core reset\n");
                 goto err;
         }
 
         /* Allow full data communication using DPC from now on. */
-        bus->sdiodev->state = BRCMF_STATE_DATA;
+        brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
         bcmerror = 0;
 
 err:
@@ -3548,6 +3533,14 @@ done:
         return err;
 }
 
+void brcmf_sdio_trigger_dpc(struct brcmf_sdio *bus)
+{
+        if (!bus->dpc_triggered) {
+                bus->dpc_triggered = true;
+                queue_work(bus->brcmf_wq, &bus->datawork);
+        }
+}
+
 void brcmf_sdio_isr(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
@@ -3557,7 +3550,7 @@ void brcmf_sdio_isr(struct brcmf_sdio *bus)
                 return;
         }
 
-        if (bus->sdiodev->state != BRCMF_STATE_DATA) {
+        if (bus->sdiodev->state != BRCMF_SDIOD_DATA) {
                 brcmf_err("bus is down. we have nothing to do\n");
                 return;
         }
@@ -3574,11 +3567,11 @@ void brcmf_sdio_isr(struct brcmf_sdio *bus)
         if (!bus->intr)
                 brcmf_err("isr w/o interrupt configured!\n");
 
-        atomic_inc(&bus->dpc_tskcnt);
+        bus->dpc_triggered = true;
         queue_work(bus->brcmf_wq, &bus->datawork);
 }
 
-static bool brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus)
+static void brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TIMER, "Enter\n");
 
@@ -3594,7 +3587,7 @@ static bool brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus)
                 if (!bus->intr ||
                     (bus->sdcnt.intrcount == bus->sdcnt.lastintrs)) {
 
-                        if (atomic_read(&bus->dpc_tskcnt) == 0) {
+                        if (!bus->dpc_triggered) {
                                 u8 devpend;
 
                                 sdio_claim_host(bus->sdiodev->func[1]);
@@ -3602,9 +3595,8 @@ static bool brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus)
                                                             SDIO_CCCR_INTx,
                                                             NULL);
                                 sdio_release_host(bus->sdiodev->func[1]);
-                                intstatus =
-                                    devpend & (INTR_STATUS_FUNC1 |
-                                               INTR_STATUS_FUNC2);
+                                intstatus = devpend & (INTR_STATUS_FUNC1 |
+                                                       INTR_STATUS_FUNC2);
                         }
 
                         /* If there is something, make like the ISR and
@@ -3613,7 +3605,7 @@ static bool brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus)
                                 bus->sdcnt.pollcnt++;
                                 atomic_set(&bus->ipend, 1);
 
-                                atomic_inc(&bus->dpc_tskcnt);
+                                bus->dpc_triggered = true;
                                 queue_work(bus->brcmf_wq, &bus->datawork);
                         }
                 }
@@ -3623,7 +3615,7 @@ static bool brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus)
         }
 #ifdef DEBUG
         /* Poll for console output periodically */
-        if (bus->sdiodev->state == BRCMF_STATE_DATA &&
+        if (bus->sdiodev->state == BRCMF_SDIOD_DATA &&
             bus->console_interval != 0) {
                 bus->console.count += BRCMF_WD_POLL_MS;
                 if (bus->console.count >= bus->console_interval) {
@@ -3640,22 +3632,25 @@ static bool brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus)
 #endif                          /* DEBUG */
 
         /* On idle timeout clear activity flag and/or turn off clock */
-        if ((bus->idletime > 0) && (bus->clkstate == CLK_AVAIL)) {
-                if (++bus->idlecount >= bus->idletime) {
-                        bus->idlecount = 0;
-                        if (bus->activity) {
-                                bus->activity = false;
-                                brcmf_sdio_wd_timer(bus, BRCMF_WD_POLL_MS);
-                        } else {
+        if (!bus->dpc_triggered) {
+                rmb();
+                if ((!bus->dpc_running) && (bus->idletime > 0) &&
+                    (bus->clkstate == CLK_AVAIL)) {
+                        bus->idlecount++;
+                        if (bus->idlecount > bus->idletime) {
                                 brcmf_dbg(SDIO, "idle\n");
                                 sdio_claim_host(bus->sdiodev->func[1]);
+                                brcmf_sdio_wd_timer(bus, 0);
+                                bus->idlecount = 0;
                                 brcmf_sdio_bus_sleep(bus, true, false);
                                 sdio_release_host(bus->sdiodev->func[1]);
                         }
+                } else {
+                        bus->idlecount = 0;
                 }
+        } else {
+                bus->idlecount = 0;
         }
-
-        return (atomic_read(&bus->ipend) > 0);
 }
 
 static void brcmf_sdio_dataworker(struct work_struct *work)
@@ -3663,9 +3658,18 @@ static void brcmf_sdio_dataworker(struct work_struct *work)
         struct brcmf_sdio *bus = container_of(work, struct brcmf_sdio,
                                               datawork);
 
-        while (atomic_read(&bus->dpc_tskcnt)) {
-                atomic_set(&bus->dpc_tskcnt, 0);
+        bus->dpc_running = true;
+        wmb();
+        while (ACCESS_ONCE(bus->dpc_triggered)) {
+                bus->dpc_triggered = false;
                 brcmf_sdio_dpc(bus);
+                bus->idlecount = 0;
+        }
+        bus->dpc_running = false;
+        if (brcmf_sdiod_freezing(bus->sdiodev)) {
+                brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DOWN);
+                brcmf_sdiod_try_freeze(bus->sdiodev);
+                brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
         }
 }
 
@@ -3784,8 +3788,8 @@ static int brcmf_sdio_buscoreprep(void *ctx)
         return 0;
 }
 
-static void brcmf_sdio_buscore_exitdl(void *ctx, struct brcmf_chip *chip,
-                                      u32 rstvec)
+static void brcmf_sdio_buscore_activate(void *ctx, struct brcmf_chip *chip,
+                                        u32 rstvec)
 {
         struct brcmf_sdio_dev *sdiodev = ctx;
         struct brcmf_core *core;
@@ -3828,7 +3832,7 @@ static void brcmf_sdio_buscore_write32(void *ctx, u32 addr, u32 val)
 
 static const struct brcmf_buscore_ops brcmf_sdio_buscore_ops = {
         .prepare = brcmf_sdio_buscoreprep,
-        .exit_dl = brcmf_sdio_buscore_exitdl,
+        .activate = brcmf_sdio_buscore_activate,
         .read32 = brcmf_sdio_buscore_read32,
         .write32 = brcmf_sdio_buscore_write32,
 };
@@ -3882,13 +3886,6 @@ brcmf_sdio_probe_attach(struct brcmf_sdio *bus)
                 drivestrength = DEFAULT_SDIO_DRIVE_STRENGTH;
         brcmf_sdio_drivestrengthinit(bus->sdiodev, bus->ci, drivestrength);
 
-        /* Get info on the SOCRAM cores... */
-        bus->ramsize = bus->ci->ramsize;
-        if (!(bus->ramsize)) {
-                brcmf_err("failed to find SOCRAM memory!\n");
-                goto fail;
-        }
-
         /* Set card control so an SDIO card reset does a WLAN backplane reset */
         reg_val = brcmf_sdiod_regrb(bus->sdiodev,
                                     SDIO_CCCR_BRCM_CARDCTRL, &err);
@@ -3944,13 +3941,19 @@ static int
 brcmf_sdio_watchdog_thread(void *data)
 {
         struct brcmf_sdio *bus = (struct brcmf_sdio *)data;
+        int wait;
 
         allow_signal(SIGTERM);
         /* Run until signal received */
+        brcmf_sdiod_freezer_count(bus->sdiodev);
         while (1) {
                 if (kthread_should_stop())
                         break;
-                if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {
+                brcmf_sdiod_freezer_uncount(bus->sdiodev);
+                wait = wait_for_completion_interruptible(&bus->watchdog_wait);
+                brcmf_sdiod_freezer_count(bus->sdiodev);
+                brcmf_sdiod_try_freeze(bus->sdiodev);
+                if (!wait) {
                         brcmf_sdio_bus_watchdog(bus);
                         /* Count the tick for reference */
                         bus->sdcnt.tickcnt++;
@@ -3971,7 +3974,7 @@ brcmf_sdio_watchdog(unsigned long data)
                 /* Reschedule the watchdog */
                 if (bus->wd_timer_valid)
                         mod_timer(&bus->timer,
-                                  jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
+                                  jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS));
         }
 }
 
@@ -4089,6 +4092,7 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
 {
         int ret;
         struct brcmf_sdio *bus;
+        struct workqueue_struct *wq;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -4117,12 +4121,16 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
                         bus->sgentry_align = sdiodev->pdata->sd_sgentry_align;
         }
 
-        INIT_WORK(&bus->datawork, brcmf_sdio_dataworker);
-        bus->brcmf_wq = create_singlethread_workqueue("brcmf_wq");
-        if (bus->brcmf_wq == NULL) {
+        /* single-threaded workqueue */
+        wq = alloc_ordered_workqueue("brcmf_wq/%s", WQ_MEM_RECLAIM,
+                                     dev_name(&sdiodev->func[1]->dev));
+        if (!wq) {
                 brcmf_err("insufficient memory to create txworkqueue\n");
                 goto fail;
         }
+        brcmf_sdiod_freezer_count(sdiodev);
+        INIT_WORK(&bus->datawork, brcmf_sdio_dataworker);
+        bus->brcmf_wq = wq;
 
         /* attempt to attach to the dongle */
         if (!(brcmf_sdio_probe_attach(bus))) {
@@ -4143,13 +4151,15 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
         /* Initialize watchdog thread */
         init_completion(&bus->watchdog_wait);
         bus->watchdog_tsk = kthread_run(brcmf_sdio_watchdog_thread,
-                                        bus, "brcmf_watchdog");
+                                        bus, "brcmf_wdog/%s",
+                                        dev_name(&sdiodev->func[1]->dev));
         if (IS_ERR(bus->watchdog_tsk)) {
                 pr_warn("brcmf_watchdog thread failed to start\n");
                 bus->watchdog_tsk = NULL;
         }
         /* Initialize DPC thread */
-        atomic_set(&bus->dpc_tskcnt, 0);
+        bus->dpc_triggered = false;
+        bus->dpc_running = false;
 
         /* Assign bus interface call back */
         bus->sdiodev->bus_if->dev = bus->sdiodev->dev;
@@ -4242,16 +4252,16 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)
                         destroy_workqueue(bus->brcmf_wq);
 
                 if (bus->ci) {
-                        if (bus->sdiodev->state != BRCMF_STATE_NOMEDIUM) {
+                        if (bus->sdiodev->state != BRCMF_SDIOD_NOMEDIUM) {
                                 sdio_claim_host(bus->sdiodev->func[1]);
+                                brcmf_sdio_wd_timer(bus, 0);
                                 brcmf_sdio_clkctl(bus, CLK_AVAIL, false);
                                 /* Leave the device in state where it is
-                                 * 'quiet'. This is done by putting it in
-                                 * download_state which essentially resets
-                                 * all necessary cores.
+                                 * 'passive'. This is done by resetting all
+                                 * necessary cores.
                                  */
                                 msleep(20);
-                                brcmf_chip_enter_download(bus->ci);
+                                brcmf_chip_set_passive(bus->ci);
                                 brcmf_sdio_clkctl(bus, CLK_NONE, false);
                                 sdio_release_host(bus->sdiodev->func[1]);
                         }
@@ -4277,7 +4287,7 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick)
         }
 
         /* don't start the wd until fw is loaded */
-        if (bus->sdiodev->state != BRCMF_STATE_DATA)
+        if (bus->sdiodev->state != BRCMF_SDIOD_DATA)
                 return;
 
         if (wdtick) {
@@ -4290,16 +4300,28 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick)
                            dynamically changed or in the first instance
                          */
                         bus->timer.expires =
-                                jiffies + BRCMF_WD_POLL_MS * HZ / 1000;
+                                jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS);
                         add_timer(&bus->timer);
 
                 } else {
                         /* Re arm the timer, at last watchdog period */
                         mod_timer(&bus->timer,
-                                jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
+                                jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS));
                 }
 
                 bus->wd_timer_valid = true;
                 bus->save_ms = wdtick;
         }
 }
+
+int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep)
+{
+        int ret;
+
+        sdio_claim_host(bus->sdiodev->func[1]);
+        ret = brcmf_sdio_bus_sleep(bus, sleep, false);
+        sdio_release_host(bus->sdiodev->func[1]);
+
+        return ret;
+}
+
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio.h
index ec2586a8425c..7328478b2d7b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.h
@@ -155,11 +155,17 @@
 /* watchdog polling interval in ms */
 #define BRCMF_WD_POLL_MS        10
 
-/* The state of the bus */
-enum brcmf_sdio_state {
-        BRCMF_STATE_DOWN,       /* Device available, still initialising */
-        BRCMF_STATE_DATA,       /* Ready for data transfers, DPC enabled */
-        BRCMF_STATE_NOMEDIUM    /* No medium access to dongle possible */
+/**
+ * enum brcmf_sdiod_state - the state of the bus.
+ *
+ * @BRCMF_SDIOD_DOWN: Device can be accessed, no DPC.
+ * @BRCMF_SDIOD_DATA: Ready for data transfers, DPC enabled.
+ * @BRCMF_SDIOD_NOMEDIUM: No medium access to dongle possible.
+ */
+enum brcmf_sdiod_state {
+        BRCMF_SDIOD_DOWN,
+        BRCMF_SDIOD_DATA,
+        BRCMF_SDIOD_NOMEDIUM
 };
 
 struct brcmf_sdreg {
@@ -169,15 +175,13 @@ struct brcmf_sdreg {
 };
 
 struct brcmf_sdio;
+struct brcmf_sdiod_freezer;
 
 struct brcmf_sdio_dev {
         struct sdio_func *func[SDIO_MAX_FUNCS];
         u8 num_funcs;                   /* Supported funcs on client */
         u32 sbwad;                      /* Save backplane window address */
         struct brcmf_sdio *bus;
-        atomic_t suspend;               /* suspend flag */
-        bool sleeping;
-        wait_queue_head_t idle_wait;
         struct device *dev;
         struct brcmf_bus *bus_if;
         struct brcmfmac_sdio_platform_data *pdata;
@@ -194,7 +198,8 @@ struct brcmf_sdio_dev {
         char fw_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
         char nvram_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
         bool wowl_enabled;
-        enum brcmf_sdio_state state;
+        enum brcmf_sdiod_state state;
+        struct brcmf_sdiod_freezer *freezer;
 };
 
 /* sdio core registers */
@@ -337,6 +342,28 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
 
 /* Issue an abort to the specified function */
 int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
+void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
+                              enum brcmf_sdiod_state state);
+#ifdef CONFIG_PM_SLEEP
+bool brcmf_sdiod_freezing(struct brcmf_sdio_dev *sdiodev);
+void brcmf_sdiod_try_freeze(struct brcmf_sdio_dev *sdiodev);
+void brcmf_sdiod_freezer_count(struct brcmf_sdio_dev *sdiodev);
+void brcmf_sdiod_freezer_uncount(struct brcmf_sdio_dev *sdiodev);
+#else
+static inline bool brcmf_sdiod_freezing(struct brcmf_sdio_dev *sdiodev)
+{
+        return false;
+}
+static inline void brcmf_sdiod_try_freeze(struct brcmf_sdio_dev *sdiodev)
+{
+}
+static inline void brcmf_sdiod_freezer_count(struct brcmf_sdio_dev *sdiodev)
+{
+}
+static inline void brcmf_sdiod_freezer_uncount(struct brcmf_sdio_dev *sdiodev)
+{
+}
+#endif /* CONFIG_PM_SLEEP */
 
 struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev);
 void brcmf_sdio_remove(struct brcmf_sdio *bus);
@@ -344,5 +371,7 @@ void brcmf_sdio_isr(struct brcmf_sdio *bus);
 
 void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick);
 void brcmf_sdio_wowl_config(struct device *dev, bool enabled);
+int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep);
+void brcmf_sdio_trigger_dpc(struct brcmf_sdio *bus);
 
 #endif /* BRCMFMAC_SDIO_H */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index eb8584a9c49a..369527e27689 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -4668,7 +4668,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
         brcms_c_coredisable(wlc_hw);
 
         /* Match driver "down" state */
-        bcma_core_pci_down(wlc_hw->d11core->bus);
+        bcma_host_pci_down(wlc_hw->d11core->bus);
 
         /* turn off pll and xtal to match driver "down" state */
         brcms_b_xtal(wlc_hw, OFF);
@@ -4959,7 +4959,7 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
          * Configure pci/pcmcia here instead of in brcms_c_attach()
          * to allow mfg hotswap:  down, hotswap (chip power cycle), up.
          */
-        bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci[0], wlc_hw->d11core,
+        bcma_host_pci_irq_ctl(wlc_hw->d11core->bus, wlc_hw->d11core,
                               true);
 
         /*
@@ -4969,12 +4969,12 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
          */
         if (brcms_b_radio_read_hwdisabled(wlc_hw)) {
                 /* put SB PCI in down state again */
-                bcma_core_pci_down(wlc_hw->d11core->bus);
+                bcma_host_pci_down(wlc_hw->d11core->bus);
                 brcms_b_xtal(wlc_hw, OFF);
                 return -ENOMEDIUM;
         }
 
-        bcma_core_pci_up(wlc_hw->d11core->bus);
+        bcma_host_pci_up(wlc_hw->d11core->bus);
 
         /* reset the d11 core */
         brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
@@ -5171,7 +5171,7 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw)
 
                 /* turn off primary xtal and pll */
                 if (!wlc_hw->noreset) {
-                        bcma_core_pci_down(wlc_hw->d11core->bus);
+                        bcma_host_pci_down(wlc_hw->d11core->bus);
                         brcms_b_xtal(wlc_hw, OFF);
                 }
         }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
index 941b1e41f366..1c4e9dd57960 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -2949,5 +2949,5 @@ bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *ppi)
         if (ISNPHY(pi))
                 return wlc_phy_n_txpower_ipa_ison(pi);
         else
-                return 0;
+                return false;
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
index 5f1366234a0d..93d4cde0eb31 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
@@ -4999,7 +4999,7 @@ void wlc_2064_vco_cal(struct brcms_phy *pi)
 bool wlc_phy_tpc_isenabled_lcnphy(struct brcms_phy *pi)
 {
         if (wlc_lcnphy_tempsense_based_pwr_ctrl_enabled(pi))
-                return 0;
+                return false;
         else
                 return (LCNPHY_TX_PWR_CTRL_HW ==
                         wlc_lcnphy_get_tx_pwr_ctrl((pi)));
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 084f18f4f950..99dac9b8a082 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -23041,10 +23041,7 @@ static void wlc_phy_rssi_cal_nphy_rev2(struct brcms_phy *pi, u8 rssi_type)
         else if (rssi_ctrl_state[0] == RADIO_2055_WBRSSI_G1_SEL)
                 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
                                      NPHY_RSSI_SEL_W1);
-        else if (rssi_ctrl_state[0] == RADIO_2055_WBRSSI_G2_SEL)
-                wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
-                                     NPHY_RSSI_SEL_W2);
-        else
+        else /* RADIO_2055_WBRSSI_G2_SEL */
                 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
                                      NPHY_RSSI_SEL_W2);
         if (rssi_ctrl_state[1] == RADIO_2055_NBRSSI_SEL)
@@ -23053,13 +23050,9 @@ static void wlc_phy_rssi_cal_nphy_rev2(struct brcms_phy *pi, u8 rssi_type)
         else if (rssi_ctrl_state[1] == RADIO_2055_WBRSSI_G1_SEL)
                 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
                                      NPHY_RSSI_SEL_W1);
-        else if (rssi_ctrl_state[1] == RADIO_2055_WBRSSI_G2_SEL)
+        else /* RADIO_2055_WBRSSI_G1_SEL */
                 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
                                      NPHY_RSSI_SEL_W2);
-        else
-                wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
-                                     NPHY_RSSI_SEL_W2);
-
         wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_OFF, rssi_type);
 
         write_phy_reg(pi, 0x91, rfctrlintc_state[0]);
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 2124a17d0bfd..4efdd51af9c8 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -37,6 +37,8 @@
 #define BRCM_CC_43362_CHIP_ID           43362
 #define BRCM_CC_4335_CHIP_ID            0x4335
 #define BRCM_CC_4339_CHIP_ID            0x4339
+#define BRCM_CC_43430_CHIP_ID           43430
+#define BRCM_CC_4345_CHIP_ID            0x4345
 #define BRCM_CC_4354_CHIP_ID            0x4354
 #define BRCM_CC_4356_CHIP_ID            0x4356
 #define BRCM_CC_43566_CHIP_ID           43566
diff --git a/drivers/net/wireless/brcm80211/include/chipcommon.h b/drivers/net/wireless/brcm80211/include/chipcommon.h
index d242333b7559..e1fd499930a0 100644
--- a/drivers/net/wireless/brcm80211/include/chipcommon.h
+++ b/drivers/net/wireless/brcm80211/include/chipcommon.h
@@ -183,7 +183,14 @@ struct chipcregs {
         u8 uart1lsr;
         u8 uart1msr;
         u8 uart1scratch;
-        u32 PAD[126];
+        u32 PAD[62];
+
+        /* save/restore, corerev >= 48 */
+        u32 sr_capability;          /* 0x500 */
+        u32 sr_control0;            /* 0x504 */
+        u32 sr_control1;            /* 0x508 */
+        u32 gpio_control;           /* 0x50C */
+        u32 PAD[60];
 
         /* PMU registers (corerev >= 20) */
         u32 pmucontrol; /* 0x600 */
diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c
index 964b64ab7fe3..7603546d2de3 100644
--- a/drivers/net/wireless/cw1200/cw1200_spi.c
+++ b/drivers/net/wireless/cw1200/cw1200_spi.c
@@ -447,7 +447,7 @@ static int cw1200_spi_disconnect(struct spi_device *func)
 }
 
 #ifdef CONFIG_PM
-static int cw1200_spi_suspend(struct device *dev, pm_message_t state)
+static int cw1200_spi_suspend(struct device *dev)
 {
         struct hwbus_priv *self = spi_get_drvdata(to_spi_device(dev));
 
@@ -458,10 +458,8 @@ static int cw1200_spi_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int cw1200_spi_resume(struct device *dev)
-{
-        return 0;
-}
+static SIMPLE_DEV_PM_OPS(cw1200_pm_ops, cw1200_spi_suspend, NULL);
+
 #endif
 
 static struct spi_driver spi_driver = {
@@ -472,8 +470,7 @@ static struct spi_driver spi_driver = {
                 .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
 #ifdef CONFIG_PM
-                .suspend        = cw1200_spi_suspend,
-                .resume         = cw1200_spi_resume,
+                .pm             = &cw1200_pm_ops,
 #endif
         },
 };
diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/cw1200/sta.c
index 4a47c7f8a246..b0f65fa09428 100644
--- a/drivers/net/wireless/cw1200/sta.c
+++ b/drivers/net/wireless/cw1200/sta.c
@@ -293,7 +293,7 @@ void cw1200_remove_interface(struct ieee80211_hw *dev,
         }
         priv->vif = NULL;
         priv->mode = NL80211_IFTYPE_MONITOR;
-        memset(priv->mac_addr, 0, ETH_ALEN);
+        eth_zero_addr(priv->mac_addr);
         memset(&priv->p2p_ps_modeinfo, 0, sizeof(priv->p2p_ps_modeinfo));
         cw1200_free_keys(priv);
         cw1200_setup_mac(priv);
@@ -1240,8 +1240,8 @@ static void cw1200_do_join(struct cw1200_common *priv)
 
         bssid = priv->vif->bss_conf.bssid;
 
-        bss = cfg80211_get_bss(priv->hw->wiphy, priv->channel,
-                        bssid, NULL, 0, 0, 0);
+        bss = cfg80211_get_bss(priv->hw->wiphy, priv->channel, bssid, NULL, 0,
+                               IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
 
         if (!bss && !conf->ibss_joined) {
                 wsm_unlock_tx(priv);
diff --git a/drivers/net/wireless/cw1200/txrx.c b/drivers/net/wireless/cw1200/txrx.c
index 0bd541175ecd..d28bd49cb5fd 100644
--- a/drivers/net/wireless/cw1200/txrx.c
+++ b/drivers/net/wireless/cw1200/txrx.c
@@ -1429,7 +1429,7 @@ void cw1200_link_id_gc_work(struct work_struct *work)
                                 priv->link_id_map &= ~mask;
                                 priv->sta_asleep_mask &= ~mask;
                                 priv->pspoll_mask &= ~mask;
-                                memset(map_link.mac_addr, 0, ETH_ALEN);
+                                eth_zero_addr(map_link.mac_addr);
                                 spin_unlock_bh(&priv->ps_state_lock);
                                 reset.link_id = i + 1;
                                 wsm_reset(priv, &reset);
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 8bde77689469..055e11d353ca 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -174,8 +174,8 @@ netdev_tx_t hostap_data_start_xmit(struct sk_buff *skb,
                 /* send broadcast and multicast frames to broadcast RA, if
                  * configured; otherwise, use unicast RA of the WDS link */
                 if ((local->wds_type & HOSTAP_WDS_BROADCAST_RA) &&
-                    skb->data[0] & 0x01)
-                        memset(&hdr.addr1, 0xff, ETH_ALEN);
+                    is_multicast_ether_addr(skb->data))
+                        eth_broadcast_addr(hdr.addr1);
                 else if (iface->type == HOSTAP_INTERFACE_WDS)
                         memcpy(&hdr.addr1, iface->u.wds.remote_addr,
                                ETH_ALEN);
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index fd8d83dd4f62..c995ace153ee 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -309,7 +309,7 @@ void hostap_deauth_all_stas(struct net_device *dev, struct ap_data *ap,
         int i;
 
         PDEBUG(DEBUG_AP, "%s: Deauthenticate all stations\n", dev->name);
-        memset(addr, 0xff, ETH_ALEN);
+        eth_broadcast_addr(addr);
 
         resp = cpu_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);
 
@@ -1015,8 +1015,8 @@ static void prism2_send_mgmt(struct net_device *dev,
                 memcpy(hdr->addr3, dev->dev_addr, ETH_ALEN); /* SA */
         } else if (ieee80211_is_ctl(hdr->frame_control)) {
                 /* control:ACK does not have addr2 or addr3 */
-                memset(hdr->addr2, 0, ETH_ALEN);
-                memset(hdr->addr3, 0, ETH_ALEN);
+                eth_zero_addr(hdr->addr2);
+                eth_zero_addr(hdr->addr3);
         } else {
                 memcpy(hdr->addr2, dev->dev_addr, ETH_ALEN); /* SA */
                 memcpy(hdr->addr3, dev->dev_addr, ETH_ALEN); /* BSSID */
@@ -1601,7 +1601,7 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
                 memcpy(prev_ap, pos, ETH_ALEN);
                 pos++; pos++; pos++; left -= 6;
         } else
-                memset(prev_ap, 0, ETH_ALEN);
+                eth_zero_addr(prev_ap);
 
         if (left >= 2) {
                 unsigned int ileft;
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index de7c4ffec309..7635ac4f6679 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -442,7 +442,7 @@ static void handle_info_queue_linkstatus(local_info_t *local)
         } else {
                 netif_carrier_off(local->dev);
                 netif_carrier_off(local->ddev);
-                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+                eth_zero_addr(wrqu.ap_addr.sa_data);
         }
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
 
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 52919ad42726..01de1a3bf94e 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -224,7 +224,7 @@ int prism2_wds_del(local_info_t *local, u8 *remote_addr,
 
         if (selected) {
                 if (do_not_remove)
-                        memset(selected->u.wds.remote_addr, 0, ETH_ALEN);
+                        eth_zero_addr(selected->u.wds.remote_addr);
                 else {
                         hostap_remove_interface(selected->dev, rtnl_locked, 0);
                         local->wds_connections--;
@@ -798,7 +798,6 @@ static void prism2_tx_timeout(struct net_device *dev)
 
 const struct header_ops hostap_80211_ops = {
         .create         = eth_header,
-        .rebuild        = eth_rebuild_header,
         .cache          = eth_header_cache,
         .cache_update   = eth_header_cache_update,
         .parse          = hostap_80211_header_parse,
@@ -1088,7 +1087,7 @@ int prism2_sta_deauth(local_info_t *local, u16 reason)
 
         ret = prism2_sta_send_mgmt(local, local->bssid, IEEE80211_STYPE_DEAUTH,
                                    (u8 *) &val, 2);
-        memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        eth_zero_addr(wrqu.ap_addr.sa_data);
         wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL);
         return ret;
 }
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 57904015380f..ca25283e1c92 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -4,6 +4,7 @@
 #include <linux/interrupt.h>
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 #include <linux/mutex.h>
 #include <net/iw_handler.h>
 #include <net/ieee80211_radiotap.h>
@@ -85,16 +86,16 @@ struct hfa384x_rx_frame {
         /* 802.11 */
         __le16 frame_control;
         __le16 duration_id;
-        u8 addr1[6];
-        u8 addr2[6];
-        u8 addr3[6];
+        u8 addr1[ETH_ALEN];
+        u8 addr2[ETH_ALEN];
+        u8 addr3[ETH_ALEN];
         __le16 seq_ctrl;
-        u8 addr4[6];
+        u8 addr4[ETH_ALEN];
         __le16 data_len;
 
         /* 802.3 */
-        u8 dst_addr[6];
-        u8 src_addr[6];
+        u8 dst_addr[ETH_ALEN];
+        u8 src_addr[ETH_ALEN];
         __be16 len;
 
         /* followed by frame data; max 2304 bytes */
@@ -114,16 +115,16 @@ struct hfa384x_tx_frame {
         /* 802.11 */
         __le16 frame_control; /* parts not used */
         __le16 duration_id;
-        u8 addr1[6];
-        u8 addr2[6]; /* filled by firmware */
-        u8 addr3[6];
+        u8 addr1[ETH_ALEN];
+        u8 addr2[ETH_ALEN]; /* filled by firmware */
+        u8 addr3[ETH_ALEN];
         __le16 seq_ctrl; /* filled by firmware */
-        u8 addr4[6];
+        u8 addr4[ETH_ALEN];
         __le16 data_len;
 
         /* 802.3 */
-        u8 dst_addr[6];
-        u8 src_addr[6];
+        u8 dst_addr[ETH_ALEN];
+        u8 src_addr[ETH_ALEN];
         __be16 len;
 
         /* followed by frame data; max 2304 bytes */
@@ -156,7 +157,7 @@ struct hfa384x_hostscan_request {
 } __packed;
 
 struct hfa384x_join_request {
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         __le16 channel;
 } __packed;
 
@@ -228,7 +229,7 @@ struct hfa384x_scan_result {
         __le16 chid;
         __le16 anl;
         __le16 sl;
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         __le16 beacon_interval;
         __le16 capability;
         __le16 ssid_len;
@@ -241,7 +242,7 @@ struct hfa384x_hostscan_result {
         __le16 chid;
         __le16 anl;
         __le16 sl;
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         __le16 beacon_interval;
         __le16 capability;
         __le16 ssid_len;
@@ -824,7 +825,7 @@ struct local_info {
 #define PRISM2_INFO_PENDING_SCANRESULTS 1
         int prev_link_status; /* previous received LinkStatus info */
         int prev_linkstatus_connected;
-        u8 preferred_ap[6]; /* use this AP if possible */
+        u8 preferred_ap[ETH_ALEN]; /* use this AP if possible */
 
 #ifdef PRISM2_CALLBACK
         void *callback_data; /* Can be used in callbacks; e.g., allocate
diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/ipw2x00/Kconfig
index 21de4fe6cf2d..d6ec44d7a391 100644
--- a/drivers/net/wireless/ipw2x00/Kconfig
+++ b/drivers/net/wireless/ipw2x00/Kconfig
@@ -66,7 +66,7 @@ config IPW2100_DEBUG
 config IPW2200
         tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
         depends on PCI && CFG80211
-        select CFG80211_WEXT
+        select CFG80211_WEXT_EXPORT
         select WIRELESS_EXT
         select WEXT_SPY
         select WEXT_PRIV
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 6fabea0309dd..08eb229e7816 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2147,8 +2147,8 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
                 return;
         }
 
-        memset(priv->bssid, 0, ETH_ALEN);
-        memset(priv->ieee->bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->bssid);
+        eth_zero_addr(priv->ieee->bssid);
 
         netif_carrier_off(priv->net_dev);
         netif_stop_queue(priv->net_dev);
@@ -6956,7 +6956,7 @@ static int ipw2100_wx_get_wap(struct net_device *dev,
                 wrqu->ap_addr.sa_family = ARPHRD_ETHER;
                 memcpy(wrqu->ap_addr.sa_data, priv->bssid, ETH_ALEN);
         } else
-                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+                eth_zero_addr(wrqu->ap_addr.sa_data);
 
         IPW_DEBUG_WX("Getting WAP BSSID: %pM\n", wrqu->ap_addr.sa_data);
         return 0;
@@ -8300,7 +8300,7 @@ static void ipw2100_wx_event_work(struct work_struct *work)
             priv->status & STATUS_RF_KILL_MASK ||
             ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID,
                                 &priv->bssid, &len)) {
-                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+                eth_zero_addr(wrqu.ap_addr.sa_data);
         } else {
                 /* We now have the BSSID, so can finish setting to the full
                  * associated state */
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 67cad9b05ad8..39f3e6f5cbcd 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -1964,7 +1964,7 @@ static void notify_wx_assoc_event(struct ipw_priv *priv)
         if (priv->status & STATUS_ASSOCIATED)
                 memcpy(wrqu.ap_addr.sa_data, priv->bssid, ETH_ALEN);
         else
-                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+                eth_zero_addr(wrqu.ap_addr.sa_data);
         wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
 }
 
@@ -7400,7 +7400,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
         memcpy(priv->assoc_request.bssid, network->bssid, ETH_ALEN);
 
         if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
-                memset(&priv->assoc_request.dest, 0xFF, ETH_ALEN);
+                eth_broadcast_addr(priv->assoc_request.dest);
                 priv->assoc_request.atim_window = cpu_to_le16(network->atim_window);
         } else {
                 memcpy(priv->assoc_request.dest, network->bssid, ETH_ALEN);
@@ -8986,7 +8986,7 @@ static int ipw_wx_get_wap(struct net_device *dev,
                 wrqu->ap_addr.sa_family = ARPHRD_ETHER;
                 memcpy(wrqu->ap_addr.sa_data, priv->bssid, ETH_ALEN);
         } else
-                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+                eth_zero_addr(wrqu->ap_addr.sa_data);
 
         IPW_DEBUG_WX("Getting WAP BSSID: %pM\n",
                      wrqu->ap_addr.sa_data);
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index eaaeea19d8c5..bac60b2bc3f0 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -1678,7 +1678,7 @@ il4965_rs_stay_in_table(struct il_lq_sta *lq_sta, bool force_search)
                     lq_sta->total_success > lq_sta->max_success_limit ||
                     (!lq_sta->search_better_tbl && lq_sta->flush_timer &&
                      flush_interval_passed)) {
-                        D_RATE("LQ: stay is expired %d %d %d\n:",
+                        D_RATE("LQ: stay is expired %d %d %d\n",
                                lq_sta->total_failed, lq_sta->total_success,
                                flush_interval_passed);
 
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 2c4fa49686ef..887114582583 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4634,7 +4634,7 @@ il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
         il->vif = NULL;
         il->iw_mode = NL80211_IFTYPE_UNSPECIFIED;
         il_teardown_interface(il, vif);
-        memset(il->bssid, 0, ETH_ALEN);
+        eth_zero_addr(il->bssid);
 
         D_MAC80211("leave\n");
         mutex_unlock(&il->mutex);
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index cceb026e0793..5abd62ed8cb4 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1130,20 +1130,23 @@ done:
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif,
-                                     enum ieee80211_rssi_event rssi_event)
+static void iwlagn_mac_event_callback(struct ieee80211_hw *hw,
+                                      struct ieee80211_vif *vif,
+                                      const struct ieee80211_event *event)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
+        if (event->type != RSSI_EVENT)
+                return;
+
         IWL_DEBUG_MAC80211(priv, "enter\n");
         mutex_lock(&priv->mutex);
 
         if (priv->lib->bt_params &&
             priv->lib->bt_params->advanced_bt_coexist) {
-                if (rssi_event == RSSI_EVENT_LOW)
+                if (event->u.rssi.data == RSSI_EVENT_LOW)
                         priv->bt_enable_pspoll = true;
-                else if (rssi_event == RSSI_EVENT_HIGH)
+                else if (event->u.rssi.data == RSSI_EVENT_HIGH)
                         priv->bt_enable_pspoll = false;
 
                 iwlagn_send_advance_bt_config(priv);
@@ -1614,7 +1617,7 @@ const struct ieee80211_ops iwlagn_hw_ops = {
         .channel_switch = iwlagn_mac_channel_switch,
         .flush = iwlagn_mac_flush,
         .tx_last_beacon = iwlagn_mac_tx_last_beacon,
-        .rssi_callback = iwlagn_mac_rssi_callback,
+        .event_callback = iwlagn_mac_event_callback,
         .set_tim = iwlagn_mac_set_tim,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index c4d6dd7402d9..234e30f498b2 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1549,7 +1549,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
                                       table.blink1, table.blink2, table.ilink1,
                                       table.ilink2, table.bcon_time, table.gp1,
                                       table.gp2, table.gp3, table.ucode_ver,
-                                      table.hw_ver, table.brd_ver);
+                                      table.hw_ver, 0, table.brd_ver);
         IWL_ERR(priv, "0x%08X | %-28s\n", table.error_id,
                 desc_lookup(table.error_id));
         IWL_ERR(priv, "0x%08X | uPc\n", table.pc);
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index 32b78a66536d..3bd7c86e90d9 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -3153,12 +3153,13 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
         desc += sprintf(buff+desc, "lq type %s\n",
            (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
         if (is_Ht(tbl->lq_type)) {
-                desc += sprintf(buff+desc, " %s",
+                desc += sprintf(buff + desc, " %s",
                    (is_siso(tbl->lq_type)) ? "SISO" :
                    ((is_mimo2(tbl->lq_type)) ? "MIMO2" : "MIMO3"));
-                   desc += sprintf(buff+desc, " %s",
+                desc += sprintf(buff + desc, " %s",
                    (tbl->is_ht40) ? "40MHz" : "20MHz");
-                   desc += sprintf(buff+desc, " %s %s %s\n", (tbl->is_SGI) ? "SGI" : "",
+                desc += sprintf(buff + desc, " %s %s %s\n",
+                   (tbl->is_SGI) ? "SGI" : "",
                    (lq_sta->is_green) ? "GF enabled" : "",
                    (lq_sta->is_agg) ? "AGG on" : "");
         }
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index 1e40a12de077..275df12a6045 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -189,9 +189,9 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
                 rate_flags |= RATE_MCS_CCK_MSK;
 
         /* Set up antennas */
-         if (priv->lib->bt_params &&
-             priv->lib->bt_params->advanced_bt_coexist &&
-             priv->bt_full_concurrent) {
+        if (priv->lib->bt_params &&
+            priv->lib->bt_params->advanced_bt_coexist &&
+            priv->bt_full_concurrent) {
                 /* operated as 1x1 in full concurrency mode */
                 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
                                 first_antenna(priv->nvm_data->valid_tx_ant));
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 97e38d2e2983..36e786f0387b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -69,16 +69,16 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL7260_UCODE_API_MAX   12
-#define IWL3160_UCODE_API_MAX   12
+#define IWL7260_UCODE_API_MAX   13
+#define IWL3160_UCODE_API_MAX   13
 
 /* Oldest version we won't warn about */
-#define IWL7260_UCODE_API_OK    10
-#define IWL3160_UCODE_API_OK    10
+#define IWL7260_UCODE_API_OK    12
+#define IWL3160_UCODE_API_OK    12
 
 /* Lowest firmware API version supported */
-#define IWL7260_UCODE_API_MIN   9
-#define IWL3160_UCODE_API_MIN   9
+#define IWL7260_UCODE_API_MIN   10
+#define IWL3160_UCODE_API_MIN   10
 
 /* NVM versions */
 #define IWL7260_NVM_VERSION             0x0a1d
diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c
index 2f7fe8167dc9..ce6321b7d241 100644
--- a/drivers/net/wireless/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-8000.c
@@ -69,13 +69,13 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL8000_UCODE_API_MAX   12
+#define IWL8000_UCODE_API_MAX   13
 
 /* Oldest version we won't warn about */
-#define IWL8000_UCODE_API_OK    10
+#define IWL8000_UCODE_API_OK    12
 
 /* Lowest firmware API version supported */
-#define IWL8000_UCODE_API_MIN   9
+#define IWL8000_UCODE_API_MIN   10
 
 /* NVM versions */
 #define IWL8000_NVM_VERSION             0x0a1d
@@ -94,8 +94,8 @@
         IWL8000_FW_PRE "-" __stringify(api) ".ucode"
 
 #define NVM_HW_SECTION_NUM_FAMILY_8000          10
-#define DEFAULT_NVM_FILE_FAMILY_8000A           "iwl_nvm_8000.bin"
-#define DEFAULT_NVM_FILE_FAMILY_8000            "iwl_nvm_8000B.bin"
+#define DEFAULT_NVM_FILE_FAMILY_8000B           "nvmData-8000B"
+#define DEFAULT_NVM_FILE_FAMILY_8000C           "nvmData-8000C"
 
 /* Max SDIO RX aggregation size of the ADDBA request/response */
 #define MAX_RX_AGG_SIZE_8260_SDIO       28
@@ -177,8 +177,8 @@ const struct iwl_cfg iwl8260_2ac_sdio_cfg = {
         .ht_params = &iwl8000_ht_params,
         .nvm_ver = IWL8000_NVM_VERSION,
         .nvm_calib_ver = IWL8000_TX_POWER_VERSION,
-        .default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,
-        .default_nvm_file_8000A = DEFAULT_NVM_FILE_FAMILY_8000A,
+        .default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,
+        .default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,
         .max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,
         .disable_dummy_notification = true,
         .max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,
@@ -192,8 +192,8 @@ const struct iwl_cfg iwl4165_2ac_sdio_cfg = {
         .ht_params = &iwl8000_ht_params,
         .nvm_ver = IWL8000_NVM_VERSION,
         .nvm_calib_ver = IWL8000_TX_POWER_VERSION,
-        .default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,
-        .default_nvm_file_8000A = DEFAULT_NVM_FILE_FAMILY_8000A,
+        .default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,
+        .default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,
         .max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,
         .bt_shared_single_ant = true,
         .disable_dummy_notification = true,
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 4b190d98a1ec..3f33f753ce2f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -92,9 +92,9 @@ static inline bool iwl_has_secure_boot(u32 hw_rev,
 {
         /* return 1 only for family 8000 B0 */
         if ((family == IWL_DEVICE_FAMILY_8000) && (hw_rev & 0xC))
-                return 1;
+                return true;
 
-        return 0;
+        return false;
 }
 
 /*
@@ -228,7 +228,7 @@ struct iwl_pwr_tx_backoff {
 
 /**
  * struct iwl_cfg
- * @name: Offical name of the device
+ * @name: Official name of the device
  * @fw_name_pre: Firmware filename prefix. The api version and extension
  *      (.ucode) will be added to filename before loading from disk. The
  *      filename is constructed as fw_name_pre<api>.ucode.
@@ -303,8 +303,8 @@ struct iwl_cfg {
         bool lp_xtal_workaround;
         const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;
         bool no_power_up_nic_in_init;
-        const char *default_nvm_file;
-        const char *default_nvm_file_8000A;
+        const char *default_nvm_file_B_step;
+        const char *default_nvm_file_C_step;
         unsigned int max_rx_agg_size;
         bool disable_dummy_notification;
         unsigned int max_tx_agg_size;
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index 684254553558..9bb36d79c2bd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -157,6 +157,7 @@ do {                                            			\
 /* 0x0000F000 - 0x00001000 */
 #define IWL_DL_ASSOC            0x00001000
 #define IWL_DL_DROP             0x00002000
+#define IWL_DL_LAR              0x00004000
 #define IWL_DL_COEX             0x00008000
 /* 0x000F0000 - 0x00010000 */
 #define IWL_DL_FW               0x00010000
@@ -219,5 +220,6 @@ do {                                            			\
 #define IWL_DEBUG_POWER(p, f, a...)     IWL_DEBUG(p, IWL_DL_POWER, f, ## a)
 #define IWL_DEBUG_11H(p, f, a...)       IWL_DEBUG(p, IWL_DL_11H, f, ## a)
 #define IWL_DEBUG_RPM(p, f, a...)       IWL_DEBUG(p, IWL_DL_RPM, f, ## a)
+#define IWL_DEBUG_LAR(p, f, a...)       IWL_DEBUG(p, IWL_DL_LAR, f, ## a)
 
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
index 6cb66a988271..223b8752f924 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
@@ -116,11 +116,11 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
         TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low,
                  u32 data1, u32 data2, u32 line, u32 blink1,
                  u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,
-                 u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,
+                 u32 gp1, u32 gp2, u32 gp3, u32 major, u32 minor, u32 hw_ver,
                  u32 brd_ver),
         TP_ARGS(dev, desc, tsf_low, data1, data2, line,
                 blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,
-                gp3, ucode_ver, hw_ver, brd_ver),
+                gp3, major, minor, hw_ver, brd_ver),
         TP_STRUCT__entry(
                 DEV_ENTRY
                 __field(u32, desc)
@@ -136,7 +136,8 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
                 __field(u32, gp1)
                 __field(u32, gp2)
                 __field(u32, gp3)
-                __field(u32, ucode_ver)
+                __field(u32, major)
+                __field(u32, minor)
                 __field(u32, hw_ver)
                 __field(u32, brd_ver)
         ),
@@ -155,21 +156,22 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
                 __entry->gp1 = gp1;
                 __entry->gp2 = gp2;
                 __entry->gp3 = gp3;
-                __entry->ucode_ver = ucode_ver;
+                __entry->major = major;
+                __entry->minor = minor;
                 __entry->hw_ver = hw_ver;
                 __entry->brd_ver = brd_ver;
         ),
         TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, "
                   "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "
-                  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X "
-                  "hw 0x%08X brd 0x%08X",
+                  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X major 0x%08X "
+                  "minor 0x%08X hw 0x%08X brd 0x%08X",
                   __get_str(dev), __entry->desc, __entry->tsf_low,
                   __entry->data1,
                   __entry->data2, __entry->line, __entry->blink1,
                   __entry->blink2, __entry->ilink1, __entry->ilink2,
                   __entry->bcon_time, __entry->gp1, __entry->gp2,
-                  __entry->gp3, __entry->ucode_ver, __entry->hw_ver,
-                  __entry->brd_ver)
+                  __entry->gp3, __entry->major, __entry->minor,
+                  __entry->hw_ver, __entry->brd_ver)
 );
 
 TRACE_EVENT(iwlwifi_dev_ucode_event,
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index c7154ac42c8c..7267152e7dc7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -145,7 +145,7 @@ static struct iwlwifi_opmode_table {
 #define IWL_DEFAULT_SCAN_CHANNELS 40
 
 /*
- * struct fw_sec: Just for the image parsing proccess.
+ * struct fw_sec: Just for the image parsing process.
  * For the fw storage we are using struct fw_desc.
  */
 struct fw_sec {
@@ -175,6 +175,8 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv)
         kfree(drv->fw.dbg_dest_tlv);
         for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_conf_tlv); i++)
                 kfree(drv->fw.dbg_conf_tlv[i]);
+        for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_trigger_tlv); i++)
+                kfree(drv->fw.dbg_trigger_tlv[i]);
 
         for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)
                 iwl_free_fw_img(drv, drv->fw.img + i);
@@ -239,16 +241,10 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
          * previous name and uses the new format.
          */
         if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
-                char rev_step[2] = {
-                        'A' + CSR_HW_REV_STEP(drv->trans->hw_rev), 0
-                };
-
-                /* A-step doesn't have an indication */
-                if (CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_A_STEP)
-                        rev_step[0] = 0;
+                char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev);
 
                 snprintf(drv->firmware_name, sizeof(drv->firmware_name),
-                         "%s%s-%s.ucode", name_pre, rev_step, tag);
+                         "%s%c-%s.ucode", name_pre, rev_step, tag);
         }
 
         IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n",
@@ -293,8 +289,10 @@ struct iwl_firmware_pieces {
 
         /* FW debug data parsed for driver usage */
         struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;
-        struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_MAX];
-        size_t dbg_conf_tlv_len[FW_DBG_MAX];
+        struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];
+        size_t dbg_conf_tlv_len[FW_DBG_CONF_MAX];
+        struct iwl_fw_dbg_trigger_tlv *dbg_trigger_tlv[FW_DBG_TRIGGER_MAX];
+        size_t dbg_trigger_tlv_len[FW_DBG_TRIGGER_MAX];
 };
 
 /*
@@ -842,6 +840,23 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                         capa->n_scan_channels =
                                 le32_to_cpup((__le32 *)tlv_data);
                         break;
+                case IWL_UCODE_TLV_FW_VERSION: {
+                        __le32 *ptr = (void *)tlv_data;
+                        u32 major, minor;
+                        u8 local_comp;
+
+                        if (tlv_len != sizeof(u32) * 3)
+                                goto invalid_tlv_len;
+
+                        major = le32_to_cpup(ptr++);
+                        minor = le32_to_cpup(ptr++);
+                        local_comp = le32_to_cpup(ptr);
+
+                        snprintf(drv->fw.fw_version,
+                                 sizeof(drv->fw.fw_version), "%u.%u.%u",
+                                 major, minor, local_comp);
+                        break;
+                        }
                 case IWL_UCODE_TLV_FW_DBG_DEST: {
                         struct iwl_fw_dbg_dest_tlv *dest = (void *)tlv_data;
 
@@ -897,6 +912,31 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                         pieces->dbg_conf_tlv_len[conf->id] = tlv_len;
                         break;
                         }
+                case IWL_UCODE_TLV_FW_DBG_TRIGGER: {
+                        struct iwl_fw_dbg_trigger_tlv *trigger =
+                                (void *)tlv_data;
+                        u32 trigger_id = le32_to_cpu(trigger->id);
+
+                        if (trigger_id >= ARRAY_SIZE(drv->fw.dbg_trigger_tlv)) {
+                                IWL_ERR(drv,
+                                        "Skip unknown trigger: %u\n",
+                                        trigger->id);
+                                break;
+                        }
+
+                        if (pieces->dbg_trigger_tlv[trigger_id]) {
+                                IWL_ERR(drv,
+                                        "Ignore duplicate dbg trigger %u\n",
+                                        trigger->id);
+                                break;
+                        }
+
+                        IWL_INFO(drv, "Found debug trigger: %u\n", trigger->id);
+
+                        pieces->dbg_trigger_tlv[trigger_id] = trigger;
+                        pieces->dbg_trigger_tlv_len[trigger_id] = tlv_len;
+                        break;
+                        }
                 case IWL_UCODE_TLV_SEC_RT_USNIFFER:
                         usniffer_images = true;
                         iwl_store_ucode_sec(pieces, tlv_data,
@@ -968,34 +1008,34 @@ static int validate_sec_sizes(struct iwl_drv *drv,
 
         /* Verify that uCode images will fit in card's SRAM. */
         if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_INST) >
-                                                        cfg->max_inst_size) {
+            cfg->max_inst_size) {
                 IWL_ERR(drv, "uCode instr len %Zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_REGULAR,
-                                                IWL_UCODE_SECTION_INST));
+                                     IWL_UCODE_SECTION_INST));
                 return -1;
         }
 
         if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_DATA) >
-                                                        cfg->max_data_size) {
+            cfg->max_data_size) {
                 IWL_ERR(drv, "uCode data len %Zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_REGULAR,
-                                                IWL_UCODE_SECTION_DATA));
+                                     IWL_UCODE_SECTION_DATA));
                 return -1;
         }
 
-         if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST) >
-                                                        cfg->max_inst_size) {
+        if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST) >
+             cfg->max_inst_size) {
                 IWL_ERR(drv, "uCode init instr len %Zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_INIT,
-                                                IWL_UCODE_SECTION_INST));
+                                     IWL_UCODE_SECTION_INST));
                 return -1;
         }
 
         if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA) >
-                                                        cfg->max_data_size) {
+            cfg->max_data_size) {
                 IWL_ERR(drv, "uCode init data len %Zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_REGULAR,
-                                                IWL_UCODE_SECTION_DATA));
+                                     IWL_UCODE_SECTION_DATA));
                 return -1;
         }
         return 0;
@@ -1062,6 +1102,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
         const unsigned int api_max = drv->cfg->ucode_api_max;
         unsigned int api_ok = drv->cfg->ucode_api_ok;
         const unsigned int api_min = drv->cfg->ucode_api_min;
+        size_t trigger_tlv_sz[FW_DBG_TRIGGER_MAX];
         u32 api_ver;
         int i;
         bool load_module = false;
@@ -1107,7 +1148,10 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
         if (err)
                 goto try_again;
 
-        api_ver = IWL_UCODE_API(drv->fw.ucode_ver);
+        if (drv->fw.ucode_capa.api[0] & IWL_UCODE_TLV_API_NEW_VERSION)
+                api_ver = drv->fw.ucode_ver;
+        else
+                api_ver = IWL_UCODE_API(drv->fw.ucode_ver);
 
         /*
          * api_ver should match the api version forming part of the
@@ -1178,6 +1222,48 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
                 }
         }
 
+        memset(&trigger_tlv_sz, 0xff, sizeof(trigger_tlv_sz));
+
+        trigger_tlv_sz[FW_DBG_TRIGGER_MISSED_BEACONS] =
+                sizeof(struct iwl_fw_dbg_trigger_missed_bcon);
+        trigger_tlv_sz[FW_DBG_TRIGGER_CHANNEL_SWITCH] = 0;
+        trigger_tlv_sz[FW_DBG_TRIGGER_FW_NOTIF] =
+                sizeof(struct iwl_fw_dbg_trigger_cmd);
+        trigger_tlv_sz[FW_DBG_TRIGGER_MLME] =
+                sizeof(struct iwl_fw_dbg_trigger_mlme);
+        trigger_tlv_sz[FW_DBG_TRIGGER_STATS] =
+                sizeof(struct iwl_fw_dbg_trigger_stats);
+        trigger_tlv_sz[FW_DBG_TRIGGER_RSSI] =
+                sizeof(struct iwl_fw_dbg_trigger_low_rssi);
+        trigger_tlv_sz[FW_DBG_TRIGGER_TXQ_TIMERS] =
+                sizeof(struct iwl_fw_dbg_trigger_txq_timer);
+        trigger_tlv_sz[FW_DBG_TRIGGER_TIME_EVENT] =
+                sizeof(struct iwl_fw_dbg_trigger_time_event);
+
+        for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_trigger_tlv); i++) {
+                if (pieces->dbg_trigger_tlv[i]) {
+                        /*
+                         * If the trigger isn't long enough, WARN and exit.
+                         * Someone is trying to debug something and he won't
+                         * be able to catch the bug he is trying to chase.
+                         * We'd better be noisy to be sure he knows what's
+                         * going on.
+                         */
+                        if (WARN_ON(pieces->dbg_trigger_tlv_len[i] <
+                                    (trigger_tlv_sz[i] +
+                                     sizeof(struct iwl_fw_dbg_trigger_tlv))))
+                                goto out_free_fw;
+                        drv->fw.dbg_trigger_tlv_len[i] =
+                                pieces->dbg_trigger_tlv_len[i];
+                        drv->fw.dbg_trigger_tlv[i] =
+                                kmemdup(pieces->dbg_trigger_tlv[i],
+                                        drv->fw.dbg_trigger_tlv_len[i],
+                                        GFP_KERNEL);
+                        if (!drv->fw.dbg_trigger_tlv[i])
+                                goto out_free_fw;
+                }
+        }
+
         /* Now that we can no longer fail, copy information */
 
         /*
@@ -1485,6 +1571,10 @@ module_param_named(d0i3_disable, iwlwifi_mod_params.d0i3_disable,
                    bool, S_IRUGO);
 MODULE_PARM_DESC(d0i3_disable, "disable d0i3 functionality (default: Y)");
 
+module_param_named(lar_disable, iwlwifi_mod_params.lar_disable,
+                   bool, S_IRUGO);
+MODULE_PARM_DESC(lar_disable, "disable LAR functionality (default: N)");
+
 module_param_named(uapsd_disable, iwlwifi_mod_params.uapsd_disable,
                    bool, S_IRUGO | S_IWUSR);
 #ifdef CONFIG_IWLWIFI_UAPSD
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h
index adf522c756e6..cda746b33db1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.h
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.h
@@ -68,7 +68,7 @@
 
 /* for all modules */
 #define DRV_NAME        "iwlwifi"
-#define DRV_COPYRIGHT   "Copyright(c) 2003- 2014 Intel Corporation"
+#define DRV_COPYRIGHT   "Copyright(c) 2003- 2015 Intel Corporation"
 #define DRV_AUTHOR     "<ilw@linux.intel.com>"
 
 /* radio config bits (actual values from NVM definition) */
@@ -123,7 +123,7 @@ struct iwl_cfg;
  * starts the driver: fetches the firmware. This should be called by bus
  * specific system flows implementations. For example, the bus specific probe
  * function should do bus related operations only, and then call to this
- * function. It returns the driver object or %NULL if an error occured.
+ * function. It returns the driver object or %NULL if an error occurred.
  */
 struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
                               const struct iwl_cfg *cfg);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
index f0548b8a64b0..5234a0bf11e4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
@@ -94,6 +94,7 @@ struct iwl_nvm_data {
         u32 nvm_version;
         s8 max_tx_pwr_half_dbm;
 
+        bool lar_enabled;
         struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
         struct ieee80211_channel channels[];
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
index 25d0105741db..219ca8acca62 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
@@ -248,7 +248,7 @@ static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
         otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
         if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
                 /* stop in this case */
-                /* set the uncorrectable OTP ECC bit for acknowledgement */
+                /* set the uncorrectable OTP ECC bit for acknowledgment */
                 iwl_set_bit(trans, CSR_OTP_GP_REG,
                             CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
                 IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");
@@ -256,7 +256,7 @@ static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
         }
         if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
                 /* continue in this case */
-                /* set the correctable OTP ECC bit for acknowledgement */
+                /* set the correctable OTP ECC bit for acknowledgment */
                 iwl_set_bit(trans, CSR_OTP_GP_REG,
                             CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
                 IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 1f7f15eb86da..d45dc021cda2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -445,7 +445,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl)
 #define RX_LOW_WATERMARK 8
 
 /**
- * struct iwl_rb_status - reseve buffer status
+ * struct iwl_rb_status - reserve buffer status
  *      host memory mapped FH registers
  * @closed_rb_num [0:11] - Indicates the index of the RB which was closed
  * @closed_fr_num [0:11] - Indicates the index of the RX Frame which was closed
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
index 919a2548a92c..251bf8dc4a12 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
@@ -82,6 +82,8 @@
  *      sections like this in a single file.
  * @IWL_FW_ERROR_DUMP_FH_REGS: range of FH registers
  * @IWL_FW_ERROR_DUMP_MEM: chunk of memory
+ * @IWL_FW_ERROR_DUMP_ERROR_INFO: description of what triggered this dump.
+ *      Structured as &struct iwl_fw_error_dump_trigger_desc.
  */
 enum iwl_fw_error_dump_type {
         /* 0 is deprecated */
@@ -94,6 +96,7 @@ enum iwl_fw_error_dump_type {
         IWL_FW_ERROR_DUMP_TXF = 7,
         IWL_FW_ERROR_DUMP_FH_REGS = 8,
         IWL_FW_ERROR_DUMP_MEM = 9,
+        IWL_FW_ERROR_DUMP_ERROR_INFO = 10,
 
         IWL_FW_ERROR_DUMP_MAX,
 };
@@ -180,7 +183,7 @@ struct iwl_fw_error_dump_info {
  * struct iwl_fw_error_dump_fw_mon - FW monitor data
  * @fw_mon_wr_ptr: the position of the write pointer in the cyclic buffer
  * @fw_mon_base_ptr: base pointer of the data
- * @fw_mon_cycle_cnt: number of wrap arounds
+ * @fw_mon_cycle_cnt: number of wraparounds
  * @reserved: for future use
  * @data: captured data
  */
@@ -230,4 +233,53 @@ iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data)
         return (void *)(data->data + le32_to_cpu(data->len));
 }
 
+/**
+ * enum iwl_fw_dbg_trigger - triggers available
+ *
+ * @FW_DBG_TRIGGER_USER: trigger log collection by user
+ *      This should not be defined as a trigger to the driver, but a value the
+ *      driver should set to indicate that the trigger was initiated by the
+ *      user.
+ * @FW_DBG_TRIGGER_FW_ASSERT: trigger log collection when the firmware asserts
+ * @FW_DBG_TRIGGER_MISSED_BEACONS: trigger log collection when beacons are
+ *      missed.
+ * @FW_DBG_TRIGGER_CHANNEL_SWITCH: trigger log collection upon channel switch.
+ * @FW_DBG_TRIGGER_FW_NOTIF: trigger log collection when the firmware sends a
+ *      command response or a notification.
+ * @FW_DBG_TRIGGER_MLME: trigger log collection upon MLME event.
+ * @FW_DBG_TRIGGER_STATS: trigger log collection upon statistics threshold.
+ * @FW_DBG_TRIGGER_RSSI: trigger log collection when the rssi of the beacon
+ *      goes below a threshold.
+ * @FW_DBG_TRIGGER_TXQ_TIMERS: configures the timers for the Tx queue hang
+ *      detection.
+ * @FW_DBG_TRIGGER_TIME_EVENT: trigger log collection upon time events related
+ *      events.
+ */
+enum iwl_fw_dbg_trigger {
+        FW_DBG_TRIGGER_INVALID = 0,
+        FW_DBG_TRIGGER_USER,
+        FW_DBG_TRIGGER_FW_ASSERT,
+        FW_DBG_TRIGGER_MISSED_BEACONS,
+        FW_DBG_TRIGGER_CHANNEL_SWITCH,
+        FW_DBG_TRIGGER_FW_NOTIF,
+        FW_DBG_TRIGGER_MLME,
+        FW_DBG_TRIGGER_STATS,
+        FW_DBG_TRIGGER_RSSI,
+        FW_DBG_TRIGGER_TXQ_TIMERS,
+        FW_DBG_TRIGGER_TIME_EVENT,
+
+        /* must be last */
+        FW_DBG_TRIGGER_MAX,
+};
+
+/**
+ * struct iwl_fw_error_dump_trigger_desc - describes the trigger condition
+ * @type: %enum iwl_fw_dbg_trigger
+ * @data: raw data about what happened
+ */
+struct iwl_fw_error_dump_trigger_desc {
+        __le32 type;
+        u8 data[];
+};
+
 #endif /* __fw_error_dump_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
index 016d91384681..bfdf3faa6c47 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -66,6 +66,7 @@
 #define __iwl_fw_file_h__
 
 #include <linux/netdevice.h>
+#include <linux/nl80211.h>
 
 /* v1/v2 uCode file layout */
 struct iwl_ucode_header {
@@ -133,8 +134,10 @@ enum iwl_ucode_tlv_type {
         IWL_UCODE_TLV_N_SCAN_CHANNELS           = 31,
         IWL_UCODE_TLV_SEC_RT_USNIFFER   = 34,
         IWL_UCODE_TLV_SDIO_ADMA_ADDR    = 35,
+        IWL_UCODE_TLV_FW_VERSION        = 36,
         IWL_UCODE_TLV_FW_DBG_DEST       = 38,
         IWL_UCODE_TLV_FW_DBG_CONF       = 39,
+        IWL_UCODE_TLV_FW_DBG_TRIGGER    = 40,
 };
 
 struct iwl_ucode_tlv {
@@ -156,7 +159,8 @@ struct iwl_tlv_ucode_header {
         __le32 zero;
         __le32 magic;
         u8 human_readable[FW_VER_HUMAN_READABLE_SZ];
-        __le32 ver;             /* major/minor/API/serial */
+        /* major/minor/API/serial or major in new format */
+        __le32 ver;
         __le32 build;
         __le64 ignore;
         /*
@@ -187,7 +191,7 @@ struct iwl_ucode_capa {
  * enum iwl_ucode_tlv_flag - ucode API flags
  * @IWL_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously
  *      was a separate TLV but moved here to save space.
- * @IWL_UCODE_TLV_FLAGS_NEWSCAN: new uCode scan behaviour on hidden SSID,
+ * @IWL_UCODE_TLV_FLAGS_NEWSCAN: new uCode scan behavior on hidden SSID,
  *      treats good CRC threshold as a boolean
  * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
  * @IWL_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.
@@ -236,11 +240,9 @@ enum iwl_ucode_tlv_flag {
 /**
  * enum iwl_ucode_tlv_api - ucode api
  * @IWL_UCODE_TLV_API_BT_COEX_SPLIT: new API for BT Coex
- * @IWL_UCODE_TLV_API_DISABLE_STA_TX: ucode supports tx_disable bit.
- * @IWL_UCODE_TLV_API_LMAC_SCAN: This ucode uses LMAC unified scan API.
- * @IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF: ucode supports disabling dummy notif.
  * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time
  *      longer than the passive one, which is essential for fragmented scan.
+ * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source.
  * IWL_UCODE_TLV_API_HDC_PHASE_0: ucode supports finer configuration of LTR
  * @IWL_UCODE_TLV_API_BASIC_DWELL: use only basic dwell time in scan command,
  *      regardless of the band or the number of the probes. FW will calculate
@@ -250,19 +252,21 @@ enum iwl_ucode_tlv_flag {
  * @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too.
  * @IWL_UCODE_TLV_API_ASYNC_DTM: Async temperature notifications are supported.
  * @IWL_UCODE_TLV_API_LQ_SS_PARAMS: Configure STBC/BFER via LQ CMD ss_params
+ * @IWL_UCODE_TLV_API_STATS_V10: uCode supports/uses statistics API version 10
+ * @IWL_UCODE_TLV_API_NEW_VERSION: new versioning format
  */
 enum iwl_ucode_tlv_api {
         IWL_UCODE_TLV_API_BT_COEX_SPLIT         = BIT(3),
-        IWL_UCODE_TLV_API_DISABLE_STA_TX        = BIT(5),
-        IWL_UCODE_TLV_API_LMAC_SCAN             = BIT(6),
-        IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF     = BIT(7),
         IWL_UCODE_TLV_API_FRAGMENTED_SCAN       = BIT(8),
+        IWL_UCODE_TLV_API_WIFI_MCC_UPDATE       = BIT(9),
         IWL_UCODE_TLV_API_HDC_PHASE_0           = BIT(10),
         IWL_UCODE_TLV_API_BASIC_DWELL           = BIT(13),
         IWL_UCODE_TLV_API_SCD_CFG               = BIT(15),
         IWL_UCODE_TLV_API_SINGLE_SCAN_EBS       = BIT(16),
         IWL_UCODE_TLV_API_ASYNC_DTM             = BIT(17),
         IWL_UCODE_TLV_API_LQ_SS_PARAMS          = BIT(18),
+        IWL_UCODE_TLV_API_STATS_V10             = BIT(19),
+        IWL_UCODE_TLV_API_NEW_VERSION           = BIT(20),
 };
 
 /**
@@ -284,6 +288,13 @@ enum iwl_ucode_tlv_api {
  *      which also implies support for the scheduler configuration command
  * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching
  * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command
+ * @IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS: support radio and beacon statistics
+ * @IWL_UCODE_TLV_CAPA_BT_COEX_PLCR: enabled BT Coex packet level co-running
+ * @IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC: ucode supports LAR updates with different
+ *      sources for the MCC. This TLV bit is a future replacement to
+ *      IWL_UCODE_TLV_API_WIFI_MCC_UPDATE. When either is set, multi-source LAR
+ *      is supported.
+ * @IWL_UCODE_TLV_CAPA_BT_COEX_RRC: supports BT Coex RRC
  */
 enum iwl_ucode_tlv_capa {
         IWL_UCODE_TLV_CAPA_D0I3_SUPPORT                 = BIT(0),
@@ -298,6 +309,10 @@ enum iwl_ucode_tlv_capa {
         IWL_UCODE_TLV_CAPA_DQA_SUPPORT                  = BIT(12),
         IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH          = BIT(13),
         IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT              = BIT(18),
+        IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS           = BIT(22),
+        IWL_UCODE_TLV_CAPA_BT_COEX_PLCR                 = BIT(28),
+        IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC                = BIT(29),
+        IWL_UCODE_TLV_CAPA_BT_COEX_RRC                  = BIT(30),
 };
 
 /* The default calibrate table size if not specified by firmware file */
@@ -450,44 +465,207 @@ struct iwl_fw_dbg_conf_hcmd {
 } __packed;
 
 /**
- * struct iwl_fw_dbg_trigger - a TLV that describes a debug configuration
+ * enum iwl_fw_dbg_trigger_mode - triggers functionalities
  *
- * @enabled: is this trigger enabled
- * @reserved:
- * @len: length, in bytes, of the %trigger field
- * @trigger: pointer to a trigger struct
+ * @IWL_FW_DBG_TRIGGER_START: when trigger occurs re-conf the dbg mechanism
+ * @IWL_FW_DBG_TRIGGER_STOP: when trigger occurs pull the dbg data
  */
-struct iwl_fw_dbg_trigger {
-        u8 enabled;
-        u8 reserved;
-        u8 len;
-        u8 trigger[0];
+enum iwl_fw_dbg_trigger_mode {
+        IWL_FW_DBG_TRIGGER_START = BIT(0),
+        IWL_FW_DBG_TRIGGER_STOP = BIT(1),
+};
+
+/**
+ * enum iwl_fw_dbg_trigger_vif_type - define the VIF type for a trigger
+ * @IWL_FW_DBG_CONF_VIF_ANY: any vif type
+ * @IWL_FW_DBG_CONF_VIF_IBSS: IBSS mode
+ * @IWL_FW_DBG_CONF_VIF_STATION: BSS mode
+ * @IWL_FW_DBG_CONF_VIF_AP: AP mode
+ * @IWL_FW_DBG_CONF_VIF_P2P_CLIENT: P2P Client mode
+ * @IWL_FW_DBG_CONF_VIF_P2P_GO: P2P GO mode
+ * @IWL_FW_DBG_CONF_VIF_P2P_DEVICE: P2P device
+ */
+enum iwl_fw_dbg_trigger_vif_type {
+        IWL_FW_DBG_CONF_VIF_ANY = NL80211_IFTYPE_UNSPECIFIED,
+        IWL_FW_DBG_CONF_VIF_IBSS = NL80211_IFTYPE_ADHOC,
+        IWL_FW_DBG_CONF_VIF_STATION = NL80211_IFTYPE_STATION,
+        IWL_FW_DBG_CONF_VIF_AP = NL80211_IFTYPE_AP,
+        IWL_FW_DBG_CONF_VIF_P2P_CLIENT = NL80211_IFTYPE_P2P_CLIENT,
+        IWL_FW_DBG_CONF_VIF_P2P_GO = NL80211_IFTYPE_P2P_GO,
+        IWL_FW_DBG_CONF_VIF_P2P_DEVICE = NL80211_IFTYPE_P2P_DEVICE,
+};
+
+/**
+ * struct iwl_fw_dbg_trigger_tlv - a TLV that describes the trigger
+ * @id: %enum iwl_fw_dbg_trigger
+ * @vif_type: %enum iwl_fw_dbg_trigger_vif_type
+ * @stop_conf_ids: bitmap of configurations this trigger relates to.
+ *      if the mode is %IWL_FW_DBG_TRIGGER_STOP, then if the bit corresponding
+ *      to the currently running configuration is set, the data should be
+ *      collected.
+ * @stop_delay: how many milliseconds to wait before collecting the data
+ *      after the STOP trigger fires.
+ * @mode: %enum iwl_fw_dbg_trigger_mode - can be stop / start of both
+ * @start_conf_id: if mode is %IWL_FW_DBG_TRIGGER_START, this defines what
+ *      configuration should be applied when the triggers kicks in.
+ * @occurrences: number of occurrences. 0 means the trigger will never fire.
+ */
+struct iwl_fw_dbg_trigger_tlv {
+        __le32 id;
+        __le32 vif_type;
+        __le32 stop_conf_ids;
+        __le32 stop_delay;
+        u8 mode;
+        u8 start_conf_id;
+        __le16 occurrences;
+        __le32 reserved[2];
+
+        u8 data[0];
 } __packed;
 
+#define FW_DBG_START_FROM_ALIVE 0
+#define FW_DBG_CONF_MAX         32
+#define FW_DBG_INVALID          0xff
+
 /**
- * enum iwl_fw_dbg_conf - configurations available
- *
- * @FW_DBG_CUSTOM: take this configuration from alive
- *      Note that the trigger is NO-OP for this configuration
+ * struct iwl_fw_dbg_trigger_missed_bcon - configures trigger for missed beacons
+ * @stop_consec_missed_bcon: stop recording if threshold is crossed.
+ * @stop_consec_missed_bcon_since_rx: stop recording if threshold is crossed.
+ * @start_consec_missed_bcon: start recording if threshold is crossed.
+ * @start_consec_missed_bcon_since_rx: start recording if threshold is crossed.
+ * @reserved1: reserved
+ * @reserved2: reserved
  */
-enum iwl_fw_dbg_conf {
-        FW_DBG_CUSTOM = 0,
+struct iwl_fw_dbg_trigger_missed_bcon {
+        __le32 stop_consec_missed_bcon;
+        __le32 stop_consec_missed_bcon_since_rx;
+        __le32 reserved2[2];
+        __le32 start_consec_missed_bcon;
+        __le32 start_consec_missed_bcon_since_rx;
+        __le32 reserved1[2];
+} __packed;
 
-        /* must be last */
-        FW_DBG_MAX,
-        FW_DBG_INVALID = 0xff,
-};
+/**
+ * struct iwl_fw_dbg_trigger_cmd - configures trigger for messages from FW.
+ * cmds: the list of commands to trigger the collection on
+ */
+struct iwl_fw_dbg_trigger_cmd {
+        struct cmd {
+                u8 cmd_id;
+                u8 group_id;
+        } __packed cmds[16];
+} __packed;
+
+/**
+ * iwl_fw_dbg_trigger_stats - configures trigger for statistics
+ * @stop_offset: the offset of the value to be monitored
+ * @stop_threshold: the threshold above which to collect
+ * @start_offset: the offset of the value to be monitored
+ * @start_threshold: the threshold above which to start recording
+ */
+struct iwl_fw_dbg_trigger_stats {
+        __le32 stop_offset;
+        __le32 stop_threshold;
+        __le32 start_offset;
+        __le32 start_threshold;
+} __packed;
+
+/**
+ * struct iwl_fw_dbg_trigger_low_rssi - trigger for low beacon RSSI
+ * @rssi: RSSI value to trigger at
+ */
+struct iwl_fw_dbg_trigger_low_rssi {
+        __le32 rssi;
+} __packed;
 
 /**
- * struct iwl_fw_dbg_conf_tlv - a TLV that describes a debug configuration
+ * struct iwl_fw_dbg_trigger_mlme - configures trigger for mlme events
+ * @stop_auth_denied: number of denied authentication to collect
+ * @stop_auth_timeout: number of authentication timeout to collect
+ * @stop_rx_deauth: number of Rx deauth before to collect
+ * @stop_tx_deauth: number of Tx deauth before to collect
+ * @stop_assoc_denied: number of denied association to collect
+ * @stop_assoc_timeout: number of association timeout to collect
+ * @stop_connection_loss: number of connection loss to collect
+ * @start_auth_denied: number of denied authentication to start recording
+ * @start_auth_timeout: number of authentication timeout to start recording
+ * @start_rx_deauth: number of Rx deauth to start recording
+ * @start_tx_deauth: number of Tx deauth to start recording
+ * @start_assoc_denied: number of denied association to start recording
+ * @start_assoc_timeout: number of association timeout to start recording
+ * @start_connection_loss: number of connection loss to start recording
+ */
+struct iwl_fw_dbg_trigger_mlme {
+        u8 stop_auth_denied;
+        u8 stop_auth_timeout;
+        u8 stop_rx_deauth;
+        u8 stop_tx_deauth;
+
+        u8 stop_assoc_denied;
+        u8 stop_assoc_timeout;
+        u8 stop_connection_loss;
+        u8 reserved;
+
+        u8 start_auth_denied;
+        u8 start_auth_timeout;
+        u8 start_rx_deauth;
+        u8 start_tx_deauth;
+
+        u8 start_assoc_denied;
+        u8 start_assoc_timeout;
+        u8 start_connection_loss;
+        u8 reserved2;
+} __packed;
+
+/**
+ * struct iwl_fw_dbg_trigger_txq_timer - configures the Tx queue's timer
+ * @command_queue: timeout for the command queue in ms
+ * @bss: timeout for the queues of a BSS (except for TDLS queues) in ms
+ * @softap: timeout for the queues of a softAP in ms
+ * @p2p_go: timeout for the queues of a P2P GO in ms
+ * @p2p_client: timeout for the queues of a P2P client in ms
+ * @p2p_device: timeout for the queues of a P2P device in ms
+ * @ibss: timeout for the queues of an IBSS in ms
+ * @tdls: timeout for the queues of a TDLS station in ms
+ */
+struct iwl_fw_dbg_trigger_txq_timer {
+        __le32 command_queue;
+        __le32 bss;
+        __le32 softap;
+        __le32 p2p_go;
+        __le32 p2p_client;
+        __le32 p2p_device;
+        __le32 ibss;
+        __le32 tdls;
+        __le32 reserved[4];
+} __packed;
+
+/**
+ * struct iwl_fw_dbg_trigger_time_event - configures a time event trigger
+ * time_Events: a list of tuples <id, action_bitmap>. The driver will issue a
+ *      trigger each time a time event notification that relates to time event
+ *      id with one of the actions in the bitmap is received and
+ *      BIT(notif->status) is set in status_bitmap.
  *
- * @id: %enum iwl_fw_dbg_conf
+ */
+struct iwl_fw_dbg_trigger_time_event {
+        struct {
+                __le32 id;
+                __le32 action_bitmap;
+                __le32 status_bitmap;
+        } __packed time_events[16];
+} __packed;
+
+/**
+ * struct iwl_fw_dbg_conf_tlv - a TLV that describes a debug configuration.
+ * @id: conf id
  * @usniffer: should the uSniffer image be used
  * @num_of_hcmds: how many HCMDs to send are present here
  * @hcmd: a variable length host command to be sent to apply the configuration.
  *      If there is more than one HCMD to send, they will appear one after the
  *      other and be sent in the order that they appear in.
- * This parses IWL_UCODE_TLV_FW_DBG_CONF
+ * This parses IWL_UCODE_TLV_FW_DBG_CONF. The user can add up-to
+ * %FW_DBG_CONF_MAX configuration per run.
  */
 struct iwl_fw_dbg_conf_tlv {
         u8 id;
@@ -495,8 +673,6 @@ struct iwl_fw_dbg_conf_tlv {
         u8 reserved;
         u8 num_of_hcmds;
         struct iwl_fw_dbg_conf_hcmd hcmd;
-
-        /* struct iwl_fw_dbg_trigger sits after all variable length hcmds */
 } __packed;
 
 #endif  /* __iwl_fw_file_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index ffd785cc67d6..cf75bafae51d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -68,6 +68,7 @@
 #include <net/mac80211.h>
 
 #include "iwl-fw-file.h"
+#include "iwl-fw-error-dump.h"
 
 /**
  * enum iwl_ucode_type
@@ -157,6 +158,8 @@ struct iwl_fw_cscheme_list {
  * @dbg_dest_tlv: points to the destination TLV for debug
  * @dbg_conf_tlv: array of pointers to configuration TLVs for debug
  * @dbg_conf_tlv_len: lengths of the @dbg_conf_tlv entries
+ * @dbg_trigger_tlv: array of pointers to triggers TLVs
+ * @dbg_trigger_tlv_len: lengths of the @dbg_trigger_tlv entries
  * @dbg_dest_reg_num: num of reg_ops in %dbg_dest_tlv
  */
 struct iwl_fw {
@@ -186,9 +189,10 @@ struct iwl_fw {
         u32 sdio_adma_addr;
 
         struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;
-        struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_MAX];
-        size_t dbg_conf_tlv_len[FW_DBG_MAX];
-
+        struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];
+        size_t dbg_conf_tlv_len[FW_DBG_CONF_MAX];
+        struct iwl_fw_dbg_trigger_tlv *dbg_trigger_tlv[FW_DBG_TRIGGER_MAX];
+        size_t dbg_trigger_tlv_len[FW_DBG_TRIGGER_MAX];
         u8 dbg_dest_reg_num;
 };
 
@@ -206,46 +210,29 @@ static inline const char *get_fw_dbg_mode_string(int mode)
         }
 }
 
-static inline const struct iwl_fw_dbg_trigger *
-iwl_fw_dbg_conf_get_trigger(const struct iwl_fw *fw, u8 id)
+static inline bool
+iwl_fw_dbg_conf_usniffer(const struct iwl_fw *fw, u8 id)
 {
         const struct iwl_fw_dbg_conf_tlv *conf_tlv = fw->dbg_conf_tlv[id];
-        u8 *ptr;
-        int i;
 
         if (!conf_tlv)
-                return NULL;
-
-        ptr = (void *)&conf_tlv->hcmd;
-        for (i = 0; i < conf_tlv->num_of_hcmds; i++) {
-                ptr += sizeof(conf_tlv->hcmd);
-                ptr += le16_to_cpu(conf_tlv->hcmd.len);
-        }
-
-        return (const struct iwl_fw_dbg_trigger *)ptr;
-}
-
-static inline bool
-iwl_fw_dbg_conf_enabled(const struct iwl_fw *fw, u8 id)
-{
-        const struct iwl_fw_dbg_trigger *trigger =
-                iwl_fw_dbg_conf_get_trigger(fw, id);
-
-        if (!trigger)
                 return false;
 
-        return trigger->enabled;
+        return conf_tlv->usniffer;
 }
 
-static inline bool
-iwl_fw_dbg_conf_usniffer(const struct iwl_fw *fw, u8 id)
-{
-        const struct iwl_fw_dbg_conf_tlv *conf_tlv = fw->dbg_conf_tlv[id];
+#define iwl_fw_dbg_trigger_enabled(fw, id) ({                   \
+        void *__dbg_trigger = (fw)->dbg_trigger_tlv[(id)];      \
+        unlikely(__dbg_trigger);                                \
+})
 
-        if (!conf_tlv)
-                return false;
+static inline struct iwl_fw_dbg_trigger_tlv*
+iwl_fw_dbg_get_trigger(const struct iwl_fw *fw, u8 id)
+{
+        if (WARN_ON(id >= ARRAY_SIZE(fw->dbg_trigger_tlv)))
+                return NULL;
 
-        return conf_tlv->usniffer;
+        return fw->dbg_trigger_tlv[id];
 }
 
 #endif  /* __iwl_fw_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 03250a45272e..27c66e477833 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -186,21 +186,16 @@ IWL_EXPORT_SYMBOL(iwl_clear_bits_prph);
 
 void iwl_force_nmi(struct iwl_trans *trans)
 {
-        /*
-         * In HW previous to the 8000 HW family, and in the 8000 HW family
-         * itself when the revision step==0, the DEVICE_SET_NMI_REG is used
-         * to force an NMI. Otherwise, a different register -
-         * DEVICE_SET_NMI_8000B_REG - is used.
-         */
-        if ((trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) ||
-            (CSR_HW_REV_STEP(trans->hw_rev) == SILICON_A_STEP)) {
+        if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {
                 iwl_write_prph(trans, DEVICE_SET_NMI_REG,
                                DEVICE_SET_NMI_VAL_DRV);
                 iwl_write_prph(trans, DEVICE_SET_NMI_REG,
                                DEVICE_SET_NMI_VAL_HW);
         } else {
-                iwl_write_prph(trans, DEVICE_SET_NMI_8000B_REG,
-                               DEVICE_SET_NMI_8000B_VAL);
+                iwl_write_prph(trans, DEVICE_SET_NMI_8000_REG,
+                               DEVICE_SET_NMI_8000_VAL);
+                iwl_write_prph(trans, DEVICE_SET_NMI_REG,
+                               DEVICE_SET_NMI_VAL_DRV);
         }
 }
 IWL_EXPORT_SYMBOL(iwl_force_nmi);
diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h
index e8eabd21ccfe..ac2b90df8413 100644
--- a/drivers/net/wireless/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h
@@ -103,6 +103,7 @@ enum iwl_disable_11n {
  * @debug_level: levels are IWL_DL_*
  * @ant_coupling: antenna coupling in dB, default = 0
  * @d0i3_disable: disable d0i3, default = 1,
+ * @lar_disable: disable LAR (regulatory), default = 0
  * @fw_monitor: allow to use firmware monitor
  */
 struct iwl_mod_params {
@@ -121,6 +122,7 @@ struct iwl_mod_params {
         char *nvm_file;
         bool uapsd_disable;
         bool d0i3_disable;
+        bool lar_disable;
         bool fw_monitor;
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index c74f1a4edf23..83903a5025c2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@ -99,12 +99,15 @@ enum family_8000_nvm_offsets {
         /* NVM SW-Section offset (in words) definitions */
         NVM_SW_SECTION_FAMILY_8000 = 0x1C0,
         NVM_VERSION_FAMILY_8000 = 0,
-        RADIO_CFG_FAMILY_8000 = 2,
-        SKU_FAMILY_8000 = 4,
-        N_HW_ADDRS_FAMILY_8000 = 5,
+        RADIO_CFG_FAMILY_8000 = 0,
+        SKU_FAMILY_8000 = 2,
+        N_HW_ADDRS_FAMILY_8000 = 3,
 
         /* NVM REGULATORY -Section offset (in words) definitions */
         NVM_CHANNELS_FAMILY_8000 = 0,
+        NVM_LAR_OFFSET_FAMILY_8000_OLD = 0x4C7,
+        NVM_LAR_OFFSET_FAMILY_8000 = 0x507,
+        NVM_LAR_ENABLED_FAMILY_8000 = 0x7,
 
         /* NVM calibration section offset (in words) definitions */
         NVM_CALIB_SECTION_FAMILY_8000 = 0x2B8,
@@ -146,7 +149,9 @@ static const u8 iwl_nvm_channels_family_8000[] = {
 #define NUM_2GHZ_CHANNELS_FAMILY_8000   14
 #define FIRST_2GHZ_HT_MINUS             5
 #define LAST_2GHZ_HT_PLUS               9
-#define LAST_5GHZ_HT                    161
+#define LAST_5GHZ_HT                    165
+#define LAST_5GHZ_HT_FAMILY_8000        181
+#define N_HW_ADDR_MASK                  0xF
 
 /* rate data (static) */
 static struct ieee80211_rate iwl_cfg80211_rates[] = {
@@ -201,9 +206,57 @@ enum iwl_nvm_channel_flags {
 #define CHECK_AND_PRINT_I(x)    \
         ((ch_flags & NVM_CHANNEL_##x) ? # x " " : "")
 
+static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, bool is_5ghz,
+                                 u16 nvm_flags, const struct iwl_cfg *cfg)
+{
+        u32 flags = IEEE80211_CHAN_NO_HT40;
+        u32 last_5ghz_ht = LAST_5GHZ_HT;
+
+        if (cfg->device_family == IWL_DEVICE_FAMILY_8000)
+                last_5ghz_ht = LAST_5GHZ_HT_FAMILY_8000;
+
+        if (!is_5ghz && (nvm_flags & NVM_CHANNEL_40MHZ)) {
+                if (ch_num <= LAST_2GHZ_HT_PLUS)
+                        flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
+                if (ch_num >= FIRST_2GHZ_HT_MINUS)
+                        flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
+        } else if (ch_num <= last_5ghz_ht && (nvm_flags & NVM_CHANNEL_40MHZ)) {
+                if ((ch_idx - NUM_2GHZ_CHANNELS) % 2 == 0)
+                        flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
+                else
+                        flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
+        }
+        if (!(nvm_flags & NVM_CHANNEL_80MHZ))
+                flags |= IEEE80211_CHAN_NO_80MHZ;
+        if (!(nvm_flags & NVM_CHANNEL_160MHZ))
+                flags |= IEEE80211_CHAN_NO_160MHZ;
+
+        if (!(nvm_flags & NVM_CHANNEL_IBSS))
+                flags |= IEEE80211_CHAN_NO_IR;
+
+        if (!(nvm_flags & NVM_CHANNEL_ACTIVE))
+                flags |= IEEE80211_CHAN_NO_IR;
+
+        if (nvm_flags & NVM_CHANNEL_RADAR)
+                flags |= IEEE80211_CHAN_RADAR;
+
+        if (nvm_flags & NVM_CHANNEL_INDOOR_ONLY)
+                flags |= IEEE80211_CHAN_INDOOR_ONLY;
+
+        /* Set the GO concurrent flag only in case that NO_IR is set.
+         * Otherwise it is meaningless
+         */
+        if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT) &&
+            (flags & IEEE80211_CHAN_NO_IR))
+                flags |= IEEE80211_CHAN_GO_CONCURRENT;
+
+        return flags;
+}
+
 static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                                 struct iwl_nvm_data *data,
-                                const __le16 * const nvm_ch_flags)
+                                const __le16 * const nvm_ch_flags,
+                                bool lar_supported)
 {
         int ch_idx;
         int n_channels = 0;
@@ -228,9 +281,14 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
 
                 if (ch_idx >= num_2ghz_channels &&
                     !data->sku_cap_band_52GHz_enable)
-                        ch_flags &= ~NVM_CHANNEL_VALID;
+                        continue;
 
-                if (!(ch_flags & NVM_CHANNEL_VALID)) {
+                if (!lar_supported && !(ch_flags & NVM_CHANNEL_VALID)) {
+                        /*
+                         * Channels might become valid later if lar is
+                         * supported, hence we still want to add them to
+                         * the list of supported channels to cfg80211.
+                         */
                         IWL_DEBUG_EEPROM(dev,
                                          "Ch. %d Flags %x [%sGHz] - No traffic\n",
                                          nvm_chan[ch_idx],
@@ -250,45 +308,6 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                         ieee80211_channel_to_frequency(
                                 channel->hw_value, channel->band);
 
-                /* TODO: Need to be dependent to the NVM */
-                channel->flags = IEEE80211_CHAN_NO_HT40;
-                if (ch_idx < num_2ghz_channels &&
-                    (ch_flags & NVM_CHANNEL_40MHZ)) {
-                        if (nvm_chan[ch_idx] <= LAST_2GHZ_HT_PLUS)
-                                channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
-                        if (nvm_chan[ch_idx] >= FIRST_2GHZ_HT_MINUS)
-                                channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
-                } else if (nvm_chan[ch_idx] <= LAST_5GHZ_HT &&
-                           (ch_flags & NVM_CHANNEL_40MHZ)) {
-                        if ((ch_idx - num_2ghz_channels) % 2 == 0)
-                                channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
-                        else
-                                channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
-                }
-                if (!(ch_flags & NVM_CHANNEL_80MHZ))
-                        channel->flags |= IEEE80211_CHAN_NO_80MHZ;
-                if (!(ch_flags & NVM_CHANNEL_160MHZ))
-                        channel->flags |= IEEE80211_CHAN_NO_160MHZ;
-
-                if (!(ch_flags & NVM_CHANNEL_IBSS))
-                        channel->flags |= IEEE80211_CHAN_NO_IR;
-
-                if (!(ch_flags & NVM_CHANNEL_ACTIVE))
-                        channel->flags |= IEEE80211_CHAN_NO_IR;
-
-                if (ch_flags & NVM_CHANNEL_RADAR)
-                        channel->flags |= IEEE80211_CHAN_RADAR;
-
-                if (ch_flags & NVM_CHANNEL_INDOOR_ONLY)
-                        channel->flags |= IEEE80211_CHAN_INDOOR_ONLY;
-
-                /* Set the GO concurrent flag only in case that NO_IR is set.
-                 * Otherwise it is meaningless
-                 */
-                if ((ch_flags & NVM_CHANNEL_GO_CONCURRENT) &&
-                    (channel->flags & IEEE80211_CHAN_NO_IR))
-                        channel->flags |= IEEE80211_CHAN_GO_CONCURRENT;
-
                 /* Initialize regulatory-based run-time data */
 
                 /*
@@ -297,6 +316,15 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                  */
                 channel->max_power = IWL_DEFAULT_MAX_TX_POWER;
                 is_5ghz = channel->band == IEEE80211_BAND_5GHZ;
+
+                /* don't put limitations in case we're using LAR */
+                if (!lar_supported)
+                        channel->flags = iwl_get_channel_flags(nvm_chan[ch_idx],
+                                                               ch_idx, is_5ghz,
+                                                               ch_flags, cfg);
+                else
+                        channel->flags = 0;
+
                 IWL_DEBUG_EEPROM(dev,
                                  "Ch. %d [%sGHz] %s%s%s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n",
                                  channel->hw_value,
@@ -370,8 +398,8 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg,
 
 static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
                             struct iwl_nvm_data *data,
-                            const __le16 *ch_section, bool enable_vht,
-                            u8 tx_chains, u8 rx_chains)
+                            const __le16 *ch_section,
+                            u8 tx_chains, u8 rx_chains, bool lar_supported)
 {
         int n_channels;
         int n_used = 0;
@@ -380,11 +408,12 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
         if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 n_channels = iwl_init_channel_map(
                                 dev, cfg, data,
-                                &ch_section[NVM_CHANNELS]);
+                                &ch_section[NVM_CHANNELS], lar_supported);
         else
                 n_channels = iwl_init_channel_map(
                                 dev, cfg, data,
-                                &ch_section[NVM_CHANNELS_FAMILY_8000]);
+                                &ch_section[NVM_CHANNELS_FAMILY_8000],
+                                lar_supported);
 
         sband = &data->bands[IEEE80211_BAND_2GHZ];
         sband->band = IEEE80211_BAND_2GHZ;
@@ -403,7 +432,7 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
                                           IEEE80211_BAND_5GHZ);
         iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ,
                              tx_chains, rx_chains);
-        if (enable_vht)
+        if (data->sku_cap_11ac_enable)
                 iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap,
                                       tx_chains, rx_chains);
 
@@ -412,17 +441,16 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
                             n_used, n_channels);
 }
 
-static int iwl_get_sku(const struct iwl_cfg *cfg,
-                       const __le16 *nvm_sw)
+static int iwl_get_sku(const struct iwl_cfg *cfg, const __le16 *nvm_sw,
+                       const __le16 *phy_sku)
 {
         if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 return le16_to_cpup(nvm_sw + SKU);
-        else
-                return le32_to_cpup((__le32 *)(nvm_sw + SKU_FAMILY_8000));
+
+        return le32_to_cpup((__le32 *)(phy_sku + SKU_FAMILY_8000));
 }
 
-static int iwl_get_nvm_version(const struct iwl_cfg *cfg,
-                               const __le16 *nvm_sw)
+static int iwl_get_nvm_version(const struct iwl_cfg *cfg, const __le16 *nvm_sw)
 {
         if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 return le16_to_cpup(nvm_sw + NVM_VERSION);
@@ -431,24 +459,26 @@ static int iwl_get_nvm_version(const struct iwl_cfg *cfg,
                                                NVM_VERSION_FAMILY_8000));
 }
 
-static int iwl_get_radio_cfg(const struct iwl_cfg *cfg,
-                             const __le16 *nvm_sw)
+static int iwl_get_radio_cfg(const struct iwl_cfg *cfg, const __le16 *nvm_sw,
+                             const __le16 *phy_sku)
 {
         if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 return le16_to_cpup(nvm_sw + RADIO_CFG);
-        else
-                return le32_to_cpup((__le32 *)(nvm_sw + RADIO_CFG_FAMILY_8000));
+
+        return le32_to_cpup((__le32 *)(nvm_sw + RADIO_CFG_FAMILY_8000));
+
 }
 
-#define N_HW_ADDRS_MASK_FAMILY_8000     0xF
-static int iwl_get_n_hw_addrs(const struct iwl_cfg *cfg,
-                              const __le16 *nvm_sw)
+static int iwl_get_n_hw_addrs(const struct iwl_cfg *cfg, const __le16 *nvm_sw)
 {
+        int n_hw_addr;
+
         if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 return le16_to_cpup(nvm_sw + N_HW_ADDRS);
-        else
-                return le32_to_cpup((__le32 *)(nvm_sw + N_HW_ADDRS_FAMILY_8000))
-                       & N_HW_ADDRS_MASK_FAMILY_8000;
+
+        n_hw_addr = le32_to_cpup((__le32 *)(nvm_sw + N_HW_ADDRS_FAMILY_8000));
+
+        return n_hw_addr & N_HW_ADDR_MASK;
 }
 
 static void iwl_set_radio_cfg(const struct iwl_cfg *cfg,
@@ -491,7 +521,8 @@ static void iwl_set_hw_address_family_8000(struct device *dev,
                                            const struct iwl_cfg *cfg,
                                            struct iwl_nvm_data *data,
                                            const __le16 *mac_override,
-                                           const __le16 *nvm_hw)
+                                           const __le16 *nvm_hw,
+                                           u32 mac_addr0, u32 mac_addr1)
 {
         const u8 *hw_addr;
 
@@ -515,48 +546,17 @@ static void iwl_set_hw_address_family_8000(struct device *dev,
         }
 
         if (nvm_hw) {
-                /* read the MAC address from OTP */
-                if (!dev_is_pci(dev) || (data->nvm_version < 0xE08)) {
-                        /* read the mac address from the WFPM location */
-                        hw_addr = (const u8 *)(nvm_hw +
-                                               HW_ADDR0_WFPM_FAMILY_8000);
-                        data->hw_addr[0] = hw_addr[3];
-                        data->hw_addr[1] = hw_addr[2];
-                        data->hw_addr[2] = hw_addr[1];
-                        data->hw_addr[3] = hw_addr[0];
-
-                        hw_addr = (const u8 *)(nvm_hw +
-                                               HW_ADDR1_WFPM_FAMILY_8000);
-                        data->hw_addr[4] = hw_addr[1];
-                        data->hw_addr[5] = hw_addr[0];
-                } else if ((data->nvm_version >= 0xE08) &&
-                           (data->nvm_version < 0xE0B)) {
-                        /* read "reverse order"  from the PCIe location */
-                        hw_addr = (const u8 *)(nvm_hw +
-                                               HW_ADDR0_PCIE_FAMILY_8000);
-                        data->hw_addr[5] = hw_addr[2];
-                        data->hw_addr[4] = hw_addr[1];
-                        data->hw_addr[3] = hw_addr[0];
-
-                        hw_addr = (const u8 *)(nvm_hw +
-                                               HW_ADDR1_PCIE_FAMILY_8000);
-                        data->hw_addr[2] = hw_addr[3];
-                        data->hw_addr[1] = hw_addr[2];
-                        data->hw_addr[0] = hw_addr[1];
-                } else {
-                        /* read from the PCIe location */
-                        hw_addr = (const u8 *)(nvm_hw +
-                                               HW_ADDR0_PCIE_FAMILY_8000);
-                        data->hw_addr[5] = hw_addr[0];
-                        data->hw_addr[4] = hw_addr[1];
-                        data->hw_addr[3] = hw_addr[2];
-
-                        hw_addr = (const u8 *)(nvm_hw +
-                                               HW_ADDR1_PCIE_FAMILY_8000);
-                        data->hw_addr[2] = hw_addr[1];
-                        data->hw_addr[1] = hw_addr[2];
-                        data->hw_addr[0] = hw_addr[3];
-                }
+                /* read the MAC address from HW resisters */
+                hw_addr = (const u8 *)&mac_addr0;
+                data->hw_addr[0] = hw_addr[3];
+                data->hw_addr[1] = hw_addr[2];
+                data->hw_addr[2] = hw_addr[1];
+                data->hw_addr[3] = hw_addr[0];
+
+                hw_addr = (const u8 *)&mac_addr1;
+                data->hw_addr[4] = hw_addr[1];
+                data->hw_addr[5] = hw_addr[0];
+
                 if (!is_valid_ether_addr(data->hw_addr))
                         IWL_ERR_DEV(dev,
                                     "mac address from hw section is not valid\n");
@@ -571,11 +571,14 @@ struct iwl_nvm_data *
 iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
                    const __le16 *nvm_hw, const __le16 *nvm_sw,
                    const __le16 *nvm_calib, const __le16 *regulatory,
-                   const __le16 *mac_override, u8 tx_chains, u8 rx_chains)
+                   const __le16 *mac_override, const __le16 *phy_sku,
+                   u8 tx_chains, u8 rx_chains, bool lar_fw_supported,
+                   u32 mac_addr0, u32 mac_addr1)
 {
         struct iwl_nvm_data *data;
         u32 sku;
         u32 radio_cfg;
+        u16 lar_config;
 
         if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 data = kzalloc(sizeof(*data) +
@@ -592,20 +595,21 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
 
         data->nvm_version = iwl_get_nvm_version(cfg, nvm_sw);
 
-        radio_cfg = iwl_get_radio_cfg(cfg, nvm_sw);
+        radio_cfg = iwl_get_radio_cfg(cfg, nvm_sw, phy_sku);
         iwl_set_radio_cfg(cfg, data, radio_cfg);
         if (data->valid_tx_ant)
                 tx_chains &= data->valid_tx_ant;
         if (data->valid_rx_ant)
                 rx_chains &= data->valid_rx_ant;
 
-        sku = iwl_get_sku(cfg, nvm_sw);
+        sku = iwl_get_sku(cfg, nvm_sw, phy_sku);
         data->sku_cap_band_24GHz_enable = sku & NVM_SKU_CAP_BAND_24GHZ;
         data->sku_cap_band_52GHz_enable = sku & NVM_SKU_CAP_BAND_52GHZ;
         data->sku_cap_11n_enable = sku & NVM_SKU_CAP_11N_ENABLE;
-        data->sku_cap_11ac_enable = sku & NVM_SKU_CAP_11AC_ENABLE;
         if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
                 data->sku_cap_11n_enable = false;
+        data->sku_cap_11ac_enable = data->sku_cap_11n_enable &&
+                                    (sku & NVM_SKU_CAP_11AC_ENABLE);
 
         data->n_hw_addrs = iwl_get_n_hw_addrs(cfg, nvm_sw);
 
@@ -626,16 +630,23 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
                 iwl_set_hw_address(cfg, data, nvm_hw);
 
                 iwl_init_sbands(dev, cfg, data, nvm_sw,
-                                sku & NVM_SKU_CAP_11AC_ENABLE, tx_chains,
-                                rx_chains);
+                                tx_chains, rx_chains, lar_fw_supported);
         } else {
+                u16 lar_offset = data->nvm_version < 0xE39 ?
+                                 NVM_LAR_OFFSET_FAMILY_8000_OLD :
+                                 NVM_LAR_OFFSET_FAMILY_8000;
+
+                lar_config = le16_to_cpup(regulatory + lar_offset);
+                data->lar_enabled = !!(lar_config &
+                                       NVM_LAR_ENABLED_FAMILY_8000);
+
                 /* MAC address in family 8000 */
                 iwl_set_hw_address_family_8000(dev, cfg, data, mac_override,
-                                               nvm_hw);
+                                               nvm_hw, mac_addr0, mac_addr1);
 
                 iwl_init_sbands(dev, cfg, data, regulatory,
-                                sku & NVM_SKU_CAP_11AC_ENABLE, tx_chains,
-                                rx_chains);
+                                tx_chains, rx_chains,
+                                lar_fw_supported && data->lar_enabled);
         }
 
         data->calib_version = 255;
@@ -643,3 +654,164 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
         return data;
 }
 IWL_EXPORT_SYMBOL(iwl_parse_nvm_data);
+
+static u32 iwl_nvm_get_regdom_bw_flags(const u8 *nvm_chan,
+                                       int ch_idx, u16 nvm_flags,
+                                       const struct iwl_cfg *cfg)
+{
+        u32 flags = NL80211_RRF_NO_HT40;
+        u32 last_5ghz_ht = LAST_5GHZ_HT;
+
+        if (cfg->device_family == IWL_DEVICE_FAMILY_8000)
+                last_5ghz_ht = LAST_5GHZ_HT_FAMILY_8000;
+
+        if (ch_idx < NUM_2GHZ_CHANNELS &&
+            (nvm_flags & NVM_CHANNEL_40MHZ)) {
+                if (nvm_chan[ch_idx] <= LAST_2GHZ_HT_PLUS)
+                        flags &= ~NL80211_RRF_NO_HT40PLUS;
+                if (nvm_chan[ch_idx] >= FIRST_2GHZ_HT_MINUS)
+                        flags &= ~NL80211_RRF_NO_HT40MINUS;
+        } else if (nvm_chan[ch_idx] <= last_5ghz_ht &&
+                   (nvm_flags & NVM_CHANNEL_40MHZ)) {
+                if ((ch_idx - NUM_2GHZ_CHANNELS) % 2 == 0)
+                        flags &= ~NL80211_RRF_NO_HT40PLUS;
+                else
+                        flags &= ~NL80211_RRF_NO_HT40MINUS;
+        }
+
+        if (!(nvm_flags & NVM_CHANNEL_80MHZ))
+                flags |= NL80211_RRF_NO_80MHZ;
+        if (!(nvm_flags & NVM_CHANNEL_160MHZ))
+                flags |= NL80211_RRF_NO_160MHZ;
+
+        if (!(nvm_flags & NVM_CHANNEL_ACTIVE))
+                flags |= NL80211_RRF_NO_IR;
+
+        if (nvm_flags & NVM_CHANNEL_RADAR)
+                flags |= NL80211_RRF_DFS;
+
+        if (nvm_flags & NVM_CHANNEL_INDOOR_ONLY)
+                flags |= NL80211_RRF_NO_OUTDOOR;
+
+        /* Set the GO concurrent flag only in case that NO_IR is set.
+         * Otherwise it is meaningless
+         */
+        if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT) &&
+            (flags & NL80211_RRF_NO_IR))
+                flags |= NL80211_RRF_GO_CONCURRENT;
+
+        return flags;
+}
+
+struct ieee80211_regdomain *
+iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
+                       int num_of_ch, __le32 *channels, u16 fw_mcc)
+{
+        int ch_idx;
+        u16 ch_flags, prev_ch_flags = 0;
+        const u8 *nvm_chan = cfg->device_family == IWL_DEVICE_FAMILY_8000 ?
+                             iwl_nvm_channels_family_8000 : iwl_nvm_channels;
+        struct ieee80211_regdomain *regd;
+        int size_of_regd;
+        struct ieee80211_reg_rule *rule;
+        enum ieee80211_band band;
+        int center_freq, prev_center_freq = 0;
+        int valid_rules = 0;
+        bool new_rule;
+        int max_num_ch = cfg->device_family == IWL_DEVICE_FAMILY_8000 ?
+                         IWL_NUM_CHANNELS_FAMILY_8000 : IWL_NUM_CHANNELS;
+
+        if (WARN_ON_ONCE(num_of_ch > NL80211_MAX_SUPP_REG_RULES))
+                return ERR_PTR(-EINVAL);
+
+        if (WARN_ON(num_of_ch > max_num_ch))
+                num_of_ch = max_num_ch;
+
+        IWL_DEBUG_DEV(dev, IWL_DL_LAR, "building regdom for %d channels\n",
+                      num_of_ch);
+
+        /* build a regdomain rule for every valid channel */
+        size_of_regd =
+                sizeof(struct ieee80211_regdomain) +
+                num_of_ch * sizeof(struct ieee80211_reg_rule);
+
+        regd = kzalloc(size_of_regd, GFP_KERNEL);
+        if (!regd)
+                return ERR_PTR(-ENOMEM);
+
+        for (ch_idx = 0; ch_idx < num_of_ch; ch_idx++) {
+                ch_flags = (u16)__le32_to_cpup(channels + ch_idx);
+                band = (ch_idx < NUM_2GHZ_CHANNELS) ?
+                       IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+                center_freq = ieee80211_channel_to_frequency(nvm_chan[ch_idx],
+                                                             band);
+                new_rule = false;
+
+                if (!(ch_flags & NVM_CHANNEL_VALID)) {
+                        IWL_DEBUG_DEV(dev, IWL_DL_LAR,
+                                      "Ch. %d Flags %x [%sGHz] - No traffic\n",
+                                      nvm_chan[ch_idx],
+                                      ch_flags,
+                                      (ch_idx >= NUM_2GHZ_CHANNELS) ?
+                                      "5.2" : "2.4");
+                        continue;
+                }
+
+                /* we can't continue the same rule */
+                if (ch_idx == 0 || prev_ch_flags != ch_flags ||
+                    center_freq - prev_center_freq > 20) {
+                        valid_rules++;
+                        new_rule = true;
+                }
+
+                rule = &regd->reg_rules[valid_rules - 1];
+
+                if (new_rule)
+                        rule->freq_range.start_freq_khz =
+                                                MHZ_TO_KHZ(center_freq - 10);
+
+                rule->freq_range.end_freq_khz = MHZ_TO_KHZ(center_freq + 10);
+
+                /* this doesn't matter - not used by FW */
+                rule->power_rule.max_antenna_gain = DBI_TO_MBI(6);
+                rule->power_rule.max_eirp =
+                        DBM_TO_MBM(IWL_DEFAULT_MAX_TX_POWER);
+
+                rule->flags = iwl_nvm_get_regdom_bw_flags(nvm_chan, ch_idx,
+                                                          ch_flags, cfg);
+
+                /* rely on auto-calculation to merge BW of contiguous chans */
+                rule->flags |= NL80211_RRF_AUTO_BW;
+                rule->freq_range.max_bandwidth_khz = 0;
+
+                prev_ch_flags = ch_flags;
+                prev_center_freq = center_freq;
+
+                IWL_DEBUG_DEV(dev, IWL_DL_LAR,
+                              "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x): Ad-Hoc %ssupported\n",
+                              center_freq,
+                              band == IEEE80211_BAND_5GHZ ? "5.2" : "2.4",
+                              CHECK_AND_PRINT_I(VALID),
+                              CHECK_AND_PRINT_I(ACTIVE),
+                              CHECK_AND_PRINT_I(RADAR),
+                              CHECK_AND_PRINT_I(WIDE),
+                              CHECK_AND_PRINT_I(40MHZ),
+                              CHECK_AND_PRINT_I(80MHZ),
+                              CHECK_AND_PRINT_I(160MHZ),
+                              CHECK_AND_PRINT_I(INDOOR_ONLY),
+                              CHECK_AND_PRINT_I(GO_CONCURRENT),
+                              ch_flags,
+                              ((ch_flags & NVM_CHANNEL_ACTIVE) &&
+                               !(ch_flags & NVM_CHANNEL_RADAR))
+                                         ? "" : "not ");
+        }
+
+        regd->n_reg_rules = valid_rules;
+
+        /* set alpha2 from FW. */
+        regd->alpha2[0] = fw_mcc >> 8;
+        regd->alpha2[1] = fw_mcc & 0xff;
+
+        return regd;
+}
+IWL_EXPORT_SYMBOL(iwl_parse_nvm_mcc_info);
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
index c9c45a39d212..822ba52e0e5a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
@@ -62,6 +62,7 @@
 #ifndef __iwl_nvm_parse_h__
 #define __iwl_nvm_parse_h__
 
+#include <net/cfg80211.h>
 #include "iwl-eeprom-parse.h"
 
 /**
@@ -76,6 +77,21 @@ struct iwl_nvm_data *
 iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
                    const __le16 *nvm_hw, const __le16 *nvm_sw,
                    const __le16 *nvm_calib, const __le16 *regulatory,
-                   const __le16 *mac_override, u8 tx_chains, u8 rx_chains);
+                   const __le16 *mac_override, const __le16 *phy_sku,
+                   u8 tx_chains, u8 rx_chains, bool lar_fw_supported,
+                   u32 mac_addr0, u32 mac_addr1);
+
+/**
+ * iwl_parse_mcc_info - parse MCC (mobile country code) info coming from FW
+ *
+ * This function parses the regulatory channel data received as a
+ * MCC_UPDATE_CMD command. It returns a newly allocation regulatory domain,
+ * to be fed into the regulatory core. An ERR_PTR is returned on error.
+ * If not given to the regulatory core, the user is responsible for freeing
+ * the regdomain returned here with kfree.
+ */
+struct ieee80211_regdomain *
+iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
+                       int num_of_ch, __le32 *channels, u16 fw_mcc);
 
 #endif /* __iwl_nvm_parse_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index 17de6d46222a..ce1cdd7604e8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -94,7 +94,7 @@ struct iwl_cfg;
  * The operational mode has a very simple life cycle.
  *
  *      1) The driver layer (iwl-drv.c) chooses the op_mode based on the
- *         capabilities advertized by the fw file (in TLV format).
+ *         capabilities advertised by the fw file (in TLV format).
  *      2) The driver layer starts the op_mode (ops->start)
  *      3) The op_mode registers mac80211
  *      4) The op_mode is governed by mac80211
@@ -116,7 +116,7 @@ struct iwl_cfg;
  *      May sleep
  * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the
  *      HCMD this Rx responds to. Can't sleep.
- * @napi_add: NAPI initialisation. The transport is fully responsible for NAPI,
+ * @napi_add: NAPI initialization. The transport is fully responsible for NAPI,
  *      but the higher layers need to know about it (in particular mac80211 to
  *      to able to call the right NAPI RX functions); this function is needed
  *      to eventually call netif_napi_add() with higher layer involvement.
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
index d4fb5cad07ea..a105455b6a24 100644
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.c
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
@@ -72,7 +72,7 @@
 #include "iwl-trans.h"
 
 #define CHANNEL_NUM_SIZE        4       /* num of channels in calib_ch size */
-#define IWL_NUM_PAPD_CH_GROUPS  7
+#define IWL_NUM_PAPD_CH_GROUPS  9
 #define IWL_NUM_TXP_CH_GROUPS   9
 
 struct iwl_phy_db_entry {
@@ -125,7 +125,7 @@ struct iwl_phy_db_chg_txp {
 } __packed;
 
 /*
- * phy db - Receieve phy db chunk after calibrations
+ * phy db - Receive phy db chunk after calibrations
  */
 struct iwl_calib_res_notif_phy_db {
         __le16 type;
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 6221e4dfc64f..88a57e6e232f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -110,8 +110,8 @@
 #define DEVICE_SET_NMI_REG 0x00a01c30
 #define DEVICE_SET_NMI_VAL_HW BIT(0)
 #define DEVICE_SET_NMI_VAL_DRV BIT(7)
-#define DEVICE_SET_NMI_8000B_REG 0x00a01c24
-#define DEVICE_SET_NMI_8000B_VAL 0x1000000
+#define DEVICE_SET_NMI_8000_REG 0x00a01c24
+#define DEVICE_SET_NMI_8000_VAL 0x1000000
 
 /* Shared registers (0x0..0x3ff, via target indirect or periphery */
 #define SHR_BASE        0x00a10000
@@ -295,25 +295,6 @@
 #define OSC_CLK                         (0xa04068)
 #define OSC_CLK_FORCE_CONTROL           (0x8)
 
-/* SECURE boot registers */
-#define LMPM_SECURE_BOOT_CONFIG_ADDR    (0x100)
-enum secure_boot_config_reg {
-        LMPM_SECURE_BOOT_CONFIG_INSPECTOR_BURNED_IN_OTP = 0x00000001,
-        LMPM_SECURE_BOOT_CONFIG_INSPECTOR_NOT_REQ       = 0x00000002,
-};
-
-#define LMPM_SECURE_BOOT_CPU1_STATUS_ADDR_B0    (0xA01E30)
-#define LMPM_SECURE_BOOT_CPU1_STATUS_ADDR       (0x1E30)
-#define LMPM_SECURE_BOOT_CPU2_STATUS_ADDR       (0x1E34)
-enum secure_boot_status_reg {
-        LMPM_SECURE_BOOT_CPU_STATUS_VERF_STATUS         = 0x00000001,
-        LMPM_SECURE_BOOT_CPU_STATUS_VERF_COMPLETED      = 0x00000002,
-        LMPM_SECURE_BOOT_CPU_STATUS_VERF_SUCCESS        = 0x00000004,
-        LMPM_SECURE_BOOT_CPU_STATUS_VERF_FAIL           = 0x00000008,
-        LMPM_SECURE_BOOT_CPU_STATUS_SIGN_VERF_FAIL      = 0x00000010,
-        LMPM_SECURE_BOOT_STATUS_SUCCESS                 = 0x00000003,
-};
-
 #define FH_UCODE_LOAD_STATUS            (0x1AF0)
 #define CSR_UCODE_LOAD_STATUS_ADDR      (0x1E70)
 enum secure_load_status_reg {
@@ -334,8 +315,6 @@ enum secure_load_status_reg {
 #define LMPM_SECURE_CPU1_HDR_MEM_SPACE          (0x420000)
 #define LMPM_SECURE_CPU2_HDR_MEM_SPACE          (0x420400)
 
-#define LMPM_SECURE_TIME_OUT    (100) /* 10 micro */
-
 /* Rx FIFO */
 #define RXF_SIZE_ADDR                   (0xa00c88)
 #define RXF_RD_D_SPACE                  (0xa00c40)
@@ -370,7 +349,33 @@ enum secure_load_status_reg {
 #define MON_BUFF_CYCLE_CNT              (0xa03c48)
 
 #define DBGC_IN_SAMPLE                  (0xa03c00)
-#define DBGC_OUT_CTRL                   (0xa03c0c)
+
+/* enable the ID buf for read */
+#define WFPM_PS_CTL_CLR                 0xA0300C
+#define WFMP_MAC_ADDR_0                 0xA03080
+#define WFMP_MAC_ADDR_1                 0xA03084
+#define LMPM_PMG_EN                     0xA01CEC
+#define RADIO_REG_SYS_MANUAL_DFT_0      0xAD4078
+#define RFIC_REG_RD                     0xAD0470
+#define WFPM_CTRL_REG                   0xA03030
+enum {
+        ENABLE_WFPM = BIT(31),
+        WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK       = 0x80000000,
+};
+
+#define AUX_MISC_REG                    0xA200B0
+enum {
+        HW_STEP_LOCATION_BITS = 24,
+};
+
+#define AUX_MISC_MASTER1_EN             0xA20818
+enum aux_misc_master1_en {
+        AUX_MISC_MASTER1_EN_SBE_MSK     = 0x1,
+};
+
+#define AUX_MISC_MASTER1_SMPHR_STATUS   0xA20800
+#define RSA_ENABLE                      0xA24B08
+#define PREG_AUX_BUS_WPROT_0            0xA04CC0
 
 /* FW chicken bits */
 #define LMPM_CHICK                      0xA01FF8
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index a96bd8db6ceb..6dfed1259260 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -77,10 +77,10 @@
 /**
  * DOC: Transport layer - what is it ?
  *
- * The tranport layer is the layer that deals with the HW directly. It provides
+ * The transport layer is the layer that deals with the HW directly. It provides
  * an abstraction of the underlying HW to the upper layer. The transport layer
  * doesn't provide any policy, algorithm or anything of this kind, but only
- * mechanisms to make the HW do something.It is not completely stateless but
+ * mechanisms to make the HW do something. It is not completely stateless but
  * close to it.
  * We will have an implementation for each different supported bus.
  */
@@ -111,10 +111,10 @@
 /**
  * DOC: Host command section
  *
- * A host command is a commaned issued by the upper layer to the fw. There are
+ * A host command is a command issued by the upper layer to the fw. There are
  * several versions of fw that have several APIs. The transport layer is
  * completely agnostic to these differences.
- * The transport does provide helper functionnality (i.e. SYNC / ASYNC mode),
+ * The transport does provide helper functionality (i.e. SYNC / ASYNC mode),
  */
 #define SEQ_TO_QUEUE(s) (((s) >> 8) & 0x1f)
 #define QUEUE_TO_SEQ(q) (((q) & 0x1f) << 8)
@@ -195,7 +195,7 @@ static inline u32 iwl_rx_packet_payload_len(const struct iwl_rx_packet *pkt)
  * @CMD_WANT_SKB: Not valid with CMD_ASYNC. The caller needs the buffer of
  *      the response. The caller needs to call iwl_free_resp when done.
  * @CMD_HIGH_PRIO: The command is high priority - it goes to the front of the
- *      command queue, but after other high priority commands. valid only
+ *      command queue, but after other high priority commands. Valid only
  *      with CMD_ASYNC.
  * @CMD_SEND_IN_IDLE: The command should be sent even when the trans is idle.
  * @CMD_MAKE_TRANS_IDLE: The command response should mark the trans as idle.
@@ -458,6 +458,8 @@ struct iwl_trans_txq_scd_cfg {
  * @txq_disable: de-configure a Tx queue to send AMPDUs
  *      Must be atomic
  * @wait_tx_queue_empty: wait until tx queues are empty. May sleep.
+ * @freeze_txq_timer: prevents the timer of the queue from firing until the
+ *      queue is set to awake. Must be atomic.
  * @dbgfs_register: add the dbgfs files under this directory. Files will be
  *      automatically deleted.
  * @write8: write a u8 to a register at offset ofs from the BAR
@@ -517,6 +519,8 @@ struct iwl_trans_ops {
 
         int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);
         int (*wait_tx_queue_empty)(struct iwl_trans *trans, u32 txq_bm);
+        void (*freeze_txq_timer)(struct iwl_trans *trans, unsigned long txqs,
+                                 bool freeze);
 
         void (*write8)(struct iwl_trans *trans, u32 ofs, u8 val);
         void (*write32)(struct iwl_trans *trans, u32 ofs, u32 val);
@@ -578,7 +582,7 @@ enum iwl_d0i3_mode {
  * @cfg - pointer to the configuration
  * @status: a bit-mask of transport status flags
  * @dev - pointer to struct device * that represents the device
- * @hw_id: a u32 with the ID of the device / subdevice.
+ * @hw_id: a u32 with the ID of the device / sub-device.
  *      Set during transport allocation.
  * @hw_id_str: a string with info about HW ID. Set during transport allocation.
  * @pm_support: set to true in start_hw if link pm is supported
@@ -595,6 +599,7 @@ enum iwl_d0i3_mode {
  * @dflt_pwr_limit: default power limit fetched from the platform (ACPI)
  * @dbg_dest_tlv: points to the destination TLV for debug
  * @dbg_conf_tlv: array of pointers to configuration TLVs for debug
+ * @dbg_trigger_tlv: array of pointers to triggers TLVs for debug
  * @dbg_dest_reg_num: num of reg_ops in %dbg_dest_tlv
  */
 struct iwl_trans {
@@ -628,7 +633,8 @@ struct iwl_trans {
         u64 dflt_pwr_limit;
 
         const struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;
-        const struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_MAX];
+        const struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];
+        struct iwl_fw_dbg_trigger_tlv * const *dbg_trigger_tlv;
         u8 dbg_dest_reg_num;
 
         enum iwl_d0i3_mode d0i3_mode;
@@ -871,6 +877,17 @@ void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue, int fifo,
         iwl_trans_txq_enable_cfg(trans, queue, 0, &cfg, queue_wdg_timeout);
 }
 
+static inline void iwl_trans_freeze_txq_timer(struct iwl_trans *trans,
+                                              unsigned long txqs,
+                                              bool freeze)
+{
+        if (unlikely(trans->state != IWL_TRANS_FW_ALIVE))
+                IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);
+
+        if (trans->ops->freeze_txq_timer)
+                trans->ops->freeze_txq_timer(trans, txqs, freeze);
+}
+
 static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans,
                                                 u32 txqs)
 {
diff --git a/drivers/net/wireless/iwlwifi/mvm/coex.c b/drivers/net/wireless/iwlwifi/mvm/coex.c
index 7810c41cf9a7..13a0a03158de 100644
--- a/drivers/net/wireless/iwlwifi/mvm/coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/coex.c
@@ -72,158 +72,6 @@
 #include "mvm.h"
 #include "iwl-debug.h"
 
-const u32 iwl_bt_ctl_kill_msk[BT_KILL_MSK_MAX] = {
-        [BT_KILL_MSK_DEFAULT] = 0xfffffc00,
-        [BT_KILL_MSK_NEVER] = 0xffffffff,
-        [BT_KILL_MSK_ALWAYS] = 0,
-};
-
-const u8 iwl_bt_cts_kill_msk[BT_MAX_AG][BT_COEX_MAX_LUT] = {
-        {
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-        },
-        {
-                BT_KILL_MSK_NEVER,
-                BT_KILL_MSK_NEVER,
-                BT_KILL_MSK_NEVER,
-        },
-        {
-                BT_KILL_MSK_NEVER,
-                BT_KILL_MSK_NEVER,
-                BT_KILL_MSK_NEVER,
-        },
-        {
-                BT_KILL_MSK_DEFAULT,
-                BT_KILL_MSK_NEVER,
-                BT_KILL_MSK_DEFAULT,
-        },
-};
-
-const u8 iwl_bt_ack_kill_msk[BT_MAX_AG][BT_COEX_MAX_LUT] = {
-        {
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-        },
-        {
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-        },
-        {
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_ALWAYS,
-        },
-        {
-                BT_KILL_MSK_DEFAULT,
-                BT_KILL_MSK_ALWAYS,
-                BT_KILL_MSK_DEFAULT,
-        },
-};
-
-static const __le32 iwl_bt_prio_boost[BT_COEX_BOOST_SIZE] = {
-        cpu_to_le32(0xf0f0f0f0), /* 50% */
-        cpu_to_le32(0xc0c0c0c0), /* 25% */
-        cpu_to_le32(0xfcfcfcfc), /* 75% */
-        cpu_to_le32(0xfefefefe), /* 87.5% */
-};
-
-static const __le32 iwl_single_shared_ant[BT_COEX_MAX_LUT][BT_COEX_LUT_SIZE] = {
-        {
-                cpu_to_le32(0x40000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x44000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x40000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x44000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xf0005000),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xf0005000),
-        },
-        {
-                cpu_to_le32(0x40000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x44000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x40000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x44000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xf0005000),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xf0005000),
-        },
-        {
-                cpu_to_le32(0x40000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x44000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x40000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x44000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xf0005000),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xf0005000),
-        },
-};
-
-static const __le32 iwl_combined_lookup[BT_COEX_MAX_LUT][BT_COEX_LUT_SIZE] = {
-        {
-                /* Tight */
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xaeaaaaaa),
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xcc00ff28),
-                cpu_to_le32(0x0000aaaa),
-                cpu_to_le32(0xcc00aaaa),
-                cpu_to_le32(0x0000aaaa),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0x00004000),
-                cpu_to_le32(0xf0005000),
-                cpu_to_le32(0xf0005000),
-        },
-        {
-                /* Loose */
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xcc00ff28),
-                cpu_to_le32(0x0000aaaa),
-                cpu_to_le32(0xcc00aaaa),
-                cpu_to_le32(0x0000aaaa),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0x00000000),
-                cpu_to_le32(0xf0005000),
-                cpu_to_le32(0xf0005000),
-        },
-        {
-                /* Tx Tx disabled */
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xeeaaaaaa),
-                cpu_to_le32(0xaaaaaaaa),
-                cpu_to_le32(0xcc00ff28),
-                cpu_to_le32(0x0000aaaa),
-                cpu_to_le32(0xcc00aaaa),
-                cpu_to_le32(0x0000aaaa),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xc0004000),
-                cpu_to_le32(0xf0005000),
-                cpu_to_le32(0xf0005000),
-        },
-};
-
 /* 20MHz / 40MHz below / 40Mhz above*/
 static const __le64 iwl_ci_mask[][3] = {
         /* dummy entry for channel 0 */
@@ -596,14 +444,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
                 goto send_cmd;
         }
 
-        bt_cmd->max_kill = cpu_to_le32(5);
-        bt_cmd->bt4_antenna_isolation_thr =
-                cpu_to_le32(IWL_MVM_BT_COEX_ANTENNA_COUPLING_THRS);
-        bt_cmd->bt4_tx_tx_delta_freq_thr = cpu_to_le32(15);
-        bt_cmd->bt4_tx_rx_max_freq0 = cpu_to_le32(15);
-        bt_cmd->override_primary_lut = cpu_to_le32(BT_COEX_INVALID_LUT);
-        bt_cmd->override_secondary_lut = cpu_to_le32(BT_COEX_INVALID_LUT);
-
         mode = iwlwifi_mod_params.bt_coex_active ? BT_COEX_NW : BT_COEX_DISABLE;
         bt_cmd->mode = cpu_to_le32(mode);
 
@@ -611,7 +451,7 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
                 bt_cmd->enabled_modules |=
                         cpu_to_le32(BT_COEX_SYNC2SCO_ENABLED);
 
-        if (IWL_MVM_BT_COEX_CORUNNING)
+        if (iwl_mvm_bt_is_plcr_supported(mvm))
                 bt_cmd->enabled_modules |= cpu_to_le32(BT_COEX_CORUN_ENABLED);
 
         if (IWL_MVM_BT_COEX_MPLUT) {
@@ -622,18 +462,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
 
         bt_cmd->enabled_modules |= cpu_to_le32(BT_COEX_HIGH_BAND_RET);
 
-        if (mvm->cfg->bt_shared_single_ant)
-                memcpy(&bt_cmd->decision_lut, iwl_single_shared_ant,
-                       sizeof(iwl_single_shared_ant));
-        else
-                memcpy(&bt_cmd->decision_lut, iwl_combined_lookup,
-                       sizeof(iwl_combined_lookup));
-
-        memcpy(&bt_cmd->mplut_prio_boost, iwl_bt_prio_boost,
-               sizeof(iwl_bt_prio_boost));
-        bt_cmd->multiprio_lut[0] = cpu_to_le32(IWL_MVM_BT_COEX_MPLUT_REG0);
-        bt_cmd->multiprio_lut[1] = cpu_to_le32(IWL_MVM_BT_COEX_MPLUT_REG1);
-
 send_cmd:
         memset(&mvm->last_bt_notif, 0, sizeof(mvm->last_bt_notif));
         memset(&mvm->last_bt_ci_cmd, 0, sizeof(mvm->last_bt_ci_cmd));
@@ -644,48 +472,6 @@ send_cmd:
         return ret;
 }
 
-static int iwl_mvm_bt_udpate_sw_boost(struct iwl_mvm *mvm)
-{
-        struct iwl_bt_coex_profile_notif *notif = &mvm->last_bt_notif;
-        u32 primary_lut = le32_to_cpu(notif->primary_ch_lut);
-        u32 secondary_lut = le32_to_cpu(notif->secondary_ch_lut);
-        u32 ag = le32_to_cpu(notif->bt_activity_grading);
-        struct iwl_bt_coex_sw_boost_update_cmd cmd = {};
-        u8 ack_kill_msk[NUM_PHY_CTX] = {};
-        u8 cts_kill_msk[NUM_PHY_CTX] = {};
-        int i;
-
-        lockdep_assert_held(&mvm->mutex);
-
-        ack_kill_msk[0] = iwl_bt_ack_kill_msk[ag][primary_lut];
-        cts_kill_msk[0] = iwl_bt_cts_kill_msk[ag][primary_lut];
-
-        ack_kill_msk[1] = iwl_bt_ack_kill_msk[ag][secondary_lut];
-        cts_kill_msk[1] = iwl_bt_cts_kill_msk[ag][secondary_lut];
-
-        /* Don't send HCMD if there is no update */
-        if (!memcmp(ack_kill_msk, mvm->bt_ack_kill_msk, sizeof(ack_kill_msk)) ||
-            !memcmp(cts_kill_msk, mvm->bt_cts_kill_msk, sizeof(cts_kill_msk)))
-                return 0;
-
-        memcpy(mvm->bt_ack_kill_msk, ack_kill_msk,
-               sizeof(mvm->bt_ack_kill_msk));
-        memcpy(mvm->bt_cts_kill_msk, cts_kill_msk,
-               sizeof(mvm->bt_cts_kill_msk));
-
-        BUILD_BUG_ON(ARRAY_SIZE(ack_kill_msk) < ARRAY_SIZE(cmd.boost_values));
-
-        for (i = 0; i < ARRAY_SIZE(cmd.boost_values); i++) {
-                cmd.boost_values[i].kill_ack_msk =
-                        cpu_to_le32(iwl_bt_ctl_kill_msk[ack_kill_msk[i]]);
-                cmd.boost_values[i].kill_cts_msk =
-                        cpu_to_le32(iwl_bt_ctl_kill_msk[cts_kill_msk[i]]);
-        }
-
-        return iwl_mvm_send_cmd_pdu(mvm, BT_COEX_UPDATE_SW_BOOST, 0,
-                                    sizeof(cmd), &cmd);
-}
-
 static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
                                        bool enable)
 {
@@ -951,9 +737,6 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)
                         IWL_ERR(mvm, "Failed to send BT_CI cmd\n");
                 memcpy(&mvm->last_bt_ci_cmd, &cmd, sizeof(cmd));
         }
-
-        if (iwl_mvm_bt_udpate_sw_boost(mvm))
-                IWL_ERR(mvm, "Failed to update the ctrl_kill_msk\n");
 }
 
 int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
@@ -1024,7 +807,7 @@ static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,
 }
 
 void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                           enum ieee80211_rssi_event rssi_event)
+                           enum ieee80211_rssi_event_data rssi_event)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct iwl_bt_iterator_data data = {
@@ -1074,9 +857,6 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         ieee80211_iterate_active_interfaces_atomic(
                 mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
                 iwl_mvm_bt_rssi_iterator, &data);
-
-        if (iwl_mvm_bt_udpate_sw_boost(mvm))
-                IWL_ERR(mvm, "Failed to update the ctrl_kill_msk\n");
 }
 
 #define LINK_QUAL_AGG_TIME_LIMIT_DEF    (4000)
@@ -1235,7 +1015,7 @@ int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,
         if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
                 return iwl_mvm_rx_ant_coupling_notif_old(mvm, rxb, dev_cmd);
 
-        if (!IWL_MVM_BT_COEX_CORUNNING)
+        if (!iwl_mvm_bt_is_plcr_supported(mvm))
                 return 0;
 
         lockdep_assert_held(&mvm->mutex);
diff --git a/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c b/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
index 542ee74f290a..d954591e0be5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
+++ b/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
@@ -288,6 +288,65 @@ static const __le64 iwl_ci_mask[][3] = {
         },
 };
 
+enum iwl_bt_kill_msk {
+        BT_KILL_MSK_DEFAULT,
+        BT_KILL_MSK_NEVER,
+        BT_KILL_MSK_ALWAYS,
+        BT_KILL_MSK_MAX,
+};
+
+static const u32 iwl_bt_ctl_kill_msk[BT_KILL_MSK_MAX] = {
+        [BT_KILL_MSK_DEFAULT] = 0xfffffc00,
+        [BT_KILL_MSK_NEVER] = 0xffffffff,
+        [BT_KILL_MSK_ALWAYS] = 0,
+};
+
+static const u8 iwl_bt_cts_kill_msk[BT_MAX_AG][BT_COEX_MAX_LUT] = {
+        {
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+        },
+        {
+                BT_KILL_MSK_NEVER,
+                BT_KILL_MSK_NEVER,
+                BT_KILL_MSK_NEVER,
+        },
+        {
+                BT_KILL_MSK_NEVER,
+                BT_KILL_MSK_NEVER,
+                BT_KILL_MSK_NEVER,
+        },
+        {
+                BT_KILL_MSK_DEFAULT,
+                BT_KILL_MSK_NEVER,
+                BT_KILL_MSK_DEFAULT,
+        },
+};
+
+static const u8 iwl_bt_ack_kill_msk[BT_MAX_AG][BT_COEX_MAX_LUT] = {
+        {
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+        },
+        {
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+        },
+        {
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_ALWAYS,
+        },
+        {
+                BT_KILL_MSK_DEFAULT,
+                BT_KILL_MSK_ALWAYS,
+                BT_KILL_MSK_DEFAULT,
+        },
+};
+
 struct corunning_block_luts {
         u8 range;
         __le32 lut20[BT_COEX_CORUN_LUT_SIZE];
@@ -619,7 +678,7 @@ int iwl_send_bt_init_conf_old(struct iwl_mvm *mvm)
         if (IWL_MVM_BT_COEX_SYNC2SCO)
                 bt_cmd->flags |= cpu_to_le32(BT_COEX_SYNC2SCO);
 
-        if (IWL_MVM_BT_COEX_CORUNNING) {
+        if (iwl_mvm_bt_is_plcr_supported(mvm)) {
                 bt_cmd->valid_bit_msk |= cpu_to_le32(BT_VALID_CORUN_LUT_20 |
                                                      BT_VALID_CORUN_LUT_40);
                 bt_cmd->flags |= cpu_to_le32(BT_COEX_CORUNNING);
@@ -633,7 +692,7 @@ int iwl_send_bt_init_conf_old(struct iwl_mvm *mvm)
         if (IWL_MVM_BT_COEX_TTC)
                 bt_cmd->flags |= cpu_to_le32(BT_COEX_TTC);
 
-        if (IWL_MVM_BT_COEX_RRC)
+        if (iwl_mvm_bt_is_rrc_supported(mvm))
                 bt_cmd->flags |= cpu_to_le32(BT_COEX_RRC);
 
         if (mvm->cfg->bt_shared_single_ant)
@@ -1069,7 +1128,7 @@ static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,
 }
 
 void iwl_mvm_bt_rssi_event_old(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                               enum ieee80211_rssi_event rssi_event)
+                               enum ieee80211_rssi_event_data rssi_event)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct iwl_bt_iterator_data data = {
@@ -1168,16 +1227,10 @@ bool iwl_mvm_bt_coex_is_mimo_allowed_old(struct iwl_mvm *mvm,
         return lut_type != BT_COEX_LOOSE_LUT;
 }
 
-bool iwl_mvm_bt_coex_is_ant_avail_old(struct iwl_mvm *mvm, u8 ant)
-{
-        u32 ag = le32_to_cpu(mvm->last_bt_notif_old.bt_activity_grading);
-        return ag < BT_HIGH_TRAFFIC;
-}
-
 bool iwl_mvm_bt_coex_is_shared_ant_avail_old(struct iwl_mvm *mvm)
 {
         u32 ag = le32_to_cpu(mvm->last_bt_notif_old.bt_activity_grading);
-        return ag == BT_OFF;
+        return ag < BT_HIGH_TRAFFIC;
 }
 
 bool iwl_mvm_bt_coex_is_tpc_allowed_old(struct iwl_mvm *mvm,
@@ -1214,7 +1267,7 @@ int iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm,
                 .dataflags = { IWL_HCMD_DFL_NOCOPY, },
         };
 
-        if (!IWL_MVM_BT_COEX_CORUNNING)
+        if (!iwl_mvm_bt_is_plcr_supported(mvm))
                 return 0;
 
         lockdep_assert_held(&mvm->mutex);
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index 14e8fd661889..a6c48c7b1e16 100644
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -694,6 +694,9 @@ static int iwl_mvm_d3_reprogram(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         if (ret)
                 IWL_ERR(mvm, "Failed to send quota: %d\n", ret);
 
+        if (iwl_mvm_is_lar_supported(mvm) && iwl_mvm_init_fw_regd(mvm))
+                IWL_ERR(mvm, "Failed to initialize D3 LAR information\n");
+
         return 0;
 }
 
@@ -1128,6 +1131,7 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,
         iwl_trans_d3_suspend(mvm->trans, test);
  out:
         if (ret < 0) {
+                iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
                 ieee80211_restart_hw(mvm->hw);
                 iwl_mvm_free_nd(mvm);
         }
@@ -1596,7 +1600,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
         /* RF-kill already asserted again... */
         if (!cmd.resp_pkt) {
-                ret = -ERFKILL;
+                fw_status = ERR_PTR(-ERFKILL);
                 goto out_free_resp;
         }
 
@@ -1605,7 +1609,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         len = iwl_rx_packet_payload_len(cmd.resp_pkt);
         if (len < status_size) {
                 IWL_ERR(mvm, "Invalid WoWLAN status response!\n");
-                ret = -EIO;
+                fw_status = ERR_PTR(-EIO);
                 goto out_free_resp;
         }
 
@@ -1613,7 +1617,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         if (len != (status_size +
                     ALIGN(le32_to_cpu(status->wake_packet_bufsize), 4))) {
                 IWL_ERR(mvm, "Invalid WoWLAN status response!\n");
-                ret = -EIO;
+                fw_status = ERR_PTR(-EIO);
                 goto out_free_resp;
         }
 
@@ -1621,7 +1625,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
 out_free_resp:
         iwl_free_resp(&cmd);
-        return ret ? ERR_PTR(ret) : fw_status;
+        return fw_status;
 }
 
 /* releases the MVM mutex */
@@ -1722,6 +1726,10 @@ iwl_mvm_netdetect_query_results(struct iwl_mvm *mvm,
         results->matched_profiles = le32_to_cpu(query->matched_profiles);
         memcpy(results->matches, query->matches, sizeof(results->matches));
 
+#ifdef CPTCFG_IWLWIFI_DEBUGFS
+        mvm->last_netdetect_scans = le32_to_cpu(query->n_scans_done);
+#endif
+
 out_free_resp:
         iwl_free_resp(&cmd);
         return ret;
@@ -1874,27 +1882,36 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
         /* query SRAM first in case we want event logging */
         iwl_mvm_read_d3_sram(mvm);
 
+        /*
+         * Query the current location and source from the D3 firmware so we
+         * can play it back when we re-intiailize the D0 firmware
+         */
+        iwl_mvm_update_changed_regdom(mvm);
+
         if (mvm->net_detect) {
                 iwl_mvm_query_netdetect_reasons(mvm, vif);
+                /* has unlocked the mutex, so skip that */
+                goto out;
         } else {
                 keep = iwl_mvm_query_wakeup_reasons(mvm, vif);
 #ifdef CONFIG_IWLWIFI_DEBUGFS
                 if (keep)
                         mvm->keep_vif = vif;
 #endif
+                /* has unlocked the mutex, so skip that */
+                goto out_iterate;
         }
-        /* has unlocked the mutex, so skip that */
-        goto out;
 
  out_unlock:
         mutex_unlock(&mvm->mutex);
 
- out:
+out_iterate:
         if (!test)
                 ieee80211_iterate_active_interfaces_rtnl(mvm->hw,
                         IEEE80211_IFACE_ITER_NORMAL,
                         iwl_mvm_d3_disconnect_iter, keep ? vif : NULL);
 
+out:
         /* return 1 to reconfigure the device */
         set_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
         set_bit(IWL_MVM_STATUS_D3_RECONFIG, &mvm->status);
@@ -2004,6 +2021,7 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file)
         __iwl_mvm_resume(mvm, true);
         rtnl_unlock();
         iwl_abort_notification_waits(&mvm->notif_wait);
+        iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
         ieee80211_restart_hw(mvm->hw);
 
         /* wait for restart and disconnect all interfaces */
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
index 5fe14591e1c4..5f37eab5008d 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
@@ -545,6 +545,57 @@ static ssize_t iwl_dbgfs_uapsd_misbehaving_write(struct ieee80211_vif *vif,
         return ret ? count : -EINVAL;
 }
 
+static ssize_t iwl_dbgfs_rx_phyinfo_write(struct ieee80211_vif *vif, char *buf,
+                                          size_t count, loff_t *ppos)
+{
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_mvm *mvm = mvmvif->mvm;
+        struct ieee80211_chanctx_conf *chanctx_conf;
+        struct iwl_mvm_phy_ctxt *phy_ctxt;
+        u16 value;
+        int ret;
+
+        ret = kstrtou16(buf, 0, &value);
+        if (ret)
+                return ret;
+
+        mutex_lock(&mvm->mutex);
+        rcu_read_lock();
+
+        chanctx_conf = rcu_dereference(vif->chanctx_conf);
+        /* make sure the channel context is assigned */
+        if (!chanctx_conf) {
+                rcu_read_unlock();
+                mutex_unlock(&mvm->mutex);
+                return -EINVAL;
+        }
+
+        phy_ctxt = &mvm->phy_ctxts[*(u16 *)chanctx_conf->drv_priv];
+        rcu_read_unlock();
+
+        mvm->dbgfs_rx_phyinfo = value;
+
+        ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &chanctx_conf->min_def,
+                                       chanctx_conf->rx_chains_static,
+                                       chanctx_conf->rx_chains_dynamic);
+        mutex_unlock(&mvm->mutex);
+
+        return ret ?: count;
+}
+
+static ssize_t iwl_dbgfs_rx_phyinfo_read(struct file *file,
+                                         char __user *user_buf,
+                                         size_t count, loff_t *ppos)
+{
+        struct ieee80211_vif *vif = file->private_data;
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        char buf[8];
+
+        snprintf(buf, sizeof(buf), "0x%04x\n", mvmvif->mvm->dbgfs_rx_phyinfo);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, sizeof(buf));
+}
+
 #define MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz) \
         _MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz, struct ieee80211_vif)
 #define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \
@@ -560,6 +611,7 @@ MVM_DEBUGFS_READ_WRITE_FILE_OPS(pm_params, 32);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(bf_params, 256);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(low_latency, 10);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(uapsd_misbehaving, 20);
+MVM_DEBUGFS_READ_WRITE_FILE_OPS(rx_phyinfo, 10);
 
 void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 {
@@ -575,7 +627,6 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                 return;
 
         mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
-        mvmvif->mvm = mvm;
 
         if (!mvmvif->dbgfs_dir) {
                 IWL_ERR(mvm, "Failed to create debugfs directory under %s\n",
@@ -595,6 +646,8 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                                  S_IRUSR | S_IWUSR);
         MVM_DEBUGFS_ADD_FILE_VIF(uapsd_misbehaving, mvmvif->dbgfs_dir,
                                  S_IRUSR | S_IWUSR);
+        MVM_DEBUGFS_ADD_FILE_VIF(rx_phyinfo, mvmvif->dbgfs_dir,
+                                 S_IRUSR | S_IWUSR);
 
         if (vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
             mvmvif == mvm->bf_allowed_vif)
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index 82c09d86af8c..9ac04c1ea706 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -562,11 +562,12 @@ static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf,
                                "\tSecondary Channel Bitmap 0x%016llx\n",
                                le64_to_cpu(cmd->bt_secondary_ci));
 
-                pos += scnprintf(buf+pos, bufsz-pos, "BT Configuration CMD\n");
-                pos += scnprintf(buf+pos, bufsz-pos, "\tACK Kill Mask 0x%08x\n",
-                                 iwl_bt_ctl_kill_msk[mvm->bt_ack_kill_msk[0]]);
-                pos += scnprintf(buf+pos, bufsz-pos, "\tCTS Kill Mask 0x%08x\n",
-                                 iwl_bt_ctl_kill_msk[mvm->bt_cts_kill_msk[0]]);
+                pos += scnprintf(buf+pos, bufsz-pos,
+                                 "BT Configuration CMD - 0=default, 1=never, 2=always\n");
+                pos += scnprintf(buf+pos, bufsz-pos, "\tACK Kill msk idx %d\n",
+                                 mvm->bt_ack_kill_msk[0]);
+                pos += scnprintf(buf+pos, bufsz-pos, "\tCTS Kill msk idx %d\n",
+                                 mvm->bt_cts_kill_msk[0]);
 
         } else {
                 struct iwl_bt_coex_ci_cmd *cmd = &mvm->last_bt_ci_cmd;
@@ -579,21 +580,6 @@ static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf,
                 pos += scnprintf(buf+pos, bufsz-pos,
                                "\tSecondary Channel Bitmap 0x%016llx\n",
                                le64_to_cpu(cmd->bt_secondary_ci));
-
-                pos += scnprintf(buf+pos, bufsz-pos, "BT Configuration CMD\n");
-                pos += scnprintf(buf+pos, bufsz-pos,
-                                 "\tPrimary: ACK Kill Mask 0x%08x\n",
-                                 iwl_bt_ctl_kill_msk[mvm->bt_ack_kill_msk[0]]);
-                pos += scnprintf(buf+pos, bufsz-pos,
-                                 "\tPrimary: CTS Kill Mask 0x%08x\n",
-                                 iwl_bt_ctl_kill_msk[mvm->bt_cts_kill_msk[0]]);
-                pos += scnprintf(buf+pos, bufsz-pos,
-                                 "\tSecondary: ACK Kill Mask 0x%08x\n",
-                                 iwl_bt_ctl_kill_msk[mvm->bt_ack_kill_msk[1]]);
-                pos += scnprintf(buf+pos, bufsz-pos,
-                                 "\tSecondary: CTS Kill Mask 0x%08x\n",
-                                 iwl_bt_ctl_kill_msk[mvm->bt_cts_kill_msk[1]]);
-
         }
 
         mutex_unlock(&mvm->mutex);
@@ -942,7 +928,7 @@ static ssize_t iwl_dbgfs_fw_dbg_conf_read(struct file *file,
                                           size_t count, loff_t *ppos)
 {
         struct iwl_mvm *mvm = file->private_data;
-        enum iwl_fw_dbg_conf conf;
+        int conf;
         char buf[8];
         const size_t bufsz = sizeof(buf);
         int pos = 0;
@@ -966,7 +952,7 @@ static ssize_t iwl_dbgfs_fw_dbg_conf_write(struct iwl_mvm *mvm,
         if (ret)
                 return ret;
 
-        if (WARN_ON(conf_id >= FW_DBG_MAX))
+        if (WARN_ON(conf_id >= FW_DBG_CONF_MAX))
                 return -EINVAL;
 
         mutex_lock(&mvm->mutex);
@@ -985,7 +971,7 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm,
         if (ret)
                 return ret;
 
-        iwl_mvm_fw_dbg_collect(mvm);
+        iwl_mvm_fw_dbg_collect(mvm, FW_DBG_TRIGGER_USER, NULL, 0, 0);
 
         iwl_mvm_unref(mvm, IWL_MVM_REF_PRPH_WRITE);
 
@@ -1487,26 +1473,6 @@ out:
         return count;
 }
 
-static ssize_t iwl_dbgfs_enable_scan_iteration_notif_write(struct iwl_mvm *mvm,
-                                                           char *buf,
-                                                           size_t count,
-                                                           loff_t *ppos)
-{
-        int val;
-
-        mutex_lock(&mvm->mutex);
-
-        if (kstrtoint(buf, 10, &val)) {
-                mutex_unlock(&mvm->mutex);
-                return -EINVAL;
-        }
-
-        mvm->scan_iter_notif_enabled = val;
-        mutex_unlock(&mvm->mutex);
-
-        return count;
-}
-
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(prph_reg, 64);
 
 /* Device wide debugfs entries */
@@ -1529,7 +1495,6 @@ MVM_DEBUGFS_READ_WRITE_FILE_OPS(scan_ant_rxchain, 8);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(d0i3_refs, 8);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(fw_dbg_conf, 8);
 MVM_DEBUGFS_WRITE_FILE_OPS(fw_dbg_collect, 8);
-MVM_DEBUGFS_WRITE_FILE_OPS(enable_scan_iteration_notif, 8);
 
 #ifdef CONFIG_IWLWIFI_BCAST_FILTERING
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(bcast_filters, 256);
@@ -1573,8 +1538,11 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
         MVM_DEBUGFS_ADD_FILE(d0i3_refs, mvm->debugfs_dir, S_IRUSR | S_IWUSR);
         MVM_DEBUGFS_ADD_FILE(fw_dbg_conf, mvm->debugfs_dir, S_IRUSR | S_IWUSR);
         MVM_DEBUGFS_ADD_FILE(fw_dbg_collect, mvm->debugfs_dir, S_IWUSR);
-        MVM_DEBUGFS_ADD_FILE(enable_scan_iteration_notif, mvm->debugfs_dir,
-                             S_IWUSR);
+        if (!debugfs_create_bool("enable_scan_iteration_notif",
+                                 S_IRUSR | S_IWUSR,
+                                 mvm->debugfs_dir,
+                                 &mvm->scan_iter_notif_enabled))
+                goto err;
 
 #ifdef CONFIG_IWLWIFI_BCAST_FILTERING
         if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BCAST_FILTERING) {
@@ -1601,6 +1569,9 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
         if (!debugfs_create_bool("d3_wake_sysassert", S_IRUSR | S_IWUSR,
                                  mvm->debugfs_dir, &mvm->d3_wake_sysassert))
                 goto err;
+        if (!debugfs_create_u32("last_netdetect_scans", S_IRUSR,
+                                mvm->debugfs_dir, &mvm->last_netdetect_scans))
+                goto err;
         MVM_DEBUGFS_ADD_FILE(netdetect, mvm->debugfs_dir, S_IRUSR | S_IWUSR);
 #endif
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h
index f3b11897991e..d398a6102805 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h
@@ -235,36 +235,12 @@ enum iwl_bt_coex_enabled_modules {
  * struct iwl_bt_coex_cmd - bt coex configuration command
  * @mode: enum %iwl_bt_coex_mode
  * @enabled_modules: enum %iwl_bt_coex_enabled_modules
- * @max_kill: max count of Tx retries due to kill from PTA
- * @override_primary_lut: enum %iwl_bt_coex_lut_type: BT_COEX_INVALID_LUT
- *      should be set by default
- * @override_secondary_lut: enum %iwl_bt_coex_lut_type: BT_COEX_INVALID_LUT
- *      should be set by default
- * @bt4_antenna_isolation_thr: antenna threshold value
- * @bt4_tx_tx_delta_freq_thr: TxTx delta frequency
- * @bt4_tx_rx_max_freq0: TxRx max frequency
- * @multiprio_lut: multi priority LUT configuration
- * @mplut_prio_boost: BT priority boost registers
- * @decision_lut: PTA decision LUT, per Prio-Ch
  *
  * The structure is used for the BT_COEX command.
  */
 struct iwl_bt_coex_cmd {
         __le32 mode;
         __le32 enabled_modules;
-
-        __le32 max_kill;
-        __le32 override_primary_lut;
-        __le32 override_secondary_lut;
-        __le32 bt4_antenna_isolation_thr;
-
-        __le32 bt4_tx_tx_delta_freq_thr;
-        __le32 bt4_tx_rx_max_freq0;
-
-        __le32 multiprio_lut[BT_COEX_MULTI_PRIO_LUT_SIZE];
-        __le32 mplut_prio_boost[BT_COEX_BOOST_SIZE];
-
-        __le32 decision_lut[BT_COEX_MAX_LUT][BT_COEX_LUT_SIZE];
 } __packed; /* BT_COEX_CMD_API_S_VER_6 */
 
 /**
@@ -280,29 +256,6 @@ struct iwl_bt_coex_corun_lut_update_cmd {
 } __packed; /* BT_COEX_UPDATE_CORUN_LUT_API_S_VER_1 */
 
 /**
- * struct iwl_bt_coex_sw_boost - SW boost values
- * @wifi_tx_prio_boost: SW boost of wifi tx priority
- * @wifi_rx_prio_boost: SW boost of wifi rx priority
- * @kill_ack_msk: kill ACK mask. 1 - Tx ACK, 0 - kill Tx of ACK.
- * @kill_cts_msk: kill CTS mask. 1 - Tx CTS, 0 - kill Tx of CTS.
- */
-struct iwl_bt_coex_sw_boost {
-        __le32 wifi_tx_prio_boost;
-        __le32 wifi_rx_prio_boost;
-        __le32 kill_ack_msk;
-        __le32 kill_cts_msk;
-};
-
-/**
- * struct iwl_bt_coex_sw_boost_update_cmd - command to update the SW boost
- * @boost_values: check struct  %iwl_bt_coex_sw_boost - one for each channel
- *      primary / secondary / low priority
- */
-struct iwl_bt_coex_sw_boost_update_cmd {
-        struct iwl_bt_coex_sw_boost boost_values[3];
-} __packed; /* BT_COEX_UPDATE_SW_BOOST_S_VER_1 */
-
-/**
  * struct iwl_bt_coex_reduced_txp_update_cmd
  * @reduced_txp: bit BT_REDUCED_TX_POWER_BIT to enable / disable, rest of the
  *      bits are the sta_id (value)
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
index 6d3bea5c59d1..d7658d16e965 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
@@ -132,7 +132,7 @@ struct iwl_proto_offload_cmd_common {
  * @solicited_node_ipv6_addr: broken -- solicited node address exists
  *      for each target address
  * @target_ipv6_addr: our target addresses
- * @ndp_mac_addr: neighbor soliciation response MAC address
+ * @ndp_mac_addr: neighbor solicitation response MAC address
  */
 struct iwl_proto_offload_cmd_v1 {
         struct iwl_proto_offload_cmd_common common;
@@ -150,7 +150,7 @@ struct iwl_proto_offload_cmd_v1 {
  * @solicited_node_ipv6_addr: broken -- solicited node address exists
  *      for each target address
  * @target_ipv6_addr: our target addresses
- * @ndp_mac_addr: neighbor soliciation response MAC address
+ * @ndp_mac_addr: neighbor solicitation response MAC address
  */
 struct iwl_proto_offload_cmd_v2 {
         struct iwl_proto_offload_cmd_common common;
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
index c405cda1025f..f3f3ee0a766b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
@@ -70,6 +70,7 @@
 #define MAC_INDEX_AUX           4
 #define MAC_INDEX_MIN_DRIVER    0
 #define NUM_MAC_INDEX_DRIVER    MAC_INDEX_AUX
+#define NUM_MAC_INDEX           (MAC_INDEX_AUX + 1)
 
 enum iwl_ac {
         AC_BK,
@@ -254,7 +255,7 @@ struct iwl_mac_data_p2p_dev {
 /**
  * enum iwl_mac_filter_flags - MAC context filter flags
  * @MAC_FILTER_IN_PROMISC: accept all data frames
- * @MAC_FILTER_IN_CONTROL_AND_MGMT: pass all mangement and
+ * @MAC_FILTER_IN_CONTROL_AND_MGMT: pass all management and
  *      control frames to the host
  * @MAC_FILTER_ACCEPT_GRP: accept multicast frames
  * @MAC_FILTER_DIS_DECRYPT: don't decrypt unicast frames
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
index cfc0e65b34a5..4f81dcf57a73 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
@@ -70,55 +70,10 @@
 
 /* Scan Commands, Responses, Notifications */
 
-/* Masks for iwl_scan_channel.type flags */
-#define SCAN_CHANNEL_TYPE_ACTIVE        BIT(0)
-#define SCAN_CHANNEL_NARROW_BAND        BIT(22)
-
 /* Max number of IEs for direct SSID scans in a command */
 #define PROBE_OPTION_MAX                20
 
 /**
- * struct iwl_scan_channel - entry in REPLY_SCAN_CMD channel table
- * @channel: band is selected by iwl_scan_cmd "flags" field
- * @tx_gain: gain for analog radio
- * @dsp_atten: gain for DSP
- * @active_dwell: dwell time for active scan in TU, typically 5-50
- * @passive_dwell: dwell time for passive scan in TU, typically 20-500
- * @type: type is broken down to these bits:
- *      bit 0: 0 = passive, 1 = active
- *      bits 1-20: SSID direct bit map. If any of these bits is set then
- *              the corresponding SSID IE is transmitted in probe request
- *              (bit i adds IE in position i to the probe request)
- *      bit 22: channel width, 0 = regular, 1 = TGj narrow channel
- *
- * @iteration_count:
- * @iteration_interval:
- * This struct is used once for each channel in the scan list.
- * Each channel can independently select:
- * 1)  SSID for directed active scans
- * 2)  Txpower setting (for rate specified within Tx command)
- * 3)  How long to stay on-channel (behavior may be modified by quiet_time,
- *     quiet_plcp_th, good_CRC_th)
- *
- * To avoid uCode errors, make sure the following are true (see comments
- * under struct iwl_scan_cmd about max_out_time and quiet_time):
- * 1)  If using passive_dwell (i.e. passive_dwell != 0):
- *     active_dwell <= passive_dwell (< max_out_time if max_out_time != 0)
- * 2)  quiet_time <= active_dwell
- * 3)  If restricting off-channel time (i.e. max_out_time !=0):
- *     passive_dwell < max_out_time
- *     active_dwell < max_out_time
- */
-struct iwl_scan_channel {
-        __le32 type;
-        __le16 channel;
-        __le16 iteration_count;
-        __le32 iteration_interval;
-        __le16 active_dwell;
-        __le16 passive_dwell;
-} __packed; /* SCAN_CHANNEL_CONTROL_API_S_VER_1 */
-
-/**
  * struct iwl_ssid_ie - directed scan network information element
  *
  * Up to 20 of these may appear in REPLY_SCAN_CMD,
@@ -132,152 +87,6 @@ struct iwl_ssid_ie {
         u8 ssid[IEEE80211_MAX_SSID_LEN];
 } __packed; /* SCAN_DIRECT_SSID_IE_API_S_VER_1 */
 
-/**
- * iwl_scan_flags - masks for scan command flags
- *@SCAN_FLAGS_PERIODIC_SCAN:
- *@SCAN_FLAGS_P2P_PUBLIC_ACTION_FRAME_TX:
- *@SCAN_FLAGS_DELAYED_SCAN_LOWBAND:
- *@SCAN_FLAGS_DELAYED_SCAN_HIGHBAND:
- *@SCAN_FLAGS_FRAGMENTED_SCAN:
- *@SCAN_FLAGS_PASSIVE2ACTIVE: use active scan on channels that was active
- *      in the past hour, even if they are marked as passive.
- */
-enum iwl_scan_flags {
-        SCAN_FLAGS_PERIODIC_SCAN                = BIT(0),
-        SCAN_FLAGS_P2P_PUBLIC_ACTION_FRAME_TX   = BIT(1),
-        SCAN_FLAGS_DELAYED_SCAN_LOWBAND         = BIT(2),
-        SCAN_FLAGS_DELAYED_SCAN_HIGHBAND        = BIT(3),
-        SCAN_FLAGS_FRAGMENTED_SCAN              = BIT(4),
-        SCAN_FLAGS_PASSIVE2ACTIVE               = BIT(5),
-};
-
-/**
- * enum iwl_scan_type - Scan types for scan command
- * @SCAN_TYPE_FORCED:
- * @SCAN_TYPE_BACKGROUND:
- * @SCAN_TYPE_OS:
- * @SCAN_TYPE_ROAMING:
- * @SCAN_TYPE_ACTION:
- * @SCAN_TYPE_DISCOVERY:
- * @SCAN_TYPE_DISCOVERY_FORCED:
- */
-enum iwl_scan_type {
-        SCAN_TYPE_FORCED                = 0,
-        SCAN_TYPE_BACKGROUND            = 1,
-        SCAN_TYPE_OS                    = 2,
-        SCAN_TYPE_ROAMING               = 3,
-        SCAN_TYPE_ACTION                = 4,
-        SCAN_TYPE_DISCOVERY             = 5,
-        SCAN_TYPE_DISCOVERY_FORCED      = 6,
-}; /* SCAN_ACTIVITY_TYPE_E_VER_1 */
-
-/**
- * struct iwl_scan_cmd - scan request command
- * ( SCAN_REQUEST_CMD = 0x80 )
- * @len: command length in bytes
- * @scan_flags: scan flags from SCAN_FLAGS_*
- * @channel_count: num of channels in channel list
- *      (1 - ucode_capa.n_scan_channels)
- * @quiet_time: in msecs, dwell this time for active scan on quiet channels
- * @quiet_plcp_th: quiet PLCP threshold (channel is quiet if less than
- *      this number of packets were received (typically 1)
- * @passive2active: is auto switching from passive to active during scan allowed
- * @rxchain_sel_flags: RXON_RX_CHAIN_*
- * @max_out_time: in TUs, max out of serving channel time
- * @suspend_time: how long to pause scan when returning to service channel:
- *      bits 0-19: beacon interal in TUs (suspend before executing)
- *      bits 20-23: reserved
- *      bits 24-31: number of beacons (suspend between channels)
- * @rxon_flags: RXON_FLG_*
- * @filter_flags: RXON_FILTER_*
- * @tx_cmd: for active scans (zero for passive), w/o payload,
- *      no RS so specify TX rate
- * @direct_scan: direct scan SSIDs
- * @type: one of SCAN_TYPE_*
- * @repeats: how many time to repeat the scan
- */
-struct iwl_scan_cmd {
-        __le16 len;
-        u8 scan_flags;
-        u8 channel_count;
-        __le16 quiet_time;
-        __le16 quiet_plcp_th;
-        __le16 passive2active;
-        __le16 rxchain_sel_flags;
-        __le32 max_out_time;
-        __le32 suspend_time;
-        /* RX_ON_FLAGS_API_S_VER_1 */
-        __le32 rxon_flags;
-        __le32 filter_flags;
-        struct iwl_tx_cmd tx_cmd;
-        struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
-        __le32 type;
-        __le32 repeats;
-
-        /*
-         * Probe request frame, followed by channel list.
-         *
-         * Size of probe request frame is specified by byte count in tx_cmd.
-         * Channel list follows immediately after probe request frame.
-         * Number of channels in list is specified by channel_count.
-         * Each channel in list is of type:
-         *
-         * struct iwl_scan_channel channels[0];
-         *
-         * NOTE:  Only one band of channels can be scanned per pass.  You
-         * must not mix 2.4GHz channels and 5.2GHz channels, and you must wait
-         * for one scan to complete (i.e. receive SCAN_COMPLETE_NOTIFICATION)
-         * before requesting another scan.
-         */
-        u8 data[0];
-} __packed; /* SCAN_REQUEST_FIXED_PART_API_S_VER_5 */
-
-/* Response to scan request contains only status with one of these values */
-#define SCAN_RESPONSE_OK        0x1
-#define SCAN_RESPONSE_ERROR     0x2
-
-/*
- * SCAN_ABORT_CMD = 0x81
- * When scan abort is requested, the command has no fields except the common
- * header. The response contains only a status with one of these values.
- */
-#define SCAN_ABORT_POSSIBLE     0x1
-#define SCAN_ABORT_IGNORED      0x2 /* no pending scans */
-
-/* TODO: complete documentation */
-#define  SCAN_OWNER_STATUS 0x1
-#define  MEASURE_OWNER_STATUS 0x2
-
-/**
- * struct iwl_scan_start_notif - notifies start of scan in the device
- * ( SCAN_START_NOTIFICATION = 0x82 )
- * @tsf_low: TSF timer (lower half) in usecs
- * @tsf_high: TSF timer (higher half) in usecs
- * @beacon_timer: structured as follows:
- *      bits 0:19 - beacon interval in usecs
- *      bits 20:23 - reserved (0)
- *      bits 24:31 - number of beacons
- * @channel: which channel is scanned
- * @band: 0 for 5.2 GHz, 1 for 2.4 GHz
- * @status: one of *_OWNER_STATUS
- */
-struct iwl_scan_start_notif {
-        __le32 tsf_low;
-        __le32 tsf_high;
-        __le32 beacon_timer;
-        u8 channel;
-        u8 band;
-        u8 reserved[2];
-        __le32 status;
-} __packed; /* SCAN_START_NTF_API_S_VER_1 */
-
-/* scan results probe_status first bit indicates success */
-#define SCAN_PROBE_STATUS_OK            0
-#define SCAN_PROBE_STATUS_TX_FAILED     BIT(0)
-/* error statuses combined with TX_FAILED */
-#define SCAN_PROBE_STATUS_FAIL_TTL      BIT(1)
-#define SCAN_PROBE_STATUS_FAIL_BT       BIT(2)
-
 /* How many statistics are gathered for each channel */
 #define SCAN_RESULTS_STATISTICS 1
 
@@ -294,7 +103,7 @@ struct iwl_scan_start_notif {
  * @SCAN_COMP_STATUS_ERR_COEX: medium was lost ot WiMax
  * @SCAN_COMP_STATUS_P2P_ACTION_OK: P2P public action frame TX was successful
  *      (not an error!)
- * @SCAN_COMP_STATUS_ITERATION_END: indicates end of one repeatition the driver
+ * @SCAN_COMP_STATUS_ITERATION_END: indicates end of one repetition the driver
  *      asked for
  * @SCAN_COMP_STATUS_ERR_ALLOC_TE: scan could not allocate time events
 */
@@ -378,11 +187,11 @@ enum scan_framework_client {
  * struct iwl_scan_offload_cmd - SCAN_REQUEST_FIXED_PART_API_S_VER_6
  * @scan_flags:         see enum iwl_scan_flags
  * @channel_count:      channels in channel list
- * @quiet_time:         dwell time, in milisiconds, on quiet channel
+ * @quiet_time:         dwell time, in milliseconds, on quiet channel
  * @quiet_plcp_th:      quiet channel num of packets threshold
  * @good_CRC_th:        passive to active promotion threshold
  * @rx_chain:           RXON rx chain.
- * @max_out_time:       max TUs to be out of assoceated channel
+ * @max_out_time:       max TUs to be out of associated channel
  * @suspend_time:       pause scan this TUs when returning to service channel
  * @flags:              RXON flags
  * @filter_flags:       RXONfilter
@@ -423,7 +232,7 @@ enum iwl_scan_offload_channel_flags {
  *      see enum iwl_scan_offload_channel_flags.
  * __le16 channel_number: channel number 1-13 etc.
  * __le16 iter_count: repetition count for the channel.
- * __le32 iter_interval: interval between two innteration on one channel.
+ * __le32 iter_interval: interval between two iterations on one channel.
  * u8 active_dwell.
  * u8 passive_dwell.
  */
@@ -466,8 +275,8 @@ enum iwl_scan_offload_band_selection {
 /**
  * iwl_scan_offload_profile - SCAN_OFFLOAD_PROFILE_S
  * @ssid_index:         index to ssid list in fixed part
- * @unicast_cipher:     encryption olgorithm to match - bitmap
- * @aut_alg:            authentication olgorithm to match - bitmap
+ * @unicast_cipher:     encryption algorithm to match - bitmap
+ * @aut_alg:            authentication algorithm to match - bitmap
  * @network_type:       enum iwl_scan_offload_network_type
  * @band_selection:     enum iwl_scan_offload_band_selection
  * @client_bitmap:      clients waiting for match - enum scan_framework_client
@@ -939,7 +748,7 @@ enum iwl_umac_scan_general_flags {
  * @flags:              bitmap - 0-19:  directed scan to i'th ssid.
  * @channel_num:        channel number 1-13 etc.
  * @iter_count:         repetition count for the channel.
- * @iter_interval:      interval between two scan interations on one channel.
+ * @iter_interval:      interval between two scan iterations on one channel.
  */
 struct iwl_scan_channel_cfg_umac {
         __le32 flags;
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h
index 928168b18346..709e28d8b1b0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h
@@ -65,6 +65,7 @@
 
 #ifndef __fw_api_stats_h__
 #define __fw_api_stats_h__
+#include "fw-api-mac.h"
 
 struct mvm_statistics_dbg {
         __le32 burst_check;
@@ -218,7 +219,7 @@ struct mvm_statistics_bt_activity {
         __le32 lo_priority_rx_denied_cnt;
 } __packed;  /* STATISTICS_BT_ACTIVITY_API_S_VER_1 */
 
-struct mvm_statistics_general {
+struct mvm_statistics_general_v5 {
         __le32 radio_temperature;
         __le32 radio_voltage;
         struct mvm_statistics_dbg dbg;
@@ -244,6 +245,39 @@ struct mvm_statistics_general {
         struct mvm_statistics_bt_activity bt_activity;
 } __packed; /* STATISTICS_GENERAL_API_S_VER_5 */
 
+struct mvm_statistics_general_v8 {
+        __le32 radio_temperature;
+        __le32 radio_voltage;
+        struct mvm_statistics_dbg dbg;
+        __le32 sleep_time;
+        __le32 slots_out;
+        __le32 slots_idle;
+        __le32 ttl_timestamp;
+        struct mvm_statistics_div slow_div;
+        __le32 rx_enable_counter;
+        /*
+         * num_of_sos_states:
+         *  count the number of times we have to re-tune
+         *  in order to get out of bad PHY status
+         */
+        __le32 num_of_sos_states;
+        __le32 beacon_filtered;
+        __le32 missed_beacons;
+        __s8 beacon_filter_average_energy;
+        __s8 beacon_filter_reason;
+        __s8 beacon_filter_current_energy;
+        __s8 beacon_filter_reserved;
+        __le32 beacon_filter_delta_time;
+        struct mvm_statistics_bt_activity bt_activity;
+        __le64 rx_time;
+        __le64 on_time_rf;
+        __le64 on_time_scan;
+        __le64 tx_time;
+        __le32 beacon_counter[NUM_MAC_INDEX];
+        u8 beacon_average_energy[NUM_MAC_INDEX];
+        u8 reserved[4 - (NUM_MAC_INDEX % 4)];
+} __packed; /* STATISTICS_GENERAL_API_S_VER_8 */
+
 struct mvm_statistics_rx {
         struct mvm_statistics_rx_phy ofdm;
         struct mvm_statistics_rx_phy cck;
@@ -256,22 +290,28 @@ struct mvm_statistics_rx {
  *
  * By default, uCode issues this notification after receiving a beacon
  * while associated.  To disable this behavior, set DISABLE_NOTIF flag in the
- * REPLY_STATISTICS_CMD 0x9c, above.
- *
- * Statistics counters continue to increment beacon after beacon, but are
- * cleared when changing channels or when driver issues REPLY_STATISTICS_CMD
- * 0x9c with CLEAR_STATS bit set (see above).
- *
- * uCode also issues this notification during scans.  uCode clears statistics
- * appropriately so that each notification contains statistics for only the
- * one channel that has just been scanned.
+ * STATISTICS_CMD (0x9c), below.
  */
 
-struct iwl_notif_statistics {
+struct iwl_notif_statistics_v8 {
         __le32 flag;
         struct mvm_statistics_rx rx;
         struct mvm_statistics_tx tx;
-        struct mvm_statistics_general general;
+        struct mvm_statistics_general_v5 general;
 } __packed; /* STATISTICS_NTFY_API_S_VER_8 */
 
+struct iwl_notif_statistics_v10 {
+        __le32 flag;
+        struct mvm_statistics_rx rx;
+        struct mvm_statistics_tx tx;
+        struct mvm_statistics_general_v8 general;
+} __packed; /* STATISTICS_NTFY_API_S_VER_10 */
+
+#define IWL_STATISTICS_FLG_CLEAR                0x1
+#define IWL_STATISTICS_FLG_DISABLE_NOTIF        0x2
+
+struct iwl_statistics_cmd {
+        __le32 flags;
+} __packed; /* STATISTICS_CMD_API_S_VER_1 */
+
 #endif /* __fw_api_stats_h__ */
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index b56154fe8ec5..aab68cbae754 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -192,6 +192,7 @@ enum {
         BEACON_NOTIFICATION = 0x90,
         BEACON_TEMPLATE_CMD = 0x91,
         TX_ANT_CONFIGURATION_CMD = 0x98,
+        STATISTICS_CMD = 0x9c,
         STATISTICS_NOTIFICATION = 0x9d,
         EOSP_NOTIFICATION = 0x9e,
         REDUCE_TX_POWER_CMD = 0x9f,
@@ -211,6 +212,10 @@ enum {
         REPLY_RX_MPDU_CMD = 0xc1,
         BA_NOTIF = 0xc5,
 
+        /* Location Aware Regulatory */
+        MCC_UPDATE_CMD = 0xc8,
+        MCC_CHUB_UPDATE_CMD = 0xc9,
+
         MARKER_CMD = 0xcb,
 
         /* BT Coex */
@@ -361,7 +366,8 @@ enum {
         NVM_SECTION_TYPE_CALIBRATION = 4,
         NVM_SECTION_TYPE_PRODUCTION = 5,
         NVM_SECTION_TYPE_MAC_OVERRIDE = 11,
-        NVM_MAX_NUM_SECTIONS = 12,
+        NVM_SECTION_TYPE_PHY_SKU = 12,
+        NVM_MAX_NUM_SECTIONS = 13,
 };
 
 /**
@@ -431,7 +437,7 @@ enum {
 
 #define IWL_ALIVE_FLG_RFKILL    BIT(0)
 
-struct mvm_alive_resp {
+struct mvm_alive_resp_ver1 {
         __le16 status;
         __le16 flags;
         u8 ucode_minor;
@@ -482,6 +488,30 @@ struct mvm_alive_resp_ver2 {
         __le32 dbg_print_buff_addr;
 } __packed; /* ALIVE_RES_API_S_VER_2 */
 
+struct mvm_alive_resp {
+        __le16 status;
+        __le16 flags;
+        __le32 ucode_minor;
+        __le32 ucode_major;
+        u8 ver_subtype;
+        u8 ver_type;
+        u8 mac;
+        u8 opt;
+        __le32 timestamp;
+        __le32 error_event_table_ptr;   /* SRAM address for error log */
+        __le32 log_event_table_ptr;     /* SRAM address for LMAC event log */
+        __le32 cpu_register_ptr;
+        __le32 dbgm_config_ptr;
+        __le32 alive_counter_ptr;
+        __le32 scd_base_ptr;            /* SRAM address for SCD */
+        __le32 st_fwrd_addr;            /* pointer to Store and forward */
+        __le32 st_fwrd_size;
+        __le32 umac_minor;              /* UMAC version: minor */
+        __le32 umac_major;              /* UMAC version: major */
+        __le32 error_info_addr;         /* SRAM address for UMAC error log */
+        __le32 dbg_print_buff_addr;
+} __packed; /* ALIVE_RES_API_S_VER_3 */
+
 /* Error response/notification */
 enum {
         FW_ERR_UNKNOWN_CMD = 0x0,
@@ -1417,7 +1447,19 @@ enum iwl_sf_scenario {
 #define SF_W_MARK_LEGACY 4096
 #define SF_W_MARK_SCAN 4096
 
-/* SF Scenarios timers for FULL_ON state (aligned to 32 uSec) */
+/* SF Scenarios timers for default configuration (aligned to 32 uSec) */
+#define SF_SINGLE_UNICAST_IDLE_TIMER_DEF 160    /* 150 uSec  */
+#define SF_SINGLE_UNICAST_AGING_TIMER_DEF 400   /* 0.4 mSec */
+#define SF_AGG_UNICAST_IDLE_TIMER_DEF 160               /* 150 uSec */
+#define SF_AGG_UNICAST_AGING_TIMER_DEF 400              /* 0.4 mSec */
+#define SF_MCAST_IDLE_TIMER_DEF 160             /* 150 mSec */
+#define SF_MCAST_AGING_TIMER_DEF 400            /* 0.4 mSec */
+#define SF_BA_IDLE_TIMER_DEF 160                        /* 150 uSec */
+#define SF_BA_AGING_TIMER_DEF 400                       /* 0.4 mSec */
+#define SF_TX_RE_IDLE_TIMER_DEF 160                     /* 150 uSec */
+#define SF_TX_RE_AGING_TIMER_DEF 400            /* 0.4 mSec */
+
+/* SF Scenarios timers for BSS MAC configuration (aligned to 32 uSec) */
 #define SF_SINGLE_UNICAST_IDLE_TIMER 320        /* 300 uSec  */
 #define SF_SINGLE_UNICAST_AGING_TIMER 2016      /* 2 mSec */
 #define SF_AGG_UNICAST_IDLE_TIMER 320           /* 300 uSec */
@@ -1448,6 +1490,92 @@ struct iwl_sf_cfg_cmd {
         __le32 full_on_timeouts[SF_NUM_SCENARIO][SF_NUM_TIMEOUT_TYPES];
 } __packed; /* SF_CFG_API_S_VER_2 */
 
+/***********************************
+ * Location Aware Regulatory (LAR) API - MCC updates
+ ***********************************/
+
+/**
+ * struct iwl_mcc_update_cmd - Request the device to update geographic
+ * regulatory profile according to the given MCC (Mobile Country Code).
+ * The MCC is two letter-code, ascii upper case[A-Z] or '00' for world domain.
+ * 'ZZ' MCC will be used to switch to NVM default profile; in this case, the
+ * MCC in the cmd response will be the relevant MCC in the NVM.
+ * @mcc: given mobile country code
+ * @source_id: the source from where we got the MCC, see iwl_mcc_source
+ * @reserved: reserved for alignment
+ */
+struct iwl_mcc_update_cmd {
+        __le16 mcc;
+        u8 source_id;
+        u8 reserved;
+} __packed; /* LAR_UPDATE_MCC_CMD_API_S */
+
+/**
+ * iwl_mcc_update_resp - response to MCC_UPDATE_CMD.
+ * Contains the new channel control profile map, if changed, and the new MCC
+ * (mobile country code).
+ * The new MCC may be different than what was requested in MCC_UPDATE_CMD.
+ * @status: see &enum iwl_mcc_update_status
+ * @mcc: the new applied MCC
+ * @cap: capabilities for all channels which matches the MCC
+ * @source_id: the MCC source, see iwl_mcc_source
+ * @n_channels: number of channels in @channels_data (may be 14, 39, 50 or 51
+ *              channels, depending on platform)
+ * @channels: channel control data map, DWORD for each channel. Only the first
+ *      16bits are used.
+ */
+struct iwl_mcc_update_resp {
+        __le32 status;
+        __le16 mcc;
+        u8 cap;
+        u8 source_id;
+        __le32 n_channels;
+        __le32 channels[0];
+} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S */
+
+/**
+ * struct iwl_mcc_chub_notif - chub notifies of mcc change
+ * (MCC_CHUB_UPDATE_CMD = 0xc9)
+ * The Chub (Communication Hub, CommsHUB) is a HW component that connects to
+ * the cellular and connectivity cores that gets updates of the mcc, and
+ * notifies the ucode directly of any mcc change.
+ * The ucode requests the driver to request the device to update geographic
+ * regulatory  profile according to the given MCC (Mobile Country Code).
+ * The MCC is two letter-code, ascii upper case[A-Z] or '00' for world domain.
+ * 'ZZ' MCC will be used to switch to NVM default profile; in this case, the
+ * MCC in the cmd response will be the relevant MCC in the NVM.
+ * @mcc: given mobile country code
+ * @source_id: identity of the change originator, see iwl_mcc_source
+ * @reserved1: reserved for alignment
+ */
+struct iwl_mcc_chub_notif {
+        u16 mcc;
+        u8 source_id;
+        u8 reserved1;
+} __packed; /* LAR_MCC_NOTIFY_S */
+
+enum iwl_mcc_update_status {
+        MCC_RESP_NEW_CHAN_PROFILE,
+        MCC_RESP_SAME_CHAN_PROFILE,
+        MCC_RESP_INVALID,
+        MCC_RESP_NVM_DISABLED,
+        MCC_RESP_ILLEGAL,
+        MCC_RESP_LOW_PRIORITY,
+};
+
+enum iwl_mcc_source {
+        MCC_SOURCE_OLD_FW = 0,
+        MCC_SOURCE_ME = 1,
+        MCC_SOURCE_BIOS = 2,
+        MCC_SOURCE_3G_LTE_HOST = 3,
+        MCC_SOURCE_3G_LTE_DEVICE = 4,
+        MCC_SOURCE_WIFI = 5,
+        MCC_SOURCE_RESERVED = 6,
+        MCC_SOURCE_DEFAULT = 7,
+        MCC_SOURCE_UNINITIALIZED = 8,
+        MCC_SOURCE_GET_CURRENT = 0x10
+};
+
 /* DTS measurements */
 
 enum iwl_dts_measurement_flags {
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index ca38e9817374..bc5eac4960e1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -112,25 +112,27 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
         struct iwl_mvm *mvm =
                 container_of(notif_wait, struct iwl_mvm, notif_wait);
         struct iwl_mvm_alive_data *alive_data = data;
-        struct mvm_alive_resp *palive;
+        struct mvm_alive_resp_ver1 *palive1;
         struct mvm_alive_resp_ver2 *palive2;
+        struct mvm_alive_resp *palive;
 
-        if (iwl_rx_packet_payload_len(pkt) == sizeof(*palive)) {
-                palive = (void *)pkt->data;
+        if (iwl_rx_packet_payload_len(pkt) == sizeof(*palive1)) {
+                palive1 = (void *)pkt->data;
 
                 mvm->support_umac_log = false;
                 mvm->error_event_table =
-                        le32_to_cpu(palive->error_event_table_ptr);
-                mvm->log_event_table = le32_to_cpu(palive->log_event_table_ptr);
-                alive_data->scd_base_addr = le32_to_cpu(palive->scd_base_ptr);
+                        le32_to_cpu(palive1->error_event_table_ptr);
+                mvm->log_event_table =
+                        le32_to_cpu(palive1->log_event_table_ptr);
+                alive_data->scd_base_addr = le32_to_cpu(palive1->scd_base_ptr);
 
-                alive_data->valid = le16_to_cpu(palive->status) ==
+                alive_data->valid = le16_to_cpu(palive1->status) ==
                                     IWL_ALIVE_STATUS_OK;
                 IWL_DEBUG_FW(mvm,
                              "Alive VER1 ucode status 0x%04x revision 0x%01X 0x%01X flags 0x%01X\n",
-                             le16_to_cpu(palive->status), palive->ver_type,
-                             palive->ver_subtype, palive->flags);
-        } else {
+                             le16_to_cpu(palive1->status), palive1->ver_type,
+                             palive1->ver_subtype, palive1->flags);
+        } else if (iwl_rx_packet_payload_len(pkt) == sizeof(*palive2)) {
                 palive2 = (void *)pkt->data;
 
                 mvm->error_event_table =
@@ -156,6 +158,33 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
                 IWL_DEBUG_FW(mvm,
                              "UMAC version: Major - 0x%x, Minor - 0x%x\n",
                              palive2->umac_major, palive2->umac_minor);
+        } else if (iwl_rx_packet_payload_len(pkt) == sizeof(*palive)) {
+                palive = (void *)pkt->data;
+
+                mvm->error_event_table =
+                        le32_to_cpu(palive->error_event_table_ptr);
+                mvm->log_event_table =
+                        le32_to_cpu(palive->log_event_table_ptr);
+                alive_data->scd_base_addr = le32_to_cpu(palive->scd_base_ptr);
+                mvm->umac_error_event_table =
+                        le32_to_cpu(palive->error_info_addr);
+                mvm->sf_space.addr = le32_to_cpu(palive->st_fwrd_addr);
+                mvm->sf_space.size = le32_to_cpu(palive->st_fwrd_size);
+
+                alive_data->valid = le16_to_cpu(palive->status) ==
+                                    IWL_ALIVE_STATUS_OK;
+                if (mvm->umac_error_event_table)
+                        mvm->support_umac_log = true;
+
+                IWL_DEBUG_FW(mvm,
+                             "Alive VER3 ucode status 0x%04x revision 0x%01X 0x%01X flags 0x%01X\n",
+                             le16_to_cpu(palive->status), palive->ver_type,
+                             palive->ver_subtype, palive->flags);
+
+                IWL_DEBUG_FW(mvm,
+                             "UMAC version: Major - 0x%x, Minor - 0x%x\n",
+                             le32_to_cpu(palive->umac_major),
+                             le32_to_cpu(palive->umac_minor));
         }
 
         return true;
@@ -188,8 +217,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
         struct iwl_sf_region st_fwrd_space;
 
         if (ucode_type == IWL_UCODE_REGULAR &&
-            iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_CUSTOM) &&
-            iwl_fw_dbg_conf_enabled(mvm->fw, FW_DBG_CUSTOM))
+            iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_START_FROM_ALIVE))
                 fw = iwl_get_ucode_image(mvm, IWL_UCODE_REGULAR_USNIFFER);
         else
                 fw = iwl_get_ucode_image(mvm, ucode_type);
@@ -451,20 +479,97 @@ exit:
         iwl_free_resp(&cmd);
 }
 
-void iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm)
+int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
+                                struct iwl_mvm_dump_desc *desc,
+                                unsigned int delay)
 {
+        if (test_and_set_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status))
+                return -EBUSY;
+
+        if (WARN_ON(mvm->fw_dump_desc))
+                iwl_mvm_free_fw_dump_desc(mvm);
+
+        IWL_WARN(mvm, "Collecting data: trigger %d fired.\n",
+                 le32_to_cpu(desc->trig_desc.type));
+
+        mvm->fw_dump_desc = desc;
+
         /* stop recording */
         if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
                 iwl_set_bits_prph(mvm->trans, MON_BUFF_SAMPLE_CTL, 0x100);
         } else {
                 iwl_write_prph(mvm->trans, DBGC_IN_SAMPLE, 0);
-                iwl_write_prph(mvm->trans, DBGC_OUT_CTRL, 0);
+                /* wait before we collect the data till the DBGC stop */
+                udelay(100);
+        }
+
+        queue_delayed_work(system_wq, &mvm->fw_dump_wk, delay);
+
+        return 0;
+}
+
+int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,
+                           const char *str, size_t len, unsigned int delay)
+{
+        struct iwl_mvm_dump_desc *desc;
+
+        desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);
+        if (!desc)
+                return -ENOMEM;
+
+        desc->len = len;
+        desc->trig_desc.type = cpu_to_le32(trig);
+        memcpy(desc->trig_desc.data, str, len);
+
+        return iwl_mvm_fw_dbg_collect_desc(mvm, desc, delay);
+}
+
+int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,
+                                struct iwl_fw_dbg_trigger_tlv *trigger,
+                                const char *fmt, ...)
+{
+        unsigned int delay = msecs_to_jiffies(le32_to_cpu(trigger->stop_delay));
+        u16 occurrences = le16_to_cpu(trigger->occurrences);
+        int ret, len = 0;
+        char buf[64];
+
+        if (!occurrences)
+                return 0;
+
+        if (fmt) {
+                va_list ap;
+
+                buf[sizeof(buf) - 1] = '\0';
+
+                va_start(ap, fmt);
+                vsnprintf(buf, sizeof(buf), fmt, ap);
+                va_end(ap);
+
+                /* check for truncation */
+                if (WARN_ON_ONCE(buf[sizeof(buf) - 1]))
+                        buf[sizeof(buf) - 1] = '\0';
+
+                len = strlen(buf) + 1;
         }
 
-        schedule_work(&mvm->fw_error_dump_wk);
+        ret = iwl_mvm_fw_dbg_collect(mvm, le32_to_cpu(trigger->id), buf,
+                                     len, delay);
+        if (ret)
+                return ret;
+
+        trigger->occurrences = cpu_to_le16(occurrences - 1);
+        return 0;
 }
 
-int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, enum iwl_fw_dbg_conf conf_id)
+static inline void iwl_mvm_restart_early_start(struct iwl_mvm *mvm)
+{
+        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000)
+                iwl_clear_bits_prph(mvm->trans, MON_BUFF_SAMPLE_CTL, 0x100);
+        else
+                iwl_write_prph(mvm->trans, DBGC_IN_SAMPLE, 1);
+}
+
+int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 conf_id)
 {
         u8 *ptr;
         int ret;
@@ -474,6 +579,14 @@ int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, enum iwl_fw_dbg_conf conf_id)
                       "Invalid configuration %d\n", conf_id))
                 return -EINVAL;
 
+        /* EARLY START - firmware's configuration is hard coded */
+        if ((!mvm->fw->dbg_conf_tlv[conf_id] ||
+             !mvm->fw->dbg_conf_tlv[conf_id]->num_of_hcmds) &&
+            conf_id == FW_DBG_START_FROM_ALIVE) {
+                iwl_mvm_restart_early_start(mvm);
+                return 0;
+        }
+
         if (!mvm->fw->dbg_conf_tlv[conf_id])
                 return -EINVAL;
 
@@ -583,7 +696,10 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
                 IWL_ERR(mvm, "Failed to initialize Smart Fifo\n");
 
         mvm->fw_dbg_conf = FW_DBG_INVALID;
-        iwl_mvm_start_fw_dbg_conf(mvm, FW_DBG_CUSTOM);
+        /* if we have a destination, assume EARLY START */
+        if (mvm->fw->dbg_dest_tlv)
+                mvm->fw_dbg_conf = FW_DBG_START_FROM_ALIVE;
+        iwl_mvm_start_fw_dbg_conf(mvm, FW_DBG_START_FROM_ALIVE);
 
         ret = iwl_send_tx_ant_cfg(mvm, iwl_mvm_get_valid_tx_ant(mvm));
         if (ret)
@@ -640,6 +756,16 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
         if (ret)
                 goto error;
 
+        /*
+         * RTNL is not taken during Ct-kill, but we don't need to scan/Tx
+         * anyway, so don't init MCC.
+         */
+        if (!test_bit(IWL_MVM_STATUS_HW_CTKILL, &mvm->status)) {
+                ret = iwl_mvm_init_mcc(mvm);
+                if (ret)
+                        goto error;
+        }
+
         if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
                 ret = iwl_mvm_config_scan(mvm);
                 if (ret)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index 7bdc6220743f..8088c7137f7c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -244,6 +244,7 @@ static void iwl_mvm_mac_sta_hw_queues_iter(void *_data,
 unsigned long iwl_mvm_get_used_hw_queues(struct iwl_mvm *mvm,
                                          struct ieee80211_vif *exclude_vif)
 {
+        u8 sta_id;
         struct iwl_mvm_hw_queues_iface_iterator_data data = {
                 .exclude_vif = exclude_vif,
                 .used_hw_queues =
@@ -264,6 +265,13 @@ unsigned long iwl_mvm_get_used_hw_queues(struct iwl_mvm *mvm,
                                           iwl_mvm_mac_sta_hw_queues_iter,
                                           &data);
 
+        /*
+         * Some TDLS stations may be removed but are in the process of being
+         * drained. Don't touch their queues.
+         */
+        for_each_set_bit(sta_id, mvm->sta_drained, IWL_MVM_STATION_COUNT)
+                data.used_hw_queues |= mvm->tfd_drained[sta_id];
+
         return data.used_hw_queues;
 }
 
@@ -462,9 +470,8 @@ exit_fail:
 
 int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 {
-        unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?
-                                        mvm->cfg->base_params->wd_timeout :
-                                        IWL_WATCHDOG_DISABLED;
+        unsigned int wdg_timeout =
+                iwl_mvm_get_wd_timeout(mvm, vif, false, false);
         u32 ac;
         int ret;
 
@@ -1367,10 +1374,18 @@ static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac,
 {
         struct iwl_missed_beacons_notif *missed_beacons = _data;
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_mvm *mvm = mvmvif->mvm;
+        struct iwl_fw_dbg_trigger_missed_bcon *bcon_trig;
+        struct iwl_fw_dbg_trigger_tlv *trigger;
+        u32 stop_trig_missed_bcon, stop_trig_missed_bcon_since_rx;
+        u32 rx_missed_bcon, rx_missed_bcon_since_rx;
 
         if (mvmvif->id != (u16)le32_to_cpu(missed_beacons->mac_id))
                 return;
 
+        rx_missed_bcon = le32_to_cpu(missed_beacons->consec_missed_beacons);
+        rx_missed_bcon_since_rx =
+                le32_to_cpu(missed_beacons->consec_missed_beacons_since_last_rx);
         /*
          * TODO: the threshold should be adjusted based on latency conditions,
          * and/or in case of a CS flow on one of the other AP vifs.
@@ -1378,6 +1393,26 @@ static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac,
         if (le32_to_cpu(missed_beacons->consec_missed_beacons_since_last_rx) >
              IWL_MVM_MISSED_BEACONS_THRESHOLD)
                 ieee80211_beacon_loss(vif);
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw,
+                                        FW_DBG_TRIGGER_MISSED_BEACONS))
+                return;
+
+        trigger = iwl_fw_dbg_get_trigger(mvm->fw,
+                                         FW_DBG_TRIGGER_MISSED_BEACONS);
+        bcon_trig = (void *)trigger->data;
+        stop_trig_missed_bcon = le32_to_cpu(bcon_trig->stop_consec_missed_bcon);
+        stop_trig_missed_bcon_since_rx =
+                le32_to_cpu(bcon_trig->stop_consec_missed_bcon_since_rx);
+
+        /* TODO: implement start trigger */
+
+        if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trigger))
+                return;
+
+        if (rx_missed_bcon_since_rx >= stop_trig_missed_bcon_since_rx ||
+            rx_missed_bcon >= stop_trig_missed_bcon)
+                iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL);
 }
 
 int iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 09654e73a533..84555170b6f7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -86,6 +86,7 @@
 #include "iwl-fw-error-dump.h"
 #include "iwl-prph.h"
 #include "iwl-csr.h"
+#include "iwl-nvm-parse.h"
 
 static const struct ieee80211_iface_limit iwl_mvm_limits[] = {
         {
@@ -301,6 +302,116 @@ static void iwl_mvm_reset_phy_ctxts(struct iwl_mvm *mvm)
         }
 }
 
+struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
+                                                  const char *alpha2,
+                                                  enum iwl_mcc_source src_id,
+                                                  bool *changed)
+{
+        struct ieee80211_regdomain *regd = NULL;
+        struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
+        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+        struct iwl_mcc_update_resp *resp;
+
+        IWL_DEBUG_LAR(mvm, "Getting regdomain data for %s from FW\n", alpha2);
+
+        lockdep_assert_held(&mvm->mutex);
+
+        resp = iwl_mvm_update_mcc(mvm, alpha2, src_id);
+        if (IS_ERR_OR_NULL(resp)) {
+                IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n",
+                              PTR_RET(resp));
+                goto out;
+        }
+
+        if (changed)
+                *changed = (resp->status == MCC_RESP_NEW_CHAN_PROFILE);
+
+        regd = iwl_parse_nvm_mcc_info(mvm->trans->dev, mvm->cfg,
+                                      __le32_to_cpu(resp->n_channels),
+                                      resp->channels,
+                                      __le16_to_cpu(resp->mcc));
+        /* Store the return source id */
+        src_id = resp->source_id;
+        kfree(resp);
+        if (IS_ERR_OR_NULL(regd)) {
+                IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n",
+                              PTR_RET(regd));
+                goto out;
+        }
+
+        IWL_DEBUG_LAR(mvm, "setting alpha2 from FW to %s (0x%x, 0x%x) src=%d\n",
+                      regd->alpha2, regd->alpha2[0], regd->alpha2[1], src_id);
+        mvm->lar_regdom_set = true;
+        mvm->mcc_src = src_id;
+
+out:
+        return regd;
+}
+
+void iwl_mvm_update_changed_regdom(struct iwl_mvm *mvm)
+{
+        bool changed;
+        struct ieee80211_regdomain *regd;
+
+        if (!iwl_mvm_is_lar_supported(mvm))
+                return;
+
+        regd = iwl_mvm_get_current_regdomain(mvm, &changed);
+        if (!IS_ERR_OR_NULL(regd)) {
+                /* only update the regulatory core if changed */
+                if (changed)
+                        regulatory_set_wiphy_regd(mvm->hw->wiphy, regd);
+
+                kfree(regd);
+        }
+}
+
+struct ieee80211_regdomain *iwl_mvm_get_current_regdomain(struct iwl_mvm *mvm,
+                                                          bool *changed)
+{
+        return iwl_mvm_get_regdomain(mvm->hw->wiphy, "ZZ",
+                                     iwl_mvm_is_wifi_mcc_supported(mvm) ?
+                                     MCC_SOURCE_GET_CURRENT :
+                                     MCC_SOURCE_OLD_FW, changed);
+}
+
+int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm)
+{
+        enum iwl_mcc_source used_src;
+        struct ieee80211_regdomain *regd;
+        int ret;
+        bool changed;
+        const struct ieee80211_regdomain *r =
+                        rtnl_dereference(mvm->hw->wiphy->regd);
+
+        if (!r)
+                return -ENOENT;
+
+        /* save the last source in case we overwrite it below */
+        used_src = mvm->mcc_src;
+        if (iwl_mvm_is_wifi_mcc_supported(mvm)) {
+                /* Notify the firmware we support wifi location updates */
+                regd = iwl_mvm_get_current_regdomain(mvm, NULL);
+                if (!IS_ERR_OR_NULL(regd))
+                        kfree(regd);
+        }
+
+        /* Now set our last stored MCC and source */
+        regd = iwl_mvm_get_regdomain(mvm->hw->wiphy, r->alpha2, used_src,
+                                     &changed);
+        if (IS_ERR_OR_NULL(regd))
+                return -EIO;
+
+        /* update cfg80211 if the regdomain was changed */
+        if (changed)
+                ret = regulatory_set_wiphy_regd_sync_rtnl(mvm->hw->wiphy, regd);
+        else
+                ret = 0;
+
+        kfree(regd);
+        return ret;
+}
+
 int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 {
         struct ieee80211_hw *hw = mvm->hw;
@@ -339,13 +450,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
             !iwlwifi_mod_params.sw_crypto)
                 hw->flags |= IEEE80211_HW_MFP_CAPABLE;
 
-        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN ||
-            mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
-                hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
-                hw->wiphy->features |=
-                        NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
-                        NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
-        }
+        hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
+        hw->wiphy->features |=
+                NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
+                NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
 
         hw->sta_data_size = sizeof(struct iwl_mvm_sta);
         hw->vif_data_size = sizeof(struct iwl_mvm_vif);
@@ -359,8 +467,12 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                 BIT(NL80211_IFTYPE_ADHOC);
 
         hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
-        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
-                                       REGULATORY_DISABLE_BEACON_HINTS;
+        hw->wiphy->regulatory_flags |= REGULATORY_ENABLE_RELAX_NO_IR;
+        if (iwl_mvm_is_lar_supported(mvm))
+                hw->wiphy->regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;
+        else
+                hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
+                                               REGULATORY_DISABLE_BEACON_HINTS;
 
         if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_GO_UAPSD)
                 hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
@@ -892,12 +1004,26 @@ static void iwl_mvm_dump_fifos(struct iwl_mvm *mvm,
         iwl_trans_release_nic_access(mvm->trans, &flags);
 }
 
+void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm)
+{
+        if (mvm->fw_dump_desc == &iwl_mvm_dump_desc_assert ||
+            !mvm->fw_dump_desc)
+                return;
+
+        kfree(mvm->fw_dump_desc);
+        mvm->fw_dump_desc = NULL;
+}
+
+#define IWL8260_ICCM_OFFSET             0x44000 /* Only for B-step */
+#define IWL8260_ICCM_LEN                0xC000 /* Only for B-step */
+
 void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
 {
         struct iwl_fw_error_dump_file *dump_file;
         struct iwl_fw_error_dump_data *dump_data;
         struct iwl_fw_error_dump_info *dump_info;
         struct iwl_fw_error_dump_mem *dump_mem;
+        struct iwl_fw_error_dump_trigger_desc *dump_trig;
         struct iwl_mvm_dump_ptrs *fw_error_dump;
         u32 sram_len, sram_ofs;
         u32 file_len, fifo_data_len = 0;
@@ -906,16 +1032,6 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
 
         lockdep_assert_held(&mvm->mutex);
 
-        /* W/A for 8000 HW family A-step */
-        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
-            CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_A_STEP) {
-                if (smem_len)
-                        smem_len = 0x38000;
-
-                if (sram2_len)
-                        sram2_len = 0x10000;
-        }
-
         fw_error_dump = kzalloc(sizeof(*fw_error_dump), GFP_KERNEL);
         if (!fw_error_dump)
                 return;
@@ -967,6 +1083,18 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
                    fifo_data_len +
                    sizeof(*dump_info);
 
+        /*
+         * In 8000 HW family B-step include the ICCM (which resides separately)
+         */
+        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
+            CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP)
+                file_len += sizeof(*dump_data) + sizeof(*dump_mem) +
+                            IWL8260_ICCM_LEN;
+
+        if (mvm->fw_dump_desc)
+                file_len += sizeof(*dump_data) + sizeof(*dump_trig) +
+                            mvm->fw_dump_desc->len;
+
         /* Make room for the SMEM, if it exists */
         if (smem_len)
                 file_len += sizeof(*dump_data) + sizeof(*dump_mem) + smem_len;
@@ -978,6 +1106,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
         dump_file = vzalloc(file_len);
         if (!dump_file) {
                 kfree(fw_error_dump);
+                iwl_mvm_free_fw_dump_desc(mvm);
                 return;
         }
 
@@ -1006,6 +1135,19 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
         if (test_bit(STATUS_FW_ERROR, &mvm->trans->status))
                 iwl_mvm_dump_fifos(mvm, &dump_data);
 
+        if (mvm->fw_dump_desc) {
+                dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_ERROR_INFO);
+                dump_data->len = cpu_to_le32(sizeof(*dump_trig) +
+                                             mvm->fw_dump_desc->len);
+                dump_trig = (void *)dump_data->data;
+                memcpy(dump_trig, &mvm->fw_dump_desc->trig_desc,
+                       sizeof(*dump_trig) + mvm->fw_dump_desc->len);
+
+                /* now we can free this copy */
+                iwl_mvm_free_fw_dump_desc(mvm);
+                dump_data = iwl_fw_error_next_data(dump_data);
+        }
+
         dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
         dump_data->len = cpu_to_le32(sram_len + sizeof(*dump_mem));
         dump_mem = (void *)dump_data->data;
@@ -1036,6 +1178,19 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
                                          dump_mem->data, sram2_len);
         }
 
+        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
+            CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP) {
+                dump_data = iwl_fw_error_next_data(dump_data);
+                dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
+                dump_data->len = cpu_to_le32(IWL8260_ICCM_LEN +
+                                             sizeof(*dump_mem));
+                dump_mem = (void *)dump_data->data;
+                dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);
+                dump_mem->offset = cpu_to_le32(IWL8260_ICCM_OFFSET);
+                iwl_trans_read_mem_bytes(mvm->trans, IWL8260_ICCM_OFFSET,
+                                         dump_mem->data, IWL8260_ICCM_LEN);
+        }
+
         fw_error_dump->trans_ptr = iwl_trans_dump_data(mvm->trans);
         fw_error_dump->op_mode_len = file_len;
         if (fw_error_dump->trans_ptr)
@@ -1044,16 +1199,26 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
 
         dev_coredumpm(mvm->trans->dev, THIS_MODULE, fw_error_dump, 0,
                       GFP_KERNEL, iwl_mvm_read_coredump, iwl_mvm_free_coredump);
+
+        clear_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status);
 }
 
+struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert = {
+        .trig_desc = {
+                .type = cpu_to_le32(FW_DBG_TRIGGER_FW_ASSERT),
+        },
+};
+
 static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)
 {
         /* clear the D3 reconfig, we only need it to avoid dumping a
          * firmware coredump on reconfiguration, we shouldn't do that
          * on D3->D0 transition
          */
-        if (!test_and_clear_bit(IWL_MVM_STATUS_D3_RECONFIG, &mvm->status))
+        if (!test_and_clear_bit(IWL_MVM_STATUS_D3_RECONFIG, &mvm->status)) {
+                mvm->fw_dump_desc = &iwl_mvm_dump_desc_assert;
                 iwl_mvm_fw_error_dump(mvm);
+        }
 
         /* cleanup all stale references (scan, roc), but keep the
          * ucode_down ref until reconfig is complete
@@ -1094,6 +1259,10 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)
 
         mvm->vif_count = 0;
         mvm->rx_ba_sessions = 0;
+        mvm->fw_dbg_conf = FW_DBG_INVALID;
+
+        /* keep statistics ticking */
+        iwl_mvm_accu_radio_stats(mvm);
 }
 
 int __iwl_mvm_mac_start(struct iwl_mvm *mvm)
@@ -1153,7 +1322,7 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)
 
         clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
         iwl_mvm_d0i3_enable_tx(mvm, NULL);
-        ret = iwl_mvm_update_quotas(mvm, NULL);
+        ret = iwl_mvm_update_quotas(mvm, false, NULL);
         if (ret)
                 IWL_ERR(mvm, "Failed to update quotas after restart (%d)\n",
                         ret);
@@ -1216,6 +1385,11 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
 {
         lockdep_assert_held(&mvm->mutex);
 
+        /* firmware counters are obviously reset now, but we shouldn't
+         * partially track so also clear the fw_reset_accu counters.
+         */
+        memset(&mvm->accu_radio_stats, 0, sizeof(mvm->accu_radio_stats));
+
         /*
          * Disallow low power states when the FW is down by taking
          * the UCODE_DOWN ref. in case of ongoing hw restart the
@@ -1246,6 +1420,20 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
          */
         clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
 
+        /* We shouldn't have any UIDs still set.  Loop over all the UIDs to
+         * make sure there's nothing left there and warn if any is found.
+         */
+        if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
+                int i;
+
+                for (i = 0; i < IWL_MVM_MAX_SIMULTANEOUS_SCANS; i++) {
+                        if (WARN_ONCE(mvm->scan_uid[i],
+                                      "UMAC scan UID %d was not cleaned\n",
+                                      mvm->scan_uid[i]))
+                                mvm->scan_uid[i] = 0;
+                }
+        }
+
         mvm->ucode_loaded = false;
 }
 
@@ -1255,7 +1443,8 @@ static void iwl_mvm_mac_stop(struct ieee80211_hw *hw)
 
         flush_work(&mvm->d0i3_exit_work);
         flush_work(&mvm->async_handlers_wk);
-        flush_work(&mvm->fw_error_dump_wk);
+        cancel_delayed_work_sync(&mvm->fw_dump_wk);
+        iwl_mvm_free_fw_dump_desc(mvm);
 
         mutex_lock(&mvm->mutex);
         __iwl_mvm_mac_stop(mvm);
@@ -1303,6 +1492,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         int ret;
 
+        mvmvif->mvm = mvm;
+
         /*
          * make sure D0i3 exit is completed, otherwise a target access
          * during tx queue configuration could be done when still in
@@ -1320,6 +1511,11 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
 
         mutex_lock(&mvm->mutex);
 
+        /* make sure that beacon statistics don't go backwards with FW reset */
+        if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
+                mvmvif->beacon_stats.accu_num_beacons +=
+                        mvmvif->beacon_stats.num_beacons;
+
         /* Allocate resources for the MAC context, and add it to the fw  */
         ret = iwl_mvm_mac_ctxt_init(mvm, vif);
         if (ret)
@@ -1434,9 +1630,33 @@ static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,
         u32 tfd_msk = iwl_mvm_mac_get_queues_mask(vif);
 
         if (tfd_msk) {
+                /*
+                 * mac80211 first removes all the stations of the vif and
+                 * then removes the vif. When it removes a station it also
+                 * flushes the AMPDU session. So by now, all the AMPDU sessions
+                 * of all the stations of this vif are closed, and the queues
+                 * of these AMPDU sessions are properly closed.
+                 * We still need to take care of the shared queues of the vif.
+                 * Flush them here.
+                 */
                 mutex_lock(&mvm->mutex);
                 iwl_mvm_flush_tx_path(mvm, tfd_msk, true);
                 mutex_unlock(&mvm->mutex);
+
+                /*
+                 * There are transports that buffer a few frames in the host.
+                 * For these, the flush above isn't enough since while we were
+                 * flushing, the transport might have sent more frames to the
+                 * device. To solve this, wait here until the transport is
+                 * empty. Technically, this could have replaced the flush
+                 * above, but flush is much faster than draining. So flush
+                 * first, and drain to make sure we have no frames in the
+                 * transport anymore.
+                 * If a station still had frames on the shared queues, it is
+                 * already marked as draining, so to complete the draining, we
+                 * just need to wait until the transport is empty.
+                 */
+                iwl_trans_wait_tx_queue_empty(mvm->trans, tfd_msk);
         }
 
         if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {
@@ -1813,8 +2033,13 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
 
         if (changes & BSS_CHANGED_ASSOC) {
                 if (bss_conf->assoc) {
+                        /* clear statistics to get clean beacon counter */
+                        iwl_mvm_request_statistics(mvm, true);
+                        memset(&mvmvif->beacon_stats, 0,
+                               sizeof(mvmvif->beacon_stats));
+
                         /* add quota for this interface */
-                        ret = iwl_mvm_update_quotas(mvm, NULL);
+                        ret = iwl_mvm_update_quotas(mvm, true, NULL);
                         if (ret) {
                                 IWL_ERR(mvm, "failed to update quotas\n");
                                 return;
@@ -1866,7 +2091,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
                                 mvm->d0i3_ap_sta_id = IWL_MVM_STATION_COUNT;
                         mvmvif->ap_sta_id = IWL_MVM_STATION_COUNT;
                         /* remove quota for this interface */
-                        ret = iwl_mvm_update_quotas(mvm, NULL);
+                        ret = iwl_mvm_update_quotas(mvm, false, NULL);
                         if (ret)
                                 IWL_ERR(mvm, "failed to update quotas\n");
 
@@ -1985,7 +2210,7 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,
         /* power updated needs to be done before quotas */
         iwl_mvm_power_update_mac(mvm);
 
-        ret = iwl_mvm_update_quotas(mvm, NULL);
+        ret = iwl_mvm_update_quotas(mvm, false, NULL);
         if (ret)
                 goto out_quota_failed;
 
@@ -2001,8 +2226,7 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,
         if (iwl_mvm_phy_ctx_count(mvm) > 1)
                 iwl_mvm_teardown_tdls_peers(mvm);
 
-        mutex_unlock(&mvm->mutex);
-        return 0;
+        goto out_unlock;
 
 out_quota_failed:
         iwl_mvm_power_update_mac(mvm);
@@ -2051,7 +2275,7 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,
         if (vif->p2p && mvm->p2p_device_vif)
                 iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif, false, NULL);
 
-        iwl_mvm_update_quotas(mvm, NULL);
+        iwl_mvm_update_quotas(mvm, false, NULL);
         iwl_mvm_send_rm_bcast_sta(mvm, vif);
         iwl_mvm_binding_remove_vif(mvm, vif);
 
@@ -2190,6 +2414,12 @@ static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,
 
         mutex_lock(&mvm->mutex);
 
+        if (iwl_mvm_is_lar_supported(mvm) && !mvm->lar_regdom_set) {
+                IWL_ERR(mvm, "scan while LAR regdomain is not set\n");
+                ret = -EBUSY;
+                goto out;
+        }
+
         if (mvm->scan_status != IWL_MVM_SCAN_NONE) {
                 ret = -EBUSY;
                 goto out;
@@ -2199,10 +2429,8 @@ static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,
 
         if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
                 ret = iwl_mvm_scan_umac(mvm, vif, hw_req);
-        else if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
-                ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req);
         else
-                ret = iwl_mvm_scan_request(mvm, vif, req);
+                ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req);
 
         if (ret)
                 iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
@@ -2272,25 +2500,35 @@ static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,
 {
         struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
         struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
+        unsigned long txqs = 0, tids = 0;
         int tid;
 
+        spin_lock_bh(&mvmsta->lock);
+        for (tid = 0; tid < IWL_MAX_TID_COUNT; tid++) {
+                struct iwl_mvm_tid_data *tid_data = &mvmsta->tid_data[tid];
+
+                if (tid_data->state != IWL_AGG_ON &&
+                    tid_data->state != IWL_EMPTYING_HW_QUEUE_DELBA)
+                        continue;
+
+                __set_bit(tid_data->txq_id, &txqs);
+
+                if (iwl_mvm_tid_queued(tid_data) == 0)
+                        continue;
+
+                __set_bit(tid, &tids);
+        }
+
         switch (cmd) {
         case STA_NOTIFY_SLEEP:
                 if (atomic_read(&mvm->pending_frames[mvmsta->sta_id]) > 0)
                         ieee80211_sta_block_awake(hw, sta, true);
-                spin_lock_bh(&mvmsta->lock);
-                for (tid = 0; tid < IWL_MAX_TID_COUNT; tid++) {
-                        struct iwl_mvm_tid_data *tid_data;
 
-                        tid_data = &mvmsta->tid_data[tid];
-                        if (tid_data->state != IWL_AGG_ON &&
-                            tid_data->state != IWL_EMPTYING_HW_QUEUE_DELBA)
-                                continue;
-                        if (iwl_mvm_tid_queued(tid_data) == 0)
-                                continue;
+                for_each_set_bit(tid, &tids, IWL_MAX_TID_COUNT)
                         ieee80211_sta_set_buffered(sta, tid, true);
-                }
-                spin_unlock_bh(&mvmsta->lock);
+
+                if (txqs)
+                        iwl_trans_freeze_txq_timer(mvm->trans, txqs, true);
                 /*
                  * The fw updates the STA to be asleep. Tx packets on the Tx
                  * queues to this station will not be transmitted. The fw will
@@ -2300,11 +2538,15 @@ static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,
         case STA_NOTIFY_AWAKE:
                 if (WARN_ON(mvmsta->sta_id == IWL_MVM_STATION_COUNT))
                         break;
+
+                if (txqs)
+                        iwl_trans_freeze_txq_timer(mvm->trans, txqs, false);
                 iwl_mvm_sta_modify_ps_wake(mvm, sta);
                 break;
         default:
                 break;
         }
+        spin_unlock_bh(&mvmsta->lock);
 }
 
 static void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw,
@@ -2542,13 +2784,13 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
 
         mutex_lock(&mvm->mutex);
 
-        /* Newest FW fixes sched scan while connected on another interface */
-        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) {
-                if (!vif->bss_conf.idle) {
-                        ret = -EBUSY;
-                        goto out;
-                }
-        } else if (!iwl_mvm_is_idle(mvm)) {
+        if (iwl_mvm_is_lar_supported(mvm) && !mvm->lar_regdom_set) {
+                IWL_ERR(mvm, "sched-scan while LAR regdomain is not set\n");
+                ret = -EBUSY;
+                goto out;
+        }
+
+        if (!vif->bss_conf.idle) {
                 ret = -EBUSY;
                 goto out;
         }
@@ -2838,6 +3080,8 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,
         IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel->hw_value,
                            duration, type);
 
+        flush_work(&mvm->roc_done_wk);
+
         mutex_lock(&mvm->mutex);
 
         switch (vif->type) {
@@ -3109,14 +3353,14 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
          */
         if (vif->type == NL80211_IFTYPE_MONITOR) {
                 mvmvif->monitor_active = true;
-                ret = iwl_mvm_update_quotas(mvm, NULL);
+                ret = iwl_mvm_update_quotas(mvm, false, NULL);
                 if (ret)
                         goto out_remove_binding;
         }
 
         /* Handle binding during CSA */
         if (vif->type == NL80211_IFTYPE_AP) {
-                iwl_mvm_update_quotas(mvm, NULL);
+                iwl_mvm_update_quotas(mvm, false, NULL);
                 iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
         }
 
@@ -3140,7 +3384,7 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
 
                 iwl_mvm_unref(mvm, IWL_MVM_REF_PROTECT_CSA);
 
-                iwl_mvm_update_quotas(mvm, NULL);
+                iwl_mvm_update_quotas(mvm, false, NULL);
         }
 
         goto out;
@@ -3213,7 +3457,7 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,
                 break;
         }
 
-        iwl_mvm_update_quotas(mvm, disabled_vif);
+        iwl_mvm_update_quotas(mvm, false, disabled_vif);
         iwl_mvm_binding_remove_vif(mvm, vif);
 
 out:
@@ -3405,7 +3649,7 @@ static int __iwl_mvm_mac_testmode_cmd(struct iwl_mvm *mvm,
                 mvm->noa_duration = noa_duration;
                 mvm->noa_vif = vif;
 
-                return iwl_mvm_update_quotas(mvm, NULL);
+                return iwl_mvm_update_quotas(mvm, false, NULL);
         case IWL_MVM_TM_CMD_SET_BEACON_FILTER:
                 /* must be associated client vif - ignore authorized */
                 if (!vif || vif->type != NL80211_IFTYPE_STATION ||
@@ -3462,9 +3706,13 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,
 
         mutex_lock(&mvm->mutex);
 
+        mvmvif->csa_failed = false;
+
         IWL_DEBUG_MAC80211(mvm, "pre CSA to freq %d\n",
                            chsw->chandef.center_freq1);
 
+        iwl_fw_dbg_trigger_simple_stop(mvm, vif, FW_DBG_TRIGGER_CHANNEL_SWITCH);
+
         switch (vif->type) {
         case NL80211_IFTYPE_AP:
                 csa_vif =
@@ -3534,6 +3782,12 @@ static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,
 
         mutex_lock(&mvm->mutex);
 
+        if (mvmvif->csa_failed) {
+                mvmvif->csa_failed = false;
+                ret = -EIO;
+                goto out_unlock;
+        }
+
         if (vif->type == NL80211_IFTYPE_STATION) {
                 struct iwl_mvm_sta *mvmsta;
 
@@ -3613,6 +3867,154 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,
         }
 }
 
+static 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;
+
+        memset(survey, 0, sizeof(*survey));
+
+        /* only support global statistics right now */
+        if (idx != 0)
+                return -ENOENT;
+
+        if (!(mvm->fw->ucode_capa.capa[0] &
+                        IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
+                return -ENOENT;
+
+        mutex_lock(&mvm->mutex);
+
+        if (mvm->ucode_loaded) {
+                ret = iwl_mvm_request_statistics(mvm, false);
+                if (ret)
+                        goto out;
+        }
+
+        survey->filled = SURVEY_INFO_TIME |
+                         SURVEY_INFO_TIME_RX |
+                         SURVEY_INFO_TIME_TX |
+                         SURVEY_INFO_TIME_SCAN;
+        survey->time = mvm->accu_radio_stats.on_time_rf +
+                       mvm->radio_stats.on_time_rf;
+        do_div(survey->time, USEC_PER_MSEC);
+
+        survey->time_rx = mvm->accu_radio_stats.rx_time +
+                          mvm->radio_stats.rx_time;
+        do_div(survey->time_rx, USEC_PER_MSEC);
+
+        survey->time_tx = mvm->accu_radio_stats.tx_time +
+                          mvm->radio_stats.tx_time;
+        do_div(survey->time_tx, USEC_PER_MSEC);
+
+        survey->time_scan = mvm->accu_radio_stats.on_time_scan +
+                            mvm->radio_stats.on_time_scan;
+        do_div(survey->time_scan, USEC_PER_MSEC);
+
+        ret = 0;
+ out:
+        mutex_unlock(&mvm->mutex);
+        return ret;
+}
+
+static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,
+                                       struct ieee80211_vif *vif,
+                                       struct ieee80211_sta *sta,
+                                       struct station_info *sinfo)
+{
+        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
+
+        if (!(mvm->fw->ucode_capa.capa[0] &
+                                IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
+                return;
+
+        /* if beacon filtering isn't on mac80211 does it anyway */
+        if (!(vif->driver_flags & IEEE80211_VIF_BEACON_FILTER))
+                return;
+
+        if (!vif->bss_conf.assoc)
+                return;
+
+        mutex_lock(&mvm->mutex);
+
+        if (mvmvif->ap_sta_id != mvmsta->sta_id)
+                goto unlock;
+
+        if (iwl_mvm_request_statistics(mvm, false))
+                goto unlock;
+
+        sinfo->rx_beacon = mvmvif->beacon_stats.num_beacons +
+                           mvmvif->beacon_stats.accu_num_beacons;
+        sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_RX);
+        if (mvmvif->beacon_stats.avg_signal) {
+                /* firmware only reports a value after RXing a few beacons */
+                sinfo->rx_beacon_signal_avg = mvmvif->beacon_stats.avg_signal;
+                sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_SIGNAL_AVG);
+        }
+ unlock:
+        mutex_unlock(&mvm->mutex);
+}
+
+static void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw,
+                                       struct ieee80211_vif *vif,
+                                       const struct ieee80211_event *event)
+{
+#define CHECK_MLME_TRIGGER(_mvm, _trig, _buf, _cnt, _fmt...)    \
+        do {                                                    \
+                if ((_cnt) && --(_cnt))                         \
+                        break;                                  \
+                iwl_mvm_fw_dbg_collect_trig(_mvm, _trig, _fmt);\
+        } while (0)
+
+        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+        struct iwl_fw_dbg_trigger_tlv *trig;
+        struct iwl_fw_dbg_trigger_mlme *trig_mlme;
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_MLME))
+                return;
+
+        if (event->u.mlme.status == MLME_SUCCESS)
+                return;
+
+        trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_MLME);
+        trig_mlme = (void *)trig->data;
+        if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trig))
+                return;
+
+        if (event->u.mlme.data == ASSOC_EVENT) {
+                if (event->u.mlme.status == MLME_DENIED)
+                        CHECK_MLME_TRIGGER(mvm, trig, buf,
+                                           trig_mlme->stop_assoc_denied,
+                                           "DENIED ASSOC: reason %d",
+                                            event->u.mlme.reason);
+                else if (event->u.mlme.status == MLME_TIMEOUT)
+                        CHECK_MLME_TRIGGER(mvm, trig, buf,
+                                           trig_mlme->stop_assoc_timeout,
+                                           "ASSOC TIMEOUT");
+        } else if (event->u.mlme.data == AUTH_EVENT) {
+                if (event->u.mlme.status == MLME_DENIED)
+                        CHECK_MLME_TRIGGER(mvm, trig, buf,
+                                           trig_mlme->stop_auth_denied,
+                                           "DENIED AUTH: reason %d",
+                                           event->u.mlme.reason);
+                else if (event->u.mlme.status == MLME_TIMEOUT)
+                        CHECK_MLME_TRIGGER(mvm, trig, buf,
+                                           trig_mlme->stop_auth_timeout,
+                                           "AUTH TIMEOUT");
+        } else if (event->u.mlme.data == DEAUTH_RX_EVENT) {
+                CHECK_MLME_TRIGGER(mvm, trig, buf,
+                                   trig_mlme->stop_rx_deauth,
+                                   "DEAUTH RX %d", event->u.mlme.reason);
+        } else if (event->u.mlme.data == DEAUTH_TX_EVENT) {
+                CHECK_MLME_TRIGGER(mvm, trig, buf,
+                                   trig_mlme->stop_tx_deauth,
+                                   "DEAUTH TX %d", event->u.mlme.reason);
+        }
+#undef CHECK_MLME_TRIGGER
+}
+
 const struct ieee80211_ops iwl_mvm_hw_ops = {
         .tx = iwl_mvm_mac_tx,
         .ampdu_action = iwl_mvm_mac_ampdu_action,
@@ -3666,6 +4068,8 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {
         .tdls_cancel_channel_switch = iwl_mvm_tdls_cancel_channel_switch,
         .tdls_recv_channel_switch = iwl_mvm_tdls_recv_channel_switch,
 
+        .event_callback = iwl_mvm_mac_event_callback,
+
         CFG80211_TESTMODE_CMD(iwl_mvm_mac_testmode_cmd)
 
 #ifdef CONFIG_PM_SLEEP
@@ -3679,4 +4083,6 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {
 #endif
         .set_default_unicast_key = iwl_mvm_set_default_unicast_key,
 #endif
+        .get_survey = iwl_mvm_mac_get_survey,
+        .sta_statistics = iwl_mvm_mac_sta_statistics,
 };
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 6c69d0584f6c..d5522a161242 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -75,6 +75,7 @@
 #include "iwl-trans.h"
 #include "iwl-notif-wait.h"
 #include "iwl-eeprom-parse.h"
+#include "iwl-fw-file.h"
 #include "sta.h"
 #include "fw-api.h"
 #include "constants.h"
@@ -145,6 +146,19 @@ struct iwl_mvm_dump_ptrs {
         u32 op_mode_len;
 };
 
+/**
+ * struct iwl_mvm_dump_desc - describes the dump
+ * @len: length of trig_desc->data
+ * @trig_desc: the description of the dump
+ */
+struct iwl_mvm_dump_desc {
+        size_t len;
+        /* must be last */
+        struct iwl_fw_error_dump_trigger_desc trig_desc;
+};
+
+extern struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert;
+
 struct iwl_mvm_phy_ctxt {
         u16 id;
         u16 color;
@@ -335,10 +349,15 @@ struct iwl_mvm_vif_bf_data {
  * @bcast_sta: station used for broadcast packets. Used by the following
  *  vifs: P2P_DEVICE, GO and AP.
  * @beacon_skb: the skb used to hold the AP/GO beacon template
- * @smps_requests: the SMPS requests of differents parts of the driver,
+ * @smps_requests: the SMPS requests of different parts of the driver,
  *      combined on update to yield the overall request to mac80211.
+ * @beacon_stats: beacon statistics, containing the # of received beacons,
+ *      # of received beacons accumulated over FW restart, and the current
+ *      average signal of beacons retrieved from the firmware
+ * @csa_failed: CSA failed to schedule time event, report an error later
  */
 struct iwl_mvm_vif {
+        struct iwl_mvm *mvm;
         u16 id;
         u16 color;
         u8 ap_sta_id;
@@ -354,6 +373,11 @@ struct iwl_mvm_vif {
         bool ps_disabled;
         struct iwl_mvm_vif_bf_data bf_data;
 
+        struct {
+                u32 num_beacons, accu_num_beacons;
+                u8 avg_signal;
+        } beacon_stats;
+
         u32 ap_beacon_time;
 
         enum iwl_tsf_id tsf_id;
@@ -396,7 +420,6 @@ struct iwl_mvm_vif {
 #endif
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-        struct iwl_mvm *mvm;
         struct dentry *dbgfs_dir;
         struct dentry *dbgfs_slink;
         struct iwl_dbgfs_pm dbgfs_pm;
@@ -411,6 +434,7 @@ struct iwl_mvm_vif {
 
         /* Indicates that CSA countdown may be started */
         bool csa_countdown;
+        bool csa_failed;
 };
 
 static inline struct iwl_mvm_vif *
@@ -593,6 +617,13 @@ struct iwl_mvm {
 
         struct mvm_statistics_rx rx_stats;
 
+        struct {
+                u64 rx_time;
+                u64 tx_time;
+                u64 on_time_rf;
+                u64 on_time_scan;
+        } radio_stats, accu_radio_stats;
+
         u8 queue_to_mac80211[IWL_MAX_HW_QUEUES];
         atomic_t mac80211_queue_stop_count[IEEE80211_MAX_QUEUES];
 
@@ -657,7 +688,7 @@ struct iwl_mvm {
         bool disable_power_off;
         bool disable_power_off_d3;
 
-        bool scan_iter_notif_enabled;
+        u32 scan_iter_notif_enabled; /* must be u32 for debugfs_create_bool */
 
         struct debugfs_blob_wrapper nvm_hw_blob;
         struct debugfs_blob_wrapper nvm_sw_blob;
@@ -666,6 +697,7 @@ struct iwl_mvm {
 
         struct iwl_mvm_frame_stats drv_rx_stats;
         spinlock_t drv_stats_lock;
+        u16 dbgfs_rx_phyinfo;
 #endif
 
         struct iwl_mvm_phy_ctxt phy_ctxts[NUM_PHY_CTX];
@@ -687,8 +719,9 @@ struct iwl_mvm {
 
         /* -1 for always, 0 for never, >0 for that many times */
         s8 restart_fw;
-        struct work_struct fw_error_dump_wk;
-        enum iwl_fw_dbg_conf fw_dbg_conf;
+        u8 fw_dbg_conf;
+        struct delayed_work fw_dump_wk;
+        struct iwl_mvm_dump_desc *fw_dump_desc;
 
 #ifdef CONFIG_IWLWIFI_LEDS
         struct led_classdev led;
@@ -715,6 +748,7 @@ struct iwl_mvm {
         void *d3_resume_sram;
         u32 d3_test_pme_ptr;
         struct ieee80211_vif *keep_vif;
+        u32 last_netdetect_scans; /* no. of scans in the last net-detect wake */
 #endif
 #endif
 
@@ -779,6 +813,9 @@ struct iwl_mvm {
         /* system time of last beacon (for AP/GO interface) */
         u32 ap_last_beacon_gp2;
 
+        bool lar_regdom_set;
+        enum iwl_mcc_source mcc_src;
+
         u8 low_latency_agg_frame_limit;
 
         /* TDLS channel switch data */
@@ -824,6 +861,7 @@ enum iwl_mvm_status {
         IWL_MVM_STATUS_IN_D0I3,
         IWL_MVM_STATUS_ROC_AUX_RUNNING,
         IWL_MVM_STATUS_D3_RECONFIG,
+        IWL_MVM_STATUS_DUMPING_FW_LOG,
 };
 
 static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm)
@@ -878,11 +916,48 @@ static inline bool iwl_mvm_is_d0i3_supported(struct iwl_mvm *mvm)
                (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_D0I3_SUPPORT);
 }
 
+static inline bool iwl_mvm_is_lar_supported(struct iwl_mvm *mvm)
+{
+        bool nvm_lar = mvm->nvm_data->lar_enabled;
+        bool tlv_lar = mvm->fw->ucode_capa.capa[0] &
+                IWL_UCODE_TLV_CAPA_LAR_SUPPORT;
+
+        if (iwlwifi_mod_params.lar_disable)
+                return false;
+
+        /*
+         * Enable LAR only if it is supported by the FW (TLV) &&
+         * enabled in the NVM
+         */
+        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000)
+                return nvm_lar && tlv_lar;
+        else
+                return tlv_lar;
+}
+
+static inline bool iwl_mvm_is_wifi_mcc_supported(struct iwl_mvm *mvm)
+{
+        return mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_WIFI_MCC_UPDATE ||
+               mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC;
+}
+
 static inline bool iwl_mvm_is_scd_cfg_supported(struct iwl_mvm *mvm)
 {
         return mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_SCD_CFG;
 }
 
+static inline bool iwl_mvm_bt_is_plcr_supported(struct iwl_mvm *mvm)
+{
+        return (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_BT_COEX_PLCR) &&
+                IWL_MVM_BT_COEX_CORUNNING;
+}
+
+static inline bool iwl_mvm_bt_is_rrc_supported(struct iwl_mvm *mvm)
+{
+        return (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_BT_COEX_RRC) &&
+                IWL_MVM_BT_COEX_RRC;
+}
+
 extern const u8 iwl_mvm_ac_to_tx_fifo[];
 
 struct iwl_rate_info {
@@ -951,12 +1026,13 @@ static inline void iwl_mvm_wait_for_async_handlers(struct iwl_mvm *mvm)
 }
 
 /* Statistics */
-int iwl_mvm_rx_reply_statistics(struct iwl_mvm *mvm,
-                                struct iwl_rx_cmd_buffer *rxb,
-                                struct iwl_device_cmd *cmd);
+void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,
+                                  struct iwl_rx_packet *pkt);
 int iwl_mvm_rx_statistics(struct iwl_mvm *mvm,
                           struct iwl_rx_cmd_buffer *rxb,
                           struct iwl_device_cmd *cmd);
+int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear);
+void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm);
 
 /* NVM */
 int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic);
@@ -1067,20 +1143,14 @@ int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 
 /* Quota management */
-int iwl_mvm_update_quotas(struct iwl_mvm *mvm,
+int iwl_mvm_update_quotas(struct iwl_mvm *mvm, bool force_upload,
                           struct ieee80211_vif *disabled_vif);
 
 /* Scanning */
 int iwl_mvm_scan_size(struct iwl_mvm *mvm);
-int iwl_mvm_scan_request(struct iwl_mvm *mvm,
-                         struct ieee80211_vif *vif,
-                         struct cfg80211_scan_request *req);
-int iwl_mvm_rx_scan_response(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
-                             struct iwl_device_cmd *cmd);
-int iwl_mvm_rx_scan_complete(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
-                             struct iwl_device_cmd *cmd);
 int iwl_mvm_cancel_scan(struct iwl_mvm *mvm);
 int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm, bool is_sched_scan);
+void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm);
 
 /* Scheduled scan */
 int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
@@ -1089,14 +1159,8 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
 int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
                                                 struct iwl_rx_cmd_buffer *rxb,
                                                 struct iwl_device_cmd *cmd);
-int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
-                              struct ieee80211_vif *vif,
-                              struct cfg80211_sched_scan_request *req,
-                              struct ieee80211_scan_ies *ies);
 int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
                                        struct cfg80211_sched_scan_request *req);
-int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
-                             struct cfg80211_sched_scan_request *req);
 int iwl_mvm_scan_offload_start(struct iwl_mvm *mvm,
                                struct ieee80211_vif *vif,
                                struct cfg80211_sched_scan_request *req,
@@ -1225,7 +1289,7 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
                              struct iwl_rx_cmd_buffer *rxb,
                              struct iwl_device_cmd *cmd);
 void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                           enum ieee80211_rssi_event rssi_event);
+                           enum ieee80211_rssi_event_data);
 void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm);
 u16 iwl_mvm_coex_agg_time_limit(struct iwl_mvm *mvm,
                                 struct ieee80211_sta *sta);
@@ -1238,7 +1302,6 @@ bool iwl_mvm_bt_coex_is_tpc_allowed(struct iwl_mvm *mvm,
 u8 iwl_mvm_bt_coex_tx_prio(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,
                            struct ieee80211_tx_info *info, u8 ac);
 
-bool iwl_mvm_bt_coex_is_ant_avail_old(struct iwl_mvm *mvm, u8 ant);
 bool iwl_mvm_bt_coex_is_shared_ant_avail_old(struct iwl_mvm *mvm);
 void iwl_mvm_bt_coex_vif_change_old(struct iwl_mvm *mvm);
 int iwl_send_bt_init_conf_old(struct iwl_mvm *mvm);
@@ -1246,7 +1309,7 @@ int iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm,
                                  struct iwl_rx_cmd_buffer *rxb,
                                  struct iwl_device_cmd *cmd);
 void iwl_mvm_bt_rssi_event_old(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                               enum ieee80211_rssi_event rssi_event);
+                               enum ieee80211_rssi_event_data);
 u16 iwl_mvm_coex_agg_time_limit_old(struct iwl_mvm *mvm,
                                     struct ieee80211_sta *sta);
 bool iwl_mvm_bt_coex_is_mimo_allowed_old(struct iwl_mvm *mvm,
@@ -1257,17 +1320,6 @@ int iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm,
                                       struct iwl_rx_cmd_buffer *rxb,
                                       struct iwl_device_cmd *cmd);
 
-enum iwl_bt_kill_msk {
-        BT_KILL_MSK_DEFAULT,
-        BT_KILL_MSK_NEVER,
-        BT_KILL_MSK_ALWAYS,
-        BT_KILL_MSK_MAX,
-};
-
-extern const u8 iwl_bt_ack_kill_msk[BT_MAX_AG][BT_COEX_MAX_LUT];
-extern const u8 iwl_bt_cts_kill_msk[BT_MAX_AG][BT_COEX_MAX_LUT];
-extern const u32 iwl_bt_ctl_kill_msk[BT_KILL_MSK_MAX];
-
 /* beacon filtering */
 #ifdef CONFIG_IWLWIFI_DEBUGFS
 void
@@ -1352,9 +1404,6 @@ static inline void iwl_mvm_enable_agg_txq(struct iwl_mvm *mvm, int queue,
         iwl_mvm_enable_txq(mvm, queue, ssn, &cfg, wdg_timeout);
 }
 
-/* Assoc status */
-bool iwl_mvm_is_idle(struct iwl_mvm *mvm);
-
 /* Thermal management and CT-kill */
 void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);
 void iwl_mvm_tt_temp_changed(struct iwl_mvm *mvm, u32 temp);
@@ -1367,6 +1416,23 @@ void iwl_mvm_tt_exit(struct iwl_mvm *mvm);
 void iwl_mvm_set_hw_ctkill_state(struct iwl_mvm *mvm, bool state);
 int iwl_mvm_get_temp(struct iwl_mvm *mvm);
 
+/* Location Aware Regulatory */
+struct iwl_mcc_update_resp *
+iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
+                   enum iwl_mcc_source src_id);
+int iwl_mvm_init_mcc(struct iwl_mvm *mvm);
+int iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,
+                               struct iwl_rx_cmd_buffer *rxb,
+                               struct iwl_device_cmd *cmd);
+struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
+                                                  const char *alpha2,
+                                                  enum iwl_mcc_source src_id,
+                                                  bool *changed);
+struct ieee80211_regdomain *iwl_mvm_get_current_regdomain(struct iwl_mvm *mvm,
+                                                          bool *changed);
+int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm);
+void iwl_mvm_update_changed_regdom(struct iwl_mvm *mvm);
+
 /* smart fifo */
 int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                       bool added_vif);
@@ -1405,7 +1471,65 @@ struct ieee80211_vif *iwl_mvm_get_bss_vif(struct iwl_mvm *mvm);
 void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error);
 void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm);
 
-int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, enum iwl_fw_dbg_conf id);
-void iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm);
+int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 id);
+int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,
+                           const char *str, size_t len, unsigned int delay);
+int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
+                                struct iwl_mvm_dump_desc *desc,
+                                unsigned int delay);
+void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm);
+int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,
+                                struct iwl_fw_dbg_trigger_tlv *trigger,
+                                const char *fmt, ...) __printf(3, 4);
+unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,
+                                    struct ieee80211_vif *vif,
+                                    bool tdls, bool cmd_q);
+void iwl_mvm_connection_loss(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             const char *errmsg);
+static inline bool
+iwl_fw_dbg_trigger_vif_match(struct iwl_fw_dbg_trigger_tlv *trig,
+                             struct ieee80211_vif *vif)
+{
+        u32 trig_vif = le32_to_cpu(trig->vif_type);
+
+        return trig_vif == IWL_FW_DBG_CONF_VIF_ANY || vif->type == trig_vif;
+}
+
+static inline bool
+iwl_fw_dbg_trigger_stop_conf_match(struct iwl_mvm *mvm,
+                                   struct iwl_fw_dbg_trigger_tlv *trig)
+{
+        return ((trig->mode & IWL_FW_DBG_TRIGGER_STOP) &&
+                (mvm->fw_dbg_conf == FW_DBG_INVALID ||
+                (BIT(mvm->fw_dbg_conf) & le32_to_cpu(trig->stop_conf_ids))));
+}
+
+static inline bool
+iwl_fw_dbg_trigger_check_stop(struct iwl_mvm *mvm,
+                              struct ieee80211_vif *vif,
+                              struct iwl_fw_dbg_trigger_tlv *trig)
+{
+        if (vif && !iwl_fw_dbg_trigger_vif_match(trig, vif))
+                return false;
+
+        return iwl_fw_dbg_trigger_stop_conf_match(mvm, trig);
+}
+
+static inline void
+iwl_fw_dbg_trigger_simple_stop(struct iwl_mvm *mvm,
+                               struct ieee80211_vif *vif,
+                               enum iwl_fw_dbg_trigger trig)
+{
+        struct iwl_fw_dbg_trigger_tlv *trigger;
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw, trig))
+                return;
+
+        trigger = iwl_fw_dbg_get_trigger(mvm->fw, trig);
+        if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trigger))
+                return;
+
+        iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL);
+}
 
 #endif /* __IWL_MVM_H__ */
diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/iwlwifi/mvm/nvm.c
index 5383429d96c1..87b2a30a2308 100644
--- a/drivers/net/wireless/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/iwlwifi/mvm/nvm.c
@@ -63,18 +63,21 @@
  *
  *****************************************************************************/
 #include <linux/firmware.h>
+#include <linux/rtnetlink.h>
+#include <linux/pci.h>
+#include <linux/acpi.h>
 #include "iwl-trans.h"
 #include "iwl-csr.h"
 #include "mvm.h"
 #include "iwl-eeprom-parse.h"
 #include "iwl-eeprom-read.h"
 #include "iwl-nvm-parse.h"
+#include "iwl-prph.h"
 
 /* Default NVM size to read */
 #define IWL_NVM_DEFAULT_CHUNK_SIZE (2*1024)
 #define IWL_MAX_NVM_SECTION_SIZE        0x1b58
-#define IWL_MAX_NVM_8000A_SECTION_SIZE  0xffc
-#define IWL_MAX_NVM_8000B_SECTION_SIZE  0x1ffc
+#define IWL_MAX_NVM_8000_SECTION_SIZE   0x1ffc
 
 #define NVM_WRITE_OPCODE 1
 #define NVM_READ_OPCODE 0
@@ -262,7 +265,9 @@ static struct iwl_nvm_data *
 iwl_parse_nvm_sections(struct iwl_mvm *mvm)
 {
         struct iwl_nvm_section *sections = mvm->nvm_sections;
-        const __le16 *hw, *sw, *calib, *regulatory, *mac_override;
+        const __le16 *hw, *sw, *calib, *regulatory, *mac_override, *phy_sku;
+        bool lar_enabled;
+        u32 mac_addr0, mac_addr1;
 
         /* Checking for required sections */
         if (mvm->trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {
@@ -286,22 +291,38 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
                                 "Can't parse mac_address, empty sections\n");
                         return NULL;
                 }
+
+                /* PHY_SKU section is mandatory in B0 */
+                if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
+                        IWL_ERR(mvm,
+                                "Can't parse phy_sku in B0, empty sections\n");
+                        return NULL;
+                }
         }
 
         if (WARN_ON(!mvm->cfg))
                 return NULL;
 
+        /* read the mac address from WFMP registers */
+        mac_addr0 = iwl_trans_read_prph(mvm->trans, WFMP_MAC_ADDR_0);
+        mac_addr1 = iwl_trans_read_prph(mvm->trans, WFMP_MAC_ADDR_1);
+
         hw = (const __le16 *)sections[mvm->cfg->nvm_hw_section_num].data;
         sw = (const __le16 *)sections[NVM_SECTION_TYPE_SW].data;
         calib = (const __le16 *)sections[NVM_SECTION_TYPE_CALIBRATION].data;
         regulatory = (const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY].data;
         mac_override =
                 (const __le16 *)sections[NVM_SECTION_TYPE_MAC_OVERRIDE].data;
+        phy_sku = (const __le16 *)sections[NVM_SECTION_TYPE_PHY_SKU].data;
+
+        lar_enabled = !iwlwifi_mod_params.lar_disable &&
+                      (mvm->fw->ucode_capa.capa[0] &
+                       IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
 
         return iwl_parse_nvm_data(mvm->trans->dev, mvm->cfg, hw, sw, calib,
-                                  regulatory, mac_override,
-                                  mvm->fw->valid_tx_ant,
-                                  mvm->fw->valid_rx_ant);
+                                  regulatory, mac_override, phy_sku,
+                                  mvm->fw->valid_tx_ant, mvm->fw->valid_rx_ant,
+                                  lar_enabled, mac_addr0, mac_addr1);
 }
 
 #define MAX_NVM_FILE_LEN        16384
@@ -354,10 +375,8 @@ static int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm)
         /* Maximal size depends on HW family and step */
         if (mvm->trans->cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 max_section_size = IWL_MAX_NVM_SECTION_SIZE;
-        else if (CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_A_STEP)
-                max_section_size = IWL_MAX_NVM_8000A_SECTION_SIZE;
-        else /* Family 8000 B-step or C-step */
-                max_section_size = IWL_MAX_NVM_8000B_SECTION_SIZE;
+        else
+                max_section_size = IWL_MAX_NVM_8000_SECTION_SIZE;
 
         /*
          * Obtain NVM image via request_firmware. Since we already used
@@ -399,6 +418,15 @@ static int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm)
                 IWL_INFO(mvm, "NVM Version %08X\n", le32_to_cpu(dword_buff[2]));
                 IWL_INFO(mvm, "NVM Manufacturing date %08X\n",
                          le32_to_cpu(dword_buff[3]));
+
+                /* nvm file validation, dword_buff[2] holds the file version */
+                if ((CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_C_STEP &&
+                     le32_to_cpu(dword_buff[2]) < 0xE4A) ||
+                    (CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP &&
+                     le32_to_cpu(dword_buff[2]) >= 0xE4A)) {
+                        ret = -EFAULT;
+                        goto out;
+                }
         } else {
                 file_sec = (void *)fw_entry->data;
         }
@@ -497,6 +525,8 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic)
         int ret, section;
         u32 size_read = 0;
         u8 *nvm_buffer, *temp;
+        const char *nvm_file_B = mvm->cfg->default_nvm_file_B_step;
+        const char *nvm_file_C = mvm->cfg->default_nvm_file_C_step;
 
         if (WARN_ON_ONCE(mvm->cfg->nvm_hw_section_num >= NVM_MAX_NUM_SECTIONS))
                 return -EINVAL;
@@ -555,10 +585,27 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic)
 
         /* load external NVM if configured */
         if (mvm->nvm_file_name) {
-                /* move to External NVM flow */
+                /* read External NVM file - take the default */
                 ret = iwl_mvm_read_external_nvm(mvm);
-                if (ret)
-                        return ret;
+                if (ret) {
+                        /* choose the nvm_file name according to the
+                         * HW step
+                         */
+                        if (CSR_HW_REV_STEP(mvm->trans->hw_rev) ==
+                            SILICON_B_STEP)
+                                mvm->nvm_file_name = nvm_file_B;
+                        else
+                                mvm->nvm_file_name = nvm_file_C;
+
+                        if (ret == -EFAULT && mvm->nvm_file_name) {
+                                /* in case nvm file was failed try again */
+                                ret = iwl_mvm_read_external_nvm(mvm);
+                                if (ret)
+                                        return ret;
+                        } else {
+                                return ret;
+                        }
+                }
         }
 
         /* parse the relevant nvm sections */
@@ -570,3 +617,257 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic)
 
         return 0;
 }
+
+struct iwl_mcc_update_resp *
+iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
+                   enum iwl_mcc_source src_id)
+{
+        struct iwl_mcc_update_cmd mcc_update_cmd = {
+                .mcc = cpu_to_le16(alpha2[0] << 8 | alpha2[1]),
+                .source_id = (u8)src_id,
+        };
+        struct iwl_mcc_update_resp *mcc_resp, *resp_cp = NULL;
+        struct iwl_rx_packet *pkt;
+        struct iwl_host_cmd cmd = {
+                .id = MCC_UPDATE_CMD,
+                .flags = CMD_WANT_SKB,
+                .data = { &mcc_update_cmd },
+        };
+
+        int ret;
+        u32 status;
+        int resp_len, n_channels;
+        u16 mcc;
+
+        if (WARN_ON_ONCE(!iwl_mvm_is_lar_supported(mvm)))
+                return ERR_PTR(-EOPNOTSUPP);
+
+        cmd.len[0] = sizeof(struct iwl_mcc_update_cmd);
+
+        IWL_DEBUG_LAR(mvm, "send MCC update to FW with '%c%c' src = %d\n",
+                      alpha2[0], alpha2[1], src_id);
+
+        ret = iwl_mvm_send_cmd(mvm, &cmd);
+        if (ret)
+                return ERR_PTR(ret);
+
+        pkt = cmd.resp_pkt;
+        if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
+                IWL_ERR(mvm, "Bad return from MCC_UPDATE_COMMAND (0x%08X)\n",
+                        pkt->hdr.flags);
+                ret = -EIO;
+                goto exit;
+        }
+
+        /* Extract MCC response */
+        mcc_resp = (void *)pkt->data;
+        status = le32_to_cpu(mcc_resp->status);
+
+        mcc = le16_to_cpu(mcc_resp->mcc);
+
+        /* W/A for a FW/NVM issue - returns 0x00 for the world domain */
+        if (mcc == 0) {
+                mcc = 0x3030;  /* "00" - world */
+                mcc_resp->mcc = cpu_to_le16(mcc);
+        }
+
+        n_channels =  __le32_to_cpu(mcc_resp->n_channels);
+        IWL_DEBUG_LAR(mvm,
+                      "MCC response status: 0x%x. new MCC: 0x%x ('%c%c') change: %d n_chans: %d\n",
+                      status, mcc, mcc >> 8, mcc & 0xff,
+                      !!(status == MCC_RESP_NEW_CHAN_PROFILE), n_channels);
+
+        resp_len = sizeof(*mcc_resp) + n_channels * sizeof(__le32);
+        resp_cp = kmemdup(mcc_resp, resp_len, GFP_KERNEL);
+        if (!resp_cp) {
+                ret = -ENOMEM;
+                goto exit;
+        }
+
+        ret = 0;
+exit:
+        iwl_free_resp(&cmd);
+        if (ret)
+                return ERR_PTR(ret);
+        return resp_cp;
+}
+
+#ifdef CONFIG_ACPI
+#define WRD_METHOD              "WRDD"
+#define WRDD_WIFI               (0x07)
+#define WRDD_WIGIG              (0x10)
+
+static u32 iwl_mvm_wrdd_get_mcc(struct iwl_mvm *mvm, union acpi_object *wrdd)
+{
+        union acpi_object *mcc_pkg, *domain_type, *mcc_value;
+        u32 i;
+
+        if (wrdd->type != ACPI_TYPE_PACKAGE ||
+            wrdd->package.count < 2 ||
+            wrdd->package.elements[0].type != ACPI_TYPE_INTEGER ||
+            wrdd->package.elements[0].integer.value != 0) {
+                IWL_DEBUG_LAR(mvm, "Unsupported wrdd structure\n");
+                return 0;
+        }
+
+        for (i = 1 ; i < wrdd->package.count ; ++i) {
+                mcc_pkg = &wrdd->package.elements[i];
+
+                if (mcc_pkg->type != ACPI_TYPE_PACKAGE ||
+                    mcc_pkg->package.count < 2 ||
+                    mcc_pkg->package.elements[0].type != ACPI_TYPE_INTEGER ||
+                    mcc_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {
+                        mcc_pkg = NULL;
+                        continue;
+                }
+
+                domain_type = &mcc_pkg->package.elements[0];
+                if (domain_type->integer.value == WRDD_WIFI)
+                        break;
+
+                mcc_pkg = NULL;
+        }
+
+        if (mcc_pkg) {
+                mcc_value = &mcc_pkg->package.elements[1];
+                return mcc_value->integer.value;
+        }
+
+        return 0;
+}
+
+static int iwl_mvm_get_bios_mcc(struct iwl_mvm *mvm, char *mcc)
+{
+        acpi_handle root_handle;
+        acpi_handle handle;
+        struct acpi_buffer wrdd = {ACPI_ALLOCATE_BUFFER, NULL};
+        acpi_status status;
+        u32 mcc_val;
+        struct pci_dev *pdev = to_pci_dev(mvm->dev);
+
+        root_handle = ACPI_HANDLE(&pdev->dev);
+        if (!root_handle) {
+                IWL_DEBUG_LAR(mvm,
+                              "Could not retrieve root port ACPI handle\n");
+                return -ENOENT;
+        }
+
+        /* Get the method's handle */
+        status = acpi_get_handle(root_handle, (acpi_string)WRD_METHOD, &handle);
+        if (ACPI_FAILURE(status)) {
+                IWL_DEBUG_LAR(mvm, "WRD method not found\n");
+                return -ENOENT;
+        }
+
+        /* Call WRDD with no arguments */
+        status = acpi_evaluate_object(handle, NULL, NULL, &wrdd);
+        if (ACPI_FAILURE(status)) {
+                IWL_DEBUG_LAR(mvm, "WRDC invocation failed (0x%x)\n", status);
+                return -ENOENT;
+        }
+
+        mcc_val = iwl_mvm_wrdd_get_mcc(mvm, wrdd.pointer);
+        kfree(wrdd.pointer);
+        if (!mcc_val)
+                return -ENOENT;
+
+        mcc[0] = (mcc_val >> 8) & 0xff;
+        mcc[1] = mcc_val & 0xff;
+        mcc[2] = '\0';
+        return 0;
+}
+#else /* CONFIG_ACPI */
+static int iwl_mvm_get_bios_mcc(struct iwl_mvm *mvm, char *mcc)
+{
+        return -ENOENT;
+}
+#endif
+
+int iwl_mvm_init_mcc(struct iwl_mvm *mvm)
+{
+        bool tlv_lar;
+        bool nvm_lar;
+        int retval;
+        struct ieee80211_regdomain *regd;
+        char mcc[3];
+
+        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
+                tlv_lar = mvm->fw->ucode_capa.capa[0] &
+                        IWL_UCODE_TLV_CAPA_LAR_SUPPORT;
+                nvm_lar = mvm->nvm_data->lar_enabled;
+                if (tlv_lar != nvm_lar)
+                        IWL_INFO(mvm,
+                                 "Conflict between TLV & NVM regarding enabling LAR (TLV = %s NVM =%s)\n",
+                                 tlv_lar ? "enabled" : "disabled",
+                                 nvm_lar ? "enabled" : "disabled");
+        }
+
+        if (!iwl_mvm_is_lar_supported(mvm))
+                return 0;
+
+        /*
+         * try to replay the last set MCC to FW. If it doesn't exist,
+         * queue an update to cfg80211 to retrieve the default alpha2 from FW.
+         */
+        retval = iwl_mvm_init_fw_regd(mvm);
+        if (retval != -ENOENT)
+                return retval;
+
+        /*
+         * Driver regulatory hint for initial update, this also informs the
+         * firmware we support wifi location updates.
+         * Disallow scans that might crash the FW while the LAR regdomain
+         * is not set.
+         */
+        mvm->lar_regdom_set = false;
+
+        regd = iwl_mvm_get_current_regdomain(mvm, NULL);
+        if (IS_ERR_OR_NULL(regd))
+                return -EIO;
+
+        if (iwl_mvm_is_wifi_mcc_supported(mvm) &&
+            !iwl_mvm_get_bios_mcc(mvm, mcc)) {
+                kfree(regd);
+                regd = iwl_mvm_get_regdomain(mvm->hw->wiphy, mcc,
+                                             MCC_SOURCE_BIOS, NULL);
+                if (IS_ERR_OR_NULL(regd))
+                        return -EIO;
+        }
+
+        retval = regulatory_set_wiphy_regd_sync_rtnl(mvm->hw->wiphy, regd);
+        kfree(regd);
+        return retval;
+}
+
+int iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,
+                               struct iwl_rx_cmd_buffer *rxb,
+                               struct iwl_device_cmd *cmd)
+{
+        struct iwl_rx_packet *pkt = rxb_addr(rxb);
+        struct iwl_mcc_chub_notif *notif = (void *)pkt->data;
+        enum iwl_mcc_source src;
+        char mcc[3];
+        struct ieee80211_regdomain *regd;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (WARN_ON_ONCE(!iwl_mvm_is_lar_supported(mvm)))
+                return 0;
+
+        mcc[0] = notif->mcc >> 8;
+        mcc[1] = notif->mcc & 0xff;
+        mcc[2] = '\0';
+        src = notif->source_id;
+
+        IWL_DEBUG_LAR(mvm,
+                      "RX: received chub update mcc cmd (mcc '%s' src %d)\n",
+                      mcc, src);
+        regd = iwl_mvm_get_regdomain(mvm->hw->wiphy, mcc, src, NULL);
+        if (IS_ERR_OR_NULL(regd))
+                return 0;
+
+        regulatory_set_wiphy_regd(mvm->hw->wiphy, regd);
+        kfree(regd);
+
+        return 0;
+}
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 2dffc3600ed3..a08b03d58d4b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -82,7 +82,6 @@
 #include "rs.h"
 #include "fw-api-scan.h"
 #include "time-event.h"
-#include "iwl-fw-error-dump.h"
 
 #define DRV_DESCRIPTION "The new Intel(R) wireless AGN driver for Linux"
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
@@ -234,11 +233,10 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {
                    iwl_mvm_rx_ant_coupling_notif, true),
 
         RX_HANDLER(TIME_EVENT_NOTIFICATION, iwl_mvm_rx_time_event_notif, false),
+        RX_HANDLER(MCC_CHUB_UPDATE_CMD, iwl_mvm_rx_chub_update_mcc, true),
 
         RX_HANDLER(EOSP_NOTIFICATION, iwl_mvm_rx_eosp_notif, false),
 
-        RX_HANDLER(SCAN_REQUEST_CMD, iwl_mvm_rx_scan_response, false),
-        RX_HANDLER(SCAN_COMPLETE_NOTIFICATION, iwl_mvm_rx_scan_complete, true),
         RX_HANDLER(SCAN_ITERATION_COMPLETE,
                    iwl_mvm_rx_scan_offload_iter_complete_notif, false),
         RX_HANDLER(SCAN_OFFLOAD_COMPLETE,
@@ -311,6 +309,7 @@ static const char *const iwl_mvm_cmd_strings[REPLY_MAX] = {
         CMD(REPLY_RX_MPDU_CMD),
         CMD(BEACON_NOTIFICATION),
         CMD(BEACON_TEMPLATE_CMD),
+        CMD(STATISTICS_CMD),
         CMD(STATISTICS_NOTIFICATION),
         CMD(EOSP_NOTIFICATION),
         CMD(REDUCE_TX_POWER_CMD),
@@ -359,6 +358,7 @@ static const char *const iwl_mvm_cmd_strings[REPLY_MAX] = {
         CMD(TDLS_CHANNEL_SWITCH_CMD),
         CMD(TDLS_CHANNEL_SWITCH_NOTIFICATION),
         CMD(TDLS_CONFIG_CMD),
+        CMD(MCC_UPDATE_CMD),
 };
 #undef CMD
 
@@ -456,7 +456,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         INIT_WORK(&mvm->roc_done_wk, iwl_mvm_roc_done_wk);
         INIT_WORK(&mvm->sta_drained_wk, iwl_mvm_sta_drained_wk);
         INIT_WORK(&mvm->d0i3_exit_work, iwl_mvm_d0i3_exit_work);
-        INIT_WORK(&mvm->fw_error_dump_wk, iwl_mvm_fw_error_dump_wk);
+        INIT_DELAYED_WORK(&mvm->fw_dump_wk, iwl_mvm_fw_error_dump_wk);
         INIT_DELAYED_WORK(&mvm->tdls_cs.dwork, iwl_mvm_tdls_ch_switch_work);
 
         spin_lock_init(&mvm->d0i3_tx_lock);
@@ -488,8 +488,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
         /* Set a short watchdog for the command queue */
         trans_cfg.cmd_q_wdg_timeout =
-                iwlmvm_mod_params.tfd_q_hang_detect ? IWL_DEF_WD_TIMEOUT :
-                                                      IWL_WATCHDOG_DISABLED;
+                iwl_mvm_get_wd_timeout(mvm, NULL, false, true);
 
         snprintf(mvm->hw->wiphy->fw_version,
                  sizeof(mvm->hw->wiphy->fw_version),
@@ -504,6 +503,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         trans->dbg_dest_reg_num = mvm->fw->dbg_dest_reg_num;
         memcpy(trans->dbg_conf_tlv, mvm->fw->dbg_conf_tlv,
                sizeof(trans->dbg_conf_tlv));
+        trans->dbg_trigger_tlv = mvm->fw->dbg_trigger_tlv;
 
         /* set up notification wait support */
         iwl_notification_wait_init(&mvm->notif_wait);
@@ -523,12 +523,11 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         /* set the nvm_file_name according to priority */
         if (iwlwifi_mod_params.nvm_file) {
                 mvm->nvm_file_name = iwlwifi_mod_params.nvm_file;
-        } else {
-                if ((trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) &&
-                    (CSR_HW_REV_STEP(trans->hw_rev) == SILICON_A_STEP))
-                        mvm->nvm_file_name = mvm->cfg->default_nvm_file_8000A;
+        } else if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
+                if (CSR_HW_REV_STEP(trans->hw_rev) == SILICON_B_STEP)
+                        mvm->nvm_file_name = mvm->cfg->default_nvm_file_B_step;
                 else
-                        mvm->nvm_file_name = mvm->cfg->default_nvm_file;
+                        mvm->nvm_file_name = mvm->cfg->default_nvm_file_C_step;
         }
 
         if (WARN(cfg->no_power_up_nic_in_init && !mvm->nvm_file_name,
@@ -685,6 +684,37 @@ static void iwl_mvm_async_handlers_wk(struct work_struct *wk)
         mutex_unlock(&mvm->mutex);
 }
 
+static inline void iwl_mvm_rx_check_trigger(struct iwl_mvm *mvm,
+                                            struct iwl_rx_packet *pkt)
+{
+        struct iwl_fw_dbg_trigger_tlv *trig;
+        struct iwl_fw_dbg_trigger_cmd *cmds_trig;
+        int i;
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_FW_NOTIF))
+                return;
+
+        trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_FW_NOTIF);
+        cmds_trig = (void *)trig->data;
+
+        if (!iwl_fw_dbg_trigger_check_stop(mvm, NULL, trig))
+                return;
+
+        for (i = 0; i < ARRAY_SIZE(cmds_trig->cmds); i++) {
+                /* don't collect on CMD 0 */
+                if (!cmds_trig->cmds[i].cmd_id)
+                        break;
+
+                if (cmds_trig->cmds[i].cmd_id != pkt->hdr.cmd)
+                        continue;
+
+                iwl_mvm_fw_dbg_collect_trig(mvm, trig,
+                                            "CMD 0x%02x received",
+                                            pkt->hdr.cmd);
+                break;
+        }
+}
+
 static int iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode,
                                struct iwl_rx_cmd_buffer *rxb,
                                struct iwl_device_cmd *cmd)
@@ -693,6 +723,8 @@ static int iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode,
         struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
         u8 i;
 
+        iwl_mvm_rx_check_trigger(mvm, pkt);
+
         /*
          * Do the notification wait before RX handlers so
          * even if the RX handler consumes the RXB we have
@@ -827,7 +859,7 @@ static void iwl_mvm_reprobe_wk(struct work_struct *wk)
 static void iwl_mvm_fw_error_dump_wk(struct work_struct *work)
 {
         struct iwl_mvm *mvm =
-                container_of(work, struct iwl_mvm, fw_error_dump_wk);
+                container_of(work, struct iwl_mvm, fw_dump_wk.work);
 
         if (iwl_mvm_ref_sync(mvm, IWL_MVM_REF_FW_DBG_COLLECT))
                 return;
@@ -837,8 +869,8 @@ static void iwl_mvm_fw_error_dump_wk(struct work_struct *work)
 
         /* start recording again if the firmware is not crashed */
         WARN_ON_ONCE((!test_bit(STATUS_FW_ERROR, &mvm->trans->status)) &&
-                      mvm->fw->dbg_dest_tlv &&
-                      iwl_mvm_start_fw_dbg_conf(mvm, mvm->fw_dbg_conf));
+                     mvm->fw->dbg_dest_tlv &&
+                     iwl_mvm_start_fw_dbg_conf(mvm, mvm->fw_dbg_conf));
 
         mutex_unlock(&mvm->mutex);
 
@@ -859,18 +891,7 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
          * the next start() call from mac80211. If restart isn't called
          * (no fw restart) scan status will stay busy.
          */
-        switch (mvm->scan_status) {
-        case IWL_MVM_SCAN_NONE:
-                break;
-        case IWL_MVM_SCAN_OS:
-                ieee80211_scan_completed(mvm->hw, true);
-                break;
-        case IWL_MVM_SCAN_SCHED:
-                /* Sched scan will be restarted by mac80211 in restart_hw. */
-                if (!mvm->restart_fw)
-                        ieee80211_sched_scan_stopped(mvm->hw);
-                break;
-        }
+        iwl_mvm_report_scan_aborted(mvm);
 
         /*
          * If we're restarting already, don't cycle restarts.
@@ -879,7 +900,7 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
          * can't recover this since we're already half suspended.
          */
         if (!mvm->restart_fw && fw_error) {
-                schedule_work(&mvm->fw_error_dump_wk);
+                iwl_mvm_fw_dbg_collect_desc(mvm, &iwl_mvm_dump_desc_assert, 0);
         } else if (test_and_set_bit(IWL_MVM_STATUS_IN_HW_RESTART,
                                     &mvm->status)) {
                 struct iwl_mvm_reprobe *reprobe;
@@ -1140,7 +1161,7 @@ static void iwl_mvm_d0i3_disconnect_iter(void *data, u8 *mac,
 
         if (vif->type == NL80211_IFTYPE_STATION && vif->bss_conf.assoc &&
             mvm->d0i3_ap_sta_id == mvmvif->ap_sta_id)
-                ieee80211_connection_loss(vif);
+                iwl_mvm_connection_loss(mvm, vif, "D0i3");
 }
 
 void iwl_mvm_d0i3_enable_tx(struct iwl_mvm *mvm, __le16 *qos_seq)
@@ -1236,6 +1257,10 @@ static void iwl_mvm_d0i3_exit_work(struct work_struct *wk)
         iwl_free_resp(&get_status_cmd);
 out:
         iwl_mvm_d0i3_enable_tx(mvm, qos_seq);
+
+        /* the FW might have updated the regdomain */
+        iwl_mvm_update_changed_regdom(mvm);
+
         iwl_mvm_unref(mvm, IWL_MVM_REF_EXIT_WORK);
         mutex_unlock(&mvm->mutex);
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index 5b43616eeb06..e68a475e3071 100644
--- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@ -67,7 +67,7 @@
 #include "fw-api.h"
 #include "mvm.h"
 
-/* Maps the driver specific channel width definition to the the fw values */
+/* Maps the driver specific channel width definition to the fw values */
 u8 iwl_mvm_get_channel_width(struct cfg80211_chan_def *chandef)
 {
         switch (chandef->width) {
@@ -175,6 +175,10 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
         cmd->rxchain_info |= cpu_to_le32(idle_cnt << PHY_RX_CHAIN_CNT_POS);
         cmd->rxchain_info |= cpu_to_le32(active_cnt <<
                                          PHY_RX_CHAIN_MIMO_CNT_POS);
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+        if (unlikely(mvm->dbgfs_rx_phyinfo))
+                cmd->rxchain_info = cpu_to_le32(mvm->dbgfs_rx_phyinfo);
+#endif
 
         cmd->txchain_info = cpu_to_le32(iwl_mvm_get_valid_tx_ant(mvm));
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index 2620dd0c45f9..d2c6ba9d326b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -66,6 +66,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/etherdevice.h>
 
 #include <net/mac80211.h>
 
@@ -357,7 +358,7 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,
         cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);
 
         if (!vif->bss_conf.ps || iwl_mvm_vif_low_latency(mvmvif) ||
-            !mvmvif->pm_enabled || iwl_mvm_tdls_sta_count(mvm, vif))
+            !mvmvif->pm_enabled)
                 return;
 
         cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK);
@@ -491,7 +492,7 @@ void iwl_mvm_power_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
         if (memcmp(vif->bss_conf.bssid, mvmvif->uapsd_misbehaving_bssid,
                    ETH_ALEN))
-                memset(mvmvif->uapsd_misbehaving_bssid, 0, ETH_ALEN);
+                eth_zero_addr(mvmvif->uapsd_misbehaving_bssid);
 }
 
 static void iwl_mvm_power_uapsd_misbehav_ap_iterator(void *_data, u8 *mac,
@@ -638,6 +639,10 @@ static void iwl_mvm_power_set_pm(struct iwl_mvm *mvm,
         if (vifs->ap_vif)
                 ap_mvmvif = iwl_mvm_vif_from_mac80211(vifs->ap_vif);
 
+        /* don't allow PM if any TDLS stations exist */
+        if (iwl_mvm_tdls_sta_count(mvm, NULL))
+                return;
+
         /* enable PM on bss if bss stand alone */
         if (vifs->bss_active && !vifs->p2p_active && !vifs->ap_active) {
                 bss_mvmvif->pm_enabled = true;
diff --git a/drivers/net/wireless/iwlwifi/mvm/quota.c b/drivers/net/wireless/iwlwifi/mvm/quota.c
index dbb2594390e9..509a66d05245 100644
--- a/drivers/net/wireless/iwlwifi/mvm/quota.c
+++ b/drivers/net/wireless/iwlwifi/mvm/quota.c
@@ -172,6 +172,7 @@ static void iwl_mvm_adjust_quota_for_noa(struct iwl_mvm *mvm,
 }
 
 int iwl_mvm_update_quotas(struct iwl_mvm *mvm,
+                          bool force_update,
                           struct ieee80211_vif *disabled_vif)
 {
         struct iwl_time_quota_cmd cmd = {};
@@ -309,7 +310,7 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm,
                           "zero quota on binding %d\n", i);
         }
 
-        if (!send) {
+        if (!send && !force_update) {
                 /* don't send a practically unchanged command, the firmware has
                  * to re-initialize a lot of state and that can have an adverse
                  * impact on it
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index 078f24cf4af3..f9928f2c125f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -160,6 +160,9 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                           struct iwl_scale_tbl_info *tbl,
                           const struct rs_tx_column *next_col)
 {
+        struct iwl_mvm_sta *mvmsta;
+        struct iwl_mvm_vif *mvmvif;
+
         if (!sta->ht_cap.ht_supported)
                 return false;
 
@@ -172,6 +175,11 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
         if (!iwl_mvm_bt_coex_is_mimo_allowed(mvm, sta))
                 return false;
 
+        mvmsta = iwl_mvm_sta_from_mac80211(sta);
+        mvmvif = iwl_mvm_vif_from_mac80211(mvmsta->vif);
+        if (iwl_mvm_vif_low_latency(mvmvif) && mvmsta->vif->p2p)
+                return false;
+
         return true;
 }
 
@@ -807,6 +815,8 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
                 rate->ldpc = true;
         if (ucode_rate & RATE_MCS_VHT_STBC_MSK)
                 rate->stbc = true;
+        if (ucode_rate & RATE_MCS_BF_MSK)
+                rate->bfer = true;
 
         rate->bw = ucode_rate & RATE_MCS_CHAN_WIDTH_MSK;
 
@@ -816,7 +826,9 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
 
                 if (nss == 1) {
                         rate->type = LQ_HT_SISO;
-                        WARN_ON_ONCE(!rate->stbc && num_of_ant != 1);
+                        WARN_ONCE(!rate->stbc && !rate->bfer && num_of_ant != 1,
+                                  "stbc %d bfer %d",
+                                  rate->stbc, rate->bfer);
                 } else if (nss == 2) {
                         rate->type = LQ_HT_MIMO2;
                         WARN_ON_ONCE(num_of_ant != 2);
@@ -829,7 +841,9 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
 
                 if (nss == 1) {
                         rate->type = LQ_VHT_SISO;
-                        WARN_ON_ONCE(!rate->stbc && num_of_ant != 1);
+                        WARN_ONCE(!rate->stbc && !rate->bfer && num_of_ant != 1,
+                                  "stbc %d bfer %d",
+                                  rate->stbc, rate->bfer);
                 } else if (nss == 2) {
                         rate->type = LQ_VHT_MIMO2;
                         WARN_ON_ONCE(num_of_ant != 2);
@@ -1008,13 +1022,41 @@ static void rs_get_lower_rate_down_column(struct iwl_lq_sta *lq_sta,
                 rs_get_lower_rate_in_column(lq_sta, rate);
 }
 
-/* Simple function to compare two rate scale table types */
-static inline bool rs_rate_match(struct rs_rate *a,
-                                 struct rs_rate *b)
+/* Check if both rates are identical
+ * allow_ant_mismatch enables matching a SISO rate on ANT_A or ANT_B
+ * with a rate indicating STBC/BFER and ANT_AB.
+ */
+static inline bool rs_rate_equal(struct rs_rate *a,
+                                 struct rs_rate *b,
+                                 bool allow_ant_mismatch)
+
+{
+        bool ant_match = (a->ant == b->ant) && (a->stbc == b->stbc) &&
+                (a->bfer == b->bfer);
+
+        if (allow_ant_mismatch) {
+                if (a->stbc || a->bfer) {
+                        WARN_ONCE(a->ant != ANT_AB, "stbc %d bfer %d ant %d",
+                                  a->stbc, a->bfer, a->ant);
+                        ant_match |= (b->ant == ANT_A || b->ant == ANT_B);
+                } else if (b->stbc || b->bfer) {
+                        WARN_ONCE(b->ant != ANT_AB, "stbc %d bfer %d ant %d",
+                                  b->stbc, b->bfer, b->ant);
+                        ant_match |= (a->ant == ANT_A || a->ant == ANT_B);
+                }
+        }
+
+        return (a->type == b->type) && (a->bw == b->bw) && (a->sgi == b->sgi) &&
+                (a->ldpc == b->ldpc) && (a->index == b->index) && ant_match;
+}
+
+/* Check if both rates share the same column */
+static inline bool rs_rate_column_match(struct rs_rate *a,
+                                        struct rs_rate *b)
 {
         bool ant_match;
 
-        if (a->stbc)
+        if (a->stbc || a->bfer)
                 ant_match = (b->ant == ANT_A || b->ant == ANT_B);
         else
                 ant_match = (a->ant == b->ant);
@@ -1023,16 +1065,35 @@ static inline bool rs_rate_match(struct rs_rate *a,
                 && ant_match;
 }
 
-static u32 rs_ch_width_from_mac_flags(enum mac80211_rate_control_flags flags)
+static inline enum rs_column rs_get_column_from_rate(struct rs_rate *rate)
 {
-        if (flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-                return RATE_MCS_CHAN_WIDTH_40;
-        else if (flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
-                return RATE_MCS_CHAN_WIDTH_80;
-        else if (flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
-                return RATE_MCS_CHAN_WIDTH_160;
+        if (is_legacy(rate)) {
+                if (rate->ant == ANT_A)
+                        return RS_COLUMN_LEGACY_ANT_A;
 
-        return RATE_MCS_CHAN_WIDTH_20;
+                if (rate->ant == ANT_B)
+                        return RS_COLUMN_LEGACY_ANT_B;
+
+                goto err;
+        }
+
+        if (is_siso(rate)) {
+                if (rate->ant == ANT_A || rate->stbc || rate->bfer)
+                        return rate->sgi ? RS_COLUMN_SISO_ANT_A_SGI :
+                                RS_COLUMN_SISO_ANT_A;
+
+                if (rate->ant == ANT_B)
+                        return rate->sgi ? RS_COLUMN_SISO_ANT_B_SGI :
+                                RS_COLUMN_SISO_ANT_B;
+
+                goto err;
+        }
+
+        if (is_mimo(rate))
+                return rate->sgi ? RS_COLUMN_MIMO2_SGI : RS_COLUMN_MIMO2;
+
+err:
+        return RS_COLUMN_INVALID;
 }
 
 static u8 rs_get_tid(struct ieee80211_hdr *hdr)
@@ -1055,15 +1116,17 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 {
         int legacy_success;
         int retries;
-        int mac_index, i;
+        int i;
         struct iwl_lq_cmd *table;
-        enum mac80211_rate_control_flags mac_flags;
-        u32 ucode_rate;
-        struct rs_rate rate;
+        u32 lq_hwrate;
+        struct rs_rate lq_rate, tx_resp_rate;
         struct iwl_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;
         u8 reduced_txp = (uintptr_t)info->status.status_driver_data[0];
+        u32 tx_resp_hwrate = (uintptr_t)info->status.status_driver_data[1];
         struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
         struct iwl_lq_sta *lq_sta = &mvmsta->lq_sta;
+        bool allow_ant_mismatch = mvm->fw->ucode_capa.api[0] &
+                IWL_UCODE_TLV_API_LQ_SS_PARAMS;
 
         /* Treat uninitialized rate scaling data same as non-existing. */
         if (!lq_sta) {
@@ -1074,50 +1137,43 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                 return;
         }
 
-#ifdef CONFIG_MAC80211_DEBUGFS
-        /* Disable last tx check if we are debugging with fixed rate */
-        if (lq_sta->pers.dbg_fixed_rate) {
-                IWL_DEBUG_RATE(mvm, "Fixed rate. avoid rate scaling\n");
-                return;
-        }
-#endif
         /* This packet was aggregated but doesn't carry status info */
         if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
             !(info->flags & IEEE80211_TX_STAT_AMPDU))
                 return;
 
-        /*
-         * Ignore this Tx frame response if its initial rate doesn't match
-         * that of latest Link Quality command.  There may be stragglers
-         * from a previous Link Quality command, but we're no longer interested
-         * in those; they're either from the "active" mode while we're trying
-         * to check "search" mode, or a prior "search" mode after we've moved
-         * to a new "search" mode (which might become the new "active" mode).
-         */
-        table = &lq_sta->lq;
-        ucode_rate = le32_to_cpu(table->rs_table[0]);
-        rs_rate_from_ucode_rate(ucode_rate, info->band, &rate);
-        if (info->band == IEEE80211_BAND_5GHZ)
-                rate.index -= IWL_FIRST_OFDM_RATE;
-        mac_flags = info->status.rates[0].flags;
-        mac_index = info->status.rates[0].idx;
-        /* For HT packets, map MCS to PLCP */
-        if (mac_flags & IEEE80211_TX_RC_MCS) {
-                /* Remove # of streams */
-                mac_index &= RATE_HT_MCS_RATE_CODE_MSK;
-                if (mac_index >= (IWL_RATE_9M_INDEX - IWL_FIRST_OFDM_RATE))
-                        mac_index++;
-                /*
-                 * mac80211 HT index is always zero-indexed; we need to move
-                 * HT OFDM rates after CCK rates in 2.4 GHz band
-                 */
-                if (info->band == IEEE80211_BAND_2GHZ)
-                        mac_index += IWL_FIRST_OFDM_RATE;
-        } else if (mac_flags & IEEE80211_TX_RC_VHT_MCS) {
-                mac_index &= RATE_VHT_MCS_RATE_CODE_MSK;
-                if (mac_index >= (IWL_RATE_9M_INDEX - IWL_FIRST_OFDM_RATE))
-                        mac_index++;
+        rs_rate_from_ucode_rate(tx_resp_hwrate, info->band, &tx_resp_rate);
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        /* Disable last tx check if we are debugging with fixed rate but
+         * update tx stats */
+        if (lq_sta->pers.dbg_fixed_rate) {
+                int index = tx_resp_rate.index;
+                enum rs_column column;
+                int attempts, success;
+
+                column = rs_get_column_from_rate(&tx_resp_rate);
+                if (WARN_ONCE(column == RS_COLUMN_INVALID,
+                              "Can't map rate 0x%x to column",
+                              tx_resp_hwrate))
+                        return;
+
+                if (info->flags & IEEE80211_TX_STAT_AMPDU) {
+                        attempts = info->status.ampdu_len;
+                        success = info->status.ampdu_ack_len;
+                } else {
+                        attempts = info->status.rates[0].count;
+                        success = !!(info->flags & IEEE80211_TX_STAT_ACK);
+                }
+
+                lq_sta->pers.tx_stats[column][index].total += attempts;
+                lq_sta->pers.tx_stats[column][index].success += success;
+
+                IWL_DEBUG_RATE(mvm, "Fixed rate 0x%x success %d attempts %d\n",
+                               tx_resp_hwrate, success, attempts);
+                return;
         }
+#endif
 
         if (time_after(jiffies,
                        (unsigned long)(lq_sta->last_tx +
@@ -1133,21 +1189,23 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
         }
         lq_sta->last_tx = jiffies;
 
+        /* Ignore this Tx frame response if its initial rate doesn't match
+         * that of latest Link Quality command.  There may be stragglers
+         * from a previous Link Quality command, but we're no longer interested
+         * in those; they're either from the "active" mode while we're trying
+         * to check "search" mode, or a prior "search" mode after we've moved
+         * to a new "search" mode (which might become the new "active" mode).
+         */
+        table = &lq_sta->lq;
+        lq_hwrate = le32_to_cpu(table->rs_table[0]);
+        rs_rate_from_ucode_rate(lq_hwrate, info->band, &lq_rate);
+
         /* Here we actually compare this rate to the latest LQ command */
-        if ((mac_index < 0) ||
-            (rate.sgi != !!(mac_flags & IEEE80211_TX_RC_SHORT_GI)) ||
-            (rate.bw != rs_ch_width_from_mac_flags(mac_flags)) ||
-            (rate.ant != info->status.antenna) ||
-            (!!(ucode_rate & RATE_MCS_HT_MSK) !=
-             !!(mac_flags & IEEE80211_TX_RC_MCS)) ||
-            (!!(ucode_rate & RATE_MCS_VHT_MSK) !=
-             !!(mac_flags & IEEE80211_TX_RC_VHT_MCS)) ||
-            (!!(ucode_rate & RATE_HT_MCS_GF_MSK) !=
-             !!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD)) ||
-            (rate.index != mac_index)) {
+        if (!rs_rate_equal(&tx_resp_rate, &lq_rate, allow_ant_mismatch)) {
                 IWL_DEBUG_RATE(mvm,
-                               "initial rate %d does not match %d (0x%x)\n",
-                               mac_index, rate.index, ucode_rate);
+                               "initial tx resp rate 0x%x does not match 0x%x\n",
+                               tx_resp_hwrate, lq_hwrate);
+
                 /*
                  * Since rates mis-match, the last LQ command may have failed.
                  * After IWL_MISSED_RATE_MAX mis-matches, resync the uCode with
@@ -1175,14 +1233,14 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                 other_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
         }
 
-        if (WARN_ON_ONCE(!rs_rate_match(&rate, &curr_tbl->rate))) {
+        if (WARN_ON_ONCE(!rs_rate_column_match(&lq_rate, &curr_tbl->rate))) {
                 IWL_DEBUG_RATE(mvm,
                                "Neither active nor search matches tx rate\n");
                 tmp_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
                 rs_dump_rate(mvm, &tmp_tbl->rate, "ACTIVE");
                 tmp_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
                 rs_dump_rate(mvm, &tmp_tbl->rate, "SEARCH");
-                rs_dump_rate(mvm, &rate, "ACTUAL");
+                rs_dump_rate(mvm, &lq_rate, "ACTUAL");
 
                 /*
                  * no matching table found, let's by-pass the data collection
@@ -1207,9 +1265,7 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                 if (info->status.ampdu_ack_len == 0)
                         info->status.ampdu_len = 1;
 
-                ucode_rate = le32_to_cpu(table->rs_table[0]);
-                rs_rate_from_ucode_rate(ucode_rate, info->band, &rate);
-                rs_collect_tx_data(mvm, lq_sta, curr_tbl, rate.index,
+                rs_collect_tx_data(mvm, lq_sta, curr_tbl, lq_rate.index,
                                    info->status.ampdu_len,
                                    info->status.ampdu_ack_len,
                                    reduced_txp);
@@ -1221,9 +1277,7 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                                         info->status.ampdu_ack_len);
                 }
         } else {
-        /*
-         * For legacy, update frame history with for each Tx retry.
-         */
+                /* For legacy, update frame history with for each Tx retry. */
                 retries = info->status.rates[0].count - 1;
                 /* HW doesn't send more than 15 retries */
                 retries = min(retries, 15);
@@ -1232,21 +1286,23 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                 legacy_success = !!(info->flags & IEEE80211_TX_STAT_ACK);
                 /* Collect data for each rate used during failed TX attempts */
                 for (i = 0; i <= retries; ++i) {
-                        ucode_rate = le32_to_cpu(table->rs_table[i]);
-                        rs_rate_from_ucode_rate(ucode_rate, info->band, &rate);
+                        lq_hwrate = le32_to_cpu(table->rs_table[i]);
+                        rs_rate_from_ucode_rate(lq_hwrate, info->band,
+                                                &lq_rate);
                         /*
                          * Only collect stats if retried rate is in the same RS
                          * table as active/search.
                          */
-                        if (rs_rate_match(&rate, &curr_tbl->rate))
+                        if (rs_rate_column_match(&lq_rate, &curr_tbl->rate))
                                 tmp_tbl = curr_tbl;
-                        else if (rs_rate_match(&rate, &other_tbl->rate))
+                        else if (rs_rate_column_match(&lq_rate,
+                                                      &other_tbl->rate))
                                 tmp_tbl = other_tbl;
                         else
                                 continue;
 
-                        rs_collect_tx_data(mvm, lq_sta, tmp_tbl, rate.index, 1,
-                                           i < retries ? 0 : legacy_success,
+                        rs_collect_tx_data(mvm, lq_sta, tmp_tbl, lq_rate.index,
+                                           1, i < retries ? 0 : legacy_success,
                                            reduced_txp);
                 }
 
@@ -1257,7 +1313,7 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                 }
         }
         /* The last TX rate is cached in lq_sta; it's set in if/else above */
-        lq_sta->last_rate_n_flags = ucode_rate;
+        lq_sta->last_rate_n_flags = lq_hwrate;
         IWL_DEBUG_RATE(mvm, "reduced txpower: %d\n", reduced_txp);
 done:
         /* See if there's a better rate or modulation mode to try. */
@@ -1557,9 +1613,9 @@ static void rs_stay_in_table(struct iwl_lq_sta *lq_sta, bool force_search)
 static void rs_update_rate_tbl(struct iwl_mvm *mvm,
                                struct ieee80211_sta *sta,
                                struct iwl_lq_sta *lq_sta,
-                               struct rs_rate *rate)
+                               struct iwl_scale_tbl_info *tbl)
 {
-        rs_fill_lq_cmd(mvm, sta, lq_sta, rate);
+        rs_fill_lq_cmd(mvm, sta, lq_sta, &tbl->rate);
         iwl_mvm_send_lq_cmd(mvm, &lq_sta->lq, false);
 }
 
@@ -2089,7 +2145,7 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm,
                         rate->type = LQ_NONE;
                         lq_sta->search_better_tbl = 0;
                         tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-                        rs_update_rate_tbl(mvm, sta, lq_sta, &tbl->rate);
+                        rs_update_rate_tbl(mvm, sta, lq_sta, tbl);
                 }
                 return;
         }
@@ -2252,7 +2308,7 @@ lq_update:
         /* Replace uCode's rate table for the destination station. */
         if (update_lq) {
                 tbl->rate.index = index;
-                rs_update_rate_tbl(mvm, sta, lq_sta, &tbl->rate);
+                rs_update_rate_tbl(mvm, sta, lq_sta, tbl);
         }
 
         rs_stay_in_table(lq_sta, false);
@@ -2299,8 +2355,7 @@ lq_update:
 
                         rs_dump_rate(mvm, &tbl->rate,
                                      "Switch to SEARCH TABLE:");
-                        rs_fill_lq_cmd(mvm, sta, lq_sta, &tbl->rate);
-                        iwl_mvm_send_lq_cmd(mvm, &lq_sta->lq, false);
+                        rs_update_rate_tbl(mvm, sta, lq_sta, tbl);
                 } else {
                         done_search = 1;
                 }
@@ -2554,6 +2609,7 @@ static void *rs_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta,
 #ifdef CONFIG_MAC80211_DEBUGFS
         lq_sta->pers.dbg_fixed_rate = 0;
         lq_sta->pers.dbg_fixed_txp_reduction = TPC_INVALID;
+        lq_sta->pers.ss_force = RS_SS_FORCE_NONE;
 #endif
         lq_sta->pers.chains = 0;
         memset(lq_sta->pers.chain_signal, 0, sizeof(lq_sta->pers.chain_signal));
@@ -3079,19 +3135,21 @@ static void rs_set_lq_ss_params(struct iwl_mvm *mvm,
         if (!iwl_mvm_bt_coex_is_mimo_allowed(mvm, sta))
                 goto out;
 
+#ifdef CONFIG_MAC80211_DEBUGFS
         /* Check if forcing the decision is configured.
          * Note that SISO is forced by not allowing STBC or BFER
          */
-        if (lq_sta->ss_force == RS_SS_FORCE_STBC)
+        if (lq_sta->pers.ss_force == RS_SS_FORCE_STBC)
                 ss_params |= (LQ_SS_STBC_1SS_ALLOWED | LQ_SS_FORCE);
-        else if (lq_sta->ss_force == RS_SS_FORCE_BFER)
+        else if (lq_sta->pers.ss_force == RS_SS_FORCE_BFER)
                 ss_params |= (LQ_SS_BFER_ALLOWED | LQ_SS_FORCE);
 
-        if (lq_sta->ss_force != RS_SS_FORCE_NONE) {
+        if (lq_sta->pers.ss_force != RS_SS_FORCE_NONE) {
                 IWL_DEBUG_RATE(mvm, "Forcing single stream Tx decision %d\n",
-                               lq_sta->ss_force);
+                               lq_sta->pers.ss_force);
                 goto out;
         }
+#endif
 
         if (lq_sta->stbc_capable)
                 ss_params |= LQ_SS_STBC_1SS_ALLOWED;
@@ -3177,7 +3235,7 @@ static void rs_fill_lq_cmd(struct iwl_mvm *mvm,
         lq_cmd->agg_frame_cnt_limit = mvmsta->max_agg_bufsize;
 
         /*
-         * In case of low latency, tell the firwmare to leave a frame in the
+         * In case of low latency, tell the firmware to leave a frame in the
          * Tx Fifo so that it can start a transaction in the same TxOP. This
          * basically allows the firmware to send bursts.
          */
@@ -3332,6 +3390,7 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
         struct iwl_mvm *mvm;
         struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
         struct rs_rate *rate = &tbl->rate;
+        u32 ss_params;
         mvm = lq_sta->pers.drv;
         buff = kmalloc(2048, GFP_KERNEL);
         if (!buff)
@@ -3351,16 +3410,16 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
                         (is_legacy(rate)) ? "legacy" :
                         is_vht(rate) ? "VHT" : "HT");
         if (!is_legacy(rate)) {
-                desc += sprintf(buff+desc, " %s",
+                desc += sprintf(buff + desc, " %s",
                    (is_siso(rate)) ? "SISO" : "MIMO2");
-                   desc += sprintf(buff+desc, " %s",
-                                   (is_ht20(rate)) ? "20MHz" :
-                                   (is_ht40(rate)) ? "40MHz" :
-                                   (is_ht80(rate)) ? "80Mhz" : "BAD BW");
-                   desc += sprintf(buff+desc, " %s %s %s\n",
-                                   (rate->sgi) ? "SGI" : "NGI",
-                                   (rate->ldpc) ? "LDPC" : "BCC",
-                                   (lq_sta->is_agg) ? "AGG on" : "");
+                desc += sprintf(buff + desc, " %s",
+                                (is_ht20(rate)) ? "20MHz" :
+                                (is_ht40(rate)) ? "40MHz" :
+                                (is_ht80(rate)) ? "80Mhz" : "BAD BW");
+                desc += sprintf(buff + desc, " %s %s %s\n",
+                                (rate->sgi) ? "SGI" : "NGI",
+                                (rate->ldpc) ? "LDPC" : "BCC",
+                                (lq_sta->is_agg) ? "AGG on" : "");
         }
         desc += sprintf(buff+desc, "last tx rate=0x%X\n",
                         lq_sta->last_rate_n_flags);
@@ -3378,6 +3437,16 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
                         lq_sta->lq.agg_frame_cnt_limit);
 
         desc += sprintf(buff+desc, "reduced tpc=%d\n", lq_sta->lq.reduced_tpc);
+        ss_params = le32_to_cpu(lq_sta->lq.ss_params);
+        desc += sprintf(buff+desc, "single stream params: %s%s%s%s\n",
+                        (ss_params & LQ_SS_PARAMS_VALID) ?
+                        "VALID" : "INVALID",
+                        (ss_params & LQ_SS_BFER_ALLOWED) ?
+                        ", BFER" : "",
+                        (ss_params & LQ_SS_STBC_1SS_ALLOWED) ?
+                        ", STBC" : "",
+                        (ss_params & LQ_SS_FORCE) ?
+                        ", FORCE" : "");
         desc += sprintf(buff+desc,
                         "Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",
                         lq_sta->lq.initial_rate_index[0],
@@ -3554,7 +3623,7 @@ static ssize_t iwl_dbgfs_ss_force_read(struct file *file,
         };
 
         pos += scnprintf(buf+pos, bufsz-pos, "%s\n",
-                         ss_force_name[lq_sta->ss_force]);
+                         ss_force_name[lq_sta->pers.ss_force]);
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
@@ -3565,12 +3634,12 @@ static ssize_t iwl_dbgfs_ss_force_write(struct iwl_lq_sta *lq_sta, char *buf,
         int ret = 0;
 
         if (!strncmp("none", buf, 4)) {
-                lq_sta->ss_force = RS_SS_FORCE_NONE;
+                lq_sta->pers.ss_force = RS_SS_FORCE_NONE;
         } else if (!strncmp("siso", buf, 4)) {
-                lq_sta->ss_force = RS_SS_FORCE_SISO;
+                lq_sta->pers.ss_force = RS_SS_FORCE_SISO;
         } else if (!strncmp("stbc", buf, 4)) {
                 if (lq_sta->stbc_capable) {
-                        lq_sta->ss_force = RS_SS_FORCE_STBC;
+                        lq_sta->pers.ss_force = RS_SS_FORCE_STBC;
                 } else {
                         IWL_ERR(mvm,
                                 "can't force STBC. peer doesn't support\n");
@@ -3578,7 +3647,7 @@ static ssize_t iwl_dbgfs_ss_force_write(struct iwl_lq_sta *lq_sta, char *buf,
                 }
         } else if (!strncmp("bfer", buf, 4)) {
                 if (lq_sta->bfer_capable) {
-                        lq_sta->ss_force = RS_SS_FORCE_BFER;
+                        lq_sta->pers.ss_force = RS_SS_FORCE_BFER;
                 } else {
                         IWL_ERR(mvm,
                                 "can't force BFER. peer doesn't support\n");
@@ -3673,7 +3742,7 @@ void iwl_mvm_rate_control_unregister(void)
 
 /**
  * iwl_mvm_tx_protection - Gets LQ command, change it to enable/disable
- * Tx protection, according to this rquest and previous requests,
+ * Tx protection, according to this request and previous requests,
  * and send the LQ command.
  * @mvmsta: The station
  * @enable: Enable Tx protection?
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.h b/drivers/net/wireless/iwlwifi/mvm/rs.h
index dc4ef3dfafe1..e4aa9346a231 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.h
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.h
@@ -170,6 +170,7 @@ struct rs_rate {
         bool sgi;
         bool ldpc;
         bool stbc;
+        bool bfer;
 };
 
 
@@ -331,14 +332,14 @@ struct iwl_lq_sta {
         /* tx power reduce for this sta */
         int tpc_reduce;
 
-        /* force STBC/BFER/SISO for testing */
-        enum rs_ss_force_opt ss_force;
-
         /* persistent fields - initialized only once - keep last! */
         struct lq_sta_pers {
 #ifdef CONFIG_MAC80211_DEBUGFS
                 u32 dbg_fixed_rate;
                 u8 dbg_fixed_txp_reduction;
+
+                /* force STBC/BFER/SISO for testing */
+                enum rs_ss_force_opt ss_force;
 #endif
                 u8 chains;
                 s8 chain_signal[IEEE80211_MAX_CHAINS];
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index f922131b4eab..78ec7db64ba5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -345,6 +345,25 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
                 struct iwl_mvm_sta *mvmsta;
                 mvmsta = iwl_mvm_sta_from_mac80211(sta);
                 rs_update_last_rssi(mvm, &mvmsta->lq_sta, rx_status);
+
+                if (iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_RSSI) &&
+                    ieee80211_is_beacon(hdr->frame_control)) {
+                        struct iwl_fw_dbg_trigger_tlv *trig;
+                        struct iwl_fw_dbg_trigger_low_rssi *rssi_trig;
+                        bool trig_check;
+                        s32 rssi;
+
+                        trig = iwl_fw_dbg_get_trigger(mvm->fw,
+                                                      FW_DBG_TRIGGER_RSSI);
+                        rssi_trig = (void *)trig->data;
+                        rssi = le32_to_cpu(rssi_trig->rssi);
+
+                        trig_check =
+                                iwl_fw_dbg_trigger_check_stop(mvm, mvmsta->vif,
+                                                              trig);
+                        if (trig_check && rx_status->signal < rssi)
+                                iwl_mvm_fw_dbg_collect_trig(mvm, trig, NULL);
+                }
         }
 
         rcu_read_unlock();
@@ -416,35 +435,43 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
 }
 
 static void iwl_mvm_update_rx_statistics(struct iwl_mvm *mvm,
-                                         struct iwl_notif_statistics *stats)
+                                         struct mvm_statistics_rx *rx_stats)
 {
-        /*
-         * NOTE FW aggregates the statistics - BUT the statistics are cleared
-         * when the driver issues REPLY_STATISTICS_CMD 0x9c with CLEAR_STATS
-         * bit set.
-         */
         lockdep_assert_held(&mvm->mutex);
-        memcpy(&mvm->rx_stats, &stats->rx, sizeof(struct mvm_statistics_rx));
+
+        mvm->rx_stats = *rx_stats;
 }
 
 struct iwl_mvm_stat_data {
-        struct iwl_notif_statistics *stats;
         struct iwl_mvm *mvm;
+        __le32 mac_id;
+        __s8 beacon_filter_average_energy;
+        struct mvm_statistics_general_v8 *general;
 };
 
 static void iwl_mvm_stat_iterator(void *_data, u8 *mac,
                                   struct ieee80211_vif *vif)
 {
         struct iwl_mvm_stat_data *data = _data;
-        struct iwl_notif_statistics *stats = data->stats;
         struct iwl_mvm *mvm = data->mvm;
-        int sig = -stats->general.beacon_filter_average_energy;
+        int sig = -data->beacon_filter_average_energy;
         int last_event;
         int thold = vif->bss_conf.cqm_rssi_thold;
         int hyst = vif->bss_conf.cqm_rssi_hyst;
-        u16 id = le32_to_cpu(stats->rx.general.mac_id);
+        u16 id = le32_to_cpu(data->mac_id);
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 
+        /* This doesn't need the MAC ID check since it's not taking the
+         * data copied into the "data" struct, but rather the data from
+         * the notification directly.
+         */
+        if (data->general) {
+                mvmvif->beacon_stats.num_beacons =
+                        le32_to_cpu(data->general->beacon_counter[mvmvif->id]);
+                mvmvif->beacon_stats.avg_signal =
+                        -data->general->beacon_average_energy[mvmvif->id];
+        }
+
         if (mvmvif->id != id)
                 return;
 
@@ -500,34 +527,101 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac,
         }
 }
 
-/*
- * iwl_mvm_rx_statistics - STATISTICS_NOTIFICATION handler
- *
- * TODO: This handler is implemented partially.
- */
-int iwl_mvm_rx_statistics(struct iwl_mvm *mvm,
-                          struct iwl_rx_cmd_buffer *rxb,
-                          struct iwl_device_cmd *cmd)
+static inline void
+iwl_mvm_rx_stats_check_trigger(struct iwl_mvm *mvm, struct iwl_rx_packet *pkt)
 {
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_notif_statistics *stats = (void *)&pkt->data;
+        struct iwl_fw_dbg_trigger_tlv *trig;
+        struct iwl_fw_dbg_trigger_stats *trig_stats;
+        u32 trig_offset, trig_thold;
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_STATS))
+                return;
+
+        trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_STATS);
+        trig_stats = (void *)trig->data;
+
+        if (!iwl_fw_dbg_trigger_check_stop(mvm, NULL, trig))
+                return;
+
+        trig_offset = le32_to_cpu(trig_stats->stop_offset);
+        trig_thold = le32_to_cpu(trig_stats->stop_threshold);
+
+        if (WARN_ON_ONCE(trig_offset >= iwl_rx_packet_payload_len(pkt)))
+                return;
+
+        if (le32_to_cpup((__le32 *) (pkt->data + trig_offset)) < trig_thold)
+                return;
+
+        iwl_mvm_fw_dbg_collect_trig(mvm, trig, NULL);
+}
+
+void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,
+                                  struct iwl_rx_packet *pkt)
+{
+        size_t v8_len = sizeof(struct iwl_notif_statistics_v8);
+        size_t v10_len = sizeof(struct iwl_notif_statistics_v10);
         struct iwl_mvm_stat_data data = {
-                .stats = stats,
                 .mvm = mvm,
         };
+        u32 temperature;
+
+        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_STATS_V10) {
+                struct iwl_notif_statistics_v10 *stats = (void *)&pkt->data;
+
+                if (iwl_rx_packet_payload_len(pkt) != v10_len)
+                        goto invalid;
+
+                temperature = le32_to_cpu(stats->general.radio_temperature);
+                data.mac_id = stats->rx.general.mac_id;
+                data.beacon_filter_average_energy =
+                        stats->general.beacon_filter_average_energy;
+
+                iwl_mvm_update_rx_statistics(mvm, &stats->rx);
+
+                mvm->radio_stats.rx_time = le64_to_cpu(stats->general.rx_time);
+                mvm->radio_stats.tx_time = le64_to_cpu(stats->general.tx_time);
+                mvm->radio_stats.on_time_rf =
+                        le64_to_cpu(stats->general.on_time_rf);
+                mvm->radio_stats.on_time_scan =
+                        le64_to_cpu(stats->general.on_time_scan);
+
+                data.general = &stats->general;
+        } else {
+                struct iwl_notif_statistics_v8 *stats = (void *)&pkt->data;
+
+                if (iwl_rx_packet_payload_len(pkt) != v8_len)
+                        goto invalid;
+
+                temperature = le32_to_cpu(stats->general.radio_temperature);
+                data.mac_id = stats->rx.general.mac_id;
+                data.beacon_filter_average_energy =
+                        stats->general.beacon_filter_average_energy;
+
+                iwl_mvm_update_rx_statistics(mvm, &stats->rx);
+        }
+
+        iwl_mvm_rx_stats_check_trigger(mvm, pkt);
 
         /* Only handle rx statistics temperature changes if async temp
          * notifications are not supported
          */
         if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_ASYNC_DTM))
-                iwl_mvm_tt_temp_changed(mvm,
-                                le32_to_cpu(stats->general.radio_temperature));
-
-        iwl_mvm_update_rx_statistics(mvm, stats);
+                iwl_mvm_tt_temp_changed(mvm, temperature);
 
         ieee80211_iterate_active_interfaces(mvm->hw,
                                             IEEE80211_IFACE_ITER_NORMAL,
                                             iwl_mvm_stat_iterator,
                                             &data);
+        return;
+ invalid:
+        IWL_ERR(mvm, "received invalid statistics size (%d)!\n",
+                iwl_rx_packet_payload_len(pkt));
+}
+
+int iwl_mvm_rx_statistics(struct iwl_mvm *mvm,
+                          struct iwl_rx_cmd_buffer *rxb,
+                          struct iwl_device_cmd *cmd)
+{
+        iwl_mvm_handle_rx_statistics(mvm, rxb_addr(rxb));
         return 0;
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index c47c8051da77..74e1c86289dc 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -82,6 +82,7 @@ struct iwl_mvm_scan_params {
         struct _dwell {
                 u16 passive;
                 u16 active;
+                u16 fragmented;
         } dwell[IEEE80211_NUM_BANDS];
 };
 
@@ -191,101 +192,6 @@ static u16 iwl_mvm_get_passive_dwell(struct iwl_mvm *mvm,
         return band == IEEE80211_BAND_2GHZ ? 100 + 20 : 100 + 10;
 }
 
-static void iwl_mvm_scan_fill_channels(struct iwl_scan_cmd *cmd,
-                                       struct cfg80211_scan_request *req,
-                                       bool basic_ssid,
-                                       struct iwl_mvm_scan_params *params)
-{
-        struct iwl_scan_channel *chan = (struct iwl_scan_channel *)
-                (cmd->data + le16_to_cpu(cmd->tx_cmd.len));
-        int i;
-        int type = BIT(req->n_ssids) - 1;
-        enum ieee80211_band band = req->channels[0]->band;
-
-        if (!basic_ssid)
-                type |= BIT(req->n_ssids);
-
-        for (i = 0; i < cmd->channel_count; i++) {
-                chan->channel = cpu_to_le16(req->channels[i]->hw_value);
-                chan->type = cpu_to_le32(type);
-                if (req->channels[i]->flags & IEEE80211_CHAN_NO_IR)
-                        chan->type &= cpu_to_le32(~SCAN_CHANNEL_TYPE_ACTIVE);
-                chan->active_dwell = cpu_to_le16(params->dwell[band].active);
-                chan->passive_dwell = cpu_to_le16(params->dwell[band].passive);
-                chan->iteration_count = cpu_to_le16(1);
-                chan++;
-        }
-}
-
-/*
- * Fill in probe request with the following parameters:
- * TA is our vif HW address, which mac80211 ensures we have.
- * Packet is broadcasted, so this is both SA and DA.
- * The probe request IE is made out of two: first comes the most prioritized
- * SSID if a directed scan is requested. Second comes whatever extra
- * information was given to us as the scan request IE.
- */
-static u16 iwl_mvm_fill_probe_req(struct ieee80211_mgmt *frame, const u8 *ta,
-                                  int n_ssids, const u8 *ssid, int ssid_len,
-                                  const u8 *band_ie, int band_ie_len,
-                                  const u8 *common_ie, int common_ie_len,
-                                  int left)
-{
-        int len = 0;
-        u8 *pos = NULL;
-
-        /* Make sure there is enough space for the probe request,
-         * two mandatory IEs and the data */
-        left -= 24;
-        if (left < 0)
-                return 0;
-
-        frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
-        eth_broadcast_addr(frame->da);
-        memcpy(frame->sa, ta, ETH_ALEN);
-        eth_broadcast_addr(frame->bssid);
-        frame->seq_ctrl = 0;
-
-        len += 24;
-
-        /* for passive scans, no need to fill anything */
-        if (n_ssids == 0)
-                return (u16)len;
-
-        /* points to the payload of the request */
-        pos = &frame->u.probe_req.variable[0];
-
-        /* fill in our SSID IE */
-        left -= ssid_len + 2;
-        if (left < 0)
-                return 0;
-        *pos++ = WLAN_EID_SSID;
-        *pos++ = ssid_len;
-        if (ssid && ssid_len) { /* ssid_len may be == 0 even if ssid is valid */
-                memcpy(pos, ssid, ssid_len);
-                pos += ssid_len;
-        }
-
-        len += ssid_len + 2;
-
-        if (WARN_ON(left < band_ie_len + common_ie_len))
-                return len;
-
-        if (band_ie && band_ie_len) {
-                memcpy(pos, band_ie, band_ie_len);
-                pos += band_ie_len;
-                len += band_ie_len;
-        }
-
-        if (common_ie && common_ie_len) {
-                memcpy(pos, common_ie, common_ie_len);
-                pos += common_ie_len;
-                len += common_ie_len;
-        }
-
-        return (u16)len;
-}
-
 static void iwl_mvm_scan_condition_iterator(void *data, u8 *mac,
                                             struct ieee80211_vif *vif)
 {
@@ -325,7 +231,7 @@ static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm,
                          * If there is more than one active interface make
                          * passive scan more fragmented.
                          */
-                        frag_passive_dwell = (global_cnt < 2) ? 40 : 20;
+                        frag_passive_dwell = 40;
                         params->max_out_time = frag_passive_dwell;
                 } else {
                         params->suspend_time = 120;
@@ -358,10 +264,10 @@ not_bound:
 
         for (band = IEEE80211_BAND_2GHZ; band < IEEE80211_NUM_BANDS; band++) {
                 if (params->passive_fragmented)
-                        params->dwell[band].passive = frag_passive_dwell;
-                else
-                        params->dwell[band].passive =
-                                iwl_mvm_get_passive_dwell(mvm, band);
+                        params->dwell[band].fragmented = frag_passive_dwell;
+
+                params->dwell[band].passive = iwl_mvm_get_passive_dwell(mvm,
+                                                                        band);
                 params->dwell[band].active = iwl_mvm_get_active_dwell(mvm, band,
                                                                       n_ssids);
         }
@@ -379,20 +285,11 @@ static int iwl_mvm_max_scan_ie_fw_cmd_room(struct iwl_mvm *mvm,
 {
         int max_probe_len;
 
-        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
-                max_probe_len = SCAN_OFFLOAD_PROBE_REQ_SIZE;
-        else
-                max_probe_len = mvm->fw->ucode_capa.max_probe_length;
+        max_probe_len = SCAN_OFFLOAD_PROBE_REQ_SIZE;
 
         /* we create the 802.11 header and SSID element */
         max_probe_len -= 24 + 2;
 
-        /* basic ssid is added only for hw_scan with and old api */
-        if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID) &&
-            !(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) &&
-            !is_sched_scan)
-                max_probe_len -= 32;
-
         /* DS parameter set element is added on 2.4GHZ band if required */
         if (iwl_mvm_rrm_scan_needed(mvm))
                 max_probe_len -= 3;
@@ -404,9 +301,6 @@ int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm, bool is_sched_scan)
 {
         int max_ie_len = iwl_mvm_max_scan_ie_fw_cmd_room(mvm, is_sched_scan);
 
-        if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN))
-                return max_ie_len;
-
         /* TODO: [BUG] This function should return the maximum allowed size of
          * scan IEs, however the LMAC scan api contains both 2GHZ and 5GHZ IEs
          * in the same command. So the correct implementation of this function
@@ -420,129 +314,6 @@ int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm, bool is_sched_scan)
         return max_ie_len;
 }
 
-int iwl_mvm_scan_request(struct iwl_mvm *mvm,
-                         struct ieee80211_vif *vif,
-                         struct cfg80211_scan_request *req)
-{
-        struct iwl_host_cmd hcmd = {
-                .id = SCAN_REQUEST_CMD,
-                .len = { 0, },
-                .data = { mvm->scan_cmd, },
-                .dataflags = { IWL_HCMD_DFL_NOCOPY, },
-        };
-        struct iwl_scan_cmd *cmd = mvm->scan_cmd;
-        int ret;
-        u32 status;
-        int ssid_len = 0;
-        u8 *ssid = NULL;
-        bool basic_ssid = !(mvm->fw->ucode_capa.flags &
-                           IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID);
-        struct iwl_mvm_scan_params params = {};
-
-        lockdep_assert_held(&mvm->mutex);
-
-        /* we should have failed registration if scan_cmd was NULL */
-        if (WARN_ON(mvm->scan_cmd == NULL))
-                return -ENOMEM;
-
-        IWL_DEBUG_SCAN(mvm, "Handling mac80211 scan request\n");
-        mvm->scan_status = IWL_MVM_SCAN_OS;
-        memset(cmd, 0, ksize(cmd));
-
-        cmd->channel_count = (u8)req->n_channels;
-        cmd->quiet_time = cpu_to_le16(IWL_ACTIVE_QUIET_TIME);
-        cmd->quiet_plcp_th = cpu_to_le16(IWL_PLCP_QUIET_THRESH);
-        cmd->rxchain_sel_flags = iwl_mvm_scan_rx_chain(mvm);
-
-        iwl_mvm_scan_calc_params(mvm, vif, req->n_ssids, req->flags, &params);
-        cmd->max_out_time = cpu_to_le32(params.max_out_time);
-        cmd->suspend_time = cpu_to_le32(params.suspend_time);
-        if (params.passive_fragmented)
-                cmd->scan_flags |= SCAN_FLAGS_FRAGMENTED_SCAN;
-
-        cmd->rxon_flags = iwl_mvm_scan_rxon_flags(req->channels[0]->band);
-        cmd->filter_flags = cpu_to_le32(MAC_FILTER_ACCEPT_GRP |
-                                        MAC_FILTER_IN_BEACON);
-
-        if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
-                cmd->type = cpu_to_le32(SCAN_TYPE_DISCOVERY_FORCED);
-        else
-                cmd->type = cpu_to_le32(SCAN_TYPE_FORCED);
-
-        cmd->repeats = cpu_to_le32(1);
-
-        /*
-         * If the user asked for passive scan, don't change to active scan if
-         * you see any activity on the channel - remain passive.
-         */
-        if (req->n_ssids > 0) {
-                cmd->passive2active = cpu_to_le16(1);
-                cmd->scan_flags |= SCAN_FLAGS_PASSIVE2ACTIVE;
-                if (basic_ssid) {
-                        ssid = req->ssids[0].ssid;
-                        ssid_len = req->ssids[0].ssid_len;
-                }
-        } else {
-                cmd->passive2active = 0;
-                cmd->scan_flags &= ~SCAN_FLAGS_PASSIVE2ACTIVE;
-        }
-
-        iwl_mvm_scan_fill_ssids(cmd->direct_scan, req->ssids, req->n_ssids,
-                                basic_ssid ? 1 : 0);
-
-        cmd->tx_cmd.tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL |
-                                           3 << TX_CMD_FLG_BT_PRIO_POS);
-
-        cmd->tx_cmd.sta_id = mvm->aux_sta.sta_id;
-        cmd->tx_cmd.life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
-        cmd->tx_cmd.rate_n_flags =
-                        iwl_mvm_scan_rate_n_flags(mvm, req->channels[0]->band,
-                                                  req->no_cck);
-
-        cmd->tx_cmd.len =
-                cpu_to_le16(iwl_mvm_fill_probe_req(
-                            (struct ieee80211_mgmt *)cmd->data,
-                            vif->addr,
-                            req->n_ssids, ssid, ssid_len,
-                            req->ie, req->ie_len, NULL, 0,
-                            mvm->fw->ucode_capa.max_probe_length));
-
-        iwl_mvm_scan_fill_channels(cmd, req, basic_ssid, &params);
-
-        cmd->len = cpu_to_le16(sizeof(struct iwl_scan_cmd) +
-                le16_to_cpu(cmd->tx_cmd.len) +
-                (cmd->channel_count * sizeof(struct iwl_scan_channel)));
-        hcmd.len[0] = le16_to_cpu(cmd->len);
-
-        status = SCAN_RESPONSE_OK;
-        ret = iwl_mvm_send_cmd_status(mvm, &hcmd, &status);
-        if (!ret && status == SCAN_RESPONSE_OK) {
-                IWL_DEBUG_SCAN(mvm, "Scan request was sent successfully\n");
-        } else {
-                /*
-                 * If the scan failed, it usually means that the FW was unable
-                 * to allocate the time events. Warn on it, but maybe we
-                 * should try to send the command again with different params.
-                 */
-                IWL_ERR(mvm, "Scan failed! status 0x%x ret %d\n",
-                        status, ret);
-                mvm->scan_status = IWL_MVM_SCAN_NONE;
-                ret = -EIO;
-        }
-        return ret;
-}
-
-int iwl_mvm_rx_scan_response(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
-                          struct iwl_device_cmd *cmd)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_cmd_response *resp = (void *)pkt->data;
-
-        IWL_DEBUG_SCAN(mvm, "Scan response received. status 0x%x\n",
-                       le32_to_cpu(resp->status));
-        return 0;
-}
-
 int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
                                                 struct iwl_rx_cmd_buffer *rxb,
                                                 struct iwl_device_cmd *cmd)
@@ -556,130 +327,25 @@ int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
         return 0;
 }
 
-int iwl_mvm_rx_scan_complete(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
-                          struct iwl_device_cmd *cmd)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_scan_complete_notif *notif = (void *)pkt->data;
-
-        lockdep_assert_held(&mvm->mutex);
-
-        IWL_DEBUG_SCAN(mvm, "Scan complete: status=0x%x scanned channels=%d\n",
-                       notif->status, notif->scanned_channels);
-
-        if (mvm->scan_status == IWL_MVM_SCAN_OS)
-                mvm->scan_status = IWL_MVM_SCAN_NONE;
-        ieee80211_scan_completed(mvm->hw, notif->status != SCAN_COMP_STATUS_OK);
-
-        iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-
-        return 0;
-}
-
 int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,
                                     struct iwl_rx_cmd_buffer *rxb,
                                     struct iwl_device_cmd *cmd)
 {
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-
-        if (!(mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) &&
-            !(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)) {
-                struct iwl_sched_scan_results *notif = (void *)pkt->data;
-
-                if (!(notif->client_bitmap & SCAN_CLIENT_SCHED_SCAN))
-                        return 0;
-        }
-
         IWL_DEBUG_SCAN(mvm, "Scheduled scan results\n");
         ieee80211_sched_scan_results(mvm->hw);
 
         return 0;
 }
 
-static bool iwl_mvm_scan_abort_notif(struct iwl_notif_wait_data *notif_wait,
-                                     struct iwl_rx_packet *pkt, void *data)
-{
-        struct iwl_mvm *mvm =
-                container_of(notif_wait, struct iwl_mvm, notif_wait);
-        struct iwl_scan_complete_notif *notif;
-        u32 *resp;
-
-        switch (pkt->hdr.cmd) {
-        case SCAN_ABORT_CMD:
-                resp = (void *)pkt->data;
-                if (*resp == CAN_ABORT_STATUS) {
-                        IWL_DEBUG_SCAN(mvm,
-                                       "Scan can be aborted, wait until completion\n");
-                        return false;
-                }
-
-                /*
-                 * If scan cannot be aborted, it means that we had a
-                 * SCAN_COMPLETE_NOTIFICATION in the pipe and it called
-                 * ieee80211_scan_completed already.
-                 */
-                IWL_DEBUG_SCAN(mvm, "Scan cannot be aborted, exit now: %d\n",
-                               *resp);
-                return true;
-
-        case SCAN_COMPLETE_NOTIFICATION:
-                notif = (void *)pkt->data;
-                IWL_DEBUG_SCAN(mvm, "Scan aborted: status 0x%x\n",
-                               notif->status);
-                return true;
-
-        default:
-                WARN_ON(1);
-                return false;
-        };
-}
-
-static int iwl_mvm_cancel_regular_scan(struct iwl_mvm *mvm)
-{
-        struct iwl_notification_wait wait_scan_abort;
-        static const u8 scan_abort_notif[] = { SCAN_ABORT_CMD,
-                                               SCAN_COMPLETE_NOTIFICATION };
-        int ret;
-
-        iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort,
-                                   scan_abort_notif,
-                                   ARRAY_SIZE(scan_abort_notif),
-                                   iwl_mvm_scan_abort_notif, NULL);
-
-        ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, 0, 0, NULL);
-        if (ret) {
-                IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret);
-                /* mac80211's state will be cleaned in the nic_restart flow */
-                goto out_remove_notif;
-        }
-
-        return iwl_wait_notification(&mvm->notif_wait, &wait_scan_abort, HZ);
-
-out_remove_notif:
-        iwl_remove_notification(&mvm->notif_wait, &wait_scan_abort);
-        return ret;
-}
-
 int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
                                            struct iwl_rx_cmd_buffer *rxb,
                                            struct iwl_device_cmd *cmd)
 {
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        u8 status, ebs_status;
-
-        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) {
-                struct iwl_periodic_scan_complete *scan_notif;
+        struct iwl_periodic_scan_complete *scan_notif;
 
-                scan_notif = (void *)pkt->data;
-                status = scan_notif->status;
-                ebs_status = scan_notif->ebs_status;
-        } else  {
-                struct iwl_scan_offload_complete *scan_notif;
+        scan_notif = (void *)pkt->data;
 
-                scan_notif = (void *)pkt->data;
-                status = scan_notif->status;
-                ebs_status = scan_notif->ebs_status;
-        }
         /* scan status must be locked for proper checking */
         lockdep_assert_held(&mvm->mutex);
 
@@ -687,9 +353,9 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
                        "%s completed, status %s, EBS status %s\n",
                        mvm->scan_status == IWL_MVM_SCAN_SCHED ?
                                 "Scheduled scan" : "Scan",
-                       status == IWL_SCAN_OFFLOAD_COMPLETED ?
+                       scan_notif->status == IWL_SCAN_OFFLOAD_COMPLETED ?
                                 "completed" : "aborted",
-                       ebs_status == IWL_SCAN_EBS_SUCCESS ?
+                       scan_notif->ebs_status == IWL_SCAN_EBS_SUCCESS ?
                                 "success" : "failed");
 
 
@@ -700,64 +366,16 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
         } else if (mvm->scan_status == IWL_MVM_SCAN_OS) {
                 mvm->scan_status = IWL_MVM_SCAN_NONE;
                 ieee80211_scan_completed(mvm->hw,
-                                         status == IWL_SCAN_OFFLOAD_ABORTED);
+                                scan_notif->status == IWL_SCAN_OFFLOAD_ABORTED);
                 iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
         }
 
-        if (ebs_status)
+        if (scan_notif->ebs_status)
                 mvm->last_ebs_successful = false;
 
         return 0;
 }
 
-static void iwl_scan_offload_build_tx_cmd(struct iwl_mvm *mvm,
-                                          struct ieee80211_vif *vif,
-                                          struct ieee80211_scan_ies *ies,
-                                          enum ieee80211_band band,
-                                          struct iwl_tx_cmd *cmd,
-                                          u8 *data)
-{
-        u16 cmd_len;
-
-        cmd->tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL);
-        cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
-        cmd->sta_id = mvm->aux_sta.sta_id;
-
-        cmd->rate_n_flags = iwl_mvm_scan_rate_n_flags(mvm, band, false);
-
-        cmd_len = iwl_mvm_fill_probe_req((struct ieee80211_mgmt *)data,
-                                         vif->addr,
-                                         1, NULL, 0,
-                                         ies->ies[band], ies->len[band],
-                                         ies->common_ies, ies->common_ie_len,
-                                         SCAN_OFFLOAD_PROBE_REQ_SIZE);
-        cmd->len = cpu_to_le16(cmd_len);
-}
-
-static void iwl_build_scan_cmd(struct iwl_mvm *mvm,
-                               struct ieee80211_vif *vif,
-                               struct cfg80211_sched_scan_request *req,
-                               struct iwl_scan_offload_cmd *scan,
-                               struct iwl_mvm_scan_params *params)
-{
-        scan->channel_count = req->n_channels;
-        scan->quiet_time = cpu_to_le16(IWL_ACTIVE_QUIET_TIME);
-        scan->quiet_plcp_th = cpu_to_le16(IWL_PLCP_QUIET_THRESH);
-        scan->good_CRC_th = IWL_GOOD_CRC_TH_DEFAULT;
-        scan->rx_chain = iwl_mvm_scan_rx_chain(mvm);
-
-        scan->max_out_time = cpu_to_le32(params->max_out_time);
-        scan->suspend_time = cpu_to_le32(params->suspend_time);
-
-        scan->filter_flags |= cpu_to_le32(MAC_FILTER_ACCEPT_GRP |
-                                          MAC_FILTER_IN_BEACON);
-        scan->scan_type = cpu_to_le32(SCAN_TYPE_BACKGROUND);
-        scan->rep_count = cpu_to_le32(1);
-
-        if (params->passive_fragmented)
-                scan->scan_flags |= SCAN_FLAGS_FRAGMENTED_SCAN;
-}
-
 static int iwl_ssid_exist(u8 *ssid, u8 ssid_len, struct iwl_ssid_ie *ssid_list)
 {
         int i;
@@ -815,127 +433,6 @@ static void iwl_scan_offload_build_ssid(struct cfg80211_sched_scan_request *req,
         }
 }
 
-static void iwl_build_channel_cfg(struct iwl_mvm *mvm,
-                                  struct cfg80211_sched_scan_request *req,
-                                  u8 *channels_buffer,
-                                  enum ieee80211_band band,
-                                  int *head,
-                                  u32 ssid_bitmap,
-                                  struct iwl_mvm_scan_params *params)
-{
-        u32 n_channels = mvm->fw->ucode_capa.n_scan_channels;
-        __le32 *type = (__le32 *)channels_buffer;
-        __le16 *channel_number = (__le16 *)(type + n_channels);
-        __le16 *iter_count = channel_number + n_channels;
-        __le32 *iter_interval = (__le32 *)(iter_count + n_channels);
-        u8 *active_dwell = (u8 *)(iter_interval + n_channels);
-        u8 *passive_dwell = active_dwell + n_channels;
-        int i, index = 0;
-
-        for (i = 0; i < req->n_channels; i++) {
-                struct ieee80211_channel *chan = req->channels[i];
-
-                if (chan->band != band)
-                        continue;
-
-                index = *head;
-                (*head)++;
-
-                channel_number[index] = cpu_to_le16(chan->hw_value);
-                active_dwell[index] = params->dwell[band].active;
-                passive_dwell[index] = params->dwell[band].passive;
-
-                iter_count[index] = cpu_to_le16(1);
-                iter_interval[index] = 0;
-
-                if (!(chan->flags & IEEE80211_CHAN_NO_IR))
-                        type[index] |=
-                                cpu_to_le32(IWL_SCAN_OFFLOAD_CHANNEL_ACTIVE);
-
-                type[index] |= cpu_to_le32(IWL_SCAN_OFFLOAD_CHANNEL_FULL |
-                                           IWL_SCAN_OFFLOAD_CHANNEL_PARTIAL);
-
-                if (chan->flags & IEEE80211_CHAN_NO_HT40)
-                        type[index] |=
-                                cpu_to_le32(IWL_SCAN_OFFLOAD_CHANNEL_NARROW);
-
-                /* scan for all SSIDs from req->ssids */
-                type[index] |= cpu_to_le32(ssid_bitmap);
-        }
-}
-
-int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
-                              struct ieee80211_vif *vif,
-                              struct cfg80211_sched_scan_request *req,
-                              struct ieee80211_scan_ies *ies)
-{
-        int band_2ghz = mvm->nvm_data->bands[IEEE80211_BAND_2GHZ].n_channels;
-        int band_5ghz = mvm->nvm_data->bands[IEEE80211_BAND_5GHZ].n_channels;
-        int head = 0;
-        u32 ssid_bitmap;
-        int cmd_len;
-        int ret;
-        u8 *probes;
-        bool basic_ssid = !(mvm->fw->ucode_capa.flags &
-                            IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID);
-
-        struct iwl_scan_offload_cfg *scan_cfg;
-        struct iwl_host_cmd cmd = {
-                .id = SCAN_OFFLOAD_CONFIG_CMD,
-        };
-        struct iwl_mvm_scan_params params = {};
-
-        lockdep_assert_held(&mvm->mutex);
-
-        cmd_len = sizeof(struct iwl_scan_offload_cfg) +
-                  mvm->fw->ucode_capa.n_scan_channels * IWL_SCAN_CHAN_SIZE +
-                  2 * SCAN_OFFLOAD_PROBE_REQ_SIZE;
-
-        scan_cfg = kzalloc(cmd_len, GFP_KERNEL);
-        if (!scan_cfg)
-                return -ENOMEM;
-
-        probes = scan_cfg->data +
-                mvm->fw->ucode_capa.n_scan_channels * IWL_SCAN_CHAN_SIZE;
-
-        iwl_mvm_scan_calc_params(mvm, vif, req->n_ssids, 0, &params);
-        iwl_build_scan_cmd(mvm, vif, req, &scan_cfg->scan_cmd, &params);
-        scan_cfg->scan_cmd.len = cpu_to_le16(cmd_len);
-
-        iwl_scan_offload_build_ssid(req, scan_cfg->scan_cmd.direct_scan,
-                                    &ssid_bitmap, basic_ssid);
-        /* build tx frames for supported bands */
-        if (band_2ghz) {
-                iwl_scan_offload_build_tx_cmd(mvm, vif, ies,
-                                              IEEE80211_BAND_2GHZ,
-                                              &scan_cfg->scan_cmd.tx_cmd[0],
-                                              probes);
-                iwl_build_channel_cfg(mvm, req, scan_cfg->data,
-                                      IEEE80211_BAND_2GHZ, &head,
-                                      ssid_bitmap, &params);
-        }
-        if (band_5ghz) {
-                iwl_scan_offload_build_tx_cmd(mvm, vif, ies,
-                                              IEEE80211_BAND_5GHZ,
-                                              &scan_cfg->scan_cmd.tx_cmd[1],
-                                              probes +
-                                                SCAN_OFFLOAD_PROBE_REQ_SIZE);
-                iwl_build_channel_cfg(mvm, req, scan_cfg->data,
-                                      IEEE80211_BAND_5GHZ, &head,
-                                      ssid_bitmap, &params);
-        }
-
-        cmd.data[0] = scan_cfg;
-        cmd.len[0] = cmd_len;
-        cmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;
-
-        IWL_DEBUG_SCAN(mvm, "Sending scheduled scan config\n");
-
-        ret = iwl_mvm_send_cmd(mvm, &cmd);
-        kfree(scan_cfg);
-        return ret;
-}
-
 int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
                                        struct cfg80211_sched_scan_request *req)
 {
@@ -1018,33 +515,6 @@ static bool iwl_mvm_scan_pass_all(struct iwl_mvm *mvm,
         return true;
 }
 
-int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
-                             struct cfg80211_sched_scan_request *req)
-{
-        struct iwl_scan_offload_req scan_req = {
-                .watchdog = IWL_SCHED_SCAN_WATCHDOG,
-
-                .schedule_line[0].iterations = IWL_FAST_SCHED_SCAN_ITERATIONS,
-                .schedule_line[0].delay = cpu_to_le16(req->interval / 1000),
-                .schedule_line[0].full_scan_mul = 1,
-
-                .schedule_line[1].iterations = 0xff,
-                .schedule_line[1].delay = cpu_to_le16(req->interval / 1000),
-                .schedule_line[1].full_scan_mul = IWL_FULL_SCAN_MULTIPLIER,
-        };
-
-        if (iwl_mvm_scan_pass_all(mvm, req))
-                scan_req.flags |= cpu_to_le16(IWL_SCAN_OFFLOAD_FLAG_PASS_ALL);
-
-        if (mvm->last_ebs_successful &&
-            mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_EBS_SUPPORT)
-                scan_req.flags |=
-                        cpu_to_le16(IWL_SCAN_OFFLOAD_FLAG_EBS_ACCURATE_MODE);
-
-        return iwl_mvm_send_cmd_pdu(mvm, SCAN_OFFLOAD_REQUEST_CMD, 0,
-                                    sizeof(scan_req), &scan_req);
-}
-
 int iwl_mvm_scan_offload_start(struct iwl_mvm *mvm,
                                struct ieee80211_vif *vif,
                                struct cfg80211_sched_scan_request *req,
@@ -1057,21 +527,12 @@ int iwl_mvm_scan_offload_start(struct iwl_mvm *mvm,
                 if (ret)
                         return ret;
                 ret = iwl_mvm_sched_scan_umac(mvm, vif, req, ies);
-        } else if ((mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)) {
-                mvm->scan_status = IWL_MVM_SCAN_SCHED;
-                ret = iwl_mvm_config_sched_scan_profiles(mvm, req);
-                if (ret)
-                        return ret;
-                ret = iwl_mvm_unified_sched_scan_lmac(mvm, vif, req, ies);
         } else {
                 mvm->scan_status = IWL_MVM_SCAN_SCHED;
-                ret = iwl_mvm_config_sched_scan(mvm, vif, req, ies);
-                if (ret)
-                        return ret;
                 ret = iwl_mvm_config_sched_scan_profiles(mvm, req);
                 if (ret)
                         return ret;
-                ret = iwl_mvm_sched_scan_start(mvm, req);
+                ret = iwl_mvm_unified_sched_scan_lmac(mvm, vif, req, ies);
         }
 
         return ret;
@@ -1088,9 +549,7 @@ static int iwl_mvm_send_scan_offload_abort(struct iwl_mvm *mvm)
         /* Exit instantly with error when device is not ready
          * to receive scan abort command or it does not perform
          * scheduled scan currently */
-        if (mvm->scan_status != IWL_MVM_SCAN_SCHED &&
-            (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) ||
-             mvm->scan_status != IWL_MVM_SCAN_OS))
+        if (mvm->scan_status == IWL_MVM_SCAN_NONE)
                 return -EIO;
 
         ret = iwl_mvm_send_cmd_status(mvm, &cmd, &status);
@@ -1133,13 +592,6 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify)
                 goto out;
         }
 
-        if (mvm->scan_status != IWL_MVM_SCAN_SCHED &&
-            (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) ||
-             mvm->scan_status != IWL_MVM_SCAN_OS)) {
-                IWL_DEBUG_SCAN(mvm, "No scan to stop\n");
-                return 0;
-        }
-
         iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_done,
                                    scan_done_notif,
                                    ARRAY_SIZE(scan_done_notif),
@@ -1316,7 +768,7 @@ iwl_mvm_build_generic_unified_scan_cmd(struct iwl_mvm *mvm,
         cmd->passive_dwell = params->dwell[IEEE80211_BAND_2GHZ].passive;
         if (params->passive_fragmented)
                 cmd->fragmented_dwell =
-                                params->dwell[IEEE80211_BAND_2GHZ].passive;
+                                params->dwell[IEEE80211_BAND_2GHZ].fragmented;
         cmd->rx_chain_select = iwl_mvm_scan_rx_chain(mvm);
         cmd->max_out_time = cpu_to_le32(params->max_out_time);
         cmd->suspend_time = cpu_to_le32(params->suspend_time);
@@ -1483,6 +935,8 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm,
 
         cmd->n_channels = (u8)req->n_channels;
 
+        cmd->delay = cpu_to_le32(req->delay);
+
         if (iwl_mvm_scan_pass_all(mvm, req))
                 flags |= IWL_MVM_LMAC_SCAN_FLAG_PASS_ALL;
         else
@@ -1579,9 +1033,7 @@ int iwl_mvm_cancel_scan(struct iwl_mvm *mvm)
                 return 0;
         }
 
-        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
-                return iwl_mvm_scan_offload_stop(mvm, true);
-        return iwl_mvm_cancel_regular_scan(mvm);
+        return iwl_mvm_scan_offload_stop(mvm, true);
 }
 
 /* UMAC scan API */
@@ -1727,6 +1179,18 @@ static bool iwl_mvm_find_scan_type(struct iwl_mvm *mvm,
         return false;
 }
 
+static int iwl_mvm_find_first_scan(struct iwl_mvm *mvm,
+                                   enum iwl_umac_scan_uid_type type)
+{
+        int i;
+
+        for (i = 0; i < IWL_MVM_MAX_SIMULTANEOUS_SCANS; i++)
+                if (mvm->scan_uid[i] & type)
+                        return i;
+
+        return i;
+}
+
 static u32 iwl_generate_scan_uid(struct iwl_mvm *mvm,
                                  enum iwl_umac_scan_uid_type type)
 {
@@ -1764,7 +1228,7 @@ iwl_mvm_build_generic_umac_scan_cmd(struct iwl_mvm *mvm,
         cmd->passive_dwell = params->dwell[IEEE80211_BAND_2GHZ].passive;
         if (params->passive_fragmented)
                 cmd->fragmented_dwell =
-                                params->dwell[IEEE80211_BAND_2GHZ].passive;
+                                params->dwell[IEEE80211_BAND_2GHZ].fragmented;
         cmd->max_out_time = cpu_to_le32(params->max_out_time);
         cmd->suspend_time = cpu_to_le32(params->suspend_time);
         cmd->scan_priority = cpu_to_le32(IWL_SCAN_PRIORITY_HIGH);
@@ -1986,7 +1450,13 @@ int iwl_mvm_sched_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                                 cpu_to_le16(req->interval / MSEC_PER_SEC);
         sec_part->schedule[0].iter_count = 0xff;
 
-        sec_part->delay = 0;
+        if (req->delay > U16_MAX) {
+                IWL_DEBUG_SCAN(mvm,
+                               "delay value is > 16-bits, set to max possible\n");
+                sec_part->delay = cpu_to_le16(U16_MAX);
+        } else {
+                sec_part->delay = cpu_to_le16(req->delay);
+        }
 
         iwl_mvm_build_unified_scan_probe(mvm, vif, ies, &sec_part->preq,
                 req->flags & NL80211_SCAN_FLAG_RANDOM_ADDR ?
@@ -2158,14 +1628,59 @@ int iwl_mvm_scan_size(struct iwl_mvm *mvm)
                                 mvm->fw->ucode_capa.n_scan_channels +
                         sizeof(struct iwl_scan_req_umac_tail);
 
-        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
-                return sizeof(struct iwl_scan_req_unified_lmac) +
-                        sizeof(struct iwl_scan_channel_cfg_lmac) *
-                                mvm->fw->ucode_capa.n_scan_channels +
-                        sizeof(struct iwl_scan_probe_req);
+        return sizeof(struct iwl_scan_req_unified_lmac) +
+                sizeof(struct iwl_scan_channel_cfg_lmac) *
+                mvm->fw->ucode_capa.n_scan_channels +
+                sizeof(struct iwl_scan_probe_req);
+}
+
+/*
+ * This function is used in nic restart flow, to inform mac80211 about scans
+ * that was aborted by restart flow or by an assert.
+ */
+void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm)
+{
+        if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
+                u32 uid, i;
 
-        return sizeof(struct iwl_scan_cmd) +
-                mvm->fw->ucode_capa.max_probe_length +
-                        mvm->fw->ucode_capa.n_scan_channels *
-                sizeof(struct iwl_scan_channel);
+                uid = iwl_mvm_find_first_scan(mvm, IWL_UMAC_SCAN_UID_REG_SCAN);
+                if (uid < IWL_MVM_MAX_SIMULTANEOUS_SCANS) {
+                        ieee80211_scan_completed(mvm->hw, true);
+                        mvm->scan_uid[uid] = 0;
+                }
+                uid = iwl_mvm_find_first_scan(mvm,
+                                              IWL_UMAC_SCAN_UID_SCHED_SCAN);
+                if (uid < IWL_MVM_MAX_SIMULTANEOUS_SCANS && !mvm->restart_fw) {
+                        ieee80211_sched_scan_stopped(mvm->hw);
+                        mvm->scan_uid[uid] = 0;
+                }
+
+                /* We shouldn't have any UIDs still set.  Loop over all the
+                 * UIDs to make sure there's nothing left there and warn if
+                 * any is found.
+                 */
+                for (i = 0; i < IWL_MVM_MAX_SIMULTANEOUS_SCANS; i++) {
+                        if (WARN_ONCE(mvm->scan_uid[i],
+                                      "UMAC scan UID %d was not cleaned\n",
+                                      mvm->scan_uid[i]))
+                                mvm->scan_uid[i] = 0;
+                }
+        } else {
+                switch (mvm->scan_status) {
+                case IWL_MVM_SCAN_NONE:
+                        break;
+                case IWL_MVM_SCAN_OS:
+                        ieee80211_scan_completed(mvm->hw, true);
+                        break;
+                case IWL_MVM_SCAN_SCHED:
+                        /*
+                         * Sched scan will be restarted by mac80211 in
+                         * restart_hw, so do not report if FW is about to be
+                         * restarted.
+                         */
+                        if (!mvm->restart_fw)
+                                ieee80211_sched_scan_stopped(mvm->hw);
+                        break;
+                }
+        }
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c
index 7eb78e2c240a..b0f59fdd287c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sf.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c
@@ -99,7 +99,35 @@ static void iwl_mvm_bound_iface_iterator(void *_data, u8 *mac,
 
 /*
  * Aging and idle timeouts for the different possible scenarios
- * in SF_FULL_ON state.
+ * in default configuration
+ */
+static const
+__le32 sf_full_timeout_def[SF_NUM_SCENARIO][SF_NUM_TIMEOUT_TYPES] = {
+        {
+                cpu_to_le32(SF_SINGLE_UNICAST_AGING_TIMER_DEF),
+                cpu_to_le32(SF_SINGLE_UNICAST_IDLE_TIMER_DEF)
+        },
+        {
+                cpu_to_le32(SF_AGG_UNICAST_AGING_TIMER_DEF),
+                cpu_to_le32(SF_AGG_UNICAST_IDLE_TIMER_DEF)
+        },
+        {
+                cpu_to_le32(SF_MCAST_AGING_TIMER_DEF),
+                cpu_to_le32(SF_MCAST_IDLE_TIMER_DEF)
+        },
+        {
+                cpu_to_le32(SF_BA_AGING_TIMER_DEF),
+                cpu_to_le32(SF_BA_IDLE_TIMER_DEF)
+        },
+        {
+                cpu_to_le32(SF_TX_RE_AGING_TIMER_DEF),
+                cpu_to_le32(SF_TX_RE_IDLE_TIMER_DEF)
+        },
+};
+
+/*
+ * Aging and idle timeouts for the different possible scenarios
+ * in single BSS MAC configuration.
  */
 static const __le32 sf_full_timeout[SF_NUM_SCENARIO][SF_NUM_TIMEOUT_TYPES] = {
         {
@@ -124,7 +152,8 @@ static const __le32 sf_full_timeout[SF_NUM_SCENARIO][SF_NUM_TIMEOUT_TYPES] = {
         },
 };
 
-static void iwl_mvm_fill_sf_command(struct iwl_sf_cfg_cmd *sf_cmd,
+static void iwl_mvm_fill_sf_command(struct iwl_mvm *mvm,
+                                    struct iwl_sf_cfg_cmd *sf_cmd,
                                     struct ieee80211_sta *sta)
 {
         int i, j, watermark;
@@ -163,24 +192,38 @@ static void iwl_mvm_fill_sf_command(struct iwl_sf_cfg_cmd *sf_cmd,
                                         cpu_to_le32(SF_LONG_DELAY_AGING_TIMER);
                 }
         }
-        BUILD_BUG_ON(sizeof(sf_full_timeout) !=
-                     sizeof(__le32) * SF_NUM_SCENARIO * SF_NUM_TIMEOUT_TYPES);
 
-        memcpy(sf_cmd->full_on_timeouts, sf_full_timeout,
-               sizeof(sf_full_timeout));
+        if (sta || IWL_UCODE_API(mvm->fw->ucode_ver) < 13) {
+                BUILD_BUG_ON(sizeof(sf_full_timeout) !=
+                             sizeof(__le32) * SF_NUM_SCENARIO *
+                             SF_NUM_TIMEOUT_TYPES);
+
+                memcpy(sf_cmd->full_on_timeouts, sf_full_timeout,
+                       sizeof(sf_full_timeout));
+        } else {
+                BUILD_BUG_ON(sizeof(sf_full_timeout_def) !=
+                             sizeof(__le32) * SF_NUM_SCENARIO *
+                             SF_NUM_TIMEOUT_TYPES);
+
+                memcpy(sf_cmd->full_on_timeouts, sf_full_timeout_def,
+                       sizeof(sf_full_timeout_def));
+        }
+
 }
 
 static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,
                              enum iwl_sf_state new_state)
 {
         struct iwl_sf_cfg_cmd sf_cmd = {
-                .state = cpu_to_le32(new_state),
+                .state = cpu_to_le32(SF_FULL_ON),
         };
         struct ieee80211_sta *sta;
         int ret = 0;
 
-        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF &&
-            mvm->cfg->disable_dummy_notification)
+        if (IWL_UCODE_API(mvm->fw->ucode_ver) < 13)
+                sf_cmd.state = cpu_to_le32(new_state);
+
+        if (mvm->cfg->disable_dummy_notification)
                 sf_cmd.state |= cpu_to_le32(SF_CFG_DUMMY_NOTIF_OFF);
 
         /*
@@ -192,6 +235,8 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,
 
         switch (new_state) {
         case SF_UNINIT:
+                if (IWL_UCODE_API(mvm->fw->ucode_ver) >= 13)
+                        iwl_mvm_fill_sf_command(mvm, &sf_cmd, NULL);
                 break;
         case SF_FULL_ON:
                 if (sta_id == IWL_MVM_STATION_COUNT) {
@@ -206,11 +251,11 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,
                         rcu_read_unlock();
                         return -EINVAL;
                 }
-                iwl_mvm_fill_sf_command(&sf_cmd, sta);
+                iwl_mvm_fill_sf_command(mvm, &sf_cmd, sta);
                 rcu_read_unlock();
                 break;
         case SF_INIT_OFF:
-                iwl_mvm_fill_sf_command(&sf_cmd, NULL);
+                iwl_mvm_fill_sf_command(mvm, &sf_cmd, NULL);
                 break;
         default:
                 WARN_ONCE(1, "Invalid state: %d. not sending Smart Fifo cmd\n",
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index 5c23cddaaae3..1845b79487c8 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -209,9 +209,8 @@ static int iwl_mvm_tdls_sta_init(struct iwl_mvm *mvm,
 {
         unsigned long used_hw_queues;
         struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
-        unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?
-                                        mvm->cfg->base_params->wd_timeout :
-                                        IWL_WATCHDOG_DISABLED;
+        unsigned int wdg_timeout =
+                iwl_mvm_get_wd_timeout(mvm, NULL, true, false);
         u32 ac;
 
         lockdep_assert_held(&mvm->mutex);
@@ -273,7 +272,7 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,
         else
                 sta_id = mvm_sta->sta_id;
 
-        if (WARN_ON_ONCE(sta_id == IWL_MVM_STATION_COUNT))
+        if (sta_id == IWL_MVM_STATION_COUNT)
                 return -ENOSPC;
 
         spin_lock_init(&mvm_sta->lock);
@@ -491,8 +490,18 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,
 
         if (vif->type == NL80211_IFTYPE_STATION &&
             mvmvif->ap_sta_id == mvm_sta->sta_id) {
+                ret = iwl_mvm_drain_sta(mvm, mvm_sta, true);
+                if (ret)
+                        return ret;
                 /* flush its queues here since we are freeing mvm_sta */
                 ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, true);
+                if (ret)
+                        return ret;
+                ret = iwl_trans_wait_tx_queue_empty(mvm->trans,
+                                                    mvm_sta->tfd_queue_msk);
+                if (ret)
+                        return ret;
+                ret = iwl_mvm_drain_sta(mvm, mvm_sta, false);
 
                 /* if we are associated - we can't remove the AP STA now */
                 if (vif->bss_conf.assoc)
@@ -971,9 +980,8 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 {
         struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
         struct iwl_mvm_tid_data *tid_data = &mvmsta->tid_data[tid];
-        unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?
-                                        mvm->cfg->base_params->wd_timeout :
-                                        IWL_WATCHDOG_DISABLED;
+        unsigned int wdg_timeout =
+                iwl_mvm_get_wd_timeout(mvm, vif, sta->tdls, false);
         int queue, fifo, ret;
         u16 ssn;
 
@@ -1120,8 +1128,12 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         spin_unlock_bh(&mvmsta->lock);
 
         if (old_state >= IWL_AGG_ON) {
+                iwl_mvm_drain_sta(mvm, mvmsta, true);
                 if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id), true))
                         IWL_ERR(mvm, "Couldn't flush the AGG queue\n");
+                iwl_trans_wait_tx_queue_empty(mvm->trans,
+                                              mvmsta->tfd_queue_msk);
+                iwl_mvm_drain_sta(mvm, mvmsta, false);
 
                 iwl_mvm_sta_tx_agg(mvm, sta, tid, txq_id, false);
 
@@ -1681,9 +1693,6 @@ void iwl_mvm_sta_modify_disable_tx(struct iwl_mvm *mvm,
         };
         int ret;
 
-        if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_DISABLE_STA_TX))
-                return;
-
         ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC, sizeof(cmd), &cmd);
         if (ret)
                 IWL_ERR(mvm, "Failed to send ADD_STA command (%d)\n", ret);
@@ -1705,8 +1714,8 @@ void iwl_mvm_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,
         mvm_sta->disable_tx = disable;
 
         /*
-         * Tell mac80211 to start/stop queueing tx for this station,
-         * but don't stop queueing if there are still pending frames
+         * Tell mac80211 to start/stop queuing tx for this station,
+         * but don't stop queuing if there are still pending frames
          * for this station.
          */
         if (disable || !atomic_read(&mvm->pending_frames[mvm_sta->sta_id]))
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/iwlwifi/mvm/sta.h
index d8f48975ad08..748f5dc3f9f4 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.h
@@ -150,7 +150,7 @@ struct iwl_mvm_vif;
  * DOC: station table - AP Station in STA mode
  *
  * %iwl_mvm_vif includes the index of the AP station in the fw's STA table:
- * %ap_sta_id. To get the point to the coresponsding %ieee80211_sta,
+ * %ap_sta_id. To get the point to the corresponding %ieee80211_sta,
  * &fw_id_to_mac_id can be used. Due to the way the fw works, we must not remove
  * the AP station from the fw before setting the MAC context as unassociated.
  * Hence, %fw_id_to_mac_id[%ap_sta_id] will be NULLed when the AP station is
@@ -209,14 +209,14 @@ struct iwl_mvm_vif;
  * When a trigger frame is received, mac80211 tells the driver to send frames
  * from the AMPDU queues or sends frames to non-aggregation queues itself,
  * depending on which ACs are delivery-enabled and what TID has frames to
- * transmit. Note that mac80211 has all the knowledege since all the non-agg
+ * transmit. Note that mac80211 has all the knowledge since all the non-agg
  * frames are buffered / filtered, and the driver tells mac80211 about agg
  * frames). The driver needs to tell the fw to let frames out even if the
  * station is asleep. This is done by %iwl_mvm_sta_modify_sleep_tx_count.
  *
  * When we receive a frame from that station with PM bit unset, the driver
  * needs to let the fw know that this station isn't asleep any more. This is
- * done by %iwl_mvm_sta_modify_ps_wake in response to mac80211 signalling the
+ * done by %iwl_mvm_sta_modify_ps_wake in response to mac80211 signaling the
  * station's wakeup.
  *
  * For a GO, the Service Period might be cut short due to an absence period
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c
index 4b81c0bf63b0..fd7b0d36f9a6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@ -119,7 +119,7 @@ void iwl_mvm_roc_done_wk(struct work_struct *wk)
 
         /*
          * Flush the offchannel queue -- this is called when the time
-         * event finishes or is cancelled, so that frames queued for it
+         * event finishes or is canceled, so that frames queued for it
          * won't get stuck on the queue and be transmitted in the next
          * time event.
          * We have to send the command asynchronously since this cannot
@@ -187,7 +187,8 @@ static bool iwl_mvm_te_check_disconnect(struct iwl_mvm *mvm,
                 return false;
         if (errmsg)
                 IWL_ERR(mvm, "%s\n", errmsg);
-        ieee80211_connection_loss(vif);
+
+        iwl_mvm_connection_loss(mvm, vif, errmsg);
         return true;
 }
 
@@ -196,19 +197,24 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm,
                              struct iwl_mvm_time_event_data *te_data,
                              struct iwl_time_event_notif *notif)
 {
-        if (!le32_to_cpu(notif->status)) {
-                if (te_data->vif->type == NL80211_IFTYPE_STATION)
-                        ieee80211_connection_loss(te_data->vif);
+        struct ieee80211_vif *vif = te_data->vif;
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+
+        if (!notif->status)
                 IWL_DEBUG_TE(mvm, "CSA time event failed to start\n");
-                iwl_mvm_te_clear_data(mvm, te_data);
-                return;
-        }
 
         switch (te_data->vif->type) {
         case NL80211_IFTYPE_AP:
+                if (!notif->status)
+                        mvmvif->csa_failed = true;
                 iwl_mvm_csa_noa_start(mvm);
                 break;
         case NL80211_IFTYPE_STATION:
+                if (!notif->status) {
+                        iwl_mvm_connection_loss(mvm, vif,
+                                                "CSA TE failed to start");
+                        break;
+                }
                 iwl_mvm_csa_client_absent(mvm, te_data->vif);
                 ieee80211_chswitch_done(te_data->vif, true);
                 break;
@@ -222,6 +228,44 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm,
         iwl_mvm_te_clear_data(mvm, te_data);
 }
 
+static void iwl_mvm_te_check_trigger(struct iwl_mvm *mvm,
+                                     struct iwl_time_event_notif *notif,
+                                     struct iwl_mvm_time_event_data *te_data)
+{
+        struct iwl_fw_dbg_trigger_tlv *trig;
+        struct iwl_fw_dbg_trigger_time_event *te_trig;
+        int i;
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_TIME_EVENT))
+                return;
+
+        trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_TIME_EVENT);
+        te_trig = (void *)trig->data;
+
+        if (!iwl_fw_dbg_trigger_check_stop(mvm, te_data->vif, trig))
+                return;
+
+        for (i = 0; i < ARRAY_SIZE(te_trig->time_events); i++) {
+                u32 trig_te_id = le32_to_cpu(te_trig->time_events[i].id);
+                u32 trig_action_bitmap =
+                        le32_to_cpu(te_trig->time_events[i].action_bitmap);
+                u32 trig_status_bitmap =
+                        le32_to_cpu(te_trig->time_events[i].status_bitmap);
+
+                if (trig_te_id != te_data->id ||
+                    !(trig_action_bitmap & le32_to_cpu(notif->action)) ||
+                    !(trig_status_bitmap & BIT(le32_to_cpu(notif->status))))
+                        continue;
+
+                iwl_mvm_fw_dbg_collect_trig(mvm, trig,
+                                            "Time event %d Action 0x%x received status: %d",
+                                            te_data->id,
+                                            le32_to_cpu(notif->action),
+                                            le32_to_cpu(notif->status));
+                break;
+        }
+}
+
 /*
  * Handles a FW notification for an event that is known to the driver.
  *
@@ -239,6 +283,8 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
                      le32_to_cpu(notif->unique_id),
                      le32_to_cpu(notif->action));
 
+        iwl_mvm_te_check_trigger(mvm, notif, te_data);
+
         /*
          * The FW sends the start/end time event notifications even for events
          * that it fails to schedule. This is indicated in the status field of
@@ -248,11 +294,16 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
          * events in the system).
          */
         if (!le32_to_cpu(notif->status)) {
-                bool start = le32_to_cpu(notif->action) &
-                                TE_V2_NOTIF_HOST_EVENT_START;
-                IWL_WARN(mvm, "Time Event %s notification failure\n",
-                         start ? "start" : "end");
-                if (iwl_mvm_te_check_disconnect(mvm, te_data->vif, NULL)) {
+                const char *msg;
+
+                if (notif->action & cpu_to_le32(TE_V2_NOTIF_HOST_EVENT_START))
+                        msg = "Time Event start notification failure";
+                else
+                        msg = "Time Event end notification failure";
+
+                IWL_DEBUG_TE(mvm, "%s\n", msg);
+
+                if (iwl_mvm_te_check_disconnect(mvm, te_data->vif, msg)) {
                         iwl_mvm_te_clear_data(mvm, te_data);
                         return;
                 }
@@ -263,17 +314,23 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
                              "TE ended - current time %lu, estimated end %lu\n",
                              jiffies, te_data->end_jiffies);
 
-                if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
+                switch (te_data->vif->type) {
+                case NL80211_IFTYPE_P2P_DEVICE:
                         ieee80211_remain_on_channel_expired(mvm->hw);
                         iwl_mvm_roc_finished(mvm);
+                        break;
+                case NL80211_IFTYPE_STATION:
+                        /*
+                         * By now, we should have finished association
+                         * and know the dtim period.
+                         */
+                        iwl_mvm_te_check_disconnect(mvm, te_data->vif,
+                                "No association and the time event is over already...");
+                        break;
+                default:
+                        break;
                 }
 
-                /*
-                 * By now, we should have finished association
-                 * and know the dtim period.
-                 */
-                iwl_mvm_te_check_disconnect(mvm, te_data->vif,
-                        "No association and the time event is over already...");
                 iwl_mvm_te_clear_data(mvm, te_data);
         } else if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_START) {
                 te_data->running = true;
@@ -309,6 +366,8 @@ static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm,
         if (!aux_roc_te) /* Not a Aux ROC time event */
                 return -EINVAL;
 
+        iwl_mvm_te_check_trigger(mvm, notif, te_data);
+
         if (!le32_to_cpu(notif->status)) {
                 IWL_DEBUG_TE(mvm,
                              "ERROR: Aux ROC Time Event %s notification failure\n",
@@ -763,7 +822,7 @@ void iwl_mvm_stop_roc(struct iwl_mvm *mvm)
          * Iterate over the list of aux roc time events and find the time
          * event that is associated with a BSS interface.
          * This assumes that a BSS interface can have only a single time
-         * event at any given time and this time event coresponds to a ROC
+         * event at any given time and this time event corresponds to a ROC
          * request
          */
         list_for_each_entry(te_data, &mvm->aux_roc_te_list, list) {
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.h b/drivers/net/wireless/iwlwifi/mvm/time-event.h
index 6f6b35db3ab8..de4fbc6d57f1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.h
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.h
@@ -147,7 +147,7 @@ void iwl_mvm_protect_session(struct iwl_mvm *mvm,
  * @vif: the virtual interface for which the session is issued
  *
  * This functions cancels the session protection which is an act of good
- * citizenship. If it is not needed any more it should be cancelled because
+ * citizenship. If it is not needed any more it should be canceled because
  * the other bindings wait for the medium during that time.
  * This funtions doesn't sleep.
  */
@@ -162,7 +162,7 @@ int iwl_mvm_rx_time_event_notif(struct iwl_mvm *mvm,
                                 struct iwl_device_cmd *cmd);
 
 /**
- * iwl_mvm_start_p2p_roc - start remain on channel for p2p device functionlity
+ * iwl_mvm_start_p2p_roc - start remain on channel for p2p device functionality
  * @mvm: the mvm component
  * @vif: the virtual interface for which the roc is requested. It is assumed
  * that the vif type is NL80211_IFTYPE_P2P_DEVICE
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index 96a05406babf..ef32e177f662 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -664,6 +664,8 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                 info->status.rates[0].count = tx_resp->failure_frame + 1;
                 iwl_mvm_hwrate_to_tx_status(le32_to_cpu(tx_resp->initial_rate),
                                             info);
+                info->status.status_driver_data[1] =
+                        (void *)(uintptr_t)le32_to_cpu(tx_resp->initial_rate);
 
                 /* Single frame failure in an AMPDU queue => send BAR */
                 if (txq_id >= mvm->first_agg_queue &&
@@ -909,6 +911,8 @@ static void iwl_mvm_tx_info_from_ba_notif(struct ieee80211_tx_info *info,
         info->status.tx_time = tid_data->tx_time;
         info->status.status_driver_data[0] =
                 (void *)(uintptr_t)tid_data->reduced_tpc;
+        info->status.status_driver_data[1] =
+                (void *)(uintptr_t)tid_data->rate_n_flags;
 }
 
 int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
@@ -1045,6 +1049,14 @@ out:
         return 0;
 }
 
+/*
+ * Note that there are transports that buffer frames before they reach
+ * the firmware. This means that after flush_tx_path is called, the
+ * queue might not be empty. The race-free way to handle this is to:
+ * 1) set the station as draining
+ * 2) flush the Tx path
+ * 3) wait for the transport queues to be empty
+ */
 int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, bool sync)
 {
         int ret;
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index 8decf9953229..bc55a8b82db6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -122,7 +122,7 @@ int iwl_mvm_send_cmd_pdu(struct iwl_mvm *mvm, u8 id,
 }
 
 /*
- * We assume that the caller set the status to the sucess value
+ * We assume that the caller set the status to the success value
  */
 int iwl_mvm_send_cmd_status(struct iwl_mvm *mvm, struct iwl_host_cmd *cmd,
                             u32 *status)
@@ -332,7 +332,7 @@ static const char *desc_lookup(u32 num)
  * read with u32-sized accesses, any members with a different size
  * need to be ordered correctly though!
  */
-struct iwl_error_event_table {
+struct iwl_error_event_table_v1 {
         u32 valid;              /* (nonzero) valid, (0) log is empty */
         u32 error_id;           /* type of error */
         u32 pc;                 /* program counter */
@@ -377,7 +377,55 @@ struct iwl_error_event_table {
         u32 u_timestamp;        /* indicate when the date and time of the
                                  * compilation */
         u32 flow_handler;       /* FH read/write pointers, RX credit */
-} __packed;
+} __packed /* LOG_ERROR_TABLE_API_S_VER_1 */;
+
+struct iwl_error_event_table {
+        u32 valid;              /* (nonzero) valid, (0) log is empty */
+        u32 error_id;           /* type of error */
+        u32 pc;                 /* program counter */
+        u32 blink1;             /* branch link */
+        u32 blink2;             /* branch link */
+        u32 ilink1;             /* interrupt link */
+        u32 ilink2;             /* interrupt link */
+        u32 data1;              /* error-specific data */
+        u32 data2;              /* error-specific data */
+        u32 data3;              /* error-specific data */
+        u32 bcon_time;          /* beacon timer */
+        u32 tsf_low;            /* network timestamp function timer */
+        u32 tsf_hi;             /* network timestamp function timer */
+        u32 gp1;                /* GP1 timer register */
+        u32 gp2;                /* GP2 timer register */
+        u32 gp3;                /* GP3 timer register */
+        u32 major;              /* uCode version major */
+        u32 minor;              /* uCode version minor */
+        u32 hw_ver;             /* HW Silicon version */
+        u32 brd_ver;            /* HW board version */
+        u32 log_pc;             /* log program counter */
+        u32 frame_ptr;          /* frame pointer */
+        u32 stack_ptr;          /* stack pointer */
+        u32 hcmd;               /* last host command header */
+        u32 isr0;               /* isr status register LMPM_NIC_ISR0:
+                                 * rxtx_flag */
+        u32 isr1;               /* isr status register LMPM_NIC_ISR1:
+                                 * host_flag */
+        u32 isr2;               /* isr status register LMPM_NIC_ISR2:
+                                 * enc_flag */
+        u32 isr3;               /* isr status register LMPM_NIC_ISR3:
+                                 * time_flag */
+        u32 isr4;               /* isr status register LMPM_NIC_ISR4:
+                                 * wico interrupt */
+        u32 isr_pref;           /* isr status register LMPM_NIC_PREF_STAT */
+        u32 wait_event;         /* wait event() caller address */
+        u32 l2p_control;        /* L2pControlField */
+        u32 l2p_duration;       /* L2pDurationField */
+        u32 l2p_mhvalid;        /* L2pMhValidBits */
+        u32 l2p_addr_match;     /* L2pAddrMatchStat */
+        u32 lmpm_pmg_sel;       /* indicate which clocks are turned on
+                                 * (LMPM_PMG_SEL) */
+        u32 u_timestamp;        /* indicate when the date and time of the
+                                 * compilation */
+        u32 flow_handler;       /* FH read/write pointers, RX credit */
+} __packed /* LOG_ERROR_TABLE_API_S_VER_2 */;
 
 /*
  * UMAC error struct - relevant starting from family 8000 chip.
@@ -396,11 +444,11 @@ struct iwl_umac_error_event_table {
         u32 data1;              /* error-specific data */
         u32 data2;              /* error-specific data */
         u32 data3;              /* error-specific data */
-        u32 umac_fw_ver;        /* UMAC version */
-        u32 umac_fw_api_ver;    /* UMAC FW API ver */
+        u32 umac_major;
+        u32 umac_minor;
         u32 frame_pointer;      /* core register 27*/
         u32 stack_pointer;      /* core register 28 */
-        u32 cmd_header; /* latest host cmd sent to UMAC */
+        u32 cmd_header;         /* latest host cmd sent to UMAC */
         u32 nic_isr_pref;       /* ISR status register */
 } __packed;
 
@@ -441,18 +489,18 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
         IWL_ERR(mvm, "0x%08X | umac data1\n", table.data1);
         IWL_ERR(mvm, "0x%08X | umac data2\n", table.data2);
         IWL_ERR(mvm, "0x%08X | umac data3\n", table.data3);
-        IWL_ERR(mvm, "0x%08X | umac version\n", table.umac_fw_ver);
-        IWL_ERR(mvm, "0x%08X | umac api version\n", table.umac_fw_api_ver);
+        IWL_ERR(mvm, "0x%08X | umac major\n", table.umac_major);
+        IWL_ERR(mvm, "0x%08X | umac minor\n", table.umac_minor);
         IWL_ERR(mvm, "0x%08X | frame pointer\n", table.frame_pointer);
         IWL_ERR(mvm, "0x%08X | stack pointer\n", table.stack_pointer);
         IWL_ERR(mvm, "0x%08X | last host cmd\n", table.cmd_header);
         IWL_ERR(mvm, "0x%08X | isr status reg\n", table.nic_isr_pref);
 }
 
-void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
+static void iwl_mvm_dump_nic_error_log_old(struct iwl_mvm *mvm)
 {
         struct iwl_trans *trans = mvm->trans;
-        struct iwl_error_event_table table;
+        struct iwl_error_event_table_v1 table;
         u32 base;
 
         base = mvm->error_event_table;
@@ -489,7 +537,7 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
                                       table.data1, table.data2, table.data3,
                                       table.blink1, table.blink2, table.ilink1,
                                       table.ilink2, table.bcon_time, table.gp1,
-                                      table.gp2, table.gp3, table.ucode_ver,
+                                      table.gp2, table.gp3, table.ucode_ver, 0,
                                       table.hw_ver, table.brd_ver);
         IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id,
                 desc_lookup(table.error_id));
@@ -530,6 +578,92 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
                 iwl_mvm_dump_umac_error_log(mvm);
 }
 
+void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
+{
+        struct iwl_trans *trans = mvm->trans;
+        struct iwl_error_event_table table;
+        u32 base;
+
+        if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_NEW_VERSION)) {
+                iwl_mvm_dump_nic_error_log_old(mvm);
+                return;
+        }
+
+        base = mvm->error_event_table;
+        if (mvm->cur_ucode == IWL_UCODE_INIT) {
+                if (!base)
+                        base = mvm->fw->init_errlog_ptr;
+        } else {
+                if (!base)
+                        base = mvm->fw->inst_errlog_ptr;
+        }
+
+        if (base < 0x800000) {
+                IWL_ERR(mvm,
+                        "Not valid error log pointer 0x%08X for %s uCode\n",
+                        base,
+                        (mvm->cur_ucode == IWL_UCODE_INIT)
+                                        ? "Init" : "RT");
+                return;
+        }
+
+        iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));
+
+        if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {
+                IWL_ERR(trans, "Start IWL Error Log Dump:\n");
+                IWL_ERR(trans, "Status: 0x%08lX, count: %d\n",
+                        mvm->status, table.valid);
+        }
+
+        /* Do not change this output - scripts rely on it */
+
+        IWL_ERR(mvm, "Loaded firmware version: %s\n", mvm->fw->fw_version);
+
+        trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low,
+                                      table.data1, table.data2, table.data3,
+                                      table.blink1, table.blink2, table.ilink1,
+                                      table.ilink2, table.bcon_time, table.gp1,
+                                      table.gp2, table.gp3, table.major,
+                                      table.minor, table.hw_ver, table.brd_ver);
+        IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id,
+                desc_lookup(table.error_id));
+        IWL_ERR(mvm, "0x%08X | uPc\n", table.pc);
+        IWL_ERR(mvm, "0x%08X | branchlink1\n", table.blink1);
+        IWL_ERR(mvm, "0x%08X | branchlink2\n", table.blink2);
+        IWL_ERR(mvm, "0x%08X | interruptlink1\n", table.ilink1);
+        IWL_ERR(mvm, "0x%08X | interruptlink2\n", table.ilink2);
+        IWL_ERR(mvm, "0x%08X | data1\n", table.data1);
+        IWL_ERR(mvm, "0x%08X | data2\n", table.data2);
+        IWL_ERR(mvm, "0x%08X | data3\n", table.data3);
+        IWL_ERR(mvm, "0x%08X | beacon time\n", table.bcon_time);
+        IWL_ERR(mvm, "0x%08X | tsf low\n", table.tsf_low);
+        IWL_ERR(mvm, "0x%08X | tsf hi\n", table.tsf_hi);
+        IWL_ERR(mvm, "0x%08X | time gp1\n", table.gp1);
+        IWL_ERR(mvm, "0x%08X | time gp2\n", table.gp2);
+        IWL_ERR(mvm, "0x%08X | time gp3\n", table.gp3);
+        IWL_ERR(mvm, "0x%08X | uCode version major\n", table.major);
+        IWL_ERR(mvm, "0x%08X | uCode version minor\n", table.minor);
+        IWL_ERR(mvm, "0x%08X | hw version\n", table.hw_ver);
+        IWL_ERR(mvm, "0x%08X | board version\n", table.brd_ver);
+        IWL_ERR(mvm, "0x%08X | hcmd\n", table.hcmd);
+        IWL_ERR(mvm, "0x%08X | isr0\n", table.isr0);
+        IWL_ERR(mvm, "0x%08X | isr1\n", table.isr1);
+        IWL_ERR(mvm, "0x%08X | isr2\n", table.isr2);
+        IWL_ERR(mvm, "0x%08X | isr3\n", table.isr3);
+        IWL_ERR(mvm, "0x%08X | isr4\n", table.isr4);
+        IWL_ERR(mvm, "0x%08X | isr_pref\n", table.isr_pref);
+        IWL_ERR(mvm, "0x%08X | wait_event\n", table.wait_event);
+        IWL_ERR(mvm, "0x%08X | l2p_control\n", table.l2p_control);
+        IWL_ERR(mvm, "0x%08X | l2p_duration\n", table.l2p_duration);
+        IWL_ERR(mvm, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);
+        IWL_ERR(mvm, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);
+        IWL_ERR(mvm, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);
+        IWL_ERR(mvm, "0x%08X | timestamp\n", table.u_timestamp);
+        IWL_ERR(mvm, "0x%08X | flow_handler\n", table.flow_handler);
+
+        if (mvm->support_umac_log)
+                iwl_mvm_dump_umac_error_log(mvm);
+}
 void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, u16 ssn,
                         const struct iwl_trans_txq_scd_cfg *cfg,
                         unsigned int wdg_timeout)
@@ -603,7 +737,7 @@ int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq, bool init)
 }
 
 /**
- * iwl_mvm_update_smps - Get a requst to change the SMPS mode
+ * iwl_mvm_update_smps - Get a request to change the SMPS mode
  * @req_type: The part of the driver who call for a change.
  * @smps_requests: The request to change the SMPS mode.
  *
@@ -643,6 +777,40 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         ieee80211_request_smps(vif, smps_mode);
 }
 
+int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear)
+{
+        struct iwl_statistics_cmd scmd = {
+                .flags = clear ? cpu_to_le32(IWL_STATISTICS_FLG_CLEAR) : 0,
+        };
+        struct iwl_host_cmd cmd = {
+                .id = STATISTICS_CMD,
+                .len[0] = sizeof(scmd),
+                .data[0] = &scmd,
+                .flags = CMD_WANT_SKB,
+        };
+        int ret;
+
+        ret = iwl_mvm_send_cmd(mvm, &cmd);
+        if (ret)
+                return ret;
+
+        iwl_mvm_handle_rx_statistics(mvm, cmd.resp_pkt);
+        iwl_free_resp(&cmd);
+
+        if (clear)
+                iwl_mvm_accu_radio_stats(mvm);
+
+        return 0;
+}
+
+void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm)
+{
+        mvm->accu_radio_stats.rx_time += mvm->radio_stats.rx_time;
+        mvm->accu_radio_stats.tx_time += mvm->radio_stats.tx_time;
+        mvm->accu_radio_stats.on_time_rf += mvm->radio_stats.on_time_rf;
+        mvm->accu_radio_stats.on_time_scan += mvm->radio_stats.on_time_scan;
+}
+
 static void iwl_mvm_diversity_iter(void *_data, u8 *mac,
                                    struct ieee80211_vif *vif)
 {
@@ -689,7 +857,7 @@ int iwl_mvm_update_low_latency(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
         mvmvif->low_latency = value;
 
-        res = iwl_mvm_update_quotas(mvm, NULL);
+        res = iwl_mvm_update_quotas(mvm, false, NULL);
         if (res)
                 return res;
 
@@ -717,25 +885,6 @@ bool iwl_mvm_low_latency(struct iwl_mvm *mvm)
         return result;
 }
 
-static void iwl_mvm_idle_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)
-{
-        bool *idle = _data;
-
-        if (!vif->bss_conf.idle)
-                *idle = false;
-}
-
-bool iwl_mvm_is_idle(struct iwl_mvm *mvm)
-{
-        bool idle = true;
-
-        ieee80211_iterate_active_interfaces_atomic(
-                        mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
-                        iwl_mvm_idle_iter, &idle);
-
-        return idle;
-}
-
 struct iwl_bss_iter_data {
         struct ieee80211_vif *vif;
         bool error;
@@ -772,3 +921,71 @@ struct ieee80211_vif *iwl_mvm_get_bss_vif(struct iwl_mvm *mvm)
 
         return bss_iter_data.vif;
 }
+
+unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,
+                                    struct ieee80211_vif *vif,
+                                    bool tdls, bool cmd_q)
+{
+        struct iwl_fw_dbg_trigger_tlv *trigger;
+        struct iwl_fw_dbg_trigger_txq_timer *txq_timer;
+        unsigned int default_timeout =
+                cmd_q ? IWL_DEF_WD_TIMEOUT : mvm->cfg->base_params->wd_timeout;
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_TXQ_TIMERS))
+                return iwlmvm_mod_params.tfd_q_hang_detect ?
+                        default_timeout : IWL_WATCHDOG_DISABLED;
+
+        trigger = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_TXQ_TIMERS);
+        txq_timer = (void *)trigger->data;
+
+        if (tdls)
+                return le32_to_cpu(txq_timer->tdls);
+
+        if (cmd_q)
+                return le32_to_cpu(txq_timer->command_queue);
+
+        if (WARN_ON(!vif))
+                return default_timeout;
+
+        switch (ieee80211_vif_type_p2p(vif)) {
+        case NL80211_IFTYPE_ADHOC:
+                return le32_to_cpu(txq_timer->ibss);
+        case NL80211_IFTYPE_STATION:
+                return le32_to_cpu(txq_timer->bss);
+        case NL80211_IFTYPE_AP:
+                return le32_to_cpu(txq_timer->softap);
+        case NL80211_IFTYPE_P2P_CLIENT:
+                return le32_to_cpu(txq_timer->p2p_client);
+        case NL80211_IFTYPE_P2P_GO:
+                return le32_to_cpu(txq_timer->p2p_go);
+        case NL80211_IFTYPE_P2P_DEVICE:
+                return le32_to_cpu(txq_timer->p2p_device);
+        default:
+                WARN_ON(1);
+                return mvm->cfg->base_params->wd_timeout;
+        }
+}
+
+void iwl_mvm_connection_loss(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             const char *errmsg)
+{
+        struct iwl_fw_dbg_trigger_tlv *trig;
+        struct iwl_fw_dbg_trigger_mlme *trig_mlme;
+
+        if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_MLME))
+                goto out;
+
+        trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_MLME);
+        trig_mlme = (void *)trig->data;
+        if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trig))
+                goto out;
+
+        if (trig_mlme->stop_connection_loss &&
+            --trig_mlme->stop_connection_loss)
+                goto out;
+
+        iwl_mvm_fw_dbg_collect_trig(mvm, trig, "%s", errmsg);
+
+out:
+        ieee80211_connection_loss(vif);
+}
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index 686dd301cd53..b18569734922 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -415,10 +415,35 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
 
 /* 8000 Series */
         {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x1010, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0110, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x1110, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0050, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0250, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x1050, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0150, iwl8260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F4, 0x1130, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F4, 0x1030, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0xC010, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0xD010, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F4, 0xC030, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F4, 0xD030, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0xC050, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0xD050, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x8010, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x9010, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F4, 0x8030, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F4, 0x9030, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x8050, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x9050, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8260_2n_cfg)},
         {IWL_PCI_DEVICE(0x24F5, 0x0010, iwl4165_2ac_cfg)},
         {IWL_PCI_DEVICE(0x24F6, 0x0030, iwl4165_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0810, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0910, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0850, iwl8260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24F3, 0x0950, iwl8260_2ac_cfg)},
 #endif /* CONFIG_IWLMVM */
 
         {0}
diff --git a/drivers/net/wireless/iwlwifi/pcie/internal.h b/drivers/net/wireless/iwlwifi/pcie/internal.h
index cae0eb8835ce..01996c9d98a7 100644
--- a/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -217,6 +217,8 @@ struct iwl_pcie_txq_scratch_buf {
  * @active: stores if queue is active
  * @ampdu: true if this queue is an ampdu queue for an specific RA/TID
  * @wd_timeout: queue watchdog timeout (jiffies) - per queue
+ * @frozen: tx stuck queue timer is frozen
+ * @frozen_expiry_remainder: remember how long until the timer fires
  *
  * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame
  * descriptors) and required locking structures.
@@ -228,9 +230,11 @@ struct iwl_txq {
         dma_addr_t scratchbufs_dma;
         struct iwl_pcie_txq_entry *entries;
         spinlock_t lock;
+        unsigned long frozen_expiry_remainder;
         struct timer_list stuck_timer;
         struct iwl_trans_pcie *trans_pcie;
         bool need_update;
+        bool frozen;
         u8 active;
         bool ampdu;
         unsigned long wd_timeout;
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index 7b7e2f223fb2..7ff69c642103 100644
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -600,9 +600,11 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,
                 if (pkt->len_n_flags == cpu_to_le32(FH_RSCSR_FRAME_INVALID))
                         break;
 
-                IWL_DEBUG_RX(trans, "cmd at offset %d: %s (0x%.2x)\n",
-                        rxcb._offset, get_cmd_string(trans_pcie, pkt->hdr.cmd),
-                        pkt->hdr.cmd);
+                IWL_DEBUG_RX(trans,
+                             "cmd at offset %d: %s (0x%.2x, seq 0x%x)\n",
+                             rxcb._offset,
+                             get_cmd_string(trans_pcie, pkt->hdr.cmd),
+                             pkt->hdr.cmd, le16_to_cpu(pkt->hdr.sequence));
 
                 len = iwl_rx_packet_len(pkt);
                 len += sizeof(u32); /* account for status word */
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 69935aa5a1b3..2de8fbfe4edf 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -682,10 +682,51 @@ static int iwl_pcie_load_section(struct iwl_trans *trans, u8 section_num,
         return ret;
 }
 
-static int iwl_pcie_load_cpu_sections_8000b(struct iwl_trans *trans,
-                                            const struct fw_img *image,
-                                            int cpu,
-                                            int *first_ucode_section)
+/*
+ * Driver Takes the ownership on secure machine before FW load
+ * and prevent race with the BT load.
+ * W/A for ROM bug. (should be remove in the next Si step)
+ */
+static int iwl_pcie_rsa_race_bug_wa(struct iwl_trans *trans)
+{
+        u32 val, loop = 1000;
+
+        /*
+         * Check the RSA semaphore is accessible.
+         * If the HW isn't locked and the rsa semaphore isn't accessible,
+         * we are in trouble.
+         */
+        val = iwl_read_prph(trans, PREG_AUX_BUS_WPROT_0);
+        if (val & (BIT(1) | BIT(17))) {
+                IWL_INFO(trans,
+                         "can't access the RSA semaphore it is write protected\n");
+                return 0;
+        }
+
+        /* take ownership on the AUX IF */
+        iwl_write_prph(trans, WFPM_CTRL_REG, WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK);
+        iwl_write_prph(trans, AUX_MISC_MASTER1_EN, AUX_MISC_MASTER1_EN_SBE_MSK);
+
+        do {
+                iwl_write_prph(trans, AUX_MISC_MASTER1_SMPHR_STATUS, 0x1);
+                val = iwl_read_prph(trans, AUX_MISC_MASTER1_SMPHR_STATUS);
+                if (val == 0x1) {
+                        iwl_write_prph(trans, RSA_ENABLE, 0);
+                        return 0;
+                }
+
+                udelay(10);
+                loop--;
+        } while (loop > 0);
+
+        IWL_ERR(trans, "Failed to take ownership on secure machine\n");
+        return -EIO;
+}
+
+static int iwl_pcie_load_cpu_sections_8000(struct iwl_trans *trans,
+                                           const struct fw_img *image,
+                                           int cpu,
+                                           int *first_ucode_section)
 {
         int shift_param;
         int i, ret = 0, sec_num = 0x1;
@@ -880,64 +921,50 @@ static int iwl_pcie_load_given_ucode(struct iwl_trans *trans,
         }
 
         /* release CPU reset */
-        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
-                iwl_write_prph(trans, RELEASE_CPU_RESET, RELEASE_CPU_RESET_BIT);
-        else
-                iwl_write32(trans, CSR_RESET, 0);
+        iwl_write32(trans, CSR_RESET, 0);
 
         return 0;
 }
 
-static int iwl_pcie_load_given_ucode_8000b(struct iwl_trans *trans,
-                                           const struct fw_img *image)
+static int iwl_pcie_load_given_ucode_8000(struct iwl_trans *trans,
+                                          const struct fw_img *image)
 {
         int ret = 0;
         int first_ucode_section;
-        u32 reg;
 
         IWL_DEBUG_FW(trans, "working with %s CPU\n",
                      image->is_dual_cpus ? "Dual" : "Single");
 
+        if (trans->dbg_dest_tlv)
+                iwl_pcie_apply_destination(trans);
+
+        /* TODO: remove in the next Si step */
+        ret = iwl_pcie_rsa_race_bug_wa(trans);
+        if (ret)
+                return ret;
+
         /* configure the ucode to be ready to get the secured image */
         /* release CPU reset */
         iwl_write_prph(trans, RELEASE_CPU_RESET, RELEASE_CPU_RESET_BIT);
 
         /* load to FW the binary Secured sections of CPU1 */
-        ret = iwl_pcie_load_cpu_sections_8000b(trans, image, 1,
-                                               &first_ucode_section);
+        ret = iwl_pcie_load_cpu_sections_8000(trans, image, 1,
+                                              &first_ucode_section);
         if (ret)
                 return ret;
 
         /* load to FW the binary sections of CPU2 */
-        ret = iwl_pcie_load_cpu_sections_8000b(trans, image, 2,
-                                               &first_ucode_section);
+        ret = iwl_pcie_load_cpu_sections_8000(trans, image, 2,
+                                              &first_ucode_section);
         if (ret)
                 return ret;
 
-        if (trans->dbg_dest_tlv)
-                iwl_pcie_apply_destination(trans);
-
-        /* wait for image verification to complete  */
-        ret = iwl_poll_prph_bit(trans, LMPM_SECURE_BOOT_CPU1_STATUS_ADDR_B0,
-                                LMPM_SECURE_BOOT_STATUS_SUCCESS,
-                                LMPM_SECURE_BOOT_STATUS_SUCCESS,
-                                LMPM_SECURE_TIME_OUT);
-        if (ret < 0) {
-                reg = iwl_read_prph(trans,
-                                    LMPM_SECURE_BOOT_CPU1_STATUS_ADDR_B0);
-
-                IWL_ERR(trans, "Timeout on secure boot process, reg = %x\n",
-                        reg);
-                return ret;
-        }
-
         return 0;
 }
 
 static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
                                    const struct fw_img *fw, bool run_in_rfkill)
 {
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ret;
         bool hw_rfkill;
 
@@ -967,9 +994,6 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
                 return ret;
         }
 
-        /* init ref_count to 1 (should be cleared when ucode is loaded) */
-        trans_pcie->ref_count = 1;
-
         /* make sure rfkill handshake bits are cleared */
         iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
         iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR,
@@ -984,9 +1008,8 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
         iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
 
         /* Load the given image to the HW */
-        if ((trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) &&
-            (CSR_HW_REV_STEP(trans->hw_rev) != SILICON_A_STEP))
-                return iwl_pcie_load_given_ucode_8000b(trans, fw);
+        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
+                return iwl_pcie_load_given_ucode_8000(trans, fw);
         else
                 return iwl_pcie_load_given_ucode(trans, fw);
 }
@@ -1288,6 +1311,9 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans,
         trans_pcie->bc_table_dword = trans_cfg->bc_table_dword;
         trans_pcie->scd_set_active = trans_cfg->scd_set_active;
 
+        /* init ref_count to 1 (should be cleared when ucode is loaded) */
+        trans_pcie->ref_count = 1;
+
         /* Initialize NAPI here - it should be before registering to mac80211
          * in the opmode but after the HW struct is allocated.
          * As this function may be called again in some corner cases don't
@@ -1462,6 +1488,60 @@ static int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr,
         return ret;
 }
 
+static void iwl_trans_pcie_freeze_txq_timer(struct iwl_trans *trans,
+                                            unsigned long txqs,
+                                            bool freeze)
+{
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        int queue;
+
+        for_each_set_bit(queue, &txqs, BITS_PER_LONG) {
+                struct iwl_txq *txq = &trans_pcie->txq[queue];
+                unsigned long now;
+
+                spin_lock_bh(&txq->lock);
+
+                now = jiffies;
+
+                if (txq->frozen == freeze)
+                        goto next_queue;
+
+                IWL_DEBUG_TX_QUEUES(trans, "%s TXQ %d\n",
+                                    freeze ? "Freezing" : "Waking", queue);
+
+                txq->frozen = freeze;
+
+                if (txq->q.read_ptr == txq->q.write_ptr)
+                        goto next_queue;
+
+                if (freeze) {
+                        if (unlikely(time_after(now,
+                                                txq->stuck_timer.expires))) {
+                                /*
+                                 * The timer should have fired, maybe it is
+                                 * spinning right now on the lock.
+                                 */
+                                goto next_queue;
+                        }
+                        /* remember how long until the timer fires */
+                        txq->frozen_expiry_remainder =
+                                txq->stuck_timer.expires - now;
+                        del_timer(&txq->stuck_timer);
+                        goto next_queue;
+                }
+
+                /*
+                 * Wake a non-empty queue -> arm timer with the
+                 * remainder before it froze
+                 */
+                mod_timer(&txq->stuck_timer,
+                          now + txq->frozen_expiry_remainder);
+
+next_queue:
+                spin_unlock_bh(&txq->lock);
+        }
+}
+
 #define IWL_FLUSH_WAIT_MS       2000
 
 static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, u32 txq_bm)
@@ -1713,7 +1793,7 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
         int ret;
         size_t bufsz;
 
-        bufsz = sizeof(char) * 64 * trans->cfg->base_params->num_of_queues;
+        bufsz = sizeof(char) * 75 * trans->cfg->base_params->num_of_queues;
 
         if (!trans_pcie->txq)
                 return -EAGAIN;
@@ -1726,11 +1806,11 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
                 txq = &trans_pcie->txq[cnt];
                 q = &txq->q;
                 pos += scnprintf(buf + pos, bufsz - pos,
-                                "hwq %.2d: read=%u write=%u use=%d stop=%d need_update=%d%s\n",
+                                "hwq %.2d: read=%u write=%u use=%d stop=%d need_update=%d frozen=%d%s\n",
                                 cnt, q->read_ptr, q->write_ptr,
                                 !!test_bit(cnt, trans_pcie->queue_used),
                                  !!test_bit(cnt, trans_pcie->queue_stopped),
-                                 txq->need_update,
+                                 txq->need_update, txq->frozen,
                                  (cnt == trans_pcie->cmd_queue ? " HCMD" : ""));
         }
         ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
@@ -1961,24 +2041,25 @@ static const struct {
         { .start = 0x00a01c7c, .end = 0x00a01c7c },
         { .start = 0x00a01c28, .end = 0x00a01c54 },
         { .start = 0x00a01c5c, .end = 0x00a01c5c },
-        { .start = 0x00a01c84, .end = 0x00a01c84 },
+        { .start = 0x00a01c60, .end = 0x00a01cdc },
         { .start = 0x00a01ce0, .end = 0x00a01d0c },
         { .start = 0x00a01d18, .end = 0x00a01d20 },
         { .start = 0x00a01d2c, .end = 0x00a01d30 },
         { .start = 0x00a01d40, .end = 0x00a01d5c },
         { .start = 0x00a01d80, .end = 0x00a01d80 },
-        { .start = 0x00a01d98, .end = 0x00a01d98 },
+        { .start = 0x00a01d98, .end = 0x00a01d9c },
+        { .start = 0x00a01da8, .end = 0x00a01da8 },
+        { .start = 0x00a01db8, .end = 0x00a01df4 },
         { .start = 0x00a01dc0, .end = 0x00a01dfc },
         { .start = 0x00a01e00, .end = 0x00a01e2c },
         { .start = 0x00a01e40, .end = 0x00a01e60 },
+        { .start = 0x00a01e68, .end = 0x00a01e6c },
+        { .start = 0x00a01e74, .end = 0x00a01e74 },
         { .start = 0x00a01e84, .end = 0x00a01e90 },
         { .start = 0x00a01e9c, .end = 0x00a01ec4 },
-        { .start = 0x00a01ed0, .end = 0x00a01ed0 },
-        { .start = 0x00a01f00, .end = 0x00a01f14 },
-        { .start = 0x00a01f44, .end = 0x00a01f58 },
-        { .start = 0x00a01f80, .end = 0x00a01fa8 },
-        { .start = 0x00a01fb0, .end = 0x00a01fbc },
-        { .start = 0x00a01ff8, .end = 0x00a01ffc },
+        { .start = 0x00a01ed0, .end = 0x00a01ee0 },
+        { .start = 0x00a01f00, .end = 0x00a01f1c },
+        { .start = 0x00a01f44, .end = 0x00a01ffc },
         { .start = 0x00a02000, .end = 0x00a02048 },
         { .start = 0x00a02068, .end = 0x00a020f0 },
         { .start = 0x00a02100, .end = 0x00a02118 },
@@ -2305,6 +2386,7 @@ static const struct iwl_trans_ops trans_ops_pcie = {
         .dbgfs_register = iwl_trans_pcie_dbgfs_register,
 
         .wait_tx_queue_empty = iwl_trans_pcie_wait_txq_empty,
+        .freeze_txq_timer = iwl_trans_pcie_freeze_txq_timer,
 
         .write8 = iwl_trans_pcie_write8,
         .write32 = iwl_trans_pcie_write32,
@@ -2423,10 +2505,45 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
          * "dash" value). To keep hw_rev backwards compatible - we'll store it
          * in the old format.
          */
-        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
+        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
+                unsigned long flags;
+                int ret;
+
                 trans->hw_rev = (trans->hw_rev & 0xfff0) |
                                 (CSR_HW_REV_STEP(trans->hw_rev << 2) << 2);
 
+                /*
+                 * in-order to recognize C step driver should read chip version
+                 * id located at the AUX bus MISC address space.
+                 */
+                iwl_set_bit(trans, CSR_GP_CNTRL,
+                            CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+                udelay(2);
+
+                ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
+                                   CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                                   CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                                   25000);
+                if (ret < 0) {
+                        IWL_DEBUG_INFO(trans, "Failed to wake up the nic\n");
+                        goto out_pci_disable_msi;
+                }
+
+                if (iwl_trans_grab_nic_access(trans, false, &flags)) {
+                        u32 hw_step;
+
+                        hw_step = __iwl_read_prph(trans, WFPM_CTRL_REG);
+                        hw_step |= ENABLE_WFPM;
+                        __iwl_write_prph(trans, WFPM_CTRL_REG, hw_step);
+                        hw_step = __iwl_read_prph(trans, AUX_MISC_REG);
+                        hw_step = (hw_step >> HW_STEP_LOCATION_BITS) & 0xF;
+                        if (hw_step == 0x3)
+                                trans->hw_rev = (trans->hw_rev & 0xFFFFFFF3) |
+                                                (SILICON_C_STEP << 2);
+                        iwl_trans_release_nic_access(trans, &flags);
+                }
+        }
+
         trans->hw_id = (pdev->device << 16) + pdev->subsystem_device;
         snprintf(trans->hw_id_str, sizeof(trans->hw_id_str),
                  "PCI ID: 0x%04X:0x%04X", pdev->device, pdev->subsystem_device);
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index af0bce736358..06952aadfd7b 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -725,33 +725,50 @@ void iwl_trans_pcie_tx_reset(struct iwl_trans *trans)
         iwl_pcie_tx_start(trans, 0);
 }
 
+static void iwl_pcie_tx_stop_fh(struct iwl_trans *trans)
+{
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        unsigned long flags;
+        int ch, ret;
+        u32 mask = 0;
+
+        spin_lock(&trans_pcie->irq_lock);
+
+        if (!iwl_trans_grab_nic_access(trans, false, &flags))
+                goto out;
+
+        /* Stop each Tx DMA channel */
+        for (ch = 0; ch < FH_TCSR_CHNL_NUM; ch++) {
+                iwl_write32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
+                mask |= FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch);
+        }
+
+        /* Wait for DMA channels to be idle */
+        ret = iwl_poll_bit(trans, FH_TSSR_TX_STATUS_REG, mask, mask, 5000);
+        if (ret < 0)
+                IWL_ERR(trans,
+                        "Failing on timeout while stopping DMA channel %d [0x%08x]\n",
+                        ch, iwl_read32(trans, FH_TSSR_TX_STATUS_REG));
+
+        iwl_trans_release_nic_access(trans, &flags);
+
+out:
+        spin_unlock(&trans_pcie->irq_lock);
+}
+
 /*
  * iwl_pcie_tx_stop - Stop all Tx DMA channels
  */
 int iwl_pcie_tx_stop(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        int ch, txq_id, ret;
+        int txq_id;
 
         /* Turn off all Tx DMA fifos */
-        spin_lock(&trans_pcie->irq_lock);
-
         iwl_scd_deactivate_fifos(trans);
 
-        /* Stop each Tx DMA channel, and wait for it to be idle */
-        for (ch = 0; ch < FH_TCSR_CHNL_NUM; ch++) {
-                iwl_write_direct32(trans,
-                                   FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
-                ret = iwl_poll_direct_bit(trans, FH_TSSR_TX_STATUS_REG,
-                        FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch), 1000);
-                if (ret < 0)
-                        IWL_ERR(trans,
-                                "Failing on timeout while stopping DMA channel %d [0x%08x]\n",
-                                ch,
-                                iwl_read_direct32(trans,
-                                                  FH_TSSR_TX_STATUS_REG));
-        }
-        spin_unlock(&trans_pcie->irq_lock);
+        /* Turn off all Tx DMA channels */
+        iwl_pcie_tx_stop_fh(trans);
 
         /*
          * This function can be called before the op_mode disabled the
@@ -912,10 +929,19 @@ error:
 
 static inline void iwl_pcie_txq_progress(struct iwl_txq *txq)
 {
+        lockdep_assert_held(&txq->lock);
+
         if (!txq->wd_timeout)
                 return;
 
         /*
+         * station is asleep and we send data - that must
+         * be uAPSD or PS-Poll. Don't rearm the timer.
+         */
+        if (txq->frozen)
+                return;
+
+        /*
          * if empty delete timer, otherwise move timer forward
          * since we're making progress on this queue
          */
@@ -1248,6 +1274,9 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id,
                         SCD_TX_STTS_QUEUE_OFFSET(txq_id);
         static const u32 zero_val[4] = {};
 
+        trans_pcie->txq[txq_id].frozen_expiry_remainder = 0;
+        trans_pcie->txq[txq_id].frozen = false;
+
         /*
          * Upon HW Rfkill - we stop the device, and then stop the queues
          * in the op_mode. Just for the sake of the simplicity of the op_mode,
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index a92985a6ea21..1a4d558022d8 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -1356,8 +1356,8 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
 
         /* Find the BSS we want using available scan results */
         bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid,
-                sme->ssid, sme->ssid_len,
-                WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+                sme->ssid, sme->ssid_len, IEEE80211_BSS_TYPE_ESS,
+                IEEE80211_PRIVACY_ANY);
         if (!bss) {
                 wiphy_err(wiphy, "assoc: bss %pM not in scan results\n",
                           sme->bssid);
@@ -2000,7 +2000,7 @@ static int lbs_join_ibss(struct wiphy *wiphy, struct net_device *dev,
          * bss list is populated already */
         bss = cfg80211_get_bss(wiphy, params->chandef.chan, params->bssid,
                 params->ssid, params->ssid_len,
-                WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
+                IEEE80211_BSS_TYPE_IBSS, IEEE80211_PRIVACY_ANY);
 
         if (bss) {
                 ret = lbs_ibss_join_existing(priv, params, bss);
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index cc6a0a586f0b..26cbf1dcc662 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -742,8 +742,7 @@ void lbs_debugfs_init(void)
 
 void lbs_debugfs_remove(void)
 {
-        if (lbs_dir)
-                 debugfs_remove(lbs_dir);
+        debugfs_remove(lbs_dir);
 }
 
 void lbs_debugfs_init_one(struct lbs_private *priv, struct net_device *dev)
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 569b64ecc607..8079560f4965 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -667,7 +667,7 @@ static int lbs_setup_firmware(struct lbs_private *priv)
         lbs_deb_enter(LBS_DEB_FW);
 
         /* Read MAC address from firmware */
-        memset(priv->current_addr, 0xff, ETH_ALEN);
+        eth_broadcast_addr(priv->current_addr);
         ret = lbs_update_hw_spec(priv);
         if (ret)
                 goto done;
@@ -871,7 +871,7 @@ static int lbs_init_adapter(struct lbs_private *priv)
 
         lbs_deb_enter(LBS_DEB_MAIN);
 
-        memset(priv->current_addr, 0xff, ETH_ALEN);
+        eth_broadcast_addr(priv->current_addr);
 
         priv->connect_status = LBS_DISCONNECTED;
         priv->channel = DEFAULT_AD_HOC_CHANNEL;
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index d576dd6665d3..1a20cee5febe 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -365,7 +365,6 @@ static int if_usb_reset_device(struct if_usb_card *cardp)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(if_usb_reset_device);
 
 /**
  *  usb_tx_block - transfer data to the device
@@ -907,7 +906,6 @@ restart:
         lbtf_deb_leave_args(LBTF_DEB_USB, "ret %d", ret);
         return ret;
 }
-EXPORT_SYMBOL_GPL(if_usb_prog_firmware);
 
 
 #define if_usb_suspend NULL
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 25c5acc78bd1..ed02e4bf2c26 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -152,7 +152,7 @@ static int lbtf_setup_firmware(struct lbtf_private *priv)
         /*
          * Read priv address from HW
          */
-        memset(priv->current_addr, 0xff, ETH_ALEN);
+        eth_broadcast_addr(priv->current_addr);
         ret = lbtf_update_hw_spec(priv);
         if (ret) {
                 ret = -1;
@@ -199,7 +199,7 @@ out:
 static int lbtf_init_adapter(struct lbtf_private *priv)
 {
         lbtf_deb_enter(LBTF_DEB_MAIN);
-        memset(priv->current_addr, 0xff, ETH_ALEN);
+        eth_broadcast_addr(priv->current_addr);
         mutex_init(&priv->lock);
 
         priv->vif = NULL;
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 8908be6dbc48..d5c0a1af08b9 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -330,6 +330,83 @@ static const struct ieee80211_rate hwsim_rates[] = {
         { .bitrate = 540 }
 };
 
+#define OUI_QCA 0x001374
+#define QCA_NL80211_SUBCMD_TEST 1
+enum qca_nl80211_vendor_subcmds {
+        QCA_WLAN_VENDOR_ATTR_TEST = 8,
+        QCA_WLAN_VENDOR_ATTR_MAX = QCA_WLAN_VENDOR_ATTR_TEST
+};
+
+static const struct nla_policy
+hwsim_vendor_test_policy[QCA_WLAN_VENDOR_ATTR_MAX + 1] = {
+        [QCA_WLAN_VENDOR_ATTR_MAX] = { .type = NLA_U32 },
+};
+
+static int mac80211_hwsim_vendor_cmd_test(struct wiphy *wiphy,
+                                          struct wireless_dev *wdev,
+                                          const void *data, int data_len)
+{
+        struct sk_buff *skb;
+        struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX + 1];
+        int err;
+        u32 val;
+
+        err = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_MAX, data, data_len,
+                        hwsim_vendor_test_policy);
+        if (err)
+                return err;
+        if (!tb[QCA_WLAN_VENDOR_ATTR_TEST])
+                return -EINVAL;
+        val = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_TEST]);
+        wiphy_debug(wiphy, "%s: test=%u\n", __func__, val);
+
+        /* Send a vendor event as a test. Note that this would not normally be
+         * done within a command handler, but rather, based on some other
+         * trigger. For simplicity, this command is used to trigger the event
+         * here.
+         *
+         * event_idx = 0 (index in mac80211_hwsim_vendor_commands)
+         */
+        skb = cfg80211_vendor_event_alloc(wiphy, wdev, 100, 0, GFP_KERNEL);
+        if (skb) {
+                /* skb_put() or nla_put() will fill up data within
+                 * NL80211_ATTR_VENDOR_DATA.
+                 */
+
+                /* Add vendor data */
+                nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TEST, val + 1);
+
+                /* Send the event - this will call nla_nest_end() */
+                cfg80211_vendor_event(skb, GFP_KERNEL);
+        }
+
+        /* Send a response to the command */
+        skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 10);
+        if (!skb)
+                return -ENOMEM;
+
+        /* skb_put() or nla_put() will fill up data within
+         * NL80211_ATTR_VENDOR_DATA
+         */
+        nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TEST, val + 2);
+
+        return cfg80211_vendor_cmd_reply(skb);
+}
+
+static struct wiphy_vendor_command mac80211_hwsim_vendor_commands[] = {
+        {
+                .info = { .vendor_id = OUI_QCA,
+                          .subcmd = QCA_NL80211_SUBCMD_TEST },
+                .flags = WIPHY_VENDOR_CMD_NEED_NETDEV,
+                .doit = mac80211_hwsim_vendor_cmd_test,
+        }
+};
+
+/* Advertise support vendor specific events */
+static const struct nl80211_vendor_cmd_info mac80211_hwsim_vendor_events[] = {
+        { .vendor_id = OUI_QCA, .subcmd = 1 },
+};
+
 static const struct ieee80211_iface_limit hwsim_if_limits[] = {
         { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
         { .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) |
@@ -906,8 +983,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                 goto nla_put_failure;
         }
 
-        if (nla_put(skb, HWSIM_ATTR_ADDR_TRANSMITTER,
-                    ETH_ALEN, data->addresses[1].addr))
+        if (nla_put(skb, HWSIM_ATTR_ADDR_TRANSMITTER, ETH_ALEN, hdr->addr2))
                 goto nla_put_failure;
 
         /* We get the skb->data */
@@ -1522,21 +1598,16 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
                 vp->aid = info->aid;
         }
 
-        if (changed & BSS_CHANGED_BEACON_INT) {
-                wiphy_debug(hw->wiphy, "  BCNINT: %d\n", info->beacon_int);
-                data->beacon_int = info->beacon_int * 1024;
-        }
-
         if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                wiphy_debug(hw->wiphy, "  BCN EN: %d\n", info->enable_beacon);
+                wiphy_debug(hw->wiphy, "  BCN EN: %d (BI=%u)\n",
+                            info->enable_beacon, info->beacon_int);
                 vp->bcn_en = info->enable_beacon;
                 if (data->started &&
                     !hrtimer_is_queued(&data->beacon_timer.timer) &&
                     info->enable_beacon) {
                         u64 tsf, until_tbtt;
                         u32 bcn_int;
-                        if (WARN_ON(!data->beacon_int))
-                                data->beacon_int = 1000 * 1024;
+                        data->beacon_int = info->beacon_int * 1024;
                         tsf = mac80211_hwsim_get_tsf(hw, vif);
                         bcn_int = data->beacon_int;
                         until_tbtt = bcn_int - do_div(tsf, bcn_int);
@@ -1550,8 +1621,10 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
                                 mac80211_hwsim_bcn_en_iter, &count);
                         wiphy_debug(hw->wiphy, "  beaconing vifs remaining: %u",
                                     count);
-                        if (count == 0)
+                        if (count == 0) {
                                 tasklet_hrtimer_cancel(&data->beacon_timer);
+                                data->beacon_int = 0;
+                        }
                 }
         }
 
@@ -1911,7 +1984,7 @@ static void mac80211_hwsim_sw_scan_complete(struct ieee80211_hw *hw,
 
         printk(KERN_DEBUG "hwsim sw_scan_complete\n");
         hwsim->scanning = false;
-        memset(hwsim->scan_addr, 0, ETH_ALEN);
+        eth_zero_addr(hwsim->scan_addr);
 
         mutex_unlock(&hwsim->mutex);
 }
@@ -2267,7 +2340,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
         skb_queue_head_init(&data->pending);
 
         SET_IEEE80211_DEV(hw, data->dev);
-        memset(addr, 0, ETH_ALEN);
+        eth_zero_addr(addr);
         addr[0] = 0x02;
         addr[3] = idx >> 8;
         addr[4] = idx;
@@ -2420,6 +2493,12 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
         hw->max_rates = 4;
         hw->max_rate_tries = 11;
 
+        hw->wiphy->vendor_commands = mac80211_hwsim_vendor_commands;
+        hw->wiphy->n_vendor_commands =
+                ARRAY_SIZE(mac80211_hwsim_vendor_commands);
+        hw->wiphy->vendor_events = mac80211_hwsim_vendor_events;
+        hw->wiphy->n_vendor_events = ARRAY_SIZE(mac80211_hwsim_vendor_events);
+
         if (param->reg_strict)
                 hw->wiphy->regulatory_flags |= REGULATORY_STRICT_REG;
         if (param->regd) {
@@ -2600,7 +2679,7 @@ static void hwsim_mon_setup(struct net_device *dev)
         ether_setup(dev);
         dev->tx_queue_len = 0;
         dev->type = ARPHRD_IEEE80211_RADIOTAP;
-        memset(dev->dev_addr, 0, ETH_ALEN);
+        eth_zero_addr(dev->dev_addr);
         dev->dev_addr[0] = 0x12;
 }
 
@@ -2611,7 +2690,7 @@ static struct mac80211_hwsim_data *get_hwsim_data_ref_from_addr(const u8 *addr)
 
         spin_lock_bh(&hwsim_radio_lock);
         list_for_each_entry(data, &hwsim_radios, list) {
-                if (memcmp(data->addresses[1].addr, addr, ETH_ALEN) == 0) {
+                if (mac80211_hwsim_addr_match(data, addr)) {
                         _found = true;
                         break;
                 }
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index 543148d27b01..433bd6837c79 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -159,6 +159,7 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,
         int tid;
         struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;
         struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
+        struct mwifiex_ra_list_tbl *ra_list;
         u16 block_ack_param_set = le16_to_cpu(add_ba_rsp->block_ack_param_set);
 
         add_ba_rsp->ssn = cpu_to_le16((le16_to_cpu(add_ba_rsp->ssn))
@@ -166,7 +167,13 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,
 
         tid = (block_ack_param_set & IEEE80211_ADDBA_PARAM_TID_MASK)
                >> BLOCKACKPARAM_TID_POS;
+        ra_list = mwifiex_wmm_get_ralist_node(priv, tid, add_ba_rsp->
+                peer_mac_addr);
         if (le16_to_cpu(add_ba_rsp->status_code) != BA_RESULT_SUCCESS) {
+                if (ra_list) {
+                        ra_list->ba_status = BA_SETUP_NONE;
+                        ra_list->amsdu_in_ampdu = false;
+                }
                 mwifiex_del_ba_tbl(priv, tid, add_ba_rsp->peer_mac_addr,
                                    TYPE_DELBA_SENT, true);
                 if (add_ba_rsp->add_rsp_result != BA_RESULT_TIMEOUT)
@@ -185,6 +192,10 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,
                         tx_ba_tbl->amsdu = true;
                 else
                         tx_ba_tbl->amsdu = false;
+                if (ra_list) {
+                        ra_list->amsdu_in_ampdu = tx_ba_tbl->amsdu;
+                        ra_list->ba_status = BA_SETUP_COMPLETE;
+                }
         } else {
                 dev_err(priv->adapter->dev, "BA stream not created\n");
         }
@@ -515,6 +526,7 @@ void mwifiex_create_ba_tbl(struct mwifiex_private *priv, u8 *ra, int tid,
                            enum mwifiex_ba_status ba_status)
 {
         struct mwifiex_tx_ba_stream_tbl *new_node;
+        struct mwifiex_ra_list_tbl *ra_list;
         unsigned long flags;
 
         if (!mwifiex_get_ba_tbl(priv, tid, ra)) {
@@ -522,7 +534,11 @@ void mwifiex_create_ba_tbl(struct mwifiex_private *priv, u8 *ra, int tid,
                                    GFP_ATOMIC);
                 if (!new_node)
                         return;
-
+                ra_list = mwifiex_wmm_get_ralist_node(priv, tid, ra);
+                if (ra_list) {
+                        ra_list->ba_status = ba_status;
+                        ra_list->amsdu_in_ampdu = false;
+                }
                 INIT_LIST_HEAD(&new_node->list);
 
                 new_node->tid = tid;
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h
index 8e2e39422ad8..afdd58aa90de 100644
--- a/drivers/net/wireless/mwifiex/11n.h
+++ b/drivers/net/wireless/mwifiex/11n.h
@@ -77,22 +77,6 @@ mwifiex_is_station_ampdu_allowed(struct mwifiex_private *priv,
         return (node->ampdu_sta[tid] != BA_STREAM_NOT_ALLOWED) ? true : false;
 }
 
-/* This function checks whether AMSDU is allowed for BA stream. */
-static inline u8
-mwifiex_is_amsdu_in_ampdu_allowed(struct mwifiex_private *priv,
-                                  struct mwifiex_ra_list_tbl *ptr, int tid)
-{
-        struct mwifiex_tx_ba_stream_tbl *tx_tbl;
-
-        if (is_broadcast_ether_addr(ptr->ra))
-                return false;
-        tx_tbl = mwifiex_get_ba_tbl(priv, tid, ptr->ra);
-        if (tx_tbl)
-                return tx_tbl->amsdu;
-
-        return false;
-}
-
 /* This function checks whether AMPDU is allowed or not for a particular TID. */
 static inline u8
 mwifiex_is_ampdu_allowed(struct mwifiex_private *priv,
@@ -182,22 +166,6 @@ mwifiex_find_stream_to_delete(struct mwifiex_private *priv, int ptr_tid,
 }
 
 /*
- * This function checks whether BA stream is set up or not.
- */
-static inline int
-mwifiex_is_ba_stream_setup(struct mwifiex_private *priv,
-                           struct mwifiex_ra_list_tbl *ptr, int tid)
-{
-        struct mwifiex_tx_ba_stream_tbl *tx_tbl;
-
-        tx_tbl = mwifiex_get_ba_tbl(priv, tid, ptr->ra);
-        if (tx_tbl && IS_BASTREAM_SETUP(tx_tbl))
-                return true;
-
-        return false;
-}
-
-/*
  * This function checks whether associated station is 11n enabled
  */
 static inline int mwifiex_is_sta_11n_enabled(struct mwifiex_private *priv,
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index 9b983b5cebbd..6183e255e62a 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -170,7 +170,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
         struct mwifiex_adapter *adapter = priv->adapter;
         struct sk_buff *skb_aggr, *skb_src;
         struct mwifiex_txinfo *tx_info_aggr, *tx_info_src;
-        int pad = 0, ret;
+        int pad = 0, aggr_num = 0, ret;
         struct mwifiex_tx_param tx_param;
         struct txpd *ptx_pd = NULL;
         struct timeval tv;
@@ -184,7 +184,8 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
         }
 
         tx_info_src = MWIFIEX_SKB_TXCB(skb_src);
-        skb_aggr = dev_alloc_skb(adapter->tx_buf_size);
+        skb_aggr = mwifiex_alloc_dma_align_buf(adapter->tx_buf_size,
+                                               GFP_ATOMIC | GFP_DMA);
         if (!skb_aggr) {
                 dev_err(adapter->dev, "%s: alloc skb_aggr\n", __func__);
                 spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
@@ -200,6 +201,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
 
         if (tx_info_src->flags & MWIFIEX_BUF_FLAG_TDLS_PKT)
                 tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_TDLS_PKT;
+        tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_AGGR_PKT;
         skb_aggr->priority = skb_src->priority;
 
         do_gettimeofday(&tv);
@@ -211,11 +213,9 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
                         break;
 
                 skb_src = skb_dequeue(&pra_list->skb_head);
-
                 pra_list->total_pkt_count--;
-
                 atomic_dec(&priv->wmm.tx_pkts_queued);
-
+                aggr_num++;
                 spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
                                        ra_list_flags);
                 mwifiex_11n_form_amsdu_pkt(skb_aggr, skb_src, &pad);
@@ -251,6 +251,12 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
                 ptx_pd = (struct txpd *)skb_aggr->data;
 
         skb_push(skb_aggr, headroom);
+        tx_info_aggr->aggr_num = aggr_num * 2;
+        if (adapter->data_sent || adapter->tx_lock_flag) {
+                atomic_add(aggr_num * 2, &adapter->tx_queued);
+                skb_queue_tail(&adapter->tx_data_q, skb_aggr);
+                return 0;
+        }
 
         if (adapter->iface_type == MWIFIEX_USB) {
                 adapter->data_sent = true;
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
index a2e8817b56d8..f75f8acfaca0 100644
--- a/drivers/net/wireless/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -659,6 +659,7 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac,
 {
         struct mwifiex_rx_reorder_tbl *tbl;
         struct mwifiex_tx_ba_stream_tbl *ptx_tbl;
+        struct mwifiex_ra_list_tbl *ra_list;
         u8 cleanup_rx_reorder_tbl;
         unsigned long flags;
 
@@ -686,7 +687,11 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac,
                                 "event: TID, RA not found in table\n");
                         return;
                 }
-
+                ra_list = mwifiex_wmm_get_ralist_node(priv, tid, peer_mac);
+                if (ra_list) {
+                        ra_list->amsdu_in_ampdu = false;
+                        ra_list->ba_status = BA_SETUP_NONE;
+                }
                 spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
                 mwifiex_11n_delete_tx_ba_stream_tbl_entry(priv, ptx_tbl);
                 spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 41c8e25df954..bf9020ff2d33 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -717,6 +717,9 @@ mwifiex_cfg80211_init_p2p_go(struct mwifiex_private *priv)
 
 static int mwifiex_deinit_priv_params(struct mwifiex_private *priv)
 {
+        struct mwifiex_adapter *adapter = priv->adapter;
+        unsigned long flags;
+
         priv->mgmt_frame_mask = 0;
         if (mwifiex_send_cmd(priv, HostCmd_CMD_MGMT_FRAME_REG,
                              HostCmd_ACT_GEN_SET, 0,
@@ -727,6 +730,25 @@ static int mwifiex_deinit_priv_params(struct mwifiex_private *priv)
         }
 
         mwifiex_deauthenticate(priv, NULL);
+
+        spin_lock_irqsave(&adapter->main_proc_lock, flags);
+        adapter->main_locked = true;
+        if (adapter->mwifiex_processing) {
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+                flush_workqueue(adapter->workqueue);
+        } else {
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+        }
+
+        spin_lock_irqsave(&adapter->rx_proc_lock, flags);
+        adapter->rx_locked = true;
+        if (adapter->rx_processing) {
+                spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+                flush_workqueue(adapter->rx_workqueue);
+        } else {
+        spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+        }
+
         mwifiex_free_priv(priv);
         priv->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
         priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
@@ -740,6 +762,9 @@ mwifiex_init_new_priv_params(struct mwifiex_private *priv,
                              struct net_device *dev,
                              enum nl80211_iftype type)
 {
+        struct mwifiex_adapter *adapter = priv->adapter;
+        unsigned long flags;
+
         mwifiex_init_priv(priv);
 
         priv->bss_mode = type;
@@ -770,6 +795,14 @@ mwifiex_init_new_priv_params(struct mwifiex_private *priv,
                 return -EOPNOTSUPP;
         }
 
+        spin_lock_irqsave(&adapter->main_proc_lock, flags);
+        adapter->main_locked = false;
+        spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+
+        spin_lock_irqsave(&adapter->rx_proc_lock, flags);
+        adapter->rx_locked = false;
+        spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+
         return 0;
 }
 
@@ -1563,7 +1596,7 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,
 
         wiphy_dbg(wiphy, "%s: mac address %pM\n", __func__, params->mac);
 
-        memset(deauth_mac, 0, ETH_ALEN);
+        eth_zero_addr(deauth_mac);
 
         spin_lock_irqsave(&priv->sta_list_spinlock, flags);
         sta_node = mwifiex_get_sta_entry(priv, params->mac);
@@ -1786,7 +1819,7 @@ mwifiex_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
         wiphy_dbg(wiphy, "info: successfully disconnected from %pM:"
                 " reason code %d\n", priv->cfg_bssid, reason_code);
 
-        memset(priv->cfg_bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->cfg_bssid);
         priv->hs2_enabled = false;
 
         return 0;
@@ -1954,13 +1987,13 @@ done:
                 if (mode == NL80211_IFTYPE_ADHOC)
                         bss = cfg80211_get_bss(priv->wdev.wiphy, channel,
                                                bssid, ssid, ssid_len,
-                                               WLAN_CAPABILITY_IBSS,
-                                               WLAN_CAPABILITY_IBSS);
+                                               IEEE80211_BSS_TYPE_IBSS,
+                                               IEEE80211_PRIVACY_ANY);
                 else
                         bss = cfg80211_get_bss(priv->wdev.wiphy, channel,
                                                bssid, ssid, ssid_len,
-                                               WLAN_CAPABILITY_ESS,
-                                               WLAN_CAPABILITY_ESS);
+                                               IEEE80211_BSS_TYPE_ESS,
+                                               IEEE80211_PRIVACY_ANY);
 
                 if (!bss) {
                         if (is_scanning_required) {
@@ -2046,7 +2079,7 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
                 dev_dbg(priv->adapter->dev,
                         "info: association to bssid %pM failed\n",
                         priv->cfg_bssid);
-                memset(priv->cfg_bssid, 0, ETH_ALEN);
+                eth_zero_addr(priv->cfg_bssid);
 
                 if (ret > 0)
                         cfg80211_connect_result(priv->netdev, priv->cfg_bssid,
@@ -2194,7 +2227,7 @@ mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
         if (mwifiex_deauthenticate(priv, NULL))
                 return -EFAULT;
 
-        memset(priv->cfg_bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->cfg_bssid);
 
         return 0;
 }
@@ -2397,12 +2430,12 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
         ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
 }
 
-#define MWIFIEX_MAX_WQ_LEN  30
 /*
- *  create a new virtual interface with the given name
+ *  create a new virtual interface with the given name and name assign type
  */
 struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                                               const char *name,
+                                              unsigned char name_assign_type,
                                               enum nl80211_iftype type,
                                               u32 *flags,
                                               struct vif_params *params)
@@ -2411,7 +2444,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         struct mwifiex_private *priv;
         struct net_device *dev;
         void *mdev_priv;
-        char dfs_cac_str[MWIFIEX_MAX_WQ_LEN], dfs_chsw_str[MWIFIEX_MAX_WQ_LEN];
 
         if (!adapter)
                 return ERR_PTR(-EFAULT);
@@ -2523,7 +2555,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         }
 
         dev = alloc_netdev_mqs(sizeof(struct mwifiex_private *), name,
-                               NET_NAME_UNKNOWN, ether_setup,
+                               name_assign_type, ether_setup,
                                IEEE80211_NUM_ACS, 1);
         if (!dev) {
                 wiphy_err(wiphy, "no memory available for netdevice\n");
@@ -2576,12 +2608,10 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 return ERR_PTR(-EFAULT);
         }
 
-        strcpy(dfs_cac_str, "MWIFIEX_DFS_CAC");
-        strcat(dfs_cac_str, name);
-        priv->dfs_cac_workqueue = alloc_workqueue(dfs_cac_str,
+        priv->dfs_cac_workqueue = alloc_workqueue("MWIFIEX_DFS_CAC%s",
                                                   WQ_HIGHPRI |
                                                   WQ_MEM_RECLAIM |
-                                                  WQ_UNBOUND, 1);
+                                                  WQ_UNBOUND, 1, name);
         if (!priv->dfs_cac_workqueue) {
                 wiphy_err(wiphy, "cannot register virtual network device\n");
                 free_netdev(dev);
@@ -2594,11 +2624,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
 
         INIT_DELAYED_WORK(&priv->dfs_cac_work, mwifiex_dfs_cac_work_queue);
 
-        strcpy(dfs_chsw_str, "MWIFIEX_DFS_CHSW");
-        strcat(dfs_chsw_str, name);
-        priv->dfs_chan_sw_workqueue = alloc_workqueue(dfs_chsw_str,
+        priv->dfs_chan_sw_workqueue = alloc_workqueue("MWIFIEX_DFS_CHSW%s",
                                                       WQ_HIGHPRI | WQ_UNBOUND |
-                                                      WQ_MEM_RECLAIM, 1);
+                                                      WQ_MEM_RECLAIM, 1, name);
         if (!priv->dfs_chan_sw_workqueue) {
                 wiphy_err(wiphy, "cannot register virtual network device\n");
                 free_netdev(dev);
@@ -2738,24 +2766,71 @@ mwifiex_is_pattern_supported(struct cfg80211_pkt_pattern *pat, s8 *byte_seq,
 }
 
 #ifdef CONFIG_PM
-static int mwifiex_set_mef_filter(struct mwifiex_private *priv,
-                                  struct cfg80211_wowlan *wowlan)
+static void mwifiex_set_auto_arp_mef_entry(struct mwifiex_private *priv,
+                                           struct mwifiex_mef_entry *mef_entry)
+{
+        int i, filt_num = 0, num_ipv4 = 0;
+        struct in_device *in_dev;
+        struct in_ifaddr *ifa;
+        __be32 ips[MWIFIEX_MAX_SUPPORTED_IPADDR];
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        mef_entry->mode = MEF_MODE_HOST_SLEEP;
+        mef_entry->action = MEF_ACTION_AUTO_ARP;
+
+        /* Enable ARP offload feature */
+        memset(ips, 0, sizeof(ips));
+        for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++) {
+                if (adapter->priv[i]->netdev) {
+                        in_dev = __in_dev_get_rtnl(adapter->priv[i]->netdev);
+                        if (!in_dev)
+                                continue;
+                        ifa = in_dev->ifa_list;
+                        if (!ifa || !ifa->ifa_local)
+                                continue;
+                        ips[i] = ifa->ifa_local;
+                        num_ipv4++;
+                }
+        }
+
+        for (i = 0; i < num_ipv4; i++) {
+                if (!ips[i])
+                        continue;
+                mef_entry->filter[filt_num].repeat = 1;
+                memcpy(mef_entry->filter[filt_num].byte_seq,
+                       (u8 *)&ips[i], sizeof(ips[i]));
+                mef_entry->filter[filt_num].
+                        byte_seq[MWIFIEX_MEF_MAX_BYTESEQ] =
+                        sizeof(ips[i]);
+                mef_entry->filter[filt_num].offset = 46;
+                mef_entry->filter[filt_num].filt_type = TYPE_EQ;
+                if (filt_num) {
+                        mef_entry->filter[filt_num].filt_action =
+                                TYPE_OR;
+                }
+                filt_num++;
+        }
+
+        mef_entry->filter[filt_num].repeat = 1;
+        mef_entry->filter[filt_num].byte_seq[0] = 0x08;
+        mef_entry->filter[filt_num].byte_seq[1] = 0x06;
+        mef_entry->filter[filt_num].byte_seq[MWIFIEX_MEF_MAX_BYTESEQ] = 2;
+        mef_entry->filter[filt_num].offset = 20;
+        mef_entry->filter[filt_num].filt_type = TYPE_EQ;
+        mef_entry->filter[filt_num].filt_action = TYPE_AND;
+}
+
+static int mwifiex_set_wowlan_mef_entry(struct mwifiex_private *priv,
+                                        struct mwifiex_ds_mef_cfg *mef_cfg,
+                                        struct mwifiex_mef_entry *mef_entry,
+                                        struct cfg80211_wowlan *wowlan)
 {
         int i, filt_num = 0, ret = 0;
         bool first_pat = true;
         u8 byte_seq[MWIFIEX_MEF_MAX_BYTESEQ + 1];
         const u8 ipv4_mc_mac[] = {0x33, 0x33};
         const u8 ipv6_mc_mac[] = {0x01, 0x00, 0x5e};
-        struct mwifiex_ds_mef_cfg mef_cfg;
-        struct mwifiex_mef_entry *mef_entry;
 
-        mef_entry = kzalloc(sizeof(*mef_entry), GFP_KERNEL);
-        if (!mef_entry)
-                return -ENOMEM;
-
-        memset(&mef_cfg, 0, sizeof(mef_cfg));
-        mef_cfg.num_entries = 1;
-        mef_cfg.mef_entry = mef_entry;
         mef_entry->mode = MEF_MODE_HOST_SLEEP;
         mef_entry->action = MEF_ACTION_ALLOW_AND_WAKEUP_HOST;
 
@@ -2772,20 +2847,19 @@ static int mwifiex_set_mef_filter(struct mwifiex_private *priv,
                 if (!wowlan->patterns[i].pkt_offset) {
                         if (!(byte_seq[0] & 0x01) &&
                             (byte_seq[MWIFIEX_MEF_MAX_BYTESEQ] == 1)) {
-                                mef_cfg.criteria |= MWIFIEX_CRITERIA_UNICAST;
+                                mef_cfg->criteria |= MWIFIEX_CRITERIA_UNICAST;
                                 continue;
                         } else if (is_broadcast_ether_addr(byte_seq)) {
-                                mef_cfg.criteria |= MWIFIEX_CRITERIA_BROADCAST;
+                                mef_cfg->criteria |= MWIFIEX_CRITERIA_BROADCAST;
                                 continue;
                         } else if ((!memcmp(byte_seq, ipv4_mc_mac, 2) &&
                                     (byte_seq[MWIFIEX_MEF_MAX_BYTESEQ] == 2)) ||
                                    (!memcmp(byte_seq, ipv6_mc_mac, 3) &&
                                     (byte_seq[MWIFIEX_MEF_MAX_BYTESEQ] == 3))) {
-                                mef_cfg.criteria |= MWIFIEX_CRITERIA_MULTICAST;
+                                mef_cfg->criteria |= MWIFIEX_CRITERIA_MULTICAST;
                                 continue;
                         }
                 }
-
                 mef_entry->filter[filt_num].repeat = 1;
                 mef_entry->filter[filt_num].offset =
                         wowlan->patterns[i].pkt_offset;
@@ -2802,7 +2876,7 @@ static int mwifiex_set_mef_filter(struct mwifiex_private *priv,
         }
 
         if (wowlan->magic_pkt) {
-                mef_cfg.criteria |= MWIFIEX_CRITERIA_UNICAST;
+                mef_cfg->criteria |= MWIFIEX_CRITERIA_UNICAST;
                 mef_entry->filter[filt_num].repeat = 16;
                 memcpy(mef_entry->filter[filt_num].byte_seq, priv->curr_addr,
                                 ETH_ALEN);
@@ -2823,6 +2897,34 @@ static int mwifiex_set_mef_filter(struct mwifiex_private *priv,
                 mef_entry->filter[filt_num].filt_type = TYPE_EQ;
                 mef_entry->filter[filt_num].filt_action = TYPE_OR;
         }
+        return ret;
+}
+
+static int mwifiex_set_mef_filter(struct mwifiex_private *priv,
+                                  struct cfg80211_wowlan *wowlan)
+{
+        int ret = 0, num_entries = 1;
+        struct mwifiex_ds_mef_cfg mef_cfg;
+        struct mwifiex_mef_entry *mef_entry;
+
+        if (wowlan->n_patterns || wowlan->magic_pkt)
+                num_entries++;
+
+        mef_entry = kcalloc(num_entries, sizeof(*mef_entry), GFP_KERNEL);
+        if (!mef_entry)
+                return -ENOMEM;
+
+        memset(&mef_cfg, 0, sizeof(mef_cfg));
+        mef_cfg.criteria |= MWIFIEX_CRITERIA_BROADCAST |
+                MWIFIEX_CRITERIA_UNICAST;
+        mef_cfg.num_entries = num_entries;
+        mef_cfg.mef_entry = mef_entry;
+
+        mwifiex_set_auto_arp_mef_entry(priv, &mef_entry[0]);
+
+        if (wowlan->n_patterns || wowlan->magic_pkt)
+                ret = mwifiex_set_wowlan_mef_entry(priv, &mef_cfg,
+                                                   &mef_entry[1], wowlan);
 
         if (!mef_cfg.criteria)
                 mef_cfg.criteria = MWIFIEX_CRITERIA_BROADCAST |
@@ -2830,8 +2932,8 @@ static int mwifiex_set_mef_filter(struct mwifiex_private *priv,
                         MWIFIEX_CRITERIA_MULTICAST;
 
         ret = mwifiex_send_cmd(priv, HostCmd_CMD_MEF_CFG,
-                        HostCmd_ACT_GEN_SET, 0, &mef_cfg, true);
-
+                        HostCmd_ACT_GEN_SET, 0,
+                        &mef_cfg, true);
         kfree(mef_entry);
         return ret;
 }
@@ -2841,27 +2943,33 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
 {
         struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
         struct mwifiex_ds_hs_cfg hs_cfg;
-        int ret = 0;
-        struct mwifiex_private *priv =
-                        mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
+        int i, ret = 0;
+        struct mwifiex_private *priv;
+
+        for (i = 0; i < adapter->priv_num; i++) {
+                priv = adapter->priv[i];
+                mwifiex_abort_cac(priv);
+        }
+
+        mwifiex_cancel_all_pending_cmd(adapter);
 
         if (!wowlan) {
                 dev_warn(adapter->dev, "None of the WOWLAN triggers enabled\n");
                 return 0;
         }
 
+        priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
+
         if (!priv->media_connected) {
                 dev_warn(adapter->dev,
                          "Can not configure WOWLAN in disconnected state\n");
                 return 0;
         }
 
-        if (wowlan->n_patterns || wowlan->magic_pkt) {
-                ret = mwifiex_set_mef_filter(priv, wowlan);
-                if (ret) {
-                        dev_err(adapter->dev, "Failed to set MEF filter\n");
-                        return ret;
-                }
+        ret = mwifiex_set_mef_filter(priv, wowlan);
+        if (ret) {
+                dev_err(adapter->dev, "Failed to set MEF filter\n");
+                return ret;
         }
 
         if (wowlan->disconnect) {
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index 88d0eade6bb1..38f24e0427d2 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -33,6 +33,7 @@
 #define MWIFIEX_MAX_BSS_NUM         (3)
 
 #define MWIFIEX_DMA_ALIGN_SZ        64
+#define MWIFIEX_RX_HEADROOM         64
 #define MAX_TXPD_SZ                 32
 #define INTF_HDR_ALIGN               4
 
@@ -82,6 +83,7 @@
 #define MWIFIEX_BUF_FLAG_TDLS_PKT          BIT(2)
 #define MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS   BIT(3)
 #define MWIFIEX_BUF_FLAG_ACTION_TX_STATUS  BIT(4)
+#define MWIFIEX_BUF_FLAG_AGGR_PKT          BIT(5)
 
 #define MWIFIEX_BRIDGED_PKTS_THR_HIGH      1024
 #define MWIFIEX_BRIDGED_PKTS_THR_LOW        128
@@ -110,6 +112,11 @@
 
 #define MWIFIEX_A_BAND_START_FREQ       5000
 
+/* SDIO Aggr data packet special info */
+#define SDIO_MAX_AGGR_BUF_SIZE          (256 * 255)
+#define BLOCK_NUMBER_OFFSET             15
+#define SDIO_HEADER_OFFSET              28
+
 enum mwifiex_bss_type {
         MWIFIEX_BSS_TYPE_STA = 0,
         MWIFIEX_BSS_TYPE_UAP = 1,
@@ -167,10 +174,11 @@ struct mwifiex_wait_queue {
 };
 
 struct mwifiex_rxinfo {
+        struct sk_buff *parent;
         u8 bss_num;
         u8 bss_type;
-        struct sk_buff *parent;
         u8 use_count;
+        u8 buf_type;
 };
 
 struct mwifiex_txinfo {
@@ -178,6 +186,7 @@ struct mwifiex_txinfo {
         u8 flags;
         u8 bss_num;
         u8 bss_type;
+        u8 aggr_num;
         u32 pkt_len;
         u8 ack_frame_id;
         u64 cookie;
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index df553e86a0ad..59d8964dd0dc 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -197,6 +197,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 
 #define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & BIT(11))
 #define ISSUPP_TDLS_ENABLED(FwCapInfo) (FwCapInfo & BIT(14))
+#define ISSUPP_SDIO_SPA_ENABLED(FwCapInfo) (FwCapInfo & BIT(16))
 
 #define MWIFIEX_DEF_HT_CAP      (IEEE80211_HT_CAP_DSSSCCK40 | \
                                  (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT) | \
@@ -353,6 +354,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define HostCmd_CMD_REMAIN_ON_CHAN                    0x010d
 #define HostCmd_CMD_11AC_CFG                          0x0112
 #define HostCmd_CMD_TDLS_OPER                         0x0122
+#define HostCmd_CMD_SDIO_SP_RX_AGGR_CFG               0x0223
 
 #define PROTOCOL_NO_SECURITY        0x01
 #define PROTOCOL_STATIC_WEP         0x02
@@ -523,9 +525,11 @@ enum P2P_MODES {
 #define TYPE_OR                         (MAX_OPERAND+5)
 #define MEF_MODE_HOST_SLEEP                     1
 #define MEF_ACTION_ALLOW_AND_WAKEUP_HOST        3
+#define MEF_ACTION_AUTO_ARP                    0x10
 #define MWIFIEX_CRITERIA_BROADCAST      BIT(0)
 #define MWIFIEX_CRITERIA_UNICAST        BIT(1)
 #define MWIFIEX_CRITERIA_MULTICAST      BIT(3)
+#define MWIFIEX_MAX_SUPPORTED_IPADDR              4
 
 #define ACT_TDLS_DELETE            0x00
 #define ACT_TDLS_CREATE            0x01
@@ -1240,6 +1244,12 @@ struct host_cmd_ds_chan_rpt_event {
         u8 tlvbuf[0];
 } __packed;
 
+struct host_cmd_sdio_sp_rx_aggr_cfg {
+        u8 action;
+        u8 enable;
+        __le16 block_size;
+} __packed;
+
 struct mwifiex_fixed_bcn_param {
         __le64 timestamp;
         __le16 beacon_period;
@@ -1962,6 +1972,7 @@ struct host_cmd_ds_command {
                 struct host_cmd_ds_coalesce_cfg coalesce_cfg;
                 struct host_cmd_ds_tdls_oper tdls_oper;
                 struct host_cmd_ds_chan_rpt_req chan_rpt_req;
+                struct host_cmd_sdio_sp_rx_aggr_cfg sdio_rx_aggr_cfg;
         } params;
 } __packed;
 
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index b77ba743e1c4..e12192f5cfad 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -76,7 +76,7 @@ int mwifiex_init_priv(struct mwifiex_private *priv)
         u32 i;
 
         priv->media_connected = false;
-        memset(priv->curr_addr, 0xff, ETH_ALEN);
+        eth_broadcast_addr(priv->curr_addr);
 
         priv->pkt_tx_ctrl = 0;
         priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
@@ -266,18 +266,15 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
 
         mwifiex_wmm_init(adapter);
 
-        if (adapter->sleep_cfm) {
-                sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *)
-                                                adapter->sleep_cfm->data;
-                memset(sleep_cfm_buf, 0, adapter->sleep_cfm->len);
-                sleep_cfm_buf->command =
-                                cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH);
-                sleep_cfm_buf->size =
-                                cpu_to_le16(adapter->sleep_cfm->len);
-                sleep_cfm_buf->result = 0;
-                sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM);
-                sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED);
-        }
+        sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *)
+                                        adapter->sleep_cfm->data;
+        memset(sleep_cfm_buf, 0, adapter->sleep_cfm->len);
+        sleep_cfm_buf->command = cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH);
+        sleep_cfm_buf->size = cpu_to_le16(adapter->sleep_cfm->len);
+        sleep_cfm_buf->result = 0;
+        sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM);
+        sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED);
+
         memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params));
         memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period));
         adapter->tx_lock_flag = false;
@@ -296,10 +293,9 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
         memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
         adapter->arp_filter_size = 0;
         adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
-        adapter->ext_scan = false;
         adapter->key_api_major_ver = 0;
         adapter->key_api_minor_ver = 0;
-        memset(adapter->perm_addr, 0xff, ETH_ALEN);
+        eth_broadcast_addr(adapter->perm_addr);
         adapter->iface_limit.sta_intf = MWIFIEX_MAX_STA_NUM;
         adapter->iface_limit.uap_intf = MWIFIEX_MAX_UAP_NUM;
         adapter->iface_limit.p2p_intf = MWIFIEX_MAX_P2P_NUM;
@@ -482,6 +478,7 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
         spin_lock_init(&adapter->rx_proc_lock);
 
         skb_queue_head_init(&adapter->rx_data_q);
+        skb_queue_head_init(&adapter->tx_data_q);
 
         for (i = 0; i < adapter->priv_num; ++i) {
                 INIT_LIST_HEAD(&adapter->bss_prio_tbl[i].bss_prio_head);
@@ -689,6 +686,10 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
                 }
         }
 
+        atomic_set(&adapter->tx_queued, 0);
+        while ((skb = skb_dequeue(&adapter->tx_data_q)))
+                mwifiex_write_data_complete(adapter, skb, 0, 0);
+
         spin_lock_irqsave(&adapter->rx_proc_lock, flags);
 
         while ((skb = skb_dequeue(&adapter->rx_data_q))) {
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 7e74b4fccddd..03a95c7d34bf 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -131,10 +131,39 @@ static int mwifiex_unregister(struct mwifiex_adapter *adapter)
         return 0;
 }
 
+void mwifiex_queue_main_work(struct mwifiex_adapter *adapter)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->main_proc_lock, flags);
+        if (adapter->mwifiex_processing) {
+                adapter->more_task_flag = true;
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+        } else {
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+                queue_work(adapter->workqueue, &adapter->main_work);
+        }
+}
+EXPORT_SYMBOL_GPL(mwifiex_queue_main_work);
+
+static void mwifiex_queue_rx_work(struct mwifiex_adapter *adapter)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->rx_proc_lock, flags);
+        if (adapter->rx_processing) {
+                spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+        } else {
+                spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+                queue_work(adapter->rx_workqueue, &adapter->rx_work);
+        }
+}
+
 static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
 {
         unsigned long flags;
         struct sk_buff *skb;
+        struct mwifiex_rxinfo *rx_info;
 
         spin_lock_irqsave(&adapter->rx_proc_lock, flags);
         if (adapter->rx_processing || adapter->rx_locked) {
@@ -154,9 +183,16 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
                         if (adapter->if_ops.submit_rem_rx_urbs)
                                 adapter->if_ops.submit_rem_rx_urbs(adapter);
                         adapter->delay_main_work = false;
-                        queue_work(adapter->workqueue, &adapter->main_work);
+                        mwifiex_queue_main_work(adapter);
+                }
+                rx_info = MWIFIEX_SKB_RXCB(skb);
+                if (rx_info->buf_type == MWIFIEX_TYPE_AGGR_DATA) {
+                        if (adapter->if_ops.deaggr_pkt)
+                                adapter->if_ops.deaggr_pkt(adapter, skb);
+                        dev_kfree_skb_any(skb);
+                } else {
+                        mwifiex_handle_rx_packet(adapter, skb);
                 }
-                mwifiex_handle_rx_packet(adapter, skb);
         }
         spin_lock_irqsave(&adapter->rx_proc_lock, flags);
         adapter->rx_processing = false;
@@ -189,15 +225,17 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
         spin_lock_irqsave(&adapter->main_proc_lock, flags);
 
         /* Check if already processing */
-        if (adapter->mwifiex_processing) {
+        if (adapter->mwifiex_processing || adapter->main_locked) {
+                adapter->more_task_flag = true;
                 spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
                 goto exit_main_proc;
         } else {
                 adapter->mwifiex_processing = true;
-                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
         }
 process_start:
         do {
+                adapter->more_task_flag = false;
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
                 if ((adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) ||
                     (adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY))
                         break;
@@ -212,9 +250,7 @@ process_start:
                 if (atomic_read(&adapter->rx_pending) >= HIGH_RX_PENDING &&
                     adapter->iface_type != MWIFIEX_USB) {
                         adapter->delay_main_work = true;
-                        if (!adapter->rx_processing)
-                                queue_work(adapter->rx_workqueue,
-                                           &adapter->rx_work);
+                        mwifiex_queue_rx_work(adapter);
                         break;
                 }
 
@@ -227,24 +263,26 @@ process_start:
                 }
 
                 if (adapter->rx_work_enabled && adapter->data_received)
-                        queue_work(adapter->rx_workqueue, &adapter->rx_work);
+                        mwifiex_queue_rx_work(adapter);
 
                 /* Need to wake up the card ? */
                 if ((adapter->ps_state == PS_STATE_SLEEP) &&
                     (adapter->pm_wakeup_card_req &&
                      !adapter->pm_wakeup_fw_try) &&
                     (is_command_pending(adapter) ||
+                     !skb_queue_empty(&adapter->tx_data_q) ||
                      !mwifiex_wmm_lists_empty(adapter))) {
                         adapter->pm_wakeup_fw_try = true;
                         mod_timer(&adapter->wakeup_timer, jiffies + (HZ*3));
                         adapter->if_ops.wakeup(adapter);
+                        spin_lock_irqsave(&adapter->main_proc_lock, flags);
                         continue;
                 }
 
                 if (IS_CARD_RX_RCVD(adapter)) {
                         adapter->data_received = false;
                         adapter->pm_wakeup_fw_try = false;
-                        del_timer_sync(&adapter->wakeup_timer);
+                        del_timer(&adapter->wakeup_timer);
                         if (adapter->ps_state == PS_STATE_SLEEP)
                                 adapter->ps_state = PS_STATE_AWAKE;
                 } else {
@@ -257,7 +295,8 @@ process_start:
 
                         if ((!adapter->scan_chan_gap_enabled &&
                              adapter->scan_processing) || adapter->data_sent ||
-                            mwifiex_wmm_lists_empty(adapter)) {
+                            (mwifiex_wmm_lists_empty(adapter) &&
+                             skb_queue_empty(&adapter->tx_data_q))) {
                                 if (adapter->cmd_sent || adapter->curr_cmd ||
                                     (!is_command_pending(adapter)))
                                         break;
@@ -295,8 +334,10 @@ process_start:
                 if ((adapter->ps_state == PS_STATE_SLEEP) ||
                     (adapter->ps_state == PS_STATE_PRE_SLEEP) ||
                     (adapter->ps_state == PS_STATE_SLEEP_CFM) ||
-                    adapter->tx_lock_flag)
+                    adapter->tx_lock_flag){
+                        spin_lock_irqsave(&adapter->main_proc_lock, flags);
                         continue;
+                }
 
                 if (!adapter->cmd_sent && !adapter->curr_cmd) {
                         if (mwifiex_exec_next_cmd(adapter) == -1) {
@@ -307,6 +348,20 @@ process_start:
 
                 if ((adapter->scan_chan_gap_enabled ||
                      !adapter->scan_processing) &&
+                    !adapter->data_sent &&
+                    !skb_queue_empty(&adapter->tx_data_q)) {
+                        mwifiex_process_tx_queue(adapter);
+                        if (adapter->hs_activated) {
+                                adapter->is_hs_configured = false;
+                                mwifiex_hs_activated_event
+                                        (mwifiex_get_priv
+                                        (adapter, MWIFIEX_BSS_ROLE_ANY),
+                                        false);
+                        }
+                }
+
+                if ((adapter->scan_chan_gap_enabled ||
+                     !adapter->scan_processing) &&
                     !adapter->data_sent && !mwifiex_wmm_lists_empty(adapter)) {
                         mwifiex_wmm_process_tx(adapter);
                         if (adapter->hs_activated) {
@@ -320,7 +375,8 @@ process_start:
 
                 if (adapter->delay_null_pkt && !adapter->cmd_sent &&
                     !adapter->curr_cmd && !is_command_pending(adapter) &&
-                    mwifiex_wmm_lists_empty(adapter)) {
+                    (mwifiex_wmm_lists_empty(adapter) &&
+                     skb_queue_empty(&adapter->tx_data_q))) {
                         if (!mwifiex_send_null_packet
                             (mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
                              MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET |
@@ -330,15 +386,12 @@ process_start:
                         }
                         break;
                 }
+                spin_lock_irqsave(&adapter->main_proc_lock, flags);
         } while (true);
 
         spin_lock_irqsave(&adapter->main_proc_lock, flags);
-        if (!adapter->delay_main_work &&
-            (adapter->int_status || IS_CARD_RX_RCVD(adapter))) {
-                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+        if (adapter->more_task_flag)
                 goto process_start;
-        }
-
         adapter->mwifiex_processing = false;
         spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 
@@ -466,7 +519,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
 
         rtnl_lock();
         /* Create station interface by default */
-        wdev = mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d",
+        wdev = mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d", NET_NAME_ENUM,
                                         NL80211_IFTYPE_STATION, NULL, NULL);
         if (IS_ERR(wdev)) {
                 dev_err(adapter->dev, "cannot create default STA interface\n");
@@ -475,7 +528,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
         }
 
         if (driver_mode & MWIFIEX_DRIVER_MODE_UAP) {
-                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "uap%d",
+                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "uap%d", NET_NAME_ENUM,
                                                 NL80211_IFTYPE_AP, NULL, NULL);
                 if (IS_ERR(wdev)) {
                         dev_err(adapter->dev, "cannot create AP interface\n");
@@ -485,7 +538,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
         }
 
         if (driver_mode & MWIFIEX_DRIVER_MODE_P2P) {
-                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "p2p%d",
+                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "p2p%d", NET_NAME_ENUM,
                                                 NL80211_IFTYPE_P2P_CLIENT, NULL,
                                                 NULL);
                 if (IS_ERR(wdev)) {
@@ -604,7 +657,7 @@ int mwifiex_queue_tx_pkt(struct mwifiex_private *priv, struct sk_buff *skb)
         atomic_inc(&priv->adapter->tx_pending);
         mwifiex_wmm_add_buf_txqueue(priv, skb);
 
-        queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
+        mwifiex_queue_main_work(priv->adapter);
 
         return 0;
 }
@@ -1096,9 +1149,6 @@ mwifiex_add_card(void *card, struct semaphore *sem,
                 INIT_WORK(&adapter->rx_work, mwifiex_rx_work_queue);
         }
 
-        if (adapter->if_ops.iface_work)
-                INIT_WORK(&adapter->iface_work, adapter->if_ops.iface_work);
-
         /* Register the device. Fill up the private data structure with relevant
            information from the card. */
         if (adapter->if_ops.register_dev(adapter)) {
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index f0a6af179af0..fe1256044a6c 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -35,6 +35,7 @@
 #include <linux/ctype.h>
 #include <linux/of.h>
 #include <linux/idr.h>
+#include <linux/inetdevice.h>
 
 #include "decl.h"
 #include "ioctl.h"
@@ -58,6 +59,8 @@ enum {
 
 #define MWIFIEX_MAX_AP                          64
 
+#define MWIFIEX_MAX_PKTS_TXQ                    16
+
 #define MWIFIEX_DEFAULT_WATCHDOG_TIMEOUT        (5 * HZ)
 
 #define MWIFIEX_TIMER_10S                       10000
@@ -118,6 +121,7 @@ enum {
 
 #define MWIFIEX_TYPE_CMD                                1
 #define MWIFIEX_TYPE_DATA                               0
+#define MWIFIEX_TYPE_AGGR_DATA                          10
 #define MWIFIEX_TYPE_EVENT                              3
 
 #define MAX_BITMAP_RATES_SIZE                   18
@@ -140,6 +144,9 @@ enum {
 
 #define MWIFIEX_DRV_INFO_SIZE_MAX 0x40000
 
+/* Address alignment */
+#define MWIFIEX_ALIGN_ADDR(p, a) (((long)(p) + (a) - 1) & ~((a) - 1))
+
 struct mwifiex_dbg {
         u32 num_cmd_host_to_card_failure;
         u32 num_cmd_sleep_cfm_host_to_card_failure;
@@ -207,6 +214,12 @@ struct mwifiex_tx_aggr {
         u8 amsdu;
 };
 
+enum mwifiex_ba_status {
+        BA_SETUP_NONE = 0,
+        BA_SETUP_INPROGRESS,
+        BA_SETUP_COMPLETE
+};
+
 struct mwifiex_ra_list_tbl {
         struct list_head list;
         struct sk_buff_head skb_head;
@@ -215,6 +228,8 @@ struct mwifiex_ra_list_tbl {
         u16 max_amsdu;
         u16 ba_pkt_count;
         u8 ba_packet_thr;
+        enum mwifiex_ba_status ba_status;
+        u8 amsdu_in_ampdu;
         u16 total_pkt_count;
         bool tdls_link;
 };
@@ -598,11 +613,6 @@ struct mwifiex_private {
         struct mwifiex_11h_intf_state state_11h;
 };
 
-enum mwifiex_ba_status {
-        BA_SETUP_NONE = 0,
-        BA_SETUP_INPROGRESS,
-        BA_SETUP_COMPLETE
-};
 
 struct mwifiex_tx_ba_stream_tbl {
         struct list_head list;
@@ -735,6 +745,7 @@ struct mwifiex_if_ops {
         int (*clean_pcie_ring) (struct mwifiex_adapter *adapter);
         void (*iface_work)(struct work_struct *work);
         void (*submit_rem_rx_urbs)(struct mwifiex_adapter *adapter);
+        void (*deaggr_pkt)(struct mwifiex_adapter *, struct sk_buff *);
 };
 
 struct mwifiex_adapter {
@@ -768,14 +779,18 @@ struct mwifiex_adapter {
         bool rx_processing;
         bool delay_main_work;
         bool rx_locked;
+        bool main_locked;
         struct mwifiex_bss_prio_tbl bss_prio_tbl[MWIFIEX_MAX_BSS_NUM];
         /* spin lock for init/shutdown */
         spinlock_t mwifiex_lock;
         /* spin lock for main process */
         spinlock_t main_proc_lock;
         u32 mwifiex_processing;
+        u8 more_task_flag;
         u16 tx_buf_size;
         u16 curr_tx_buf_size;
+        bool sdio_rx_aggr_enable;
+        u16 sdio_rx_block_size;
         u32 ioport;
         enum MWIFIEX_HARDWARE_STATUS hw_status;
         u16 number_of_antenna;
@@ -810,6 +825,8 @@ struct mwifiex_adapter {
         spinlock_t scan_pending_q_lock;
         /* spin lock for RX processing routine */
         spinlock_t rx_proc_lock;
+        struct sk_buff_head tx_data_q;
+        atomic_t tx_queued;
         u32 scan_processing;
         u16 region_code;
         struct mwifiex_802_11d_domain_reg domain_reg;
@@ -881,8 +898,6 @@ struct mwifiex_adapter {
         bool ext_scan;
         u8 fw_api_ver;
         u8 key_api_major_ver, key_api_minor_ver;
-        struct work_struct iface_work;
-        unsigned long iface_work_flags;
         struct memory_type_mapping *mem_type_mapping_tbl;
         u8 num_mem_types;
         u8 curr_mem_idx;
@@ -896,6 +911,8 @@ struct mwifiex_adapter {
         bool auto_tdls;
 };
 
+void mwifiex_process_tx_queue(struct mwifiex_adapter *adapter);
+
 int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
 
 void mwifiex_set_trans_start(struct net_device *dev);
@@ -1318,6 +1335,7 @@ u8 mwifiex_chan_type_to_sec_chan_offset(enum nl80211_channel_type chan_type);
 
 struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                                               const char *name,
+                                              unsigned char name_assign_type,
                                               enum nl80211_iftype type,
                                               u32 *flags,
                                               struct vif_params *params);
@@ -1417,6 +1435,8 @@ u8 mwifiex_adjust_data_rate(struct mwifiex_private *priv,
                             u8 rx_rate, u8 ht_info);
 
 void mwifiex_dump_drv_info(struct mwifiex_adapter *adapter);
+void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags);
+void mwifiex_queue_main_work(struct mwifiex_adapter *adapter);
 
 #ifdef CONFIG_DEBUG_FS
 void mwifiex_debugfs_init(void);
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index a5828da59365..bcc7751d883c 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -203,7 +203,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
                 card->pcie.reg = data->reg;
                 card->pcie.blksz_fw_dl = data->blksz_fw_dl;
                 card->pcie.tx_buf_size = data->tx_buf_size;
-                card->pcie.supports_fw_dump = data->supports_fw_dump;
+                card->pcie.can_dump_fw = data->can_dump_fw;
                 card->pcie.can_ext_scan = data->can_ext_scan;
         }
 
@@ -234,8 +234,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
         if (!adapter || !adapter->priv_num)
                 return;
 
-        cancel_work_sync(&adapter->iface_work);
-
         if (user_rmmod) {
 #ifdef CONFIG_PM_SLEEP
                 if (adapter->is_suspended)
@@ -498,7 +496,8 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter)
 
         for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) {
                 /* Allocate skb here so that firmware can DMA data from it */
-                skb = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE);
+                skb = mwifiex_alloc_dma_align_buf(MWIFIEX_RX_DATA_BUF_SIZE,
+                                                  GFP_KERNEL | GFP_DMA);
                 if (!skb) {
                         dev_err(adapter->dev,
                                 "Unable to allocate skb for RX ring.\n");
@@ -1297,7 +1296,8 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
                         }
                 }
 
-                skb_tmp = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE);
+                skb_tmp = mwifiex_alloc_dma_align_buf(MWIFIEX_RX_DATA_BUF_SIZE,
+                                                      GFP_KERNEL | GFP_DMA);
                 if (!skb_tmp) {
                         dev_err(adapter->dev,
                                 "Unable to allocate skb.\n");
@@ -2099,7 +2099,7 @@ static irqreturn_t mwifiex_pcie_interrupt(int irq, void *context)
                 goto exit;
 
         mwifiex_interrupt_status(adapter);
-        queue_work(adapter->workqueue, &adapter->main_work);
+        mwifiex_queue_main_work(adapter);
 
 exit:
         return IRQ_HANDLED;
@@ -2271,7 +2271,7 @@ static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter)
         int ret;
         static char *env[] = { "DRIVER=mwifiex_pcie", "EVENT=fw_dump", NULL };
 
-        if (!card->pcie.supports_fw_dump)
+        if (!card->pcie.can_dump_fw)
                 return;
 
         for (idx = 0; idx < ARRAY_SIZE(mem_type_mapping_tbl); idx++) {
@@ -2371,25 +2371,26 @@ done:
         adapter->curr_mem_idx = 0;
 }
 
+static unsigned long iface_work_flags;
+static struct mwifiex_adapter *save_adapter;
 static void mwifiex_pcie_work(struct work_struct *work)
 {
-        struct mwifiex_adapter *adapter =
-                        container_of(work, struct mwifiex_adapter, iface_work);
-
         if (test_and_clear_bit(MWIFIEX_IFACE_WORK_FW_DUMP,
-                               &adapter->iface_work_flags))
-                mwifiex_pcie_fw_dump_work(adapter);
+                               &iface_work_flags))
+                mwifiex_pcie_fw_dump_work(save_adapter);
 }
 
+static DECLARE_WORK(pcie_work, mwifiex_pcie_work);
 /* This function dumps FW information */
 static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter)
 {
-        if (test_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &adapter->iface_work_flags))
+        save_adapter = adapter;
+        if (test_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags))
                 return;
 
-        set_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &adapter->iface_work_flags);
+        set_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags);
 
-        schedule_work(&adapter->iface_work);
+        schedule_work(&pcie_work);
 }
 
 /*
@@ -2617,7 +2618,6 @@ static struct mwifiex_if_ops pcie_ops = {
         .init_fw_port =                 mwifiex_pcie_init_fw_port,
         .clean_pcie_ring =              mwifiex_clean_pcie_ring_buf,
         .fw_dump =                      mwifiex_pcie_fw_dump,
-        .iface_work =                   mwifiex_pcie_work,
 };
 
 /*
@@ -2663,6 +2663,7 @@ static void mwifiex_pcie_cleanup_module(void)
         /* Set the flag as user is removing this module. */
         user_rmmod = 1;
 
+        cancel_work_sync(&pcie_work);
         pci_unregister_driver(&mwifiex_pcie);
 }
 
diff --git a/drivers/net/wireless/mwifiex/pcie.h b/drivers/net/wireless/mwifiex/pcie.h
index 666d40e9dbc3..0e7ee8b72358 100644
--- a/drivers/net/wireless/mwifiex/pcie.h
+++ b/drivers/net/wireless/mwifiex/pcie.h
@@ -205,7 +205,7 @@ struct mwifiex_pcie_device {
         const struct mwifiex_pcie_card_reg *reg;
         u16 blksz_fw_dl;
         u16 tx_buf_size;
-        bool supports_fw_dump;
+        bool can_dump_fw;
         bool can_ext_scan;
 };
 
@@ -214,7 +214,7 @@ static const struct mwifiex_pcie_device mwifiex_pcie8766 = {
         .reg            = &mwifiex_reg_8766,
         .blksz_fw_dl = MWIFIEX_PCIE_BLOCK_SIZE_FW_DNLD,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
-        .supports_fw_dump = false,
+        .can_dump_fw = false,
         .can_ext_scan = true,
 };
 
@@ -223,7 +223,7 @@ static const struct mwifiex_pcie_device mwifiex_pcie8897 = {
         .reg            = &mwifiex_reg_8897,
         .blksz_fw_dl = MWIFIEX_PCIE_BLOCK_SIZE_FW_DNLD,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
-        .supports_fw_dump = true,
+        .can_dump_fw = true,
         .can_ext_scan = true,
 };
 
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 91e36cda9543..d10320f89bc1 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -47,6 +47,7 @@
 static u8 user_rmmod;
 
 static struct mwifiex_if_ops sdio_ops;
+static unsigned long iface_work_flags;
 
 static struct semaphore add_remove_card_sem;
 
@@ -105,8 +106,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
                 card->tx_buf_size = data->tx_buf_size;
                 card->mp_tx_agg_buf_size = data->mp_tx_agg_buf_size;
                 card->mp_rx_agg_buf_size = data->mp_rx_agg_buf_size;
-                card->supports_fw_dump = data->supports_fw_dump;
-                card->auto_tdls = data->auto_tdls;
+                card->can_dump_fw = data->can_dump_fw;
+                card->can_auto_tdls = data->can_auto_tdls;
                 card->can_ext_scan = data->can_ext_scan;
         }
 
@@ -200,8 +201,6 @@ mwifiex_sdio_remove(struct sdio_func *func)
         if (!adapter || !adapter->priv_num)
                 return;
 
-        cancel_work_sync(&adapter->iface_work);
-
         if (user_rmmod) {
                 if (adapter->is_suspended)
                         mwifiex_sdio_resume(adapter->dev);
@@ -1043,6 +1042,59 @@ static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,
 }
 
 /*
+ * This function decode sdio aggreation pkt.
+ *
+ * Based on the the data block size and pkt_len,
+ * skb data will be decoded to few packets.
+ */
+static void mwifiex_deaggr_sdio_pkt(struct mwifiex_adapter *adapter,
+                                    struct sk_buff *skb)
+{
+        u32 total_pkt_len, pkt_len;
+        struct sk_buff *skb_deaggr;
+        u32 pkt_type;
+        u16 blk_size;
+        u8 blk_num;
+        u8 *data;
+
+        data = skb->data;
+        total_pkt_len = skb->len;
+
+        while (total_pkt_len >= (SDIO_HEADER_OFFSET + INTF_HEADER_LEN)) {
+                if (total_pkt_len < adapter->sdio_rx_block_size)
+                        break;
+                blk_num = *(data + BLOCK_NUMBER_OFFSET);
+                blk_size = adapter->sdio_rx_block_size * blk_num;
+                if (blk_size > total_pkt_len) {
+                        dev_err(adapter->dev, "%s: error in pkt,\t"
+                                "blk_num=%d, blk_size=%d, total_pkt_len=%d\n",
+                                __func__, blk_num, blk_size, total_pkt_len);
+                        break;
+                }
+                pkt_len = le16_to_cpu(*(__le16 *)(data + SDIO_HEADER_OFFSET));
+                pkt_type = le16_to_cpu(*(__le16 *)(data + SDIO_HEADER_OFFSET +
+                                         2));
+                if ((pkt_len + SDIO_HEADER_OFFSET) > blk_size) {
+                        dev_err(adapter->dev, "%s: error in pkt,\t"
+                                "pkt_len=%d, blk_size=%d\n",
+                                __func__, pkt_len, blk_size);
+                        break;
+                }
+                skb_deaggr = mwifiex_alloc_dma_align_buf(pkt_len,
+                                                         GFP_KERNEL | GFP_DMA);
+                if (!skb_deaggr)
+                        break;
+                skb_put(skb_deaggr, pkt_len);
+                memcpy(skb_deaggr->data, data + SDIO_HEADER_OFFSET, pkt_len);
+                skb_pull(skb_deaggr, INTF_HEADER_LEN);
+
+                mwifiex_handle_rx_packet(adapter, skb_deaggr);
+                data += blk_size;
+                total_pkt_len -= blk_size;
+        }
+}
+
+/*
  * This function decodes a received packet.
  *
  * Based on the type, the packet is treated as either a data, or
@@ -1055,11 +1107,28 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
         u8 *cmd_buf;
         __le16 *curr_ptr = (__le16 *)skb->data;
         u16 pkt_len = le16_to_cpu(*curr_ptr);
+        struct mwifiex_rxinfo *rx_info;
 
-        skb_trim(skb, pkt_len);
-        skb_pull(skb, INTF_HEADER_LEN);
+        if (upld_typ != MWIFIEX_TYPE_AGGR_DATA) {
+                skb_trim(skb, pkt_len);
+                skb_pull(skb, INTF_HEADER_LEN);
+        }
 
         switch (upld_typ) {
+        case MWIFIEX_TYPE_AGGR_DATA:
+                dev_dbg(adapter->dev, "info: --- Rx: Aggr Data packet ---\n");
+                rx_info = MWIFIEX_SKB_RXCB(skb);
+                rx_info->buf_type = MWIFIEX_TYPE_AGGR_DATA;
+                if (adapter->rx_work_enabled) {
+                        skb_queue_tail(&adapter->rx_data_q, skb);
+                        atomic_inc(&adapter->rx_pending);
+                        adapter->data_received = true;
+                } else {
+                        mwifiex_deaggr_sdio_pkt(adapter, skb);
+                        dev_kfree_skb_any(skb);
+                }
+                break;
+
         case MWIFIEX_TYPE_DATA:
                 dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n");
                 if (adapter->rx_work_enabled) {
@@ -1127,17 +1196,17 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
  * provided there is space left, processed and finally uploaded.
  */
 static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
-                                             struct sk_buff *skb, u8 port)
+                                             u16 rx_len, u8 port)
 {
         struct sdio_mmc_card *card = adapter->card;
         s32 f_do_rx_aggr = 0;
         s32 f_do_rx_cur = 0;
         s32 f_aggr_cur = 0;
+        s32 f_post_aggr_cur = 0;
         struct sk_buff *skb_deaggr;
-        u32 pind;
-        u32 pkt_len, pkt_type, mport;
+        struct sk_buff *skb = NULL;
+        u32 pkt_len, pkt_type, mport, pind;
         u8 *curr_ptr;
-        u32 rx_len = skb->len;
 
         if ((card->has_control_mask) && (port == CTRL_PORT)) {
                 /* Read the command Resp without aggr */
@@ -1164,12 +1233,12 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
                 dev_dbg(adapter->dev, "info: %s: not last packet\n", __func__);
 
                 if (MP_RX_AGGR_IN_PROGRESS(card)) {
-                        if (MP_RX_AGGR_BUF_HAS_ROOM(card, skb->len)) {
+                        if (MP_RX_AGGR_BUF_HAS_ROOM(card, rx_len)) {
                                 f_aggr_cur = 1;
                         } else {
                                 /* No room in Aggr buf, do rx aggr now */
                                 f_do_rx_aggr = 1;
-                                f_do_rx_cur = 1;
+                                f_post_aggr_cur = 1;
                         }
                 } else {
                         /* Rx aggr not in progress */
@@ -1182,7 +1251,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 
                 if (MP_RX_AGGR_IN_PROGRESS(card)) {
                         f_do_rx_aggr = 1;
-                        if (MP_RX_AGGR_BUF_HAS_ROOM(card, skb->len))
+                        if (MP_RX_AGGR_BUF_HAS_ROOM(card, rx_len))
                                 f_aggr_cur = 1;
                         else
                                 /* No room in Aggr buf, do rx aggr now */
@@ -1195,7 +1264,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
         if (f_aggr_cur) {
                 dev_dbg(adapter->dev, "info: current packet aggregation\n");
                 /* Curr pkt can be aggregated */
-                mp_rx_aggr_setup(card, skb, port);
+                mp_rx_aggr_setup(card, rx_len, port);
 
                 if (MP_RX_AGGR_PKT_LIMIT_REACHED(card) ||
                     mp_rx_aggr_port_limit_reached(card)) {
@@ -1238,16 +1307,29 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
                 curr_ptr = card->mpa_rx.buf;
 
                 for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) {
+                        u32 *len_arr = card->mpa_rx.len_arr;
 
                         /* get curr PKT len & type */
                         pkt_len = le16_to_cpu(*(__le16 *) &curr_ptr[0]);
                         pkt_type = le16_to_cpu(*(__le16 *) &curr_ptr[2]);
 
                         /* copy pkt to deaggr buf */
-                        skb_deaggr = card->mpa_rx.skb_arr[pind];
+                        skb_deaggr = mwifiex_alloc_dma_align_buf(len_arr[pind],
+                                                                 GFP_KERNEL |
+                                                                 GFP_DMA);
+                        if (!skb_deaggr) {
+                                dev_err(adapter->dev, "skb allocation failure drop pkt len=%d type=%d\n",
+                                        pkt_len, pkt_type);
+                                curr_ptr += len_arr[pind];
+                                continue;
+                        }
 
-                        if ((pkt_type == MWIFIEX_TYPE_DATA) && (pkt_len <=
-                                         card->mpa_rx.len_arr[pind])) {
+                        skb_put(skb_deaggr, len_arr[pind]);
+
+                        if ((pkt_type == MWIFIEX_TYPE_DATA ||
+                             (pkt_type == MWIFIEX_TYPE_AGGR_DATA &&
+                              adapter->sdio_rx_aggr_enable)) &&
+                            (pkt_len <= len_arr[pind])) {
 
                                 memcpy(skb_deaggr->data, curr_ptr, pkt_len);
 
@@ -1257,13 +1339,15 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
                                 mwifiex_decode_rx_packet(adapter, skb_deaggr,
                                                          pkt_type);
                         } else {
-                                dev_err(adapter->dev, "wrong aggr pkt:"
-                                        " type=%d len=%d max_len=%d\n",
+                                dev_err(adapter->dev, " drop wrong aggr pkt:\t"
+                                        "sdio_single_port_rx_aggr=%d\t"
+                                        "type=%d len=%d max_len=%d\n",
+                                        adapter->sdio_rx_aggr_enable,
                                         pkt_type, pkt_len,
-                                        card->mpa_rx.len_arr[pind]);
+                                        len_arr[pind]);
                                 dev_kfree_skb_any(skb_deaggr);
                         }
-                        curr_ptr += card->mpa_rx.len_arr[pind];
+                        curr_ptr += len_arr[pind];
                 }
                 MP_RX_AGGR_BUF_RESET(card);
         }
@@ -1273,28 +1357,46 @@ rx_curr_single:
                 dev_dbg(adapter->dev, "info: RX: port: %d, rx_len: %d\n",
                         port, rx_len);
 
+                skb = mwifiex_alloc_dma_align_buf(rx_len, GFP_KERNEL | GFP_DMA);
+                if (!skb) {
+                        dev_err(adapter->dev, "single skb allocated fail,\t"
+                                "drop pkt port=%d len=%d\n", port, rx_len);
+                        if (mwifiex_sdio_card_to_host(adapter, &pkt_type,
+                                                      card->mpa_rx.buf, rx_len,
+                                                      adapter->ioport + port))
+                                goto error;
+                        return 0;
+                }
+
+                skb_put(skb, rx_len);
+
                 if (mwifiex_sdio_card_to_host(adapter, &pkt_type,
                                               skb->data, skb->len,
                                               adapter->ioport + port))
                         goto error;
+                if (!adapter->sdio_rx_aggr_enable &&
+                    pkt_type == MWIFIEX_TYPE_AGGR_DATA) {
+                        dev_err(adapter->dev, "drop wrong pkt type %d\t"
+                                "current SDIO RX Aggr not enabled\n",
+                                pkt_type);
+                        dev_kfree_skb_any(skb);
+                        return 0;
+                }
 
                 mwifiex_decode_rx_packet(adapter, skb, pkt_type);
         }
+        if (f_post_aggr_cur) {
+                dev_dbg(adapter->dev, "info: current packet aggregation\n");
+                /* Curr pkt can be aggregated */
+                mp_rx_aggr_setup(card, rx_len, port);
+        }
 
         return 0;
-
 error:
-        if (MP_RX_AGGR_IN_PROGRESS(card)) {
-                /* Multiport-aggregation transfer failed - cleanup */
-                for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) {
-                        /* copy pkt to deaggr buf */
-                        skb_deaggr = card->mpa_rx.skb_arr[pind];
-                        dev_kfree_skb_any(skb_deaggr);
-                }
+        if (MP_RX_AGGR_IN_PROGRESS(card))
                 MP_RX_AGGR_BUF_RESET(card);
-        }
 
-        if (f_do_rx_cur)
+        if (f_do_rx_cur && skb)
                 /* Single transfer pending. Free curr buff also */
                 dev_kfree_skb_any(skb);
 
@@ -1356,8 +1458,9 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
                      MWIFIEX_RX_DATA_BUF_SIZE)
                         return -1;
                 rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
+                dev_dbg(adapter->dev, "info: rx_len = %d\n", rx_len);
 
-                skb = dev_alloc_skb(rx_len);
+                skb = mwifiex_alloc_dma_align_buf(rx_len, GFP_KERNEL | GFP_DMA);
                 if (!skb)
                         return -1;
 
@@ -1447,27 +1550,16 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
                                  1) / MWIFIEX_SDIO_BLOCK_SIZE;
                         if (rx_len <= INTF_HEADER_LEN ||
                             (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE) >
-                             MWIFIEX_RX_DATA_BUF_SIZE) {
+                             card->mpa_rx.buf_size) {
                                 dev_err(adapter->dev, "invalid rx_len=%d\n",
                                         rx_len);
                                 return -1;
                         }
-                        rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
-
-                        skb = dev_alloc_skb(rx_len);
-
-                        if (!skb) {
-                                dev_err(adapter->dev, "%s: failed to alloc skb",
-                                        __func__);
-                                return -1;
-                        }
 
-                        skb_put(skb, rx_len);
-
-                        dev_dbg(adapter->dev, "info: rx_len = %d skb->len = %d\n",
-                                rx_len, skb->len);
+                        rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
+                        dev_dbg(adapter->dev, "info: rx_len = %d\n", rx_len);
 
-                        if (mwifiex_sdio_card_to_host_mp_aggr(adapter, skb,
+                        if (mwifiex_sdio_card_to_host_mp_aggr(adapter, rx_len,
                                                               port)) {
                                 dev_err(adapter->dev, "card_to_host_mpa failed:"
                                         " int status=%#x\n", sdio_ireg);
@@ -1735,6 +1827,7 @@ static int mwifiex_alloc_sdio_mpa_buffers(struct mwifiex_adapter *adapter,
                                    u32 mpa_tx_buf_size, u32 mpa_rx_buf_size)
 {
         struct sdio_mmc_card *card = adapter->card;
+        u32 rx_buf_size;
         int ret = 0;
 
         card->mpa_tx.buf = kzalloc(mpa_tx_buf_size, GFP_KERNEL);
@@ -1745,13 +1838,15 @@ static int mwifiex_alloc_sdio_mpa_buffers(struct mwifiex_adapter *adapter,
 
         card->mpa_tx.buf_size = mpa_tx_buf_size;
 
-        card->mpa_rx.buf = kzalloc(mpa_rx_buf_size, GFP_KERNEL);
+        rx_buf_size = max_t(u32, mpa_rx_buf_size,
+                            (u32)SDIO_MAX_AGGR_BUF_SIZE);
+        card->mpa_rx.buf = kzalloc(rx_buf_size, GFP_KERNEL);
         if (!card->mpa_rx.buf) {
                 ret = -1;
                 goto error;
         }
 
-        card->mpa_rx.buf_size = mpa_rx_buf_size;
+        card->mpa_rx.buf_size = rx_buf_size;
 
 error:
         if (ret) {
@@ -1887,7 +1982,7 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
                 return -1;
         }
 
-        adapter->auto_tdls = card->auto_tdls;
+        adapter->auto_tdls = card->can_auto_tdls;
         adapter->ext_scan = card->can_ext_scan;
         return ret;
 }
@@ -1950,6 +2045,7 @@ mwifiex_update_mp_end_port(struct mwifiex_adapter *adapter, u16 port)
                 port, card->mp_data_port_mask);
 }
 
+static struct mwifiex_adapter *save_adapter;
 static void mwifiex_sdio_card_reset_work(struct mwifiex_adapter *adapter)
 {
         struct sdio_mmc_card *card = adapter->card;
@@ -2018,10 +2114,8 @@ rdwr_status mwifiex_sdio_rdwr_firmware(struct mwifiex_adapter *adapter,
 }
 
 /* This function dump firmware memory to file */
-static void mwifiex_sdio_fw_dump_work(struct work_struct *work)
+static void mwifiex_sdio_fw_dump_work(struct mwifiex_adapter *adapter)
 {
-        struct mwifiex_adapter *adapter =
-                        container_of(work, struct mwifiex_adapter, iface_work);
         struct sdio_mmc_card *card = adapter->card;
         int ret = 0;
         unsigned int reg, reg_start, reg_end;
@@ -2032,7 +2126,7 @@ static void mwifiex_sdio_fw_dump_work(struct work_struct *work)
 
         mwifiex_dump_drv_info(adapter);
 
-        if (!card->supports_fw_dump)
+        if (!card->can_dump_fw)
                 return;
 
         for (idx = 0; idx < ARRAY_SIZE(mem_type_mapping_tbl); idx++) {
@@ -2143,36 +2237,36 @@ done:
 
 static void mwifiex_sdio_work(struct work_struct *work)
 {
-        struct mwifiex_adapter *adapter =
-                        container_of(work, struct mwifiex_adapter, iface_work);
-
-        if (test_and_clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET,
-                               &adapter->iface_work_flags))
-                mwifiex_sdio_card_reset_work(adapter);
         if (test_and_clear_bit(MWIFIEX_IFACE_WORK_FW_DUMP,
-                               &adapter->iface_work_flags))
-                mwifiex_sdio_fw_dump_work(work);
+                               &iface_work_flags))
+                mwifiex_sdio_fw_dump_work(save_adapter);
+        if (test_and_clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET,
+                               &iface_work_flags))
+                mwifiex_sdio_card_reset_work(save_adapter);
 }
 
+static DECLARE_WORK(sdio_work, mwifiex_sdio_work);
 /* This function resets the card */
 static void mwifiex_sdio_card_reset(struct mwifiex_adapter *adapter)
 {
-        if (test_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &adapter->iface_work_flags))
+        save_adapter = adapter;
+        if (test_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &iface_work_flags))
                 return;
 
-        set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &adapter->iface_work_flags);
+        set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &iface_work_flags);
 
-        schedule_work(&adapter->iface_work);
+        schedule_work(&sdio_work);
 }
 
 /* This function dumps FW information */
 static void mwifiex_sdio_fw_dump(struct mwifiex_adapter *adapter)
 {
-        if (test_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &adapter->iface_work_flags))
+        save_adapter = adapter;
+        if (test_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags))
                 return;
 
-        set_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &adapter->iface_work_flags);
-        schedule_work(&adapter->iface_work);
+        set_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags);
+        schedule_work(&sdio_work);
 }
 
 /* Function to dump SDIO function registers and SDIO scratch registers in case
@@ -2288,9 +2382,9 @@ static struct mwifiex_if_ops sdio_ops = {
         .cmdrsp_complete = mwifiex_sdio_cmdrsp_complete,
         .event_complete = mwifiex_sdio_event_complete,
         .card_reset = mwifiex_sdio_card_reset,
-        .iface_work = mwifiex_sdio_work,
         .fw_dump = mwifiex_sdio_fw_dump,
         .reg_dump = mwifiex_sdio_reg_dump,
+        .deaggr_pkt = mwifiex_deaggr_sdio_pkt,
 };
 
 /*
@@ -2327,6 +2421,7 @@ mwifiex_sdio_cleanup_module(void)
 
         /* Set the flag as user is removing this module. */
         user_rmmod = 1;
+        cancel_work_sync(&sdio_work);
 
         sdio_unregister_driver(&mwifiex_sdio);
 }
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index 957cca246618..6f645cf47369 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -67,6 +67,8 @@
 
 #define MWIFIEX_MP_AGGR_BUF_SIZE_16K    (16384)
 #define MWIFIEX_MP_AGGR_BUF_SIZE_32K    (32768)
+/* we leave one block of 256 bytes for DMA alignment*/
+#define MWIFIEX_MP_AGGR_BUF_SIZE_MAX    (65280)
 
 /* Misc. Config Register : Auto Re-enable interrupts */
 #define AUTO_RE_ENABLE_INT              BIT(4)
@@ -238,9 +240,6 @@ struct sdio_mmc_card {
         const struct mwifiex_sdio_card_reg *reg;
         u8 max_ports;
         u8 mp_agg_pkt_limit;
-        bool supports_sdio_new_mode;
-        bool has_control_mask;
-        bool supports_fw_dump;
         u16 tx_buf_size;
         u32 mp_tx_agg_buf_size;
         u32 mp_rx_agg_buf_size;
@@ -255,7 +254,10 @@ struct sdio_mmc_card {
         u8 curr_wr_port;
 
         u8 *mp_regs;
-        u8 auto_tdls;
+        bool supports_sdio_new_mode;
+        bool has_control_mask;
+        bool can_dump_fw;
+        bool can_auto_tdls;
         bool can_ext_scan;
 
         struct mwifiex_sdio_mpa_tx mpa_tx;
@@ -267,13 +269,13 @@ struct mwifiex_sdio_device {
         const struct mwifiex_sdio_card_reg *reg;
         u8 max_ports;
         u8 mp_agg_pkt_limit;
-        bool supports_sdio_new_mode;
-        bool has_control_mask;
-        bool supports_fw_dump;
         u16 tx_buf_size;
         u32 mp_tx_agg_buf_size;
         u32 mp_rx_agg_buf_size;
-        u8 auto_tdls;
+        bool supports_sdio_new_mode;
+        bool has_control_mask;
+        bool can_dump_fw;
+        bool can_auto_tdls;
         bool can_ext_scan;
 };
 
@@ -412,13 +414,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = {
         .reg = &mwifiex_reg_sd87xx,
         .max_ports = 16,
         .mp_agg_pkt_limit = 8,
-        .supports_sdio_new_mode = false,
-        .has_control_mask = true,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .supports_sdio_new_mode = false,
+        .has_control_mask = true,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = false,
 };
 
@@ -427,13 +429,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {
         .reg = &mwifiex_reg_sd87xx,
         .max_ports = 16,
         .mp_agg_pkt_limit = 8,
-        .supports_sdio_new_mode = false,
-        .has_control_mask = true,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .supports_sdio_new_mode = false,
+        .has_control_mask = true,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
@@ -442,13 +444,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {
         .reg = &mwifiex_reg_sd87xx,
         .max_ports = 16,
         .mp_agg_pkt_limit = 8,
-        .supports_sdio_new_mode = false,
-        .has_control_mask = true,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .supports_sdio_new_mode = false,
+        .has_control_mask = true,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
@@ -457,13 +459,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {
         .reg = &mwifiex_reg_sd8897,
         .max_ports = 32,
         .mp_agg_pkt_limit = 16,
+        .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
+        .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,
+        .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,
         .supports_sdio_new_mode = true,
         .has_control_mask = false,
-        .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
-        .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
-        .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
-        .supports_fw_dump = true,
-        .auto_tdls = false,
+        .can_dump_fw = true,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
@@ -472,13 +474,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {
         .reg = &mwifiex_reg_sd8887,
         .max_ports = 32,
         .mp_agg_pkt_limit = 16,
-        .supports_sdio_new_mode = true,
-        .has_control_mask = false,
-        .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
+        .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
-        .supports_fw_dump = false,
-        .auto_tdls = true,
+        .supports_sdio_new_mode = true,
+        .has_control_mask = false,
+        .can_dump_fw = false,
+        .can_auto_tdls = true,
         .can_ext_scan = true,
 };
 
@@ -492,8 +494,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
@@ -571,9 +573,9 @@ mp_tx_aggr_port_limit_reached(struct sdio_mmc_card *card)
 
 /* Prepare to copy current packet from card to SDIO Rx aggregation buffer */
 static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,
-                                    struct sk_buff *skb, u8 port)
+                                    u16 rx_len, u8 port)
 {
-        card->mpa_rx.buf_len += skb->len;
+        card->mpa_rx.buf_len += rx_len;
 
         if (!card->mpa_rx.pkt_cnt)
                 card->mpa_rx.start_port = port;
@@ -586,8 +588,8 @@ static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,
                 else
                         card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt + 1);
         }
-        card->mpa_rx.skb_arr[card->mpa_rx.pkt_cnt] = skb;
-        card->mpa_rx.len_arr[card->mpa_rx.pkt_cnt] = skb->len;
+        card->mpa_rx.skb_arr[card->mpa_rx.pkt_cnt] = NULL;
+        card->mpa_rx.len_arr[card->mpa_rx.pkt_cnt] = rx_len;
         card->mpa_rx.pkt_cnt++;
 }
 #endif /* _MWIFIEX_SDIO_H */
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index f7d204ffd6e9..49422f2a5380 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -1370,22 +1370,29 @@ mwifiex_cmd_mef_cfg(struct mwifiex_private *priv,
                     struct mwifiex_ds_mef_cfg *mef)
 {
         struct host_cmd_ds_mef_cfg *mef_cfg = &cmd->params.mef_cfg;
+        struct mwifiex_fw_mef_entry *mef_entry = NULL;
         u8 *pos = (u8 *)mef_cfg;
+        u16 i;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_MEF_CFG);
 
         mef_cfg->criteria = cpu_to_le32(mef->criteria);
         mef_cfg->num_entries = cpu_to_le16(mef->num_entries);
         pos += sizeof(*mef_cfg);
-        mef_cfg->mef_entry->mode = mef->mef_entry->mode;
-        mef_cfg->mef_entry->action = mef->mef_entry->action;
-        pos += sizeof(*(mef_cfg->mef_entry));
 
-        if (mwifiex_cmd_append_rpn_expression(priv, mef->mef_entry, &pos))
-                return -1;
+        for (i = 0; i < mef->num_entries; i++) {
+                mef_entry = (struct mwifiex_fw_mef_entry *)pos;
+                mef_entry->mode = mef->mef_entry[i].mode;
+                mef_entry->action = mef->mef_entry[i].action;
+                pos += sizeof(*mef_cfg->mef_entry);
+
+                if (mwifiex_cmd_append_rpn_expression(priv,
+                                                      &mef->mef_entry[i], &pos))
+                        return -1;
 
-        mef_cfg->mef_entry->exprsize =
-                        cpu_to_le16(pos - mef_cfg->mef_entry->expr);
+                mef_entry->exprsize =
+                        cpu_to_le16(pos - mef_entry->expr);
+        }
         cmd->size = cpu_to_le16((u16) (pos - (u8 *)mef_cfg) + S_DS_GEN);
 
         return 0;
@@ -1664,6 +1671,25 @@ mwifiex_cmd_tdls_oper(struct mwifiex_private *priv,
 
         return 0;
 }
+
+/* This function prepares command of sdio rx aggr info. */
+static int mwifiex_cmd_sdio_rx_aggr_cfg(struct host_cmd_ds_command *cmd,
+                                        u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_sdio_sp_rx_aggr_cfg *cfg =
+                                        &cmd->params.sdio_rx_aggr_cfg;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_SDIO_SP_RX_AGGR_CFG);
+        cmd->size =
+                cpu_to_le16(sizeof(struct host_cmd_sdio_sp_rx_aggr_cfg) +
+                            S_DS_GEN);
+        cfg->action = cmd_action;
+        if (cmd_action == HostCmd_ACT_GEN_SET)
+                cfg->enable = *(u8 *)data_buf;
+
+        return 0;
+}
+
 /*
  * This function prepares the commands before sending them to the firmware.
  *
@@ -1901,6 +1927,10 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
                 ret = mwifiex_cmd_issue_chan_report_request(priv, cmd_ptr,
                                                             data_buf);
                 break;
+        case HostCmd_CMD_SDIO_SP_RX_AGGR_CFG:
+                ret = mwifiex_cmd_sdio_rx_aggr_cfg(cmd_ptr, cmd_action,
+                                                   data_buf);
+                break;
         default:
                 dev_err(priv->adapter->dev,
                         "PREP_CMD: unknown cmd- %#x\n", cmd_no);
@@ -1940,6 +1970,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
         struct mwifiex_ds_auto_ds auto_ds;
         enum state_11d_t state_11d;
         struct mwifiex_ds_11n_tx_cfg tx_cfg;
+        u8 sdio_sp_rx_aggr_enable;
 
         if (first_sta) {
                 if (priv->adapter->iface_type == MWIFIEX_PCIE) {
@@ -1983,6 +2014,22 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
                 if (ret)
                         return -1;
 
+                /** Set SDIO Single Port RX Aggr Info */
+                if (priv->adapter->iface_type == MWIFIEX_SDIO &&
+                    ISSUPP_SDIO_SPA_ENABLED(priv->adapter->fw_cap_info)) {
+                        sdio_sp_rx_aggr_enable = true;
+                        ret = mwifiex_send_cmd(priv,
+                                               HostCmd_CMD_SDIO_SP_RX_AGGR_CFG,
+                                               HostCmd_ACT_GEN_SET, 0,
+                                               &sdio_sp_rx_aggr_enable,
+                                               true);
+                        if (ret) {
+                                dev_err(priv->adapter->dev,
+                                        "error while enabling SP aggregation..disable it");
+                                adapter->sdio_rx_aggr_enable = false;
+                        }
+                }
+
                 /* Reconfigure tx buf size */
                 ret = mwifiex_send_cmd(priv, HostCmd_CMD_RECONFIGURE_TX_BUFF,
                                        HostCmd_ACT_GEN_SET, 0,
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index 5f8da5924666..88dc6b672ef4 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -90,6 +90,10 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv,
         case HostCmd_CMD_MAC_CONTROL:
                 break;
 
+        case HostCmd_CMD_SDIO_SP_RX_AGGR_CFG:
+                dev_err(priv->adapter->dev, "SDIO RX single-port aggregation Not support\n");
+                break;
+
         default:
                 break;
         }
@@ -943,6 +947,20 @@ static int mwifiex_ret_cfg_data(struct mwifiex_private *priv,
         return 0;
 }
 
+/** This Function handles the command response of sdio rx aggr */
+static int mwifiex_ret_sdio_rx_aggr_cfg(struct mwifiex_private *priv,
+                                        struct host_cmd_ds_command *resp)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_sdio_sp_rx_aggr_cfg *cfg =
+                                &resp->params.sdio_rx_aggr_cfg;
+
+        adapter->sdio_rx_aggr_enable = cfg->enable;
+        adapter->sdio_rx_block_size = le16_to_cpu(cfg->block_size);
+
+        return 0;
+}
+
 /*
  * This function handles the command responses.
  *
@@ -1124,6 +1142,9 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
                 break;
         case HostCmd_CMD_CHAN_REPORT_REQUEST:
                 break;
+        case HostCmd_CMD_SDIO_SP_RX_AGGR_CFG:
+                ret = mwifiex_ret_sdio_rx_aggr_cfg(priv, resp);
+                break;
         default:
                 dev_err(adapter->dev, "CMD_RESP: unknown cmd response %#x\n",
                         resp->command);
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index 80ffe7412496..0dc7a1d3993d 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -135,7 +135,7 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code)
                 cfg80211_disconnected(priv->netdev, reason_code, NULL, 0,
                                       GFP_KERNEL);
         }
-        memset(priv->cfg_bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->cfg_bssid);
 
         mwifiex_stop_net_dev_queue(priv->netdev, adapter);
         if (netif_carrier_ok(priv->netdev))
@@ -312,7 +312,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                                         adapter->ps_state = PS_STATE_AWAKE;
                                         adapter->pm_wakeup_card_req = false;
                                         adapter->pm_wakeup_fw_try = false;
-                                        del_timer_sync(&adapter->wakeup_timer);
+                                        del_timer(&adapter->wakeup_timer);
                                         break;
                                 }
                                 if (!mwifiex_send_null_packet
@@ -327,7 +327,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                 adapter->ps_state = PS_STATE_AWAKE;
                 adapter->pm_wakeup_card_req = false;
                 adapter->pm_wakeup_fw_try = false;
-                del_timer_sync(&adapter->wakeup_timer);
+                del_timer(&adapter->wakeup_timer);
 
                 break;
 
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index ac93557cbdc9..a245f444aeec 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -80,23 +80,29 @@ EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet);
 int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
                        struct mwifiex_tx_param *tx_param)
 {
-        int ret = -1;
+        int hroom, ret = -1;
         struct mwifiex_adapter *adapter = priv->adapter;
         u8 *head_ptr;
         struct txpd *local_tx_pd = NULL;
 
+        hroom = (adapter->iface_type == MWIFIEX_USB) ? 0 : INTF_HEADER_LEN;
+
         if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)
                 head_ptr = mwifiex_process_uap_txpd(priv, skb);
         else
                 head_ptr = mwifiex_process_sta_txpd(priv, skb);
 
+        if ((adapter->data_sent || adapter->tx_lock_flag) && head_ptr) {
+                skb_queue_tail(&adapter->tx_data_q, skb);
+                atomic_inc(&adapter->tx_queued);
+                return 0;
+        }
+
         if (head_ptr) {
                 if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)
-                        local_tx_pd =
-                                (struct txpd *) (head_ptr + INTF_HEADER_LEN);
+                        local_tx_pd = (struct txpd *)(head_ptr + hroom);
                 if (adapter->iface_type == MWIFIEX_USB) {
                         adapter->data_sent = true;
-                        skb_pull(skb, INTF_HEADER_LEN);
                         ret = adapter->if_ops.host_to_card(adapter,
                                                            MWIFIEX_USB_EP_DATA,
                                                            skb, NULL);
@@ -142,6 +148,123 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
         return ret;
 }
 
+static int mwifiex_host_to_card(struct mwifiex_adapter *adapter,
+                                struct sk_buff *skb,
+                                struct mwifiex_tx_param *tx_param)
+{
+        struct txpd *local_tx_pd = NULL;
+        u8 *head_ptr = skb->data;
+        int ret = 0;
+        struct mwifiex_private *priv;
+        struct mwifiex_txinfo *tx_info;
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+        priv = mwifiex_get_priv_by_id(adapter, tx_info->bss_num,
+                                      tx_info->bss_type);
+        if (!priv) {
+                dev_err(adapter->dev, "data: priv not found. Drop TX packet\n");
+                adapter->dbg.num_tx_host_to_card_failure++;
+                mwifiex_write_data_complete(adapter, skb, 0, 0);
+                return ret;
+        }
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) {
+                if (adapter->iface_type == MWIFIEX_USB)
+                        local_tx_pd = (struct txpd *)head_ptr;
+                else
+                        local_tx_pd = (struct txpd *) (head_ptr +
+                                INTF_HEADER_LEN);
+        }
+
+        if (adapter->iface_type == MWIFIEX_USB) {
+                adapter->data_sent = true;
+                ret = adapter->if_ops.host_to_card(adapter,
+                                                   MWIFIEX_USB_EP_DATA,
+                                                   skb, NULL);
+        } else {
+                ret = adapter->if_ops.host_to_card(adapter,
+                                                   MWIFIEX_TYPE_DATA,
+                                                   skb, tx_param);
+        }
+        switch (ret) {
+        case -ENOSR:
+                dev_err(adapter->dev, "data: -ENOSR is returned\n");
+                break;
+        case -EBUSY:
+                if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&
+                    (adapter->pps_uapsd_mode) &&
+                    (adapter->tx_lock_flag)) {
+                        priv->adapter->tx_lock_flag = false;
+                        if (local_tx_pd)
+                                local_tx_pd->flags = 0;
+                }
+                skb_queue_head(&adapter->tx_data_q, skb);
+                if (tx_info->flags & MWIFIEX_BUF_FLAG_AGGR_PKT)
+                        atomic_add(tx_info->aggr_num, &adapter->tx_queued);
+                else
+                        atomic_inc(&adapter->tx_queued);
+                dev_dbg(adapter->dev, "data: -EBUSY is returned\n");
+                break;
+        case -1:
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        adapter->data_sent = false;
+                dev_err(adapter->dev, "mwifiex_write_data_async failed: 0x%X\n",
+                        ret);
+                adapter->dbg.num_tx_host_to_card_failure++;
+                mwifiex_write_data_complete(adapter, skb, 0, ret);
+                break;
+        case -EINPROGRESS:
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        adapter->data_sent = false;
+                break;
+        case 0:
+                mwifiex_write_data_complete(adapter, skb, 0, ret);
+                break;
+        default:
+                break;
+        }
+        return ret;
+}
+
+static int
+mwifiex_dequeue_tx_queue(struct mwifiex_adapter *adapter)
+{
+        struct sk_buff *skb, *skb_next;
+        struct mwifiex_txinfo *tx_info;
+        struct mwifiex_tx_param tx_param;
+
+        skb = skb_dequeue(&adapter->tx_data_q);
+        if (!skb)
+                return -1;
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+        if (tx_info->flags & MWIFIEX_BUF_FLAG_AGGR_PKT)
+                atomic_sub(tx_info->aggr_num, &adapter->tx_queued);
+        else
+                atomic_dec(&adapter->tx_queued);
+
+        if (!skb_queue_empty(&adapter->tx_data_q))
+                skb_next = skb_peek(&adapter->tx_data_q);
+        else
+                skb_next = NULL;
+        tx_param.next_pkt_len = ((skb_next) ? skb_next->len : 0);
+        if (!tx_param.next_pkt_len) {
+                if (!mwifiex_wmm_lists_empty(adapter))
+                        tx_param.next_pkt_len = 1;
+        }
+        return mwifiex_host_to_card(adapter, skb, &tx_param);
+}
+
+void
+mwifiex_process_tx_queue(struct mwifiex_adapter *adapter)
+{
+        do {
+                if (adapter->data_sent || adapter->tx_lock_flag)
+                        break;
+                if (mwifiex_dequeue_tx_queue(adapter))
+                        break;
+        } while (!skb_queue_empty(&adapter->tx_data_q));
+}
+
 /*
  * Packet send completion callback handler.
  *
@@ -179,8 +302,11 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
                 priv->stats.tx_errors++;
         }
 
-        if (tx_info->flags & MWIFIEX_BUF_FLAG_BRIDGED_PKT)
+        if (tx_info->flags & MWIFIEX_BUF_FLAG_BRIDGED_PKT) {
                 atomic_dec_return(&adapter->pending_bridged_pkts);
+                if (tx_info->flags & MWIFIEX_BUF_FLAG_AGGR_PKT)
+                        goto done;
+        }
 
         if (aggr)
                 /* For skb_aggr, do not wake up tx queue */
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
index 223873022ffe..fd8027f200a0 100644
--- a/drivers/net/wireless/mwifiex/usb.c
+++ b/drivers/net/wireless/mwifiex/usb.c
@@ -193,7 +193,7 @@ static void mwifiex_usb_rx_complete(struct urb *urb)
                 dev_dbg(adapter->dev, "info: recv_length=%d, status=%d\n",
                         recv_length, status);
                 if (status == -EINPROGRESS) {
-                        queue_work(adapter->workqueue, &adapter->main_work);
+                        mwifiex_queue_main_work(adapter);
 
                         /* urb for data_ep is re-submitted now;
                          * urb for cmd_ep will be re-submitted in callback
@@ -262,7 +262,7 @@ static void mwifiex_usb_tx_complete(struct urb *urb)
                                             urb->status ? -1 : 0);
         }
 
-        queue_work(adapter->workqueue, &adapter->main_work);
+        mwifiex_queue_main_work(adapter);
 
         return;
 }
@@ -1006,7 +1006,7 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
 {
         /* Simulation of HS_AWAKE event */
         adapter->pm_wakeup_fw_try = false;
-        del_timer_sync(&adapter->wakeup_timer);
+        del_timer(&adapter->wakeup_timer);
         adapter->pm_wakeup_card_req = false;
         adapter->ps_state = PS_STATE_AWAKE;
 
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 308550611f22..b8a45872354d 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -367,6 +367,13 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,
         if (!skb)
                 return -1;
 
+        if (!priv->mgmt_frame_mask ||
+            priv->wdev.iftype == NL80211_IFTYPE_UNSPECIFIED) {
+                dev_dbg(priv->adapter->dev,
+                        "do not receive mgmt frames on uninitialized intf");
+                return -1;
+        }
+
         rx_pd = (struct rxpd *)skb->data;
 
         skb_pull(skb, le16_to_cpu(rx_pd->rx_pkt_offset));
@@ -624,3 +631,26 @@ void mwifiex_hist_data_reset(struct mwifiex_private *priv)
         for (ix = 0; ix < MWIFIEX_MAX_SIG_STRENGTH; ix++)
                 atomic_set(&phist_data->sig_str[ix], 0);
 }
+
+void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags)
+{
+        struct sk_buff *skb;
+        int buf_len, pad;
+
+        buf_len = rx_len + MWIFIEX_RX_HEADROOM + MWIFIEX_DMA_ALIGN_SZ;
+
+        skb = __dev_alloc_skb(buf_len, flags);
+
+        if (!skb)
+                return NULL;
+
+        skb_reserve(skb, MWIFIEX_RX_HEADROOM);
+
+        pad = MWIFIEX_ALIGN_ADDR(skb->data, MWIFIEX_DMA_ALIGN_SZ) -
+              (long)skb->data;
+
+        skb_reserve(skb, pad);
+
+        return skb;
+}
+EXPORT_SYMBOL_GPL(mwifiex_alloc_dma_align_buf);
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index ef717acec8b7..b2e99569a0f8 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -157,6 +157,8 @@ void mwifiex_ralist_add(struct mwifiex_private *priv, const u8 *ra)
 
                 ra_list->is_11n_enabled = 0;
                 ra_list->tdls_link = false;
+                ra_list->ba_status = BA_SETUP_NONE;
+                ra_list->amsdu_in_ampdu = false;
                 if (!mwifiex_queuing_ra_based(priv)) {
                         if (mwifiex_get_tdls_link_status(priv, ra) ==
                             TDLS_SETUP_COMPLETE) {
@@ -574,7 +576,7 @@ mwifiex_clean_txrx(struct mwifiex_private *priv)
  * This function retrieves a particular RA list node, matching with the
  * given TID and RA address.
  */
-static struct mwifiex_ra_list_tbl *
+struct mwifiex_ra_list_tbl *
 mwifiex_wmm_get_ralist_node(struct mwifiex_private *priv, u8 tid,
                             const u8 *ra_addr)
 {
@@ -730,7 +732,7 @@ mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
         } else {
                 memcpy(ra, skb->data, ETH_ALEN);
                 if (ra[0] & 0x01 || mwifiex_is_skb_mgmt_frame(skb))
-                        memset(ra, 0xff, ETH_ALEN);
+                        eth_broadcast_addr(ra);
                 ra_list = mwifiex_wmm_get_queue_raptr(priv, tid_down, ra);
         }
 
@@ -942,14 +944,11 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter,
         struct mwifiex_ra_list_tbl *ptr;
         struct mwifiex_tid_tbl *tid_ptr;
         atomic_t *hqp;
-        unsigned long flags_bss, flags_ra;
+        unsigned long flags_ra;
         int i, j;
 
         /* check the BSS with highest priority first */
         for (j = adapter->priv_num - 1; j >= 0; --j) {
-                spin_lock_irqsave(&adapter->bss_prio_tbl[j].bss_prio_lock,
-                                  flags_bss);
-
                 /* iterate over BSS with the equal priority */
                 list_for_each_entry(adapter->bss_prio_tbl[j].bss_prio_cur,
                                     &adapter->bss_prio_tbl[j].bss_prio_head,
@@ -985,19 +984,15 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter,
                         }
                 }
 
-                spin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,
-                                       flags_bss);
         }
 
         return NULL;
 
 found:
-        /* holds bss_prio_lock / ra_list_spinlock */
+        /* holds ra_list_spinlock */
         if (atomic_read(hqp) > i)
                 atomic_set(hqp, i);
         spin_unlock_irqrestore(&priv_tmp->wmm.ra_list_spinlock, flags_ra);
-        spin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,
-                               flags_bss);
 
         *priv = priv_tmp;
         *tid = tos_to_tid[i];
@@ -1179,6 +1174,14 @@ mwifiex_send_processed_packet(struct mwifiex_private *priv,
 
         skb = skb_dequeue(&ptr->skb_head);
 
+        if (adapter->data_sent || adapter->tx_lock_flag) {
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                skb_queue_tail(&adapter->tx_data_q, skb);
+                atomic_inc(&adapter->tx_queued);
+                return;
+        }
+
         if (!skb_queue_empty(&ptr->skb_head))
                 skb_next = skb_peek(&ptr->skb_head);
         else
@@ -1276,13 +1279,13 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter)
         }
 
         if (!ptr->is_11n_enabled ||
-            mwifiex_is_ba_stream_setup(priv, ptr, tid) ||
-            priv->wps.session_enable) {
+                ptr->ba_status ||
+                priv->wps.session_enable) {
                 if (ptr->is_11n_enabled &&
-                    mwifiex_is_ba_stream_setup(priv, ptr, tid) &&
-                    mwifiex_is_amsdu_in_ampdu_allowed(priv, ptr, tid) &&
-                    mwifiex_is_amsdu_allowed(priv, tid) &&
-                    mwifiex_is_11n_aggragation_possible(priv, ptr,
+                        ptr->ba_status &&
+                        ptr->amsdu_in_ampdu &&
+                        mwifiex_is_amsdu_allowed(priv, tid) &&
+                        mwifiex_is_11n_aggragation_possible(priv, ptr,
                                                         adapter->tx_buf_size))
                         mwifiex_11n_aggregate_pkt(priv, ptr, ptr_index, flags);
                         /* ra_list_spinlock has been freed in
@@ -1329,11 +1332,16 @@ void
 mwifiex_wmm_process_tx(struct mwifiex_adapter *adapter)
 {
         do {
-                /* Check if busy */
-                if (adapter->data_sent || adapter->tx_lock_flag)
-                        break;
-
                 if (mwifiex_dequeue_tx_packet(adapter))
                         break;
+                if (adapter->iface_type != MWIFIEX_SDIO) {
+                        if (adapter->data_sent ||
+                            adapter->tx_lock_flag)
+                                break;
+                } else {
+                        if (atomic_read(&adapter->tx_queued) >=
+                            MWIFIEX_MAX_PKTS_TXQ)
+                                break;
+                }
         } while (!mwifiex_wmm_lists_empty(adapter));
 }
diff --git a/drivers/net/wireless/mwifiex/wmm.h b/drivers/net/wireless/mwifiex/wmm.h
index 569bd73f33c5..48ece0b35591 100644
--- a/drivers/net/wireless/mwifiex/wmm.h
+++ b/drivers/net/wireless/mwifiex/wmm.h
@@ -127,4 +127,6 @@ mwifiex_wmm_get_queue_raptr(struct mwifiex_private *priv, u8 tid,
                             const u8 *ra_addr);
 u8 mwifiex_wmm_downgrade_tid(struct mwifiex_private *priv, u32 tid);
 
+struct mwifiex_ra_list_tbl *mwifiex_wmm_get_ralist_node(struct mwifiex_private
+                                        *priv, u8 tid, const u8 *ra_addr);
 #endif /* !_MWIFIEX_WMM_H_ */
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index f9b1218c761a..95921167b53f 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1277,7 +1277,7 @@ static inline void mwl8k_save_beacon(struct ieee80211_hw *hw,
         struct mwl8k_priv *priv = hw->priv;
 
         priv->capture_beacon = false;
-        memset(priv->capture_bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->capture_bssid);
 
         /*
          * Use GFP_ATOMIC as rxq_process is called from
diff --git a/drivers/net/wireless/orinoco/Kconfig b/drivers/net/wireless/orinoco/Kconfig
index 6d831d4d1b5f..f6fa3f4e294f 100644
--- a/drivers/net/wireless/orinoco/Kconfig
+++ b/drivers/net/wireless/orinoco/Kconfig
@@ -2,7 +2,7 @@ config HERMES
         tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
         depends on (PPC_PMAC || PCI || PCMCIA)
         depends on CFG80211
-        select CFG80211_WEXT
+        select CFG80211_WEXT_EXPORT
         select WIRELESS_EXT
         select WEXT_SPY
         select WEXT_PRIV
diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/orinoco/airport.c
index 0ca8b1455cd9..77e6c53040a3 100644
--- a/drivers/net/wireless/orinoco/airport.c
+++ b/drivers/net/wireless/orinoco/airport.c
@@ -228,7 +228,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
 MODULE_DESCRIPTION("Driver for the Apple Airport wireless card.");
 MODULE_LICENSE("Dual MPL/GPL");
 
-static struct of_device_id airport_match[] = {
+static const struct of_device_id airport_match[] = {
         {
         .name           = "radio",
         },
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 6abdaf0aa052..1d4dae422106 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -168,7 +168,7 @@ static int orinoco_ioctl_setwap(struct net_device *dev,
         if (is_zero_ether_addr(ap_addr->sa_data) ||
             is_broadcast_ether_addr(ap_addr->sa_data)) {
                 priv->bssid_fixed = 0;
-                memset(priv->desired_bssid, 0, ETH_ALEN);
+                eth_zero_addr(priv->desired_bssid);
 
                 /* "off" means keep existing connection */
                 if (ap_addr->sa_data[0] == 0) {
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 5367d510b22d..275408eaf95e 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -671,7 +671,7 @@ int p54_upload_key(struct p54_common *priv, u8 algo, int slot, u8 idx, u8 len,
         if (addr)
                 memcpy(rxkey->mac, addr, ETH_ALEN);
         else
-                memset(rxkey->mac, ~0, ETH_ALEN);
+                eth_broadcast_addr(rxkey->mac);
 
         switch (algo) {
         case P54_CRYPTO_WEP:
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index b9250d75d253..e79674f73dc5 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -182,7 +182,7 @@ static int p54_start(struct ieee80211_hw *dev)
         if (err)
                 goto out;
 
-        memset(priv->bssid, ~0, ETH_ALEN);
+        eth_broadcast_addr(priv->bssid);
         priv->mode = NL80211_IFTYPE_MONITOR;
         err = p54_setup_mac(priv);
         if (err) {
@@ -274,8 +274,8 @@ static void p54_remove_interface(struct ieee80211_hw *dev,
                 wait_for_completion_interruptible_timeout(&priv->beacon_comp, HZ);
         }
         priv->mode = NL80211_IFTYPE_MONITOR;
-        memset(priv->mac_addr, 0, ETH_ALEN);
-        memset(priv->bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->mac_addr);
+        eth_zero_addr(priv->bssid);
         p54_setup_mac(priv);
         mutex_unlock(&priv->conf_mutex);
 }
@@ -794,7 +794,7 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
         init_completion(&priv->beacon_comp);
         INIT_DELAYED_WORK(&priv->work, p54_work);
 
-        memset(&priv->mc_maclist[0], ~0, ETH_ALEN);
+        eth_broadcast_addr(priv->mc_maclist[0]);
         priv->curchan = NULL;
         p54_reset_stats(priv);
         return dev;
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 8330fa33e50b..477f86354dc5 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -808,7 +808,7 @@ static int ray_dev_init(struct net_device *dev)
 
         /* copy mac and broadcast addresses to linux device */
         memcpy(dev->dev_addr, &local->sparm.b4.a_mac_addr, ADDRLEN);
-        memset(dev->broadcast, 0xff, ETH_ALEN);
+        eth_broadcast_addr(dev->broadcast);
 
         dev_dbg(&link->dev, "ray_dev_init ending\n");
         return 0;
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 60d44ce9c017..d72ff8e7125d 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -199,13 +199,13 @@ enum ndis_80211_pmkid_cand_list_flag_bits {
 
 struct ndis_80211_auth_request {
         __le32 length;
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         u8 padding[2];
         __le32 flags;
 } __packed;
 
 struct ndis_80211_pmkid_candidate {
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         u8 padding[2];
         __le32 flags;
 } __packed;
@@ -248,7 +248,7 @@ struct ndis_80211_conf {
 
 struct ndis_80211_bssid_ex {
         __le32 length;
-        u8 mac[6];
+        u8 mac[ETH_ALEN];
         u8 padding[2];
         struct ndis_80211_ssid ssid;
         __le32 privacy;
@@ -283,7 +283,7 @@ struct ndis_80211_key {
         __le32 size;
         __le32 index;
         __le32 length;
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         u8 padding[6];
         u8 rsc[8];
         u8 material[32];
@@ -292,7 +292,7 @@ struct ndis_80211_key {
 struct ndis_80211_remove_key {
         __le32 size;
         __le32 index;
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         u8 padding[2];
 } __packed;
 
@@ -310,7 +310,7 @@ struct ndis_80211_assoc_info {
         struct req_ie {
                 __le16 capa;
                 __le16 listen_interval;
-                u8 cur_ap_address[6];
+                u8 cur_ap_address[ETH_ALEN];
         } req_ie;
         __le32 req_ie_length;
         __le32 offset_req_ies;
@@ -338,7 +338,7 @@ struct ndis_80211_capability {
 } __packed;
 
 struct ndis_80211_bssid_info {
-        u8 bssid[6];
+        u8 bssid[ETH_ALEN];
         u8 pmkid[16];
 } __packed;
 
@@ -1037,7 +1037,7 @@ static int get_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
                               bssid, &len);
 
         if (ret != 0)
-                memset(bssid, 0, ETH_ALEN);
+                eth_zero_addr(bssid);
 
         return ret;
 }
@@ -1391,7 +1391,7 @@ static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,
         priv->encr_keys[index].len = key_len;
         priv->encr_keys[index].cipher = cipher;
         memcpy(&priv->encr_keys[index].material, key, key_len);
-        memset(&priv->encr_keys[index].bssid, 0xff, ETH_ALEN);
+        eth_broadcast_addr(priv->encr_keys[index].bssid);
 
         return 0;
 }
@@ -1466,7 +1466,7 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
         } else {
                 /* group key */
                 if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
-                        memset(ndis_key.bssid, 0xff, ETH_ALEN);
+                        eth_broadcast_addr(ndis_key.bssid);
                 else
                         get_bssid(usbdev, ndis_key.bssid);
         }
@@ -1486,7 +1486,7 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
         if (flags & NDIS_80211_ADDKEY_PAIRWISE_KEY)
                 memcpy(&priv->encr_keys[index].bssid, ndis_key.bssid, ETH_ALEN);
         else
-                memset(&priv->encr_keys[index].bssid, 0xff, ETH_ALEN);
+                eth_broadcast_addr(priv->encr_keys[index].bssid);
 
         if (flags & NDIS_80211_ADDKEY_TRANSMIT_KEY)
                 priv->encr_tx_key_index = index;
@@ -2280,7 +2280,7 @@ static int rndis_disconnect(struct wiphy *wiphy, struct net_device *dev,
         netdev_dbg(usbdev->net, "cfg80211.disconnect(%d)\n", reason_code);
 
         priv->connected = false;
-        memset(priv->bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->bssid);
 
         return deauthenticate(usbdev);
 }
@@ -2392,7 +2392,7 @@ static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
         netdev_dbg(usbdev->net, "cfg80211.leave_ibss()\n");
 
         priv->connected = false;
-        memset(priv->bssid, 0, ETH_ALEN);
+        eth_zero_addr(priv->bssid);
 
         return deauthenticate(usbdev);
 }
@@ -2857,7 +2857,7 @@ static void rndis_wlan_do_link_down_work(struct usbnet *usbdev)
 
         if (priv->connected) {
                 priv->connected = false;
-                memset(priv->bssid, 0, ETH_ALEN);
+                eth_zero_addr(priv->bssid);
 
                 deauthenticate(usbdev);
 
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 8444313eabe2..6ec2466b52b6 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -233,6 +233,7 @@ static int rt2800usb_autorun_detect(struct rt2x00_dev *rt2x00dev)
 {
         __le32 *reg;
         u32 fw_mode;
+        int ret;
 
         reg = kmalloc(sizeof(*reg), GFP_KERNEL);
         if (reg == NULL)
@@ -242,11 +243,14 @@ static int rt2800usb_autorun_detect(struct rt2x00_dev *rt2x00dev)
          * magic value USB_MODE_AUTORUN (0x11) to the device, thus the
          * returned value would be invalid.
          */
-        rt2x00usb_vendor_request(rt2x00dev, USB_DEVICE_MODE,
-                                 USB_VENDOR_REQUEST_IN, 0, USB_MODE_AUTORUN,
-                                 reg, sizeof(*reg), REGISTER_TIMEOUT_FIRMWARE);
+        ret = rt2x00usb_vendor_request(rt2x00dev, USB_DEVICE_MODE,
+                                       USB_VENDOR_REQUEST_IN, 0,
+                                       USB_MODE_AUTORUN, reg, sizeof(*reg),
+                                       REGISTER_TIMEOUT_FIRMWARE);
         fw_mode = le32_to_cpu(*reg);
         kfree(reg);
+        if (ret < 0)
+                return ret;
 
         if ((fw_mode & 0x00000003) == 2)
                 return 1;
@@ -289,6 +293,7 @@ static int rt2800usb_write_firmware(struct rt2x00_dev *rt2x00dev,
         if (retval) {
                 rt2x00_info(rt2x00dev,
                             "Firmware loading not required - NIC in AutoRun mode\n");
+                __clear_bit(REQUIRE_FIRMWARE, &rt2x00dev->cap_flags);
         } else {
                 rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
                                               data + offset, length);
@@ -374,7 +379,6 @@ static int rt2800usb_enable_radio(struct rt2x00_dev *rt2x00dev)
 static void rt2800usb_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
         rt2800_disable_radio(rt2x00dev);
-        rt2x00usb_disable_radio(rt2x00dev);
 }
 
 static int rt2800usb_set_state(struct rt2x00_dev *rt2x00dev,
@@ -1040,6 +1044,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x07d1, 0x3c17) },
         { USB_DEVICE(0x2001, 0x3317) },
         { USB_DEVICE(0x2001, 0x3c1b) },
+        { USB_DEVICE(0x2001, 0x3c25) },
         /* Draytek */
         { USB_DEVICE(0x07fa, 0x7712) },
         /* DVICO */
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index 8f85fbd5f237..569363da00a2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -199,7 +199,7 @@ static inline void rt2x00usb_register_read(struct rt2x00_dev *rt2x00dev,
                                            const unsigned int offset,
                                            u32 *value)
 {
-        __le32 reg;
+        __le32 reg = 0;
         rt2x00usb_vendor_request_buff(rt2x00dev, USB_MULTI_READ,
                                       USB_VENDOR_REQUEST_IN, offset,
                                       &reg, sizeof(reg));
@@ -219,7 +219,7 @@ static inline void rt2x00usb_register_read_lock(struct rt2x00_dev *rt2x00dev,
                                                 const unsigned int offset,
                                                 u32 *value)
 {
-        __le32 reg;
+        __le32 reg = 0;
         rt2x00usb_vendor_req_buff_lock(rt2x00dev, USB_MULTI_READ,
                                        USB_VENDOR_REQUEST_IN, offset,
                                        &reg, sizeof(reg), REGISTER_TIMEOUT);
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 074f716020aa..01f56c7df8b5 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -1315,7 +1315,8 @@ static void setup_arp_tx(struct rtl_priv *rtlpriv, struct rtl_ps_ctl *ppsc)
 }
 
 /*should call before software enc*/
-u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
+u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,
+                       bool is_enc)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
@@ -1344,7 +1345,9 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                 break;
         }
 
-        offset = mac_hdr_len + SNAP_SIZE + encrypt_header_len;
+        offset = mac_hdr_len + SNAP_SIZE;
+        if (is_enc)
+                offset += encrypt_header_len;
         ether_type = be16_to_cpup((__be16 *)(skb->data + offset));
 
         if (ETH_P_IP == ether_type) {
diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h
index c6cb49c3ee32..74233d601a90 100644
--- a/drivers/net/wireless/rtlwifi/base.h
+++ b/drivers/net/wireless/rtlwifi/base.h
@@ -45,9 +45,6 @@ enum ap_peer {
 #define RTL_TX_DESC_SIZE        32
 #define RTL_TX_HEADER_SIZE      (RTL_TX_DESC_SIZE + RTL_TX_DUMMY_SIZE)
 
-#define HT_AMSDU_SIZE_4K        3839
-#define HT_AMSDU_SIZE_8K        7935
-
 #define MAX_BIT_RATE_40MHZ_MCS15        300     /* Mbps */
 #define MAX_BIT_RATE_40MHZ_MCS7         150     /* Mbps */
 
@@ -61,9 +58,6 @@ enum ap_peer {
 #define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS9    390     /* Mbps */
 #define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS7    293     /* Mbps */
 
-#define RTL_RATE_COUNT_LEGACY           12
-#define RTL_CHANNEL_COUNT               14
-
 #define FRAME_OFFSET_FRAME_CONTROL      0
 #define FRAME_OFFSET_DURATION           2
 #define FRAME_OFFSET_ADDRESS1           4
@@ -126,10 +120,10 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
 int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht,
                          bool isvht, u8 desc_rate);
 bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);
-u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
+u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,
+                       bool is_enc);
 
 void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);
-void rtl_watch_dog_timer_callback(unsigned long data);
 int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         struct ieee80211_sta *sta, u16 tid, u16 *ssn);
 int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
diff --git a/drivers/net/wireless/rtlwifi/cam.h b/drivers/net/wireless/rtlwifi/cam.h
index 35508087c0c5..e2e647d511c1 100644
--- a/drivers/net/wireless/rtlwifi/cam.h
+++ b/drivers/net/wireless/rtlwifi/cam.h
@@ -28,13 +28,11 @@
 
 #define CAM_CONTENT_COUNT                               8
 
-#define CFG_DEFAULT_KEY                                 BIT(5)
 #define CFG_VALID                                       BIT(15)
 
 #define PAIRWISE_KEYIDX                                 0
 #define CAM_PAIRWISE_KEY_POSITION                       4
 
-#define CAM_CONFIG_USEDK                                1
 #define CAM_CONFIG_NO_USEDK                             0
 
 void rtl_cam_reset_all_entry(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index a31a12775f1a..3b3a88b53b11 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -195,7 +195,7 @@ static void rtl_op_stop(struct ieee80211_hw *hw)
         if (!(support_remote_wakeup &&
               rtlhal->enter_pnp_sleep)) {
                 mac->link_state = MAC80211_NOLINK;
-                memset(mac->bssid, 0, 6);
+                eth_zero_addr(mac->bssid);
                 mac->vendor = PEER_UNKNOWN;
 
                 /* reset sec info */
@@ -357,7 +357,7 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
         mac->p2p = 0;
         mac->vif = NULL;
         mac->link_state = MAC80211_NOLINK;
-        memset(mac->bssid, 0, ETH_ALEN);
+        eth_zero_addr(mac->bssid);
         mac->vendor = PEER_UNKNOWN;
         mac->opmode = NL80211_IFTYPE_UNSPECIFIED;
         rtlpriv->cfg->ops->set_network_type(hw, mac->opmode);
@@ -1157,7 +1157,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         if (ppsc->p2p_ps_info.p2p_ps_mode > P2P_PS_NONE)
                                 rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
                         mac->link_state = MAC80211_NOLINK;
-                        memset(mac->bssid, 0, ETH_ALEN);
+                        eth_zero_addr(mac->bssid);
                         mac->vendor = PEER_UNKNOWN;
                         mac->mode = 0;
 
diff --git a/drivers/net/wireless/rtlwifi/core.h b/drivers/net/wireless/rtlwifi/core.h
index 7b64e34f421e..82733c6b8c46 100644
--- a/drivers/net/wireless/rtlwifi/core.h
+++ b/drivers/net/wireless/rtlwifi/core.h
@@ -33,8 +33,6 @@
         FIF_FCSFAIL | \
         FIF_BCN_PRBRESP_PROMISC)
 
-#define RTL_SUPPORTED_CTRL_FILTER       0xFF
-
 #define DM_DIG_THRESH_HIGH              40
 #define DM_DIG_THRESH_LOW               35
 #define DM_FALSEALARM_THRESH_LOW        400
diff --git a/drivers/net/wireless/rtlwifi/efuse.h b/drivers/net/wireless/rtlwifi/efuse.h
index fdab8240a5d7..be02e7894c61 100644
--- a/drivers/net/wireless/rtlwifi/efuse.h
+++ b/drivers/net/wireless/rtlwifi/efuse.h
@@ -40,12 +40,6 @@
 #define PG_STATE_WORD_3                 0x10
 #define PG_STATE_DATA                   0x20
 
-#define PG_SWBYTE_H                     0x01
-#define PG_SWBYTE_L                     0x02
-
-#define _POWERON_DELAY_
-#define _PRE_EXECUTE_READ_CMD_
-
 #define EFUSE_REPEAT_THRESHOLD_         3
 #define EFUSE_ERROE_HANDLE              1
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 8c45cf44ce24..f46c9d7f6528 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -887,7 +887,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                                 unicast = true;
                                 rtlpriv->stats.rxbytesunicast += skb->len;
                         }
-                        rtl_is_special_data(hw, skb, false);
+                        rtl_is_special_data(hw, skb, false, true);
 
                         if (ieee80211_is_data(fc)) {
                                 rtlpriv->cfg->ops->led_control(hw, LED_CTL_RX);
diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c
index 7863bd278b22..74c14ce28238 100644
--- a/drivers/net/wireless/rtlwifi/rc.c
+++ b/drivers/net/wireless/rtlwifi/rc.c
@@ -56,7 +56,8 @@ static u8 _rtl_rc_get_highest_rix(struct rtl_priv *rtlpriv,
                 wireless_mode = sta_entry->wireless_mode;
         }
 
-        if (rtl_is_special_data(rtlpriv->mac80211.hw, skb, true) || not_data) {
+        if (rtl_is_special_data(rtlpriv->mac80211.hw, skb, true, false) ||
+            not_data) {
                 return 0;
         } else {
                 if (rtlhal->current_bandtype == BAND_ON_2_4G) {
@@ -201,7 +202,7 @@ static void rtl_tx_status(void *ppriv,
         if (!priv_sta || !ieee80211_is_data(fc))
                 return;
 
-        if (rtl_is_special_data(mac->hw, skb, true))
+        if (rtl_is_special_data(mac->hw, skb, true, true))
                 return;
 
         if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
index d9ea9d0c79a5..0532b9852444 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
@@ -26,53 +26,12 @@
 #ifndef __RTL92C_DEF_H__
 #define __RTL92C_DEF_H__
 
-#define HAL_RETRY_LIMIT_INFRA                           48
-#define HAL_RETRY_LIMIT_AP_ADHOC                        7
-
-#define RESET_DELAY_8185                                20
-
-#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
-#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
-
-#define NUM_OF_FIRMWARE_QUEUE                           10
-#define NUM_OF_PAGES_IN_FW                              0x100
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA                    0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT                    0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH                    0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
-
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM                  0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM                  0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM                  0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM                  0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM                 0x00
-
-#define MAX_LINES_HWCONFIG_TXT                          1000
-#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
-
-#define SW_THREE_WIRE                                   0
-#define HW_THREE_WIRE                                   2
-
-#define BT_DEMO_BOARD                                   0
-#define BT_QA_BOARD                                     1
-#define BT_FPGA                                         2
-
 #define HAL_PRIME_CHNL_OFFSET_DONT_CARE                 0
 #define HAL_PRIME_CHNL_OFFSET_LOWER                     1
 #define HAL_PRIME_CHNL_OFFSET_UPPER                     2
 
-#define MAX_H2C_QUEUE_NUM                               10
-
 #define RX_MPDU_QUEUE                                   0
 #define RX_CMD_QUEUE                                    1
-#define RX_MAX_QUEUE                                    2
-#define AC2QUEUEID(_AC)                                 (_AC)
 
 #define C2H_RX_CMD_HDR_LEN                              8
 #define GET_C2H_CMD_CMD_LEN(__prxhdr)                   \
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
index f2b9713c456e..86ce5b1930e6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
@@ -30,6 +30,7 @@
 #include "../cam.h"
 #include "../ps.h"
 #include "../pci.h"
+#include "../pwrseqcmd.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -566,7 +567,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 acm_ctrl &= (~ACMHW_VIQEN);
                                 break;
                         case AC3_VO:
-                                acm_ctrl &= (~ACMHW_BEQEN);
+                                acm_ctrl &= (~ACMHW_VOQEN);
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -885,7 +886,7 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
 
         rtl_write_word(rtlpriv, REG_CR, 0x2ff);
         rtl_write_byte(rtlpriv, REG_CR+1, 0x06);
-        rtl_write_byte(rtlpriv, REG_CR+2, 0x00);
+        rtl_write_byte(rtlpriv, MSR, 0x00);
 
         if (!rtlhal->mac_func_enable) {
                 if (_rtl88ee_llt_table_init(hw) == false) {
@@ -1277,7 +1278,7 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw,
                          mode);
         }
 
-        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
+        rtl_write_byte(rtlpriv, MSR, bt_msr | mode);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
         if (mode == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
index 3f6c59cdeaba..a2bb02c7b837 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
@@ -452,9 +452,10 @@ static void handle_branch1(struct ieee80211_hw *hw, u16 arraylen,
                                 READ_NEXT_PAIR(v1, v2, i);
                                 while (v2 != 0xDEAD &&
                                        v2 != 0xCDEF &&
-                                       v2 != 0xCDCD && i < arraylen - 2)
+                                       v2 != 0xCDCD && i < arraylen - 2) {
                                         _rtl8188e_config_bb_reg(hw, v1, v2);
                                         READ_NEXT_PAIR(v1, v2, i);
+                                }
 
                                 while (v2 != 0xDEAD && i < arraylen - 2)
                                         READ_NEXT_PAIR(v1, v2, i);
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
index 5c1472d88fd4..0eca030e3238 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
@@ -27,7 +27,6 @@
 #define __RTL92C_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
-#define RF6052_MAX_REG                  0x3F
 
 void rtl88e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
                                      u8 bandwidth);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
index 9b660df6fd71..690a7a1675e2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
@@ -30,59 +30,18 @@
 #ifndef __RTL92C_DEF_H__
 #define __RTL92C_DEF_H__
 
-#define HAL_RETRY_LIMIT_INFRA                           48
-#define HAL_RETRY_LIMIT_AP_ADHOC                        7
-
 #define PHY_RSSI_SLID_WIN_MAX                           100
 #define PHY_LINKQUALITY_SLID_WIN_MAX                    20
 #define PHY_BEACON_RSSI_SLID_WIN_MAX                    10
 
-#define RESET_DELAY_8185                                20
-
-#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
-#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
-
-#define NUM_OF_FIRMWARE_QUEUE                           10
-#define NUM_OF_PAGES_IN_FW                              0x100
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA                    0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT                    0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH                    0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
-
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM                  0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM                  0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM                  0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM                  0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM                 0x00
-
-#define MAX_LINES_HWCONFIG_TXT                          1000
-#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
-
-#define SW_THREE_WIRE                                   0
-#define HW_THREE_WIRE                                   2
-
-#define BT_DEMO_BOARD                                   0
-#define BT_QA_BOARD                                     1
-#define BT_FPGA                                         2
-
 #define RX_SMOOTH_FACTOR                                20
 
 #define HAL_PRIME_CHNL_OFFSET_DONT_CARE                 0
 #define HAL_PRIME_CHNL_OFFSET_LOWER                     1
 #define HAL_PRIME_CHNL_OFFSET_UPPER                     2
 
-#define MAX_H2C_QUEUE_NUM                               10
-
 #define RX_MPDU_QUEUE                                   0
 #define RX_CMD_QUEUE                                    1
-#define RX_MAX_QUEUE                                    2
-#define AC2QUEUEID(_AC)                                 (_AC)
 
 #define C2H_RX_CMD_HDR_LEN                              8
 #define GET_C2H_CMD_CMD_LEN(__prxhdr)           \
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 303b299376c9..04eb5c3f8464 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -363,7 +363,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         acm_ctrl &= (~AcmHw_ViqEn);
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl &= (~AcmHw_BeqEn);
+                                        acm_ctrl &= (~AcmHw_VoqEn);
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
index d8fe68b389d2..ebd72cae10b6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
@@ -31,7 +31,6 @@
 #define __RTL92C_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
-#define RF6052_MAX_REG                  0x3F
 #define RF6052_MAX_PATH                 2
 
 void rtl92ce_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index fe4b699a12f5..d310d55d800e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1364,7 +1364,7 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw,
                          "Network type %d not supported!\n", type);
                 goto error_out;
         }
-        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+        rtl_write_byte(rtlpriv, MSR, bt_msr);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
         if ((bt_msr & MSR_MASK) == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
@@ -1471,8 +1471,7 @@ static void _InitBeaconParameters(struct ieee80211_hw *hw)
                 rtl_write_word(rtlpriv, REG_BCNTCFG, 0x66FF);
 }
 
-static void _beacon_function_enable(struct ieee80211_hw *hw, bool Enable,
-                                    bool Linked)
+static void _beacon_function_enable(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
@@ -1517,7 +1516,7 @@ void rtl92cu_set_beacon_related_registers(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_CCK, 0x50);
                 rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_OFDM, 0x50);
         }
-        _beacon_function_enable(hw, true, true);
+        _beacon_function_enable(hw);
 }
 
 void rtl92cu_set_beacon_interval(struct ieee80211_hw *hw)
@@ -1589,6 +1588,8 @@ void rtl92cu_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_DATA_FILTER:
                 *((u16 *) (val)) = rtl_read_word(rtlpriv, REG_RXFLTMAP2);
                 break;
+        case HAL_DEF_WOWLAN:
+                break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "switch case not processed\n");
@@ -1871,7 +1872,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         acm_ctrl &= (~AcmHw_ViqEn);
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl &= (~AcmHw_BeqEn);
+                                        acm_ctrl &= (~AcmHw_VoqEn);
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
index c1e33b0228c0..67588083e6cc 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
@@ -32,8 +32,6 @@
 
 #define H2C_RA_MASK     6
 
-#define LLT_POLLING_LLT_THRESHOLD               20
-#define LLT_POLLING_READY_TIMEOUT_COUNT         100
 #define LLT_LAST_ENTRY_OF_TX_PKT_BUFFER         255
 
 #define RX_PAGE_SIZE_REG_VALUE                  PBP_128
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 133e395b7401..adb810794eef 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -497,7 +497,7 @@ int rtl92c_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
                          "Network type %d not supported!\n", type);
                 return -EOPNOTSUPP;
         }
-        rtl_write_byte(rtlpriv, (REG_CR + 2), value);
+        rtl_write_byte(rtlpriv, MSR, value);
         return 0;
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
index 11b439d6b671..6f987de5b441 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
@@ -31,7 +31,6 @@
 #define __RTL92CU_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
-#define RF6052_MAX_REG                  0x3F
 #define RF6052_MAX_PATH                 2
 
 void rtl92cu_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 90a714c189a8..23806c243a53 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -321,6 +321,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
         {RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/
         {RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/
         {RTL_USB_DEVICE(0x0846, 0x9041, rtl92cu_hal_cfg)}, /*NetGear WNA1000M*/
+        {RTL_USB_DEVICE(0x0b05, 0x17ba, rtl92cu_hal_cfg)}, /*ASUS-Edimax*/
         {RTL_USB_DEVICE(0x0bda, 0x5088, rtl92cu_hal_cfg)}, /*Thinkware-CC&C*/
         {RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/
         {RTL_USB_DEVICE(0x0df6, 0x005c, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/
@@ -377,6 +378,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
         {RTL_USB_DEVICE(0x2001, 0x3307, rtl92cu_hal_cfg)}, /*D-Link-Cameo*/
         {RTL_USB_DEVICE(0x2001, 0x3309, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/
         {RTL_USB_DEVICE(0x2001, 0x330a, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/
+        {RTL_USB_DEVICE(0x2001, 0x330d, rtl92cu_hal_cfg)}, /*D-Link DWA-131 */
         {RTL_USB_DEVICE(0x2019, 0xab2b, rtl92cu_hal_cfg)}, /*Planex -Abocom*/
         {RTL_USB_DEVICE(0x20f4, 0x624d, rtl92cu_hal_cfg)}, /*TRENDNet*/
         {RTL_USB_DEVICE(0x2357, 0x0100, rtl92cu_hal_cfg)}, /*TP-Link WN8200ND*/
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/def.h b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
index 939c905f547f..0a443ed17cf4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
@@ -35,61 +35,22 @@
 #define MAX_MSS_DENSITY_1T                              0x0A
 
 #define RF6052_MAX_TX_PWR                               0x3F
-#define RF6052_MAX_REG                                  0x3F
 #define RF6052_MAX_PATH                                 2
 
-#define HAL_RETRY_LIMIT_INFRA                           48
-#define HAL_RETRY_LIMIT_AP_ADHOC                        7
-
 #define PHY_RSSI_SLID_WIN_MAX                           100
 #define PHY_LINKQUALITY_SLID_WIN_MAX                    20
 #define PHY_BEACON_RSSI_SLID_WIN_MAX                    10
 
-#define RESET_DELAY_8185                                20
-
-#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
 #define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
 
-#define NUM_OF_FIRMWARE_QUEUE                           10
-#define NUM_OF_PAGES_IN_FW                              0x100
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA                    0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT                    0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH                    0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
-
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM                  0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM                  0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM                  0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM                  0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM                 0x00
-
-#define MAX_LINES_HWCONFIG_TXT                          1000
-#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
-
-#define SW_THREE_WIRE                                   0
-#define HW_THREE_WIRE                                   2
-
-#define BT_DEMO_BOARD                                   0
-#define BT_QA_BOARD                                     1
-#define BT_FPGA                                         2
-
 #define RX_SMOOTH_FACTOR                                20
 
 #define HAL_PRIME_CHNL_OFFSET_DONT_CARE                 0
 #define HAL_PRIME_CHNL_OFFSET_LOWER                     1
 #define HAL_PRIME_CHNL_OFFSET_UPPER                     2
 
-#define MAX_H2C_QUEUE_NUM                               10
-
 #define RX_MPDU_QUEUE                                   0
 #define RX_CMD_QUEUE                                    1
-#define RX_MAX_QUEUE                                    2
 
 #define C2H_RX_CMD_HDR_LEN                              8
 #define GET_C2H_CMD_CMD_LEN(__prxhdr)                   \
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index 01bcc2d218dc..f49b60d31450 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -1126,7 +1126,7 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw,
                 break;
 
         }
-        rtl_write_byte(rtlpriv, REG_CR + 2, bt_msr);
+        rtl_write_byte(rtlpriv, MSR, bt_msr);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
         if ((bt_msr & MSR_MASK) == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
index b461b3128da5..da0a6125f314 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
@@ -562,7 +562,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 acm_ctrl &= (~ACMHW_VIQEN);
                                 break;
                         case AC3_VO:
-                                acm_ctrl &= (~ACMHW_BEQEN);
+                                acm_ctrl &= (~ACMHW_VOQEN);
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
@@ -1510,7 +1510,7 @@ static int _rtl92ee_set_media_status(struct ieee80211_hw *hw,
                          mode);
         }
 
-        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
+        rtl_write_byte(rtlpriv, MSR, bt_msr | mode);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
         if (mode == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/rf.h b/drivers/net/wireless/rtlwifi/rtl8192ee/rf.h
index 8bdeed3c064e..039c0133ad6b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/rf.h
@@ -27,7 +27,6 @@
 #define __RTL92E_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
-#define RF6052_MAX_REG                  0x3F
 
 void rtl92ee_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
                                       u8 bandwidth);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
index ef87c09b77d0..41466f957cdc 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
@@ -31,7 +31,6 @@
 
 #define RX_MPDU_QUEUE                           0
 #define RX_CMD_QUEUE                            1
-#define RX_MAX_QUEUE                            2
 
 #define SHORT_SLOT_TIME                         9
 #define NON_SHORT_SLOT_TIME                     20
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 5761d5b49e39..12b0978ba4fa 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -293,7 +293,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         acm_ctrl &= (~AcmHw_ViqEn);
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl &= (~AcmHw_BeqEn);
+                                        acm_ctrl &= (~AcmHw_VoqEn);
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -1204,7 +1204,7 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw,
         if (type != NL80211_IFTYPE_AP &&
             rtlpriv->mac80211.link_state < MAC80211_LINKED)
                 bt_msr = rtl_read_byte(rtlpriv, MSR) & ~MSR_LINK_MASK;
-        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+        rtl_write_byte(rtlpriv, MSR, bt_msr);
 
         temp = rtl_read_dword(rtlpriv, TCR);
         rtl_write_dword(rtlpriv, TCR, temp & (~BIT(8)));
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/def.h b/drivers/net/wireless/rtlwifi/rtl8723ae/def.h
index 94bdd4bbca5d..bcdf2273688e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/def.h
@@ -26,53 +26,12 @@
 #ifndef __RTL8723E_DEF_H__
 #define __RTL8723E_DEF_H__
 
-#define HAL_RETRY_LIMIT_INFRA                           48
-#define HAL_RETRY_LIMIT_AP_ADHOC                        7
-
-#define RESET_DELAY_8185                                        20
-
-#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
-#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
-
-#define NUM_OF_FIRMWARE_QUEUE                           10
-#define NUM_OF_PAGES_IN_FW                                      0x100
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA            0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT            0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH            0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
-
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM          0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM          0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM          0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM          0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM         0x00
-
-#define MAX_LINES_HWCONFIG_TXT                          1000
-#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
-
-#define SW_THREE_WIRE                                           0
-#define HW_THREE_WIRE                                           2
-
-#define BT_DEMO_BOARD                                           0
-#define BT_QA_BOARD                                                     1
-#define BT_FPGA                                                         2
-
 #define HAL_PRIME_CHNL_OFFSET_DONT_CARE         0
 #define HAL_PRIME_CHNL_OFFSET_LOWER                     1
 #define HAL_PRIME_CHNL_OFFSET_UPPER                     2
 
-#define MAX_H2C_QUEUE_NUM                                       10
-
 #define RX_MPDU_QUEUE                                           0
 #define RX_CMD_QUEUE                                            1
-#define RX_MAX_QUEUE                                            2
-#define AC2QUEUEID(_AC)                                         (_AC)
 
 #define C2H_RX_CMD_HDR_LEN                                      8
 #define GET_C2H_CMD_CMD_LEN(__prxhdr)           \
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index aa085462d0e9..67bb47d77b68 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -362,7 +362,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         acm_ctrl &= (~ACMHW_VIQEN);
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl &= (~ACMHW_BEQEN);
+                                        acm_ctrl &= (~ACMHW_VOQEN);
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
@@ -1183,7 +1183,7 @@ static int _rtl8723e_set_media_status(struct ieee80211_hw *hw,
                          mode);
         }
 
-        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
+        rtl_write_byte(rtlpriv, MSR, bt_msr | mode);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
         if (mode == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h b/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h
index f3f45b16361f..7b44ebc0fac9 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h
@@ -27,7 +27,6 @@
 #define __RTL8723E_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
-#define RF6052_MAX_REG                  0x3F
 
 void rtl8723e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
                                        u8 bandwidth);
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
index 6dad28e77bbb..b681af3c7a35 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
@@ -603,7 +603,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 acm_ctrl &= (~ACMHW_VIQEN);
                                 break;
                         case AC3_VO:
-                                acm_ctrl &= (~ACMHW_BEQEN);
+                                acm_ctrl &= (~ACMHW_VOQEN);
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
@@ -1558,7 +1558,7 @@ static int _rtl8723be_set_media_status(struct ieee80211_hw *hw,
                          mode);
         }
 
-        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
+        rtl_write_byte(rtlpriv, MSR, bt_msr | mode);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
         if (mode == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/rf.h b/drivers/net/wireless/rtlwifi/rtl8723be/rf.h
index a6fea106ced4..f423e157020f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/rf.h
@@ -27,7 +27,6 @@
 #define __RTL8723BE_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
-#define RF6052_MAX_REG                  0x3F
 
 void rtl8723be_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
                                         u8 bandwidth);
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/def.h b/drivers/net/wireless/rtlwifi/rtl8821ae/def.h
index ee7c208bd070..dfbdf539de1a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/def.h
@@ -118,55 +118,14 @@
 #define WIFI_NAV_UPPER_US                               30000
 #define HAL_92C_NAV_UPPER_UNIT                  128
 
-#define HAL_RETRY_LIMIT_INFRA                           48
-#define HAL_RETRY_LIMIT_AP_ADHOC                        7
-
-#define RESET_DELAY_8185                                        20
-
-#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
-#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
-
-#define NUM_OF_FIRMWARE_QUEUE                           10
-#define NUM_OF_PAGES_IN_FW                                      0x100
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA            0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT            0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH            0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
-
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM          0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM          0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM          0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM          0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM         0x00
-
 #define MAX_RX_DMA_BUFFER_SIZE                          0x3E80
 
-#define MAX_LINES_HWCONFIG_TXT                          1000
-#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
-
-#define SW_THREE_WIRE                                           0
-#define HW_THREE_WIRE                                           2
-
-#define BT_DEMO_BOARD                                           0
-#define BT_QA_BOARD                                                     1
-#define BT_FPGA                                                         2
-
 #define HAL_PRIME_CHNL_OFFSET_DONT_CARE         0
 #define HAL_PRIME_CHNL_OFFSET_LOWER                     1
 #define HAL_PRIME_CHNL_OFFSET_UPPER                     2
 
-#define MAX_H2C_QUEUE_NUM                                       10
-
 #define RX_MPDU_QUEUE                                           0
 #define RX_CMD_QUEUE                                            1
-#define RX_MAX_QUEUE                                            2
-#define AC2QUEUEID(_AC)                                         (_AC)
 
 #define MAX_RX_DMA_BUFFER_SIZE_8812     0x3E80
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
index 8ec8200002c7..8704eee9f3a4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
@@ -423,7 +423,7 @@ void rtl8821ae_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 *((u16 *)(val+4)) = rtl_read_word(rtlpriv, REG_BSSID+4);
                 break;
         case HW_VAR_MEDIA_STATUS:
-                val[0] = rtl_read_byte(rtlpriv, REG_CR+2) & 0x3;
+                val[0] = rtl_read_byte(rtlpriv, MSR) & 0x3;
                 break;
         case HW_VAR_SLOT_TIME:
                 *((u8 *)(val)) = mac->slot_time;
@@ -667,7 +667,7 @@ void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 acm_ctrl &= (~ACMHW_VIQEN);
                                 break;
                         case AC3_VO:
-                                acm_ctrl &= (~ACMHW_BEQEN);
+                                acm_ctrl &= (~ACMHW_VOQEN);
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
@@ -1515,7 +1515,7 @@ static bool _rtl8821ae_dynamic_rqpn(struct ieee80211_hw *hw, u32 boundary,
                                       (u8 *)(&support_remote_wakeup));
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "boundary=0x%#X, NPQ_RQPNValue=0x%#X, RQPNValue=0x%#X\n",
+                 "boundary=%#X, NPQ_RQPNValue=%#X, RQPNValue=%#X\n",
                   boundary, npq_rqpn_value, rqpn_val);
 
         /* stop PCIe DMA
@@ -2178,7 +2178,7 @@ static int _rtl8821ae_set_media_status(struct ieee80211_hw *hw,
                 return 1;
         }
 
-        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+        rtl_write_byte(rtlpriv, MSR, bt_msr);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
         if ((bt_msr & 0xfc) == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/rf.h b/drivers/net/wireless/rtlwifi/rtl8821ae/rf.h
index d9582ee1c335..efd22bd0b139 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/rf.h
@@ -27,7 +27,6 @@
 #define __RTL8821AE_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
-#define RF6052_MAX_REG                  0x3F
 
 void rtl8821ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
                                         u8 bandwidth);
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
index 72af4b9ee32b..174743aef943 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
@@ -64,6 +64,20 @@ static u16 odm_cfo(char value)
         return ret_val;
 }
 
+static u8 _rtl8821ae_evm_dbm_jaguar(char value)
+{
+        char ret_val = value;
+
+        /* -33dB~0dB to 33dB ~ 0dB*/
+        if (ret_val == -128)
+                ret_val = 127;
+        else if (ret_val < 0)
+                ret_val = 0 - ret_val;
+
+        ret_val  = ret_val >> 1;
+        return ret_val;
+}
+
 static void query_rxphystatus(struct ieee80211_hw *hw,
                               struct rtl_stats *pstatus, u8 *pdesc,
                               struct rx_fwinfo_8821ae *p_drvinfo,
@@ -246,7 +260,7 @@ static void query_rxphystatus(struct ieee80211_hw *hw,
 
                 for (i = 0; i < max_spatial_stream; i++) {
                         evm = rtl_evm_db_to_percentage(p_phystrpt->rxevm[i]);
-                        evmdbm = rtl_evm_dbm_jaguar(p_phystrpt->rxevm[i]);
+                        evmdbm = _rtl8821ae_evm_dbm_jaguar(p_phystrpt->rxevm[i]);
 
                         if (bpacket_match_bssid) {
                                 /* Fill value in RFD, Get the first
diff --git a/drivers/net/wireless/rtlwifi/stats.c b/drivers/net/wireless/rtlwifi/stats.c
index 2d0736a09fc0..d8b30690b00d 100644
--- a/drivers/net/wireless/rtlwifi/stats.c
+++ b/drivers/net/wireless/rtlwifi/stats.c
@@ -39,15 +39,8 @@ EXPORT_SYMBOL(rtl_query_rxpwrpercentage);
 
 u8 rtl_evm_db_to_percentage(char value)
 {
-        char ret_val;
-        ret_val = value;
+        char ret_val = clamp(-value, 0, 33) * 3;
 
-        if (ret_val >= 0)
-                ret_val = 0;
-        if (ret_val <= -33)
-                ret_val = -33;
-        ret_val = 0 - ret_val;
-        ret_val *= 3;
         if (ret_val == 99)
                 ret_val = 100;
 
@@ -55,21 +48,6 @@ u8 rtl_evm_db_to_percentage(char value)
 }
 EXPORT_SYMBOL(rtl_evm_db_to_percentage);
 
-u8 rtl_evm_dbm_jaguar(char value)
-{
-        char ret_val = value;
-
-        /* -33dB~0dB to 33dB ~ 0dB*/
-        if (ret_val == -128)
-                ret_val = 127;
-        else if (ret_val < 0)
-                ret_val = 0 - ret_val;
-
-        ret_val  = ret_val >> 1;
-        return ret_val;
-}
-EXPORT_SYMBOL(rtl_evm_dbm_jaguar);
-
 static long rtl_translate_todbm(struct ieee80211_hw *hw,
                          u8 signal_strength_index)
 {
diff --git a/drivers/net/wireless/rtlwifi/stats.h b/drivers/net/wireless/rtlwifi/stats.h
index aa4eec80ccf7..2b57dffef572 100644
--- a/drivers/net/wireless/rtlwifi/stats.h
+++ b/drivers/net/wireless/rtlwifi/stats.h
@@ -35,7 +35,6 @@
 
 u8 rtl_query_rxpwrpercentage(char antpower);
 u8 rtl_evm_db_to_percentage(char value);
-u8 rtl_evm_dbm_jaguar(char value);
 long rtl_signal_scale_mapping(struct ieee80211_hw *hw, long currsig);
 void rtl_process_phyinfo(struct ieee80211_hw *hw, u8 *buffer,
                          struct rtl_stats *pstatus);
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index 46ee956d0235..f0188c83c79f 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -701,12 +701,18 @@ free:
 
 static void _rtl_usb_cleanup_rx(struct ieee80211_hw *hw)
 {
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw));
         struct urb *urb;
 
         usb_kill_anchored_urbs(&rtlusb->rx_submitted);
 
         tasklet_kill(&rtlusb->rx_work_tasklet);
+        cancel_work_sync(&rtlpriv->works.lps_change_work);
+
+        flush_workqueue(rtlpriv->works.rtl_wq);
+        destroy_workqueue(rtlpriv->works.rtl_wq);
+
         skb_queue_purge(&rtlusb->rx_queue);
 
         while ((urb = usb_get_from_anchor(&rtlusb->rx_cleanup_urbs))) {
@@ -794,8 +800,6 @@ static void rtl_usb_cleanup(struct ieee80211_hw *hw)
         struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw));
         struct ieee80211_tx_info *txinfo;
 
-        SET_USB_STOP(rtlusb);
-
         /* clean up rx stuff. */
         _rtl_usb_cleanup_rx(hw);
 
@@ -834,7 +838,6 @@ static void rtl_usb_stop(struct ieee80211_hw *hw)
         cancel_work_sync(&rtlpriv->works.fill_h2c_cmd);
         /* Enable software */
         SET_USB_STOP(rtlusb);
-        rtl_usb_deinit(hw);
         rtlpriv->cfg->ops->hw_disable(hw);
 }
 
@@ -1147,9 +1150,9 @@ void rtl_usb_disconnect(struct usb_interface *intf)
 
         if (unlikely(!rtlpriv))
                 return;
-
         /* just in case driver is removed before firmware callback */
         wait_for_completion(&rtlpriv->firmware_loading_complete);
+        clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
         /*ieee80211_unregister_hw will call ops_stop */
         if (rtlmac->mac80211_registered == 1) {
                 ieee80211_unregister_hw(hw);
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index d4ba009ac9aa..5d54d16a59e7 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -468,7 +468,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
         wl1251_tx_flush(wl);
         wl1251_power_off(wl);
 
-        memset(wl->bssid, 0, ETH_ALEN);
+        eth_zero_addr(wl->bssid);
         wl->listen_int = 1;
         wl->bss_type = MAX_BSS_TYPE;
 
@@ -547,7 +547,7 @@ static void wl1251_op_remove_interface(struct ieee80211_hw *hw,
         mutex_lock(&wl->mutex);
         wl1251_debug(DEBUG_MAC80211, "mac80211 remove interface");
         wl->vif = NULL;
-        memset(wl->bssid, 0, ETH_ALEN);
+        eth_zero_addr(wl->bssid);
         mutex_unlock(&wl->mutex);
 }
 
@@ -1608,7 +1608,7 @@ int wl1251_free_hw(struct wl1251 *wl)
 }
 EXPORT_SYMBOL_GPL(wl1251_free_hw);
 
-MODULE_DESCRIPTION("TI wl1251 Wireles LAN Driver Core");
+MODULE_DESCRIPTION("TI wl1251 Wireless LAN Driver Core");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kalle Valo <kvalo@adurom.com>");
 MODULE_FIRMWARE(WL1251_FW_NAME);
diff --git a/drivers/net/wireless/ti/wl18xx/debugfs.c b/drivers/net/wireless/ti/wl18xx/debugfs.c
index c93fae95baac..5fbd2230f372 100644
--- a/drivers/net/wireless/ti/wl18xx/debugfs.c
+++ b/drivers/net/wireless/ti/wl18xx/debugfs.c
@@ -139,7 +139,7 @@ WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, protection_filter, "%u");
 WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, accum_arp_pend_requests, "%u");
 WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, max_arp_queue_dep, "%u");
 
-WL18XX_DEBUGFS_FWSTATS_FILE(rx_rate, rx_frames_per_rates, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(rx_rate, rx_frames_per_rates, 50);
 
 WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(aggr_size, tx_agg_vs_rate,
                                   AGGR_STATS_TX_AGG*AGGR_STATS_TX_RATE);
diff --git a/drivers/net/wireless/ti/wl18xx/event.c b/drivers/net/wireless/ti/wl18xx/event.c
index c28f06854195..548bb9e7e91e 100644
--- a/drivers/net/wireless/ti/wl18xx/event.c
+++ b/drivers/net/wireless/ti/wl18xx/event.c
@@ -77,7 +77,7 @@ static int wlcore_smart_config_sync_event(struct wl1271 *wl, u8 sync_channel,
         wl1271_debug(DEBUG_EVENT,
                      "SMART_CONFIG_SYNC_EVENT_ID, freq: %d (chan: %d band %d)",
                      freq, sync_channel, sync_band);
-        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy, 20,
+        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy, NULL, 20,
                                           WLCORE_VENDOR_EVENT_SC_SYNC,
                                           GFP_KERNEL);
 
@@ -98,7 +98,7 @@ static int wlcore_smart_config_decode_event(struct wl1271 *wl,
         wl1271_debug(DEBUG_EVENT, "SMART_CONFIG_DECODE_EVENT_ID");
         wl1271_dump_ascii(DEBUG_EVENT, "SSID:", ssid, ssid_len);
 
-        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy,
+        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy, NULL,
                                           ssid_len + pwd_len + 20,
                                           WLCORE_VENDOR_EVENT_SC_DECODE,
                                           GFP_KERNEL);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index c26fc2106e5b..68919f8d4310 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -367,7 +367,7 @@ void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid)
         wl->links[*hlid].allocated_pkts = 0;
         wl->links[*hlid].prev_freed_pkts = 0;
         wl->links[*hlid].ba_bitmap = 0;
-        memset(wl->links[*hlid].addr, 0, ETH_ALEN);
+        eth_zero_addr(wl->links[*hlid].addr);
 
         /*
          * At this point op_tx() will not add more packets to the queues. We
@@ -1293,7 +1293,7 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         hdr->frame_control = cpu_to_le16(fc);
         memcpy(hdr->addr1, vif->bss_conf.bssid, ETH_ALEN);
         memcpy(hdr->addr2, vif->addr, ETH_ALEN);
-        memset(hdr->addr3, 0xff, ETH_ALEN);
+        eth_broadcast_addr(hdr->addr3);
 
         ret = wl1271_cmd_template_set(wl, wlvif->role_id, CMD_TEMPL_ARP_RSP,
                                       skb->data, skb->len, 0,
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.h b/drivers/net/wireless/ti/wlcore/debugfs.h
index 0f2cfb0d2a9e..bf14676e6515 100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.h
+++ b/drivers/net/wireless/ti/wlcore/debugfs.h
@@ -26,8 +26,8 @@
 
 #include "wlcore.h"
 
-int wl1271_format_buffer(char __user *userbuf, size_t count,
-                         loff_t *ppos, char *fmt, ...);
+__printf(4, 5) int wl1271_format_buffer(char __user *userbuf, size_t count,
+                                        loff_t *ppos, char *fmt, ...);
 
 int wl1271_debugfs_init(struct wl1271 *wl);
 void wl1271_debugfs_exit(struct wl1271 *wl);