Merge tag 'wireless-drivers-next-for-davem-2019-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 5.1

Most likely the last set of patches for 5.1. WPA3 support to ath10k
and qtnfmac. FTM support to iwlwifi and ath10k. And of course other
new features and bugfixes.

wireless-drivers was merged due to dependency in mt76.

Major changes:

iwlwifi

* HE radiotap

* FTM (Fine Timing Measurement) initiator and responder implementation

* bump supported firmware API to 46

* VHT extended NSS support

* new PCI IDs for 9260 and 22000 series

ath10k

* change QMI interface to support the new (and backwards incompatible)
  interface from HL3.1 and used in recent HL2.0 branch firmware
  releases

* support WPA3 with WCN3990

* support for mac80211 airtime fairness based on transmit rate
  estimation, the firmware needs to support WMI_SERVICE_PEER_STATS to
  enable this

* report transmit airtime to mac80211 with firmwares having
  WMI_SERVICE_REPORT_AIRTIME feature, this to have more accurate
  airtime fairness based on real transmit time (instead of just
  estimated from transmit rate)

* support Fine Timing Measurement (FTM) responder role

* add dynamic VLAN support with firmware having WMI_SERVICE_PER_PACKET_SW_ENCRYPT

* switch to use SPDX license identifiers

ath

* add new country codes for US

brcmfmac

* support monitor frames with the hardware/ucode header

qtnfmac

* enable WPA3 SAE and OWE support

mt76

* beacon support for USB devices (mesh+ad-hoc only)

rtlwifi

* convert to use SPDX license identifiers

libertas_tf

* get the MAC address before registering the device
====================

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

478 files changed, 8789 insertions, 10522 deletions

diff --git a/drivers/net/wireless/ath/ath10k/Makefile b/drivers/net/wireless/ath/ath10k/Makefile
index 66326b949ab1..142c777b287f 100644
--- a/drivers/net/wireless/ath/ath10k/Makefile
+++ b/drivers/net/wireless/ath/ath10k/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: ISC
 obj-$(CONFIG_ATH10K) += ath10k_core.o
 ath10k_core-y += mac.o \
                  debug.o \
diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c
index 4cd69aca75e2..0bf726c55736 100644
--- a/drivers/net/wireless/ath/ath10k/ahb.c
+++ b/drivers/net/wireless/ath/ath10k/ahb.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2016-2017 Qualcomm Atheros, Inc. All rights reserved.
  * Copyright (c) 2015 The Linux Foundation. All rights reserved.
- *
- * 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 <linux/module.h>
 #include <linux/of.h>
@@ -661,7 +650,8 @@ static void ath10k_ahb_hif_stop(struct ath10k *ar)
         ath10k_pci_flush(ar);
 }
 
-static int ath10k_ahb_hif_power_up(struct ath10k *ar)
+static int ath10k_ahb_hif_power_up(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         int ret;
 
diff --git a/drivers/net/wireless/ath/ath10k/ahb.h b/drivers/net/wireless/ath/ath10k/ahb.h
index d43e375215c8..cee11a3ae2a5 100644
--- a/drivers/net/wireless/ath/ath10k/ahb.h
+++ b/drivers/net/wireless/ath/ath10k/ahb.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2016 Qualcomm Atheros, Inc. All rights reserved.
  * Copyright (c) 2015 The Linux Foundation. All rights reserved.
- *
- * 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 _AHB_H_
diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c
index 1750b182209b..95dc4be82e5c 100644
--- a/drivers/net/wireless/ath/ath10k/bmi.c
+++ b/drivers/net/wireless/ath/ath10k/bmi.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2014,2016-2017 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 "bmi.h"
diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h
index 725c9afc63f2..ef3bdba43bed 100644
--- a/drivers/net/wireless/ath/ath10k/bmi.h
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2015,2017 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 _BMI_H_
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index 2a5668b4f6bc..cc154a81737d 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 "hif.h"
@@ -228,11 +217,31 @@ ath10k_ce_shadow_dest_ring_write_index_set(struct ath10k *ar,
 }
 
 static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar,
-                                                    u32 ce_ctrl_addr,
-                                                    unsigned int addr)
+                                                    u32 ce_id,
+                                                    u64 addr)
+{
+        struct ath10k_ce *ce = ath10k_ce_priv(ar);
+        struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
+        u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
+        u32 addr_lo = lower_32_bits(addr);
+
+        ath10k_ce_write32(ar, ce_ctrl_addr +
+                          ar->hw_ce_regs->sr_base_addr_lo, addr_lo);
+
+        if (ce_state->ops->ce_set_src_ring_base_addr_hi) {
+                ce_state->ops->ce_set_src_ring_base_addr_hi(ar, ce_ctrl_addr,
+                                                            addr);
+        }
+}
+
+static void ath10k_ce_set_src_ring_base_addr_hi(struct ath10k *ar,
+                                                u32 ce_ctrl_addr,
+                                                u64 addr)
 {
+        u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
+
         ath10k_ce_write32(ar, ce_ctrl_addr +
-                          ar->hw_ce_regs->sr_base_addr, addr);
+                          ar->hw_ce_regs->sr_base_addr_hi, addr_hi);
 }
 
 static inline void ath10k_ce_src_ring_size_set(struct ath10k *ar,
@@ -313,11 +322,36 @@ static inline u32 ath10k_ce_dest_ring_read_index_get(struct ath10k *ar,
 }
 
 static inline void ath10k_ce_dest_ring_base_addr_set(struct ath10k *ar,
-                                                     u32 ce_ctrl_addr,
-                                                     u32 addr)
+                                                     u32 ce_id,
+                                                     u64 addr)
+{
+        struct ath10k_ce *ce = ath10k_ce_priv(ar);
+        struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
+        u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
+        u32 addr_lo = lower_32_bits(addr);
+
+        ath10k_ce_write32(ar, ce_ctrl_addr +
+                          ar->hw_ce_regs->dr_base_addr_lo, addr_lo);
+
+        if (ce_state->ops->ce_set_dest_ring_base_addr_hi) {
+                ce_state->ops->ce_set_dest_ring_base_addr_hi(ar, ce_ctrl_addr,
+                                                             addr);
+        }
+}
+
+static void ath10k_ce_set_dest_ring_base_addr_hi(struct ath10k *ar,
+                                                 u32 ce_ctrl_addr,
+                                                 u64 addr)
 {
+        u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
+        u32 reg_value;
+
+        reg_value = ath10k_ce_read32(ar, ce_ctrl_addr +
+                                     ar->hw_ce_regs->dr_base_addr_hi);
+        reg_value &= ~CE_DESC_ADDR_HI_MASK;
+        reg_value |= addr_hi;
         ath10k_ce_write32(ar, ce_ctrl_addr +
-                          ar->hw_ce_regs->dr_base_addr, addr);
+                          ar->hw_ce_regs->dr_base_addr_hi, reg_value);
 }
 
 static inline void ath10k_ce_dest_ring_size_set(struct ath10k *ar,
@@ -500,14 +534,8 @@ static int _ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state,
         write_index = CE_RING_IDX_INCR(nentries_mask, write_index);
 
         /* WORKAROUND */
-        if (!(flags & CE_SEND_FLAG_GATHER)) {
-                if (ar->hw_params.shadow_reg_support)
-                        ath10k_ce_shadow_src_ring_write_index_set(ar, ce_state,
-                                                                  write_index);
-                else
-                        ath10k_ce_src_ring_write_index_set(ar, ctrl_addr,
-                                                           write_index);
-        }
+        if (!(flags & CE_SEND_FLAG_GATHER))
+                ath10k_ce_src_ring_write_index_set(ar, ctrl_addr, write_index);
 
         src_ring->write_index = write_index;
 exit:
@@ -563,7 +591,7 @@ static int _ath10k_ce_send_nolock_64(struct ath10k_ce_pipe *ce_state,
 
         addr = (__le32 *)&sdesc.addr;
 
-        flags |= upper_32_bits(buffer) & CE_DESC_FLAGS_GET_MASK;
+        flags |= upper_32_bits(buffer) & CE_DESC_ADDR_HI_MASK;
         addr[0] = __cpu_to_le32(buffer);
         addr[1] = __cpu_to_le32(flags);
         if (flags & CE_SEND_FLAG_GATHER)
@@ -581,8 +609,14 @@ static int _ath10k_ce_send_nolock_64(struct ath10k_ce_pipe *ce_state,
         /* Update Source Ring Write Index */
         write_index = CE_RING_IDX_INCR(nentries_mask, write_index);
 
-        if (!(flags & CE_SEND_FLAG_GATHER))
-                ath10k_ce_src_ring_write_index_set(ar, ctrl_addr, write_index);
+        if (!(flags & CE_SEND_FLAG_GATHER)) {
+                if (ar->hw_params.shadow_reg_support)
+                        ath10k_ce_shadow_src_ring_write_index_set(ar, ce_state,
+                                                                  write_index);
+                else
+                        ath10k_ce_src_ring_write_index_set(ar, ctrl_addr,
+                                                           write_index);
+        }
 
         src_ring->write_index = write_index;
 exit:
@@ -731,7 +765,7 @@ static int __ath10k_ce_rx_post_buf_64(struct ath10k_ce_pipe *pipe,
                 return -ENOSPC;
 
         desc->addr = __cpu_to_le64(paddr);
-        desc->addr &= __cpu_to_le64(CE_DESC_37BIT_ADDR_MASK);
+        desc->addr &= __cpu_to_le64(CE_DESC_ADDR_MASK);
 
         desc->nbytes = 0;
 
@@ -1346,7 +1380,7 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar,
                 ath10k_ce_src_ring_write_index_get(ar, ctrl_addr);
         src_ring->write_index &= src_ring->nentries_mask;
 
-        ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr,
+        ath10k_ce_src_ring_base_addr_set(ar, ce_id,
                                          src_ring->base_addr_ce_space);
         ath10k_ce_src_ring_size_set(ar, ctrl_addr, nentries);
         ath10k_ce_src_ring_dmax_set(ar, ctrl_addr, attr->src_sz_max);
@@ -1385,7 +1419,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar,
                 ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr);
         dest_ring->write_index &= dest_ring->nentries_mask;
 
-        ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr,
+        ath10k_ce_dest_ring_base_addr_set(ar, ce_id,
                                           dest_ring->base_addr_ce_space);
         ath10k_ce_dest_ring_size_set(ar, ctrl_addr, nentries);
         ath10k_ce_dest_ring_byte_swap_set(ar, ctrl_addr, 0);
@@ -1404,12 +1438,12 @@ static int ath10k_ce_alloc_shadow_base(struct ath10k *ar,
                                        u32 nentries)
 {
         src_ring->shadow_base_unaligned = kcalloc(nentries,
-                                                  sizeof(struct ce_desc),
+                                                  sizeof(struct ce_desc_64),
                                                   GFP_KERNEL);
         if (!src_ring->shadow_base_unaligned)
                 return -ENOMEM;
 
-        src_ring->shadow_base = (struct ce_desc *)
+        src_ring->shadow_base = (struct ce_desc_64 *)
                         PTR_ALIGN(src_ring->shadow_base_unaligned,
                                   CE_DESC_RING_ALIGN);
         return 0;
@@ -1461,7 +1495,7 @@ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id,
                 ret = ath10k_ce_alloc_shadow_base(ar, src_ring, nentries);
                 if (ret) {
                         dma_free_coherent(ar->dev,
-                                          (nentries * sizeof(struct ce_desc) +
+                                          (nentries * sizeof(struct ce_desc_64) +
                                            CE_DESC_RING_ALIGN),
                                           src_ring->base_addr_owner_space_unaligned,
                                           base_addr);
@@ -1554,7 +1588,8 @@ ath10k_ce_alloc_dest_ring(struct ath10k *ar, unsigned int ce_id,
          */
         dest_ring->base_addr_owner_space_unaligned =
                 dma_alloc_coherent(ar->dev,
-                                   (nentries * sizeof(struct ce_desc) + CE_DESC_RING_ALIGN),
+                                   (nentries * sizeof(struct ce_desc) +
+                                    CE_DESC_RING_ALIGN),
                                    &base_addr, GFP_KERNEL);
         if (!dest_ring->base_addr_owner_space_unaligned) {
                 kfree(dest_ring);
@@ -1660,7 +1695,7 @@ static void ath10k_ce_deinit_src_ring(struct ath10k *ar, unsigned int ce_id)
 {
         u32 ctrl_addr = ath10k_ce_base_address(ar, ce_id);
 
-        ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr, 0);
+        ath10k_ce_src_ring_base_addr_set(ar, ce_id, 0);
         ath10k_ce_src_ring_size_set(ar, ctrl_addr, 0);
         ath10k_ce_src_ring_dmax_set(ar, ctrl_addr, 0);
         ath10k_ce_src_ring_highmark_set(ar, ctrl_addr, 0);
@@ -1670,7 +1705,7 @@ static void ath10k_ce_deinit_dest_ring(struct ath10k *ar, unsigned int ce_id)
 {
         u32 ctrl_addr = ath10k_ce_base_address(ar, ce_id);
 
-        ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr, 0);
+        ath10k_ce_dest_ring_base_addr_set(ar, ce_id, 0);
         ath10k_ce_dest_ring_size_set(ar, ctrl_addr, 0);
         ath10k_ce_dest_ring_highmark_set(ar, ctrl_addr, 0);
 }
@@ -1802,6 +1837,8 @@ static const struct ath10k_ce_ops ce_ops = {
         .ce_extract_desc_data = ath10k_ce_extract_desc_data,
         .ce_free_pipe = _ath10k_ce_free_pipe,
         .ce_send_nolock = _ath10k_ce_send_nolock,
+        .ce_set_src_ring_base_addr_hi = NULL,
+        .ce_set_dest_ring_base_addr_hi = NULL,
 };
 
 static const struct ath10k_ce_ops ce_64_ops = {
@@ -1814,6 +1851,8 @@ static const struct ath10k_ce_ops ce_64_ops = {
         .ce_extract_desc_data = ath10k_ce_extract_desc_data_64,
         .ce_free_pipe = _ath10k_ce_free_pipe_64,
         .ce_send_nolock = _ath10k_ce_send_nolock_64,
+        .ce_set_src_ring_base_addr_hi = ath10k_ce_set_src_ring_base_addr_hi,
+        .ce_set_dest_ring_base_addr_hi = ath10k_ce_set_dest_ring_base_addr_hi,
 };
 
 static void ath10k_ce_set_ops(struct ath10k *ar,
@@ -1909,7 +1948,7 @@ void ath10k_ce_alloc_rri(struct ath10k *ar)
                           lower_32_bits(ce->paddr_rri));
         ath10k_ce_write32(ar, ar->hw_ce_regs->ce_rri_high,
                           (upper_32_bits(ce->paddr_rri) &
-                          CE_DESC_FLAGS_GET_MASK));
+                          CE_DESC_ADDR_HI_MASK));
 
         for (i = 0; i < CE_COUNT; i++) {
                 ctrl1_regs = ar->hw_ce_regs->ctrl1_regs->addr;
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index ead9987c3259..692b3a8957a9 100644
--- a/drivers/net/wireless/ath/ath10k/ce.h
+++ b/drivers/net/wireless/ath/ath10k/ce.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 _CE_H_
@@ -39,8 +28,8 @@ struct ath10k_ce_pipe;
 #define CE_DESC_FLAGS_BYTE_SWAP      (1 << 1)
 #define CE_WCN3990_DESC_FLAGS_GATHER BIT(31)
 
-#define CE_DESC_FLAGS_GET_MASK          GENMASK(4, 0)
-#define CE_DESC_37BIT_ADDR_MASK         GENMASK_ULL(37, 0)
+#define CE_DESC_ADDR_MASK               GENMASK_ULL(34, 0)
+#define CE_DESC_ADDR_HI_MASK            GENMASK(4, 0)
 
 /* Following desc flags are used in QCA99X0 */
 #define CE_DESC_FLAGS_HOST_INT_DIS      (1 << 2)
@@ -104,7 +93,7 @@ struct ath10k_ce_ring {
         /* Host address space */
         void *base_addr_owner_space_unaligned;
         /* CE address space */
-        u32 base_addr_ce_space_unaligned;
+        dma_addr_t base_addr_ce_space_unaligned;
 
         /*
          * Actual start of descriptors.
@@ -115,10 +104,10 @@ struct ath10k_ce_ring {
         void *base_addr_owner_space;
 
         /* CE address space */
-        u32 base_addr_ce_space;
+        dma_addr_t base_addr_ce_space;
 
         char *shadow_base_unaligned;
-        struct ce_desc *shadow_base;
+        struct ce_desc_64 *shadow_base;
 
         /* keep last */
         void *per_transfer_context[0];
@@ -334,6 +323,12 @@ struct ath10k_ce_ops {
                               void *per_transfer_context,
                               dma_addr_t buffer, u32 nbytes,
                               u32 transfer_id, u32 flags);
+        void (*ce_set_src_ring_base_addr_hi)(struct ath10k *ar,
+                                             u32 ce_ctrl_addr,
+                                             u64 addr);
+        void (*ce_set_dest_ring_base_addr_hi)(struct ath10k *ar,
+                                              u32 ce_ctrl_addr,
+                                              u64 addr);
 };
 
 static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index e8891f5fc83a..ac2cf3f1c7b4 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 <linux/module.h>
@@ -561,7 +550,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                 .hw_ops = &wcn3990_ops,
                 .decap_align_bytes = 1,
                 .num_peers = TARGET_HL_10_TLV_NUM_PEERS,
-                .n_cipher_suites = 8,
+                .n_cipher_suites = 11,
                 .ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT,
                 .num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES,
                 .target_64bit = true,
@@ -2309,7 +2298,11 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
                 ar->max_num_stations = TARGET_TLV_NUM_STATIONS;
                 ar->max_num_vdevs = TARGET_TLV_NUM_VDEVS;
                 ar->max_num_tdls_vdevs = TARGET_TLV_NUM_TDLS_VDEVS;
-                ar->htt.max_num_pending_tx = TARGET_TLV_NUM_MSDU_DESC;
+                if (ar->hif.bus == ATH10K_BUS_SDIO)
+                        ar->htt.max_num_pending_tx =
+                                TARGET_TLV_NUM_MSDU_DESC_HL;
+                else
+                        ar->htt.max_num_pending_tx = TARGET_TLV_NUM_MSDU_DESC;
                 ar->wow.max_num_patterns = TARGET_TLV_NUM_WOW_PATTERNS;
                 ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |
                         WMI_STAT_PEER;
@@ -2556,6 +2549,12 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
                 goto err_hif_stop;
         }
 
+        status = ath10k_hif_swap_mailbox(ar);
+        if (status) {
+                ath10k_err(ar, "failed to swap mailbox: %d\n", status);
+                goto err_hif_stop;
+        }
+
         if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {
                 status = ath10k_htt_connect(&ar->htt);
                 if (status) {
@@ -2621,6 +2620,9 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
                              ar->wmi.svc_map))
                         val |= WMI_10_4_TX_DATA_ACK_RSSI;
 
+                if (test_bit(WMI_SERVICE_REPORT_AIRTIME, ar->wmi.svc_map))
+                        val |= WMI_10_4_REPORT_AIRTIME;
+
                 status = ath10k_mac_ext_resource_config(ar, val);
                 if (status) {
                         ath10k_err(ar,
@@ -2649,6 +2651,13 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
                 goto err_hif_stop;
         }
 
+        status = ath10k_wmi_pdev_set_base_macaddr(ar, ar->mac_addr);
+        if (status && status != -EOPNOTSUPP) {
+                ath10k_err(ar,
+                           "failed to set base mac address: %d\n", status);
+                goto err_hif_stop;
+        }
+
         /* Some firmware revisions do not properly set up hardware rx filter
          * registers.
          *
@@ -2763,7 +2772,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
         struct bmi_target_info target_info;
         int ret = 0;
 
-        ret = ath10k_hif_power_up(ar);
+        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
         if (ret) {
                 ath10k_err(ar, "could not power on hif bus (%d)\n", ret);
                 return ret;
@@ -2977,8 +2986,8 @@ err:
 int ath10k_core_register(struct ath10k *ar,
                          const struct ath10k_bus_params *bus_params)
 {
-        ar->chip_id = bus_params->chip_id;
-        ar->dev_type = bus_params->dev_type;
+        ar->bus_param = *bus_params;
+
         queue_work(ar->workqueue, &ar->register_work);
 
         return 0;
@@ -3098,9 +3107,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
 
         mutex_init(&ar->conf_mutex);
         spin_lock_init(&ar->data_lock);
-        spin_lock_init(&ar->txqs_lock);
 
-        INIT_LIST_HEAD(&ar->txqs);
         INIT_LIST_HEAD(&ar->peers);
         init_waitqueue_head(&ar->peer_mapping_wq);
         init_waitqueue_head(&ar->htt.empty_tx_wq);
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 46e9c8c97a4d..27ec5557de88 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 _CORE_H_
@@ -90,6 +79,9 @@
 /* The magic used by QCA spec */
 #define ATH10K_SMBIOS_BDF_EXT_MAGIC "BDF_"
 
+/* Default Airtime weight multipler (Tuned for multiclient performance) */
+#define ATH10K_AIRTIME_WEIGHT_MULTIPLIER  4
+
 struct ath10k;
 
 static inline const char *ath10k_bus_str(enum ath10k_bus bus)
@@ -116,6 +108,7 @@ enum ath10k_skb_flags {
         ATH10K_SKB_F_DELIVER_CAB = BIT(2),
         ATH10K_SKB_F_MGMT = BIT(3),
         ATH10K_SKB_F_QOS = BIT(4),
+        ATH10K_SKB_F_RAW_TX = BIT(5),
 };
 
 struct ath10k_skb_cb {
@@ -123,6 +116,7 @@ struct ath10k_skb_cb {
         u8 flags;
         u8 eid;
         u16 msdu_id;
+        u16 airtime_est;
         struct ieee80211_vif *vif;
         struct ieee80211_txq *txq;
 } __packed;
@@ -443,14 +437,14 @@ enum ath10k_amsdu_subfrm_num {
 };
 
 struct ath10k_sta_tid_stats {
-        unsigned long int rx_pkt_from_fw;
-        unsigned long int rx_pkt_unchained;
-        unsigned long int rx_pkt_drop_chained;
-        unsigned long int rx_pkt_drop_filter;
-        unsigned long int rx_pkt_err[ATH10K_PKT_RX_ERR_MAX];
-        unsigned long int rx_pkt_queued_for_mac;
-        unsigned long int rx_pkt_ampdu[ATH10K_AMPDU_SUBFRM_NUM_MAX];
-        unsigned long int rx_pkt_amsdu[ATH10K_AMSDU_SUBFRM_NUM_MAX];
+        unsigned long rx_pkt_from_fw;
+        unsigned long rx_pkt_unchained;
+        unsigned long rx_pkt_drop_chained;
+        unsigned long rx_pkt_drop_filter;
+        unsigned long rx_pkt_err[ATH10K_PKT_RX_ERR_MAX];
+        unsigned long rx_pkt_queued_for_mac;
+        unsigned long rx_pkt_ampdu[ATH10K_AMPDU_SUBFRM_NUM_MAX];
+        unsigned long rx_pkt_amsdu[ATH10K_AMSDU_SUBFRM_NUM_MAX];
 };
 
 enum ath10k_counter_type {
@@ -495,6 +489,7 @@ struct ath10k_sta {
         u16 peer_id;
         struct rate_info txrate;
         struct ieee80211_tx_info tx_info;
+        u32 last_tx_bitrate;
 
         struct work_struct update_wk;
         u64 rx_duration;
@@ -571,6 +566,7 @@ struct ath10k_vif {
         bool nohwcrypt;
         int num_legacy_stations;
         int txpower;
+        bool ftm_responder;
         struct wmi_wmm_params_all_arg wmm_params;
         struct work_struct ap_csa_work;
         struct delayed_work connection_loss_work;
@@ -922,6 +918,7 @@ enum ath10k_dev_type {
 struct ath10k_bus_params {
         u32 chip_id;
         enum ath10k_dev_type dev_type;
+        bool link_can_suspend;
 };
 
 struct ath10k {
@@ -1068,10 +1065,7 @@ struct ath10k {
 
         /* protects shared structure data */
         spinlock_t data_lock;
-        /* protects: ar->txqs, artxq->list */
-        spinlock_t txqs_lock;
 
-        struct list_head txqs;
         struct list_head arvifs;
         struct list_head peers;
         struct ath10k_peer *peer_map[ATH10K_MAX_NUM_PEER_IDS];
@@ -1182,6 +1176,7 @@ struct ath10k {
 
         u32 ampdu_reference;
 
+        const u8 *wmi_key_cipher;
         void *ce_priv;
 
         u32 sta_tid_stats_mask;
@@ -1190,6 +1185,7 @@ struct ath10k {
         enum ath10k_radar_confirmation_state radar_conf_state;
         struct ath10k_radar_found_info last_radar_info;
         struct work_struct radar_confirmation_work;
+        struct ath10k_bus_params bus_param;
 
         /* must be last */
         u8 drv_priv[0] __aligned(sizeof(void *));
diff --git a/drivers/net/wireless/ath/ath10k/coredump.c b/drivers/net/wireless/ath/ath10k/coredump.c
index eadae2f9206b..33838d9c1cb6 100644
--- a/drivers/net/wireless/ath/ath10k/coredump.c
+++ b/drivers/net/wireless/ath/ath10k/coredump.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 "coredump.h"
@@ -1167,7 +1156,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)
         dump_data->version = cpu_to_le32(ATH10K_FW_CRASH_DUMP_VERSION);
 
         guid_copy(&dump_data->guid, &crash_data->guid);
-        dump_data->chip_id = cpu_to_le32(ar->chip_id);
+        dump_data->chip_id = cpu_to_le32(ar->bus_param.chip_id);
         dump_data->bus_type = cpu_to_le32(0);
         dump_data->target_version = cpu_to_le32(ar->target_version);
         dump_data->fw_version_major = cpu_to_le32(ar->fw_version_major);
diff --git a/drivers/net/wireless/ath/ath10k/coredump.h b/drivers/net/wireless/ath/ath10k/coredump.h
index 5dac653e1649..09de41922f97 100644
--- a/drivers/net/wireless/ath/ath10k/coredump.h
+++ b/drivers/net/wireless/ath/ath10k/coredump.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2011-2017 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 _COREDUMP_H_
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index 02988fc378a1..1b8903280d42 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 <linux/module.h>
@@ -58,7 +47,7 @@ void ath10k_debug_print_hwfw_info(struct ath10k *ar)
         ath10k_info(ar, "%s target 0x%08x chip_id 0x%08x sub %04x:%04x",
                     ar->hw_params.name,
                     ar->target_version,
-                    ar->chip_id,
+                    ar->bus_param.chip_id,
                     ar->id.subsystem_vendor, ar->id.subsystem_device);
 
         ath10k_info(ar, "kconfig debug %d debugfs %d tracing %d dfs %d testmode %d\n",
@@ -625,7 +614,7 @@ static ssize_t ath10k_read_chip_id(struct file *file, char __user *user_buf,
         size_t len;
         char buf[50];
 
-        len = scnprintf(buf, sizeof(buf), "0x%08x\n", ar->chip_id);
+        len = scnprintf(buf, sizeof(buf), "0x%08x\n", ar->bus_param.chip_id);
 
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
diff --git a/drivers/net/wireless/ath/ath10k/debug.h b/drivers/net/wireless/ath/ath10k/debug.h
index 5cf16d690724..db78e855a80f 100644
--- a/drivers/net/wireless/ath/ath10k/debug.h
+++ b/drivers/net/wireless/ath/ath10k/debug.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 _DEBUG_H_
@@ -213,12 +202,12 @@ void ath10k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 void ath10k_sta_update_rx_duration(struct ath10k *ar,
                                    struct ath10k_fw_stats *stats);
 void ath10k_sta_update_rx_tid_stats(struct ath10k *ar, u8 *first_hdr,
-                                    unsigned long int num_msdus,
+                                    unsigned long num_msdus,
                                     enum ath10k_pkt_rx_err err,
-                                    unsigned long int unchain_cnt,
-                                    unsigned long int drop_cnt,
-                                    unsigned long int drop_cnt_filter,
-                                    unsigned long int queued_msdus);
+                                    unsigned long unchain_cnt,
+                                    unsigned long drop_cnt,
+                                    unsigned long drop_cnt_filter,
+                                    unsigned long queued_msdus);
 void ath10k_sta_update_rx_tid_stats_ampdu(struct ath10k *ar,
                                           u16 peer_id, u8 tid,
                                           struct htt_rx_indication_mpdu_range *ranges,
@@ -232,12 +221,12 @@ void ath10k_sta_update_rx_duration(struct ath10k *ar,
 
 static inline
 void ath10k_sta_update_rx_tid_stats(struct ath10k *ar, u8 *first_hdr,
-                                    unsigned long int num_msdus,
+                                    unsigned long num_msdus,
                                     enum ath10k_pkt_rx_err err,
-                                    unsigned long int unchain_cnt,
-                                    unsigned long int drop_cnt,
-                                    unsigned long int drop_cnt_filter,
-                                    unsigned long int queued_msdus)
+                                    unsigned long unchain_cnt,
+                                    unsigned long drop_cnt,
+                                    unsigned long drop_cnt_filter,
+                                    unsigned long queued_msdus)
 {
 }
 
diff --git a/drivers/net/wireless/ath/ath10k/debugfs_sta.c b/drivers/net/wireless/ath/ath10k/debugfs_sta.c
index 4778a455d81a..8331d8b09987 100644
--- a/drivers/net/wireless/ath/ath10k/debugfs_sta.c
+++ b/drivers/net/wireless/ath/ath10k/debugfs_sta.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2014-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 "core.h"
@@ -87,12 +76,12 @@ out:
 }
 
 void ath10k_sta_update_rx_tid_stats(struct ath10k *ar, u8 *first_hdr,
-                                    unsigned long int num_msdus,
+                                    unsigned long num_msdus,
                                     enum ath10k_pkt_rx_err err,
-                                    unsigned long int unchain_cnt,
-                                    unsigned long int drop_cnt,
-                                    unsigned long int drop_cnt_filter,
-                                    unsigned long int queued_msdus)
+                                    unsigned long unchain_cnt,
+                                    unsigned long drop_cnt,
+                                    unsigned long drop_cnt_filter,
+                                    unsigned long queued_msdus)
 {
         struct ieee80211_sta *sta;
         struct ath10k_sta *arsta;
diff --git a/drivers/net/wireless/ath/ath10k/hif.h b/drivers/net/wireless/ath/ath10k/hif.h
index 1a59ea0068c2..fe5417962f40 100644
--- a/drivers/net/wireless/ath/ath10k/hif.h
+++ b/drivers/net/wireless/ath/ath10k/hif.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2015,2017 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 _HIF_H_
@@ -59,6 +48,8 @@ struct ath10k_hif_ops {
          */
         void (*stop)(struct ath10k *ar);
 
+        int (*swap_mailbox)(struct ath10k *ar);
+
         int (*map_service_to_pipe)(struct ath10k *ar, u16 service_id,
                                    u8 *ul_pipe, u8 *dl_pipe);
 
@@ -81,7 +72,7 @@ struct ath10k_hif_ops {
         void (*write32)(struct ath10k *ar, u32 address, u32 value);
 
         /* Power up the device and enter BMI transfer mode for FW download */
-        int (*power_up)(struct ath10k *ar);
+        int (*power_up)(struct ath10k *ar, enum ath10k_firmware_mode fw_mode);
 
         /* Power down the device and free up resources. stop() must be called
          * before this if start() was called earlier
@@ -139,6 +130,13 @@ static inline void ath10k_hif_stop(struct ath10k *ar)
         return ar->hif.ops->stop(ar);
 }
 
+static inline int ath10k_hif_swap_mailbox(struct ath10k *ar)
+{
+        if (ar->hif.ops->swap_mailbox)
+                return ar->hif.ops->swap_mailbox(ar);
+        return 0;
+}
+
 static inline int ath10k_hif_map_service_to_pipe(struct ath10k *ar,
                                                  u16 service_id,
                                                  u8 *ul_pipe, u8 *dl_pipe)
@@ -165,9 +163,10 @@ static inline u16 ath10k_hif_get_free_queue_number(struct ath10k *ar,
         return ar->hif.ops->get_free_queue_number(ar, pipe_id);
 }
 
-static inline int ath10k_hif_power_up(struct ath10k *ar)
+static inline int ath10k_hif_power_up(struct ath10k *ar,
+                                      enum ath10k_firmware_mode fw_mode)
 {
-        return ar->hif.ops->power_up(ar);
+        return ar->hif.ops->power_up(ar, fw_mode);
 }
 
 static inline void ath10k_hif_power_down(struct ath10k *ar)
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index 28daed5981a1..805a7f8a04f2 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 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 "core.h"
@@ -53,7 +42,7 @@ static inline void ath10k_htc_restore_tx_skb(struct ath10k_htc *htc,
 {
         struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
 
-        if (htc->ar->dev_type != ATH10K_DEV_TYPE_HL)
+        if (htc->ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
                 dma_unmap_single(htc->ar->dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE);
         skb_pull(skb, sizeof(struct ath10k_htc_hdr));
 }
@@ -88,7 +77,8 @@ static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep,
         hdr->eid = ep->eid;
         hdr->len = __cpu_to_le16(skb->len - sizeof(*hdr));
         hdr->flags = 0;
-        hdr->flags |= ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE;
+        if (ep->tx_credit_flow_enabled)
+                hdr->flags |= ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE;
 
         spin_lock_bh(&ep->htc->tx_lock);
         hdr->seq_no = ep->seq_no++;
@@ -138,7 +128,7 @@ int ath10k_htc_send(struct ath10k_htc *htc,
         ath10k_htc_prepare_tx_skb(ep, skb);
 
         skb_cb->eid = eid;
-        if (ar->dev_type != ATH10K_DEV_TYPE_HL) {
+        if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL) {
                 skb_cb->paddr = dma_map_single(dev, skb->data, skb->len,
                                                DMA_TO_DEVICE);
                 ret = dma_mapping_error(dev, skb_cb->paddr);
@@ -161,7 +151,7 @@ int ath10k_htc_send(struct ath10k_htc *htc,
         return 0;
 
 err_unmap:
-        if (ar->dev_type != ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
                 dma_unmap_single(dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE);
 err_credits:
         if (ep->tx_credit_flow_enabled) {
diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
index 51fda6c23f69..f55d3caec61f 100644
--- a/drivers/net/wireless/ath/ath10k/htc.h
+++ b/drivers/net/wireless/ath/ath10k/htc.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2016 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 _HTC_H_
@@ -51,7 +40,6 @@ struct ath10k;
  */
 
 #define HTC_HOST_MAX_MSG_PER_RX_BUNDLE        8
-#define HTC_HOST_MAX_MSG_PER_TX_BUNDLE        16
 
 enum ath10k_htc_tx_flags {
         ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,
diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index 21a67f82f037..d235ff3098e8 100644
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 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 <linux/slab.h>
@@ -268,7 +257,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt)
                 return status;
         }
 
-        status = ath10k_htt_h2t_aggr_cfg_msg(htt,
+        status = htt->tx_ops->htt_h2t_aggr_cfg_msg(htt,
                                              htt->max_num_ampdu,
                                              htt->max_num_amsdu);
         if (status) {
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index a76f7c9e2199..fef716aa8f3a 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 _HTT_H_
@@ -357,6 +346,13 @@ struct htt_aggr_conf {
         u8 max_num_amsdu_subframes;
 } __packed;
 
+struct htt_aggr_conf_v2 {
+        u8 max_num_ampdu_subframes;
+        /* amsdu_subframes is limited by 0x1F mask */
+        u8 max_num_amsdu_subframes;
+        u8 reserved;
+} __packed;
+
 #define HTT_MGMT_FRM_HDR_DOWNLOAD_LEN 32
 struct htt_mgmt_tx_desc_qca99x0 {
         __le32 rate;
@@ -564,6 +560,7 @@ struct htt_mgmt_tx_completion {
 #define HTT_RX_INDICATION_INFO0_EXT_TID_LSB   (0)
 #define HTT_RX_INDICATION_INFO0_FLUSH_VALID   (1 << 5)
 #define HTT_RX_INDICATION_INFO0_RELEASE_VALID (1 << 6)
+#define HTT_RX_INDICATION_INFO0_PPDU_DURATION BIT(7)
 
 #define HTT_RX_INDICATION_INFO1_FLUSH_START_SEQNO_MASK   0x0000003F
 #define HTT_RX_INDICATION_INFO1_FLUSH_START_SEQNO_LSB    0
@@ -576,7 +573,10 @@ struct htt_mgmt_tx_completion {
 #define HTT_RX_INDICATION_INFO1_NUM_MPDU_RANGES_MASK     0xFF000000
 #define HTT_RX_INDICATION_INFO1_NUM_MPDU_RANGES_LSB      24
 
-#define HTT_TX_CMPL_FLAG_DATA_RSSI BIT(0)
+#define HTT_TX_CMPL_FLAG_DATA_RSSI              BIT(0)
+#define HTT_TX_CMPL_FLAG_PPID_PRESENT           BIT(1)
+#define HTT_TX_CMPL_FLAG_PA_PRESENT             BIT(2)
+#define HTT_TX_CMPL_FLAG_PPDU_DURATION_PRESENT  BIT(3)
 
 struct htt_rx_indication_hdr {
         u8 info0; /* %HTT_RX_INDICATION_INFO0_ */
@@ -866,6 +866,21 @@ struct htt_data_tx_completion {
         __le16 msdus[0]; /* variable length based on %num_msdus */
 } __packed;
 
+#define HTT_TX_PPDU_DUR_INFO0_PEER_ID_MASK      GENMASK(15, 0)
+#define HTT_TX_PPDU_DUR_INFO0_TID_MASK          GENMASK(20, 16)
+
+struct htt_data_tx_ppdu_dur {
+        __le32 info0; /* HTT_TX_PPDU_DUR_INFO0_ */
+        __le32 tx_duration; /* in usecs */
+} __packed;
+
+#define HTT_TX_COMPL_PPDU_DUR_INFO0_NUM_ENTRIES_MASK    GENMASK(7, 0)
+
+struct htt_data_tx_compl_ppdu_dur {
+        __le32 info0; /* HTT_TX_COMPL_PPDU_DUR_INFO0_ */
+        struct htt_data_tx_ppdu_dur ppdu_dur[0];
+} __packed;
+
 struct htt_tx_compl_ind_base {
         u32 hdr;
         u16 payload[1/*or more*/];
@@ -1650,6 +1665,7 @@ struct htt_cmd {
                 struct htt_stats_req stats_req;
                 struct htt_oob_sync_req oob_sync_req;
                 struct htt_aggr_conf aggr_conf;
+                struct htt_aggr_conf_v2 aggr_conf_v2;
                 struct htt_frag_desc_bank_cfg32 frag_desc_bank_cfg32;
                 struct htt_frag_desc_bank_cfg64 frag_desc_bank_cfg64;
                 struct htt_tx_fetch_resp tx_fetch_resp;
@@ -1716,14 +1732,14 @@ struct ath10k_htt_txbuf_32 {
         struct ath10k_htc_hdr htc_hdr;
         struct htt_cmd_hdr cmd_hdr;
         struct htt_data_tx_desc cmd_tx;
-} __packed;
+} __packed __aligned(4);
 
 struct ath10k_htt_txbuf_64 {
         struct htt_data_tx_desc_frag frags[2];
         struct ath10k_htc_hdr htc_hdr;
         struct htt_cmd_hdr cmd_hdr;
         struct htt_data_tx_desc_64 cmd_tx;
-} __packed;
+} __packed __aligned(4);
 
 struct ath10k_htt {
         struct ath10k *ar;
@@ -1890,6 +1906,9 @@ struct ath10k_htt_tx_ops {
                       struct sk_buff *msdu);
         int (*htt_alloc_txbuff)(struct ath10k_htt *htt);
         void (*htt_free_txbuff)(struct ath10k_htt *htt);
+        int (*htt_h2t_aggr_cfg_msg)(struct ath10k_htt *htt,
+                                    u8 max_subfrms_ampdu,
+                                    u8 max_subfrms_amsdu);
 };
 
 static inline int ath10k_htt_send_rx_ring_cfg(struct ath10k_htt *htt)
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index f42bac204ef8..4fc885617de1 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 "core.h"
@@ -265,7 +254,7 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)
         struct ath10k_htt *htt = &ar->htt;
         int ret;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 return 0;
 
         spin_lock_bh(&htt->rx_ring.lock);
@@ -282,7 +271,7 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)
 
 void ath10k_htt_rx_free(struct ath10k_htt *htt)
 {
-        if (htt->ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (htt->ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 return;
 
         del_timer_sync(&htt->rx_ring.refill_retry_timer);
@@ -760,7 +749,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
         size_t size;
         struct timer_list *timer = &htt->rx_ring.refill_retry_timer;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 return 0;
 
         htt->rx_confused = false;
@@ -1905,7 +1894,7 @@ static void ath10k_htt_rx_h_enqueue(struct ath10k *ar,
 }
 
 static int ath10k_unchain_msdu(struct sk_buff_head *amsdu,
-                               unsigned long int *unchain_cnt)
+                               unsigned long *unchain_cnt)
 {
         struct sk_buff *skb, *first;
         int space;
@@ -1954,8 +1943,8 @@ static int ath10k_unchain_msdu(struct sk_buff_head *amsdu,
 
 static void ath10k_htt_rx_h_unchain(struct ath10k *ar,
                                     struct sk_buff_head *amsdu,
-                                    unsigned long int *drop_cnt,
-                                    unsigned long int *unchain_cnt)
+                                    unsigned long *drop_cnt,
+                                    unsigned long *unchain_cnt)
 {
         struct sk_buff *first;
         struct htt_rx_desc *rxd;
@@ -2005,7 +1994,7 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar,
 static void ath10k_htt_rx_h_filter(struct ath10k *ar,
                                    struct sk_buff_head *amsdu,
                                    struct ieee80211_rx_status *rx_status,
-                                   unsigned long int *drop_cnt)
+                                   unsigned long *drop_cnt)
 {
         if (skb_queue_empty(amsdu))
                 return;
@@ -2025,10 +2014,10 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
         struct ieee80211_rx_status *rx_status = &htt->rx_status;
         struct sk_buff_head amsdu;
         int ret;
-        unsigned long int drop_cnt = 0;
-        unsigned long int unchain_cnt = 0;
-        unsigned long int drop_cnt_filter = 0;
-        unsigned long int msdus_to_queue, num_msdus;
+        unsigned long drop_cnt = 0;
+        unsigned long unchain_cnt = 0;
+        unsigned long drop_cnt_filter = 0;
+        unsigned long msdus_to_queue, num_msdus;
         enum ath10k_pkt_rx_err err = ATH10K_PKT_RX_ERR_MAX;
         u8 first_hdr[RX_HTT_HDR_STATUS_LEN];
 
@@ -2220,8 +2209,12 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
         int status = MS(resp->data_tx_completion.flags, HTT_DATA_TX_STATUS);
         __le16 msdu_id, *msdus;
         bool rssi_enabled = false;
-        u8 msdu_count = 0;
+        u8 msdu_count = 0, num_airtime_records, tid;
         int i;
+        struct htt_data_tx_compl_ppdu_dur *ppdu_info;
+        struct ath10k_peer *peer;
+        u16 ppdu_info_offset = 0, peer_id;
+        u32 tx_duration;
 
         switch (status) {
         case HTT_DATA_TX_STATUS_NO_ACK:
@@ -2245,12 +2238,12 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
                    resp->data_tx_completion.num_msdus);
 
         msdu_count = resp->data_tx_completion.num_msdus;
+        msdus = resp->data_tx_completion.msdus;
 
         if (resp->data_tx_completion.flags2 & HTT_TX_CMPL_FLAG_DATA_RSSI)
                 rssi_enabled = true;
 
         for (i = 0; i < msdu_count; i++) {
-                msdus = resp->data_tx_completion.msdus;
                 msdu_id = msdus[i];
                 tx_done.msdu_id = __le16_to_cpu(msdu_id);
 
@@ -2282,6 +2275,50 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
                         ath10k_txrx_tx_unref(htt, &tx_done);
                 }
         }
+
+        if (!(resp->data_tx_completion.flags2 & HTT_TX_CMPL_FLAG_PPDU_DURATION_PRESENT))
+                return;
+
+        ppdu_info_offset = (msdu_count & 0x01) ? msdu_count + 1 : msdu_count;
+
+        if (rssi_enabled)
+                ppdu_info_offset += ppdu_info_offset;
+
+        if (resp->data_tx_completion.flags2 &
+            (HTT_TX_CMPL_FLAG_PPID_PRESENT | HTT_TX_CMPL_FLAG_PA_PRESENT))
+                ppdu_info_offset += 2;
+
+        ppdu_info = (struct htt_data_tx_compl_ppdu_dur *)&msdus[ppdu_info_offset];
+        num_airtime_records = FIELD_GET(HTT_TX_COMPL_PPDU_DUR_INFO0_NUM_ENTRIES_MASK,
+                                        __le32_to_cpu(ppdu_info->info0));
+
+        for (i = 0; i < num_airtime_records; i++) {
+                struct htt_data_tx_ppdu_dur *ppdu_dur;
+                u32 info0;
+
+                ppdu_dur = &ppdu_info->ppdu_dur[i];
+                info0 = __le32_to_cpu(ppdu_dur->info0);
+
+                peer_id = FIELD_GET(HTT_TX_PPDU_DUR_INFO0_PEER_ID_MASK,
+                                    info0);
+                rcu_read_lock();
+                spin_lock_bh(&ar->data_lock);
+
+                peer = ath10k_peer_find_by_id(ar, peer_id);
+                if (!peer) {
+                        spin_unlock_bh(&ar->data_lock);
+                        rcu_read_unlock();
+                        continue;
+                }
+
+                tid = FIELD_GET(HTT_TX_PPDU_DUR_INFO0_TID_MASK, info0);
+                tx_duration = __le32_to_cpu(ppdu_dur->tx_duration);
+
+                ieee80211_sta_register_airtime(peer->sta, tid, tx_duration, 0);
+
+                spin_unlock_bh(&ar->data_lock);
+                rcu_read_unlock();
+        }
 }
 
 static void ath10k_htt_rx_addba(struct ath10k *ar, struct htt_resp *resp)
@@ -2596,6 +2633,7 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)
         u8 tid;
         int ret;
         int i;
+        bool may_tx;
 
         ath10k_dbg(ar, ATH10K_DBG_HTT, "htt rx tx fetch ind\n");
 
@@ -2668,8 +2706,13 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)
                 num_msdus = 0;
                 num_bytes = 0;
 
+                ieee80211_txq_schedule_start(hw, txq->ac);
+                may_tx = ieee80211_txq_may_transmit(hw, txq);
                 while (num_msdus < max_num_msdus &&
                        num_bytes < max_num_bytes) {
+                        if (!may_tx)
+                                break;
+
                         ret = ath10k_mac_tx_push_txq(hw, txq);
                         if (ret < 0)
                                 break;
@@ -2677,6 +2720,8 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)
                         num_msdus++;
                         num_bytes += ret;
                 }
+                ieee80211_return_txq(hw, txq);
+                ieee80211_txq_schedule_end(hw, txq->ac);
 
                 record->num_msdus = cpu_to_le16(num_msdus);
                 record->num_bytes = cpu_to_le32(num_bytes);
@@ -2975,6 +3020,8 @@ ath10k_accumulate_per_peer_tx_stats(struct ath10k *ar,
                 STATS_OP_FMT(RETRY).rate_table[0][idx] += pstats->retry_bytes;
                 STATS_OP_FMT(RETRY).rate_table[1][idx] += pstats->retry_pkts;
         }
+
+        tx_stats->tx_duration += pstats->duration;
 }
 
 static void
@@ -3070,6 +3117,7 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,
 
         arsta->txrate.nss = txrate.nss;
         arsta->txrate.bw = ath10k_bw_to_mac80211_bw(txrate.bw);
+        arsta->last_tx_bitrate = cfg80211_calculate_bitrate(&arsta->txrate);
         if (sgi)
                 arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
 
@@ -3141,6 +3189,7 @@ static void ath10k_htt_fetch_peer_stats(struct ath10k *ar,
                 p_tx_stats->succ_pkts = __le16_to_cpu(tx_stats->succ_pkts);
                 p_tx_stats->retry_pkts = __le16_to_cpu(tx_stats->retry_pkts);
                 p_tx_stats->failed_pkts = __le16_to_cpu(tx_stats->failed_pkts);
+                p_tx_stats->duration = __le16_to_cpu(tx_stats->tx_duration);
 
                 ath10k_update_per_peer_tx_stats(ar, sta, p_tx_stats);
         }
@@ -3234,7 +3283,7 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                 break;
         }
         case HTT_T2H_MSG_TYPE_RX_IND:
-                if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+                if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                         return ath10k_htt_rx_proc_rx_ind_hl(htt,
                                                             &resp->rx_ind_hl,
                                                             skb);
@@ -3530,7 +3579,7 @@ void ath10k_htt_set_rx_ops(struct ath10k_htt *htt)
 {
         struct ath10k *ar = htt->ar;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 htt->rx_ops = &htt_rx_ops_hl;
         else if (ar->hw_params.target_64bit)
                 htt->rx_ops = &htt_rx_ops_64;
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index ad05ab714c9b..d8e9cc0bb772 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 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 <linux/etherdevice.h>
@@ -495,7 +484,7 @@ int ath10k_htt_tx_start(struct ath10k_htt *htt)
         if (htt->tx_mem_allocated)
                 return 0;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 return 0;
 
         ret = ath10k_htt_tx_alloc_buf(htt);
@@ -1035,6 +1024,53 @@ int ath10k_htt_h2t_aggr_cfg_msg(struct ath10k_htt *htt,
         return 0;
 }
 
+static int ath10k_htt_h2t_aggr_cfg_msg_v2(struct ath10k_htt *htt,
+                                          u8 max_subfrms_ampdu,
+                                          u8 max_subfrms_amsdu)
+{
+        struct ath10k *ar = htt->ar;
+        struct htt_aggr_conf_v2 *aggr_conf;
+        struct sk_buff *skb;
+        struct htt_cmd *cmd;
+        int len;
+        int ret;
+
+        /* Firmware defaults are: amsdu = 3 and ampdu = 64 */
+
+        if (max_subfrms_ampdu == 0 || max_subfrms_ampdu > 64)
+                return -EINVAL;
+
+        if (max_subfrms_amsdu == 0 || max_subfrms_amsdu > 31)
+                return -EINVAL;
+
+        len = sizeof(cmd->hdr);
+        len += sizeof(cmd->aggr_conf_v2);
+
+        skb = ath10k_htc_alloc_skb(ar, len);
+        if (!skb)
+                return -ENOMEM;
+
+        skb_put(skb, len);
+        cmd = (struct htt_cmd *)skb->data;
+        cmd->hdr.msg_type = HTT_H2T_MSG_TYPE_AGGR_CFG;
+
+        aggr_conf = &cmd->aggr_conf_v2;
+        aggr_conf->max_num_ampdu_subframes = max_subfrms_ampdu;
+        aggr_conf->max_num_amsdu_subframes = max_subfrms_amsdu;
+
+        ath10k_dbg(ar, ATH10K_DBG_HTT, "htt h2t aggr cfg msg amsdu %d ampdu %d",
+                   aggr_conf->max_num_amsdu_subframes,
+                   aggr_conf->max_num_ampdu_subframes);
+
+        ret = ath10k_htc_send(&htt->ar->htc, htt->eid, skb);
+        if (ret) {
+                dev_kfree_skb_any(skb);
+                return ret;
+        }
+
+        return 0;
+}
+
 int ath10k_htt_tx_fetch_resp(struct ath10k *ar,
                              __le32 token,
                              __le16 fetch_seq_num,
@@ -1177,7 +1213,7 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
         return 0;
 
 err_unmap_msdu:
-        if (ar->dev_type != ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
                 dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
 err_free_txdesc:
         dev_kfree_skb_any(txdesc);
@@ -1498,7 +1534,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt,
         u16 msdu_id, flags1 = 0;
         u16 freq = 0;
         dma_addr_t frags_paddr = 0;
-        u32 txbuf_paddr;
+        dma_addr_t txbuf_paddr;
         struct htt_msdu_ext_desc_64 *ext_desc = NULL;
         struct htt_msdu_ext_desc_64 *ext_desc_t = NULL;
 
@@ -1692,6 +1728,7 @@ static const struct ath10k_htt_tx_ops htt_tx_ops_32 = {
         .htt_tx = ath10k_htt_tx_32,
         .htt_alloc_txbuff = ath10k_htt_tx_alloc_cont_txbuf_32,
         .htt_free_txbuff = ath10k_htt_tx_free_cont_txbuf_32,
+        .htt_h2t_aggr_cfg_msg = ath10k_htt_h2t_aggr_cfg_msg,
 };
 
 static const struct ath10k_htt_tx_ops htt_tx_ops_64 = {
@@ -1702,6 +1739,7 @@ static const struct ath10k_htt_tx_ops htt_tx_ops_64 = {
         .htt_tx = ath10k_htt_tx_64,
         .htt_alloc_txbuff = ath10k_htt_tx_alloc_cont_txbuf_64,
         .htt_free_txbuff = ath10k_htt_tx_free_cont_txbuf_64,
+        .htt_h2t_aggr_cfg_msg = ath10k_htt_h2t_aggr_cfg_msg_v2,
 };
 
 static const struct ath10k_htt_tx_ops htt_tx_ops_hl = {
@@ -1714,7 +1752,7 @@ void ath10k_htt_set_tx_ops(struct ath10k_htt *htt)
 {
         struct ath10k *ar = htt->ar;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 htt->tx_ops = &htt_tx_ops_hl;
         else if (ar->hw_params.target_64bit)
                 htt->tx_ops = &htt_tx_ops_64;
diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c
index 61ecf931ba4d..eeaee8e41b28 100644
--- a/drivers/net/wireless/ath/ath10k/hw.c
+++ b/drivers/net/wireless/ath/ath10k/hw.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2014-2017 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 <linux/types.h>
@@ -318,9 +307,11 @@ static struct ath10k_hw_ce_ctrl1_upd wcn3990_ctrl1_upd = {
 };
 
 const struct ath10k_hw_ce_regs wcn3990_ce_regs = {
-        .sr_base_addr           = 0x00000000,
+        .sr_base_addr_lo        = 0x00000000,
+        .sr_base_addr_hi        = 0x00000004,
         .sr_size_addr           = 0x00000008,
-        .dr_base_addr           = 0x0000000c,
+        .dr_base_addr_lo        = 0x0000000c,
+        .dr_base_addr_hi        = 0x00000010,
         .dr_size_addr           = 0x00000014,
         .misc_ie_addr           = 0x00000034,
         .sr_wr_index_addr       = 0x0000003c,
@@ -464,9 +455,9 @@ static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = {
 };
 
 const struct ath10k_hw_ce_regs qcax_ce_regs = {
-        .sr_base_addr           = 0x00000000,
+        .sr_base_addr_lo        = 0x00000000,
         .sr_size_addr           = 0x00000004,
-        .dr_base_addr           = 0x00000008,
+        .dr_base_addr_lo        = 0x00000008,
         .dr_size_addr           = 0x0000000c,
         .ce_cmd_addr            = 0x00000018,
         .misc_ie_addr           = 0x00000034,
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index e50a8dc5b093..de7dc01bf51d 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 _HW_H_
@@ -353,9 +342,11 @@ struct ath10k_hw_ce_ctrl1_upd {
 };
 
 struct ath10k_hw_ce_regs {
-        u32 sr_base_addr;
+        u32 sr_base_addr_lo;
+        u32 sr_base_addr_hi;
         u32 sr_size_addr;
-        u32 dr_base_addr;
+        u32 dr_base_addr_lo;
+        u32 dr_base_addr_hi;
         u32 dr_size_addr;
         u32 ce_cmd_addr;
         u32 misc_ie_addr;
@@ -734,6 +725,7 @@ ath10k_rx_desc_msdu_limit_error(struct ath10k_hw_params *hw,
 #define TARGET_TLV_NUM_TDLS_VDEVS               1
 #define TARGET_TLV_NUM_TIDS                     ((TARGET_TLV_NUM_PEERS) * 2)
 #define TARGET_TLV_NUM_MSDU_DESC                (1024 + 32)
+#define TARGET_TLV_NUM_MSDU_DESC_HL             64
 #define TARGET_TLV_NUM_WOW_PATTERNS             22
 #define TARGET_TLV_MGMT_NUM_MSDU_DESC           (50)
 
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 49758490eaba..b73c23d4ce86 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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.
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
  */
 
 #include "mac.h"
@@ -250,24 +239,24 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
 
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_CCMP:
-                arg.key_cipher = WMI_CIPHER_AES_CCM;
+                arg.key_cipher = ar->wmi_key_cipher[WMI_CIPHER_AES_CCM];
                 key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV_MGMT;
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
-                arg.key_cipher = WMI_CIPHER_TKIP;
+                arg.key_cipher = ar->wmi_key_cipher[WMI_CIPHER_TKIP];
                 arg.key_txmic_len = 8;
                 arg.key_rxmic_len = 8;
                 break;
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
-                arg.key_cipher = WMI_CIPHER_WEP;
+                arg.key_cipher = ar->wmi_key_cipher[WMI_CIPHER_WEP];
                 break;
         case WLAN_CIPHER_SUITE_CCMP_256:
-                arg.key_cipher = WMI_CIPHER_AES_CCM;
+                arg.key_cipher = ar->wmi_key_cipher[WMI_CIPHER_AES_CCM];
                 break;
         case WLAN_CIPHER_SUITE_GCMP:
         case WLAN_CIPHER_SUITE_GCMP_256:
-                arg.key_cipher = WMI_CIPHER_AES_GCM;
+                arg.key_cipher = ar->wmi_key_cipher[WMI_CIPHER_AES_GCM];
                 break;
         case WLAN_CIPHER_SUITE_BIP_GMAC_128:
         case WLAN_CIPHER_SUITE_BIP_GMAC_256:
@@ -284,7 +273,7 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
                 key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
 
         if (cmd == DISABLE_KEY) {
-                arg.key_cipher = WMI_CIPHER_NONE;
+                arg.key_cipher = ar->wmi_key_cipher[WMI_CIPHER_NONE];
                 arg.key_data = NULL;
         }
 
@@ -3397,6 +3386,7 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar,
                            struct sk_buff *skb)
 {
         const struct ieee80211_hdr *hdr = (void *)skb->data;
+        const struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
         __le16 fc = hdr->frame_control;
 
         if (!vif || vif->type == NL80211_IFTYPE_MONITOR)
@@ -3438,7 +3428,8 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar,
         if (ieee80211_is_data_present(fc) && sta && sta->tdls)
                 return ATH10K_HW_TXRX_ETHERNET;
 
-        if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags))
+        if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags) ||
+            skb_cb->flags & ATH10K_SKB_F_RAW_TX)
                 return ATH10K_HW_TXRX_RAW;
 
         return ATH10K_HW_TXRX_NATIVE_WIFI;
@@ -3544,10 +3535,13 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
 static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,
                                     struct ieee80211_vif *vif,
                                     struct ieee80211_txq *txq,
-                                    struct sk_buff *skb)
+                                    struct sk_buff *skb, u16 airtime)
 {
         struct ieee80211_hdr *hdr = (void *)skb->data;
         struct ath10k_skb_cb *cb = ATH10K_SKB_CB(skb);
+        const struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        bool is_data = ieee80211_is_data(hdr->frame_control) ||
+                        ieee80211_is_data_qos(hdr->frame_control);
 
         cb->flags = 0;
         if (!ath10k_tx_h_use_hwcrypto(vif, skb))
@@ -3559,8 +3553,19 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,
         if (ieee80211_is_data_qos(hdr->frame_control))
                 cb->flags |= ATH10K_SKB_F_QOS;
 
+        /* Data frames encrypted in software will be posted to firmware
+         * with tx encap mode set to RAW. Ex: Multicast traffic generated
+         * for a specific VLAN group will always be encrypted in software.
+         */
+        if (is_data && ieee80211_has_protected(hdr->frame_control) &&
+            !info->control.hw_key) {
+                cb->flags |= ATH10K_SKB_F_NO_HWCRYPT;
+                cb->flags |= ATH10K_SKB_F_RAW_TX;
+        }
+
         cb->vif = vif;
         cb->txq = txq;
+        cb->airtime_est = airtime;
 }
 
 bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
@@ -3667,6 +3672,7 @@ static int ath10k_mac_tx(struct ath10k *ar,
 {
         struct ieee80211_hw *hw = ar->hw;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        const struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
         int ret;
 
         /* We should disable CCK RATE due to P2P */
@@ -3684,7 +3690,8 @@ static int ath10k_mac_tx(struct ath10k *ar,
                 ath10k_tx_h_8023(skb);
                 break;
         case ATH10K_HW_TXRX_RAW:
-                if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) {
+                if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags) &&
+                    !(skb_cb->flags & ATH10K_SKB_F_RAW_TX)) {
                         WARN_ON_ONCE(1);
                         ieee80211_free_txskb(hw, skb);
                         return -ENOTSUPP;
@@ -3863,7 +3870,7 @@ void ath10k_mgmt_over_wmi_tx_work(struct work_struct *work)
                                 ath10k_warn(ar, "failed to transmit management frame by ref via WMI: %d\n",
                                             ret);
                                 dma_unmap_single(ar->dev, paddr, skb->len,
-                                                 DMA_FROM_DEVICE);
+                                                 DMA_TO_DEVICE);
                                 ieee80211_free_txskb(ar->hw, skb);
                         }
                 } else {
@@ -3890,7 +3897,6 @@ static void ath10k_mac_txq_init(struct ieee80211_txq *txq)
 
 static void ath10k_mac_txq_unref(struct ath10k *ar, struct ieee80211_txq *txq)
 {
-        struct ath10k_txq *artxq;
         struct ath10k_skb_cb *cb;
         struct sk_buff *msdu;
         int msdu_id;
@@ -3898,12 +3904,6 @@ static void ath10k_mac_txq_unref(struct ath10k *ar, struct ieee80211_txq *txq)
         if (!txq)
                 return;
 
-        artxq = (void *)txq->drv_priv;
-        spin_lock_bh(&ar->txqs_lock);
-        if (!list_empty(&artxq->list))
-                list_del_init(&artxq->list);
-        spin_unlock_bh(&ar->txqs_lock);
-
         spin_lock_bh(&ar->htt.tx_lock);
         idr_for_each_entry(&ar->htt.pending_tx, msdu, msdu_id) {
                 cb = ATH10K_SKB_CB(msdu);
@@ -3943,7 +3943,6 @@ static bool ath10k_mac_tx_can_push(struct ieee80211_hw *hw,
         struct ath10k_txq *artxq = (void *)txq->drv_priv;
 
         /* No need to get locks */
-
         if (ar->htt.tx_q_state.mode == HTT_TX_MODE_SWITCH_PUSH)
                 return true;
 
@@ -3956,6 +3955,52 @@ static bool ath10k_mac_tx_can_push(struct ieee80211_hw *hw,
         return false;
 }
 
+/* Return estimated airtime in microsecond, which is calculated using last
+ * reported TX rate. This is just a rough estimation because host driver has no
+ * knowledge of the actual transmit rate, retries or aggregation. If actual
+ * airtime can be reported by firmware, then delta between estimated and actual
+ * airtime can be adjusted from deficit.
+ */
+#define IEEE80211_ATF_OVERHEAD          100     /* IFS + some slot time */
+#define IEEE80211_ATF_OVERHEAD_IFS      16      /* IFS only */
+static u16 ath10k_mac_update_airtime(struct ath10k *ar,
+                                     struct ieee80211_txq *txq,
+                                     struct sk_buff *skb)
+{
+        struct ath10k_sta *arsta;
+        u32 pktlen;
+        u16 airtime = 0;
+
+        if (!txq || !txq->sta)
+                return airtime;
+
+        if (test_bit(WMI_SERVICE_REPORT_AIRTIME, ar->wmi.svc_map))
+                return airtime;
+
+        spin_lock_bh(&ar->data_lock);
+        arsta = (struct ath10k_sta *)txq->sta->drv_priv;
+
+        pktlen = skb->len + 38; /* Assume MAC header 30, SNAP 8 for most case */
+        if (arsta->last_tx_bitrate) {
+                /* airtime in us, last_tx_bitrate in 100kbps */
+                airtime = (pktlen * 8 * (1000 / 100))
+                                / arsta->last_tx_bitrate;
+                /* overhead for media access time and IFS */
+                airtime += IEEE80211_ATF_OVERHEAD_IFS;
+        } else {
+                /* This is mostly for throttle excessive BC/MC frames, and the
+                 * airtime/rate doesn't need be exact. Airtime of BC/MC frames
+                 * in 2G get some discount, which helps prevent very low rate
+                 * frames from being blocked for too long.
+                 */
+                airtime = (pktlen * 8 * (1000 / 100)) / 60; /* 6M */
+                airtime += IEEE80211_ATF_OVERHEAD;
+        }
+        spin_unlock_bh(&ar->data_lock);
+
+        return airtime;
+}
+
 int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
                            struct ieee80211_txq *txq)
 {
@@ -3971,6 +4016,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
         size_t skb_len;
         bool is_mgmt, is_presp;
         int ret;
+        u16 airtime;
 
         spin_lock_bh(&ar->htt.tx_lock);
         ret = ath10k_htt_tx_inc_pending(htt);
@@ -3988,7 +4034,8 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
                 return -ENOENT;
         }
 
-        ath10k_mac_tx_h_fill_cb(ar, vif, txq, skb);
+        airtime = ath10k_mac_update_airtime(ar, txq, skb);
+        ath10k_mac_tx_h_fill_cb(ar, vif, txq, skb, airtime);
 
         skb_len = skb->len;
         txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb);
@@ -4030,48 +4077,45 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
         return skb_len;
 }
 
-void ath10k_mac_tx_push_pending(struct ath10k *ar)
+static int ath10k_mac_schedule_txq(struct ieee80211_hw *hw, u32 ac)
 {
-        struct ieee80211_hw *hw = ar->hw;
         struct ieee80211_txq *txq;
-        struct ath10k_txq *artxq;
-        struct ath10k_txq *last;
-        int ret;
-        int max;
-
-        if (ar->htt.num_pending_tx >= (ar->htt.max_num_pending_tx / 2))
-                return;
-
-        spin_lock_bh(&ar->txqs_lock);
-        rcu_read_lock();
-
-        last = list_last_entry(&ar->txqs, struct ath10k_txq, list);
-        while (!list_empty(&ar->txqs)) {
-                artxq = list_first_entry(&ar->txqs, struct ath10k_txq, list);
-                txq = container_of((void *)artxq, struct ieee80211_txq,
-                                   drv_priv);
+        int ret = 0;
 
-                /* Prevent aggressive sta/tid taking over tx queue */
-                max = HTC_HOST_MAX_MSG_PER_TX_BUNDLE;
-                ret = 0;
-                while (ath10k_mac_tx_can_push(hw, txq) && max--) {
+        ieee80211_txq_schedule_start(hw, ac);
+        while ((txq = ieee80211_next_txq(hw, ac))) {
+                while (ath10k_mac_tx_can_push(hw, txq)) {
                         ret = ath10k_mac_tx_push_txq(hw, txq);
                         if (ret < 0)
                                 break;
                 }
+                ieee80211_return_txq(hw, txq);
+                ath10k_htt_tx_txq_update(hw, txq);
+                if (ret == -EBUSY)
+                        break;
+        }
+        ieee80211_txq_schedule_end(hw, ac);
 
-                list_del_init(&artxq->list);
-                if (ret != -ENOENT)
-                        list_add_tail(&artxq->list, &ar->txqs);
+        return ret;
+}
 
-                ath10k_htt_tx_txq_update(hw, txq);
+void ath10k_mac_tx_push_pending(struct ath10k *ar)
+{
+        struct ieee80211_hw *hw = ar->hw;
+        u32 ac;
+
+        if (ar->htt.tx_q_state.mode != HTT_TX_MODE_SWITCH_PUSH)
+                return;
+
+        if (ar->htt.num_pending_tx >= (ar->htt.max_num_pending_tx / 2))
+                return;
 
-                if (artxq == last || (ret < 0 && ret != -ENOENT))
+        rcu_read_lock();
+        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
+                if (ath10k_mac_schedule_txq(hw, ac) == -EBUSY)
                         break;
         }
-
         rcu_read_unlock();
-        spin_unlock_bh(&ar->txqs_lock);
 }
 EXPORT_SYMBOL(ath10k_mac_tx_push_pending);
 
@@ -4258,8 +4302,10 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,
         bool is_mgmt;
         bool is_presp;
         int ret;
+        u16 airtime;
 
-        ath10k_mac_tx_h_fill_cb(ar, vif, txq, skb);
+        airtime = ath10k_mac_update_airtime(ar, txq, skb);
+        ath10k_mac_tx_h_fill_cb(ar, vif, txq, skb, airtime);
 
         txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb);
         txpath = ath10k_mac_tx_h_get_txpath(ar, skb, txmode);
@@ -4310,31 +4356,28 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,
                                         struct ieee80211_txq *txq)
 {
         struct ath10k *ar = hw->priv;
-        struct ath10k_txq *artxq = (void *)txq->drv_priv;
-        struct ieee80211_txq *f_txq;
-        struct ath10k_txq *f_artxq;
-        int ret = 0;
-        int max = HTC_HOST_MAX_MSG_PER_TX_BUNDLE;
+        int ret;
+        u8 ac;
 
-        spin_lock_bh(&ar->txqs_lock);
-        if (list_empty(&artxq->list))
-                list_add_tail(&artxq->list, &ar->txqs);
+        ath10k_htt_tx_txq_update(hw, txq);
+        if (ar->htt.tx_q_state.mode != HTT_TX_MODE_SWITCH_PUSH)
+                return;
 
-        f_artxq = list_first_entry(&ar->txqs, struct ath10k_txq, list);
-        f_txq = container_of((void *)f_artxq, struct ieee80211_txq, drv_priv);
-        list_del_init(&f_artxq->list);
+        ac = txq->ac;
+        ieee80211_txq_schedule_start(hw, ac);
+        txq = ieee80211_next_txq(hw, ac);
+        if (!txq)
+                goto out;
 
-        while (ath10k_mac_tx_can_push(hw, f_txq) && max--) {
-                ret = ath10k_mac_tx_push_txq(hw, f_txq);
+        while (ath10k_mac_tx_can_push(hw, txq)) {
+                ret = ath10k_mac_tx_push_txq(hw, txq);
                 if (ret < 0)
                         break;
         }
-        if (ret != -ENOENT)
-                list_add_tail(&f_artxq->list, &ar->txqs);
-        spin_unlock_bh(&ar->txqs_lock);
-
-        ath10k_htt_tx_txq_update(hw, f_txq);
+        ieee80211_return_txq(hw, txq);
         ath10k_htt_tx_txq_update(hw, txq);
+out:
+        ieee80211_txq_schedule_end(hw, ac);
 }
 
 /* Must not be called with conf_mutex held as workers can use that also. */
@@ -4549,7 +4592,8 @@ static struct ieee80211_sta_ht_cap ath10k_get_ht_cap(struct ath10k *ar)
                 ht_cap.cap |= stbc;
         }
 
-        if (ar->ht_cap_info & WMI_HT_CAP_LDPC)
+        if (ar->ht_cap_info & WMI_HT_CAP_LDPC || (ar->ht_cap_info &
+            WMI_HT_CAP_RX_LDPC && (ar->ht_cap_info & WMI_HT_CAP_TX_LDPC)))
                 ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;
 
         if (ar->ht_cap_info & WMI_HT_CAP_L_SIG_TXOP_PROT)
@@ -4704,7 +4748,7 @@ static int ath10k_start(struct ieee80211_hw *hw)
                 goto err;
         }
 
-        ret = ath10k_hif_power_up(ar);
+        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
         if (ret) {
                 ath10k_err(ar, "Could not init hif: %d\n", ret);
                 goto err_off;
@@ -5341,6 +5385,17 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
                 goto err_peer_delete;
         }
 
+        if (test_bit(WMI_SERVICE_RTT_RESPONDER_ROLE, ar->wmi.svc_map)) {
+                vdev_param = ar->wmi.vdev_param->rtt_responder_role;
+                ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
+                                                arvif->ftm_responder);
+
+                /* It is harmless to not set FTM role. Do not warn */
+                if (ret && ret != -EOPNOTSUPP)
+                        ath10k_warn(ar, "failed to set vdev %i FTM Responder: %d\n",
+                                    arvif->vdev_id, ret);
+        }
+
         if (vif->type == NL80211_IFTYPE_MONITOR) {
                 ar->monitor_arvif = arvif;
                 ret = ath10k_monitor_recalc(ar);
@@ -5615,6 +5670,20 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
         if (changed & BSS_CHANGED_BSSID && !is_zero_ether_addr(info->bssid))
                 ether_addr_copy(arvif->bssid, info->bssid);
 
+        if (changed & BSS_CHANGED_FTM_RESPONDER &&
+            arvif->ftm_responder != info->ftm_responder &&
+            test_bit(WMI_SERVICE_RTT_RESPONDER_ROLE, ar->wmi.svc_map)) {
+                arvif->ftm_responder = info->ftm_responder;
+
+                vdev_param = ar->wmi.vdev_param->rtt_responder_role;
+                ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
+                                                arvif->ftm_responder);
+
+                ath10k_dbg(ar, ATH10K_DBG_MAC,
+                           "mac vdev %d ftm_responder %d:ret %d\n",
+                           arvif->vdev_id, arvif->ftm_responder, ret);
+        }
+
         if (changed & BSS_CHANGED_BEACON_ENABLED)
                 ath10k_control_beaconing(arvif, info);
 
@@ -8617,6 +8686,15 @@ int ath10k_mac_register(struct ath10k *ar)
                 wiphy_ext_feature_set(ar->hw->wiphy,
                                       NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT);
 
+        if (ath10k_peer_stats_enabled(ar) ||
+            test_bit(WMI_SERVICE_REPORT_AIRTIME, ar->wmi.svc_map))
+                wiphy_ext_feature_set(ar->hw->wiphy,
+                                      NL80211_EXT_FEATURE_AIRTIME_FAIRNESS);
+
+        if (test_bit(WMI_SERVICE_RTT_RESPONDER_ROLE, ar->wmi.svc_map))
+                wiphy_ext_feature_set(ar->hw->wiphy,
+                                      NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER);
+
         /*
          * on LL hardware queues are managed entirely by the FW
          * so we only advertise to mac we can do the queues thing
@@ -8726,12 +8804,19 @@ int ath10k_mac_register(struct ath10k *ar)
 
         wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
 
+        ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
+
         ret = ieee80211_register_hw(ar->hw);
         if (ret) {
                 ath10k_err(ar, "failed to register ieee80211: %d\n", ret);
                 goto err_dfs_detector_exit;
         }
 
+        if (test_bit(WMI_SERVICE_PER_PACKET_SW_ENCRYPT, ar->wmi.svc_map)) {
+                ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP_VLAN);
+                ar->hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN);
+        }
+
         if (!ath_is_world_regd(&ar->ath_common.regulatory)) {
                 ret = regulatory_hint(ar->hw->wiphy,
                                       ar->ath_common.regulatory.alpha2);
diff --git a/drivers/net/wireless/ath/ath10k/mac.h b/drivers/net/wireless/ath/ath10k/mac.h
index 570493d2d648..1fe84948b868 100644
--- a/drivers/net/wireless/ath/ath10k/mac.h
+++ b/drivers/net/wireless/ath/ath10k/mac.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 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 _MAC_H_
diff --git a/drivers/net/wireless/ath/ath10k/p2p.c b/drivers/net/wireless/ath/ath10k/p2p.c
index 7e621ee194e3..29c737b2f432 100644
--- a/drivers/net/wireless/ath/ath10k/p2p.c
+++ b/drivers/net/wireless/ath/ath10k/p2p.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * 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 "core.h"
diff --git a/drivers/net/wireless/ath/ath10k/p2p.h b/drivers/net/wireless/ath/ath10k/p2p.h
index 7be616e2e121..7d7f44809fbb 100644
--- a/drivers/net/wireless/ath/ath10k/p2p.h
+++ b/drivers/net/wireless/ath/ath10k/p2p.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * 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 _P2P_H
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 39e0b1cc2a12..271f92c24d44 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 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 <linux/pci.h>
@@ -913,7 +902,6 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
                                     int nbytes)
 {
         struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
-        struct ath10k_ce *ce = ath10k_ce_priv(ar);
         int ret = 0;
         u32 *buf;
         unsigned int completed_nbytes, alloc_nbytes, remaining_bytes;
@@ -924,8 +912,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
         void *data_buf = NULL;
         int i;
 
-        spin_lock_bh(&ce->ce_lock);
-
+        mutex_lock(&ar_pci->ce_diag_mutex);
         ce_diag = ar_pci->ce_diag;
 
         /*
@@ -960,19 +947,17 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
                 nbytes = min_t(unsigned int, remaining_bytes,
                                DIAG_TRANSFER_LIMIT);
 
-                ret = ce_diag->ops->ce_rx_post_buf(ce_diag, &ce_data, ce_data);
+                ret = ath10k_ce_rx_post_buf(ce_diag, &ce_data, ce_data);
                 if (ret != 0)
                         goto done;
 
                 /* Request CE to send from Target(!) address to Host buffer */
-                ret = ath10k_ce_send_nolock(ce_diag, NULL, (u32)address, nbytes, 0,
-                                            0);
+                ret = ath10k_ce_send(ce_diag, NULL, (u32)address, nbytes, 0, 0);
                 if (ret)
                         goto done;
 
                 i = 0;
-                while (ath10k_ce_completed_send_next_nolock(ce_diag,
-                                                            NULL) != 0) {
+                while (ath10k_ce_completed_send_next(ce_diag, NULL) != 0) {
                         udelay(DIAG_ACCESS_CE_WAIT_US);
                         i += DIAG_ACCESS_CE_WAIT_US;
 
@@ -983,10 +968,8 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
                 }
 
                 i = 0;
-                while (ath10k_ce_completed_recv_next_nolock(ce_diag,
-                                                            (void **)&buf,
-                                                            &completed_nbytes)
-                                                                != 0) {
+                while (ath10k_ce_completed_recv_next(ce_diag, (void **)&buf,
+                                                     &completed_nbytes) != 0) {
                         udelay(DIAG_ACCESS_CE_WAIT_US);
                         i += DIAG_ACCESS_CE_WAIT_US;
 
@@ -1019,7 +1002,7 @@ done:
                 dma_free_coherent(ar->dev, alloc_nbytes, data_buf,
                                   ce_data_base);
 
-        spin_unlock_bh(&ce->ce_lock);
+        mutex_unlock(&ar_pci->ce_diag_mutex);
 
         return ret;
 }
@@ -1067,7 +1050,6 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
                               const void *data, int nbytes)
 {
         struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
-        struct ath10k_ce *ce = ath10k_ce_priv(ar);
         int ret = 0;
         u32 *buf;
         unsigned int completed_nbytes, alloc_nbytes, remaining_bytes;
@@ -1076,8 +1058,7 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
         dma_addr_t ce_data_base = 0;
         int i;
 
-        spin_lock_bh(&ce->ce_lock);
-
+        mutex_lock(&ar_pci->ce_diag_mutex);
         ce_diag = ar_pci->ce_diag;
 
         /*
@@ -1118,7 +1099,7 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
                 memcpy(data_buf, data, nbytes);
 
                 /* Set up to receive directly into Target(!) address */
-                ret = ce_diag->ops->ce_rx_post_buf(ce_diag, &address, address);
+                ret = ath10k_ce_rx_post_buf(ce_diag, &address, address);
                 if (ret != 0)
                         goto done;
 
@@ -1126,14 +1107,12 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
                  * Request CE to send caller-supplied data that
                  * was copied to bounce buffer to Target(!) address.
                  */
-                ret = ath10k_ce_send_nolock(ce_diag, NULL, ce_data_base,
-                                            nbytes, 0, 0);
+                ret = ath10k_ce_send(ce_diag, NULL, ce_data_base, nbytes, 0, 0);
                 if (ret != 0)
                         goto done;
 
                 i = 0;
-                while (ath10k_ce_completed_send_next_nolock(ce_diag,
-                                                            NULL) != 0) {
+                while (ath10k_ce_completed_send_next(ce_diag, NULL) != 0) {
                         udelay(DIAG_ACCESS_CE_WAIT_US);
                         i += DIAG_ACCESS_CE_WAIT_US;
 
@@ -1144,10 +1123,8 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
                 }
 
                 i = 0;
-                while (ath10k_ce_completed_recv_next_nolock(ce_diag,
-                                                            (void **)&buf,
-                                                            &completed_nbytes)
-                                                                != 0) {
+                while (ath10k_ce_completed_recv_next(ce_diag, (void **)&buf,
+                                                     &completed_nbytes) != 0) {
                         udelay(DIAG_ACCESS_CE_WAIT_US);
                         i += DIAG_ACCESS_CE_WAIT_US;
 
@@ -1182,7 +1159,7 @@ done:
                 ath10k_warn(ar, "failed to write diag value at 0x%x: %d\n",
                             address, ret);
 
-        spin_unlock_bh(&ce->ce_lock);
+        mutex_unlock(&ar_pci->ce_diag_mutex);
 
         return ret;
 }
@@ -2283,7 +2260,7 @@ static int ath10k_pci_get_num_banks(struct ath10k *ar)
                 return 1;
         case QCA6164_2_1_DEVICE_ID:
         case QCA6174_2_1_DEVICE_ID:
-                switch (MS(ar->chip_id, SOC_CHIP_ID_REV)) {
+                switch (MS(ar->bus_param.chip_id, SOC_CHIP_ID_REV)) {
                 case QCA6174_HW_1_0_CHIP_ID_REV:
                 case QCA6174_HW_1_1_CHIP_ID_REV:
                 case QCA6174_HW_2_1_CHIP_ID_REV:
@@ -2806,7 +2783,8 @@ static int ath10k_pci_chip_reset(struct ath10k *ar)
         return ar_pci->pci_hard_reset(ar);
 }
 
-static int ath10k_pci_hif_power_up(struct ath10k *ar)
+static int ath10k_pci_hif_power_up(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
         int ret;
@@ -3462,6 +3440,7 @@ int ath10k_pci_setup_resource(struct ath10k *ar)
 
         spin_lock_init(&ce->ce_lock);
         spin_lock_init(&ar_pci->ps_lock);
+        mutex_init(&ar_pci->ce_diag_mutex);
 
         timer_setup(&ar_pci->rx_post_retry, ath10k_pci_rx_replenish_retry, 0);
 
@@ -3553,7 +3532,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
         case QCA9377_1_0_DEVICE_ID:
                 hw_rev = ATH10K_HW_QCA9377;
                 pci_ps = true;
-                pci_soft_reset = NULL;
+                pci_soft_reset = ath10k_pci_warm_reset;
                 pci_hard_reset = ath10k_pci_qca6174_chip_reset;
                 targ_cpu_to_ce_addr = ath10k_pci_qca6174_targ_cpu_to_ce_addr;
                 break;
@@ -3636,6 +3615,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
         }
 
         bus_params.dev_type = ATH10K_DEV_TYPE_LL;
+        bus_params.link_can_suspend = true;
         bus_params.chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);
         if (bus_params.chip_id == 0xffffffff) {
                 ath10k_err(ar, "failed to get chip id\n");
diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h
index e8d86331c539..3773c79f322f 100644
--- a/drivers/net/wireless/ath/ath10k/pci.h
+++ b/drivers/net/wireless/ath/ath10k/pci.h
@@ -1,24 +1,14 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 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 _PCI_H_
 #define _PCI_H_
 
 #include <linux/interrupt.h>
+#include <linux/mutex.h>
 
 #include "hw.h"
 #include "ce.h"
@@ -128,6 +118,8 @@ struct ath10k_pci {
 
         /* Copy Engine used for Diagnostic Accesses */
         struct ath10k_ce_pipe *ce_diag;
+        /* For protecting ce_diag */
+        struct mutex ce_diag_mutex;
 
         struct ath10k_ce ce;
         struct timer_list rx_post_retry;
diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index 37b3bd629f48..a7bc2c70d076 100644
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 <linux/completion.h>
diff --git a/drivers/net/wireless/ath/ath10k/qmi.h b/drivers/net/wireless/ath/ath10k/qmi.h
index 1efe1d22fc2f..e4aa20445666 100644
--- a/drivers/net/wireless/ath/ath10k/qmi.h
+++ b/drivers/net/wireless/ath/ath10k/qmi.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 _ATH10K_QMI_H_
 #define _ATH10K_QMI_H_
diff --git a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c
index ba79c2e4aed6..1fe05c6218c3 100644
--- a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c
+++ b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 <linux/soc/qcom/qmi.h>
@@ -1763,14 +1752,239 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
                                            daemon_support_valid),
         },
         {
-                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .data_type      = QMI_UNSIGNED_4_BYTE,
                 .elem_len       = 1,
-                .elem_size      = sizeof(u8),
+                .elem_size      = sizeof(u32),
                 .array_type     = NO_ARRAY,
                 .tlv_type       = 0x10,
                 .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
                                            daemon_support),
         },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x11,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           wake_msi_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_4_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u32),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x11,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           wake_msi),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x12,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           gpios_valid),
+        },
+        {
+                .data_type      = QMI_DATA_LEN,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u32),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x12,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           gpios_len),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_4_BYTE,
+                .elem_len       = QMI_WLFW_MAX_NUM_GPIO_V01,
+                .elem_size      = sizeof(u32),
+                .array_type     = VAR_LEN_ARRAY,
+                .tlv_type       = 0x12,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           gpios),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x13,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           nm_modem_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x13,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           nm_modem),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x14,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           bdf_support_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x14,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           bdf_support),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x15,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           bdf_cache_support_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x15,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           bdf_cache_support),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x16,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           m3_support_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x16,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           m3_support),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x17,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           m3_cache_support_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x17,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           m3_cache_support),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x18,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           cal_filesys_support_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x18,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           cal_filesys_support),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x19,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           cal_cache_support_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x19,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           cal_cache_support),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x1A,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           cal_done_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x1A,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           cal_done),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x1B,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           mem_bucket_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_4_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u32),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x1B,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           mem_bucket),
+        },
+        {
+                .data_type      = QMI_OPT_FLAG,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x1C,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           mem_cfg_mode_valid),
+        },
+        {
+                .data_type      = QMI_UNSIGNED_1_BYTE,
+                .elem_len       = 1,
+                .elem_size      = sizeof(u8),
+                .array_type     = NO_ARRAY,
+                .tlv_type       = 0x1C,
+                .offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+                                           mem_cfg_mode),
+        },
         {}
 };
 
diff --git a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
index c5e3870b8871..bca1186e1560 100644
--- a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
+++ b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 WCN3990_QMI_SVC_V01_H
@@ -553,12 +542,38 @@ struct wlfw_mac_addr_resp_msg_v01 {
 #define WLFW_MAC_ADDR_RESP_MSG_V01_MAX_MSG_LEN 7
 extern struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[];
 
+#define QMI_WLFW_MAX_NUM_GPIO_V01 32
 struct wlfw_host_cap_req_msg_v01 {
         u8 daemon_support_valid;
-        u8 daemon_support;
-};
-
-#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 4
+        u32 daemon_support;
+        u8 wake_msi_valid;
+        u32 wake_msi;
+        u8 gpios_valid;
+        u32 gpios_len;
+        u32 gpios[QMI_WLFW_MAX_NUM_GPIO_V01];
+        u8 nm_modem_valid;
+        u8 nm_modem;
+        u8 bdf_support_valid;
+        u8 bdf_support;
+        u8 bdf_cache_support_valid;
+        u8 bdf_cache_support;
+        u8 m3_support_valid;
+        u8 m3_support;
+        u8 m3_cache_support_valid;
+        u8 m3_cache_support;
+        u8 cal_filesys_support_valid;
+        u8 cal_filesys_support;
+        u8 cal_cache_support_valid;
+        u8 cal_cache_support;
+        u8 cal_done_valid;
+        u8 cal_done;
+        u8 mem_bucket_valid;
+        u32 mem_bucket;
+        u8 mem_cfg_mode_valid;
+        u8 mem_cfg_mode;
+};
+
+#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 189
 extern struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[];
 
 struct wlfw_host_cap_resp_msg_v01 {
diff --git a/drivers/net/wireless/ath/ath10k/rx_desc.h b/drivers/net/wireless/ath/ath10k/rx_desc.h
index dfbfe674e11e..dec1582005b9 100644
--- a/drivers/net/wireless/ath/ath10k/rx_desc.h
+++ b/drivers/net/wireless/ath/ath10k/rx_desc.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 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 _RX_DESC_H_
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index 983ecfef1d28..d62502f386f2 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2004-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2012,2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2016-2017 Erik Stromdahl <erik.stromdahl@gmail.com>
- *
- * 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 <linux/module.h>
@@ -1381,7 +1370,8 @@ static int ath10k_sdio_hif_disable_intrs(struct ath10k *ar)
         return ret;
 }
 
-static int ath10k_sdio_hif_power_up(struct ath10k *ar)
+static int ath10k_sdio_hif_power_up(struct ath10k *ar,
+                                    enum ath10k_firmware_mode fw_mode)
 {
         struct ath10k_sdio *ar_sdio = ath10k_sdio_priv(ar);
         struct sdio_func *func = ar_sdio->func;
@@ -1615,12 +1605,33 @@ static int ath10k_sdio_hif_diag_write_mem(struct ath10k *ar, u32 address,
         return 0;
 }
 
+static int ath10k_sdio_hif_swap_mailbox(struct ath10k *ar)
+{
+        struct ath10k_sdio *ar_sdio = ath10k_sdio_priv(ar);
+        u32 addr, val;
+        int ret = 0;
+
+        addr = host_interest_item_address(HI_ITEM(hi_acs_flags));
+
+        ret = ath10k_sdio_hif_diag_read32(ar, addr, &val);
+        if (ret) {
+                ath10k_warn(ar, "unable to read hi_acs_flags : %d\n", ret);
+                return ret;
+        }
+
+        if (val & HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_FW_ACK) {
+                ath10k_dbg(ar, ATH10K_DBG_SDIO,
+                           "sdio mailbox swap service enabled\n");
+                ar_sdio->swap_mbox = true;
+        }
+        return 0;
+}
+
 /* HIF start/stop */
 
 static int ath10k_sdio_hif_start(struct ath10k *ar)
 {
         struct ath10k_sdio *ar_sdio = ath10k_sdio_priv(ar);
-        u32 addr, val;
         int ret;
 
         /* Sleep 20 ms before HIF interrupts are disabled.
@@ -1654,20 +1665,6 @@ static int ath10k_sdio_hif_start(struct ath10k *ar)
         if (ret)
                 ath10k_warn(ar, "failed to enable sdio interrupts: %d\n", ret);
 
-        addr = host_interest_item_address(HI_ITEM(hi_acs_flags));
-
-        ret = ath10k_sdio_hif_diag_read32(ar, addr, &val);
-        if (ret) {
-                ath10k_warn(ar, "unable to read hi_acs_flags address: %d\n", ret);
-                return ret;
-        }
-
-        if (val & HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_FW_ACK) {
-                ath10k_dbg(ar, ATH10K_DBG_SDIO,
-                           "sdio mailbox swap service enabled\n");
-                ar_sdio->swap_mbox = true;
-        }
-
         /* Enable sleep and then disable it again */
         ret = ath10k_sdio_hif_set_mbox_sleep(ar, true);
         if (ret)
@@ -1898,6 +1895,7 @@ static const struct ath10k_hif_ops ath10k_sdio_hif_ops = {
         .exchange_bmi_msg       = ath10k_sdio_bmi_exchange_msg,
         .start                  = ath10k_sdio_hif_start,
         .stop                   = ath10k_sdio_hif_stop,
+        .swap_mailbox           = ath10k_sdio_hif_swap_mailbox,
         .map_service_to_pipe    = ath10k_sdio_hif_map_service_to_pipe,
         .get_default_pipe       = ath10k_sdio_hif_get_default_pipe,
         .send_complete_check    = ath10k_sdio_hif_send_complete_check,
@@ -2088,7 +2086,10 @@ static struct sdio_driver ath10k_sdio_driver = {
         .id_table = ath10k_sdio_devices,
         .probe = ath10k_sdio_probe,
         .remove = ath10k_sdio_remove,
-        .drv.pm = ATH10K_SDIO_PM_OPS,
+        .drv = {
+                .owner = THIS_MODULE,
+                .pm = ATH10K_SDIO_PM_OPS,
+        },
 };
 
 static int __init ath10k_sdio_init(void)
diff --git a/drivers/net/wireless/ath/ath10k/sdio.h b/drivers/net/wireless/ath/ath10k/sdio.h
index 453eb6263143..b8c7ac0330bd 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.h
+++ b/drivers/net/wireless/ath/ath10k/sdio.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2004-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2012 Qualcomm Atheros, Inc.
  * Copyright (c) 2016-2017 Erik Stromdahl <erik.stromdahl@gmail.com>
- *
- * 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 _SDIO_H_
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index 54efe6be8f1d..873cb4ce419b 100644
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 <linux/clk.h>
@@ -30,6 +19,7 @@
 
 #define ATH10K_SNOC_RX_POST_RETRY_MS 50
 #define CE_POLL_PIPE 4
+#define ATH10K_SNOC_WAKE_IRQ 2
 
 static char *const ce_name[] = {
         "WLAN_CE_0",
@@ -66,7 +56,7 @@ static void ath10k_snoc_pktlog_rx_cb(struct ath10k_ce_pipe *ce_state);
 
 static const struct ath10k_snoc_drv_priv drv_priv = {
         .hw_rev = ATH10K_HW_WCN3990,
-        .dma_mask = DMA_BIT_MASK(37),
+        .dma_mask = DMA_BIT_MASK(35),
         .msa_size = 0x100000,
 };
 
@@ -875,13 +865,11 @@ static void ath10k_snoc_tx_pipe_cleanup(struct ath10k_snoc_pipe *snoc_pipe)
 {
         struct ath10k_ce_pipe *ce_pipe;
         struct ath10k_ce_ring *ce_ring;
-        struct ath10k_snoc *ar_snoc;
         struct sk_buff *skb;
         struct ath10k *ar;
         int i;
 
         ar = snoc_pipe->hif_ce_state;
-        ar_snoc = ath10k_snoc_priv(ar);
         ce_pipe = snoc_pipe->ce_hdl;
         ce_ring = ce_pipe->src_ring;
 
@@ -958,7 +946,8 @@ static int ath10k_snoc_init_pipes(struct ath10k *ar)
         return 0;
 }
 
-static int ath10k_snoc_wlan_enable(struct ath10k *ar)
+static int ath10k_snoc_wlan_enable(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         struct ath10k_tgt_pipe_cfg tgt_cfg[CE_COUNT_MAX];
         struct ath10k_qmi_wlan_enable_cfg cfg;
@@ -992,7 +981,17 @@ static int ath10k_snoc_wlan_enable(struct ath10k *ar)
         cfg.shadow_reg_cfg = (struct ath10k_shadow_reg_cfg *)
                 &target_shadow_reg_cfg_map;
 
-        mode = QMI_WLFW_MISSION_V01;
+        switch (fw_mode) {
+        case ATH10K_FIRMWARE_MODE_NORMAL:
+                mode = QMI_WLFW_MISSION_V01;
+                break;
+        case ATH10K_FIRMWARE_MODE_UTF:
+                mode = QMI_WLFW_FTM_V01;
+                break;
+        default:
+                ath10k_err(ar, "invalid firmware mode %d\n", fw_mode);
+                return -EINVAL;
+        }
 
         return ath10k_qmi_wlan_enable(ar, &cfg, mode,
                                        NULL);
@@ -1000,7 +999,16 @@ static int ath10k_snoc_wlan_enable(struct ath10k *ar)
 
 static void ath10k_snoc_wlan_disable(struct ath10k *ar)
 {
-        if (!test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags))
+        struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
+
+        /* If both ATH10K_FLAG_CRASH_FLUSH and ATH10K_SNOC_FLAG_RECOVERY
+         * flags are not set, it means that the driver has restarted
+         * due to a crash inject via debugfs. In this case, the driver
+         * needs to restart the firmware and hence send qmi wlan disable,
+         * during the driver restart sequence.
+         */
+        if (!test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags) ||
+            !test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags))
                 ath10k_qmi_wlan_disable(ar);
 }
 
@@ -1012,14 +1020,15 @@ static void ath10k_snoc_hif_power_down(struct ath10k *ar)
         ath10k_ce_free_rri(ar);
 }
 
-static int ath10k_snoc_hif_power_up(struct ath10k *ar)
+static int ath10k_snoc_hif_power_up(struct ath10k *ar,
+                                    enum ath10k_firmware_mode fw_mode)
 {
         int ret;
 
         ath10k_dbg(ar, ATH10K_DBG_SNOC, "%s:WCN3990 driver state = %d\n",
                    __func__, ar->state);
 
-        ret = ath10k_snoc_wlan_enable(ar);
+        ret = ath10k_snoc_wlan_enable(ar, fw_mode);
         if (ret) {
                 ath10k_err(ar, "failed to enable wcn3990: %d\n", ret);
                 return ret;
@@ -1041,6 +1050,46 @@ err_wlan_enable:
         return ret;
 }
 
+#ifdef CONFIG_PM
+static int ath10k_snoc_hif_suspend(struct ath10k *ar)
+{
+        struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
+        int ret;
+
+        if (!device_may_wakeup(ar->dev))
+                return -EPERM;
+
+        ret = enable_irq_wake(ar_snoc->ce_irqs[ATH10K_SNOC_WAKE_IRQ].irq_line);
+        if (ret) {
+                ath10k_err(ar, "failed to enable wakeup irq :%d\n", ret);
+                return ret;
+        }
+
+        ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc device suspended\n");
+
+        return ret;
+}
+
+static int ath10k_snoc_hif_resume(struct ath10k *ar)
+{
+        struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
+        int ret;
+
+        if (!device_may_wakeup(ar->dev))
+                return -EPERM;
+
+        ret = disable_irq_wake(ar_snoc->ce_irqs[ATH10K_SNOC_WAKE_IRQ].irq_line);
+        if (ret) {
+                ath10k_err(ar, "failed to disable wakeup irq: %d\n", ret);
+                return ret;
+        }
+
+        ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc device resumed\n");
+
+        return ret;
+}
+#endif
+
 static const struct ath10k_hif_ops ath10k_snoc_hif_ops = {
         .read32         = ath10k_snoc_read32,
         .write32        = ath10k_snoc_write32,
@@ -1054,6 +1103,10 @@ static const struct ath10k_hif_ops ath10k_snoc_hif_ops = {
         .send_complete_check    = ath10k_snoc_hif_send_complete_check,
         .get_free_queue_number  = ath10k_snoc_hif_get_free_queue_number,
         .get_target_info        = ath10k_snoc_hif_get_target_info,
+#ifdef CONFIG_PM
+        .suspend                = ath10k_snoc_hif_suspend,
+        .resume                 = ath10k_snoc_hif_resume,
+#endif
 };
 
 static const struct ath10k_bus_ops ath10k_snoc_bus_ops = {
diff --git a/drivers/net/wireless/ath/ath10k/snoc.h b/drivers/net/wireless/ath/ath10k/snoc.h
index 2b2f23cf7c5d..d62f53501fbb 100644
--- a/drivers/net/wireless/ath/ath10k/snoc.h
+++ b/drivers/net/wireless/ath/ath10k/snoc.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * 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 _SNOC_H_
@@ -90,7 +79,7 @@ struct ath10k_snoc {
         struct ath10k_vreg_info *vreg;
         struct ath10k_clk_info *clk;
         struct ath10k_qmi *qmi;
-        unsigned long int flags;
+        unsigned long flags;
 };
 
 static inline struct ath10k_snoc *ath10k_snoc_priv(struct ath10k *ar)
diff --git a/drivers/net/wireless/ath/ath10k/spectral.c b/drivers/net/wireless/ath/ath10k/spectral.c
index 653b6d013207..5db6bff5193b 100644
--- a/drivers/net/wireless/ath/ath10k/spectral.c
+++ b/drivers/net/wireless/ath/ath10k/spectral.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2013-2017 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 <linux/relay.h>
@@ -494,6 +483,9 @@ static struct dentry *create_buf_file_handler(const char *filename,
 
         buf_file = debugfs_create_file(filename, mode, parent, buf,
                                        &relay_file_operations);
+        if (IS_ERR(buf_file))
+                return NULL;
+
         *is_global = 1;
         return buf_file;
 }
diff --git a/drivers/net/wireless/ath/ath10k/spectral.h b/drivers/net/wireless/ath/ath10k/spectral.h
index 13276f4dc12c..5f481f11c6e5 100644
--- a/drivers/net/wireless/ath/ath10k/spectral.h
+++ b/drivers/net/wireless/ath/ath10k/spectral.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2013-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 SPECTRAL_H
diff --git a/drivers/net/wireless/ath/ath10k/swap.c b/drivers/net/wireless/ath/ath10k/swap.c
index e7f57efadae1..4dddeee684b4 100644
--- a/drivers/net/wireless/ath/ath10k/swap.c
+++ b/drivers/net/wireless/ath/ath10k/swap.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2015-2016 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.
  */
 
 /* This file has implementation for code swap logic. With code swap feature,
diff --git a/drivers/net/wireless/ath/ath10k/swap.h b/drivers/net/wireless/ath/ath10k/swap.h
index fa602f15fa93..25e0ad36ddb1 100644
--- a/drivers/net/wireless/ath/ath10k/swap.h
+++ b/drivers/net/wireless/ath/ath10k/swap.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2015-2016 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 _SWAP_H_
diff --git a/drivers/net/wireless/ath/ath10k/targaddrs.h b/drivers/net/wireless/ath/ath10k/targaddrs.h
index b11a1c3d87b4..dff6c8ac9dba 100644
--- a/drivers/net/wireless/ath/ath10k/targaddrs.h
+++ b/drivers/net/wireless/ath/ath10k/targaddrs.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2016 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 __TARGADDRS_H__
diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c
index c24ee616833c..6433ff10d80e 100644
--- a/drivers/net/wireless/ath/ath10k/testmode.c
+++ b/drivers/net/wireless/ath/ath10k/testmode.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2014-2017 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 "testmode.h"
@@ -270,7 +259,7 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
         ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode wmi version %d\n",
                    ar->testmode.utf_mode_fw.fw_file.wmi_op_version);
 
-        ret = ath10k_hif_power_up(ar);
+        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_UTF);
         if (ret) {
                 ath10k_err(ar, "failed to power up hif (testmode): %d\n", ret);
                 ar->state = ATH10K_STATE_OFF;
diff --git a/drivers/net/wireless/ath/ath10k/testmode.h b/drivers/net/wireless/ath/ath10k/testmode.h
index 9cdd150815db..6488fd514ae3 100644
--- a/drivers/net/wireless/ath/ath10k/testmode.h
+++ b/drivers/net/wireless/ath/ath10k/testmode.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2014 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 "core.h"
diff --git a/drivers/net/wireless/ath/ath10k/testmode_i.h b/drivers/net/wireless/ath/ath10k/testmode_i.h
index 6514d1a14242..ee1cb27c1d60 100644
--- a/drivers/net/wireless/ath/ath10k/testmode_i.h
+++ b/drivers/net/wireless/ath/ath10k/testmode_i.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2014,2017 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.
  */
 
 /* "API" level of the ath10k testmode interface. Bump it after every
diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c
index fe35edcd3ec8..36c9a1364253 100644
--- a/drivers/net/wireless/ath/ath10k/thermal.c
+++ b/drivers/net/wireless/ath/ath10k/thermal.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * 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
- * 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 <linux/device.h>
diff --git a/drivers/net/wireless/ath/ath10k/thermal.h b/drivers/net/wireless/ath/ath10k/thermal.h
index 65e2419543f9..5fdb020f4da3 100644
--- a/drivers/net/wireless/ath/ath10k/thermal.h
+++ b/drivers/net/wireless/ath/ath10k/thermal.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2014-2016 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 _THERMAL_
 #define _THERMAL_
diff --git a/drivers/net/wireless/ath/ath10k/trace.c b/drivers/net/wireless/ath/ath10k/trace.c
index 4a31e2c6fbd4..3ecdff17f64e 100644
--- a/drivers/net/wireless/ath/ath10k/trace.c
+++ b/drivers/net/wireless/ath/ath10k/trace.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2012 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 <linux/module.h>
diff --git a/drivers/net/wireless/ath/ath10k/trace.h b/drivers/net/wireless/ath/ath10k/trace.h
index 7d2fac342150..ba977bbe6291 100644
--- a/drivers/net/wireless/ath/ath10k/trace.h
+++ b/drivers/net/wireless/ath/ath10k/trace.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2016 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.
  */
 
 #if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index 23606b6972d0..c5818d28f55a 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2016 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 "core.h"
@@ -95,7 +84,11 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
                 wake_up(&htt->empty_tx_wq);
         spin_unlock_bh(&htt->tx_lock);
 
-        if (ar->dev_type != ATH10K_DEV_TYPE_HL)
+        if (txq && txq->sta && skb_cb->airtime_est)
+                ieee80211_sta_register_airtime(txq->sta, txq->tid,
+                                               skb_cb->airtime_est, 0);
+
+        if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
                 dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
 
         ath10k_report_offchan_tx(htt->ar, msdu);
diff --git a/drivers/net/wireless/ath/ath10k/txrx.h b/drivers/net/wireless/ath/ath10k/txrx.h
index 2bf401e436d3..ecac441d83a7 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.h
+++ b/drivers/net/wireless/ath/ath10k/txrx.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2014,2016 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 _TXRX_H_
 #define _TXRX_H_
diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c
index f731d35ee76d..970cf69ac35f 100644
--- a/drivers/net/wireless/ath/ath10k/usb.c
+++ b/drivers/net/wireless/ath/ath10k/usb.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2007-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2012,2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2016-2017 Erik Stromdahl <erik.stromdahl@gmail.com>
- *
- * 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 <linux/module.h>
@@ -706,7 +695,8 @@ static void ath10k_usb_hif_send_complete_check(struct ath10k *ar,
 {
 }
 
-static int ath10k_usb_hif_power_up(struct ath10k *ar)
+static int ath10k_usb_hif_power_up(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         return 0;
 }
diff --git a/drivers/net/wireless/ath/ath10k/usb.h b/drivers/net/wireless/ath/ath10k/usb.h
index f60a3cc7d712..34d683e8fc18 100644
--- a/drivers/net/wireless/ath/ath10k/usb.h
+++ b/drivers/net/wireless/ath/ath10k/usb.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2004-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2012 Qualcomm Atheros, Inc.
  * Copyright (c) 2016-2017 Erik Stromdahl <erik.stromdahl@gmail.com>
- *
- * 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 _USB_H_
diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h
index 04663076d27a..1491c25518bb 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-ops.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 _WMI_OPS_H_
@@ -33,6 +22,9 @@ struct wmi_ops {
                             struct wmi_mgmt_rx_ev_arg *arg);
         int (*pull_mgmt_tx_compl)(struct ath10k *ar, struct sk_buff *skb,
                                   struct wmi_tlv_mgmt_tx_compl_ev_arg *arg);
+        int (*pull_mgmt_tx_bundle_compl)(
+                                struct ath10k *ar, struct sk_buff *skb,
+                                struct wmi_tlv_mgmt_tx_bundle_compl_ev_arg *arg);
         int (*pull_ch_info)(struct ath10k *ar, struct sk_buff *skb,
                             struct wmi_ch_info_ev_arg *arg);
         int (*pull_vdev_start)(struct ath10k *ar, struct sk_buff *skb,
@@ -66,6 +58,8 @@ struct wmi_ops {
 
         struct sk_buff *(*gen_pdev_suspend)(struct ath10k *ar, u32 suspend_opt);
         struct sk_buff *(*gen_pdev_resume)(struct ath10k *ar);
+        struct sk_buff *(*gen_pdev_set_base_macaddr)(struct ath10k *ar,
+                                                     const u8 macaddr[ETH_ALEN]);
         struct sk_buff *(*gen_pdev_set_rd)(struct ath10k *ar, u16 rd, u16 rd2g,
                                            u16 rd5g, u16 ctl2g, u16 ctl5g,
                                            enum wmi_dfs_region dfs_reg);
@@ -280,6 +274,16 @@ ath10k_wmi_pull_mgmt_tx_compl(struct ath10k *ar, struct sk_buff *skb,
 }
 
 static inline int
+ath10k_wmi_pull_mgmt_tx_bundle_compl(struct ath10k *ar, struct sk_buff *skb,
+                                     struct wmi_tlv_mgmt_tx_bundle_compl_ev_arg *arg)
+{
+        if (!ar->wmi.ops->pull_mgmt_tx_bundle_compl)
+                return -EOPNOTSUPP;
+
+        return ar->wmi.ops->pull_mgmt_tx_bundle_compl(ar, skb, arg);
+}
+
+static inline int
 ath10k_wmi_pull_mgmt_rx(struct ath10k *ar, struct sk_buff *skb,
                         struct wmi_mgmt_rx_ev_arg *arg)
 {
@@ -507,6 +511,22 @@ ath10k_wmi_pdev_set_regdomain(struct ath10k *ar, u16 rd, u16 rd2g, u16 rd5g,
 }
 
 static inline int
+ath10k_wmi_pdev_set_base_macaddr(struct ath10k *ar, const u8 macaddr[ETH_ALEN])
+{
+        struct sk_buff *skb;
+
+        if (!ar->wmi.ops->gen_pdev_set_base_macaddr)
+                return -EOPNOTSUPP;
+
+        skb = ar->wmi.ops->gen_pdev_set_base_macaddr(ar, macaddr);
+        if (IS_ERR(skb))
+                return PTR_ERR(skb);
+
+        return ath10k_wmi_cmd_send(ar, skb,
+                                   ar->wmi.cmd->pdev_set_base_macaddr_cmdid);
+}
+
+static inline int
 ath10k_wmi_pdev_suspend_target(struct ath10k *ar, u32 suspend_opt)
 {
         struct sk_buff *skb;
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 892bd8c30dd9..fc62174a115c 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 "core.h"
 #include "debug.h"
@@ -620,6 +609,9 @@ static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb)
         case WMI_TLV_MGMT_TX_COMPLETION_EVENTID:
                 ath10k_wmi_event_mgmt_tx_compl(ar, skb);
                 break;
+        case WMI_TLV_MGMT_TX_BUNDLE_COMPLETION_EVENTID:
+                ath10k_wmi_event_mgmt_tx_bundle_compl(ar, skb);
+                break;
         default:
                 ath10k_dbg(ar, ATH10K_DBG_WMI, "Unknown eventid: %d\n", id);
                 break;
@@ -686,6 +678,65 @@ ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev(struct ath10k *ar, struct sk_buff *skb,
         return 0;
 }
 
+struct wmi_tlv_tx_bundle_compl_parse {
+        const __le32 *num_reports;
+        const __le32 *desc_ids;
+        const __le32 *status;
+        bool desc_ids_done;
+        bool status_done;
+};
+
+static int
+ath10k_wmi_tlv_mgmt_tx_bundle_compl_parse(struct ath10k *ar, u16 tag, u16 len,
+                                          const void *ptr, void *data)
+{
+        struct wmi_tlv_tx_bundle_compl_parse *bundle_tx_compl = data;
+
+        switch (tag) {
+        case WMI_TLV_TAG_STRUCT_MGMT_TX_COMPL_BUNDLE_EVENT:
+                bundle_tx_compl->num_reports = ptr;
+                break;
+        case WMI_TLV_TAG_ARRAY_UINT32:
+                if (!bundle_tx_compl->desc_ids_done) {
+                        bundle_tx_compl->desc_ids_done = true;
+                        bundle_tx_compl->desc_ids = ptr;
+                } else if (!bundle_tx_compl->status_done) {
+                        bundle_tx_compl->status_done = true;
+                        bundle_tx_compl->status = ptr;
+                }
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_mgmt_tx_bundle_compl_ev(
+                                struct ath10k *ar, struct sk_buff *skb,
+                                struct wmi_tlv_mgmt_tx_bundle_compl_ev_arg *arg)
+{
+        struct wmi_tlv_tx_bundle_compl_parse bundle_tx_compl = { };
+        int ret;
+
+        ret = ath10k_wmi_tlv_iter(ar, skb->data, skb->len,
+                                  ath10k_wmi_tlv_mgmt_tx_bundle_compl_parse,
+                                  &bundle_tx_compl);
+        if (ret) {
+                ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+                return ret;
+        }
+
+        if (!bundle_tx_compl.num_reports || !bundle_tx_compl.desc_ids ||
+            !bundle_tx_compl.status)
+                return -EPROTO;
+
+        arg->num_reports = *bundle_tx_compl.num_reports;
+        arg->desc_ids = bundle_tx_compl.desc_ids;
+        arg->status = bundle_tx_compl.status;
+
+        return 0;
+}
+
 static int ath10k_wmi_tlv_op_pull_mgmt_rx_ev(struct ath10k *ar,
                                              struct sk_buff *skb,
                                              struct wmi_mgmt_rx_ev_arg *arg)
@@ -1611,7 +1662,7 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
         cfg->rx_skip_defrag_timeout_dup_detection_check = __cpu_to_le32(0);
         cfg->vow_config = __cpu_to_le32(0);
         cfg->gtk_offload_max_vdev = __cpu_to_le32(2);
-        cfg->num_msdu_desc = __cpu_to_le32(TARGET_TLV_NUM_MSDU_DESC);
+        cfg->num_msdu_desc = __cpu_to_le32(ar->htt.max_num_pending_tx);
         cfg->max_frag_entries = __cpu_to_le32(2);
         cfg->num_tdls_vdevs = __cpu_to_le32(TARGET_TLV_NUM_TDLS_VDEVS);
         cfg->num_tdls_conn_table_entries = __cpu_to_le32(0x20);
@@ -1626,7 +1677,7 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
         cfg->num_ocb_vdevs = __cpu_to_le32(0);
         cfg->num_ocb_channels = __cpu_to_le32(0);
         cfg->num_ocb_schedules = __cpu_to_le32(0);
-        cfg->host_capab = __cpu_to_le32(0);
+        cfg->host_capab = __cpu_to_le32(WMI_TLV_FLAG_MGMT_BUNDLE_TX_COMPL);
 
         ath10k_wmi_put_host_mem_chunks(ar, chunks);
 
@@ -1998,9 +2049,11 @@ ath10k_wmi_tlv_op_gen_vdev_install_key(struct ath10k *ar,
         size_t len;
         void *ptr;
 
-        if (arg->key_cipher == WMI_CIPHER_NONE && arg->key_data != NULL)
+        if (arg->key_cipher == ar->wmi_key_cipher[WMI_CIPHER_NONE] &&
+            arg->key_data)
                 return ERR_PTR(-EINVAL);
-        if (arg->key_cipher != WMI_CIPHER_NONE && arg->key_data == NULL)
+        if (arg->key_cipher != ar->wmi_key_cipher[WMI_CIPHER_NONE] &&
+            !arg->key_data)
                 return ERR_PTR(-EINVAL);
 
         len = sizeof(*tlv) + sizeof(*cmd) +
@@ -3259,6 +3312,8 @@ ath10k_wmi_tlv_op_gen_wow_enable(struct ath10k *ar)
         cmd = (void *)tlv->value;
 
         cmd->enable = __cpu_to_le32(1);
+        if (!ar->bus_param.link_can_suspend)
+                cmd->pause_iface_config = __cpu_to_le32(WOW_IFACE_PAUSE_DISABLED);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv wow enable\n");
         return skb;
@@ -4093,6 +4148,7 @@ static const struct wmi_ops wmi_tlv_ops = {
         .pull_scan = ath10k_wmi_tlv_op_pull_scan_ev,
         .pull_mgmt_rx = ath10k_wmi_tlv_op_pull_mgmt_rx_ev,
         .pull_mgmt_tx_compl = ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev,
+        .pull_mgmt_tx_bundle_compl = ath10k_wmi_tlv_op_pull_mgmt_tx_bundle_compl_ev,
         .pull_ch_info = ath10k_wmi_tlv_op_pull_ch_info_ev,
         .pull_vdev_start = ath10k_wmi_tlv_op_pull_vdev_start_ev,
         .pull_peer_kick = ath10k_wmi_tlv_op_pull_peer_kick_ev,
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
index e07e9907e355..af4cb0e14952 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 _WMI_TLV_H
 #define _WMI_TLV_H
@@ -321,6 +310,7 @@ enum wmi_tlv_event_id {
         WMI_TLV_OFFLOAD_BCN_TX_STATUS_EVENTID,
         WMI_TLV_OFFLOAD_PROB_RESP_TX_STATUS_EVENTID,
         WMI_TLV_MGMT_TX_COMPLETION_EVENTID,
+        WMI_TLV_MGMT_TX_BUNDLE_COMPLETION_EVENTID,
         WMI_TLV_TX_DELBA_COMPLETE_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_BA_NEG),
         WMI_TLV_TX_ADDBA_COMPLETE_EVENTID,
         WMI_TLV_BA_RSP_SSN_EVENTID,
@@ -1592,6 +1582,8 @@ struct chan_info_params {
         u32 mac_clk_mhz;
 };
 
+#define WMI_TLV_FLAG_MGMT_BUNDLE_TX_COMPL       BIT(9)
+
 struct wmi_tlv_mgmt_tx_compl_ev {
         __le32 desc_id;
         __le32 status;
@@ -1998,8 +1990,15 @@ struct wmi_tlv_set_quiet_cmd {
         __le32 enabled;
 } __packed;
 
+enum wmi_tlv_wow_interface_cfg {
+        WOW_IFACE_PAUSE_ENABLED,
+        WOW_IFACE_PAUSE_DISABLED
+};
+
 struct wmi_tlv_wow_enable_cmd {
         __le32 enable;
+        __le32 pause_iface_config;
+        __le32 flags;
 } __packed;
 
 struct wmi_tlv_wow_host_wakeup_ind {
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 8e236d158ca6..97e5b2eb8a91 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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.
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/skbuff.h>
@@ -827,6 +816,7 @@ static struct wmi_vdev_param_map wmi_vdev_param_map = {
         .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED,
         .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED,
         .disable_4addr_src_lrn = WMI_VDEV_PARAM_UNSUPPORTED,
+        .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED,
 };
 
 /* 10.X WMI VDEV param map */
@@ -903,6 +893,7 @@ static struct wmi_vdev_param_map wmi_10x_vdev_param_map = {
         .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED,
         .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED,
         .disable_4addr_src_lrn = WMI_VDEV_PARAM_UNSUPPORTED,
+        .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED,
 };
 
 static struct wmi_vdev_param_map wmi_10_2_4_vdev_param_map = {
@@ -978,6 +969,7 @@ static struct wmi_vdev_param_map wmi_10_2_4_vdev_param_map = {
         .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED,
         .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED,
         .disable_4addr_src_lrn = WMI_VDEV_PARAM_UNSUPPORTED,
+        .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED,
 };
 
 static struct wmi_vdev_param_map wmi_10_4_vdev_param_map = {
@@ -1056,6 +1048,7 @@ static struct wmi_vdev_param_map wmi_10_4_vdev_param_map = {
         .inc_tsf = WMI_10_4_VDEV_PARAM_TSF_INCREMENT,
         .dec_tsf = WMI_10_4_VDEV_PARAM_TSF_DECREMENT,
         .disable_4addr_src_lrn = WMI_10_4_VDEV_PARAM_DISABLE_4_ADDR_SRC_LRN,
+        .rtt_responder_role = WMI_10_4_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE,
 };
 
 static struct wmi_pdev_param_map wmi_pdev_param_map = {
@@ -1606,6 +1599,30 @@ static struct wmi_pdev_param_map wmi_10_4_pdev_param_map = {
         .enable_btcoex = WMI_10_4_PDEV_PARAM_ENABLE_BTCOEX,
 };
 
+static const u8 wmi_key_cipher_suites[] = {
+        [WMI_CIPHER_NONE] = WMI_CIPHER_NONE,
+        [WMI_CIPHER_WEP] = WMI_CIPHER_WEP,
+        [WMI_CIPHER_TKIP] = WMI_CIPHER_TKIP,
+        [WMI_CIPHER_AES_OCB] = WMI_CIPHER_AES_OCB,
+        [WMI_CIPHER_AES_CCM] = WMI_CIPHER_AES_CCM,
+        [WMI_CIPHER_WAPI] = WMI_CIPHER_WAPI,
+        [WMI_CIPHER_CKIP] = WMI_CIPHER_CKIP,
+        [WMI_CIPHER_AES_CMAC] = WMI_CIPHER_AES_CMAC,
+        [WMI_CIPHER_AES_GCM] = WMI_CIPHER_AES_GCM,
+};
+
+static const u8 wmi_tlv_key_cipher_suites[] = {
+        [WMI_CIPHER_NONE] = WMI_TLV_CIPHER_NONE,
+        [WMI_CIPHER_WEP] = WMI_TLV_CIPHER_WEP,
+        [WMI_CIPHER_TKIP] = WMI_TLV_CIPHER_TKIP,
+        [WMI_CIPHER_AES_OCB] = WMI_TLV_CIPHER_AES_OCB,
+        [WMI_CIPHER_AES_CCM] = WMI_TLV_CIPHER_AES_CCM,
+        [WMI_CIPHER_WAPI] = WMI_TLV_CIPHER_WAPI,
+        [WMI_CIPHER_CKIP] = WMI_TLV_CIPHER_CKIP,
+        [WMI_CIPHER_AES_CMAC] = WMI_TLV_CIPHER_AES_CMAC,
+        [WMI_CIPHER_AES_GCM] = WMI_TLV_CIPHER_AES_GCM,
+};
+
 static const struct wmi_peer_flags_map wmi_peer_flags_map = {
         .auth = WMI_PEER_AUTH,
         .qos = WMI_PEER_QOS,
@@ -2346,7 +2363,7 @@ static int wmi_process_mgmt_tx_comp(struct ath10k *ar, u32 desc_id,
 
         msdu = pkt_addr->vaddr;
         dma_unmap_single(ar->dev, pkt_addr->paddr,
-                         msdu->len, DMA_FROM_DEVICE);
+                         msdu->len, DMA_TO_DEVICE);
         info = IEEE80211_SKB_CB(msdu);
 
         if (status)
@@ -2383,6 +2400,29 @@ int ath10k_wmi_event_mgmt_tx_compl(struct ath10k *ar, struct sk_buff *skb)
         return 0;
 }
 
+int ath10k_wmi_event_mgmt_tx_bundle_compl(struct ath10k *ar, struct sk_buff *skb)
+{
+        struct wmi_tlv_mgmt_tx_bundle_compl_ev_arg arg;
+        u32 num_reports;
+        int i, ret;
+
+        ret = ath10k_wmi_pull_mgmt_tx_bundle_compl(ar, skb, &arg);
+        if (ret) {
+                ath10k_warn(ar, "failed to parse bundle mgmt compl event: %d\n", ret);
+                return ret;
+        }
+
+        num_reports = __le32_to_cpu(arg.num_reports);
+
+        for (i = 0; i < num_reports; i++)
+                wmi_process_mgmt_tx_comp(ar, __le32_to_cpu(arg.desc_ids[i]),
+                                         __le32_to_cpu(arg.status[i]));
+
+        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv event bundle mgmt tx completion\n");
+
+        return 0;
+}
+
 int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
 {
         struct wmi_mgmt_rx_ev_arg arg = {};
@@ -6240,6 +6280,25 @@ int ath10k_wmi_connect(struct ath10k *ar)
 }
 
 static struct sk_buff *
+ath10k_wmi_op_gen_pdev_set_base_macaddr(struct ath10k *ar,
+                                        const u8 macaddr[ETH_ALEN])
+{
+        struct wmi_pdev_set_base_macaddr_cmd *cmd;
+        struct sk_buff *skb;
+
+        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
+        if (!skb)
+                return ERR_PTR(-ENOMEM);
+
+        cmd = (struct wmi_pdev_set_base_macaddr_cmd *)skb->data;
+        ether_addr_copy(cmd->mac_addr.addr, macaddr);
+
+        ath10k_dbg(ar, ATH10K_DBG_WMI,
+                   "wmi pdev basemac %pM\n", macaddr);
+        return skb;
+}
+
+static struct sk_buff *
 ath10k_wmi_op_gen_pdev_set_rd(struct ath10k *ar, u16 rd, u16 rd2g, u16 rd5g,
                               u16 ctl2g, u16 ctl5g,
                               enum wmi_dfs_region dfs_reg)
@@ -9048,6 +9107,7 @@ static const struct wmi_ops wmi_10_2_ops = {
         .gen_peer_create = ath10k_wmi_op_gen_peer_create,
         .gen_peer_delete = ath10k_wmi_op_gen_peer_delete,
         .gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
+        .gen_pdev_set_base_macaddr = ath10k_wmi_op_gen_pdev_set_base_macaddr,
         .gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param,
         .gen_set_psmode = ath10k_wmi_op_gen_set_psmode,
         .gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
@@ -9166,6 +9226,7 @@ static const struct wmi_ops wmi_10_4_ops = {
 
         .gen_pdev_suspend = ath10k_wmi_op_gen_pdev_suspend,
         .gen_pdev_resume = ath10k_wmi_op_gen_pdev_resume,
+        .gen_pdev_set_base_macaddr = ath10k_wmi_op_gen_pdev_set_base_macaddr,
         .gen_pdev_set_rd = ath10k_wmi_10x_op_gen_pdev_set_rd,
         .gen_pdev_set_param = ath10k_wmi_op_gen_pdev_set_param,
         .gen_init = ath10k_wmi_10_4_op_gen_init,
@@ -9229,6 +9290,7 @@ int ath10k_wmi_attach(struct ath10k *ar)
                 ar->wmi.vdev_param = &wmi_10_4_vdev_param_map;
                 ar->wmi.pdev_param = &wmi_10_4_pdev_param_map;
                 ar->wmi.peer_flags = &wmi_10_2_peer_flags_map;
+                ar->wmi_key_cipher = wmi_key_cipher_suites;
                 break;
         case ATH10K_FW_WMI_OP_VERSION_10_2_4:
                 ar->wmi.cmd = &wmi_10_2_4_cmd_map;
@@ -9236,6 +9298,7 @@ int ath10k_wmi_attach(struct ath10k *ar)
                 ar->wmi.vdev_param = &wmi_10_2_4_vdev_param_map;
                 ar->wmi.pdev_param = &wmi_10_2_4_pdev_param_map;
                 ar->wmi.peer_flags = &wmi_10_2_peer_flags_map;
+                ar->wmi_key_cipher = wmi_key_cipher_suites;
                 break;
         case ATH10K_FW_WMI_OP_VERSION_10_2:
                 ar->wmi.cmd = &wmi_10_2_cmd_map;
@@ -9243,6 +9306,7 @@ int ath10k_wmi_attach(struct ath10k *ar)
                 ar->wmi.vdev_param = &wmi_10x_vdev_param_map;
                 ar->wmi.pdev_param = &wmi_10x_pdev_param_map;
                 ar->wmi.peer_flags = &wmi_10_2_peer_flags_map;
+                ar->wmi_key_cipher = wmi_key_cipher_suites;
                 break;
         case ATH10K_FW_WMI_OP_VERSION_10_1:
                 ar->wmi.cmd = &wmi_10x_cmd_map;
@@ -9250,6 +9314,7 @@ int ath10k_wmi_attach(struct ath10k *ar)
                 ar->wmi.vdev_param = &wmi_10x_vdev_param_map;
                 ar->wmi.pdev_param = &wmi_10x_pdev_param_map;
                 ar->wmi.peer_flags = &wmi_10x_peer_flags_map;
+                ar->wmi_key_cipher = wmi_key_cipher_suites;
                 break;
         case ATH10K_FW_WMI_OP_VERSION_MAIN:
                 ar->wmi.cmd = &wmi_cmd_map;
@@ -9257,9 +9322,11 @@ int ath10k_wmi_attach(struct ath10k *ar)
                 ar->wmi.vdev_param = &wmi_vdev_param_map;
                 ar->wmi.pdev_param = &wmi_pdev_param_map;
                 ar->wmi.peer_flags = &wmi_peer_flags_map;
+                ar->wmi_key_cipher = wmi_key_cipher_suites;
                 break;
         case ATH10K_FW_WMI_OP_VERSION_TLV:
                 ath10k_wmi_tlv_attach(ar);
+                ar->wmi_key_cipher = wmi_tlv_key_cipher_suites;
                 break;
         case ATH10K_FW_WMI_OP_VERSION_UNSET:
         case ATH10K_FW_WMI_OP_VERSION_MAX:
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 021eb30d1fb7..d9b646f3dcc2 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -1,26 +1,15 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 _WMI_H_
 #define _WMI_H_
 
 #include <linux/types.h>
-#include <net/mac80211.h>
+#include <linux/ieee80211.h>
 
 /*
  * This file specifies the WMI interface for the Unified Software
@@ -208,6 +197,11 @@ enum wmi_service {
         WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT,
         WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT,
         WMI_SERVICE_THERM_THROT,
+        WMI_SERVICE_RTT_RESPONDER_ROLE,
+        WMI_SERVICE_PER_PACKET_SW_ENCRYPT,
+        WMI_SERVICE_REPORT_AIRTIME,
+
+        /* Remember to add the new value to wmi_service_name()! */
 
         /* keep last */
         WMI_SERVICE_MAX,
@@ -368,9 +362,14 @@ enum wmi_10_4_service {
         WMI_10_4_SERVICE_HTT_ASSERT_TRIGGER_SUPPORT,
         WMI_10_4_SERVICE_VDEV_FILTER_NEIGHBOR_RX_PACKETS,
         WMI_10_4_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT,
+        WMI_10_4_SERVICE_PEER_CHWIDTH_CHANGE,
+        WMI_10_4_SERVICE_RX_FILTER_OUT_COUNT,
+        WMI_10_4_SERVICE_RTT_RESPONDER_ROLE,
+        WMI_10_4_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT,
+        WMI_10_4_SERVICE_REPORT_AIRTIME,
 };
 
-static inline char *wmi_service_name(int service_id)
+static inline char *wmi_service_name(enum wmi_service service_id)
 {
 #define SVCSTR(x) case x: return #x
 
@@ -467,6 +466,7 @@ static inline char *wmi_service_name(int service_id)
         SVCSTR(WMI_SERVICE_TX_MODE_PUSH_PULL);
         SVCSTR(WMI_SERVICE_TX_MODE_DYNAMIC);
         SVCSTR(WMI_SERVICE_VDEV_RX_FILTER);
+        SVCSTR(WMI_SERVICE_BTCOEX);
         SVCSTR(WMI_SERVICE_CHECK_CAL_VERSION);
         SVCSTR(WMI_SERVICE_DBGLOG_WARN2);
         SVCSTR(WMI_SERVICE_BTCOEX_DUTY_CYCLE);
@@ -476,18 +476,29 @@ static inline char *wmi_service_name(int service_id)
         SVCSTR(WMI_SERVICE_SMART_LOGGING_SUPPORT);
         SVCSTR(WMI_SERVICE_TDLS_CONN_TRACKER_IN_HOST_MODE);
         SVCSTR(WMI_SERVICE_TDLS_EXPLICIT_MODE_ONLY);
+        SVCSTR(WMI_SERVICE_MGMT_TX_WMI);
         SVCSTR(WMI_SERVICE_TDLS_WIDER_BANDWIDTH);
         SVCSTR(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS);
         SVCSTR(WMI_SERVICE_HOST_DFS_CHECK_SUPPORT);
         SVCSTR(WMI_SERVICE_TPC_STATS_FINAL);
         SVCSTR(WMI_SERVICE_RESET_CHIP);
+        SVCSTR(WMI_SERVICE_SPOOF_MAC_SUPPORT);
         SVCSTR(WMI_SERVICE_TX_DATA_ACK_RSSI);
         SVCSTR(WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT);
-        default:
+        SVCSTR(WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT);
+        SVCSTR(WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT);
+        SVCSTR(WMI_SERVICE_THERM_THROT);
+        SVCSTR(WMI_SERVICE_RTT_RESPONDER_ROLE);
+        SVCSTR(WMI_SERVICE_PER_PACKET_SW_ENCRYPT);
+        SVCSTR(WMI_SERVICE_REPORT_AIRTIME);
+
+        case WMI_SERVICE_MAX:
                 return NULL;
         }
 
 #undef SVCSTR
+
+        return NULL;
 }
 
 #define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \
@@ -579,6 +590,8 @@ static inline void wmi_10x_svc_map(const __le32 *in, unsigned long *out,
                WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, len);
         SVCMAP(WMI_10X_SERVICE_BB_TIMING_CONFIG_SUPPORT,
                WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT, len);
+        SVCMAP(WMI_10X_SERVICE_PER_PACKET_SW_ENCRYPT,
+               WMI_SERVICE_PER_PACKET_SW_ENCRYPT, len);
 }
 
 static inline void wmi_main_svc_map(const __le32 *in, unsigned long *out,
@@ -799,6 +812,12 @@ static inline void wmi_10_4_svc_map(const __le32 *in, unsigned long *out,
                WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT, len);
         SVCMAP(WMI_10_4_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT,
                WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT, len);
+        SVCMAP(WMI_10_4_SERVICE_RTT_RESPONDER_ROLE,
+               WMI_SERVICE_RTT_RESPONDER_ROLE, len);
+        SVCMAP(WMI_10_4_SERVICE_PER_PACKET_SW_ENCRYPT,
+               WMI_SERVICE_PER_PACKET_SW_ENCRYPT, len);
+        SVCMAP(WMI_10_4_SERVICE_REPORT_AIRTIME,
+               WMI_SERVICE_REPORT_AIRTIME, len);
 }
 
 #undef SVCMAP
@@ -2075,6 +2094,8 @@ enum wmi_channel_change_cause {
 #define WMI_HT_CAP_MPDU_DENSITY           0x0700   /* MPDU Density */
 #define WMI_HT_CAP_MPDU_DENSITY_MASK_SHIFT 8
 #define WMI_HT_CAP_HT40_SGI               0x0800
+#define WMI_HT_CAP_RX_LDPC                0x1000   /* LDPC RX support */
+#define WMI_HT_CAP_TX_LDPC                0x2000   /* LDPC TX support */
 
 #define WMI_HT_CAP_DEFAULT_ALL (WMI_HT_CAP_ENABLED       | \
                                 WMI_HT_CAP_HT20_SGI      | \
@@ -2972,6 +2993,8 @@ enum wmi_10_4_feature_mask {
         WMI_10_4_TDLS_CONN_TRACKER_IN_HOST_MODE = BIT(11),
         WMI_10_4_TDLS_EXPLICIT_MODE_ONLY        = BIT(12),
         WMI_10_4_TX_DATA_ACK_RSSI               = BIT(16),
+        WMI_10_4_EXT_PEER_TID_CONFIGS_SUPPORT   = BIT(17),
+        WMI_10_4_REPORT_AIRTIME                 = BIT(18),
 
 };
 
@@ -4083,6 +4106,10 @@ struct wmi_pdev_set_param_cmd {
         __le32 param_value;
 } __packed;
 
+struct wmi_pdev_set_base_macaddr_cmd {
+        struct wmi_mac_addr mac_addr;
+} __packed;
+
 /* valid period is 1 ~ 60000ms, unit in millisecond */
 #define WMI_PDEV_PARAM_CAL_PERIOD_MAX 60000
 
@@ -4929,15 +4956,30 @@ struct wmi_key_seq_counter {
         __le32 key_seq_counter_h;
 } __packed;
 
-#define WMI_CIPHER_NONE     0x0 /* clear key */
-#define WMI_CIPHER_WEP      0x1
-#define WMI_CIPHER_TKIP     0x2
-#define WMI_CIPHER_AES_OCB  0x3
-#define WMI_CIPHER_AES_CCM  0x4
-#define WMI_CIPHER_WAPI     0x5
-#define WMI_CIPHER_CKIP     0x6
-#define WMI_CIPHER_AES_CMAC 0x7
-#define WMI_CIPHER_AES_GCM  0x8
+enum wmi_cipher_suites {
+        WMI_CIPHER_NONE,
+        WMI_CIPHER_WEP,
+        WMI_CIPHER_TKIP,
+        WMI_CIPHER_AES_OCB,
+        WMI_CIPHER_AES_CCM,
+        WMI_CIPHER_WAPI,
+        WMI_CIPHER_CKIP,
+        WMI_CIPHER_AES_CMAC,
+        WMI_CIPHER_AES_GCM,
+};
+
+enum wmi_tlv_cipher_suites {
+        WMI_TLV_CIPHER_NONE,
+        WMI_TLV_CIPHER_WEP,
+        WMI_TLV_CIPHER_TKIP,
+        WMI_TLV_CIPHER_AES_OCB,
+        WMI_TLV_CIPHER_AES_CCM,
+        WMI_TLV_CIPHER_WAPI,
+        WMI_TLV_CIPHER_CKIP,
+        WMI_TLV_CIPHER_AES_CMAC,
+        WMI_TLV_CIPHER_ANY,
+        WMI_TLV_CIPHER_AES_GCM,
+};
 
 struct wmi_vdev_install_key_cmd {
         __le32 vdev_id;
@@ -5083,6 +5125,7 @@ struct wmi_vdev_param_map {
         u32 inc_tsf;
         u32 dec_tsf;
         u32 disable_4addr_src_lrn;
+        u32 rtt_responder_role;
 };
 
 #define WMI_VDEV_PARAM_UNSUPPORTED 0
@@ -6688,6 +6731,12 @@ struct wmi_tlv_mgmt_tx_compl_ev_arg {
         __le32 pdev_id;
 };
 
+struct wmi_tlv_mgmt_tx_bundle_compl_ev_arg {
+        __le32 num_reports;
+        const __le32 *desc_ids;
+        const __le32 *status;
+};
+
 struct wmi_mgmt_rx_ev_arg {
         __le32 channel;
         __le32 snr;
@@ -7244,6 +7293,7 @@ int ath10k_wmi_start_scan_verify(const struct wmi_start_scan_arg *arg);
 int ath10k_wmi_event_scan(struct ath10k *ar, struct sk_buff *skb);
 int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb);
 int ath10k_wmi_event_mgmt_tx_compl(struct ath10k *ar, struct sk_buff *skb);
+int ath10k_wmi_event_mgmt_tx_bundle_compl(struct ath10k *ar, struct sk_buff *skb);
 void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb);
 void ath10k_wmi_event_echo(struct ath10k *ar, struct sk_buff *skb);
 int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb);
diff --git a/drivers/net/wireless/ath/ath10k/wow.c b/drivers/net/wireless/ath/ath10k/wow.c
index 36d4245c308e..8c26adddd034 100644
--- a/drivers/net/wireless/ath/ath10k/wow.c
+++ b/drivers/net/wireless/ath/ath10k/wow.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2015-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * 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 "mac.h"
@@ -77,7 +66,7 @@ static int ath10k_wow_cleanup(struct ath10k *ar)
         return 0;
 }
 
-/**
+/*
  * Convert a 802.3 format to a 802.11 format.
  *         +------------+-----------+--------+----------------+
  * 802.3:  |dest mac(6B)|src mac(6B)|type(2B)|     body...    |
@@ -88,9 +77,8 @@ static int ath10k_wow_cleanup(struct ath10k *ar)
  * 802.11: |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body...  |
  *         +--+------------+----+-----------+---------------+-----------+
  */
-static void ath10k_wow_convert_8023_to_80211
-                                        (struct cfg80211_pkt_pattern *new,
-                                        const struct cfg80211_pkt_pattern *old)
+static void ath10k_wow_convert_8023_to_80211(struct cfg80211_pkt_pattern *new,
+                                             const struct cfg80211_pkt_pattern *old)
 {
         u8 hdr_8023_pattern[ETH_HLEN] = {};
         u8 hdr_8023_bit_mask[ETH_HLEN] = {};
diff --git a/drivers/net/wireless/ath/ath10k/wow.h b/drivers/net/wireless/ath/ath10k/wow.h
index 6e810105b775..14ea4e1e925e 100644
--- a/drivers/net/wireless/ath/ath10k/wow.h
+++ b/drivers/net/wireless/ath/ath10k/wow.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: ISC */
 /*
  * Copyright (c) 2015,2017 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 _WOW_H_
 #define _WOW_H_
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 9d7ac1ab2d02..68854c45d0a4 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -776,10 +776,8 @@ int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi)
         cmd->info.params.roam_rssi_floor = DEF_LRSSI_ROAM_FLOOR;
         cmd->roam_ctrl = WMI_SET_LRSSI_SCAN_PARAMS;
 
-        ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_ROAM_CTRL_CMDID,
+        return ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_ROAM_CTRL_CMDID,
                             NO_SYNC_WMIFLAG);
-
-        return 0;
 }
 
 int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index f019a20e5a1f..2b29bf4730f6 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3457,9 +3457,9 @@ static u32 ar9003_dump_cal_data(struct ath_hw *ah, char *buf, u32 len, u32 size,
                 if (!((pBase->txrxMask >> i) & 1))
                         continue;
 
-                len += snprintf(buf + len, size - len, "Chain %d\n", i);
+                len += scnprintf(buf + len, size - len, "Chain %d\n", i);
 
-                len += snprintf(buf + len, size - len,
+                len += scnprintf(buf + len, size - len,
                         "Freq\t ref\tvolt\ttemp\tnf_cal\tnf_pow\trx_temp\n");
 
                 for (j = 0; j < cal_pier_nr; j++) {
@@ -3471,10 +3471,10 @@ static u32 ar9003_dump_cal_data(struct ath_hw *ah, char *buf, u32 len, u32 size,
                                 freq = 4800 + eep->calFreqPier5G[j] * 5;
                         }
 
-                        len += snprintf(buf + len, size - len,
+                        len += scnprintf(buf + len, size - len,
                                 "%d\t", freq);
 
-                        len += snprintf(buf + len, size - len,
+                        len += scnprintf(buf + len, size - len,
                                 "%d\t%d\t%d\t%d\t%d\t%d\n",
                                 cal_pier->refPower,
                                 cal_pier->voltMeas,
@@ -3505,12 +3505,12 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
                 len += scnprintf(buf + len, size - len, "Calibration data\n");
                 len = ar9003_dump_cal_data(ah, buf, len, size, true);
 
-                len +=  snprintf(buf + len, size - len,
+                len += scnprintf(buf + len, size - len,
                                  "%20s :\n", "5GHz modal Header");
                 len = ar9003_dump_modal_eeprom(buf, len, size,
                                                 &eep->modalHeader5G);
 
-                len += snprintf(buf + len, size - len, "Calibration data\n");
+                len += scnprintf(buf + len, size - len, "Calibration data\n");
                 len = ar9003_dump_cal_data(ah, buf, len, size, false);
 
                 goto out;
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 0fca44e91a71..a412b352182c 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -112,8 +112,6 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
 #define ATH_TXFIFO_DEPTH           8
 #define ATH_TX_ERROR               0x01
 
-#define ATH_AIRTIME_QUANTUM        300 /* usec */
-
 /* Stop tx traffic 1ms before the GO goes away */
 #define ATH_P2P_PS_STOP_TIME       1000
 
@@ -246,10 +244,8 @@ struct ath_atx_tid {
         s8 bar_index;
         bool active;
         bool clear_ps_filter;
-        bool has_queued;
 };
 
-void __ath_tx_queue_tid(struct ath_softc *sc, struct ath_atx_tid *tid);
 void ath_tx_queue_tid(struct ath_softc *sc, struct ath_atx_tid *tid);
 
 struct ath_node {
@@ -263,12 +259,9 @@ struct ath_node {
 
         bool sleeping;
         bool no_ps_filter;
-        s64 airtime_deficit[IEEE80211_NUM_ACS];
-        u32 airtime_rx_start;
 
 #ifdef CONFIG_ATH9K_STATION_STATISTICS
         struct ath_rx_rate_stats rx_rate_stats;
-        struct ath_airtime_stats airtime_stats;
 #endif
         u8 key_idx[4];
 
@@ -986,11 +979,6 @@ void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs);
 
 #define ATH9K_NUM_CHANCTX  2 /* supports 2 operating channels */
 
-#define AIRTIME_USE_TX          BIT(0)
-#define AIRTIME_USE_RX          BIT(1)
-#define AIRTIME_USE_NEW_QUEUES  BIT(2)
-#define AIRTIME_ACTIVE(flags) (!!(flags & (AIRTIME_USE_TX|AIRTIME_USE_RX)))
-
 struct ath_softc {
         struct ieee80211_hw *hw;
         struct device *dev;
@@ -1034,8 +1022,6 @@ struct ath_softc {
         short nbcnvifs;
         unsigned long ps_usecount;
 
-        u16 airtime_flags; /* AIRTIME_* */
-
         struct ath_rx rx;
         struct ath_tx tx;
         struct ath_beacon beacon;
diff --git a/drivers/net/wireless/ath/ath9k/common-spectral.c b/drivers/net/wireless/ath/ath9k/common-spectral.c
index 6aa3ec024ffa..21191955a7c1 100644
--- a/drivers/net/wireless/ath/ath9k/common-spectral.c
+++ b/drivers/net/wireless/ath/ath9k/common-spectral.c
@@ -1039,6 +1039,9 @@ static struct dentry *create_buf_file_handler(const char *filename,
 
         buf_file = debugfs_create_file(filename, mode, parent, buf,
                                        &relay_file_operations);
+        if (IS_ERR(buf_file))
+                return NULL;
+
         *is_global = 1;
         return buf_file;
 }
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 4399e9ad058f..0dfea5d6e949 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1443,9 +1443,6 @@ int ath9k_init_debug(struct ath_hw *ah)
 #endif
         debugfs_create_file("tpc", 0600, sc->debug.debugfs_phy, sc, &fops_tpc);
 
-        debugfs_create_u16("airtime_flags", 0600,
-                           sc->debug.debugfs_phy, &sc->airtime_flags);
-
         debugfs_create_file("nf_override", 0600,
                             sc->debug.debugfs_phy, sc, &fops_nf_override);
 
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 79607db14387..33826aa13687 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -319,20 +319,12 @@ ath9k_debug_sync_cause(struct ath_softc *sc, u32 sync_cause)
 void ath_debug_rate_stats(struct ath_softc *sc,
                           struct ath_rx_status *rs,
                           struct sk_buff *skb);
-void ath_debug_airtime(struct ath_softc *sc,
-                       struct ath_node *an,
-                       u32 rx, u32 tx);
 #else
 static inline void ath_debug_rate_stats(struct ath_softc *sc,
                                         struct ath_rx_status *rs,
                                         struct sk_buff *skb)
 {
 }
-static inline void ath_debug_airtime(struct ath_softc *sc,
-                              struct ath_node *an,
-                              u32 rx, u32 tx)
-{
-}
 #endif /* CONFIG_ATH9K_STATION_STATISTICS */
 
 #endif /* DEBUG_H */
diff --git a/drivers/net/wireless/ath/ath9k/debug_sta.c b/drivers/net/wireless/ath/ath9k/debug_sta.c
index e8fcd3e1c470..d95cabddce33 100644
--- a/drivers/net/wireless/ath/ath9k/debug_sta.c
+++ b/drivers/net/wireless/ath/ath9k/debug_sta.c
@@ -242,75 +242,6 @@ static const struct file_operations fops_node_recv = {
         .llseek = default_llseek,
 };
 
-void ath_debug_airtime(struct ath_softc *sc,
-                struct ath_node *an,
-                u32 rx,
-                u32 tx)
-{
-        struct ath_airtime_stats *astats = &an->airtime_stats;
-
-        astats->rx_airtime += rx;
-        astats->tx_airtime += tx;
-}
-
-static ssize_t read_airtime(struct file *file, char __user *user_buf,
-                        size_t count, loff_t *ppos)
-{
-        struct ath_node *an = file->private_data;
-        struct ath_airtime_stats *astats;
-        static const char *qname[4] = {
-                "VO", "VI", "BE", "BK"
-        };
-        u32 len = 0, size = 256;
-        char *buf;
-        size_t retval;
-        int i;
-
-        buf = kzalloc(size, GFP_KERNEL);
-        if (buf == NULL)
-                return -ENOMEM;
-
-        astats = &an->airtime_stats;
-
-        len += scnprintf(buf + len, size - len, "RX: %u us\n", astats->rx_airtime);
-        len += scnprintf(buf + len, size - len, "TX: %u us\n", astats->tx_airtime);
-        len += scnprintf(buf + len, size - len, "Deficit: ");
-        for (i = 0; i < 4; i++)
-                len += scnprintf(buf+len, size - len, "%s: %lld us ", qname[i], an->airtime_deficit[i]);
-        if (len < size)
-                buf[len++] = '\n';
-
-        retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        kfree(buf);
-
-        return retval;
-}
-
-static ssize_t
-write_airtime_reset_stub(struct file *file, const char __user *ubuf,
-                   size_t count, loff_t *ppos)
-{
-        struct ath_node *an = file->private_data;
-        struct ath_airtime_stats *astats;
-        int i;
-
-        astats = &an->airtime_stats;
-        astats->rx_airtime = 0;
-        astats->tx_airtime = 0;
-        for (i = 0; i < 4; i++)
-                an->airtime_deficit[i] = ATH_AIRTIME_QUANTUM;
-        return count;
-}
-
-static const struct file_operations fops_airtime = {
-        .read = read_airtime,
-        .write = write_airtime_reset_stub,
-        .open = simple_open,
-        .owner = THIS_MODULE,
-        .llseek = default_llseek,
-};
-
-
 void ath9k_sta_add_debugfs(struct ieee80211_hw *hw,
                            struct ieee80211_vif *vif,
                            struct ieee80211_sta *sta,
@@ -320,5 +251,4 @@ void ath9k_sta_add_debugfs(struct ieee80211_hw *hw,
 
         debugfs_create_file("node_aggr", 0444, dir, an, &fops_node_aggr);
         debugfs_create_file("node_recv", 0444, dir, an, &fops_node_recv);
-        debugfs_create_file("airtime", 0644, dir, an, &fops_airtime);
 }
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 799010ed04e0..4e8e80ac8341 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -574,12 +574,12 @@ void ath9k_tx_failed_tasklet(unsigned long data)
 {
         struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *)data;
 
-        spin_lock_bh(&priv->tx.tx_lock);
+        spin_lock(&priv->tx.tx_lock);
         if (priv->tx.flags & ATH9K_HTC_OP_TX_DRAIN) {
-                spin_unlock_bh(&priv->tx.tx_lock);
+                spin_unlock(&priv->tx.tx_lock);
                 return;
         }
-        spin_unlock_bh(&priv->tx.tx_lock);
+        spin_unlock(&priv->tx.tx_lock);
 
         ath9k_htc_tx_drainq(priv, &priv->tx.tx_failed);
 }
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index c070a9e51ebf..98141b699c88 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -636,15 +636,15 @@ static int ath9k_of_init(struct ath_softc *sc)
                 ret = ath9k_eeprom_request(sc, eeprom_name);
                 if (ret)
                         return ret;
+
+                ah->ah_flags &= ~AH_USE_EEPROM;
+                ah->ah_flags |= AH_NO_EEP_SWAP;
         }
 
         mac = of_get_mac_address(np);
         if (mac)
                 ether_addr_copy(common->macaddr, mac);
 
-        ah->ah_flags &= ~AH_USE_EEPROM;
-        ah->ah_flags |= AH_NO_EEP_SWAP;
-
         return 0;
 }
 
@@ -676,8 +676,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
 
         /* Will be cleared in ath9k_start() */
         set_bit(ATH_OP_INVALID, &common->op_flags);
-        sc->airtime_flags = (AIRTIME_USE_TX | AIRTIME_USE_RX |
-                             AIRTIME_USE_NEW_QUEUES);
 
         sc->sc_ah = ah;
         sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
@@ -1013,6 +1011,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
         SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
 
         wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
+        wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS);
 }
 
 int ath9k_init_device(u16 devid, struct ath_softc *sc,
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 30d1bd832d90..285a62d3019d 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1054,14 +1054,7 @@ static void ath_rx_count_airtime(struct ath_softc *sc,
                                                 len, rxs->rate_idx, is_sp);
         }
 
-        if (!!(sc->airtime_flags & AIRTIME_USE_RX)) {
-                spin_lock_bh(&acq->lock);
-                an->airtime_deficit[acno] -= airtime;
-                if (an->airtime_deficit[acno] <= 0)
-                        __ath_tx_queue_tid(sc, ATH_AN_2_TID(an, tidno));
-                spin_unlock_bh(&acq->lock);
-        }
-        ath_debug_airtime(sc, an, airtime, 0);
+        ieee80211_sta_register_airtime(sta, tidno, 0, airtime);
 exit:
         rcu_read_unlock();
 }
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index f448d5716639..06e0c5a6fab6 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -113,44 +113,14 @@ void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq)
                 ath_tx_status(hw, skb);
 }
 
-void __ath_tx_queue_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
-{
-        struct ath_vif *avp = (struct ath_vif *) tid->an->vif->drv_priv;
-        struct ath_chanctx *ctx = avp->chanctx;
-        struct ath_acq *acq;
-        struct list_head *tid_list;
-        u8 acno = TID_TO_WME_AC(tid->tidno);
-
-        if (!ctx || !list_empty(&tid->list))
-                return;
-
-
-        acq = &ctx->acq[acno];
-        if ((sc->airtime_flags & AIRTIME_USE_NEW_QUEUES) &&
-            tid->an->airtime_deficit[acno] > 0)
-                tid_list = &acq->acq_new;
-        else
-                tid_list = &acq->acq_old;
-
-        list_add_tail(&tid->list, tid_list);
-}
-
 void ath_tx_queue_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 {
-        struct ath_vif *avp = (struct ath_vif *) tid->an->vif->drv_priv;
-        struct ath_chanctx *ctx = avp->chanctx;
-        struct ath_acq *acq;
+        struct ieee80211_txq *queue =
+                container_of((void *)tid, struct ieee80211_txq, drv_priv);
 
-        if (!ctx || !list_empty(&tid->list))
-                return;
-
-        acq = &ctx->acq[TID_TO_WME_AC(tid->tidno)];
-        spin_lock_bh(&acq->lock);
-        __ath_tx_queue_tid(sc, tid);
-        spin_unlock_bh(&acq->lock);
+        ieee80211_schedule_txq(sc->hw, queue);
 }
 
-
 void ath9k_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *queue)
 {
         struct ath_softc *sc = hw->priv;
@@ -163,11 +133,7 @@ void ath9k_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *queue)
                 tid->tidno);
 
         ath_txq_lock(sc, txq);
-
-        tid->has_queued = true;
-        ath_tx_queue_tid(sc, tid);
         ath_txq_schedule(sc, txq);
-
         ath_txq_unlock(sc, txq);
 }
 
@@ -217,8 +183,8 @@ ath_get_skb_tid(struct ath_softc *sc, struct ath_node *an, struct sk_buff *skb)
         return ATH_AN_2_TID(an, tidno);
 }
 
-static struct sk_buff *
-ath_tid_pull(struct ath_atx_tid *tid)
+static int
+ath_tid_pull(struct ath_atx_tid *tid, struct sk_buff **skbuf)
 {
         struct ieee80211_txq *txq = container_of((void*)tid, struct ieee80211_txq, drv_priv);
         struct ath_softc *sc = tid->an->sc;
@@ -229,20 +195,16 @@ ath_tid_pull(struct ath_atx_tid *tid)
         };
         struct sk_buff *skb;
         struct ath_frame_info *fi;
-        int q;
-
-        if (!tid->has_queued)
-                return NULL;
+        int q, ret;
 
         skb = ieee80211_tx_dequeue(hw, txq);
-        if (!skb) {
-                tid->has_queued = false;
-                return NULL;
-        }
+        if (!skb)
+                return -ENOENT;
 
-        if (ath_tx_prepare(hw, skb, &txctl)) {
+        ret = ath_tx_prepare(hw, skb, &txctl);
+        if (ret) {
                 ieee80211_free_txskb(hw, skb);
-                return NULL;
+                return ret;
         }
 
         q = skb_get_queue_mapping(skb);
@@ -252,24 +214,19 @@ ath_tid_pull(struct ath_atx_tid *tid)
                 ++tid->txq->pending_frames;
         }
 
-        return skb;
-}
-
-
-static bool ath_tid_has_buffered(struct ath_atx_tid *tid)
-{
-        return !skb_queue_empty(&tid->retry_q) || tid->has_queued;
+        *skbuf = skb;
+        return 0;
 }
 
-static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid)
+static int ath_tid_dequeue(struct ath_atx_tid *tid,
+                           struct sk_buff **skb)
 {
-        struct sk_buff *skb;
-
-        skb = __skb_dequeue(&tid->retry_q);
-        if (!skb)
-                skb = ath_tid_pull(tid);
+        int ret = 0;
+        *skb = __skb_dequeue(&tid->retry_q);
+        if (!*skb)
+                ret = ath_tid_pull(tid, skb);
 
-        return skb;
+        return ret;
 }
 
 static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
@@ -365,11 +322,12 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
         struct list_head bf_head;
         struct ath_tx_status ts;
         struct ath_frame_info *fi;
+        int ret;
 
         memset(&ts, 0, sizeof(ts));
         INIT_LIST_HEAD(&bf_head);
 
-        while ((skb = ath_tid_dequeue(tid))) {
+        while ((ret = ath_tid_dequeue(tid, &skb)) == 0) {
                 fi = get_frame_info(skb);
                 bf = fi->bf;
 
@@ -681,7 +639,6 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 skb_queue_splice_tail(&bf_pending, &tid->retry_q);
                 if (!an->sleeping) {
                         ath_tx_queue_tid(sc, tid);
-
                         if (ts->ts_status & (ATH9K_TXERR_FILT | ATH9K_TXERR_XRETRY))
                                 tid->clear_ps_filter = true;
                 }
@@ -708,11 +665,11 @@ static bool bf_is_ampdu_not_probing(struct ath_buf *bf)
     return bf_isampdu(bf) && !(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);
 }
 
-static void ath_tx_count_airtime(struct ath_softc *sc, struct ath_node *an,
-                                 struct ath_atx_tid *tid, struct ath_buf *bf,
+static void ath_tx_count_airtime(struct ath_softc *sc,
+                                 struct ieee80211_sta *sta,
+                                 struct ath_buf *bf,
                                  struct ath_tx_status *ts)
 {
-        struct ath_txq *txq = tid->txq;
         u32 airtime = 0;
         int i;
 
@@ -722,17 +679,7 @@ static void ath_tx_count_airtime(struct ath_softc *sc, struct ath_node *an,
                 airtime += rate_dur * bf->rates[i].count;
         }
 
-        if (sc->airtime_flags & AIRTIME_USE_TX) {
-                int q = txq->mac80211_qnum;
-                struct ath_acq *acq = &sc->cur_chan->acq[q];
-
-                spin_lock_bh(&acq->lock);
-                an->airtime_deficit[q] -= airtime;
-                if (an->airtime_deficit[q] <= 0)
-                        __ath_tx_queue_tid(sc, tid);
-                spin_unlock_bh(&acq->lock);
-        }
-        ath_debug_airtime(sc, an, 0, airtime);
+        ieee80211_sta_register_airtime(sta, ts->tid, airtime, 0);
 }
 
 static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
@@ -762,7 +709,7 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
         if (sta) {
                 struct ath_node *an = (struct ath_node *)sta->drv_priv;
                 tid = ath_get_skb_tid(sc, an, bf->bf_mpdu);
-                ath_tx_count_airtime(sc, an, tid, bf, ts);
+                ath_tx_count_airtime(sc, sta, bf, ts);
                 if (ts->ts_status & (ATH9K_TXERR_FILT | ATH9K_TXERR_XRETRY))
                         tid->clear_ps_filter = true;
         }
@@ -947,20 +894,21 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
         return ndelim;
 }
 
-static struct ath_buf *
+static int
 ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
-                        struct ath_atx_tid *tid)
+                        struct ath_atx_tid *tid, struct ath_buf **buf)
 {
         struct ieee80211_tx_info *tx_info;
         struct ath_frame_info *fi;
-        struct sk_buff *skb, *first_skb = NULL;
         struct ath_buf *bf;
+        struct sk_buff *skb, *first_skb = NULL;
         u16 seqno;
+        int ret;
 
         while (1) {
-                skb = ath_tid_dequeue(tid);
-                if (!skb)
-                        break;
+                ret = ath_tid_dequeue(tid, &skb);
+                if (ret < 0)
+                        return ret;
 
                 fi = get_frame_info(skb);
                 bf = fi->bf;
@@ -992,7 +940,7 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
 
                 if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
                         bf->bf_state.bf_type = 0;
-                        return bf;
+                        break;
                 }
 
                 bf->bf_state.bf_type = BUF_AMPDU | BUF_AGGR;
@@ -1011,7 +959,7 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
                                         first_skb = skb;
                                 continue;
                         }
-                        break;
+                        return -EINPROGRESS;
                 }
 
                 if (tid->bar_index > ATH_BA_INDEX(tid->seq_start, seqno)) {
@@ -1028,10 +976,11 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
                 if (bf_isampdu(bf))
                         ath_tx_addto_baw(sc, tid, bf);
 
-                return bf;
+                break;
         }
 
-        return NULL;
+        *buf = bf;
+        return 0;
 }
 
 static int
@@ -1041,7 +990,7 @@ ath_tx_form_aggr(struct ath_softc *sc, struct ath_txq *txq,
 {
 #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
         struct ath_buf *bf = bf_first, *bf_prev = NULL;
-        int nframes = 0, ndelim;
+        int nframes = 0, ndelim, ret;
         u16 aggr_limit = 0, al = 0, bpad = 0,
             al_delta, h_baw = tid->baw_size / 2;
         struct ieee80211_tx_info *tx_info;
@@ -1093,7 +1042,9 @@ ath_tx_form_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
                 bf_prev = bf;
 
-                bf = ath_tx_get_tid_subframe(sc, txq, tid);
+                ret = ath_tx_get_tid_subframe(sc, txq, tid, &bf);
+                if (ret < 0)
+                        break;
         }
         goto finish;
 stop:
@@ -1490,7 +1441,7 @@ ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq,
                   struct ath_buf *bf_first)
 {
         struct ath_buf *bf = bf_first, *bf_prev = NULL;
-        int nframes = 0;
+        int nframes = 0, ret;
 
         do {
                 struct ieee80211_tx_info *tx_info;
@@ -1504,8 +1455,8 @@ ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq,
                 if (nframes >= 2)
                         break;
 
-                bf = ath_tx_get_tid_subframe(sc, txq, tid);
-                if (!bf)
+                ret = ath_tx_get_tid_subframe(sc, txq, tid, &bf);
+                if (ret < 0)
                         break;
 
                 tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
@@ -1518,30 +1469,27 @@ ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq,
         } while (1);
 }
 
-static bool ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
-                              struct ath_atx_tid *tid)
+static int ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
+                             struct ath_atx_tid *tid)
 {
-        struct ath_buf *bf;
+        struct ath_buf *bf = NULL;
         struct ieee80211_tx_info *tx_info;
         struct list_head bf_q;
-        int aggr_len = 0;
+        int aggr_len = 0, ret;
         bool aggr;
 
-        if (!ath_tid_has_buffered(tid))
-                return false;
-
         INIT_LIST_HEAD(&bf_q);
 
-        bf = ath_tx_get_tid_subframe(sc, txq, tid);
-        if (!bf)
-                return false;
+        ret = ath_tx_get_tid_subframe(sc, txq, tid, &bf);
+        if (ret < 0)
+                return ret;
 
         tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
         aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
         if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ||
             (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) {
                 __skb_queue_tail(&tid->retry_q, bf->bf_mpdu);
-                return false;
+                return -EBUSY;
         }
 
         ath_set_rates(tid->an->vif, tid->an->sta, bf);
@@ -1551,7 +1499,7 @@ static bool ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 ath_tx_form_burst(sc, txq, tid, &bf_q, bf);
 
         if (list_empty(&bf_q))
-                return false;
+                return -EAGAIN;
 
         if (tid->clear_ps_filter || tid->an->no_ps_filter) {
                 tid->clear_ps_filter = false;
@@ -1560,7 +1508,7 @@ static bool ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
         ath_tx_fill_desc(sc, bf, txq, aggr_len);
         ath_tx_txqaddbuf(sc, txq, &bf_q, false);
-        return true;
+        return 0;
 }
 
 int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
@@ -1623,28 +1571,16 @@ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_atx_tid *tid;
-        struct ath_txq *txq;
         int tidno;
 
         ath_dbg(common, XMIT, "%s called\n", __func__);
 
         for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
                 tid = ath_node_to_tid(an, tidno);
-                txq = tid->txq;
-
-                ath_txq_lock(sc, txq);
-
-                if (list_empty(&tid->list)) {
-                        ath_txq_unlock(sc, txq);
-                        continue;
-                }
 
                 if (!skb_queue_empty(&tid->retry_q))
                         ieee80211_sta_set_buffered(sta, tid->tidno, true);
 
-                list_del_init(&tid->list);
-
-                ath_txq_unlock(sc, txq);
         }
 }
 
@@ -1663,11 +1599,12 @@ void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an)
 
                 ath_txq_lock(sc, txq);
                 tid->clear_ps_filter = true;
-                if (ath_tid_has_buffered(tid)) {
+                if (!skb_queue_empty(&tid->retry_q)) {
                         ath_tx_queue_tid(sc, tid);
                         ath_txq_schedule(sc, txq);
                 }
                 ath_txq_unlock_complete(sc, txq);
+
         }
 }
 
@@ -1698,9 +1635,9 @@ void ath9k_release_buffered_frames(struct ieee80211_hw *hw,
         struct ath_txq *txq = sc->tx.uapsdq;
         struct ieee80211_tx_info *info;
         struct list_head bf_q;
-        struct ath_buf *bf_tail = NULL, *bf;
+        struct ath_buf *bf_tail = NULL, *bf = NULL;
         int sent = 0;
-        int i;
+        int i, ret;
 
         INIT_LIST_HEAD(&bf_q);
         for (i = 0; tids && nframes; i++, tids >>= 1) {
@@ -1713,8 +1650,9 @@ void ath9k_release_buffered_frames(struct ieee80211_hw *hw,
 
                 ath_txq_lock(sc, tid->txq);
                 while (nframes > 0) {
-                        bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid);
-                        if (!bf)
+                        ret = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq,
+                                                      tid, &bf);
+                        if (ret < 0)
                                 break;
 
                         ath9k_set_moredata(sc, bf, true);
@@ -1980,11 +1918,11 @@ void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq)
  */
 void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
 {
+        struct ieee80211_hw *hw = sc->hw;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ieee80211_txq *queue;
         struct ath_atx_tid *tid;
-        struct list_head *tid_list;
-        struct ath_acq *acq;
-        bool active = AIRTIME_ACTIVE(sc->airtime_flags);
+        int ret;
 
         if (txq->mac80211_qnum < 0)
                 return;
@@ -1992,58 +1930,26 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
         if (test_bit(ATH_OP_HW_RESET, &common->op_flags))
                 return;
 
+        ieee80211_txq_schedule_start(hw, txq->mac80211_qnum);
         spin_lock_bh(&sc->chan_lock);
         rcu_read_lock();
-        acq = &sc->cur_chan->acq[txq->mac80211_qnum];
 
         if (sc->cur_chan->stopped)
                 goto out;
 
-begin:
-        tid_list = &acq->acq_new;
-        if (list_empty(tid_list)) {
-                tid_list = &acq->acq_old;
-                if (list_empty(tid_list))
-                        goto out;
-        }
-        tid = list_first_entry(tid_list, struct ath_atx_tid, list);
-
-        if (active && tid->an->airtime_deficit[txq->mac80211_qnum] <= 0) {
-                spin_lock_bh(&acq->lock);
-                tid->an->airtime_deficit[txq->mac80211_qnum] += ATH_AIRTIME_QUANTUM;
-                list_move_tail(&tid->list, &acq->acq_old);
-                spin_unlock_bh(&acq->lock);
-                goto begin;
-        }
-
-        if (!ath_tid_has_buffered(tid)) {
-                spin_lock_bh(&acq->lock);
-                if ((tid_list == &acq->acq_new) && !list_empty(&acq->acq_old))
-                        list_move_tail(&tid->list, &acq->acq_old);
-                else {
-                        list_del_init(&tid->list);
-                }
-                spin_unlock_bh(&acq->lock);
-                goto begin;
-        }
+        while ((queue = ieee80211_next_txq(hw, txq->mac80211_qnum))) {
+                tid = (struct ath_atx_tid *)queue->drv_priv;
 
+                ret = ath_tx_sched_aggr(sc, txq, tid);
+                ath_dbg(common, QUEUE, "ath_tx_sched_aggr returned %d\n", ret);
 
-        /*
-         * If we succeed in scheduling something, immediately restart to make
-         * sure we keep the HW busy.
-         */
-        if(ath_tx_sched_aggr(sc, txq, tid)) {
-                if (!active) {
-                        spin_lock_bh(&acq->lock);
-                        list_move_tail(&tid->list, &acq->acq_old);
-                        spin_unlock_bh(&acq->lock);
-                }
-                goto begin;
+                ieee80211_return_txq(hw, queue);
         }
 
 out:
         rcu_read_unlock();
         spin_unlock_bh(&sc->chan_lock);
+        ieee80211_txq_schedule_end(hw, txq->mac80211_qnum);
 }
 
 void ath_txq_schedule_all(struct ath_softc *sc)
@@ -2887,9 +2793,6 @@ void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
         struct ath_atx_tid *tid;
         int tidno, acno;
 
-        for (acno = 0; acno < IEEE80211_NUM_ACS; acno++)
-                an->airtime_deficit[acno] = ATH_AIRTIME_QUANTUM;
-
         for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
                 tid = ath_node_to_tid(an, tidno);
                 tid->an        = an;
@@ -2899,7 +2802,6 @@ void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
                 tid->baw_head  = tid->baw_tail = 0;
                 tid->active        = false;
                 tid->clear_ps_filter = true;
-                tid->has_queued  = false;
                 __skb_queue_head_init(&tid->retry_q);
                 INIT_LIST_HEAD(&tid->list);
                 acno = TID_TO_WME_AC(tidno);
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index f7c2f19e81c1..8e154f6364a3 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -427,7 +427,7 @@ static int carl9170_rx_mac_status(struct ar9170 *ar,
                 if (head->plcp[6] & 0x80)
                         status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
 
-                status->rate_idx = clamp(0, 75, head->plcp[3] & 0x7f);
+                status->rate_idx = clamp(head->plcp[3] & 0x7f, 0, 75);
                 status->encoding = RX_ENC_HT;
                 break;
 
diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index d73e45e26547..75ddaefdd049 100644
--- a/drivers/net/wireless/ath/regd.h
+++ b/drivers/net/wireless/ath/regd.h
@@ -185,7 +185,9 @@ enum CountryCode {
         CTRY_UKRAINE = 804,
         CTRY_UNITED_KINGDOM = 826,
         CTRY_UNITED_STATES = 840,
+        CTRY_UNITED_STATES2 = 841,
         CTRY_UNITED_STATES_FCC49 = 842,
+        CTRY_UNITED_STATES3 = 843,
         CTRY_URUGUAY = 858,
         CTRY_UZBEKISTAN = 860,
         CTRY_VENEZUELA = 862,
diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h
index 4021e37a225a..c4bd26e65949 100644
--- a/drivers/net/wireless/ath/regd_common.h
+++ b/drivers/net/wireless/ath/regd_common.h
@@ -483,6 +483,8 @@ static struct country_code_to_enum_rd allCountries[] = {
         {CTRY_UAE, NULL1_WORLD, "AE"},
         {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB"},
         {CTRY_UNITED_STATES, FCC3_FCCA, "US"},
+        {CTRY_UNITED_STATES2, FCC3_FCCA, "US"},
+        {CTRY_UNITED_STATES3, FCC3_FCCA, "US"},
         /* This "PS" is for US public safety actually... to support this we
          * would need to assign new special alpha2 to CRDA db as with the world
          * regdomain and use another alpha2 */
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
index 1068a2a4494c..73d3c1a0a7c9 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
@@ -178,8 +178,8 @@ brcmf_proto_bcdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
         *fwerr = 0;
         ret = brcmf_proto_bcdc_msg(drvr, ifidx, cmd, buf, len, false);
         if (ret < 0) {
-                brcmf_err("brcmf_proto_bcdc_msg failed w/status %d\n",
-                          ret);
+                bphy_err(drvr, "brcmf_proto_bcdc_msg failed w/status %d\n",
+                         ret);
                 goto done;
         }
 
@@ -195,9 +195,9 @@ retry:
         if ((id < bcdc->reqid) && (++retries < RETRIES))
                 goto retry;
         if (id != bcdc->reqid) {
-                brcmf_err("%s: unexpected request id %d (expected %d)\n",
-                          brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
-                          bcdc->reqid);
+                bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",
+                         brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
+                         bcdc->reqid);
                 ret = -EINVAL;
                 goto done;
         }
@@ -245,9 +245,9 @@ brcmf_proto_bcdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
         id = (flags & BCDC_DCMD_ID_MASK) >> BCDC_DCMD_ID_SHIFT;
 
         if (id != bcdc->reqid) {
-                brcmf_err("%s: unexpected request id %d (expected %d)\n",
-                          brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
-                          bcdc->reqid);
+                bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",
+                         brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
+                         bcdc->reqid);
                 ret = -EINVAL;
                 goto done;
         }
@@ -312,8 +312,8 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pub *drvr, bool do_fws,
         }
         if (((h->flags & BCDC_FLAG_VER_MASK) >> BCDC_FLAG_VER_SHIFT) !=
             BCDC_PROTO_VER) {
-                brcmf_err("%s: non-BCDC packet received, flags 0x%x\n",
-                          brcmf_ifname(tmp_if), h->flags);
+                bphy_err(drvr, "%s: non-BCDC packet received, flags 0x%x\n",
+                         brcmf_ifname(tmp_if), h->flags);
                 return -EBADE;
         }
 
@@ -460,7 +460,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
 
         /* ensure that the msg buf directly follows the cdc msg struct */
         if ((unsigned long)(&bcdc->msg + 1) != (unsigned long)bcdc->buf) {
-                brcmf_err("struct brcmf_proto_bcdc is not correctly defined\n");
+                bphy_err(drvr, "struct brcmf_proto_bcdc is not correctly defined\n");
                 goto fail;
         }
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
index c4965184cdf3..3d441c5c745c 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
@@ -90,6 +90,7 @@ struct brcmf_bus_ops {
         int (*get_memdump)(struct device *dev, void *data, size_t len);
         int (*get_fwname)(struct device *dev, const char *ext,
                           unsigned char *fw_name);
+        void (*debugfs_create)(struct device *dev);
 };
 
 
@@ -235,6 +236,15 @@ int brcmf_bus_get_fwname(struct brcmf_bus *bus, const char *ext,
         return bus->ops->get_fwname(bus->dev, ext, fw_name);
 }
 
+static inline
+void brcmf_bus_debugfs_create(struct brcmf_bus *bus)
+{
+        if (!bus->ops->debugfs_create)
+                return;
+
+        return bus->ops->debugfs_create(bus->dev);
+}
+
 /*
  * interface functions from common layer
  */
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 35301237d435..e92f6351bd22 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -457,6 +457,7 @@ static void convert_key_from_CPU(struct brcmf_wsec_key *key,
 static int
 send_key_to_dongle(struct brcmf_if *ifp, struct brcmf_wsec_key *key)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         int err;
         struct brcmf_wsec_key_le key_le;
 
@@ -468,7 +469,7 @@ send_key_to_dongle(struct brcmf_if *ifp, struct brcmf_wsec_key *key)
                                         sizeof(key_le));
 
         if (err)
-                brcmf_err("wsec_key error (%d)\n", err);
+                bphy_err(drvr, "wsec_key error (%d)\n", err);
         return err;
 }
 
@@ -508,6 +509,7 @@ static int brcmf_get_first_free_bsscfgidx(struct brcmf_pub *drvr)
 
 static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_mbss_ssid_le mbss_ssid_le;
         int bsscfgidx;
         int err;
@@ -524,7 +526,7 @@ static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
         err = brcmf_fil_bsscfg_data_set(ifp, "bsscfg:ssid", &mbss_ssid_le,
                                         sizeof(mbss_ssid_le));
         if (err < 0)
-                brcmf_err("setting ssid failed %d\n", err);
+                bphy_err(drvr, "setting ssid failed %d\n", err);
 
         return err;
 }
@@ -542,6 +544,7 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         int err;
 
@@ -567,7 +570,7 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,
                                             BRCMF_VIF_EVENT_TIMEOUT);
         brcmf_cfg80211_arm_vif_event(cfg, NULL);
         if (!err) {
-                brcmf_err("timeout occurred\n");
+                bphy_err(drvr, "timeout occurred\n");
                 err = -EIO;
                 goto fail;
         }
@@ -575,7 +578,7 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,
         /* interface created in firmware */
         ifp = vif->ifp;
         if (!ifp) {
-                brcmf_err("no if pointer provided\n");
+                bphy_err(drvr, "no if pointer provided\n");
                 err = -ENOENT;
                 goto fail;
         }
@@ -583,7 +586,7 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,
         strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
         err = brcmf_net_attach(ifp, true);
         if (err) {
-                brcmf_err("Registering netdevice failed\n");
+                bphy_err(drvr, "Registering netdevice failed\n");
                 free_netdev(ifp->ndev);
                 goto fail;
         }
@@ -614,13 +617,15 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,
                                                      enum nl80211_iftype type,
                                                      struct vif_params *params)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct wireless_dev *wdev;
         int err;
 
         brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
         err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
         if (err) {
-                brcmf_err("iface validation failed: err=%d\n", err);
+                bphy_err(drvr, "iface validation failed: err=%d\n", err);
                 return ERR_PTR(err);
         }
         switch (type) {
@@ -645,8 +650,8 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,
         }
 
         if (IS_ERR(wdev))
-                brcmf_err("add iface %s type %d failed: err=%d\n",
-                          name, type, (int)PTR_ERR(wdev));
+                bphy_err(drvr, "add iface %s type %d failed: err=%d\n", name,
+                         type, (int)PTR_ERR(wdev));
         else
                 brcmf_cfg80211_update_proto_addr_mode(wdev);
 
@@ -661,12 +666,13 @@ static void brcmf_scan_config_mpc(struct brcmf_if *ifp, int mpc)
 
 void brcmf_set_mpc(struct brcmf_if *ifp, int mpc)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err = 0;
 
         if (check_vif_up(ifp->vif)) {
                 err = brcmf_fil_iovar_int_set(ifp, "mpc", mpc);
                 if (err) {
-                        brcmf_err("fail to set mpc\n");
+                        bphy_err(drvr, "fail to set mpc\n");
                         return;
                 }
                 brcmf_dbg(INFO, "MPC : %d\n", mpc);
@@ -677,6 +683,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
                                 struct brcmf_if *ifp, bool aborted,
                                 bool fw_abort)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_scan_params_le params_le;
         struct cfg80211_scan_request *scan_request;
         u64 reqid;
@@ -711,7 +718,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
                 err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,
                                              &params_le, sizeof(params_le));
                 if (err)
-                        brcmf_err("Scan abort failed\n");
+                        bphy_err(drvr, "Scan abort failed\n");
         }
 
         brcmf_scan_config_mpc(ifp, 1);
@@ -756,6 +763,7 @@ static int brcmf_cfg80211_del_ap_iface(struct wiphy *wiphy,
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct net_device *ndev = wdev->netdev;
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
         int ret;
         int err;
 
@@ -763,7 +771,7 @@ static int brcmf_cfg80211_del_ap_iface(struct wiphy *wiphy,
 
         err = brcmf_fil_bsscfg_data_set(ifp, "interface_remove", NULL, 0);
         if (err) {
-                brcmf_err("interface_remove failed %d\n", err);
+                bphy_err(drvr, "interface_remove failed %d\n", err);
                 goto err_unarm;
         }
 
@@ -771,7 +779,7 @@ static int brcmf_cfg80211_del_ap_iface(struct wiphy *wiphy,
         ret = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
                                             BRCMF_VIF_EVENT_TIMEOUT);
         if (!ret) {
-                brcmf_err("timeout occurred\n");
+                bphy_err(drvr, "timeout occurred\n");
                 err = -EIO;
                 goto err_unarm;
         }
@@ -834,6 +842,7 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_vif *vif = ifp->vif;
+        struct brcmf_pub *drvr = cfg->pub;
         s32 infra = 0;
         s32 ap = 0;
         s32 err = 0;
@@ -873,14 +882,14 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
         }
         err = brcmf_vif_change_validate(wiphy_to_cfg(wiphy), vif, type);
         if (err) {
-                brcmf_err("iface validation failed: err=%d\n", err);
+                bphy_err(drvr, "iface validation failed: err=%d\n", err);
                 return err;
         }
         switch (type) {
         case NL80211_IFTYPE_MONITOR:
         case NL80211_IFTYPE_WDS:
-                brcmf_err("type (%d) : currently we do not support this type\n",
-                          type);
+                bphy_err(drvr, "type (%d) : currently we do not support this type\n",
+                         type);
                 return -EOPNOTSUPP;
         case NL80211_IFTYPE_ADHOC:
                 infra = 0;
@@ -908,7 +917,7 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
         } else {
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, infra);
                 if (err) {
-                        brcmf_err("WLC_SET_INFRA error (%d)\n", err);
+                        bphy_err(drvr, "WLC_SET_INFRA error (%d)\n", err);
                         err = -EAGAIN;
                         goto done;
                 }
@@ -999,6 +1008,7 @@ static s32
 brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
                 struct cfg80211_scan_request *request)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         s32 params_size = BRCMF_SCAN_PARAMS_FIXED_SIZE +
                           offsetof(struct brcmf_escan_params_le, params_le);
         struct brcmf_escan_params_le *params;
@@ -1030,7 +1040,7 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
                 if (err == -EBUSY)
                         brcmf_dbg(INFO, "system busy : escan canceled\n");
                 else
-                        brcmf_err("error (%d)\n", err);
+                        bphy_err(drvr, "error (%d)\n", err);
         }
 
         kfree(params);
@@ -1067,6 +1077,7 @@ static s32
 brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         s32 err = 0;
 
@@ -1076,21 +1087,22 @@ brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
                 return -EIO;
 
         if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
-                brcmf_err("Scanning already: status (%lu)\n", cfg->scan_status);
+                bphy_err(drvr, "Scanning already: status (%lu)\n",
+                         cfg->scan_status);
                 return -EAGAIN;
         }
         if (test_bit(BRCMF_SCAN_STATUS_ABORT, &cfg->scan_status)) {
-                brcmf_err("Scanning being aborted: status (%lu)\n",
-                          cfg->scan_status);
+                bphy_err(drvr, "Scanning being aborted: status (%lu)\n",
+                         cfg->scan_status);
                 return -EAGAIN;
         }
         if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
-                brcmf_err("Scanning suppressed: status (%lu)\n",
-                          cfg->scan_status);
+                bphy_err(drvr, "Scanning suppressed: status (%lu)\n",
+                         cfg->scan_status);
                 return -EAGAIN;
         }
         if (test_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state)) {
-                brcmf_err("Connecting: status (%lu)\n", vif->sme_state);
+                bphy_err(drvr, "Connecting: status (%lu)\n", vif->sme_state);
                 return -EAGAIN;
         }
 
@@ -1124,7 +1136,7 @@ brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
         return 0;
 
 scan_out:
-        brcmf_err("scan error (%d)\n", err);
+        bphy_err(drvr, "scan error (%d)\n", err);
         clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
         cfg->scan_request = NULL;
         return err;
@@ -1132,36 +1144,41 @@ scan_out:
 
 static s32 brcmf_set_rts(struct net_device *ndev, u32 rts_threshold)
 {
+        struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err = 0;
 
-        err = brcmf_fil_iovar_int_set(netdev_priv(ndev), "rtsthresh",
-                                      rts_threshold);
+        err = brcmf_fil_iovar_int_set(ifp, "rtsthresh", rts_threshold);
         if (err)
-                brcmf_err("Error (%d)\n", err);
+                bphy_err(drvr, "Error (%d)\n", err);
 
         return err;
 }
 
 static s32 brcmf_set_frag(struct net_device *ndev, u32 frag_threshold)
 {
+        struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err = 0;
 
-        err = brcmf_fil_iovar_int_set(netdev_priv(ndev), "fragthresh",
+        err = brcmf_fil_iovar_int_set(ifp, "fragthresh",
                                       frag_threshold);
         if (err)
-                brcmf_err("Error (%d)\n", err);
+                bphy_err(drvr, "Error (%d)\n", err);
 
         return err;
 }
 
 static s32 brcmf_set_retry(struct net_device *ndev, u32 retry, bool l)
 {
+        struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err = 0;
         u32 cmd = (l ? BRCMF_C_SET_LRL : BRCMF_C_SET_SRL);
 
-        err = brcmf_fil_cmd_int_set(netdev_priv(ndev), cmd, retry);
+        err = brcmf_fil_cmd_int_set(ifp, cmd, retry);
         if (err) {
-                brcmf_err("cmd (%d) , error (%d)\n", cmd, err);
+                bphy_err(drvr, "cmd (%d) , error (%d)\n", cmd, err);
                 return err;
         }
         return err;
@@ -1237,6 +1254,7 @@ static u16 brcmf_map_fw_linkdown_reason(const struct brcmf_event_msg *e)
 
 static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_wsec_pmk_le pmk;
         int i, err;
 
@@ -1250,8 +1268,8 @@ static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len)
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_WSEC_PMK,
                                      &pmk, sizeof(pmk));
         if (err < 0)
-                brcmf_err("failed to change PSK in firmware (len=%u)\n",
-                          pmk_len);
+                bphy_err(drvr, "failed to change PSK in firmware (len=%u)\n",
+                         pmk_len);
 
         return err;
 }
@@ -1259,6 +1277,7 @@ static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len)
 static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason)
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(vif->wdev.wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         s32 err = 0;
 
         brcmf_dbg(TRACE, "Enter\n");
@@ -1268,7 +1287,7 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason)
                 err = brcmf_fil_cmd_data_set(vif->ifp,
                                              BRCMF_C_DISASSOC, NULL, 0);
                 if (err) {
-                        brcmf_err("WLC_DISASSOC failed (%d)\n", err);
+                        bphy_err(drvr, "WLC_DISASSOC failed (%d)\n", err);
                 }
                 if ((vif->wdev.iftype == NL80211_IFTYPE_STATION) ||
                     (vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT))
@@ -1292,6 +1311,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_join_params join_params;
         size_t join_params_size = 0;
         s32 err = 0;
@@ -1356,7 +1376,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
 
         err = brcmf_fil_iovar_int_set(ifp, "wsec", wsec);
         if (err) {
-                brcmf_err("wsec failed (%d)\n", err);
+                bphy_err(drvr, "wsec failed (%d)\n", err);
                 goto done;
         }
 
@@ -1368,7 +1388,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
 
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD, bcnprd);
         if (err) {
-                brcmf_err("WLC_SET_BCNPRD failed (%d)\n", err);
+                bphy_err(drvr, "WLC_SET_BCNPRD failed (%d)\n", err);
                 goto done;
         }
 
@@ -1413,7 +1433,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_CHANNEL,
                                             target_channel);
                 if (err) {
-                        brcmf_err("WLC_SET_CHANNEL failed (%d)\n", err);
+                        bphy_err(drvr, "WLC_SET_CHANNEL failed (%d)\n", err);
                         goto done;
                 }
         } else
@@ -1425,7 +1445,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
                                      &join_params, join_params_size);
         if (err) {
-                brcmf_err("WLC_SET_SSID failed (%d)\n", err);
+                bphy_err(drvr, "WLC_SET_SSID failed (%d)\n", err);
                 goto done;
         }
 
@@ -1461,7 +1481,9 @@ brcmf_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)
 static s32 brcmf_set_wpa_version(struct net_device *ndev,
                                  struct cfg80211_connect_params *sme)
 {
+        struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_cfg80211_security *sec;
         s32 val = 0;
         s32 err = 0;
@@ -1473,9 +1495,9 @@ static s32 brcmf_set_wpa_version(struct net_device *ndev,
         else
                 val = WPA_AUTH_DISABLED;
         brcmf_dbg(CONN, "setting wpa_auth to 0x%0x\n", val);
-        err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
+        err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", val);
         if (err) {
-                brcmf_err("set wpa_auth failed (%d)\n", err);
+                bphy_err(drvr, "set wpa_auth failed (%d)\n", err);
                 return err;
         }
         sec = &profile->sec;
@@ -1486,7 +1508,9 @@ static s32 brcmf_set_wpa_version(struct net_device *ndev,
 static s32 brcmf_set_auth_type(struct net_device *ndev,
                                struct cfg80211_connect_params *sme)
 {
+        struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_cfg80211_security *sec;
         s32 val = 0;
         s32 err = 0;
@@ -1506,9 +1530,9 @@ static s32 brcmf_set_auth_type(struct net_device *ndev,
                 break;
         }
 
-        err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "auth", val);
+        err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
         if (err) {
-                brcmf_err("set auth failed (%d)\n", err);
+                bphy_err(drvr, "set auth failed (%d)\n", err);
                 return err;
         }
         sec = &profile->sec;
@@ -1520,7 +1544,9 @@ static s32
 brcmf_set_wsec_mode(struct net_device *ndev,
                     struct cfg80211_connect_params *sme)
 {
+        struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_cfg80211_security *sec;
         s32 pval = 0;
         s32 gval = 0;
@@ -1543,8 +1569,8 @@ brcmf_set_wsec_mode(struct net_device *ndev,
                         pval = AES_ENABLED;
                         break;
                 default:
-                        brcmf_err("invalid cipher pairwise (%d)\n",
-                                  sme->crypto.ciphers_pairwise[0]);
+                        bphy_err(drvr, "invalid cipher pairwise (%d)\n",
+                                 sme->crypto.ciphers_pairwise[0]);
                         return -EINVAL;
                 }
         }
@@ -1564,8 +1590,8 @@ brcmf_set_wsec_mode(struct net_device *ndev,
                         gval = AES_ENABLED;
                         break;
                 default:
-                        brcmf_err("invalid cipher group (%d)\n",
-                                  sme->crypto.cipher_group);
+                        bphy_err(drvr, "invalid cipher group (%d)\n",
+                                 sme->crypto.cipher_group);
                         return -EINVAL;
                 }
         }
@@ -1578,9 +1604,9 @@ brcmf_set_wsec_mode(struct net_device *ndev,
                 pval = AES_ENABLED;
 
         wsec = pval | gval;
-        err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wsec", wsec);
+        err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
         if (err) {
-                brcmf_err("error (%d)\n", err);
+                bphy_err(drvr, "error (%d)\n", err);
                 return err;
         }
 
@@ -1596,6 +1622,7 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
 {
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 val;
         s32 err;
         const struct brcmf_tlv *rsn_ie;
@@ -1613,7 +1640,7 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
 
         err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev), "wpa_auth", &val);
         if (err) {
-                brcmf_err("could not get wpa_auth (%d)\n", err);
+                bphy_err(drvr, "could not get wpa_auth (%d)\n", err);
                 return err;
         }
         if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
@@ -1627,8 +1654,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
                         val = WPA_AUTH_PSK;
                         break;
                 default:
-                        brcmf_err("invalid cipher group (%d)\n",
-                                  sme->crypto.cipher_group);
+                        bphy_err(drvr, "invalid cipher group (%d)\n",
+                                 sme->crypto.cipher_group);
                         return -EINVAL;
                 }
         } else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
@@ -1658,8 +1685,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
                         val = WPA2_AUTH_PSK | WPA2_AUTH_FT;
                         break;
                 default:
-                        brcmf_err("invalid cipher group (%d)\n",
-                                  sme->crypto.cipher_group);
+                        bphy_err(drvr, "invalid cipher group (%d)\n",
+                                 sme->crypto.cipher_group);
                         return -EINVAL;
                 }
         }
@@ -1705,7 +1732,7 @@ skip_mfp_config:
         brcmf_dbg(CONN, "setting wpa_auth to %d\n", val);
         err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
         if (err) {
-                brcmf_err("could not set wpa_auth (%d)\n", err);
+                bphy_err(drvr, "could not set wpa_auth (%d)\n", err);
                 return err;
         }
 
@@ -1716,6 +1743,8 @@ static s32
 brcmf_set_sharedkey(struct net_device *ndev,
                     struct cfg80211_connect_params *sme)
 {
+        struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
         struct brcmf_cfg80211_security *sec;
         struct brcmf_wsec_key key;
@@ -1742,7 +1771,7 @@ brcmf_set_sharedkey(struct net_device *ndev,
         key.len = (u32) sme->key_len;
         key.index = (u32) sme->key_idx;
         if (key.len > sizeof(key.data)) {
-                brcmf_err("Too long key length (%u)\n", key.len);
+                bphy_err(drvr, "Too long key length (%u)\n", key.len);
                 return -EINVAL;
         }
         memcpy(key.data, sme->key, key.len);
@@ -1755,24 +1784,24 @@ brcmf_set_sharedkey(struct net_device *ndev,
                 key.algo = CRYPTO_ALGO_WEP128;
                 break;
         default:
-                brcmf_err("Invalid algorithm (%d)\n",
-                          sme->crypto.ciphers_pairwise[0]);
+                bphy_err(drvr, "Invalid algorithm (%d)\n",
+                         sme->crypto.ciphers_pairwise[0]);
                 return -EINVAL;
         }
         /* Set the new key/index */
         brcmf_dbg(CONN, "key length (%d) key index (%d) algo (%d)\n",
                   key.len, key.index, key.algo);
         brcmf_dbg(CONN, "key \"%s\"\n", key.data);
-        err = send_key_to_dongle(netdev_priv(ndev), &key);
+        err = send_key_to_dongle(ifp, &key);
         if (err)
                 return err;
 
         if (sec->auth_type == NL80211_AUTHTYPE_SHARED_KEY) {
                 brcmf_dbg(CONN, "set auth_type to shared key\n");
                 val = WL_AUTH_SHARED_KEY;       /* shared key */
-                err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "auth", val);
+                err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
                 if (err)
-                        brcmf_err("set auth failed (%d)\n", err);
+                        bphy_err(drvr, "set auth failed (%d)\n", err);
         }
         return err;
 }
@@ -1792,6 +1821,7 @@ enum nl80211_auth_type brcmf_war_auth_type(struct brcmf_if *ifp,
 static void brcmf_set_join_pref(struct brcmf_if *ifp,
                                 struct cfg80211_bss_selection *bss_select)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_join_pref_params join_pref_params[2];
         enum nl80211_band band;
         int err, i = 0;
@@ -1830,7 +1860,7 @@ static void brcmf_set_join_pref(struct brcmf_if *ifp,
         err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,
                                        sizeof(join_pref_params));
         if (err)
-                brcmf_err("Set join_pref error (%d)\n", err);
+                bphy_err(drvr, "Set join_pref error (%d)\n", err);
 }
 
 static s32
@@ -1841,6 +1871,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
         struct ieee80211_channel *chan = sme->channel;
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_join_params join_params;
         size_t join_params_size;
         const struct brcmf_tlv *rsn_ie;
@@ -1857,7 +1888,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
                 return -EIO;
 
         if (!sme->ssid) {
-                brcmf_err("Invalid ssid\n");
+                bphy_err(drvr, "Invalid ssid\n");
                 return -EOPNOTSUPP;
         }
 
@@ -1886,7 +1917,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
         err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
                                     sme->ie, sme->ie_len);
         if (err)
-                brcmf_err("Set Assoc REQ IE Failed\n");
+                bphy_err(drvr, "Set Assoc REQ IE Failed\n");
         else
                 brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
 
@@ -1907,32 +1938,32 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
 
         err = brcmf_set_wpa_version(ndev, sme);
         if (err) {
-                brcmf_err("wl_set_wpa_version failed (%d)\n", err);
+                bphy_err(drvr, "wl_set_wpa_version failed (%d)\n", err);
                 goto done;
         }
 
         sme->auth_type = brcmf_war_auth_type(ifp, sme->auth_type);
         err = brcmf_set_auth_type(ndev, sme);
         if (err) {
-                brcmf_err("wl_set_auth_type failed (%d)\n", err);
+                bphy_err(drvr, "wl_set_auth_type failed (%d)\n", err);
                 goto done;
         }
 
         err = brcmf_set_wsec_mode(ndev, sme);
         if (err) {
-                brcmf_err("wl_set_set_cipher failed (%d)\n", err);
+                bphy_err(drvr, "wl_set_set_cipher failed (%d)\n", err);
                 goto done;
         }
 
         err = brcmf_set_key_mgmt(ndev, sme);
         if (err) {
-                brcmf_err("wl_set_key_mgmt failed (%d)\n", err);
+                bphy_err(drvr, "wl_set_key_mgmt failed (%d)\n", err);
                 goto done;
         }
 
         err = brcmf_set_sharedkey(ndev, sme);
         if (err) {
-                brcmf_err("brcmf_set_sharedkey failed (%d)\n", err);
+                bphy_err(drvr, "brcmf_set_sharedkey failed (%d)\n", err);
                 goto done;
         }
 
@@ -1949,7 +1980,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
                 /* enable firmware supplicant for this interface */
                 err = brcmf_fil_iovar_int_set(ifp, "sup_wpa", 1);
                 if (err < 0) {
-                        brcmf_err("failed to enable fw supplicant\n");
+                        bphy_err(drvr, "failed to enable fw supplicant\n");
                         goto done;
                 }
         }
@@ -2044,7 +2075,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
                                      &join_params, join_params_size);
         if (err)
-                brcmf_err("BRCMF_C_SET_SSID failed (%d)\n", err);
+                bphy_err(drvr, "BRCMF_C_SET_SSID failed (%d)\n", err);
 
 done:
         if (err)
@@ -2057,8 +2088,10 @@ static s32
 brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,
                        u16 reason_code)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_scb_val_le scbval;
         s32 err = 0;
 
@@ -2075,7 +2108,7 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_DISASSOC,
                                      &scbval, sizeof(scbval));
         if (err)
-                brcmf_err("error (%d)\n", err);
+                bphy_err(drvr, "error (%d)\n", err);
 
         brcmf_dbg(TRACE, "Exit\n");
         return err;
@@ -2088,6 +2121,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct net_device *ndev = cfg_to_ndev(cfg);
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
         s32 err;
         s32 disable;
         u32 qdbm = 127;
@@ -2102,7 +2136,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
         case NL80211_TX_POWER_LIMITED:
         case NL80211_TX_POWER_FIXED:
                 if (mbm < 0) {
-                        brcmf_err("TX_POWER_FIXED - dbm is negative\n");
+                        bphy_err(drvr, "TX_POWER_FIXED - dbm is negative\n");
                         err = -EINVAL;
                         goto done;
                 }
@@ -2112,7 +2146,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
                 qdbm |= WL_TXPWR_OVERRIDE;
                 break;
         default:
-                brcmf_err("Unsupported type %d\n", type);
+                bphy_err(drvr, "Unsupported type %d\n", type);
                 err = -EINVAL;
                 goto done;
         }
@@ -2120,11 +2154,11 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
         disable = WL_RADIO_SW_DISABLE << 16;
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_RADIO, disable);
         if (err)
-                brcmf_err("WLC_SET_RADIO error (%d)\n", err);
+                bphy_err(drvr, "WLC_SET_RADIO error (%d)\n", err);
 
         err = brcmf_fil_iovar_int_set(ifp, "qtxpower", qdbm);
         if (err)
-                brcmf_err("qtxpower error (%d)\n", err);
+                bphy_err(drvr, "qtxpower error (%d)\n", err);
 
 done:
         brcmf_dbg(TRACE, "Exit %d (qdbm)\n", qdbm & ~WL_TXPWR_OVERRIDE);
@@ -2135,7 +2169,9 @@ static s32
 brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
                             s32 *dbm)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_cfg80211_vif *vif = wdev_to_vif(wdev);
+        struct brcmf_pub *drvr = cfg->pub;
         s32 qdbm = 0;
         s32 err;
 
@@ -2145,7 +2181,7 @@ brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
 
         err = brcmf_fil_iovar_int_get(vif->ifp, "qtxpower", &qdbm);
         if (err) {
-                brcmf_err("error (%d)\n", err);
+                bphy_err(drvr, "error (%d)\n", err);
                 goto done;
         }
         *dbm = (qdbm & ~WL_TXPWR_OVERRIDE) / 4;
@@ -2160,6 +2196,7 @@ brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev,
                                   u8 key_idx, bool unicast, bool multicast)
 {
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = ifp->drvr;
         u32 index;
         u32 wsec;
         s32 err = 0;
@@ -2171,7 +2208,7 @@ brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev,
 
         err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
         if (err) {
-                brcmf_err("WLC_GET_WSEC error (%d)\n", err);
+                bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
                 goto done;
         }
 
@@ -2181,7 +2218,7 @@ brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev,
                 err = brcmf_fil_cmd_int_set(ifp,
                                             BRCMF_C_SET_KEY_PRIMARY, index);
                 if (err)
-                        brcmf_err("error (%d)\n", err);
+                        bphy_err(drvr, "error (%d)\n", err);
         }
 done:
         brcmf_dbg(TRACE, "Exit\n");
@@ -2230,7 +2267,9 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
                        u8 key_idx, bool pairwise, const u8 *mac_addr,
                        struct key_params *params)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_wsec_key *key;
         s32 val;
         s32 wsec;
@@ -2245,7 +2284,7 @@ brcmf_cfg80211_add_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);
+                bphy_err(drvr, "invalid key index (%d)\n", key_idx);
                 return -EINVAL;
         }
 
@@ -2254,7 +2293,7 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
                                               mac_addr);
 
         if (params->key_len > sizeof(key->data)) {
-                brcmf_err("Too long key length (%u)\n", params->key_len);
+                bphy_err(drvr, "Too long key length (%u)\n", params->key_len);
                 return -EINVAL;
         }
 
@@ -2308,7 +2347,7 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
                 brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_CCMP\n");
                 break;
         default:
-                brcmf_err("Invalid cipher (0x%x)\n", params->cipher);
+                bphy_err(drvr, "Invalid cipher (0x%x)\n", params->cipher);
                 err = -EINVAL;
                 goto done;
         }
@@ -2319,13 +2358,13 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
 
         err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
         if (err) {
-                brcmf_err("get wsec error (%d)\n", err);
+                bphy_err(drvr, "get wsec error (%d)\n", err);
                 goto done;
         }
         wsec |= val;
         err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
         if (err) {
-                brcmf_err("set wsec error (%d)\n", err);
+                bphy_err(drvr, "set wsec error (%d)\n", err);
                 goto done;
         }
 
@@ -2340,9 +2379,11 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx,
                        void (*callback)(void *cookie,
                                         struct key_params *params))
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct key_params params;
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_cfg80211_security *sec;
         s32 wsec;
         s32 err = 0;
@@ -2356,7 +2397,7 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx,
 
         err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
         if (err) {
-                brcmf_err("WLC_GET_WSEC error (%d)\n", err);
+                bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
                 /* Ignore this error, may happen during DISASSOC */
                 err = -EAGAIN;
                 goto done;
@@ -2377,7 +2418,7 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx,
                 params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
                 brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_AES_CMAC\n");
         } else  {
-                brcmf_err("Invalid algo (0x%x)\n", wsec);
+                bphy_err(drvr, "Invalid algo (0x%x)\n", wsec);
                 err = -EINVAL;
                 goto done;
         }
@@ -2407,6 +2448,7 @@ brcmf_cfg80211_config_default_mgmt_key(struct wiphy *wiphy,
 static void
 brcmf_cfg80211_reconfigure_wep(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err;
         u8 key_idx;
         struct brcmf_wsec_key *key;
@@ -2423,18 +2465,18 @@ brcmf_cfg80211_reconfigure_wep(struct brcmf_if *ifp)
 
         err = send_key_to_dongle(ifp, key);
         if (err) {
-                brcmf_err("Setting WEP key failed (%d)\n", err);
+                bphy_err(drvr, "Setting WEP key failed (%d)\n", err);
                 return;
         }
         err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
         if (err) {
-                brcmf_err("get wsec error (%d)\n", err);
+                bphy_err(drvr, "get wsec error (%d)\n", err);
                 return;
         }
         wsec |= WEP_ENABLED;
         err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
         if (err)
-                brcmf_err("set wsec error (%d)\n", err);
+                bphy_err(drvr, "set wsec error (%d)\n", err);
 }
 
 static void brcmf_convert_sta_flags(u32 fw_sta_flags, struct station_info *si)
@@ -2460,6 +2502,7 @@ static void brcmf_convert_sta_flags(u32 fw_sta_flags, struct station_info *si)
 
 static void brcmf_fill_bss_param(struct brcmf_if *ifp, struct station_info *si)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct {
                 __le32 len;
                 struct brcmf_bss_info_le bss_le;
@@ -2475,7 +2518,7 @@ static void brcmf_fill_bss_param(struct brcmf_if *ifp, struct station_info *si)
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO, buf,
                                      WL_BSS_INFO_MAX);
         if (err) {
-                brcmf_err("Failed to get bss info (%d)\n", err);
+                bphy_err(drvr, "Failed to get bss info (%d)\n", err);
                 goto out_kfree;
         }
         si->filled |= BIT_ULL(NL80211_STA_INFO_BSS_PARAM);
@@ -2497,6 +2540,7 @@ static s32
 brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp,
                                 struct station_info *sinfo)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_scb_val_le scbval;
         struct brcmf_pktcnt_le pktcnt;
         s32 err;
@@ -2506,7 +2550,7 @@ brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp,
         /* Get the current tx rate */
         err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_RATE, &rate);
         if (err < 0) {
-                brcmf_err("BRCMF_C_GET_RATE error (%d)\n", err);
+                bphy_err(drvr, "BRCMF_C_GET_RATE error (%d)\n", err);
                 return err;
         }
         sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
@@ -2516,7 +2560,7 @@ brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp,
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI, &scbval,
                                      sizeof(scbval));
         if (err) {
-                brcmf_err("BRCMF_C_GET_RSSI error (%d)\n", err);
+                bphy_err(drvr, "BRCMF_C_GET_RSSI error (%d)\n", err);
                 return err;
         }
         rssi = le32_to_cpu(scbval.val);
@@ -2526,7 +2570,7 @@ brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp,
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_GET_PKTCNTS, &pktcnt,
                                      sizeof(pktcnt));
         if (err) {
-                brcmf_err("BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
+                bphy_err(drvr, "BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
                 return err;
         }
         sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS) |
@@ -2545,7 +2589,9 @@ static s32
 brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
                            const u8 *mac, struct station_info *sinfo)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_scb_val_le scb_val;
         s32 err = 0;
         struct brcmf_sta_info_le sta_info_le;
@@ -2574,7 +2620,7 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
                                                &sta_info_le,
                                                sizeof(sta_info_le));
                 if (err < 0) {
-                        brcmf_err("GET STA INFO failed, %d\n", err);
+                        bphy_err(drvr, "GET STA INFO failed, %d\n", err);
                         goto done;
                 }
         }
@@ -2643,7 +2689,8 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
                         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI,
                                                      &scb_val, sizeof(scb_val));
                         if (err) {
-                                brcmf_err("Could not get rssi (%d)\n", err);
+                                bphy_err(drvr, "Could not get rssi (%d)\n",
+                                         err);
                                 goto done;
                         } else {
                                 rssi = le32_to_cpu(scb_val.val);
@@ -2664,6 +2711,7 @@ brcmf_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *ndev,
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
         s32 err;
 
         brcmf_dbg(TRACE, "Enter, idx %d\n", idx);
@@ -2674,8 +2722,8 @@ brcmf_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *ndev,
                                              &cfg->assoclist,
                                              sizeof(cfg->assoclist));
                 if (err) {
-                        brcmf_err("BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
-                                  err);
+                        bphy_err(drvr, "BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
+                                 err);
                         cfg->assoclist.count = 0;
                         return -EOPNOTSUPP;
                 }
@@ -2695,6 +2743,7 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
         s32 err = 0;
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -2723,9 +2772,9 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm);
         if (err) {
                 if (err == -ENODEV)
-                        brcmf_err("net_device is not ready yet\n");
+                        bphy_err(drvr, "net_device is not ready yet\n");
                 else
-                        brcmf_err("error (%d)\n", err);
+                        bphy_err(drvr, "error (%d)\n", err);
         }
 done:
         brcmf_dbg(TRACE, "Exit\n");
@@ -2736,6 +2785,7 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg,
                                    struct brcmf_bss_info_le *bi)
 {
         struct wiphy *wiphy = cfg_to_wiphy(cfg);
+        struct brcmf_pub *drvr = cfg->pub;
         struct cfg80211_bss *bss;
         enum nl80211_band band;
         struct brcmu_chan ch;
@@ -2748,7 +2798,7 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg,
         struct cfg80211_inform_bss bss_data = {};
 
         if (le32_to_cpu(bi->length) > WL_BSS_INFO_MAX) {
-                brcmf_err("Bss info is larger than buffer. Discarding\n");
+                bphy_err(drvr, "Bss info is larger than buffer. Discarding\n");
                 return 0;
         }
 
@@ -2807,6 +2857,7 @@ next_bss_le(struct brcmf_scan_results *list, struct brcmf_bss_info_le *bss)
 
 static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_scan_results *bss_list;
         struct brcmf_bss_info_le *bi = NULL;    /* must be initialized */
         s32 err = 0;
@@ -2815,8 +2866,8 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)
         bss_list = (struct brcmf_scan_results *)cfg->escan_info.escan_buf;
         if (bss_list->count != 0 &&
             bss_list->version != BRCMF_BSS_INFO_VERSION) {
-                brcmf_err("Version %d != WL_BSS_INFO_VERSION\n",
-                          bss_list->version);
+                bphy_err(drvr, "Version %d != WL_BSS_INFO_VERSION\n",
+                         bss_list->version);
                 return -EOPNOTSUPP;
         }
         brcmf_dbg(SCAN, "scanned AP count (%d)\n", bss_list->count);
@@ -2833,6 +2884,7 @@ static s32 brcmf_inform_ibss(struct brcmf_cfg80211_info *cfg,
                              struct net_device *ndev, const u8 *bssid)
 {
         struct wiphy *wiphy = cfg_to_wiphy(cfg);
+        struct brcmf_pub *drvr = cfg->pub;
         struct ieee80211_channel *notify_channel;
         struct brcmf_bss_info_le *bi = NULL;
         struct ieee80211_supported_band *band;
@@ -2860,7 +2912,7 @@ static s32 brcmf_inform_ibss(struct brcmf_cfg80211_info *cfg,
         err = brcmf_fil_cmd_data_get(netdev_priv(ndev), BRCMF_C_GET_BSS_INFO,
                                      buf, WL_BSS_INFO_MAX);
         if (err) {
-                brcmf_err("WLC_GET_BSS_INFO failed: %d\n", err);
+                bphy_err(drvr, "WLC_GET_BSS_INFO failed: %d\n", err);
                 goto CleanUp;
         }
 
@@ -2914,6 +2966,7 @@ CleanUp:
 static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,
                                  struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_bss_info_le *bi;
         const struct brcmf_tlv *tim;
         u16 beacon_interval;
@@ -2930,7 +2983,7 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO,
                                      cfg->extra_buf, WL_EXTRA_BUF_MAX);
         if (err) {
-                brcmf_err("Could not get bss info %d\n", err);
+                bphy_err(drvr, "Could not get bss info %d\n", err);
                 goto update_bss_info_out;
         }
 
@@ -2955,7 +3008,7 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,
                 u32 var;
                 err = brcmf_fil_iovar_int_get(ifp, "dtim_assoc", &var);
                 if (err) {
-                        brcmf_err("wl dtim_assoc failed (%d)\n", err);
+                        bphy_err(drvr, "wl dtim_assoc failed (%d)\n", err);
                         goto update_bss_info_out;
                 }
                 dtim_period = (u8)var;
@@ -2993,9 +3046,10 @@ static void brcmf_escan_timeout(struct timer_list *t)
 {
         struct brcmf_cfg80211_info *cfg =
                         from_timer(cfg, t, escan_timeout);
+        struct brcmf_pub *drvr = cfg->pub;
 
         if (cfg->int_escan_map || cfg->scan_request) {
-                brcmf_err("timer expired\n");
+                bphy_err(drvr, "timer expired\n");
                 schedule_work(&cfg->escan_timeout_work);
         }
 }
@@ -3043,7 +3097,8 @@ static s32
 brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                              const struct brcmf_event_msg *e, void *data)
 {
-        struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_cfg80211_info *cfg = drvr->config;
         s32 status;
         struct brcmf_escan_result_le *escan_result_le;
         u32 escan_buflen;
@@ -3060,32 +3115,33 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                 goto exit;
 
         if (!test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
-                brcmf_err("scan not ready, bsscfgidx=%d\n", ifp->bsscfgidx);
+                bphy_err(drvr, "scan not ready, bsscfgidx=%d\n",
+                         ifp->bsscfgidx);
                 return -EPERM;
         }
 
         if (status == BRCMF_E_STATUS_PARTIAL) {
                 brcmf_dbg(SCAN, "ESCAN Partial result\n");
                 if (e->datalen < sizeof(*escan_result_le)) {
-                        brcmf_err("invalid event data length\n");
+                        bphy_err(drvr, "invalid event data length\n");
                         goto exit;
                 }
                 escan_result_le = (struct brcmf_escan_result_le *) data;
                 if (!escan_result_le) {
-                        brcmf_err("Invalid escan result (NULL pointer)\n");
+                        bphy_err(drvr, "Invalid escan result (NULL pointer)\n");
                         goto exit;
                 }
                 escan_buflen = le32_to_cpu(escan_result_le->buflen);
                 if (escan_buflen > BRCMF_ESCAN_BUF_SIZE ||
                     escan_buflen > e->datalen ||
                     escan_buflen < sizeof(*escan_result_le)) {
-                        brcmf_err("Invalid escan buffer length: %d\n",
-                                  escan_buflen);
+                        bphy_err(drvr, "Invalid escan buffer length: %d\n",
+                                 escan_buflen);
                         goto exit;
                 }
                 if (le16_to_cpu(escan_result_le->bss_count) != 1) {
-                        brcmf_err("Invalid bss_count %d: ignoring\n",
-                                  escan_result_le->bss_count);
+                        bphy_err(drvr, "Invalid bss_count %d: ignoring\n",
+                                 escan_result_le->bss_count);
                         goto exit;
                 }
                 bss_info_le = &escan_result_le->bss_info_le;
@@ -3100,8 +3156,8 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
 
                 bi_length = le32_to_cpu(bss_info_le->length);
                 if (bi_length != escan_buflen - WL_ESCAN_RESULTS_FIXED_SIZE) {
-                        brcmf_err("Ignoring invalid bss_info length: %d\n",
-                                  bi_length);
+                        bphy_err(drvr, "Ignoring invalid bss_info length: %d\n",
+                                 bi_length);
                         goto exit;
                 }
 
@@ -3109,7 +3165,7 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                                         BIT(NL80211_IFTYPE_ADHOC))) {
                         if (le16_to_cpu(bss_info_le->capability) &
                                                 WLAN_CAPABILITY_IBSS) {
-                                brcmf_err("Ignoring IBSS result\n");
+                                bphy_err(drvr, "Ignoring IBSS result\n");
                                 goto exit;
                         }
                 }
@@ -3117,7 +3173,7 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                 list = (struct brcmf_scan_results *)
                                 cfg->escan_info.escan_buf;
                 if (bi_length > BRCMF_ESCAN_BUF_SIZE - list->buflen) {
-                        brcmf_err("Buffer is too small: ignoring\n");
+                        bphy_err(drvr, "Buffer is too small: ignoring\n");
                         goto exit;
                 }
 
@@ -3276,7 +3332,8 @@ static s32
 brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
                                 const struct brcmf_event_msg *e, void *data)
 {
-        struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_cfg80211_info *cfg = drvr->config;
         struct brcmf_pno_net_info_le *netinfo, *netinfo_start;
         struct cfg80211_scan_request *request = NULL;
         struct wiphy *wiphy = cfg_to_wiphy(cfg);
@@ -3309,14 +3366,14 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
         WARN_ON(status != BRCMF_PNO_SCAN_COMPLETE);
         brcmf_dbg(SCAN, "PFN NET FOUND event. count: %d\n", result_count);
         if (!result_count) {
-                brcmf_err("FALSE PNO Event. (pfn_count == 0)\n");
+                bphy_err(drvr, "FALSE PNO Event. (pfn_count == 0)\n");
                 goto out_err;
         }
 
         netinfo_start = brcmf_get_netinfo_array(pfn_result);
         datalen = e->datalen - ((void *)netinfo_start - (void *)pfn_result);
         if (datalen < result_count * sizeof(*netinfo)) {
-                brcmf_err("insufficient event data\n");
+                bphy_err(drvr, "insufficient event data\n");
                 goto out_err;
         }
 
@@ -3363,15 +3420,16 @@ brcmf_cfg80211_sched_scan_start(struct wiphy *wiphy,
                                 struct net_device *ndev,
                                 struct cfg80211_sched_scan_request *req)
 {
-        struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
 
         brcmf_dbg(SCAN, "Enter: n_match_sets=%d n_ssids=%d\n",
                   req->n_match_sets, req->n_ssids);
 
         if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
-                brcmf_err("Scanning suppressed: status=%lu\n",
-                          cfg->scan_status);
+                bphy_err(drvr, "Scanning suppressed: status=%lu\n",
+                         cfg->scan_status);
                 return -EAGAIN;
         }
 
@@ -3449,7 +3507,8 @@ static s32
 brcmf_wowl_nd_results(struct brcmf_if *ifp, const struct brcmf_event_msg *e,
                       void *data)
 {
-        struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_cfg80211_info *cfg = drvr->config;
         struct brcmf_pno_scanresults_le *pfn_result;
         struct brcmf_pno_net_info_le *netinfo;
 
@@ -3468,12 +3527,14 @@ brcmf_wowl_nd_results(struct brcmf_if *ifp, const struct brcmf_event_msg *e,
         }
 
         if (le32_to_cpu(pfn_result->count) < 1) {
-                brcmf_err("Invalid result count, expected 1 (%d)\n",
-                          le32_to_cpu(pfn_result->count));
+                bphy_err(drvr, "Invalid result count, expected 1 (%d)\n",
+                         le32_to_cpu(pfn_result->count));
                 return -EINVAL;
         }
 
         netinfo = brcmf_get_netinfo_array(pfn_result);
+        if (netinfo->SSID_len > IEEE80211_MAX_SSID_LEN)
+                netinfo->SSID_len = IEEE80211_MAX_SSID_LEN;
         memcpy(cfg->wowl.nd->ssid.ssid, netinfo->SSID, netinfo->SSID_len);
         cfg->wowl.nd->ssid.ssid_len = netinfo->SSID_len;
         cfg->wowl.nd->n_channels = 1;
@@ -3496,6 +3557,7 @@ brcmf_wowl_nd_results(struct brcmf_if *ifp, const struct brcmf_event_msg *e,
 static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_wowl_wakeind_le wake_ind_le;
         struct cfg80211_wowlan_wakeup wakeup_data;
         struct cfg80211_wowlan_wakeup *wakeup;
@@ -3506,7 +3568,7 @@ static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)
         err = brcmf_fil_iovar_data_get(ifp, "wowl_wakeind", &wake_ind_le,
                                        sizeof(wake_ind_le));
         if (err) {
-                brcmf_err("Get wowl_wakeind failed, err = %d\n", err);
+                bphy_err(drvr, "Get wowl_wakeind failed, err = %d\n", err);
                 return;
         }
 
@@ -3547,7 +3609,7 @@ static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)
                                 cfg->wowl.nd_data_completed,
                                 BRCMF_ND_INFO_TIMEOUT);
                         if (!timeout)
-                                brcmf_err("No result for wowl net detect\n");
+                                bphy_err(drvr, "No result for wowl net detect\n");
                         else
                                 wakeup_data.net_detect = cfg->wowl.nd_info;
                 }
@@ -3736,6 +3798,7 @@ brcmf_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *ndev,
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
+        struct brcmf_pub *drvr = cfg->pub;
         s32 err;
         u32 npmk, i;
 
@@ -3755,7 +3818,7 @@ brcmf_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *ndev,
                         cfg->pmk_list.npmk = cpu_to_le32(npmk);
                 }
         } else {
-                brcmf_err("Too many PMKSA entries cached %d\n", npmk);
+                bphy_err(drvr, "Too many PMKSA entries cached %d\n", npmk);
                 return -EINVAL;
         }
 
@@ -3778,6 +3841,7 @@ brcmf_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *ndev,
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
+        struct brcmf_pub *drvr = cfg->pub;
         s32 err;
         u32 npmk, i;
 
@@ -3801,7 +3865,7 @@ brcmf_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *ndev,
                 memset(&pmk[i], 0, sizeof(*pmk));
                 cfg->pmk_list.npmk = cpu_to_le32(npmk - 1);
         } else {
-                brcmf_err("Cache entry not found\n");
+                bphy_err(drvr, "Cache entry not found\n");
                 return -EINVAL;
         }
 
@@ -3833,19 +3897,20 @@ brcmf_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *ndev)
 
 static s32 brcmf_configure_opensecurity(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err;
         s32 wpa_val;
 
         /* set auth */
         err = brcmf_fil_bsscfg_int_set(ifp, "auth", 0);
         if (err < 0) {
-                brcmf_err("auth error %d\n", err);
+                bphy_err(drvr, "auth error %d\n", err);
                 return err;
         }
         /* set wsec */
         err = brcmf_fil_bsscfg_int_set(ifp, "wsec", 0);
         if (err < 0) {
-                brcmf_err("wsec error %d\n", err);
+                bphy_err(drvr, "wsec error %d\n", err);
                 return err;
         }
         /* set upper-layer auth */
@@ -3855,7 +3920,7 @@ static s32 brcmf_configure_opensecurity(struct brcmf_if *ifp)
                 wpa_val = WPA_AUTH_DISABLED;
         err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_val);
         if (err < 0) {
-                brcmf_err("wpa_auth error %d\n", err);
+                bphy_err(drvr, "wpa_auth error %d\n", err);
                 return err;
         }
 
@@ -3875,6 +3940,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
                       const struct brcmf_vs_tlv *wpa_ie,
                       bool is_rsn_ie)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         u32 auth = 0; /* d11 open authentication */
         u16 count;
         s32 err = 0;
@@ -3905,13 +3971,13 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
         /* check for multicast cipher suite */
         if (offset + WPA_IE_MIN_OUI_LEN > len) {
                 err = -EINVAL;
-                brcmf_err("no multicast cipher suite\n");
+                bphy_err(drvr, "no multicast cipher suite\n");
                 goto exit;
         }
 
         if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
                 err = -EINVAL;
-                brcmf_err("ivalid OUI\n");
+                bphy_err(drvr, "ivalid OUI\n");
                 goto exit;
         }
         offset += TLV_OUI_LEN;
@@ -3933,7 +3999,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
                 break;
         default:
                 err = -EINVAL;
-                brcmf_err("Invalid multi cast cipher info\n");
+                bphy_err(drvr, "Invalid multi cast cipher info\n");
                 goto exit;
         }
 
@@ -3944,13 +4010,13 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
         /* Check for unicast suite(s) */
         if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
                 err = -EINVAL;
-                brcmf_err("no unicast cipher suite\n");
+                bphy_err(drvr, "no unicast cipher suite\n");
                 goto exit;
         }
         for (i = 0; i < count; i++) {
                 if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
                         err = -EINVAL;
-                        brcmf_err("ivalid OUI\n");
+                        bphy_err(drvr, "ivalid OUI\n");
                         goto exit;
                 }
                 offset += TLV_OUI_LEN;
@@ -3968,7 +4034,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
                         pval |= AES_ENABLED;
                         break;
                 default:
-                        brcmf_err("Invalid unicast security info\n");
+                        bphy_err(drvr, "Invalid unicast security info\n");
                 }
                 offset++;
         }
@@ -3978,13 +4044,13 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
         /* Check for auth key management suite(s) */
         if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
                 err = -EINVAL;
-                brcmf_err("no auth key mgmt suite\n");
+                bphy_err(drvr, "no auth key mgmt suite\n");
                 goto exit;
         }
         for (i = 0; i < count; i++) {
                 if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
                         err = -EINVAL;
-                        brcmf_err("ivalid OUI\n");
+                        bphy_err(drvr, "ivalid OUI\n");
                         goto exit;
                 }
                 offset += TLV_OUI_LEN;
@@ -4012,7 +4078,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
                         wpa_auth |= WPA2_AUTH_1X_SHA256;
                         break;
                 default:
-                        brcmf_err("Invalid key mgmt info\n");
+                        bphy_err(drvr, "Invalid key mgmt info\n");
                 }
                 offset++;
         }
@@ -4054,7 +4120,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
                 err = brcmf_fil_bsscfg_int_set(ifp, "wme_bss_disable",
                                                wme_bss_disable);
                 if (err < 0) {
-                        brcmf_err("wme_bss_disable error %d\n", err);
+                        bphy_err(drvr, "wme_bss_disable error %d\n", err);
                         goto exit;
                 }
 
@@ -4068,7 +4134,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
                                                         &data[offset],
                                                         WPA_IE_MIN_OUI_LEN);
                         if (err < 0) {
-                                brcmf_err("bip error %d\n", err);
+                                bphy_err(drvr, "bip error %d\n", err);
                                 goto exit;
                         }
                 }
@@ -4079,13 +4145,13 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
         /* set auth */
         err = brcmf_fil_bsscfg_int_set(ifp, "auth", auth);
         if (err < 0) {
-                brcmf_err("auth error %d\n", err);
+                bphy_err(drvr, "auth error %d\n", err);
                 goto exit;
         }
         /* set wsec */
         err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
         if (err < 0) {
-                brcmf_err("wsec error %d\n", err);
+                bphy_err(drvr, "wsec error %d\n", err);
                 goto exit;
         }
         /* Configure MFP, this needs to go after wsec otherwise the wsec command
@@ -4094,14 +4160,14 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,
         if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP)) {
                 err = brcmf_fil_bsscfg_int_set(ifp, "mfp", mfp);
                 if (err < 0) {
-                        brcmf_err("mfp error %d\n", err);
+                        bphy_err(drvr, "mfp error %d\n", err);
                         goto exit;
                 }
         }
         /* set upper-layer auth */
         err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_auth);
         if (err < 0) {
-                brcmf_err("wpa_auth error %d\n", err);
+                bphy_err(drvr, "wpa_auth error %d\n", err);
                 goto exit;
         }
 
@@ -4187,6 +4253,7 @@ brcmf_vndr_ie(u8 *iebuf, s32 pktflag, u8 *ie_ptr, u32 ie_len, s8 *add_del_cmd)
 s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
                           const u8 *vndr_ie_buf, u32 vndr_ie_len)
 {
+        struct brcmf_pub *drvr;
         struct brcmf_if *ifp;
         struct vif_saved_ie *saved_ie;
         s32 err = 0;
@@ -4208,6 +4275,7 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
         if (!vif)
                 return -ENODEV;
         ifp = vif->ifp;
+        drvr = ifp->drvr;
         saved_ie = &vif->saved_ie;
 
         brcmf_dbg(TRACE, "bsscfgidx %d, pktflag : 0x%02X\n", ifp->bsscfgidx,
@@ -4239,13 +4307,13 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
                 break;
         default:
                 err = -EPERM;
-                brcmf_err("not suitable type\n");
+                bphy_err(drvr, "not suitable type\n");
                 goto exit;
         }
 
         if (vndr_ie_len > mgmt_ie_buf_len) {
                 err = -ENOMEM;
-                brcmf_err("extra IE size too big\n");
+                bphy_err(drvr, "extra IE size too big\n");
                 goto exit;
         }
 
@@ -4306,8 +4374,8 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
                         /* verify remained buf size before copy data */
                         if (remained_buf_len < (vndrie_info->vndrie.len +
                                                         VNDR_IE_VSIE_OFFSET)) {
-                                brcmf_err("no space in mgmt_ie_buf: len left %d",
-                                          remained_buf_len);
+                                bphy_err(drvr, "no space in mgmt_ie_buf: len left %d",
+                                         remained_buf_len);
                                 break;
                         }
                         remained_buf_len -= (vndrie_info->ie_len +
@@ -4338,7 +4406,7 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
                 err  = brcmf_fil_bsscfg_data_set(ifp, "vndr_ie", iovar_ie_buf,
                                                  total_ie_buf_len);
                 if (err)
-                        brcmf_err("vndr ie set error : %d\n", err);
+                        bphy_err(drvr, "vndr ie set error : %d\n", err);
         }
 
 exit:
@@ -4366,13 +4434,14 @@ static s32
 brcmf_config_ap_mgmt_ie(struct brcmf_cfg80211_vif *vif,
                         struct cfg80211_beacon_data *beacon)
 {
+        struct brcmf_pub *drvr = vif->ifp->drvr;
         s32 err;
 
         /* Set Beacon IEs to FW */
         err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_BEACON_FLAG,
                                     beacon->tail, beacon->tail_len);
         if (err) {
-                brcmf_err("Set Beacon IE Failed\n");
+                bphy_err(drvr, "Set Beacon IE Failed\n");
                 return err;
         }
         brcmf_dbg(TRACE, "Applied Vndr IEs for Beacon\n");
@@ -4382,7 +4451,7 @@ brcmf_config_ap_mgmt_ie(struct brcmf_cfg80211_vif *vif,
                                     beacon->proberesp_ies,
                                     beacon->proberesp_ies_len);
         if (err)
-                brcmf_err("Set Probe Resp IE Failed\n");
+                bphy_err(drvr, "Set Probe Resp IE Failed\n");
         else
                 brcmf_dbg(TRACE, "Applied Vndr IEs for Probe Resp\n");
 
@@ -4396,6 +4465,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
         s32 ie_offset;
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
         const struct brcmf_tlv *ssid_ie;
         const struct brcmf_tlv *country_ie;
         struct brcmf_ssid_le ssid_le;
@@ -4491,7 +4561,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
                                                     is_11d);
                         if (err < 0) {
-                                brcmf_err("Regulatory Set Error, %d\n", err);
+                                bphy_err(drvr, "Regulatory Set Error, %d\n",
+                                         err);
                                 goto exit;
                         }
                 }
@@ -4499,8 +4570,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD,
                                                     settings->beacon_interval);
                         if (err < 0) {
-                                brcmf_err("Beacon Interval Set Error, %d\n",
-                                          err);
+                                bphy_err(drvr, "Beacon Interval Set Error, %d\n",
+                                         err);
                                 goto exit;
                         }
                 }
@@ -4508,7 +4579,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_DTIMPRD,
                                                     settings->dtim_period);
                         if (err < 0) {
-                                brcmf_err("DTIM Interval Set Error, %d\n", err);
+                                bphy_err(drvr, "DTIM Interval Set Error, %d\n",
+                                         err);
                                 goto exit;
                         }
                 }
@@ -4518,7 +4590,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                      !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB))) {
                         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
                         if (err < 0) {
-                                brcmf_err("BRCMF_C_DOWN error %d\n", err);
+                                bphy_err(drvr, "BRCMF_C_DOWN error %d\n",
+                                         err);
                                 goto exit;
                         }
                         brcmf_fil_iovar_int_set(ifp, "apsta", 0);
@@ -4526,7 +4599,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
 
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 1);
                 if (err < 0) {
-                        brcmf_err("SET INFRA error %d\n", err);
+                        bphy_err(drvr, "SET INFRA error %d\n", err);
                         goto exit;
                 }
         } else if (WARN_ON(supports_11d && (is_11d != ifp->vif->is_11d))) {
@@ -4542,7 +4615,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
 
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 1);
                 if (err < 0) {
-                        brcmf_err("setting AP mode failed %d\n", err);
+                        bphy_err(drvr, "setting AP mode failed %d\n",
+                                 err);
                         goto exit;
                 }
                 if (!mbss) {
@@ -4551,14 +4625,14 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                          */
                         err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
                         if (err < 0) {
-                                brcmf_err("Set Channel failed: chspec=%d, %d\n",
-                                          chanspec, err);
+                                bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
+                                         chanspec, err);
                                 goto exit;
                         }
                 }
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
                 if (err < 0) {
-                        brcmf_err("BRCMF_C_UP error (%d)\n", err);
+                        bphy_err(drvr, "BRCMF_C_UP error (%d)\n", err);
                         goto exit;
                 }
                 /* On DOWN the firmware removes the WEP keys, reconfigure
@@ -4573,14 +4647,14 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                 err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
                                              &join_params, sizeof(join_params));
                 if (err < 0) {
-                        brcmf_err("SET SSID error (%d)\n", err);
+                        bphy_err(drvr, "SET SSID error (%d)\n", err);
                         goto exit;
                 }
 
                 if (settings->hidden_ssid) {
                         err = brcmf_fil_iovar_int_set(ifp, "closednet", 1);
                         if (err) {
-                                brcmf_err("closednet error (%d)\n", err);
+                                bphy_err(drvr, "closednet error (%d)\n", err);
                                 goto exit;
                         }
                 }
@@ -4589,14 +4663,14 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
         } else if (dev_role == NL80211_IFTYPE_P2P_GO) {
                 err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
                 if (err < 0) {
-                        brcmf_err("Set Channel failed: chspec=%d, %d\n",
-                                  chanspec, err);
+                        bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
+                                 chanspec, err);
                         goto exit;
                 }
                 err = brcmf_fil_bsscfg_data_set(ifp, "ssid", &ssid_le,
                                                 sizeof(ssid_le));
                 if (err < 0) {
-                        brcmf_err("setting ssid failed %d\n", err);
+                        bphy_err(drvr, "setting ssid failed %d\n", err);
                         goto exit;
                 }
                 bss_enable.bsscfgidx = cpu_to_le32(ifp->bsscfgidx);
@@ -4604,7 +4678,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                 err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
                                                sizeof(bss_enable));
                 if (err < 0) {
-                        brcmf_err("bss_enable config failed %d\n", err);
+                        bphy_err(drvr, "bss_enable config failed %d\n", err);
                         goto exit;
                 }
 
@@ -4627,7 +4701,9 @@ exit:
 
 static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_pub *drvr = cfg->pub;
         s32 err;
         struct brcmf_fil_bss_enable_le bss_enable;
         struct brcmf_join_params join_params;
@@ -4652,13 +4728,13 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
                 err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
                                              &join_params, sizeof(join_params));
                 if (err < 0)
-                        brcmf_err("SET SSID error (%d)\n", err);
+                        bphy_err(drvr, "SET SSID error (%d)\n", err);
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
                 if (err < 0)
-                        brcmf_err("BRCMF_C_DOWN error %d\n", err);
+                        bphy_err(drvr, "BRCMF_C_DOWN error %d\n", err);
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
                 if (err < 0)
-                        brcmf_err("setting AP mode failed %d\n", err);
+                        bphy_err(drvr, "setting AP mode failed %d\n", err);
                 if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS))
                         brcmf_fil_iovar_int_set(ifp, "mbss", 0);
                 brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
@@ -4666,7 +4742,7 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
                 /* Bring device back up so it can be used again */
                 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
                 if (err < 0)
-                        brcmf_err("BRCMF_C_UP error %d\n", err);
+                        bphy_err(drvr, "BRCMF_C_UP error %d\n", err);
 
                 brcmf_vif_clear_mgmt_ies(ifp->vif);
         } else {
@@ -4675,7 +4751,7 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
                 err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
                                                sizeof(bss_enable));
                 if (err < 0)
-                        brcmf_err("bss_enable config failed %d\n", err);
+                        bphy_err(drvr, "bss_enable config failed %d\n", err);
         }
         brcmf_set_mpc(ifp, 1);
         brcmf_configure_arp_nd_offload(ifp, true);
@@ -4704,6 +4780,7 @@ brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev,
                            struct station_del_parameters *params)
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_scb_val_le scbval;
         struct brcmf_if *ifp = netdev_priv(ndev);
         s32 err;
@@ -4723,7 +4800,8 @@ brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev,
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,
                                      &scbval, sizeof(scbval));
         if (err)
-                brcmf_err("SCB_DEAUTHENTICATE_FOR_REASON failed %d\n", err);
+                bphy_err(drvr, "SCB_DEAUTHENTICATE_FOR_REASON failed %d\n",
+                         err);
 
         brcmf_dbg(TRACE, "Exit\n");
         return err;
@@ -4733,6 +4811,8 @@ static int
 brcmf_cfg80211_change_station(struct wiphy *wiphy, struct net_device *ndev,
                               const u8 *mac, struct station_parameters *params)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_if *ifp = netdev_priv(ndev);
         s32 err;
 
@@ -4753,7 +4833,7 @@ brcmf_cfg80211_change_station(struct wiphy *wiphy, struct net_device *ndev,
                 err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SCB_DEAUTHORIZE,
                                              (void *)mac, ETH_ALEN);
         if (err < 0)
-                brcmf_err("Setting SCB (de-)authorize failed, %d\n", err);
+                bphy_err(drvr, "Setting SCB (de-)authorize failed, %d\n", err);
 
         return err;
 }
@@ -4783,6 +4863,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct ieee80211_channel *chan = params->chan;
+        struct brcmf_pub *drvr = cfg->pub;
         const u8 *buf = params->buf;
         size_t len = params->len;
         const struct ieee80211_mgmt *mgmt;
@@ -4803,7 +4884,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
         mgmt = (const struct ieee80211_mgmt *)buf;
 
         if (!ieee80211_is_mgmt(mgmt->frame_control)) {
-                brcmf_err("Driver only allows MGMT packet type\n");
+                bphy_err(drvr, "Driver only allows MGMT packet type\n");
                 return -EPERM;
         }
 
@@ -4834,13 +4915,13 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                                         GFP_KERNEL);
         } else if (ieee80211_is_action(mgmt->frame_control)) {
                 if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
-                        brcmf_err("invalid action frame length\n");
+                        bphy_err(drvr, "invalid action frame length\n");
                         err = -EINVAL;
                         goto exit;
                 }
                 af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
                 if (af_params == NULL) {
-                        brcmf_err("unable to allocate frame\n");
+                        bphy_err(drvr, "unable to allocate frame\n");
                         err = -ENOMEM;
                         goto exit;
                 }
@@ -4891,6 +4972,7 @@ brcmf_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
                                         u64 cookie)
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         int err = 0;
 
@@ -4898,7 +4980,7 @@ brcmf_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
 
         vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
         if (vif == NULL) {
-                brcmf_err("No p2p device available for probe response\n");
+                bphy_err(drvr, "No p2p device available for probe response\n");
                 err = -ENODEV;
                 goto exit;
         }
@@ -4913,6 +4995,7 @@ static int brcmf_cfg80211_get_channel(struct wiphy *wiphy,
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct net_device *ndev = wdev->netdev;
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_if *ifp;
         struct brcmu_chan ch;
         enum nl80211_band band = 0;
@@ -4926,7 +5009,7 @@ static int brcmf_cfg80211_get_channel(struct wiphy *wiphy,
 
         err = brcmf_fil_iovar_int_get(ifp, "chanspec", &chanspec);
         if (err) {
-                brcmf_err("chanspec failed (%d)\n", err);
+                bphy_err(drvr, "chanspec failed (%d)\n", err);
                 return err;
         }
 
@@ -5048,6 +5131,8 @@ static int brcmf_cfg80211_tdls_oper(struct wiphy *wiphy,
                                     struct net_device *ndev, const u8 *peer,
                                     enum nl80211_tdls_operation oper)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_if *ifp;
         struct brcmf_tdls_iovar_le info;
         int ret = 0;
@@ -5065,7 +5150,7 @@ static int brcmf_cfg80211_tdls_oper(struct wiphy *wiphy,
         ret = brcmf_fil_iovar_data_set(ifp, "tdls_endpoint",
                                        &info, sizeof(info));
         if (ret < 0)
-                brcmf_err("tdls_endpoint iovar failed: ret=%d\n", ret);
+                bphy_err(drvr, "tdls_endpoint iovar failed: ret=%d\n", ret);
 
         return ret;
 }
@@ -5076,6 +5161,8 @@ brcmf_cfg80211_update_conn_params(struct wiphy *wiphy,
                                   struct cfg80211_connect_params *sme,
                                   u32 changed)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_if *ifp;
         int err;
 
@@ -5086,7 +5173,7 @@ brcmf_cfg80211_update_conn_params(struct wiphy *wiphy,
         err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
                                     sme->ie, sme->ie_len);
         if (err)
-                brcmf_err("Set Assoc REQ IE Failed\n");
+                bphy_err(drvr, "Set Assoc REQ IE Failed\n");
         else
                 brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
 
@@ -5098,6 +5185,8 @@ static int
 brcmf_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *ndev,
                               struct cfg80211_gtk_rekey_data *gtk)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_gtk_keyinfo_le gtk_le;
         int ret;
@@ -5112,7 +5201,7 @@ brcmf_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *ndev,
         ret = brcmf_fil_iovar_data_set(ifp, "gtk_key_info", &gtk_le,
                                        sizeof(gtk_le));
         if (ret < 0)
-                brcmf_err("gtk_key_info iovar failed: ret=%d\n", ret);
+                bphy_err(drvr, "gtk_key_info iovar failed: ret=%d\n", ret);
 
         return ret;
 }
@@ -5344,6 +5433,7 @@ static void brcmf_clear_assoc_ies(struct brcmf_cfg80211_info *cfg)
 static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
                                struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_cfg80211_assoc_ielen_le *assoc_info;
         struct brcmf_cfg80211_connect_info *conn_info = cfg_to_conn(cfg);
         u32 req_len;
@@ -5355,7 +5445,7 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
         err = brcmf_fil_iovar_data_get(ifp, "assoc_info",
                                        cfg->extra_buf, WL_ASSOC_INFO_MAX);
         if (err) {
-                brcmf_err("could not get assoc info (%d)\n", err);
+                bphy_err(drvr, "could not get assoc info (%d)\n", err);
                 return err;
         }
         assoc_info =
@@ -5367,7 +5457,7 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
                                                cfg->extra_buf,
                                                WL_ASSOC_INFO_MAX);
                 if (err) {
-                        brcmf_err("could not get assoc req (%d)\n", err);
+                        bphy_err(drvr, "could not get assoc req (%d)\n", err);
                         return err;
                 }
                 conn_info->req_ie_len = req_len;
@@ -5383,7 +5473,7 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
                                                cfg->extra_buf,
                                                WL_ASSOC_INFO_MAX);
                 if (err) {
-                        brcmf_err("could not get assoc resp (%d)\n", err);
+                        bphy_err(drvr, "could not get assoc resp (%d)\n", err);
                         return err;
                 }
                 conn_info->resp_ie_len = resp_len;
@@ -5510,6 +5600,7 @@ brcmf_notify_connect_status_ap(struct brcmf_cfg80211_info *cfg,
                                struct net_device *ndev,
                                const struct brcmf_event_msg *e, void *data)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         static int generation;
         u32 event = e->event_code;
         u32 reason = e->reason;
@@ -5527,7 +5618,7 @@ brcmf_notify_connect_status_ap(struct brcmf_cfg80211_info *cfg,
         if (((event == BRCMF_E_ASSOC_IND) || (event == BRCMF_E_REASSOC_IND)) &&
             (reason == BRCMF_E_STATUS_SUCCESS)) {
                 if (!data) {
-                        brcmf_err("No IEs present in ASSOC/REASSOC_IND");
+                        bphy_err(drvr, "No IEs present in ASSOC/REASSOC_IND\n");
                         return -EINVAL;
                 }
 
@@ -5819,6 +5910,7 @@ static void init_vif_event(struct brcmf_cfg80211_vif_event *event)
 
 static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err;
         u32 bcn_timeout;
         __le32 roamtrigger[2];
@@ -5831,7 +5923,7 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
                 bcn_timeout = BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_ON;
         err = brcmf_fil_iovar_int_set(ifp, "bcn_timeout", bcn_timeout);
         if (err) {
-                brcmf_err("bcn_timeout error (%d)\n", err);
+                bphy_err(drvr, "bcn_timeout error (%d)\n", err);
                 goto roam_setup_done;
         }
 
@@ -5843,7 +5935,7 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
         err = brcmf_fil_iovar_int_set(ifp, "roam_off",
                                       ifp->drvr->settings->roamoff);
         if (err) {
-                brcmf_err("roam_off error (%d)\n", err);
+                bphy_err(drvr, "roam_off error (%d)\n", err);
                 goto roam_setup_done;
         }
 
@@ -5852,7 +5944,7 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER,
                                      (void *)roamtrigger, sizeof(roamtrigger));
         if (err) {
-                brcmf_err("WLC_SET_ROAM_TRIGGER error (%d)\n", err);
+                bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
                 goto roam_setup_done;
         }
 
@@ -5861,7 +5953,7 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA,
                                      (void *)roam_delta, sizeof(roam_delta));
         if (err) {
-                brcmf_err("WLC_SET_ROAM_DELTA error (%d)\n", err);
+                bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err);
                 goto roam_setup_done;
         }
 
@@ -5872,25 +5964,26 @@ roam_setup_done:
 static s32
 brcmf_dongle_scantime(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 err = 0;
 
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
                                     BRCMF_SCAN_CHANNEL_TIME);
         if (err) {
-                brcmf_err("Scan assoc time error (%d)\n", err);
+                bphy_err(drvr, "Scan assoc time error (%d)\n", err);
                 goto dongle_scantime_out;
         }
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
                                     BRCMF_SCAN_UNASSOC_TIME);
         if (err) {
-                brcmf_err("Scan unassoc time error (%d)\n", err);
+                bphy_err(drvr, "Scan unassoc time error (%d)\n", err);
                 goto dongle_scantime_out;
         }
 
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_PASSIVE_TIME,
                                     BRCMF_SCAN_PASSIVE_TIME);
         if (err) {
-                brcmf_err("Scan passive time error (%d)\n", err);
+                bphy_err(drvr, "Scan passive time error (%d)\n", err);
                 goto dongle_scantime_out;
         }
 
@@ -5922,10 +6015,11 @@ static void brcmf_update_bw40_channel_flag(struct ieee80211_channel *channel,
 static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
                                     u32 bw_cap[])
 {
-        struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
+        struct wiphy *wiphy = cfg_to_wiphy(cfg);
+        struct brcmf_pub *drvr = cfg->pub;
+        struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
         struct ieee80211_supported_band *band;
         struct ieee80211_channel *channel;
-        struct wiphy *wiphy;
         struct brcmf_chanspec_list *list;
         struct brcmu_chan ch;
         int err;
@@ -5944,11 +6038,10 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
         err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
                                        BRCMF_DCMD_MEDLEN);
         if (err) {
-                brcmf_err("get chanspecs error (%d)\n", err);
+                bphy_err(drvr, "get chanspecs error (%d)\n", err);
                 goto fail_pbuf;
         }
 
-        wiphy = cfg_to_wiphy(cfg);
         band = wiphy->bands[NL80211_BAND_2GHZ];
         if (band)
                 for (i = 0; i < band->n_channels; i++)
@@ -5968,7 +6061,8 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
                 } else if (ch.band == BRCMU_CHAN_BAND_5G) {
                         band = wiphy->bands[NL80211_BAND_5GHZ];
                 } else {
-                        brcmf_err("Invalid channel Spec. 0x%x.\n", ch.chspec);
+                        bphy_err(drvr, "Invalid channel Spec. 0x%x.\n",
+                                 ch.chspec);
                         continue;
                 }
                 if (!band)
@@ -5991,8 +6085,8 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
                         /* It seems firmware supports some channel we never
                          * considered. Something new in IEEE standard?
                          */
-                        brcmf_err("Ignoring unexpected firmware channel %d\n",
-                                  ch.control_ch_num);
+                        bphy_err(drvr, "Ignoring unexpected firmware channel %d\n",
+                                 ch.control_ch_num);
                         continue;
                 }
 
@@ -6002,11 +6096,21 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
                 /* assuming the chanspecs order is HT20,
                  * HT40 upper, HT40 lower, and VHT80.
                  */
-                if (ch.bw == BRCMU_CHAN_BW_80) {
+                switch (ch.bw) {
+                case BRCMU_CHAN_BW_160:
+                        channel->flags &= ~IEEE80211_CHAN_NO_160MHZ;
+                        break;
+                case BRCMU_CHAN_BW_80:
                         channel->flags &= ~IEEE80211_CHAN_NO_80MHZ;
-                } else if (ch.bw == BRCMU_CHAN_BW_40) {
+                        break;
+                case BRCMU_CHAN_BW_40:
                         brcmf_update_bw40_channel_flag(channel, &ch);
-                } else {
+                        break;
+                default:
+                        wiphy_warn(wiphy, "Firmware reported unsupported bandwidth %d\n",
+                                   ch.bw);
+                        /* fall through */
+                case BRCMU_CHAN_BW_20:
                         /* enable the channel and disable other bandwidths
                          * for now as mentioned order assure they are enabled
                          * for subsequent chanspecs.
@@ -6038,7 +6142,8 @@ fail_pbuf:
 
 static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)
 {
-        struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
+        struct brcmf_pub *drvr = cfg->pub;
+        struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
         struct ieee80211_supported_band *band;
         struct brcmf_fil_bwcap_le band_bwcap;
         struct brcmf_chanspec_list *list;
@@ -6084,7 +6189,7 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)
                 err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
                                                BRCMF_DCMD_MEDLEN);
                 if (err) {
-                        brcmf_err("get chanspecs error (%d)\n", err);
+                        bphy_err(drvr, "get chanspecs error (%d)\n", err);
                         kfree(pbuf);
                         return err;
                 }
@@ -6115,6 +6220,7 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)
 
 static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         u32 band, mimo_bwcap;
         int err;
 
@@ -6150,7 +6256,7 @@ static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])
                 bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT;
                 break;
         default:
-                brcmf_err("invalid mimo_bw_cap value\n");
+                bphy_err(drvr, "invalid mimo_bw_cap value\n");
         }
 }
 
@@ -6225,8 +6331,9 @@ static void brcmf_update_vht_cap(struct ieee80211_supported_band *band,
 
 static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
 {
-        struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
-        struct wiphy *wiphy;
+        struct brcmf_pub *drvr = cfg->pub;
+        struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
+        struct wiphy *wiphy = cfg_to_wiphy(cfg);
         u32 nmode = 0;
         u32 vhtmode = 0;
         u32 bw_cap[2] = { WLC_BW_20MHZ_BIT, WLC_BW_20MHZ_BIT };
@@ -6242,7 +6349,7 @@ static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
         (void)brcmf_fil_iovar_int_get(ifp, "vhtmode", &vhtmode);
         err = brcmf_fil_iovar_int_get(ifp, "nmode", &nmode);
         if (err) {
-                brcmf_err("nmode error (%d)\n", err);
+                bphy_err(drvr, "nmode error (%d)\n", err);
         } else {
                 brcmf_get_bwcap(ifp, bw_cap);
         }
@@ -6252,7 +6359,7 @@ static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
 
         err = brcmf_fil_iovar_int_get(ifp, "rxchain", &rxchain);
         if (err) {
-                brcmf_err("rxchain error (%d)\n", err);
+                bphy_err(drvr, "rxchain error (%d)\n", err);
                 nchain = 1;
         } else {
                 for (nchain = 0; rxchain; nchain++)
@@ -6262,7 +6369,7 @@ static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
 
         err = brcmf_construct_chaninfo(cfg, bw_cap);
         if (err) {
-                brcmf_err("brcmf_construct_chaninfo failed (%d)\n", err);
+                bphy_err(drvr, "brcmf_construct_chaninfo failed (%d)\n", err);
                 return err;
         }
 
@@ -6274,7 +6381,6 @@ static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
                                               &txbf_bfr_cap);
         }
 
-        wiphy = cfg_to_wiphy(cfg);
         for (i = 0; i < ARRAY_SIZE(wiphy->bands); i++) {
                 band = wiphy->bands[i];
                 if (band == NULL)
@@ -6470,12 +6576,13 @@ static void brcmf_wiphy_wowl_params(struct wiphy *wiphy, struct brcmf_if *ifp)
 {
 #ifdef CONFIG_PM
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_pub *drvr = cfg->pub;
         struct wiphy_wowlan_support *wowl;
 
         wowl = kmemdup(&brcmf_wowlan_support, sizeof(brcmf_wowlan_support),
                        GFP_KERNEL);
         if (!wowl) {
-                brcmf_err("only support basic wowlan features\n");
+                bphy_err(drvr, "only support basic wowlan features\n");
                 wiphy->wowlan = &brcmf_wowlan_support;
                 return;
         }
@@ -6572,7 +6679,7 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BANDLIST, &bandlist,
                                      sizeof(bandlist));
         if (err) {
-                brcmf_err("could not obtain band info: err=%d\n", err);
+                bphy_err(drvr, "could not obtain band info: err=%d\n", err);
                 return err;
         }
         /* first entry in bandlist is number of bands */
@@ -6621,6 +6728,7 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
 
 static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         struct net_device *ndev;
         struct wireless_dev *wdev;
         struct brcmf_if *ifp;
@@ -6658,7 +6766,7 @@ static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
 
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_FAKEFRAG, 1);
         if (err) {
-                brcmf_err("failed to set frameburst mode\n");
+                bphy_err(drvr, "failed to set frameburst mode\n");
                 goto default_conf_out;
         }
 
@@ -6839,6 +6947,7 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_fil_country_le ccreq;
         s32 err;
         int i;
@@ -6850,8 +6959,8 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
         /* ignore non-ISO3166 country codes */
         for (i = 0; i < 2; i++)
                 if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {
-                        brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n",
-                                  req->alpha2[0], req->alpha2[1]);
+                        bphy_err(drvr, "not an ISO3166 code (0x%02x 0x%02x)\n",
+                                 req->alpha2[0], req->alpha2[1]);
                         return;
                 }
 
@@ -6860,7 +6969,7 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
 
         err = brcmf_fil_iovar_data_get(ifp, "country", &ccreq, sizeof(ccreq));
         if (err) {
-                brcmf_err("Country code iovar returned err = %d\n", err);
+                bphy_err(drvr, "Country code iovar returned err = %d\n", err);
                 return;
         }
 
@@ -6870,7 +6979,7 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
 
         err = brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq));
         if (err) {
-                brcmf_err("Firmware rejected country setting\n");
+                bphy_err(drvr, "Firmware rejected country setting\n");
                 return;
         }
         brcmf_setup_wiphybands(cfg);
@@ -6916,13 +7025,13 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
         u16 *cap = NULL;
 
         if (!ndev) {
-                brcmf_err("ndev is invalid\n");
+                bphy_err(drvr, "ndev is invalid\n");
                 return NULL;
         }
 
         cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
         if (!cfg) {
-                brcmf_err("Could not allocate wiphy device\n");
+                bphy_err(drvr, "Could not allocate wiphy device\n");
                 return NULL;
         }
 
@@ -6943,7 +7052,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
 
         err = wl_init_priv(cfg);
         if (err) {
-                brcmf_err("Failed to init iwm_priv (%d)\n", err);
+                bphy_err(drvr, "Failed to init iwm_priv (%d)\n", err);
                 brcmf_free_vif(vif);
                 goto wiphy_out;
         }
@@ -6952,7 +7061,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
         /* determine d11 io type before wiphy setup */
         err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_VERSION, &io_type);
         if (err) {
-                brcmf_err("Failed to get D11 version (%d)\n", err);
+                bphy_err(drvr, "Failed to get D11 version (%d)\n", err);
                 goto priv_out;
         }
         cfg->d11inf.io_type = (u8)io_type;
@@ -6986,13 +7095,13 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
 #endif
         err = wiphy_register(wiphy);
         if (err < 0) {
-                brcmf_err("Could not register wiphy device (%d)\n", err);
+                bphy_err(drvr, "Could not register wiphy device (%d)\n", err);
                 goto priv_out;
         }
 
         err = brcmf_setup_wiphybands(cfg);
         if (err) {
-                brcmf_err("Setting wiphy bands failed (%d)\n", err);
+                bphy_err(drvr, "Setting wiphy bands failed (%d)\n", err);
                 goto wiphy_unreg_out;
         }
 
@@ -7010,24 +7119,24 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
 
         err = brcmf_fweh_activate_events(ifp);
         if (err) {
-                brcmf_err("FWEH activation failed (%d)\n", err);
+                bphy_err(drvr, "FWEH activation failed (%d)\n", err);
                 goto wiphy_unreg_out;
         }
 
         err = brcmf_p2p_attach(cfg, p2pdev_forced);
         if (err) {
-                brcmf_err("P2P initialisation failed (%d)\n", err);
+                bphy_err(drvr, "P2P initialisation failed (%d)\n", err);
                 goto wiphy_unreg_out;
         }
         err = brcmf_btcoex_attach(cfg);
         if (err) {
-                brcmf_err("BT-coex initialisation failed (%d)\n", err);
+                bphy_err(drvr, "BT-coex initialisation failed (%d)\n", err);
                 brcmf_p2p_detach(&cfg->p2p);
                 goto wiphy_unreg_out;
         }
         err = brcmf_pno_attach(cfg);
         if (err) {
-                brcmf_err("PNO initialisation failed (%d)\n", err);
+                bphy_err(drvr, "PNO initialisation failed (%d)\n", err);
                 brcmf_btcoex_detach(cfg);
                 brcmf_p2p_detach(&cfg->p2p);
                 goto wiphy_unreg_out;
@@ -7047,7 +7156,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
         /* (re-) activate FWEH event handling */
         err = brcmf_fweh_activate_events(ifp);
         if (err) {
-                brcmf_err("FWEH activation failed (%d)\n", err);
+                bphy_err(drvr, "FWEH activation failed (%d)\n", err);
                 goto detach;
         }
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 0ce1d8174e6d..96b8d5b3aeed 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -90,6 +90,7 @@ struct brcmf_mp_global_t brcmf_mp_global;
 
 void brcmf_c_set_joinpref_default(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_join_pref_params join_pref_params[2];
         int err;
 
@@ -106,7 +107,7 @@ void brcmf_c_set_joinpref_default(struct brcmf_if *ifp)
         err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,
                                        sizeof(join_pref_params));
         if (err)
-                brcmf_err("Set join_pref error (%d)\n", err);
+                bphy_err(drvr, "Set join_pref error (%d)\n", err);
 }
 
 static int brcmf_c_download(struct brcmf_if *ifp, u16 flag,
@@ -129,7 +130,8 @@ static int brcmf_c_download(struct brcmf_if *ifp, u16 flag,
 
 static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
 {
-        struct brcmf_bus *bus = ifp->drvr->bus_if;
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_bus *bus = drvr->bus_if;
         struct brcmf_dload_data_le *chunk_buf;
         const struct firmware *clm = NULL;
         u8 clm_name[BRCMF_FW_NAME_LEN];
@@ -145,7 +147,7 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
         memset(clm_name, 0, sizeof(clm_name));
         err = brcmf_bus_get_fwname(bus, ".clm_blob", clm_name);
         if (err) {
-                brcmf_err("get CLM blob file name failed (%d)\n", err);
+                bphy_err(drvr, "get CLM blob file name failed (%d)\n", err);
                 return err;
         }
 
@@ -182,12 +184,12 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
         } while ((datalen > 0) && (err == 0));
 
         if (err) {
-                brcmf_err("clmload (%zu byte file) failed (%d); ",
-                          clm->size, err);
+                bphy_err(drvr, "clmload (%zu byte file) failed (%d)\n",
+                         clm->size, err);
                 /* Retrieve clmload_status and print */
                 err = brcmf_fil_iovar_int_get(ifp, "clmload_status", &status);
                 if (err)
-                        brcmf_err("get clmload_status failed (%d)\n", err);
+                        bphy_err(drvr, "get clmload_status failed (%d)\n", err);
                 else
                         brcmf_dbg(INFO, "clmload_status=%d\n", status);
                 err = -EIO;
@@ -201,6 +203,7 @@ done:
 
 int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         s8 eventmask[BRCMF_EVENTING_MASK_LEN];
         u8 buf[BRCMF_DCMD_SMLEN];
         struct brcmf_bus *bus;
@@ -214,7 +217,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,
                                        sizeof(ifp->mac_addr));
         if (err < 0) {
-                brcmf_err("Retrieving cur_etheraddr failed, %d\n", err);
+                bphy_err(drvr, "Retrieving cur_etheraddr failed, %d\n", err);
                 goto done;
         }
         memcpy(ifp->drvr->wiphy->perm_addr, ifp->drvr->mac, ETH_ALEN);
@@ -226,7 +229,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_REVINFO,
                                      &revinfo, sizeof(revinfo));
         if (err < 0) {
-                brcmf_err("retrieving revision info failed, %d\n", err);
+                bphy_err(drvr, "retrieving revision info failed, %d\n", err);
                 strlcpy(ri->chipname, "UNKNOWN", sizeof(ri->chipname));
         } else {
                 ri->vendorid = le32_to_cpu(revinfo.vendorid);
@@ -260,7 +263,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         /* Do any CLM downloading */
         err = brcmf_c_process_clm_blob(ifp);
         if (err < 0) {
-                brcmf_err("download CLM blob file failed, %d\n", err);
+                bphy_err(drvr, "download CLM blob file failed, %d\n", err);
                 goto done;
         }
 
@@ -269,8 +272,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         strcpy(buf, "ver");
         err = brcmf_fil_iovar_data_get(ifp, "ver", buf, sizeof(buf));
         if (err < 0) {
-                brcmf_err("Retrieving version information failed, %d\n",
-                          err);
+                bphy_err(drvr, "Retrieving version information failed, %d\n",
+                         err);
                 goto done;
         }
         ptr = (char *)buf;
@@ -304,7 +307,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         /* set mpc */
         err = brcmf_fil_iovar_int_set(ifp, "mpc", 1);
         if (err) {
-                brcmf_err("failed setting mpc\n");
+                bphy_err(drvr, "failed setting mpc\n");
                 goto done;
         }
 
@@ -314,14 +317,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,
                                        BRCMF_EVENTING_MASK_LEN);
         if (err) {
-                brcmf_err("Get event_msgs error (%d)\n", err);
+                bphy_err(drvr, "Get event_msgs error (%d)\n", err);
                 goto done;
         }
         setbit(eventmask, BRCMF_E_IF);
         err = brcmf_fil_iovar_data_set(ifp, "event_msgs", eventmask,
                                        BRCMF_EVENTING_MASK_LEN);
         if (err) {
-                brcmf_err("Set event_msgs error (%d)\n", err);
+                bphy_err(drvr, "Set event_msgs error (%d)\n", err);
                 goto done;
         }
 
@@ -329,8 +332,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
                                     BRCMF_DEFAULT_SCAN_CHANNEL_TIME);
         if (err) {
-                brcmf_err("BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",
-                          err);
+                bphy_err(drvr, "BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",
+                         err);
                 goto done;
         }
 
@@ -338,8 +341,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
                                     BRCMF_DEFAULT_SCAN_UNASSOC_TIME);
         if (err) {
-                brcmf_err("BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",
-                          err);
+                bphy_err(drvr, "BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",
+                         err);
                 goto done;
         }
 
@@ -350,7 +353,7 @@ done:
 }
 
 #ifndef CONFIG_BRCM_TRACING
-void __brcmf_err(const char *func, const char *fmt, ...)
+void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...)
 {
         struct va_format vaf;
         va_list args;
@@ -359,7 +362,10 @@ void __brcmf_err(const char *func, const char *fmt, ...)
 
         vaf.fmt = fmt;
         vaf.va = &args;
-        pr_err("%s: %pV", func, &vaf);
+        if (bus)
+                dev_err(bus->dev, "%s: %pV", func, &vaf);
+        else
+                pr_err("%s: %pV", func, &vaf);
 
         va_end(args);
 }
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 860a4372cb56..4fbe8791f674 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -43,6 +43,36 @@
 
 #define BRCMF_BSSIDX_INVALID                    -1
 
+#define RXS_PBPRES                              BIT(2)
+
+#define D11_PHY_HDR_LEN                         6
+
+struct d11rxhdr_le {
+        __le16 RxFrameSize;
+        u16 PAD;
+        __le16 PhyRxStatus_0;
+        __le16 PhyRxStatus_1;
+        __le16 PhyRxStatus_2;
+        __le16 PhyRxStatus_3;
+        __le16 PhyRxStatus_4;
+        __le16 PhyRxStatus_5;
+        __le16 RxStatus1;
+        __le16 RxStatus2;
+        __le16 RxTSFTime;
+        __le16 RxChan;
+        u8 unknown[12];
+} __packed;
+
+struct wlc_d11rxhdr {
+        struct d11rxhdr_le rxhdr;
+        __le32 tsf_l;
+        s8 rssi;
+        s8 rxpwr0;
+        s8 rxpwr1;
+        s8 do_rssi_ma;
+        s8 rxpwr[4];
+} __packed;
+
 char *brcmf_ifname(struct brcmf_if *ifp)
 {
         if (!ifp)
@@ -60,7 +90,7 @@ struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx)
         s32 bsscfgidx;
 
         if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {
-                brcmf_err("ifidx %d out of range\n", ifidx);
+                bphy_err(drvr, "ifidx %d out of range\n", ifidx);
                 return NULL;
         }
 
@@ -111,7 +141,9 @@ void brcmf_configure_arp_nd_offload(struct brcmf_if *ifp, bool enable)
 
 static void _brcmf_set_multicast_list(struct work_struct *work)
 {
-        struct brcmf_if *ifp;
+        struct brcmf_if *ifp = container_of(work, struct brcmf_if,
+                                            multicast_work);
+        struct brcmf_pub *drvr = ifp->drvr;
         struct net_device *ndev;
         struct netdev_hw_addr *ha;
         u32 cmd_value, cnt;
@@ -120,8 +152,6 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
         u32 buflen;
         s32 err;
 
-        ifp = container_of(work, struct brcmf_if, multicast_work);
-
         brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 
         ndev = ifp->ndev;
@@ -151,7 +181,7 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
 
         err = brcmf_fil_iovar_data_set(ifp, "mcast_list", buf, buflen);
         if (err < 0) {
-                brcmf_err("Setting mcast_list failed, %d\n", err);
+                bphy_err(drvr, "Setting mcast_list failed, %d\n", err);
                 cmd_value = cnt ? true : cmd_value;
         }
 
@@ -164,25 +194,25 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
          */
         err = brcmf_fil_iovar_int_set(ifp, "allmulti", cmd_value);
         if (err < 0)
-                brcmf_err("Setting allmulti failed, %d\n", err);
+                bphy_err(drvr, "Setting allmulti failed, %d\n", err);
 
         /*Finally, pick up the PROMISC flag */
         cmd_value = (ndev->flags & IFF_PROMISC) ? true : false;
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PROMISC, cmd_value);
         if (err < 0)
-                brcmf_err("Setting BRCMF_C_SET_PROMISC failed, %d\n",
-                          err);
+                bphy_err(drvr, "Setting BRCMF_C_SET_PROMISC failed, %d\n",
+                         err);
         brcmf_configure_arp_nd_offload(ifp, !cmd_value);
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
 static void _brcmf_update_ndtable(struct work_struct *work)
 {
-        struct brcmf_if *ifp;
+        struct brcmf_if *ifp = container_of(work, struct brcmf_if,
+                                            ndoffload_work);
+        struct brcmf_pub *drvr = ifp->drvr;
         int i, ret;
 
-        ifp = container_of(work, struct brcmf_if, ndoffload_work);
-
         /* clear the table in firmware */
         ret = brcmf_fil_iovar_data_set(ifp, "nd_hostip_clear", NULL, 0);
         if (ret) {
@@ -195,7 +225,7 @@ static void _brcmf_update_ndtable(struct work_struct *work)
                                                &ifp->ipv6_addr_tbl[i],
                                                sizeof(struct in6_addr));
                 if (ret)
-                        brcmf_err("add nd ip err %d\n", ret);
+                        bphy_err(drvr, "add nd ip err %d\n", ret);
         }
 }
 #else
@@ -208,6 +238,7 @@ static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr)
 {
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct sockaddr *sa = (struct sockaddr *)addr;
+        struct brcmf_pub *drvr = ifp->drvr;
         int err;
 
         brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
@@ -215,7 +246,7 @@ static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr)
         err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", sa->sa_data,
                                        ETH_ALEN);
         if (err < 0) {
-                brcmf_err("Setting cur_etheraddr failed, %d\n", err);
+                bphy_err(drvr, "Setting cur_etheraddr failed, %d\n", err);
         } else {
                 brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);
                 memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
@@ -275,7 +306,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
 
         /* Can the device send data? */
         if (drvr->bus_if->state != BRCMF_BUS_UP) {
-                brcmf_err("xmit rejected state=%d\n", drvr->bus_if->state);
+                bphy_err(drvr, "xmit rejected state=%d\n", drvr->bus_if->state);
                 netif_stop_queue(ndev);
                 dev_kfree_skb(skb);
                 ret = -ENODEV;
@@ -309,8 +340,8 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
                 ret = pskb_expand_head(skb, ALIGN(head_delta, NET_SKB_PAD), 0,
                                        GFP_ATOMIC);
                 if (ret < 0) {
-                        brcmf_err("%s: failed to expand headroom\n",
-                                  brcmf_ifname(ifp));
+                        bphy_err(drvr, "%s: failed to expand headroom\n",
+                                 brcmf_ifname(ifp));
                         atomic_inc(&drvr->bus_if->stats.pktcow_failed);
                         goto done;
                 }
@@ -409,6 +440,31 @@ void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb)
 {
         if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MONITOR_FMT_RADIOTAP)) {
                 /* Do nothing */
+        } else if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR)) {
+                struct wlc_d11rxhdr *wlc_rxhdr = (struct wlc_d11rxhdr *)skb->data;
+                struct ieee80211_radiotap_header *radiotap;
+                unsigned int offset;
+                u16 RxStatus1;
+
+                RxStatus1 = le16_to_cpu(wlc_rxhdr->rxhdr.RxStatus1);
+
+                offset = sizeof(struct wlc_d11rxhdr);
+                /* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU
+                 * subframes
+                 */
+                if (RxStatus1 & RXS_PBPRES)
+                        offset += 2;
+                offset += D11_PHY_HDR_LEN;
+
+                skb_pull(skb, offset);
+
+                /* TODO: use RX header to fill some radiotap data */
+                radiotap = skb_push(skb, sizeof(*radiotap));
+                memset(radiotap, 0, sizeof(*radiotap));
+                radiotap->it_len = cpu_to_le16(sizeof(*radiotap));
+
+                /* TODO: 4 bytes with receive status? */
+                skb->len -= 4;
         } else {
                 struct ieee80211_radiotap_header *radiotap;
 
@@ -464,7 +520,8 @@ void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event)
         } else {
                 /* Process special event packets */
                 if (handle_event)
-                        brcmf_fweh_process_skb(ifp->drvr, skb);
+                        brcmf_fweh_process_skb(ifp->drvr, skb,
+                                               BCMILCP_SUBTYPE_VENDOR_LONG);
 
                 brcmf_netif_rx(ifp, skb);
         }
@@ -481,7 +538,7 @@ void brcmf_rx_event(struct device *dev, struct sk_buff *skb)
         if (brcmf_rx_hdrpull(drvr, skb, &ifp))
                 return;
 
-        brcmf_fweh_process_skb(ifp->drvr, skb);
+        brcmf_fweh_process_skb(ifp->drvr, skb, 0);
         brcmu_pkt_buf_free_skb(skb);
 }
 
@@ -551,7 +608,7 @@ static int brcmf_netdev_open(struct net_device *ndev)
 
         /* If bus is not ready, can't continue */
         if (bus_if->state != BRCMF_BUS_UP) {
-                brcmf_err("failed bus is not ready\n");
+                bphy_err(drvr, "failed bus is not ready\n");
                 return -EAGAIN;
         }
 
@@ -565,7 +622,7 @@ static int brcmf_netdev_open(struct net_device *ndev)
                 ndev->features &= ~NETIF_F_IP_CSUM;
 
         if (brcmf_cfg80211_up(ndev)) {
-                brcmf_err("failed to bring up cfg80211\n");
+                bphy_err(drvr, "failed to bring up cfg80211\n");
                 return -EIO;
         }
 
@@ -610,7 +667,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
         else
                 err = register_netdev(ndev);
         if (err != 0) {
-                brcmf_err("couldn't register the net device\n");
+                bphy_err(drvr, "couldn't register the net device\n");
                 goto fail;
         }
 
@@ -687,6 +744,7 @@ static const struct net_device_ops brcmf_netdev_ops_p2p = {
 
 static int brcmf_net_p2p_attach(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct net_device *ndev;
 
         brcmf_dbg(TRACE, "Enter, bsscfgidx=%d mac=%pM\n", ifp->bsscfgidx,
@@ -699,7 +757,7 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp)
         memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
 
         if (register_netdev(ndev) != 0) {
-                brcmf_err("couldn't register the p2p net device\n");
+                bphy_err(drvr, "couldn't register the p2p net device\n");
                 goto fail;
         }
 
@@ -728,8 +786,8 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
          */
         if (ifp) {
                 if (ifidx) {
-                        brcmf_err("ERROR: netdev:%s already exists\n",
-                                  ifp->ndev->name);
+                        bphy_err(drvr, "ERROR: netdev:%s already exists\n",
+                                 ifp->ndev->name);
                         netif_stop_queue(ifp->ndev);
                         brcmf_net_detach(ifp->ndev, false);
                         drvr->iflist[bsscfgidx] = NULL;
@@ -787,7 +845,7 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,
         ifp = drvr->iflist[bsscfgidx];
         drvr->iflist[bsscfgidx] = NULL;
         if (!ifp) {
-                brcmf_err("Null interface, bsscfgidx=%d\n", bsscfgidx);
+                bphy_err(drvr, "Null interface, bsscfgidx=%d\n", bsscfgidx);
                 return;
         }
         brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx,
@@ -837,16 +895,17 @@ static int brcmf_psm_watchdog_notify(struct brcmf_if *ifp,
                                      const struct brcmf_event_msg *evtmsg,
                                      void *data)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         int err;
 
         brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
 
-        brcmf_err("PSM's watchdog has fired!\n");
+        bphy_err(drvr, "PSM's watchdog has fired!\n");
 
         err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
                                          evtmsg->datalen);
         if (err)
-                brcmf_err("Failed to get memory dump, %d\n", err);
+                bphy_err(drvr, "Failed to get memory dump, %d\n", err);
 
         return err;
 }
@@ -890,7 +949,7 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb,
         ret = brcmf_fil_iovar_data_get(ifp, "arp_hostip", addr_table,
                                        sizeof(addr_table));
         if (ret) {
-                brcmf_err("fail to get arp ip table err:%d\n", ret);
+                bphy_err(drvr, "fail to get arp ip table err:%d\n", ret);
                 return NOTIFY_OK;
         }
 
@@ -907,7 +966,7 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb,
                         ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip",
                                 &ifa->ifa_address, sizeof(ifa->ifa_address));
                         if (ret)
-                                brcmf_err("add arp ip err %d\n", ret);
+                                bphy_err(drvr, "add arp ip err %d\n", ret);
                 }
                 break;
         case NETDEV_DOWN:
@@ -919,8 +978,8 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb,
                         ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip_clear",
                                                        NULL, 0);
                         if (ret) {
-                                brcmf_err("fail to clear arp ip table err:%d\n",
-                                          ret);
+                                bphy_err(drvr, "fail to clear arp ip table err:%d\n",
+                                         ret);
                                 return NOTIFY_OK;
                         }
                         for (i = 0; i < ARPOL_MAX_ENTRIES; i++) {
@@ -930,8 +989,8 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb,
                                                                &addr_table[i],
                                                                sizeof(addr_table[i]));
                                 if (ret)
-                                        brcmf_err("add arp ip err %d\n",
-                                                  ret);
+                                        bphy_err(drvr, "add arp ip err %d\n",
+                                                 ret);
                         }
                 }
                 break;
@@ -1100,11 +1159,12 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops)
         brcmf_debugfs_add_entry(drvr, "revinfo", brcmf_revinfo_read);
         brcmf_feat_debugfs_create(drvr);
         brcmf_proto_debugfs_create(drvr);
+        brcmf_bus_debugfs_create(bus_if);
 
         return 0;
 
 fail:
-        brcmf_err("failed: %d\n", ret);
+        bphy_err(drvr, "failed: %d\n", ret);
         if (drvr->config) {
                 brcmf_cfg80211_detach(drvr->config);
                 drvr->config = NULL;
@@ -1156,7 +1216,7 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
         /* Attach and link in the protocol */
         ret = brcmf_proto_attach(drvr);
         if (ret != 0) {
-                brcmf_err("brcmf_prot_attach failed\n");
+                bphy_err(drvr, "brcmf_prot_attach failed\n");
                 goto fail;
         }
 
@@ -1169,7 +1229,7 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
 
         ret = brcmf_bus_started(drvr, ops);
         if (ret != 0) {
-                brcmf_err("dongle is not responding: err=%d\n", ret);
+                bphy_err(drvr, "dongle is not responding: err=%d\n", ret);
                 goto fail;
         }
 
@@ -1269,6 +1329,7 @@ static int brcmf_get_pend_8021x_cnt(struct brcmf_if *ifp)
 
 int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         int err;
 
         err = wait_event_timeout(ifp->pend_8021x_wait,
@@ -1276,7 +1337,7 @@ int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)
                                  MAX_WAIT_FOR_8021X_TX);
 
         if (!err)
-                brcmf_err("Timed out waiting for no pending 802.1x packets\n");
+                bphy_err(drvr, "Timed out waiting for no pending 802.1x packets\n");
 
         return !err;
 }
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
index dcf6e27cc16f..d8085ce579f4 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
@@ -36,7 +36,7 @@
 #define BRCMF_DCMD_MEDLEN       1536
 #define BRCMF_DCMD_MAXLEN       8192
 
-/* IOCTL from host to device are limited in lenght. A device can only handle
+/* IOCTL from host to device are limited in length. A device can only handle
  * ethernet frame size. This limitation is to be applied by protocol layer.
  */
 #define BRCMF_TX_IOCTL_MAX_MSG_SIZE     (ETH_FRAME_LEN+ETH_FCS_LEN)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
index cfed0626bf5a..2998726b62c3 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
@@ -45,17 +45,30 @@
 #undef pr_fmt
 #define pr_fmt(fmt)             KBUILD_MODNAME ": " fmt
 
-__printf(2, 3)
-void __brcmf_err(const char *func, const char *fmt, ...);
+struct brcmf_bus;
+
+__printf(3, 4)
+void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...);
 /* Macro for error messages. When debugging / tracing the driver all error
  * messages are important to us.
  */
+#ifndef brcmf_err
 #define brcmf_err(fmt, ...)                                             \
         do {                                                            \
                 if (IS_ENABLED(CONFIG_BRCMDBG) ||                       \
                     IS_ENABLED(CONFIG_BRCM_TRACING) ||                  \
                     net_ratelimit())                                    \
-                        __brcmf_err(__func__, fmt, ##__VA_ARGS__);      \
+                        __brcmf_err(NULL, __func__, fmt, ##__VA_ARGS__);\
+        } while (0)
+#endif
+
+#define bphy_err(drvr, fmt, ...)                                        \
+        do {                                                            \
+                if (IS_ENABLED(CONFIG_BRCMDBG) ||                       \
+                    IS_ENABLED(CONFIG_BRCM_TRACING) ||                  \
+                    net_ratelimit())                                    \
+                        wiphy_err((drvr)->wiphy, "%s: " fmt, __func__,  \
+                                  ##__VA_ARGS__);                       \
         } while (0)
 
 #if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
index 4c5a3995dc35..acca719b3907 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
@@ -103,6 +103,10 @@ static const struct brcmf_feat_fwfeat brcmf_feat_fwfeat_map[] = {
         { "01-6cb8e269", BIT(BRCMF_FEAT_MONITOR) },
         /* brcmfmac4366b-pcie.bin from linux-firmware.git commit 52442afee990 */
         { "01-c47a91a4", BIT(BRCMF_FEAT_MONITOR) },
+        /* brcmfmac4366b-pcie.bin from linux-firmware.git commit 211de1679a68 */
+        { "01-801fb449", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) },
+        /* brcmfmac4366c-pcie.bin from linux-firmware.git commit 211de1679a68 */
+        { "01-d2cbb8fd", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) },
 };
 
 static void brcmf_feat_firmware_overrides(struct brcmf_pub *drv)
@@ -181,13 +185,14 @@ static void brcmf_feat_iovar_data_set(struct brcmf_if *ifp,
 #define MAX_CAPS_BUFFER_SIZE    768
 static void brcmf_feat_firmware_capabilities(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         char caps[MAX_CAPS_BUFFER_SIZE];
         enum brcmf_feat_id id;
         int i, err;
 
         err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
         if (err) {
-                brcmf_err("could not get firmware cap (%d)\n", err);
+                bphy_err(drvr, "could not get firmware cap (%d)\n", err);
                 return;
         }
 
@@ -212,14 +217,15 @@ static void brcmf_feat_firmware_capabilities(struct brcmf_if *ifp)
 static int brcmf_feat_fwcap_debugfs_read(struct seq_file *seq, void *data)
 {
         struct brcmf_bus *bus_if = dev_get_drvdata(seq->private);
-        struct brcmf_if *ifp = brcmf_get_ifp(bus_if->drvr, 0);
+        struct brcmf_pub *drvr = bus_if->drvr;
+        struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
         char caps[MAX_CAPS_BUFFER_SIZE + 1] = { };
         char *tmp;
         int err;
 
         err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
         if (err) {
-                brcmf_err("could not get firmware cap (%d)\n", err);
+                bphy_err(drvr, "could not get firmware cap (%d)\n", err);
                 return err;
         }
 
@@ -268,9 +274,15 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
                                         BIT(BRCMF_FEAT_WOWL_GTK);
                 }
         }
-        /* MBSS does not work for 43362 */
-        if (drvr->bus_if->chip == BRCM_CC_43362_CHIP_ID)
+        /* MBSS does not work for all chips */
+        switch (drvr->bus_if->chip) {
+        case BRCM_CC_4330_CHIP_ID:
+        case BRCM_CC_43362_CHIP_ID:
                 ifp->drvr->feat_flags &= ~BIT(BRCMF_FEAT_MBSS);
+                break;
+        default:
+                break;
+        }
         brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_RSDB, "rsdb_mode");
         brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_TDLS, "tdls_enable");
         brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MFP, "mfp");
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
index 0b4974df353a..5e88a7f16ad2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
@@ -35,6 +35,7 @@
  * FWSUP: Firmware supplicant.
  * MONITOR: firmware can pass monitor packets to host.
  * MONITOR_FMT_RADIOTAP: firmware provides monitor packets with radiotap header
+ * MONITOR_FMT_HW_RX_HDR: firmware provides monitor packets with hw/ucode header
  */
 #define BRCMF_FEAT_LIST \
         BRCMF_FEAT_DEF(MBSS) \
@@ -52,7 +53,8 @@
         BRCMF_FEAT_DEF(GSCAN) \
         BRCMF_FEAT_DEF(FWSUP) \
         BRCMF_FEAT_DEF(MONITOR) \
-        BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP)
+        BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) \
+        BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR)
 
 /*
  * Quirks:
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index 14b948917a1a..8209a42dea72 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -47,7 +47,7 @@ enum nvram_parser_state {
  * @state: current parser state.
  * @data: input buffer being parsed.
  * @nvram: output buffer with parse result.
- * @nvram_len: lenght of parse result.
+ * @nvram_len: length of parse result.
  * @line: current line.
  * @column: current column in line.
  * @pos: byte offset in input buffer.
@@ -719,8 +719,10 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,
                         break;
         }
 
+        brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
+
         if (i == table_size) {
-                brcmf_err("Unknown chipid %d [%d]\n", chip, chiprev);
+                brcmf_err("Unknown chip %s\n", chipname);
                 return NULL;
         }
 
@@ -729,8 +731,6 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,
         if (!fwreq)
                 return NULL;
 
-        brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
-
         brcmf_info("using %s for chip %s\n",
                    mapping_table[i].fw_base, chipname);
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
index e7eaa57d11d9..63e98fd583ab 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
@@ -102,7 +102,8 @@ static void brcmf_fweh_queue_event(struct brcmf_fweh_info *fweh,
         schedule_work(&fweh->event_work);
 }
 
-static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,
+static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,
+                                         struct brcmf_if *ifp,
                                          enum brcmf_fweh_event_code code,
                                          struct brcmf_event_msg *emsg,
                                          void *data)
@@ -117,9 +118,9 @@ static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,
                 if (fweh->evt_handler[code])
                         err = fweh->evt_handler[code](ifp, emsg, data);
                 else
-                        brcmf_err("unhandled event %d ignored\n", code);
+                        bphy_err(drvr, "unhandled event %d ignored\n", code);
         } else {
-                brcmf_err("no interface object\n");
+                bphy_err(drvr, "no interface object\n");
         }
         return err;
 }
@@ -158,7 +159,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
                 return;
         }
         if (ifevent->ifidx >= BRCMF_MAX_IFS) {
-                brcmf_err("invalid interface index: %u\n", ifevent->ifidx);
+                bphy_err(drvr, "invalid interface index: %u\n", ifevent->ifidx);
                 return;
         }
 
@@ -181,7 +182,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
         if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)
                 brcmf_proto_reset_if(drvr, ifp);
 
-        err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
+        err = brcmf_fweh_call_event_handler(drvr, ifp, emsg->event_code, emsg,
+                                            data);
 
         if (ifp && ifevent->action == BRCMF_E_IF_DEL) {
                 bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
@@ -268,11 +270,11 @@ static void brcmf_fweh_event_worker(struct work_struct *work)
                         ifp = drvr->iflist[0];
                 else
                         ifp = drvr->iflist[emsg.bsscfgidx];
-                err = brcmf_fweh_call_event_handler(ifp, event->code, &emsg,
-                                                    event->data);
+                err = brcmf_fweh_call_event_handler(drvr, ifp, event->code,
+                                                    &emsg, event->data);
                 if (err) {
-                        brcmf_err("event handler failed (%d)\n",
-                                  event->code);
+                        bphy_err(drvr, "event handler failed (%d)\n",
+                                 event->code);
                         err = 0;
                 }
 event_free:
@@ -339,7 +341,7 @@ int brcmf_fweh_register(struct brcmf_pub *drvr, enum brcmf_fweh_event_code code,
                         brcmf_fweh_handler_t handler)
 {
         if (drvr->fweh.evt_handler[code]) {
-                brcmf_err("event code %d already registered\n", code);
+                bphy_err(drvr, "event code %d already registered\n", code);
                 return -ENOSPC;
         }
         drvr->fweh.evt_handler[code] = handler;
@@ -369,6 +371,7 @@ void brcmf_fweh_unregister(struct brcmf_pub *drvr,
  */
 int brcmf_fweh_activate_events(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         int i, err;
         s8 eventmask[BRCMF_EVENTING_MASK_LEN];
 
@@ -388,7 +391,7 @@ int brcmf_fweh_activate_events(struct brcmf_if *ifp)
         err = brcmf_fil_iovar_data_set(ifp, "event_msgs",
                                        eventmask, BRCMF_EVENTING_MASK_LEN);
         if (err)
-                brcmf_err("Set event_msgs error (%d)\n", err);
+                bphy_err(drvr, "Set event_msgs error (%d)\n", err);
 
         return err;
 }
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
index 816f80ea925b..7027243db17e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
@@ -211,7 +211,7 @@ enum brcmf_fweh_event_code {
  */
 #define BRCM_OUI                                "\x00\x10\x18"
 #define BCMILCP_BCM_SUBTYPE_EVENT               1
-
+#define BCMILCP_SUBTYPE_VENDOR_LONG             32769
 
 /**
  * struct brcm_ethhdr - broadcom specific ether header.
@@ -266,7 +266,7 @@ struct brcmf_event {
  * @status: status information.
  * @reason: reason code.
  * @auth_type: authentication type.
- * @datalen: lenght of event data buffer.
+ * @datalen: length of event data buffer.
  * @addr: ether address.
  * @ifname: interface name.
  * @ifidx: interface index.
@@ -334,10 +334,10 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,
 void brcmf_fweh_p2pdev_setup(struct brcmf_if *ifp, bool ongoing);
 
 static inline void brcmf_fweh_process_skb(struct brcmf_pub *drvr,
-                                          struct sk_buff *skb)
+                                          struct sk_buff *skb, u16 stype)
 {
         struct brcmf_event *event_packet;
-        u16 usr_stype;
+        u16 subtype, usr_stype;
 
         /* only process events when protocol matches */
         if (skb->protocol != cpu_to_be16(ETH_P_LINK_CTL))
@@ -346,8 +346,16 @@ static inline void brcmf_fweh_process_skb(struct brcmf_pub *drvr,
         if ((skb->len + ETH_HLEN) < sizeof(*event_packet))
                 return;
 
-        /* check for BRCM oui match */
         event_packet = (struct brcmf_event *)skb_mac_header(skb);
+
+        /* check subtype if needed */
+        if (unlikely(stype)) {
+                subtype = get_unaligned_be16(&event_packet->hdr.subtype);
+                if (subtype != stype)
+                        return;
+        }
+
+        /* check for BRCM oui match */
         if (memcmp(BRCM_OUI, &event_packet->hdr.oui[0],
                    sizeof(event_packet->hdr.oui)))
                 return;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
index 802d7cb73b80..8ea27489734e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
@@ -110,7 +110,7 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp, u32 cmd, void *data, u32 len, bool set)
         s32 err, fwerr;
 
         if (drvr->bus_if->state != BRCMF_BUS_UP) {
-                brcmf_err("bus is down. we have nothing to do.\n");
+                bphy_err(drvr, "bus is down. we have nothing to do.\n");
                 return -EIO;
         }
 
@@ -242,7 +242,7 @@ brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, const void *data,
                                          buflen, true);
         } else {
                 err = -EPERM;
-                brcmf_err("Creating iovar failed\n");
+                bphy_err(drvr, "Creating iovar failed\n");
         }
 
         mutex_unlock(&drvr->proto_block);
@@ -268,7 +268,7 @@ brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,
                         memcpy(data, drvr->proto_buf, len);
         } else {
                 err = -EPERM;
-                brcmf_err("Creating iovar failed\n");
+                bphy_err(drvr, "Creating iovar failed\n");
         }
 
         brcmf_dbg(FIL, "ifidx=%d, name=%s, len=%d\n", ifp->ifidx, name, len);
@@ -366,7 +366,7 @@ brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name,
                                          buflen, true);
         } else {
                 err = -EPERM;
-                brcmf_err("Creating bsscfg failed\n");
+                bphy_err(drvr, "Creating bsscfg failed\n");
         }
 
         mutex_unlock(&drvr->proto_block);
@@ -392,7 +392,7 @@ brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name,
                         memcpy(data, drvr->proto_buf, len);
         } else {
                 err = -EPERM;
-                brcmf_err("Creating bsscfg failed\n");
+                bphy_err(drvr, "Creating bsscfg failed\n");
         }
         brcmf_dbg(FIL, "ifidx=%d, bsscfgidx=%d, name=%s, len=%d\n", ifp->ifidx,
                   ifp->bsscfgidx, name, len);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
index 02759ebd207c..abeb305492e0 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
@@ -1255,6 +1255,7 @@ static int brcmf_fws_enq(struct brcmf_fws_info *fws,
                          enum brcmf_fws_skb_state state, int fifo,
                          struct sk_buff *p)
 {
+        struct brcmf_pub *drvr = fws->drvr;
         int prec = 2 * fifo;
         u32 *qfull_stat = &fws->stats.delayq_full_error;
         struct brcmf_fws_mac_descriptor *entry;
@@ -1267,7 +1268,7 @@ static int brcmf_fws_enq(struct brcmf_fws_info *fws,
 
         entry = brcmf_skbcb(p)->mac;
         if (entry == NULL) {
-                brcmf_err("no mac descriptor found for skb %p\n", p);
+                bphy_err(drvr, "no mac descriptor found for skb %p\n", p);
                 return -ENOENT;
         }
 
@@ -1457,6 +1458,7 @@ static int
 brcmf_fws_txs_process(struct brcmf_fws_info *fws, u8 flags, u32 hslot,
                       u32 genbit, u16 seq, u8 compcnt)
 {
+        struct brcmf_pub *drvr = fws->drvr;
         u32 fifo;
         u8 cnt = 0;
         int ret;
@@ -1481,14 +1483,14 @@ brcmf_fws_txs_process(struct brcmf_fws_info *fws, u8 flags, u32 hslot,
         else if (flags == BRCMF_FWS_TXSTATUS_HOST_TOSSED)
                 fws->stats.txs_host_tossed += compcnt;
         else
-                brcmf_err("unexpected txstatus\n");
+                bphy_err(drvr, "unexpected txstatus\n");
 
         while (cnt < compcnt) {
                 ret = brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
                                               remove_from_hanger);
                 if (ret != 0) {
-                        brcmf_err("no packet in hanger slot: hslot=%d\n",
-                                  hslot);
+                        bphy_err(drvr, "no packet in hanger slot: hslot=%d\n",
+                                 hslot);
                         goto cont;
                 }
 
@@ -1612,12 +1614,13 @@ static int brcmf_fws_notify_credit_map(struct brcmf_if *ifp,
                                        const struct brcmf_event_msg *e,
                                        void *data)
 {
-        struct brcmf_fws_info *fws = drvr_to_fws(ifp->drvr);
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_fws_info *fws = drvr_to_fws(drvr);
         int i;
         u8 *credits = data;
 
         if (e->datalen < BRCMF_FWS_FIFO_COUNT) {
-                brcmf_err("event payload too small (%d)\n", e->datalen);
+                bphy_err(drvr, "event payload too small (%d)\n", e->datalen);
                 return -EINVAL;
         }
 
@@ -1681,6 +1684,7 @@ static void brcmf_rxreorder_get_skb_list(struct brcmf_ampdu_rx_reorder *rfi,
 
 void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         u8 *reorder_data;
         u8 flow_id, max_idx, cur_idx, exp_idx, end_idx;
         struct brcmf_ampdu_rx_reorder *rfi;
@@ -1695,7 +1699,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt)
 
         /* validate flags and flow id */
         if (flags == 0xFF) {
-                brcmf_err("invalid flags...so ignore this packet\n");
+                bphy_err(drvr, "invalid flags...so ignore this packet\n");
                 brcmf_netif_rx(ifp, pkt);
                 return;
         }
@@ -1732,7 +1736,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt)
                           flow_id, max_idx);
                 rfi = kzalloc(buf_size, GFP_ATOMIC);
                 if (rfi == NULL) {
-                        brcmf_err("failed to alloc buffer\n");
+                        bphy_err(drvr, "failed to alloc buffer\n");
                         brcmf_netif_rx(ifp, pkt);
                         return;
                 }
@@ -1996,6 +2000,7 @@ static u8 brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo,
 static void brcmf_fws_rollback_toq(struct brcmf_fws_info *fws,
                                    struct sk_buff *skb, int fifo)
 {
+        struct brcmf_pub *drvr = fws->drvr;
         struct brcmf_fws_mac_descriptor *entry;
         struct sk_buff *pktout;
         int qidx, hslot;
@@ -2009,11 +2014,11 @@ static void brcmf_fws_rollback_toq(struct brcmf_fws_info *fws,
 
                 pktout = brcmu_pktq_penq_head(&entry->psq, qidx, skb);
                 if (pktout == NULL) {
-                        brcmf_err("%s queue %d full\n", entry->name, qidx);
+                        bphy_err(drvr, "%s queue %d full\n", entry->name, qidx);
                         rc = -ENOSPC;
                 }
         } else {
-                brcmf_err("%s entry removed\n", entry->name);
+                bphy_err(drvr, "%s entry removed\n", entry->name);
                 rc = -ENOENT;
         }
 
@@ -2118,7 +2123,8 @@ static int brcmf_fws_assign_htod(struct brcmf_fws_info *fws, struct sk_buff *p,
 
 int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
 {
-        struct brcmf_fws_info *fws = drvr_to_fws(ifp->drvr);
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_fws_info *fws = drvr_to_fws(drvr);
         struct brcmf_skbuff_cb *skcb = brcmf_skbcb(skb);
         struct ethhdr *eh = (struct ethhdr *)(skb->data);
         int fifo = BRCMF_FWS_FIFO_BCMC;
@@ -2146,7 +2152,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
                 brcmf_fws_enq(fws, BRCMF_FWS_SKBSTATE_DELAYED, fifo, skb);
                 brcmf_fws_schedule_deq(fws);
         } else {
-                brcmf_err("drop skb: no hanger slot\n");
+                bphy_err(drvr, "drop skb: no hanger slot\n");
                 brcmf_txfinalize(ifp, skb, false);
                 rc = -ENOMEM;
         }
@@ -2365,7 +2371,7 @@ struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr)
 
         fws->fws_wq = create_singlethread_workqueue("brcmf_fws_wq");
         if (fws->fws_wq == NULL) {
-                brcmf_err("workqueue creation failed\n");
+                bphy_err(drvr, "workqueue creation failed\n");
                 rc = -EBADF;
                 goto fail;
         }
@@ -2381,13 +2387,13 @@ struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr)
         rc = brcmf_fweh_register(drvr, BRCMF_E_FIFO_CREDIT_MAP,
                                  brcmf_fws_notify_credit_map);
         if (rc < 0) {
-                brcmf_err("register credit map handler failed\n");
+                bphy_err(drvr, "register credit map handler failed\n");
                 goto fail;
         }
         rc = brcmf_fweh_register(drvr, BRCMF_E_BCMC_CREDIT_SUPPORT,
                                  brcmf_fws_notify_bcmc_credit_support);
         if (rc < 0) {
-                brcmf_err("register bcmc credit handler failed\n");
+                bphy_err(drvr, "register bcmc credit handler failed\n");
                 brcmf_fweh_unregister(drvr, BRCMF_E_FIFO_CREDIT_MAP);
                 goto fail;
         }
@@ -2399,7 +2405,7 @@ struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr)
         fws->fw_signals = true;
         ifp = brcmf_get_ifp(drvr, 0);
         if (brcmf_fil_iovar_int_set(ifp, "tlv", tlv)) {
-                brcmf_err("failed to set bdcv2 tlv signaling\n");
+                bphy_err(drvr, "failed to set bdcv2 tlv signaling\n");
                 fws->fcmode = BRCMF_FWS_FCMODE_NONE;
                 fws->fw_signals = false;
         }
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
index 4e8397a0cbc8..aef2d4092872 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@ -134,6 +134,14 @@ struct msgbuf_completion_hdr {
         __le16                          flow_ring_id;
 };
 
+/* Data struct for the MSGBUF_TYPE_RING_STATUS */
+struct msgbuf_ring_status {
+        struct msgbuf_common_hdr        msg;
+        struct msgbuf_completion_hdr    compl_hdr;
+        __le16                          write_idx;
+        __le32                          rsvd0[5];
+};
+
 struct msgbuf_rx_event {
         struct msgbuf_common_hdr        msg;
         struct msgbuf_completion_hdr    compl_hdr;
@@ -431,7 +439,7 @@ static int brcmf_msgbuf_tx_ioctl(struct brcmf_pub *drvr, int ifidx,
         brcmf_commonring_lock(commonring);
         ret_ptr = brcmf_commonring_reserve_for_write(commonring);
         if (!ret_ptr) {
-                brcmf_err("Failed to reserve space in commonring\n");
+                bphy_err(drvr, "Failed to reserve space in commonring\n");
                 brcmf_commonring_unlock(commonring);
                 return -ENOMEM;
         }
@@ -495,7 +503,7 @@ static int brcmf_msgbuf_query_dcmd(struct brcmf_pub *drvr, int ifidx,
 
         timeout = brcmf_msgbuf_ioctl_resp_wait(msgbuf);
         if (!timeout) {
-                brcmf_err("Timeout on response for query command\n");
+                bphy_err(drvr, "Timeout on response for query command\n");
                 return -EIO;
         }
 
@@ -572,6 +580,7 @@ static u32
 brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
                                     struct brcmf_msgbuf_work_item *work)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct msgbuf_tx_flowring_create_req *create;
         struct brcmf_commonring *commonring;
         void *ret_ptr;
@@ -587,7 +596,7 @@ brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
                                      &msgbuf->flowring_dma_handle[flowid],
                                      GFP_KERNEL);
         if (!dma_buf) {
-                brcmf_err("dma_alloc_coherent failed\n");
+                bphy_err(drvr, "dma_alloc_coherent failed\n");
                 brcmf_flowring_delete(msgbuf->flow, flowid);
                 return BRCMF_FLOWRING_INVALID_ID;
         }
@@ -600,7 +609,7 @@ brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
         brcmf_commonring_lock(commonring);
         ret_ptr = brcmf_commonring_reserve_for_write(commonring);
         if (!ret_ptr) {
-                brcmf_err("Failed to reserve space in commonring\n");
+                bphy_err(drvr, "Failed to reserve space in commonring\n");
                 brcmf_commonring_unlock(commonring);
                 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
                 return BRCMF_FLOWRING_INVALID_ID;
@@ -627,7 +636,7 @@ brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
         err = brcmf_commonring_write_complete(commonring);
         brcmf_commonring_unlock(commonring);
         if (err) {
-                brcmf_err("Failed to write commonring\n");
+                bphy_err(drvr, "Failed to write commonring\n");
                 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
                 return BRCMF_FLOWRING_INVALID_ID;
         }
@@ -686,6 +695,7 @@ static u32 brcmf_msgbuf_flowring_create(struct brcmf_msgbuf *msgbuf, int ifidx,
 static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
 {
         struct brcmf_flowring *flow = msgbuf->flow;
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct brcmf_commonring *commonring;
         void *ret_ptr;
         u32 count;
@@ -705,8 +715,8 @@ static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
         while (brcmf_flowring_qlen(flow, flowid)) {
                 skb = brcmf_flowring_dequeue(flow, flowid);
                 if (skb == NULL) {
-                        brcmf_err("No SKB, but qlen %d\n",
-                                  brcmf_flowring_qlen(flow, flowid));
+                        bphy_err(drvr, "No SKB, but qlen %d\n",
+                                 brcmf_flowring_qlen(flow, flowid));
                         break;
                 }
                 skb_orphan(skb);
@@ -714,7 +724,7 @@ static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
                                              msgbuf->tx_pktids, skb, ETH_HLEN,
                                              &physaddr, &pktid)) {
                         brcmf_flowring_reinsert(flow, flowid, skb);
-                        brcmf_err("No PKTID available !!\n");
+                        bphy_err(drvr, "No PKTID available !!\n");
                         break;
                 }
                 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
@@ -885,6 +895,7 @@ brcmf_msgbuf_process_txstatus(struct brcmf_msgbuf *msgbuf, void *buf)
 
 static u32 brcmf_msgbuf_rxbuf_data_post(struct brcmf_msgbuf *msgbuf, u32 count)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct brcmf_commonring *commonring;
         void *ret_ptr;
         struct sk_buff *skb;
@@ -912,7 +923,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(struct brcmf_msgbuf *msgbuf, u32 count)
                 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
 
                 if (skb == NULL) {
-                        brcmf_err("Failed to alloc SKB\n");
+                        bphy_err(drvr, "Failed to alloc SKB\n");
                         brcmf_commonring_write_cancel(commonring, alloced - i);
                         break;
                 }
@@ -922,7 +933,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(struct brcmf_msgbuf *msgbuf, u32 count)
                                              msgbuf->rx_pktids, skb, 0,
                                              &physaddr, &pktid)) {
                         dev_kfree_skb_any(skb);
-                        brcmf_err("No PKTID available !!\n");
+                        bphy_err(drvr, "No PKTID available !!\n");
                         brcmf_commonring_write_cancel(commonring, alloced - i);
                         break;
                 }
@@ -992,6 +1003,7 @@ static u32
 brcmf_msgbuf_rxbuf_ctrl_post(struct brcmf_msgbuf *msgbuf, bool event_buf,
                              u32 count)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct brcmf_commonring *commonring;
         void *ret_ptr;
         struct sk_buff *skb;
@@ -1009,7 +1021,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcmf_msgbuf *msgbuf, bool event_buf,
                                                               count,
                                                               &alloced);
         if (!ret_ptr) {
-                brcmf_err("Failed to reserve space in commonring\n");
+                bphy_err(drvr, "Failed to reserve space in commonring\n");
                 brcmf_commonring_unlock(commonring);
                 return 0;
         }
@@ -1021,7 +1033,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcmf_msgbuf *msgbuf, bool event_buf,
                 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
 
                 if (skb == NULL) {
-                        brcmf_err("Failed to alloc SKB\n");
+                        bphy_err(drvr, "Failed to alloc SKB\n");
                         brcmf_commonring_write_cancel(commonring, alloced - i);
                         break;
                 }
@@ -1031,7 +1043,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcmf_msgbuf *msgbuf, bool event_buf,
                                              msgbuf->rx_pktids, skb, 0,
                                              &physaddr, &pktid)) {
                         dev_kfree_skb_any(skb);
-                        brcmf_err("No PKTID available !!\n");
+                        bphy_err(drvr, "No PKTID available !!\n");
                         brcmf_commonring_write_cancel(commonring, alloced - i);
                         break;
                 }
@@ -1083,6 +1095,7 @@ static void brcmf_msgbuf_rxbuf_event_post(struct brcmf_msgbuf *msgbuf)
 
 static void brcmf_msgbuf_process_event(struct brcmf_msgbuf *msgbuf, void *buf)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct msgbuf_rx_event *event;
         u32 idx;
         u16 buflen;
@@ -1109,14 +1122,14 @@ static void brcmf_msgbuf_process_event(struct brcmf_msgbuf *msgbuf, void *buf)
 
         ifp = brcmf_get_ifp(msgbuf->drvr, event->msg.ifidx);
         if (!ifp || !ifp->ndev) {
-                brcmf_err("Received pkt for invalid ifidx %d\n",
-                          event->msg.ifidx);
+                bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
+                         event->msg.ifidx);
                 goto exit;
         }
 
         skb->protocol = eth_type_trans(skb, ifp->ndev);
 
-        brcmf_fweh_process_skb(ifp->drvr, skb);
+        brcmf_fweh_process_skb(ifp->drvr, skb, 0);
 
 exit:
         brcmu_pkt_buf_free_skb(skb);
@@ -1126,6 +1139,7 @@ exit:
 static void
 brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct msgbuf_rx_complete *rx_complete;
         struct sk_buff *skb;
         u16 data_offset;
@@ -1159,7 +1173,7 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
                 ifp = msgbuf->drvr->mon_if;
 
                 if (!ifp) {
-                        brcmf_err("Received unexpected monitor pkt\n");
+                        bphy_err(drvr, "Received unexpected monitor pkt\n");
                         brcmu_pkt_buf_free_skb(skb);
                         return;
                 }
@@ -1170,8 +1184,8 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
 
         ifp = brcmf_get_ifp(msgbuf->drvr, rx_complete->msg.ifidx);
         if (!ifp || !ifp->ndev) {
-                brcmf_err("Received pkt for invalid ifidx %d\n",
-                          rx_complete->msg.ifidx);
+                bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
+                         rx_complete->msg.ifidx);
                 brcmu_pkt_buf_free_skb(skb);
                 return;
         }
@@ -1180,11 +1194,27 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
         brcmf_netif_rx(ifp, skb);
 }
 
+static void brcmf_msgbuf_process_ring_status(struct brcmf_msgbuf *msgbuf,
+                                             void *buf)
+{
+        struct msgbuf_ring_status *ring_status = buf;
+        struct brcmf_pub *drvr = msgbuf->drvr;
+        int err;
+
+        err = le16_to_cpu(ring_status->compl_hdr.status);
+        if (err) {
+                int ring = le16_to_cpu(ring_status->compl_hdr.flow_ring_id);
+
+                bphy_err(drvr, "Firmware reported ring %d error: %d\n", ring,
+                         err);
+        }
+}
 
 static void
 brcmf_msgbuf_process_flow_ring_create_response(struct brcmf_msgbuf *msgbuf,
                                                void *buf)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct msgbuf_flowring_create_resp *flowring_create_resp;
         u16 status;
         u16 flowid;
@@ -1196,7 +1226,7 @@ brcmf_msgbuf_process_flow_ring_create_response(struct brcmf_msgbuf *msgbuf,
         status =  le16_to_cpu(flowring_create_resp->compl_hdr.status);
 
         if (status) {
-                brcmf_err("Flowring creation failed, code %d\n", status);
+                bphy_err(drvr, "Flowring creation failed, code %d\n", status);
                 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
                 return;
         }
@@ -1213,6 +1243,7 @@ static void
 brcmf_msgbuf_process_flow_ring_delete_response(struct brcmf_msgbuf *msgbuf,
                                                void *buf)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct msgbuf_flowring_delete_resp *flowring_delete_resp;
         u16 status;
         u16 flowid;
@@ -1224,7 +1255,7 @@ brcmf_msgbuf_process_flow_ring_delete_response(struct brcmf_msgbuf *msgbuf,
         status =  le16_to_cpu(flowring_delete_resp->compl_hdr.status);
 
         if (status) {
-                brcmf_err("Flowring deletion failed, code %d\n", status);
+                bphy_err(drvr, "Flowring deletion failed, code %d\n", status);
                 brcmf_flowring_delete(msgbuf->flow, flowid);
                 return;
         }
@@ -1237,10 +1268,15 @@ brcmf_msgbuf_process_flow_ring_delete_response(struct brcmf_msgbuf *msgbuf,
 
 static void brcmf_msgbuf_process_msgtype(struct brcmf_msgbuf *msgbuf, void *buf)
 {
+        struct brcmf_pub *drvr = msgbuf->drvr;
         struct msgbuf_common_hdr *msg;
 
         msg = (struct msgbuf_common_hdr *)buf;
         switch (msg->msgtype) {
+        case MSGBUF_TYPE_RING_STATUS:
+                brcmf_dbg(MSGBUF, "MSGBUF_TYPE_RING_STATUS\n");
+                brcmf_msgbuf_process_ring_status(msgbuf, buf);
+                break;
         case MSGBUF_TYPE_FLOW_RING_CREATE_CMPLT:
                 brcmf_dbg(MSGBUF, "MSGBUF_TYPE_FLOW_RING_CREATE_CMPLT\n");
                 brcmf_msgbuf_process_flow_ring_create_response(msgbuf, buf);
@@ -1269,7 +1305,7 @@ static void brcmf_msgbuf_process_msgtype(struct brcmf_msgbuf *msgbuf, void *buf)
                 brcmf_msgbuf_process_rx_complete(msgbuf, buf);
                 break;
         default:
-                brcmf_err("Unsupported msgtype %d\n", msg->msgtype);
+                bphy_err(drvr, "Unsupported msgtype %d\n", msg->msgtype);
                 break;
         }
 }
@@ -1352,7 +1388,7 @@ void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid)
         brcmf_commonring_lock(commonring);
         ret_ptr = brcmf_commonring_reserve_for_write(commonring);
         if (!ret_ptr) {
-                brcmf_err("FW unaware, flowring will be removed !!\n");
+                bphy_err(drvr, "FW unaware, flowring will be removed !!\n");
                 brcmf_commonring_unlock(commonring);
                 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
                 return;
@@ -1376,7 +1412,7 @@ void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid)
         err = brcmf_commonring_write_complete(commonring);
         brcmf_commonring_unlock(commonring);
         if (err) {
-                brcmf_err("Failed to submit RING_DELETE, flowring will be removed\n");
+                bphy_err(drvr, "Failed to submit RING_DELETE, flowring will be removed\n");
                 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
         }
 }
@@ -1451,8 +1487,8 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
         if_msgbuf = drvr->bus_if->msgbuf;
 
         if (if_msgbuf->max_flowrings >= BRCMF_FLOWRING_HASHSIZE) {
-                brcmf_err("driver not configured for this many flowrings %d\n",
-                          if_msgbuf->max_flowrings);
+                bphy_err(drvr, "driver not configured for this many flowrings %d\n",
+                         if_msgbuf->max_flowrings);
                 if_msgbuf->max_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
         }
 
@@ -1462,7 +1498,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
 
         msgbuf->txflow_wq = create_singlethread_workqueue("msgbuf_txflow");
         if (msgbuf->txflow_wq == NULL) {
-                brcmf_err("workqueue creation failed\n");
+                bphy_err(drvr, "workqueue creation failed\n");
                 goto fail;
         }
         INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 456a1bf008b3..73a0e550f2b2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -434,6 +434,7 @@ static void brcmf_p2p_print_actframe(bool tx, void *frame, u32 frame_len)
  */
 static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         s32 ret = 0;
 
         brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
@@ -450,7 +451,7 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
         ret = brcmf_fil_iovar_data_set(ifp, "p2p_da_override", p2p_mac,
                                        ETH_ALEN);
         if (ret)
-                brcmf_err("failed to update device address ret %d\n", ret);
+                bphy_err(drvr, "failed to update device address ret %d\n", ret);
 
         return ret;
 }
@@ -570,13 +571,14 @@ static s32 brcmf_p2p_deinit_discovery(struct brcmf_p2p_info *p2p)
  */
 static int brcmf_p2p_enable_discovery(struct brcmf_p2p_info *p2p)
 {
+        struct brcmf_pub *drvr = p2p->cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         s32 ret = 0;
 
         brcmf_dbg(TRACE, "enter\n");
         vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
         if (!vif) {
-                brcmf_err("P2P config device not available\n");
+                bphy_err(drvr, "P2P config device not available\n");
                 ret = -EPERM;
                 goto exit;
         }
@@ -590,13 +592,13 @@ static int brcmf_p2p_enable_discovery(struct brcmf_p2p_info *p2p)
         vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
         ret = brcmf_fil_iovar_int_set(vif->ifp, "p2p_disc", 1);
         if (ret < 0) {
-                brcmf_err("set p2p_disc error\n");
+                bphy_err(drvr, "set p2p_disc error\n");
                 goto exit;
         }
         vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
         ret = brcmf_p2p_set_discover_state(vif->ifp, WL_P2P_DISC_ST_SCAN, 0, 0);
         if (ret < 0) {
-                brcmf_err("unable to set WL_P2P_DISC_ST_SCAN\n");
+                bphy_err(drvr, "unable to set WL_P2P_DISC_ST_SCAN\n");
                 goto exit;
         }
 
@@ -608,7 +610,7 @@ static int brcmf_p2p_enable_discovery(struct brcmf_p2p_info *p2p)
          */
         ret = brcmf_fil_bsscfg_int_set(vif->ifp, "wsec", AES_ENABLED);
         if (ret < 0) {
-                brcmf_err("wsec error %d\n", ret);
+                bphy_err(drvr, "wsec error %d\n", ret);
                 goto exit;
         }
 
@@ -630,6 +632,7 @@ static s32 brcmf_p2p_escan(struct brcmf_p2p_info *p2p, u32 num_chans,
                            u16 chanspecs[], s32 search_state,
                            enum p2p_bss_type bss_type)
 {
+        struct brcmf_pub *drvr = p2p->cfg->pub;
         s32 ret = 0;
         s32 memsize = offsetof(struct brcmf_p2p_scan_le,
                                eparams.params_le.channel_list);
@@ -648,7 +651,7 @@ static s32 brcmf_p2p_escan(struct brcmf_p2p_info *p2p, u32 num_chans,
 
         vif = p2p->bss_idx[bss_type].vif;
         if (vif == NULL) {
-                brcmf_err("no vif for bss type %d\n", bss_type);
+                bphy_err(drvr, "no vif for bss type %d\n", bss_type);
                 ret = -EINVAL;
                 goto exit;
         }
@@ -676,7 +679,7 @@ static s32 brcmf_p2p_escan(struct brcmf_p2p_info *p2p, u32 num_chans,
                        BRCMF_P2P_WILDCARD_SSID_LEN);
                 break;
         default:
-                brcmf_err(" invalid search state %d\n", search_state);
+                bphy_err(drvr, " invalid search state %d\n", search_state);
                 ret = -EINVAL;
                 goto exit;
         }
@@ -760,6 +763,7 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg,
                                struct cfg80211_scan_request *request)
 {
         struct brcmf_p2p_info *p2p = &cfg->p2p;
+        struct brcmf_pub *drvr = cfg->pub;
         s32 err = 0;
         s32 search_state = WL_P2P_DISC_ST_SCAN;
         struct brcmf_cfg80211_vif *vif;
@@ -822,7 +826,7 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg,
         }
 exit:
         if (err)
-                brcmf_err("error (%d)\n", err);
+                bphy_err(drvr, "error (%d)\n", err);
         return err;
 }
 
@@ -917,19 +921,20 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,
 static s32
 brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, u16 channel, u32 duration)
 {
+        struct brcmf_pub *drvr = p2p->cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         struct brcmu_chan ch;
         s32 err = 0;
 
         vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
         if (!vif) {
-                brcmf_err("Discovery is not set, so we have nothing to do\n");
+                bphy_err(drvr, "Discovery is not set, so we have nothing to do\n");
                 err = -EPERM;
                 goto exit;
         }
 
         if (test_bit(BRCMF_P2P_STATUS_DISCOVER_LISTEN, &p2p->status)) {
-                brcmf_err("Previous LISTEN is not completed yet\n");
+                bphy_err(drvr, "Previous LISTEN is not completed yet\n");
                 /* WAR: prevent cookie mismatch in wpa_supplicant return OK */
                 goto exit;
         }
@@ -1046,6 +1051,7 @@ void brcmf_p2p_cancel_remain_on_channel(struct brcmf_if *ifp)
  */
 static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
 {
+        struct brcmf_pub *drvr = p2p->cfg->pub;
         s32 err;
         u32 channel_cnt;
         u16 *default_chan_list;
@@ -1061,7 +1067,7 @@ static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
         default_chan_list = kcalloc(channel_cnt, sizeof(*default_chan_list),
                                     GFP_KERNEL);
         if (default_chan_list == NULL) {
-                brcmf_err("channel list allocation failed\n");
+                bphy_err(drvr, "channel list allocation failed\n");
                 err = -ENOMEM;
                 goto exit;
         }
@@ -1103,6 +1109,7 @@ static void brcmf_p2p_afx_handler(struct work_struct *work)
         struct brcmf_p2p_info *p2p = container_of(afx_hdl,
                                                   struct brcmf_p2p_info,
                                                   afx_hdl);
+        struct brcmf_pub *drvr = p2p->cfg->pub;
         s32 err;
 
         if (!afx_hdl->is_active)
@@ -1116,7 +1123,7 @@ static void brcmf_p2p_afx_handler(struct work_struct *work)
                 err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan);
 
         if (err) {
-                brcmf_err("ERROR occurred! value is (%d)\n", err);
+                bphy_err(drvr, "ERROR occurred! value is (%d)\n", err);
                 if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
                              &p2p->status))
                         complete(&afx_hdl->act_frm_scan);
@@ -1338,7 +1345,8 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
                                      const struct brcmf_event_msg *e,
                                      void *data)
 {
-        struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_cfg80211_info *cfg = drvr->config;
         struct brcmf_p2p_info *p2p = &cfg->p2p;
         struct afx_hdl *afx_hdl = &p2p->afx_hdl;
         struct wireless_dev *wdev;
@@ -1409,7 +1417,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
         mgmt_frame = kzalloc(offsetof(struct ieee80211_mgmt, u) +
                              mgmt_frame_len, GFP_KERNEL);
         if (!mgmt_frame) {
-                brcmf_err("No memory available for action frame\n");
+                bphy_err(drvr, "No memory available for action frame\n");
                 return -ENOMEM;
         }
         memcpy(mgmt_frame->da, ifp->mac_addr, ETH_ALEN);
@@ -1492,6 +1500,7 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,
 static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
                                      struct brcmf_fil_af_params_le *af_params)
 {
+        struct brcmf_pub *drvr = p2p->cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         s32 err = 0;
         s32 timeout = 0;
@@ -1506,7 +1515,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
         err = brcmf_fil_bsscfg_data_set(vif->ifp, "actframe", af_params,
                                         sizeof(*af_params));
         if (err) {
-                brcmf_err(" sending action frame has failed\n");
+                bphy_err(drvr, " sending action frame has failed\n");
                 goto exit;
         }
 
@@ -1556,6 +1565,7 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg,
                                struct brcmf_config_af_params *config_af_params)
 {
         struct brcmf_p2p_info *p2p = &cfg->p2p;
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_fil_action_frame_le *action_frame;
         struct brcmf_p2p_pub_act_frame *act_frm;
         s32 err = 0;
@@ -1634,8 +1644,8 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg,
                 config_af_params->extra_listen = false;
                 break;
         default:
-                brcmf_err("Unknown p2p pub act frame subtype: %d\n",
-                          act_frm->subtype);
+                bphy_err(drvr, "Unknown p2p pub act frame subtype: %d\n",
+                         act_frm->subtype);
                 err = -EINVAL;
         }
         return err;
@@ -1657,6 +1667,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
         struct brcmf_fil_action_frame_le *action_frame;
         struct brcmf_config_af_params config_af_params;
         struct afx_hdl *afx_hdl = &p2p->afx_hdl;
+        struct brcmf_pub *drvr = cfg->pub;
         u16 action_frame_len;
         bool ack = false;
         u8 category;
@@ -1692,7 +1703,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
                 if (brcmf_p2p_pub_af_tx(cfg, af_params, &config_af_params)) {
                         /* Just send unknown subtype frame with */
                         /* default parameters.                  */
-                        brcmf_err("P2P Public action frame, unknown subtype.\n");
+                        bphy_err(drvr, "P2P Public action frame, unknown subtype.\n");
                 }
         } else if (brcmf_p2p_is_gas_action(action_frame->data,
                                            action_frame_len)) {
@@ -1714,7 +1725,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
                         af_params->dwell_time =
                                 cpu_to_le32(P2P_AF_MIN_DWELL_TIME);
                 } else {
-                        brcmf_err("Unknown action type: %d\n", action);
+                        bphy_err(drvr, "Unknown action type: %d\n", action);
                         goto exit;
                 }
         } else if (brcmf_p2p_is_p2p_action(action_frame->data,
@@ -1722,8 +1733,8 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
                 /* do not configure anything. it will be */
                 /* sent with a default configuration     */
         } else {
-                brcmf_err("Unknown Frame: category 0x%x, action 0x%x\n",
-                          category, action);
+                bphy_err(drvr, "Unknown Frame: category 0x%x, action 0x%x\n",
+                         category, action);
                 return false;
         }
 
@@ -1761,7 +1772,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
 
                 if (brcmf_p2p_af_searching_channel(p2p) ==
                                                         P2P_INVALID_CHANNEL) {
-                        brcmf_err("Couldn't find peer's channel.\n");
+                        bphy_err(drvr, "Couldn't find peer's channel.\n");
                         goto exit;
                 }
 
@@ -1783,7 +1794,8 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
                 tx_retry++;
         }
         if (ack == false) {
-                brcmf_err("Failed to send Action Frame(retry %d)\n", tx_retry);
+                bphy_err(drvr, "Failed to send Action Frame(retry %d)\n",
+                         tx_retry);
                 clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
         }
 
@@ -1965,6 +1977,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,
                        enum brcmf_fil_p2p_if_types if_type)
 {
         struct brcmf_p2p_info *p2p = &cfg->p2p;
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         struct brcmf_fil_p2p_if_le if_request;
         s32 err;
@@ -1974,13 +1987,13 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,
 
         vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
         if (!vif) {
-                brcmf_err("vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
+                bphy_err(drvr, "vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
                 return -EPERM;
         }
         brcmf_notify_escan_complete(cfg, vif->ifp, true, true);
         vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;
         if (!vif) {
-                brcmf_err("vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
+                bphy_err(drvr, "vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
                 return -EPERM;
         }
         brcmf_set_mpc(vif->ifp, 0);
@@ -1998,7 +2011,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,
         err = brcmf_fil_iovar_data_set(vif->ifp, "p2p_ifupd", &if_request,
                                        sizeof(if_request));
         if (err) {
-                brcmf_err("p2p_ifupd FAILED, err=%d\n", err);
+                bphy_err(drvr, "p2p_ifupd FAILED, err=%d\n", err);
                 brcmf_cfg80211_arm_vif_event(cfg, NULL);
                 return err;
         }
@@ -2006,7 +2019,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,
                                             BRCMF_VIF_EVENT_TIMEOUT);
         brcmf_cfg80211_arm_vif_event(cfg, NULL);
         if (!err)  {
-                brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
+                bphy_err(drvr, "No BRCMF_E_IF_CHANGE event received\n");
                 return -EIO;
         }
 
@@ -2069,6 +2082,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
                                                     struct wiphy *wiphy,
                                                     u8 *addr)
 {
+        struct brcmf_pub *drvr = p2p->cfg->pub;
         struct brcmf_cfg80211_vif *p2p_vif;
         struct brcmf_if *p2p_ifp;
         struct brcmf_if *pri_ifp;
@@ -2080,7 +2094,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
 
         p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE);
         if (IS_ERR(p2p_vif)) {
-                brcmf_err("could not create discovery vif\n");
+                bphy_err(drvr, "could not create discovery vif\n");
                 return (struct wireless_dev *)p2p_vif;
         }
 
@@ -2088,7 +2102,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
 
         /* firmware requires unique mac address for p2pdev interface */
         if (addr && ether_addr_equal(addr, pri_ifp->mac_addr)) {
-                brcmf_err("discovery vif must be different from primary interface\n");
+                bphy_err(drvr, "discovery vif must be different from primary interface\n");
                 return ERR_PTR(-EINVAL);
         }
 
@@ -2101,7 +2115,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
         /* Initialize P2P Discovery in the firmware */
         err = brcmf_fil_iovar_int_set(pri_ifp, "p2p_disc", 1);
         if (err < 0) {
-                brcmf_err("set p2p_disc error\n");
+                bphy_err(drvr, "set p2p_disc error\n");
                 brcmf_fweh_p2pdev_setup(pri_ifp, false);
                 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
                 goto fail;
@@ -2113,7 +2127,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
         brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
         brcmf_fweh_p2pdev_setup(pri_ifp, false);
         if (!err) {
-                brcmf_err("timeout occurred\n");
+                bphy_err(drvr, "timeout occurred\n");
                 err = -EIO;
                 goto fail;
         }
@@ -2127,7 +2141,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
         /* verify bsscfg index for P2P discovery */
         err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bsscfgidx);
         if (err < 0) {
-                brcmf_err("retrieving discover bsscfg index failed\n");
+                bphy_err(drvr, "retrieving discover bsscfg index failed\n");
                 goto fail;
         }
 
@@ -2161,6 +2175,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_cfg80211_vif *vif;
         enum brcmf_fil_p2p_if_types iftype;
         int err;
@@ -2201,7 +2216,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
                                             BRCMF_VIF_EVENT_TIMEOUT);
         brcmf_cfg80211_arm_vif_event(cfg, NULL);
         if (!err) {
-                brcmf_err("timeout occurred\n");
+                bphy_err(drvr, "timeout occurred\n");
                 err = -EIO;
                 goto fail;
         }
@@ -2209,7 +2224,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
         /* interface created in firmware */
         ifp = vif->ifp;
         if (!ifp) {
-                brcmf_err("no if pointer provided\n");
+                bphy_err(drvr, "no if pointer provided\n");
                 err = -ENOENT;
                 goto fail;
         }
@@ -2218,7 +2233,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
         ifp->ndev->name_assign_type = name_assign_type;
         err = brcmf_net_attach(ifp, true);
         if (err) {
-                brcmf_err("Registering netdevice failed\n");
+                bphy_err(drvr, "Registering netdevice failed\n");
                 free_netdev(ifp->ndev);
                 goto fail;
         }
@@ -2373,6 +2388,7 @@ void brcmf_p2p_stop_device(struct wiphy *wiphy, struct wireless_dev *wdev)
  */
 s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced)
 {
+        struct brcmf_pub *drvr = cfg->pub;
         struct brcmf_p2p_info *p2p;
         struct brcmf_if *pri_ifp;
         s32 err = 0;
@@ -2387,7 +2403,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced)
         if (p2pdev_forced) {
                 err_ptr = brcmf_p2p_create_p2pdev(p2p, NULL, NULL);
                 if (IS_ERR(err_ptr)) {
-                        brcmf_err("P2P device creation failed.\n");
+                        bphy_err(drvr, "P2P device creation failed.\n");
                         err = PTR_ERR(err_ptr);
                 }
         } else {
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index 0f69b3fa296e..58a6bc379358 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -30,6 +30,15 @@
 #include <brcmu_wifi.h>
 #include <brcm_hw_ids.h>
 
+/* Custom brcmf_err() that takes bus arg and passes it further */
+#define brcmf_err(bus, fmt, ...)                                        \
+        do {                                                            \
+                if (IS_ENABLED(CONFIG_BRCMDBG) ||                       \
+                    IS_ENABLED(CONFIG_BRCM_TRACING) ||                  \
+                    net_ratelimit())                                    \
+                        __brcmf_err(bus, __func__, fmt, ##__VA_ARGS__); \
+        } while (0)
+
 #include "debug.h"
 #include "bus.h"
 #include "commonring.h"
@@ -531,6 +540,7 @@ static void
 brcmf_pcie_select_core(struct brcmf_pciedev_info *devinfo, u16 coreid)
 {
         const struct pci_dev *pdev = devinfo->pdev;
+        struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
         struct brcmf_core *core;
         u32 bar0_win;
 
@@ -548,7 +558,7 @@ brcmf_pcie_select_core(struct brcmf_pciedev_info *devinfo, u16 coreid)
                         }
                 }
         } else {
-                brcmf_err("Unsupported core selected %x\n", coreid);
+                brcmf_err(bus, "Unsupported core selected %x\n", coreid);
         }
 }
 
@@ -848,9 +858,8 @@ static irqreturn_t brcmf_pcie_isr_thread(int irq, void *arg)
 
 static int brcmf_pcie_request_irq(struct brcmf_pciedev_info *devinfo)
 {
-        struct pci_dev *pdev;
-
-        pdev = devinfo->pdev;
+        struct pci_dev *pdev = devinfo->pdev;
+        struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
 
         brcmf_pcie_intr_disable(devinfo);
 
@@ -861,7 +870,7 @@ static int brcmf_pcie_request_irq(struct brcmf_pciedev_info *devinfo)
                                  brcmf_pcie_isr_thread, IRQF_SHARED,
                                  "brcmf_pcie_intr", devinfo)) {
                 pci_disable_msi(pdev);
-                brcmf_err("Failed to request IRQ %d\n", pdev->irq);
+                brcmf_err(bus, "Failed to request IRQ %d\n", pdev->irq);
                 return -EIO;
         }
         devinfo->irq_allocated = true;
@@ -871,15 +880,14 @@ static int brcmf_pcie_request_irq(struct brcmf_pciedev_info *devinfo)
 
 static void brcmf_pcie_release_irq(struct brcmf_pciedev_info *devinfo)
 {
-        struct pci_dev *pdev;
+        struct pci_dev *pdev = devinfo->pdev;
+        struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
         u32 status;
         u32 count;
 
         if (!devinfo->irq_allocated)
                 return;
 
-        pdev = devinfo->pdev;
-
         brcmf_pcie_intr_disable(devinfo);
         free_irq(pdev->irq, devinfo);
         pci_disable_msi(pdev);
@@ -891,7 +899,7 @@ static void brcmf_pcie_release_irq(struct brcmf_pciedev_info *devinfo)
                 count++;
         }
         if (devinfo->in_irq)
-                brcmf_err("Still in IRQ (processing) !!!\n");
+                brcmf_err(bus, "Still in IRQ (processing) !!!\n");
 
         status = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT);
         brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT, status);
@@ -1102,6 +1110,7 @@ static void brcmf_pcie_release_ringbuffers(struct brcmf_pciedev_info *devinfo)
 
 static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo)
 {
+        struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
         struct brcmf_pcie_ringbuf *ring;
         struct brcmf_pcie_ringbuf *rings;
         u32 d2h_w_idx_ptr;
@@ -1254,7 +1263,7 @@ static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo)
         return 0;
 
 fail:
-        brcmf_err("Allocating ring buffers failed\n");
+        brcmf_err(bus, "Allocating ring buffers failed\n");
         brcmf_pcie_release_ringbuffers(devinfo);
         return -ENOMEM;
 }
@@ -1277,6 +1286,7 @@ brcmf_pcie_release_scratchbuffers(struct brcmf_pciedev_info *devinfo)
 
 static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
 {
+        struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
         u64 address;
         u32 addr;
 
@@ -1316,7 +1326,7 @@ static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
         return 0;
 
 fail:
-        brcmf_err("Allocating scratch buffers failed\n");
+        brcmf_err(bus, "Allocating scratch buffers failed\n");
         brcmf_pcie_release_scratchbuffers(devinfo);
         return -ENOMEM;
 }
@@ -1437,6 +1447,7 @@ static int
 brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
                                u32 sharedram_addr)
 {
+        struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
         struct brcmf_pcie_shared_info *shared;
         u32 addr;
 
@@ -1448,7 +1459,8 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
         brcmf_dbg(PCIE, "PCIe protocol version %d\n", shared->version);
         if ((shared->version > BRCMF_PCIE_MAX_SHARED_VERSION) ||
             (shared->version < BRCMF_PCIE_MIN_SHARED_VERSION)) {
-                brcmf_err("Unsupported PCIE version %d\n", shared->version);
+                brcmf_err(bus, "Unsupported PCIE version %d\n",
+                          shared->version);
                 return -EINVAL;
         }
 
@@ -1490,6 +1502,7 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo,
                                         const struct firmware *fw, void *nvram,
                                         u32 nvram_len)
 {
+        struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
         u32 sharedram_addr;
         u32 sharedram_addr_written;
         u32 loop_counter;
@@ -1544,7 +1557,13 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo,
                 loop_counter--;
         }
         if (sharedram_addr == sharedram_addr_written) {
-                brcmf_err("FW failed to initialize\n");
+                brcmf_err(bus, "FW failed to initialize\n");
+                return -ENODEV;
+        }
+        if (sharedram_addr < devinfo->ci->rambase ||
+            sharedram_addr >= devinfo->ci->rambase + devinfo->ci->ramsize) {
+                brcmf_err(bus, "Invalid shared RAM address 0x%08x\n",
+                          sharedram_addr);
                 return -ENODEV;
         }
         brcmf_dbg(PCIE, "Shared RAM addr: 0x%08x\n", sharedram_addr);
@@ -1555,16 +1574,15 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo,
 
 static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo)
 {
-        struct pci_dev *pdev;
+        struct pci_dev *pdev = devinfo->pdev;
+        struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
         int err;
         phys_addr_t  bar0_addr, bar1_addr;
         ulong bar1_size;
 
-        pdev = devinfo->pdev;
-
         err = pci_enable_device(pdev);
         if (err) {
-                brcmf_err("pci_enable_device failed err=%d\n", err);
+                brcmf_err(bus, "pci_enable_device failed err=%d\n", err);
                 return err;
         }
 
@@ -1577,7 +1595,7 @@ static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo)
         /* read Bar-1 mapped memory range */
         bar1_size = pci_resource_len(pdev, 2);
         if ((bar1_size == 0) || (bar1_addr == 0)) {
-                brcmf_err("BAR1 Not enabled, device size=%ld, addr=%#016llx\n",
+                brcmf_err(bus, "BAR1 Not enabled, device size=%ld, addr=%#016llx\n",
                           bar1_size, (unsigned long long)bar1_addr);
                 return -EINVAL;
         }
@@ -1586,7 +1604,7 @@ static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo)
         devinfo->tcm = ioremap_nocache(bar1_addr, bar1_size);
 
         if (!devinfo->regs || !devinfo->tcm) {
-                brcmf_err("ioremap() failed (%p,%p)\n", devinfo->regs,
+                brcmf_err(bus, "ioremap() failed (%p,%p)\n", devinfo->regs,
                           devinfo->tcm);
                 return -EINVAL;
         }
@@ -1873,7 +1891,7 @@ fail_bus:
         kfree(bus->msgbuf);
         kfree(bus);
 fail:
-        brcmf_err("failed %x:%x\n", pdev->vendor, pdev->device);
+        brcmf_err(NULL, "failed %x:%x\n", pdev->vendor, pdev->device);
         brcmf_pcie_release_resource(devinfo);
         if (devinfo->ci)
                 brcmf_chip_detach(devinfo->ci);
@@ -1947,7 +1965,7 @@ static int brcmf_pcie_pm_enter_D3(struct device *dev)
         wait_event_timeout(devinfo->mbdata_resp_wait, devinfo->mbdata_completed,
                            BRCMF_PCIE_MBDATA_TIMEOUT);
         if (!devinfo->mbdata_completed) {
-                brcmf_err("Timeout on response for entering D3 substate\n");
+                brcmf_err(bus, "Timeout on response for entering D3 substate\n");
                 brcmf_bus_change_state(bus, BRCMF_BUS_UP);
                 return -EIO;
         }
@@ -1993,7 +2011,7 @@ cleanup:
 
         err = brcmf_pcie_probe(pdev, NULL);
         if (err)
-                brcmf_err("probe after resume failed, err=%d\n", err);
+                brcmf_err(bus, "probe after resume failed, err=%d\n", err);
 
         return err;
 }
@@ -2064,7 +2082,8 @@ void brcmf_pcie_register(void)
         brcmf_dbg(PCIE, "Enter\n");
         err = pci_register_driver(&brcmf_pciedrvr);
         if (err)
-                brcmf_err("PCIE driver registration failed, err=%d\n", err);
+                brcmf_err(NULL, "PCIE driver registration failed, err=%d\n",
+                          err);
 }
 
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
index 37b403877228..0fb97f7dd5a2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
@@ -109,6 +109,7 @@ static int brcmf_pno_channel_config(struct brcmf_if *ifp,
 static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
                             u32 mscan, u32 bestn)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_pno_param_le pfn_param;
         u16 flags;
         u32 pfnmem;
@@ -132,13 +133,13 @@ static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
                 /* set bestn in firmware */
                 err = brcmf_fil_iovar_int_set(ifp, "pfnmem", pfnmem);
                 if (err < 0) {
-                        brcmf_err("failed to set pfnmem\n");
+                        bphy_err(drvr, "failed to set pfnmem\n");
                         goto exit;
                 }
                 /* get max mscan which the firmware supports */
                 err = brcmf_fil_iovar_int_get(ifp, "pfnmem", &pfnmem);
                 if (err < 0) {
-                        brcmf_err("failed to get pfnmem\n");
+                        bphy_err(drvr, "failed to get pfnmem\n");
                         goto exit;
                 }
                 mscan = min_t(u32, mscan, pfnmem);
@@ -152,7 +153,7 @@ static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
         err = brcmf_fil_iovar_data_set(ifp, "pfn_set", &pfn_param,
                                        sizeof(pfn_param));
         if (err)
-                brcmf_err("pfn_set failed, err=%d\n", err);
+                bphy_err(drvr, "pfn_set failed, err=%d\n", err);
 
 exit:
         return err;
@@ -160,6 +161,7 @@ exit:
 
 static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_pno_macaddr_le pfn_mac;
         u8 *mac_addr = NULL;
         u8 *mac_mask = NULL;
@@ -194,7 +196,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)
         err = brcmf_fil_iovar_data_set(ifp, "pfn_macaddr", &pfn_mac,
                                        sizeof(pfn_mac));
         if (err)
-                brcmf_err("pfn_macaddr failed, err=%d\n", err);
+                bphy_err(drvr, "pfn_macaddr failed, err=%d\n", err);
 
         return err;
 }
@@ -202,6 +204,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)
 static int brcmf_pno_add_ssid(struct brcmf_if *ifp, struct cfg80211_ssid *ssid,
                               bool active)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_pno_net_param_le pfn;
         int err;
 
@@ -218,12 +221,13 @@ static int brcmf_pno_add_ssid(struct brcmf_if *ifp, struct cfg80211_ssid *ssid,
         brcmf_dbg(SCAN, "adding ssid=%.32s (active=%d)\n", ssid->ssid, active);
         err = brcmf_fil_iovar_data_set(ifp, "pfn_add", &pfn, sizeof(pfn));
         if (err < 0)
-                brcmf_err("adding failed: err=%d\n", err);
+                bphy_err(drvr, "adding failed: err=%d\n", err);
         return err;
 }
 
 static int brcmf_pno_add_bssid(struct brcmf_if *ifp, const u8 *bssid)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_pno_bssid_le bssid_cfg;
         int err;
 
@@ -234,7 +238,7 @@ static int brcmf_pno_add_bssid(struct brcmf_if *ifp, const u8 *bssid)
         err = brcmf_fil_iovar_data_set(ifp, "pfn_add_bssid", &bssid_cfg,
                                        sizeof(bssid_cfg));
         if (err < 0)
-                brcmf_err("adding failed: err=%d\n", err);
+                bphy_err(drvr, "adding failed: err=%d\n", err);
         return err;
 }
 
@@ -258,6 +262,7 @@ static bool brcmf_is_ssid_active(struct cfg80211_ssid *ssid,
 
 static int brcmf_pno_clean(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         int ret;
 
         /* Disable pfn */
@@ -267,7 +272,7 @@ static int brcmf_pno_clean(struct brcmf_if *ifp)
                 ret = brcmf_fil_iovar_data_set(ifp, "pfnclear", NULL, 0);
         }
         if (ret < 0)
-                brcmf_err("failed code %d\n", ret);
+                bphy_err(drvr, "failed code %d\n", ret);
 
         return ret;
 }
@@ -392,6 +397,7 @@ static int brcmf_pno_config_networks(struct brcmf_if *ifp,
 
 static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         struct brcmf_pno_info *pi;
         struct brcmf_gscan_config *gscan_cfg;
         struct brcmf_gscan_bucket_config *buckets;
@@ -416,7 +422,7 @@ static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)
         /* clean up everything */
         err = brcmf_pno_clean(ifp);
         if  (err < 0) {
-                brcmf_err("failed error=%d\n", err);
+                bphy_err(drvr, "failed error=%d\n", err);
                 goto free_gscan;
         }
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
index c5ff551ec659..024c643052bc 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
@@ -47,8 +47,8 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)
                 if (brcmf_proto_msgbuf_attach(drvr))
                         goto fail;
         } else {
-                brcmf_err("Unsupported proto type %d\n",
-                          drvr->bus_if->proto_type);
+                bphy_err(drvr, "Unsupported proto type %d\n",
+                         drvr->bus_if->proto_type);
                 goto fail;
         }
         if (!proto->tx_queue_data || (proto->hdrpull == NULL) ||
@@ -56,7 +56,7 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)
             (proto->configure_addr_mode == NULL) ||
             (proto->delete_peer == NULL) || (proto->add_tdls_peer == NULL) ||
             (proto->debugfs_create == NULL)) {
-                brcmf_err("Not all proto handlers have been installed\n");
+                bphy_err(drvr, "Not all proto handlers have been installed\n");
                 goto fail;
         }
         return 0;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 0cd5b8d970d7..4d104ab80fd8 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -2999,21 +2999,35 @@ static int brcmf_sdio_trap_info(struct seq_file *seq, struct brcmf_sdio *bus,
         if (error < 0)
                 return error;
 
-        seq_printf(seq,
-                   "dongle trap info: type 0x%x @ epc 0x%08x\n"
-                   "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
-                   "  lr   0x%08x pc   0x%08x offset 0x%x\n"
-                   "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
-                   "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
-                   le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
-                   le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
-                   le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
-                   le32_to_cpu(tr.pc), sh->trap_addr,
-                   le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
-                   le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
-                   le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
-                   le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
-
+        if (seq)
+                seq_printf(seq,
+                           "dongle trap info: type 0x%x @ epc 0x%08x\n"
+                           "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
+                           "  lr   0x%08x pc   0x%08x offset 0x%x\n"
+                           "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
+                           "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
+                           le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
+                           le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
+                           le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
+                           le32_to_cpu(tr.pc), sh->trap_addr,
+                           le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
+                           le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
+                           le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
+                           le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
+        else
+                pr_debug("dongle trap info: type 0x%x @ epc 0x%08x\n"
+                         "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
+                         "  lr   0x%08x pc   0x%08x offset 0x%x\n"
+                         "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
+                         "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
+                         le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
+                         le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
+                         le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
+                         le32_to_cpu(tr.pc), sh->trap_addr,
+                         le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
+                         le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
+                         le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
+                         le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
         return 0;
 }
 
@@ -3067,8 +3081,10 @@ static int brcmf_sdio_checkdied(struct brcmf_sdio *bus)
         else if (sh.flags & SDPCM_SHARED_ASSERT)
                 brcmf_err("assertion in dongle\n");
 
-        if (sh.flags & SDPCM_SHARED_TRAP)
+        if (sh.flags & SDPCM_SHARED_TRAP) {
                 brcmf_err("firmware trap in dongle\n");
+                brcmf_sdio_trap_info(NULL, bus, &sh);
+        }
 
         return 0;
 }
@@ -3143,9 +3159,12 @@ static int brcmf_debugfs_sdio_count_read(struct seq_file *seq, void *data)
         return 0;
 }
 
-static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
+static void brcmf_sdio_debugfs_create(struct device *dev)
 {
-        struct brcmf_pub *drvr = bus->sdiodev->bus_if->drvr;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_pub *drvr = bus_if->drvr;
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+        struct brcmf_sdio *bus = sdiodev->bus;
         struct dentry *dentry = brcmf_debugfs_get_devdir(drvr);
 
         if (IS_ERR_OR_NULL(dentry))
@@ -3165,7 +3184,7 @@ static int brcmf_sdio_checkdied(struct brcmf_sdio *bus)
         return 0;
 }
 
-static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
+static void brcmf_sdio_debugfs_create(struct device *dev)
 {
 }
 #endif /* DEBUG */
@@ -3477,8 +3496,6 @@ static int brcmf_sdio_bus_preinit(struct device *dev)
         if (bus->rxbuf)
                 bus->rxblen = value;
 
-        brcmf_sdio_debugfs_create(bus);
-
         /* the commands below use the terms tx and rx from
          * a device perspective, ie. bus:txglom affects the
          * bus transfers from device to host.
@@ -4088,6 +4105,7 @@ static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {
         .get_ramsize = brcmf_sdio_bus_get_ramsize,
         .get_memdump = brcmf_sdio_bus_get_memdump,
         .get_fwname = brcmf_sdio_get_fwname,
+        .debugfs_create = brcmf_sdio_debugfs_create
 };
 
 #define BRCMF_SDIO_FW_CODE      0
@@ -4197,7 +4215,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
         } else {
                 /* Disable F2 again */
                 sdio_disable_func(sdiod->func2);
-                goto release;
+                goto checkdied;
         }
 
         if (brcmf_chip_sr_capable(bus->ci)) {
@@ -4218,8 +4236,10 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
         }
 
         /* If we didn't come up, turn off backplane clock */
-        if (err != 0)
+        if (err != 0) {
                 brcmf_sdio_clkctl(bus, CLK_NONE, false);
+                goto checkdied;
+        }
 
         sdio_release_host(sdiod->func1);
 
@@ -4233,12 +4253,15 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
         err = brcmf_attach(sdiod->dev, sdiod->settings);
         if (err != 0) {
                 brcmf_err("brcmf_attach failed\n");
-                goto fail;
+                sdio_claim_host(sdiod->func1);
+                goto checkdied;
         }
 
         /* ready */
         return;
 
+checkdied:
+        brcmf_sdio_checkdied(bus);
 release:
         sdio_release_host(sdiod->func1);
 fail:
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
index fe6755944b7b..a5c271bff446 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
@@ -14,14 +14,16 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/device.h>
 #include <linux/module.h> /* bug in tracepoint.h, it should include this */
 
 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
+#include "bus.h"
 #include "tracepoint.h"
 #include "debug.h"
 
-void __brcmf_err(const char *func, const char *fmt, ...)
+void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...)
 {
         struct va_format vaf = {
                 .fmt = fmt,
@@ -30,7 +32,10 @@ void __brcmf_err(const char *func, const char *fmt, ...)
 
         va_start(args, fmt);
         vaf.va = &args;
-        pr_err("%s: %pV", func, &vaf);
+        if (bus)
+                dev_err(bus->dev, "%s: %pV", func, &vaf);
+        else
+                pr_err("%s: %pV", func, &vaf);
         trace_brcmf_err(func, &vaf);
         va_end(args);
 }
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index 76cfaf6999c8..e9cbfd077710 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -508,7 +508,7 @@ static void brcmf_usb_rx_complete(struct urb *urb)
         skb = req->skb;
         req->skb = NULL;
 
-        /* zero lenght packets indicate usb "failure". Do not refill */
+        /* zero length packets indicate usb "failure". Do not refill */
         if (urb->status != 0 || !urb->actual_length) {
                 brcmu_pkt_buf_free_skb(skb);
                 brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req, NULL);
@@ -575,7 +575,6 @@ static void
 brcmf_usb_state_change(struct brcmf_usbdev_info *devinfo, int state)
 {
         struct brcmf_bus *bcmf_bus = devinfo->bus_pub.bus;
-        int old_state;
 
         brcmf_dbg(USB, "Enter, current state=%d, new state=%d\n",
                   devinfo->bus_pub.state, state);
@@ -583,7 +582,6 @@ brcmf_usb_state_change(struct brcmf_usbdev_info *devinfo, int state)
         if (devinfo->bus_pub.state == state)
                 return;
 
-        old_state = devinfo->bus_pub.state;
         devinfo->bus_pub.state = state;
 
         /* update state of upper layer */
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index eb93711d474b..fdc56f821b5a 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2015-2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * 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
@@ -20,7 +20,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2015-2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@
 #include "iwl-config.h"
 
 /* Highest firmware API version supported */
-#define IWL_22000_UCODE_API_MAX 43
+#define IWL_22000_UCODE_API_MAX 46
 
 /* Lowest firmware API version supported */
 #define IWL_22000_UCODE_API_MIN 39
@@ -79,11 +79,15 @@
 #define IWL_22000_HR_B_F0_FW_PRE        "iwlwifi-Qu-b0-hr-b0-"
 #define IWL_22000_QU_B_HR_B_FW_PRE      "iwlwifi-Qu-b0-hr-b0-"
 #define IWL_22000_HR_B_FW_PRE           "iwlwifi-QuQnj-b0-hr-b0-"
-#define IWL_22000_JF_B0_FW_PRE          "iwlwifi-QuQnj-a0-jf-b0-"
 #define IWL_22000_HR_A0_FW_PRE          "iwlwifi-QuQnj-a0-hr-a0-"
 #define IWL_22000_SU_Z0_FW_PRE          "iwlwifi-su-z0-"
 #define IWL_QU_B_JF_B_FW_PRE            "iwlwifi-Qu-b0-jf-b0-"
+#define IWL_QNJ_B_JF_B_FW_PRE           "iwlwifi-QuQnj-b0-jf-b0-"
 #define IWL_CC_A_FW_PRE                 "iwlwifi-cc-a0-"
+#define IWL_22000_SO_A_JF_B_FW_PRE      "iwlwifi-so-a0-jf-b0-"
+#define IWL_22000_SO_A_HR_B_FW_PRE      "iwlwifi-so-a0-hr-b0-"
+#define IWL_22000_SO_A_GF_A_FW_PRE      "iwlwifi-so-a0-gf-a0-"
+#define IWL_22000_TY_A_GF_A_FW_PRE      "iwlwifi-ty-a0-gf-a0-"
 
 #define IWL_22000_HR_MODULE_FIRMWARE(api) \
         IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
@@ -97,16 +101,26 @@
         IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
 #define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api) \
         IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"
-#define IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(api) \
-        IWL_22000_JF_B0_FW_PRE __stringify(api) ".ucode"
 #define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \
         IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"
 #define IWL_22000_SU_Z0_MODULE_FIRMWARE(api) \
         IWL_22000_SU_Z0_FW_PRE __stringify(api) ".ucode"
 #define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \
         IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"
-#define IWL_CC_A_MODULE_FIRMWARE(api) \
+#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \
+        IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"
+#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api)             \
+        IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode"
+#define IWL_CC_A_MODULE_FIRMWARE(api)                   \
         IWL_CC_A_FW_PRE __stringify(api) ".ucode"
+#define IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(api) \
+        IWL_22000_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"
+#define IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(api) \
+        IWL_22000_SO_A_HR_B_FW_PRE __stringify(api) ".ucode"
+#define IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(api) \
+        IWL_22000_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"
+#define IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(api) \
+        IWL_22000_TY_A_GF_A_FW_PRE __stringify(api) ".ucode"
 
 static const struct iwl_base_params iwl_22000_base_params = {
         .eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -167,6 +181,10 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
         .d3_debug_data_base_addr = 0x401000,                            \
         .d3_debug_data_length = 60 * 1024
 
+#define IWL_DEVICE_AX200_COMMON                                         \
+        IWL_DEVICE_22000_COMMON,                                        \
+        .umac_prph_offset = 0x300000
+
 #define IWL_DEVICE_22500                                                \
         IWL_DEVICE_22000_COMMON,                                        \
         .device_family = IWL_DEVICE_FAMILY_22000,                       \
@@ -179,6 +197,13 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
         .base_params = &iwl_22560_base_params,                          \
         .csr = &iwl_csr_v2
 
+#define IWL_DEVICE_AX210                                                \
+        IWL_DEVICE_AX200_COMMON,                                        \
+        .device_family = IWL_DEVICE_FAMILY_AX210,                       \
+        .base_params = &iwl_22000_base_params,                          \
+        .csr = &iwl_csr_v1,                                             \
+        .min_txq_size = 128
+
 const struct iwl_cfg iwl22000_2ac_cfg_hr = {
         .name = "Intel(R) Dual Band Wireless AC 22000",
         .fw_name_pre = IWL_22000_HR_FW_PRE,
@@ -198,8 +223,8 @@ const struct iwl_cfg iwl22000_2ac_cfg_jf = {
         IWL_DEVICE_22500,
 };
 
-const struct iwl_cfg iwl22560_2ax_cfg_hr = {
-        .name = "Intel(R) Wireless-AX 22560",
+const struct iwl_cfg iwl_ax101_cfg_qu_hr = {
+        .name = "Intel(R) Wi-Fi 6 AX101",
         .fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
         IWL_DEVICE_22500,
         /*
@@ -220,10 +245,11 @@ const struct iwl_cfg iwl22260_2ax_cfg = {
          * HT size; mac80211 would otherwise pick the HE max (256) by default.
          */
         .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+        .bisr_workaround = 1,
 };
 
 const struct iwl_cfg killer1650x_2ax_cfg = {
-        .name = "Killer(R) Wireless-AX 1650x Wireless Network Adapter (22260NGW)",
+        .name = "Killer(R) Wireless-AX 1650x Wireless Network Adapter (200NGW)",
         .fw_name_pre = IWL_CC_A_FW_PRE,
         IWL_DEVICE_22500,
         /*
@@ -232,10 +258,11 @@ const struct iwl_cfg killer1650x_2ax_cfg = {
          * HT size; mac80211 would otherwise pick the HE max (256) by default.
          */
         .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+        .bisr_workaround = 1,
 };
 
 const struct iwl_cfg killer1650w_2ax_cfg = {
-        .name = "Killer(R) Wireless-AX 1650w Wireless Network Adapter (22260D2W)",
+        .name = "Killer(R) Wireless-AX 1650w Wireless Network Adapter (200D2W)",
         .fw_name_pre = IWL_CC_A_FW_PRE,
         IWL_DEVICE_22500,
         /*
@@ -244,6 +271,7 @@ const struct iwl_cfg killer1650w_2ax_cfg = {
          * HT size; mac80211 would otherwise pick the HE max (256) by default.
          */
         .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+        .bisr_workaround = 1,
 };
 
 /*
@@ -275,6 +303,18 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = {
         IWL_DEVICE_22500,
 };
 
+const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {
+        .name = "Intel(R) Wireless-AC 9560 160MHz",
+        .fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,
+        IWL_DEVICE_22500,
+        /*
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
+        .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+};
+
 const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = {
         .name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
         .fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
@@ -347,18 +387,6 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {
         .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
 };
 
-const struct iwl_cfg iwl22000_2ax_cfg_qnj_jf_b0 = {
-        .name = "Intel(R) Dual Band Wireless AX 22000",
-        .fw_name_pre = IWL_22000_JF_B0_FW_PRE,
-        IWL_DEVICE_22500,
-        /*
-         * This device doesn't support receiving BlockAck with a large bitmap
-         * so we need to restrict the size of transmitted aggregation to the
-         * HT size; mac80211 would otherwise pick the HE max (256) by default.
-         */
-        .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
-
 const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {
         .name = "Intel(R) Dual Band Wireless AX 22000",
         .fw_name_pre = IWL_22000_HR_A0_FW_PRE,
@@ -384,13 +412,41 @@ const struct iwl_cfg iwl22560_2ax_cfg_su_cdb = {
         .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
 };
 
+const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {
+        .name = "Intel(R) Wireless-AC 9560 160MHz",
+        .fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,
+        IWL_DEVICE_AX210,
+};
+
+const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {
+        .name = "Intel(R) Wi-Fi 6 AX201 160MHz",
+        .fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,
+        IWL_DEVICE_AX210,
+};
+
+const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0 = {
+        .name = "Intel(R) Wi-Fi 7 AX211 160MHz",
+        .fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,
+        IWL_DEVICE_AX210,
+};
+
+const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {
+        .name = "Intel(R) Wi-Fi 7 AX210 160MHz",
+        .fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,
+        IWL_DEVICE_AX210,
+};
+
 MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_SU_Z0_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index 113bcf7735a0..3225b64eb845 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -57,7 +57,7 @@
 #include "fw/file.h"
 
 /* Highest firmware API version supported */
-#define IWL9000_UCODE_API_MAX   43
+#define IWL9000_UCODE_API_MAX   46
 
 /* Lowest firmware API version supported */
 #define IWL9000_UCODE_API_MIN   30
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
index 431e13c6ee35..254a5ce52456 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
@@ -439,13 +439,10 @@ static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state)
 }
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir);
+void iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir);
 #else
-static inline int iwl_dbgfs_register(struct iwl_priv *priv,
-                                     struct dentry *dbgfs_dir)
-{
-        return 0;
-}
+static inline void iwl_dbgfs_register(struct iwl_priv *priv,
+                                      struct dentry *dbgfs_dir) { }
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
 #ifdef CONFIG_IWLWIFI_DEBUG
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
index 3d2e44a642de..d4b19673b06a 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
@@ -3,6 +3,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018 Intel Corporation
  *
  * 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
@@ -36,31 +37,8 @@
 
 /* create and remove of files */
 #define DEBUGFS_ADD_FILE(name, parent, mode) do {                       \
-        if (!debugfs_create_file(#name, mode, parent, priv,             \
-                                 &iwl_dbgfs_##name##_ops))              \
-                goto err;                                               \
-} while (0)
-
-#define DEBUGFS_ADD_BOOL(name, parent, ptr) do {                        \
-        struct dentry *__tmp;                                           \
-        __tmp = debugfs_create_bool(#name, 0600, parent, ptr);          \
-        if (IS_ERR(__tmp) || !__tmp)                                    \
-                goto err;                                               \
-} while (0)
-
-#define DEBUGFS_ADD_X32(name, parent, ptr) do {                         \
-        struct dentry *__tmp;                                           \
-        __tmp = debugfs_create_x32(#name, 0600, parent, ptr);           \
-        if (IS_ERR(__tmp) || !__tmp)                                    \
-                goto err;                                               \
-} while (0)
-
-#define DEBUGFS_ADD_U32(name, parent, ptr, mode) do {                   \
-        struct dentry *__tmp;                                           \
-        __tmp = debugfs_create_u32(#name, mode,                         \
-                                   parent, ptr);                        \
-        if (IS_ERR(__tmp) || !__tmp)                                    \
-                goto err;                                               \
+        debugfs_create_file(#name, mode, parent, priv,                  \
+                            &iwl_dbgfs_##name##_ops);                   \
 } while (0)
 
 /* file operation */
@@ -2238,7 +2216,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
         buf_size = min(count, sizeof(buf) -  1);
         if (copy_from_user(buf, user_buf, buf_size))
                 return -EFAULT;
-        if (sscanf(buf, "%d", &event_log_flag) != 1)
+        if (sscanf(buf, "%u", &event_log_flag) != 1)
                 return -EFAULT;
         if (event_log_flag == 1)
                 iwl_dump_nic_event_log(priv, true, NULL);
@@ -2347,21 +2325,15 @@ DEBUGFS_READ_WRITE_FILE_OPS(calib_disabled);
  * Create the debugfs files and directories
  *
  */
-int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir)
+void iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir)
 {
         struct dentry *dir_data, *dir_rf, *dir_debug;
 
         priv->debugfs_dir = dbgfs_dir;
 
         dir_data = debugfs_create_dir("data", dbgfs_dir);
-        if (!dir_data)
-                goto err;
         dir_rf = debugfs_create_dir("rf", dbgfs_dir);
-        if (!dir_rf)
-                goto err;
         dir_debug = debugfs_create_dir("debug", dbgfs_dir);
-        if (!dir_debug)
-                goto err;
 
         DEBUGFS_ADD_FILE(nvm, dir_data, 0400);
         DEBUGFS_ADD_FILE(sram, dir_data, 0600);
@@ -2421,13 +2393,6 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir)
 
                 snprintf(buf, 100, "../../%pd2", dev_dir);
 
-                if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf))
-                        goto err;
+                debugfs_create_symlink("iwlwifi", mac80211_dir, buf);
         }
-
-        return 0;
-
-err:
-        IWL_ERR(priv, "failed to create the dvm debugfs entries\n");
-        return -ENOMEM;
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
index bd3c3b921d4c..7c68a86ed9e1 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
@@ -1509,13 +1509,10 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
         if (iwlagn_mac_setup_register(priv, &fw->ucode_capa))
                 goto out_destroy_workqueue;
 
-        if (iwl_dbgfs_register(priv, dbgfs_dir))
-                goto out_mac80211_unregister;
+        iwl_dbgfs_register(priv, dbgfs_dir);
 
         return op_mode;
 
-out_mac80211_unregister:
-        iwlagn_mac_unregister(priv);
 out_destroy_workqueue:
         iwl_tt_exit(priv);
         iwl_cancel_deferred_work(priv);
@@ -1881,7 +1878,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                 return pos;
         }
 
-        if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log)
+        if (!(iwl_have_debug_level(IWL_DL_FW)) && !full_log)
                 size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
                         ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;
         IWL_ERR(priv, "Start IWL Event Log Dump: display last %u entries\n",
@@ -1897,7 +1894,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                 if (!*buf)
                         return -ENOMEM;
         }
-        if (iwl_have_debug_level(IWL_DL_FW_ERRORS) || full_log) {
+        if (iwl_have_debug_level(IWL_DL_FW) || full_log) {
                 /*
                  * if uCode has wrapped back to top of log,
                  * start at the oldest entry,
@@ -1927,7 +1924,7 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
         unsigned int reload_msec;
         unsigned long reload_jiffies;
 
-        if (iwl_have_debug_level(IWL_DL_FW_ERRORS))
+        if (iwl_have_debug_level(IWL_DL_FW))
                 iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);
 
         /* uCode is no longer loaded. */
@@ -1965,12 +1962,12 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
 
         if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
                 if (iwlwifi_mod_params.fw_restart) {
-                        IWL_DEBUG_FW_ERRORS(priv,
-                                  "Restarting adapter due to uCode error.\n");
+                        IWL_DEBUG_FW(priv,
+                                     "Restarting adapter due to uCode error.\n");
                         queue_work(priv->workqueue, &priv->restart);
                 } else
-                        IWL_DEBUG_FW_ERRORS(priv,
-                                  "Detected FW error, but not restarting\n");
+                        IWL_DEBUG_FW(priv,
+                                     "Detected FW error, but not restarting\n");
         }
 }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
index 6f17a5e24e82..e224b23f0ba8 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
@@ -2,6 +2,7 @@
  *
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2015 Intel Deutschland GmbH
+ * Copyright(c) 2018 Intel Corporation
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portionhelp of the ieee80211 subsystem header files.
@@ -592,7 +593,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv,
                 if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
                     RX_RES_STATUS_BAD_KEY_TTAK)
                         break;
-
+                /* fall through */
         case RX_RES_STATUS_SEC_TYPE_WEP:
                 if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
                     RX_RES_STATUS_BAD_ICV_MIC) {
@@ -601,6 +602,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv,
                         IWL_DEBUG_RX(priv, "Packet destroyed\n");
                         return -1;
                 }
+                /* fall through */
         case RX_RES_STATUS_SEC_TYPE_CCMP:
                 if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
                     RX_RES_STATUS_DECRYPT_OK) {
@@ -729,7 +731,7 @@ static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)
                         decrypt_out |= RX_RES_STATUS_BAD_KEY_TTAK;
                         break;
                 }
-                /* fall through if TTAK OK */
+                /* fall through */
         default:
                 if (!(decrypt_in & RX_MPDU_RES_STATUS_ICV_OK))
                         decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
index 8d7aafb4d9e9..f190f7beb3a8 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
@@ -3,6 +3,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2018        Intel Corporation
  *
  * 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
@@ -418,7 +419,7 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)
                 limit = (limits[1] * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;
                 limit /= 2;
                 dwell_time = min(limit, dwell_time);
-                /* fall through to limit further */
+                /* fall through */
         case 1:
                 limit = (limits[0] * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;
                 limit /= n_active;
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
index 32d000cffe9f..405038ce98d6 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
@@ -6,6 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2017        Intel Deutschland GmbH
+ * Copyright (C) 2019 Intel Corporation
  *
  * 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
@@ -26,6 +27,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2017        Intel Deutschland GmbH
+ * Copyright (C) 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -205,3 +207,33 @@ out:
         return dflt_pwr_limit;
 }
 IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit);
+
+int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)
+{
+        union acpi_object *wifi_pkg, *data;
+        int ret;
+
+        data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD);
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+
+        wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE);
+        if (IS_ERR(wifi_pkg)) {
+                ret = PTR_ERR(wifi_pkg);
+                goto out_free;
+        }
+
+        if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {
+                ret = -EINVAL;
+                goto out_free;
+        }
+
+        *extl_clk = wifi_pkg->package.elements[1].integer.value;
+
+        ret = 0;
+
+out_free:
+        kfree(data);
+        return ret;
+}
+IWL_EXPORT_SYMBOL(iwl_acpi_get_eckv);
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
index 7492dfb6729b..f5704e16643f 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2017        Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019        Intel Corporation
  *
  * 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
@@ -27,7 +27,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2017        Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019       Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,7 @@
 #define ACPI_WGDS_METHOD        "WGDS"
 #define ACPI_WRDD_METHOD        "WRDD"
 #define ACPI_SPLC_METHOD        "SPLC"
+#define ACPI_ECKV_METHOD        "ECKV"
 
 #define ACPI_WIFI_DOMAIN        (0x07)
 
@@ -86,6 +87,7 @@
 #define ACPI_WGDS_WIFI_DATA_SIZE        19
 #define ACPI_WRDD_WIFI_DATA_SIZE        2
 #define ACPI_SPLC_WIFI_DATA_SIZE        2
+#define ACPI_ECKV_WIFI_DATA_SIZE        2
 
 #define ACPI_WGDS_NUM_BANDS             2
 #define ACPI_WGDS_TABLE_SIZE            3
@@ -109,6 +111,17 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc);
 
 u64 iwl_acpi_get_pwr_limit(struct device *dev);
 
+/*
+ * iwl_acpi_get_eckv - read external clock validation from ACPI, if available
+ *
+ * @dev: the struct device
+ * @extl_clk: output var (2 bytes) that will get the clk indication.
+ *
+ * This function tries to read the external clock indication
+ * from ACPI if available.
+ */
+int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk);
+
 #else /* CONFIG_ACPI */
 
 static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
@@ -133,5 +146,10 @@ static inline u64 iwl_acpi_get_pwr_limit(struct device *dev)
         return 0;
 }
 
+static inline int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)
+{
+        return -ENOENT;
+}
+
 #endif /* CONFIG_ACPI */
 #endif /* __iwl_fw_acpi__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h b/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
index 08d3d8a190f6..df1bd0d2450e 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
@@ -96,14 +96,7 @@ enum {
 
 #define IWL_ALIVE_FLG_RFKILL    BIT(0)
 
-struct iwl_lmac_alive {
-        __le32 ucode_major;
-        __le32 ucode_minor;
-        u8 ver_subtype;
-        u8 ver_type;
-        u8 mac;
-        u8 opt;
-        __le32 timestamp;
+struct iwl_lmac_debug_addrs {
         __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;
@@ -112,13 +105,28 @@ struct iwl_lmac_alive {
         __le32 scd_base_ptr;            /* SRAM address for SCD */
         __le32 st_fwrd_addr;            /* pointer to Store and forward */
         __le32 st_fwrd_size;
+} __packed; /* UCODE_DEBUG_ADDRS_API_S_VER_2 */
+
+struct iwl_lmac_alive {
+        __le32 ucode_major;
+        __le32 ucode_minor;
+        u8 ver_subtype;
+        u8 ver_type;
+        u8 mac;
+        u8 opt;
+        __le32 timestamp;
+        struct iwl_lmac_debug_addrs dbg_ptrs;
 } __packed; /* UCODE_ALIVE_NTFY_API_S_VER_3 */
 
+struct iwl_umac_debug_addrs {
+        __le32 error_info_addr;         /* SRAM address for UMAC error log */
+        __le32 dbg_print_buff_addr;
+} __packed; /* UMAC_DEBUG_ADDRS_API_S_VER_1 */
+
 struct iwl_umac_alive {
         __le32 umac_major;              /* UMAC version: major */
         __le32 umac_minor;              /* UMAC version: minor */
-        __le32 error_info_addr;         /* SRAM address for UMAC error log */
-        __le32 dbg_print_buff_addr;
+        struct iwl_umac_debug_addrs dbg_ptrs;
 } __packed; /* UMAC_ALIVE_DATA_API_S_VER_2 */
 
 struct mvm_alive_resp_v3 {
@@ -189,4 +197,24 @@ struct iwl_card_state_notif {
         __le32 flags;
 } __packed; /* CARD_STATE_NTFY_API_S_VER_1 */
 
+/**
+ * enum iwl_error_recovery_flags - flags for error recovery cmd
+ * @ERROR_RECOVERY_UPDATE_DB: update db from blob sent
+ * @ERROR_RECOVERY_END_OF_RECOVERY: end of recovery
+ */
+enum iwl_error_recovery_flags {
+        ERROR_RECOVERY_UPDATE_DB = BIT(0),
+        ERROR_RECOVERY_END_OF_RECOVERY = BIT(1),
+};
+
+/**
+ * struct iwl_fw_error_recovery_cmd - recovery cmd sent upon assert
+ * @flags: &enum iwl_error_recovery_flags
+ * @buf_size: db buffer size in bytes
+ */
+struct iwl_fw_error_recovery_cmd {
+        __le32 flags;
+        __le32 buf_size;
+} __packed; /* ERROR_RECOVERY_CMD_HDR_API_S_VER_1 */
+
 #endif /* __iwl_fw_api_alive_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index 0290b333d860..4d2274bcc0b5 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -643,6 +643,11 @@ enum iwl_system_subcmd_ids {
          * @INIT_EXTENDED_CFG_CMD: &struct iwl_init_extended_cfg_cmd
          */
         INIT_EXTENDED_CFG_CMD = 0x03,
+
+        /**
+         * @FW_ERROR_RECOVERY_CMD: &struct iwl_fw_error_recovery_cmd
+         */
+        FW_ERROR_RECOVERY_CMD = 0x7,
 };
 
 #endif /* __iwl_fw_api_commands_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
index ab82b7a67967..33858787817b 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -25,7 +25,7 @@
  *
  * BSD LICENSE
  *
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,7 @@ struct iwl_fw_ini_header {
         __le32 tlv_version;
         __le32 apply_point;
         u8 data[];
-} __packed; /* FW_INI_HEADER_TLV_S */
+} __packed; /* FW_DEBUG_TLV_HEADER_S */
 
 /**
  * struct iwl_fw_ini_allocation_tlv - (IWL_FW_INI_TLV_TYPE_BUFFER_ALLOCATION)
@@ -92,7 +92,7 @@ struct iwl_fw_ini_allocation_tlv {
         __le32 size;
         __le32 max_fragments;
         __le32 min_frag_size;
-} __packed; /* FW_INI_BUFFER_ALLOCATION_TLV_S_VER_1 */
+} __packed; /* FW_DEBUG_TLV_BUFFER_ALLOCATION_TLV_S_VER_1 */
 
 /**
  * struct iwl_fw_ini_hcmd (IWL_FW_INI_TLV_TYPE_HCMD)
@@ -108,7 +108,7 @@ struct iwl_fw_ini_hcmd {
         u8 group;
         __le16 padding;
         u8 data[0];
-} __packed; /* FW_INI_HCMD_S */
+} __packed; /* FW_DEBUG_TLV_HCMD_DATA_S */
 
 /**
  * struct iwl_fw_ini_hcmd_tlv
@@ -118,7 +118,7 @@ struct iwl_fw_ini_hcmd {
 struct iwl_fw_ini_hcmd_tlv {
         struct iwl_fw_ini_header header;
         struct iwl_fw_ini_hcmd hcmd;
-} __packed; /* FW_INI_HCMD_TLV_S_VER_1 */
+} __packed; /* FW_DEBUG_TLV_HCMD_S_VER_1 */
 
 /*
  * struct iwl_fw_ini_debug_flow_tlv (IWL_FW_INI_TLV_TYPE_DEBUG_FLOW)
@@ -129,20 +129,50 @@ struct iwl_fw_ini_hcmd_tlv {
 struct iwl_fw_ini_debug_flow_tlv {
         struct iwl_fw_ini_header header;
         __le32 debug_flow_cfg;
-} __packed; /* FW_INI_DEBUG_FLOW_TLV_S_VER_1 */
+} __packed; /* FW_DEBUG_TLV_FLOW_TLV_S_VER_1 */
 
-#define IWL_FW_INI_MAX_REGION_ID        20
+#define IWL_FW_INI_MAX_REGION_ID        64
 #define IWL_FW_INI_MAX_NAME             32
+
+/**
+ * struct iwl_fw_ini_region_cfg_internal - meta data of internal memory region
+ * @num_of_range: the amount of ranges in the region
+ * @range_data_size: size of the data to read per range, in bytes.
+ */
+struct iwl_fw_ini_region_cfg_internal {
+        __le32 num_of_ranges;
+        __le32 range_data_size;
+} __packed; /* FW_DEBUG_TLV_REGION_NIC_INTERNAL_RANGES_S */
+
+/**
+ * struct iwl_fw_ini_region_cfg_fifos - meta data of fifos region
+ * @fid1: fifo id 1 - bitmap of lmac tx/rx fifos to include in the region
+ * @fid2: fifo id 2 - bitmap of umac rx fifos to include in the region.
+ *      It is unused for tx.
+ * @num_of_registers: number of prph registers in the region, each register is
+ *      4 bytes size.
+ * @header_only: none zero value indicates that this region does not include
+ *      fifo data and includes only the given registers.
+ */
+struct iwl_fw_ini_region_cfg_fifos {
+        __le32 fid1;
+        __le32 fid2;
+        __le32 num_of_registers;
+        __le32 header_only;
+} __packed; /* FW_DEBUG_TLV_REGION_FIFOS_S */
+
 /**
  * struct iwl_fw_ini_region_cfg
  * @region_id: ID of this dump configuration
  * @region_type: &enum iwl_fw_ini_region_type
  * @num_regions: amount of regions in the address array.
- * @allocation_id: For DRAM type field substitutes for allocation_id.
  * @name_len: name length
  * @name: file name to use for this region
- * @size: size of the data, in bytes.(unused for IWL_FW_INI_REGION_DRAM_BUFFER)
- * @start_addr: array of addresses. (unused for IWL_FW_INI_REGION_DRAM_BUFFER)
+ * @internal: used in case the region uses internal memory.
+ * @allocation_id: For DRAM type field substitutes for allocation_id
+ * @fifos: used in case of fifos region.
+ * @offset: offset to use for each memory base address
+ * @start_addr: array of addresses.
  */
 struct iwl_fw_ini_region_cfg {
         __le32 region_id;
@@ -150,32 +180,38 @@ struct iwl_fw_ini_region_cfg {
         __le32 name_len;
         u8 name[IWL_FW_INI_MAX_NAME];
         union {
-                __le32 num_regions;
+                struct iwl_fw_ini_region_cfg_internal internal;
                 __le32 allocation_id;
+                struct iwl_fw_ini_region_cfg_fifos fifos;
         };
-        __le32 size;
+        __le32 offset;
         __le32 start_addr[];
-} __packed; /* FW_INI_REGION_CONFIG_S */
+} __packed; /* FW_DEBUG_TLV_REGION_CONFIG_S */
 
 /**
  * struct iwl_fw_ini_region_tlv - (IWL_FW_INI_TLV_TYPE_REGION_CFG)
  * DUMP sections define IDs and triggers that use those IDs TLV
  * @header: header
  * @num_regions: how many different region section and IDs are coming next
- * @iwl_fw_ini_dump dump_config: list of dump configurations
+ * @region_config: list of dump configurations
  */
 struct iwl_fw_ini_region_tlv {
         struct iwl_fw_ini_header header;
         __le32 num_regions;
         struct iwl_fw_ini_region_cfg region_config[];
-} __packed; /* FW_INI_REGION_CFG_S */
+} __packed; /* FW_DEBUG_TLV_REGIONS_S_VER_1 */
 
 /**
  * struct iwl_fw_ini_trigger - (IWL_FW_INI_TLV_TYPE_DUMP_CFG)
  * Region sections define IDs and triggers that use those IDs TLV
  *
  * @trigger_id: enum &iwl_fw_ini_tigger_id
- * @ignore_default: override FW TLV with binary TLV
+ * @override_trig: determines how apply trigger in case a trigger with the
+ *      same id is already in use. Using the first 2 bytes:
+ *      Byte 0: if 0, override trigger configuration, otherwise use the
+ *      existing configuration.
+ *      Byte 1: if 0, override trigger regions, otherwise append regions to
+ *      existing trigger.
  * @dump_delay: delay from trigger fire to dump, in usec
  * @occurrences: max amount of times to be fired
  * @ignore_consec: ignore consecutive triggers, in usec
@@ -187,7 +223,7 @@ struct iwl_fw_ini_region_tlv {
  */
 struct iwl_fw_ini_trigger {
         __le32 trigger_id;
-        __le32 ignore_default;
+        __le32 override_trig;
         __le32 dump_delay;
         __le32 occurrences;
         __le32 ignore_consec;
@@ -196,7 +232,7 @@ struct iwl_fw_ini_trigger {
         __le32 trigger_data;
         __le32 num_regions;
         __le32 data[];
-} __packed; /* FW_INI_TRIGGER_CONFIG_S */
+} __packed; /* FW_TLV_DEBUG_TRIGGER_CONFIG_S */
 
 /**
  * struct iwl_fw_ini_trigger_tlv - (IWL_FW_INI_TLV_TYPE_TRIGGERS_CFG)
@@ -210,20 +246,17 @@ struct iwl_fw_ini_trigger_tlv {
         struct iwl_fw_ini_header header;
         __le32 num_triggers;
         struct iwl_fw_ini_trigger trigger_config[];
-} __packed; /* FW_INI_TRIGGER_CFG_S */
+} __packed; /* FW_TLV_DEBUG_TRIGGERS_S_VER_1 */
 
 /**
  * enum iwl_fw_ini_trigger_id
  * @IWL_FW_TRIGGER_ID_FW_ASSERT: FW assert
- * @IWL_FW_TRIGGER_ID_FW_TFD_Q_HANG: TFD queue hang
  * @IWL_FW_TRIGGER_ID_FW_HW_ERROR: HW assert
- * @IWL_FW_TRIGGER_ID_FW_TRIGGER_ERROR: FW error notification
- * @IWL_FW_TRIGGER_ID_FW_TRIGGER_WARNING: FW warning notification
- * @IWL_FW_TRIGGER_ID_FW_TRIGGER_INFO: FW info notification
- * @IWL_FW_TRIGGER_ID_FW_TRIGGER_DEBUG: FW debug notification
+ * @IWL_FW_TRIGGER_ID_FW_TFD_Q_HANG: TFD queue hang
+ * @IWL_FW_TRIGGER_ID_FW_DEBUG_HOST_TRIGGER: FW debug notification
+ * @IWL_FW_TRIGGER_ID_FW_GENERIC_NOTIFOCATION: FW generic notification
  * @IWL_FW_TRIGGER_ID_USER_TRIGGER: User trigger
  * @IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY: peer inactivity
- * @FW_DEBUG_TLV_TRIGGER_ID_HOST_DID_INITIATED_EVENT: undefined
  * @IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED: TX latency
  *      threshold was crossed
  * @IWL_FW_TRIGGER_ID_HOST_TX_RESPONSE_STATUS_FAILED: TX failed
@@ -257,50 +290,53 @@ struct iwl_fw_ini_trigger_tlv {
  * @IWL_FW_TRIGGER_ID_NUM: number of trigger IDs
  */
 enum iwl_fw_ini_trigger_id {
+        IWL_FW_TRIGGER_ID_INVALID                               = 0,
+
         /* Errors triggers */
         IWL_FW_TRIGGER_ID_FW_ASSERT                             = 1,
-        IWL_FW_TRIGGER_ID_FW_TFD_Q_HANG                         = 2,
-        IWL_FW_TRIGGER_ID_FW_HW_ERROR                           = 3,
-        /* Generic triggers */
-        IWL_FW_TRIGGER_ID_FW_TRIGGER_ERROR                      = 4,
-        IWL_FW_TRIGGER_ID_FW_TRIGGER_WARNING                    = 5,
-        IWL_FW_TRIGGER_ID_FW_TRIGGER_INFO                       = 6,
-        IWL_FW_TRIGGER_ID_FW_TRIGGER_DEBUG                      = 7,
-        /* User Trigger */
-        IWL_FW_TRIGGER_ID_USER_TRIGGER                          = 8,
+        IWL_FW_TRIGGER_ID_FW_HW_ERROR                           = 2,
+        IWL_FW_TRIGGER_ID_FW_TFD_Q_HANG                         = 3,
+
+        /* FW triggers */
+        IWL_FW_TRIGGER_ID_FW_DEBUG_HOST_TRIGGER                 = 4,
+        IWL_FW_TRIGGER_ID_FW_GENERIC_NOTIFOCATION               = 5,
+
+        /* User trigger */
+        IWL_FW_TRIGGER_ID_USER_TRIGGER                          = 6,
+
         /* Host triggers */
-        IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY           = 9,
-        IWL_FW_TRIGGER_ID_HOST_DID_INITIATED_EVENT              = 10,
-        IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED     = 11,
-        IWL_FW_TRIGGER_ID_HOST_TX_RESPONSE_STATUS_FAILED        = 12,
-        IWL_FW_TRIGGER_ID_HOST_OS_REQ_DEAUTH_PEER               = 13,
-        IWL_FW_TRIGGER_ID_HOST_STOP_GO_REQUEST                  = 14,
-        IWL_FW_TRIGGER_ID_HOST_START_GO_REQUEST                 = 15,
-        IWL_FW_TRIGGER_ID_HOST_JOIN_GROUP_REQUEST               = 16,
-        IWL_FW_TRIGGER_ID_HOST_SCAN_START                       = 17,
-        IWL_FW_TRIGGER_ID_HOST_SCAN_SUBITTED                    = 18,
-        IWL_FW_TRIGGER_ID_HOST_SCAN_PARAMS                      = 19,
-        IWL_FW_TRIGGER_ID_HOST_CHECK_FOR_HANG                   = 20,
-        IWL_FW_TRIGGER_ID_HOST_BAR_RECEIVED                     = 21,
-        IWL_FW_TRIGGER_ID_HOST_AGG_TX_RESPONSE_STATUS_FAILED    = 22,
-        IWL_FW_TRIGGER_ID_HOST_EAPOL_TX_RESPONSE_FAILED         = 23,
-        IWL_FW_TRIGGER_ID_HOST_FAKE_TX_RESPONSE_SUSPECTED       = 24,
-        IWL_FW_TRIGGER_ID_HOST_AUTH_REQ_FROM_ASSOC_CLIENT       = 25,
-        IWL_FW_TRIGGER_ID_HOST_ROAM_COMPLETE                    = 26,
-        IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAST_FAILED           = 27,
-        IWL_FW_TRIGGER_ID_HOST_D3_START                         = 28,
-        IWL_FW_TRIGGER_ID_HOST_D3_END                           = 29,
-        IWL_FW_TRIGGER_ID_HOST_BSS_MISSED_BEACONS               = 30,
-        IWL_FW_TRIGGER_ID_HOST_P2P_CLIENT_MISSED_BEACONS        = 31,
-        IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_TX_FAILURES          = 32,
-        IWL_FW_TRIGGER_ID_HOST_TX_WFD_ACTION_FRAME_FAILED       = 33,
-        IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAILED                = 34,
-        IWL_FW_TRIGGER_ID_HOST_SCAN_COMPLETE                    = 35,
-        IWL_FW_TRIGGER_ID_HOST_SCAN_ABORT                       = 36,
-        IWL_FW_TRIGGER_ID_HOST_NIC_ALIVE                        = 37,
-        IWL_FW_TRIGGER_ID_HOST_CHANNEL_SWITCH_COMPLETE          = 38,
+        IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY           = 7,
+        IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED     = 8,
+        IWL_FW_TRIGGER_ID_HOST_TX_RESPONSE_STATUS_FAILED        = 9,
+        IWL_FW_TRIGGER_ID_HOST_OS_REQ_DEAUTH_PEER               = 10,
+        IWL_FW_TRIGGER_ID_HOST_STOP_GO_REQUEST                  = 11,
+        IWL_FW_TRIGGER_ID_HOST_START_GO_REQUEST                 = 12,
+        IWL_FW_TRIGGER_ID_HOST_JOIN_GROUP_REQUEST               = 13,
+        IWL_FW_TRIGGER_ID_HOST_SCAN_START                       = 14,
+        IWL_FW_TRIGGER_ID_HOST_SCAN_SUBMITTED                   = 15,
+        IWL_FW_TRIGGER_ID_HOST_SCAN_PARAMS                      = 16,
+        IWL_FW_TRIGGER_ID_HOST_CHECK_FOR_HANG                   = 17,
+        IWL_FW_TRIGGER_ID_HOST_BAR_RECEIVED                     = 18,
+        IWL_FW_TRIGGER_ID_HOST_AGG_TX_RESPONSE_STATUS_FAILED    = 19,
+        IWL_FW_TRIGGER_ID_HOST_EAPOL_TX_RESPONSE_FAILED         = 20,
+        IWL_FW_TRIGGER_ID_HOST_FAKE_TX_RESPONSE_SUSPECTED       = 21,
+        IWL_FW_TRIGGER_ID_HOST_AUTH_REQ_FROM_ASSOC_CLIENT       = 22,
+        IWL_FW_TRIGGER_ID_HOST_ROAM_COMPLETE                    = 23,
+        IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAST_FAILED           = 24,
+        IWL_FW_TRIGGER_ID_HOST_D3_START                         = 25,
+        IWL_FW_TRIGGER_ID_HOST_D3_END                           = 26,
+        IWL_FW_TRIGGER_ID_HOST_BSS_MISSED_BEACONS               = 27,
+        IWL_FW_TRIGGER_ID_HOST_P2P_CLIENT_MISSED_BEACONS        = 28,
+        IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_TX_FAILURES          = 29,
+        IWL_FW_TRIGGER_ID_HOST_TX_WFD_ACTION_FRAME_FAILED       = 30,
+        IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAILED                = 31,
+        IWL_FW_TRIGGER_ID_HOST_SCAN_COMPLETE                    = 32,
+        IWL_FW_TRIGGER_ID_HOST_SCAN_ABORT                       = 33,
+        IWL_FW_TRIGGER_ID_HOST_NIC_ALIVE                        = 34,
+        IWL_FW_TRIGGER_ID_HOST_CHANNEL_SWITCH_COMPLETE          = 35,
+
         IWL_FW_TRIGGER_ID_NUM,
-}; /* FW_INI_TRIGGER_ID_E_VER_1 */
+}; /* FW_DEBUG_TLV_TRIGGER_ID_E_VER_1 */
 
 /**
  * enum iwl_fw_ini_apply_point
@@ -320,7 +356,7 @@ enum iwl_fw_ini_apply_point {
         IWL_FW_INI_APPLY_MISSED_BEACONS,
         IWL_FW_INI_APPLY_SCAN_COMPLETE,
         IWL_FW_INI_APPLY_NUM,
-}; /* FW_INI_APPLY_POINT_E_VER_1 */
+}; /* FW_DEBUG_TLV_APPLY_POINT_E_VER_1 */
 
 /**
  * enum iwl_fw_ini_allocation_id
@@ -340,7 +376,7 @@ enum iwl_fw_ini_allocation_id {
         IWL_FW_INI_ALLOCATION_ID_SDFX,
         IWL_FW_INI_ALLOCATION_ID_FW_DUMP,
         IWL_FW_INI_ALLOCATION_ID_USER_DEFINED,
-}; /* FW_INI_ALLOCATION_ID_E_VER_1 */
+}; /* FW_DEBUG_TLV_ALLOCATION_ID_E_VER_1 */
 
 /**
  * enum iwl_fw_ini_buffer_location
@@ -349,10 +385,10 @@ enum iwl_fw_ini_allocation_id {
  * @IWL_FW_INI_LOCATION_DRAM_PATH: DRAM location
  */
 enum iwl_fw_ini_buffer_location {
-        IWL_FW_INI_LOCATION_SRAM_INVALID,
+        IWL_FW_INI_LOCATION_INVALID,
         IWL_FW_INI_LOCATION_SRAM_PATH,
         IWL_FW_INI_LOCATION_DRAM_PATH,
-}; /* FW_INI_BUFFER_LOCATION_E_VER_1 */
+}; /* FW_DEBUG_TLV_BUFFER_LOCATION_E_VER_1 */
 
 /**
  * enum iwl_fw_ini_debug_flow
@@ -364,7 +400,7 @@ enum iwl_fw_ini_debug_flow {
         IWL_FW_INI_DEBUG_INVALID,
         IWL_FW_INI_DEBUG_DBTR_FLOW,
         IWL_FW_INI_DEBUG_TB2DTF_FLOW,
-}; /* FW_INI_DEBUG_FLOW_E_VER_1 */
+}; /* FW_DEBUG_TLV_FLOW_E_VER_1 */
 
 /**
  * enum iwl_fw_ini_region_type
@@ -396,6 +432,6 @@ enum iwl_fw_ini_region_type {
         IWL_FW_INI_REGION_PAGING,
         IWL_FW_INI_REGION_CSR,
         IWL_FW_INI_REGION_NUM
-}; /* FW_INI_REGION_TYPE_E_VER_1*/
+}; /* FW_DEBUG_TLV_REGION_TYPE_E_VER_1 */
 
 #endif
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
index 6da91ec0df55..5dddb21c1c4d 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
@@ -7,6 +7,7 @@
  *
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
  * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2019 Intel Corporation
  *
  * 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
@@ -28,6 +29,7 @@
  *
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
  * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -322,7 +324,7 @@ enum iwl_tof_location_query {
 };
 
  /**
- * struct iwl_tof_range_req_ap_entry - AP configuration parameters
+ * struct iwl_tof_range_req_ap_entry_v2 - AP configuration parameters
  * @channel_num: Current AP Channel
  * @bandwidth: Current AP Bandwidth. One of iwl_tof_bandwidth.
  * @tsf_delta_direction: TSF relatively to the subject AP
@@ -355,7 +357,7 @@ enum iwl_tof_location_query {
  * @notify_mcsi: &enum iwl_tof_mcsi_ntfy.
  * @reserved: For alignment and future use
  */
-struct iwl_tof_range_req_ap_entry {
+struct iwl_tof_range_req_ap_entry_v2 {
         u8 channel_num;
         u8 bandwidth;
         u8 tsf_delta_direction;
@@ -374,6 +376,62 @@ struct iwl_tof_range_req_ap_entry {
         u8 algo_type;
         u8 notify_mcsi;
         __le16 reserved;
+} __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_2 */
+
+/**
+ * enum iwl_initiator_ap_flags - per responder FTM configuration flags
+ * @IWL_INITIATOR_AP_FLAGS_ASAP: Request for ASAP measurement.
+ * @IWL_INITIATOR_AP_FLAGS_LCI_REQUEST: Request for LCI information
+ * @IWL_INITIATOR_AP_FLAGS_CIVIC_REQUEST: Request for CIVIC information
+ * @IWL_INITIATOR_AP_FLAGS_DYN_ACK: Send HT/VHT ack for FTM frames. If not set,
+ *      20Mhz dup acks will be sent.
+ * @IWL_INITIATOR_AP_FLAGS_ALGO_LR: Use LR algo type for rtt calculation.
+ *      Default algo type is ML.
+ * @IWL_INITIATOR_AP_FLAGS_ALGO_FFT: Use FFT algo type for rtt calculation.
+ *      Default algo type is ML.
+ * @IWL_INITIATOR_AP_FLAGS_MCSI_REPORT: Send the MCSI for each FTM frame to the
+ *      driver.
+ */
+enum iwl_initiator_ap_flags {
+        IWL_INITIATOR_AP_FLAGS_ASAP = BIT(1),
+        IWL_INITIATOR_AP_FLAGS_LCI_REQUEST = BIT(2),
+        IWL_INITIATOR_AP_FLAGS_CIVIC_REQUEST = BIT(3),
+        IWL_INITIATOR_AP_FLAGS_DYN_ACK = BIT(4),
+        IWL_INITIATOR_AP_FLAGS_ALGO_LR = BIT(5),
+        IWL_INITIATOR_AP_FLAGS_ALGO_FFT = BIT(6),
+        IWL_INITIATOR_AP_FLAGS_MCSI_REPORT = BIT(8),
+};
+
+/**
+ * struct iwl_tof_range_req_ap_entry - AP configuration parameters
+ * @initiator_ap_flags: see &enum iwl_initiator_ap_flags.
+ * @channel_num: AP Channel number
+ * @bandwidth: AP bandwidth. One of iwl_tof_bandwidth.
+ * @ctrl_ch_position: Coding of the control channel position relative to the
+ *      center frequency, see iwl_mvm_get_ctrl_pos().
+ * @ftmr_max_retries: Max number of retries to send the FTMR in case of no
+ *      reply from the AP.
+ * @bssid: AP's BSSID
+ * @burst_period: Recommended value to be sent to the AP. Measurement
+ *      periodicity In units of 100ms. ignored if num_of_bursts_exp = 0
+ * @samples_per_burst: the number of FTMs pairs in single Burst (1-31);
+ * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of
+ *      the number of measurement iterations (min 2^0 = 1, max 2^14)
+ * @reserved: For alignment and future use
+ * @tsf_delta: not in use
+ */
+struct iwl_tof_range_req_ap_entry {
+        __le32 initiator_ap_flags;
+        u8 channel_num;
+        u8 bandwidth;
+        u8 ctrl_ch_position;
+        u8 ftmr_max_retries;
+        u8 bssid[ETH_ALEN];
+        __le16 burst_period;
+        u8 samples_per_burst;
+        u8 num_of_bursts;
+        __le16 reserved;
+        __le32 tsf_delta;
 } __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_3 */
 
 /**
@@ -403,7 +461,12 @@ enum iwl_tof_response_mode {
  * @IWL_TOF_INITIATOR_FLAGS_TX_CHAIN_SEL_A: use antenna A fo TX ACKs during FTM
  * @IWL_TOF_INITIATOR_FLAGS_TX_CHAIN_SEL_B: use antenna B fo TX ACKs during FTM
  * @IWL_TOF_INITIATOR_FLAGS_TX_CHAIN_SEL_C: use antenna C fo TX ACKs during FTM
- * @IWL_TOF_INITIATOR_FLAGS_MINDELTA_NO_PREF: no preference for minDeltaFTM
+ * @IWL_TOF_INITIATOR_FLAGS_MACADDR_RANDOM: use random mac address for FTM
+ * @IWL_TOF_INITIATOR_FLAGS_SPECIFIC_CALIB: use the specific calib value from
+ *      the range request command
+ * @IWL_TOF_INITIATOR_FLAGS_COMMON_CALIB: use the common calib value from the
+ *      ragne request command
+ * @IWL_TOF_INITIATOR_FLAGS_NON_ASAP_SUPPORT: support non-asap measurements
  */
 enum iwl_tof_initiator_flags {
         IWL_TOF_INITIATOR_FLAGS_FAST_ALGO_DISABLED = BIT(0),
@@ -413,14 +476,17 @@ enum iwl_tof_initiator_flags {
         IWL_TOF_INITIATOR_FLAGS_TX_CHAIN_SEL_A = BIT(4),
         IWL_TOF_INITIATOR_FLAGS_TX_CHAIN_SEL_B = BIT(5),
         IWL_TOF_INITIATOR_FLAGS_TX_CHAIN_SEL_C = BIT(6),
-        IWL_TOF_INITIATOR_FLAGS_MINDELTA_NO_PREF = BIT(7),
+        IWL_TOF_INITIATOR_FLAGS_MACADDR_RANDOM = BIT(7),
+        IWL_TOF_INITIATOR_FLAGS_SPECIFIC_CALIB = BIT(15),
+        IWL_TOF_INITIATOR_FLAGS_COMMON_CALIB   = BIT(16),
+        IWL_TOF_INITIATOR_FLAGS_NON_ASAP_SUPPORT = BIT(20),
 }; /* LOCATION_RANGE_REQ_CMD_API_S_VER_5 */
 
 #define IWL_MVM_TOF_MAX_APS 5
 #define IWL_MVM_TOF_MAX_TWO_SIDED_APS 5
 
 /**
- * struct iwl_tof_range_req_cmd - start measurement cmd
+ * struct iwl_tof_range_req_cmd_v5 - start measurement cmd
  * @initiator_flags: see flags @ iwl_tof_initiator_flags
  * @request_id: A Token incremented per request. The same Token will be
  *              sent back in the range response
@@ -448,7 +514,7 @@ enum iwl_tof_initiator_flags {
  * @specific_calib: The specific calib value to inject to this measurement calc
  * @ap: per-AP request data
  */
-struct iwl_tof_range_req_cmd {
+struct iwl_tof_range_req_cmd_v5 {
         __le32 initiator_flags;
         u8 request_id;
         u8 initiator;
@@ -465,10 +531,42 @@ struct iwl_tof_range_req_cmd {
         u8 ftm_tx_chains;
         __le16 common_calib;
         __le16 specific_calib;
-        struct iwl_tof_range_req_ap_entry ap[IWL_MVM_TOF_MAX_APS];
+        struct iwl_tof_range_req_ap_entry_v2 ap[IWL_MVM_TOF_MAX_APS];
 } __packed;
 /* LOCATION_RANGE_REQ_CMD_API_S_VER_5 */
 
+/**
+ * struct iwl_tof_range_req_cmd - start measurement cmd
+ * @initiator_flags: see flags @ iwl_tof_initiator_flags
+ * @request_id: A Token incremented per request. The same Token will be
+ *              sent back in the range response
+ * @num_of_ap: Number of APs to measure (error if > IWL_MVM_TOF_MAX_APS)
+ * @range_req_bssid: ranging request BSSID
+ * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.
+ *                Bits set to 1 shall be randomized by the UMAC
+ * @macaddr_template: MAC address template to use for non-randomized bits
+ * @req_timeout_ms: Requested timeout of the response in units of milliseconds.
+ *      This is the session time for completing the measurement.
+ * @tsf_mac_id: report the measurement start time for each ap in terms of the
+ *      TSF of this mac id. 0xff to disable TSF reporting.
+ * @common_calib: The common calib value to inject to this measurement calc
+ * @specific_calib: The specific calib value to inject to this measurement calc
+ * @ap: per-AP request data, see &struct iwl_tof_range_req_ap_entry_v2.
+ */
+struct iwl_tof_range_req_cmd {
+        __le32 initiator_flags;
+        u8 request_id;
+        u8 num_of_ap;
+        u8 range_req_bssid[ETH_ALEN];
+        u8 macaddr_mask[ETH_ALEN];
+        u8 macaddr_template[ETH_ALEN];
+        __le32 req_timeout_ms;
+        __le32 tsf_mac_id;
+        __le16 common_calib;
+        __le16 specific_calib;
+        struct iwl_tof_range_req_ap_entry ap[IWL_MVM_TOF_MAX_APS];
+} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_7 */
+
 /*
  * enum iwl_tof_range_request_status - status of the sent request
  * @IWL_TOF_RANGE_REQUEST_STATUS_SUCCESSFUL - FW successfully received the
@@ -528,7 +626,7 @@ enum iwl_tof_entry_status {
 }; /* LOCATION_RANGE_RSP_AP_ENTRY_NTFY_API_S_VER_2 */
 
 /**
- * struct iwl_tof_range_rsp_ap_entry_ntfy - AP parameters (response)
+ * struct iwl_tof_range_rsp_ap_entry_ntfy_v3 - AP parameters (response)
  * @bssid: BSSID of the AP
  * @measure_status: current APs measurement status, one of
  *      &enum iwl_tof_entry_status.
@@ -555,7 +653,7 @@ enum iwl_tof_entry_status {
  * @papd_calib_output: The result of the tof papd calibration that was injected
  *      into the algorithm.
  */
-struct iwl_tof_range_rsp_ap_entry_ntfy {
+struct iwl_tof_range_rsp_ap_entry_ntfy_v3 {
         u8 bssid[ETH_ALEN];
         u8 measure_status;
         u8 measure_bw;
@@ -577,6 +675,59 @@ struct iwl_tof_range_rsp_ap_entry_ntfy {
 } __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_3 */
 
 /**
+ * struct iwl_tof_range_rsp_ap_entry_ntfy - AP parameters (response)
+ * @bssid: BSSID of the AP
+ * @measure_status: current APs measurement status, one of
+ *      &enum iwl_tof_entry_status.
+ * @measure_bw: Current AP Bandwidth: 0  20MHz, 1  40MHz, 2  80MHz
+ * @rtt: The Round Trip Time that took for the last measurement for
+ *      current AP [pSec]
+ * @rtt_variance: The Variance of the RTT values measured for current AP
+ * @rtt_spread: The Difference between the maximum and the minimum RTT
+ *      values measured for current AP in the current session [pSec]
+ * @rssi: RSSI as uploaded in the Channel Estimation notification
+ * @rssi_spread: The Difference between the maximum and the minimum RSSI values
+ *      measured for current AP in the current session
+ * @last_burst: 1 if no more FTM sessions are scheduled for this responder
+ * @refusal_period: refusal period in case of
+ *      @IWL_TOF_ENTRY_RESPONDER_CANNOT_COLABORATE [sec]
+ * @timestamp: The GP2 Clock [usec] where Channel Estimation notification was
+ *      uploaded by the LMAC
+ * @start_tsf: measurement start time in TSF of the mac specified in the range
+ *      request
+ * @rx_rate_n_flags: rate and flags of the last FTM frame received from this
+ *      responder
+ * @tx_rate_n_flags: rate and flags of the last ack sent to this responder
+ * @t2t3_initiator: as calculated from the algo in the initiator
+ * @t1t4_responder: as calculated from the algo in the responder
+ * @common_calib: Calib val that was used in for this AP measurement
+ * @specific_calib: val that was used in for this AP measurement
+ * @papd_calib_output: The result of the tof papd calibration that was injected
+ *      into the algorithm.
+ */
+struct iwl_tof_range_rsp_ap_entry_ntfy {
+        u8 bssid[ETH_ALEN];
+        u8 measure_status;
+        u8 measure_bw;
+        __le32 rtt;
+        __le32 rtt_variance;
+        __le32 rtt_spread;
+        s8 rssi;
+        u8 rssi_spread;
+        u8 last_burst;
+        u8 refusal_period;
+        __le32 timestamp;
+        __le32 start_tsf;
+        __le32 rx_rate_n_flags;
+        __le32 tx_rate_n_flags;
+        __le32 t2t3_initiator;
+        __le32 t1t4_responder;
+        __le16 common_calib;
+        __le16 specific_calib;
+        __le32 papd_calib_output;
+} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_4 */
+
+/**
  * enum iwl_tof_response_status - tof response status
  *
  * @IWL_TOF_RESPONSE_SUCCESS: successful range.
@@ -593,7 +744,7 @@ enum iwl_tof_response_status {
 }; /* LOCATION_RNG_RSP_STATUS */
 
 /**
- * struct iwl_tof_range_rsp_ntfy - ranging response notification
+ * struct iwl_tof_range_rsp_ntfy_v5 - ranging response notification
  * @request_id: A Token ID of the corresponding Range request
  * @request_status: status of current measurement session, one of
  *      &enum iwl_tof_response_status.
@@ -601,13 +752,29 @@ enum iwl_tof_response_status {
  * @num_of_aps: Number of APs to measure (error if > IWL_MVM_TOF_MAX_APS)
  * @ap: per-AP data
  */
-struct iwl_tof_range_rsp_ntfy {
+struct iwl_tof_range_rsp_ntfy_v5 {
         u8 request_id;
         u8 request_status;
         u8 last_in_batch;
         u8 num_of_aps;
+        struct iwl_tof_range_rsp_ap_entry_ntfy_v3 ap[IWL_MVM_TOF_MAX_APS];
+} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_5 */
+
+/**
+ * struct iwl_tof_range_rsp_ntfy - ranging response notification
+ * @request_id: A Token ID of the corresponding Range request
+ * @num_of_aps: Number of APs results
+ * @last_report: 1 if no more FTM sessions are scheduled, 0 otherwise.
+ * @reserved: reserved
+ * @ap: per-AP data
+ */
+struct iwl_tof_range_rsp_ntfy {
+        u8 request_id;
+        u8 num_of_aps;
+        u8 last_report;
+        u8 reserved;
         struct iwl_tof_range_rsp_ap_entry_ntfy ap[IWL_MVM_TOF_MAX_APS];
-} __packed;
+} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_6 */
 
 #define IWL_MVM_TOF_MCSI_BUF_SIZE  (245)
 /**
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
index ca49db786ed6..6b4d59daacd6 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
@@ -74,6 +74,10 @@ enum iwl_mac_conf_subcmd_ids {
          */
         LOW_LATENCY_CMD = 0x3,
         /**
+         * @CHANNEL_SWITCH_TIME_EVENT_CMD: &struct iwl_chan_switch_te_cmd
+         */
+        CHANNEL_SWITCH_TIME_EVENT_CMD = 0x4,
+        /**
          * @PROBE_RESPONSE_DATA_NOTIF: &struct iwl_probe_resp_data_notif
          */
         PROBE_RESPONSE_DATA_NOTIF = 0xFC,
@@ -136,6 +140,29 @@ struct iwl_channel_switch_noa_notif {
 } __packed; /* CHANNEL_SWITCH_START_NTFY_API_S_VER_1 */
 
 /**
+ * struct iwl_chan_switch_te_cmd - Channel Switch Time Event command
+ *
+ * @mac_id: MAC ID for channel switch
+ * @action: action to perform, one of FW_CTXT_ACTION_*
+ * @tsf: beacon tsf
+ * @cs_count: channel switch count from CSA/eCSA IE
+ * @cs_delayed_bcn_count: if set to N (!= 0) GO/AP can delay N beacon intervals
+ *      at the new channel after the channel switch, otherwise (N == 0) expect
+ *      beacon right after the channel switch.
+ * @cs_mode: 1 - quiet, 0 - otherwise
+ * @reserved: reserved for alignment purposes
+ */
+struct iwl_chan_switch_te_cmd {
+        __le32 mac_id;
+        __le32 action;
+        __le32 tsf;
+        u8 cs_count;
+        u8 cs_delayed_bcn_count;
+        u8 cs_mode;
+        u8 reserved;
+} __packed; /* MAC_CHANNEL_SWITCH_TIME_EVENT_S_VER_2 */
+
+/**
  * struct iwl_mac_low_latency_cmd - set/clear mac to 'low-latency mode'
  *
  * @mac_id: MAC ID to whom to apply the low-latency configurations
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
index 286a22da232d..01f003c6cff9 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -200,9 +200,16 @@ struct iwl_powertable_cmd {
  * @DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK:
  *      '1' Allow to save power by turning off
  *      receiver and transmitter. '0' - does not allow.
+ * @DEVICE_POWER_FLAGS_ALLOW_MEM_RETENTION_MSK:
+ *      Device Retention indication, '1' indicate retention is enabled.
+ * @DEVICE_POWER_FLAGS_32K_CLK_VALID_MSK:
+ *      32Khz external slow clock valid indication, '1' indicate cloack is
+ *      valid.
 */
 enum iwl_device_power_flags {
-        DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK   = BIT(0),
+        DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK           = BIT(0),
+        DEVICE_POWER_FLAGS_ALLOW_MEM_RETENTION_MSK      = BIT(1),
+        DEVICE_POWER_FLAGS_32K_CLK_VALID_MSK            = BIT(12),
 };
 
 /**
@@ -470,6 +477,13 @@ struct iwl_geo_tx_power_profiles_resp {
  * @ba_escape_timer: Fully receive and parse beacon if no beacons were passed
  *      for a longer period of time then this escape-timeout. Units: Beacons.
  * @ba_enable_beacon_abort: 1, beacon abort is enabled; 0, disabled.
+ * @bf_threshold_absolute_low: See below.
+ * @bf_threshold_absolute_high: Send Beacon to driver if Energy value calculated
+ *      for this beacon crossed this absolute threshold. For the 'Increase'
+ *      direction the bf_energy_absolute_low[i] is used. For the 'Decrease'
+ *      direction the bf_energy_absolute_high[i] is used. Zero value means
+ *      that this specific threshold is ignored for beacon filtering, and
+ *      beacon will not be forced to be sent to driver due to this setting.
  */
 struct iwl_beacon_filter_cmd {
         __le32 bf_energy_delta;
@@ -483,7 +497,9 @@ struct iwl_beacon_filter_cmd {
         __le32 bf_escape_timer;
         __le32 ba_escape_timer;
         __le32 ba_enable_beacon_abort;
-} __packed;
+        __le32 bf_threshold_absolute_low[2];
+        __le32 bf_threshold_absolute_high[2];
+} __packed; /* BEACON_FILTER_CONFIG_API_S_VER_4 */
 
 /* Beacon filtering and beacon abort */
 #define IWL_BF_ENERGY_DELTA_DEFAULT 5
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
index 18741889ec30..890a939c463d 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -434,7 +434,7 @@ struct iwl_periodic_scan_complete {
 /* The maximum of either of these cannot exceed 8, because we use an
  * 8-bit mask (see IWL_MVM_SCAN_MASK in mvm.h).
  */
-#define IWL_MVM_MAX_UMAC_SCANS 8
+#define IWL_MVM_MAX_UMAC_SCANS 4
 #define IWL_MVM_MAX_LMAC_SCANS 1
 
 enum scan_config_flags {
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
index 358bdf051e83..8511e735c374 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
@@ -847,13 +847,13 @@ struct iwl_beacon_notif {
 } __packed;
 
 /**
- * struct iwl_extended_beacon_notif - notifies about beacon transmission
+ * struct iwl_extended_beacon_notif_v5 - notifies about beacon transmission
  * @beacon_notify_hdr: tx response command associated with the beacon
  * @tsf: last beacon tsf
  * @ibss_mgr_status: whether IBSS is manager
  * @gp2: last beacon time in gp2
  */
-struct iwl_extended_beacon_notif {
+struct iwl_extended_beacon_notif_v5 {
         struct iwl_mvm_tx_resp beacon_notify_hdr;
         __le64 tsf;
         __le32 ibss_mgr_status;
@@ -861,6 +861,20 @@ struct iwl_extended_beacon_notif {
 } __packed; /* BEACON_NTFY_API_S_VER_5 */
 
 /**
+ * struct iwl_extended_beacon_notif - notifies about beacon transmission
+ * @status: the status of the Tx response of the beacon
+ * @tsf: last beacon tsf
+ * @ibss_mgr_status: whether IBSS is manager
+ * @gp2: last beacon time in gp2
+ */
+struct iwl_extended_beacon_notif {
+        __le32 status;
+        __le64 tsf;
+        __le32 ibss_mgr_status;
+        __le32 gp2;
+} __packed; /* BEACON_NTFY_API_S_VER_6_ */
+
+/**
  * enum iwl_dump_control - dump (flush) control flags
  * @DUMP_TX_FIFO_FLUSH: Dump MSDUs until the the FIFO is empty
  *      and the TFD queues are empty.
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 22efd94da6d3..f119c49cd39c 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -242,7 +242,8 @@ static void iwl_fw_dump_rxf(struct iwl_fw_runtime *fwrt,
                                   cfg->lmac[0].rxfifo1_size, 0, 0);
                 /* Pull RXF2 */
                 iwl_fwrt_dump_rxf(fwrt, dump_data, cfg->rxfifo2_size,
-                                  RXF_DIFF_FROM_PREV, 1);
+                                  RXF_DIFF_FROM_PREV +
+                                  fwrt->trans->cfg->umac_prph_offset, 1);
                 /* Pull LMAC2 RXF1 */
                 if (fwrt->smem_cfg.num_lmacs > 1)
                         iwl_fwrt_dump_rxf(fwrt, dump_data,
@@ -673,7 +674,9 @@ static void iwl_fw_prph_handler(struct iwl_fw_runtime *fwrt, void *ptr,
 {
         u32 range_len;
 
-        if (fwrt->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22000) {
+        if (fwrt->trans->cfg->device_family >= IWL_DEVICE_FAMILY_AX210) {
+                /* TODO */
+        } else if (fwrt->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22000) {
                 range_len = ARRAY_SIZE(iwl_prph_dump_addr_22000);
                 handler(fwrt, iwl_prph_dump_addr_22000, range_len, ptr);
         } else {
@@ -707,28 +710,6 @@ static void iwl_fw_dump_mem(struct iwl_fw_runtime *fwrt,
         IWL_DEBUG_INFO(fwrt, "WRT memory dump. Type=%u\n", dump_mem->type);
 }
 
-static void iwl_fw_dump_named_mem(struct iwl_fw_runtime *fwrt,
-                                  struct iwl_fw_error_dump_data **dump_data,
-                                  u32 len, u32 ofs, u8 *name, u8 name_len)
-{
-        struct iwl_fw_error_dump_named_mem *dump_mem;
-
-        if (!len)
-                return;
-
-        (*dump_data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
-        (*dump_data)->len = cpu_to_le32(len + sizeof(*dump_mem));
-        dump_mem = (void *)(*dump_data)->data;
-        dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_NAMED_MEM);
-        dump_mem->offset = cpu_to_le32(ofs);
-        dump_mem->name_len = name_len;
-        memcpy(dump_mem->name, name, name_len);
-        iwl_trans_read_mem_bytes(fwrt->trans, ofs, dump_mem->data, len);
-        *dump_data = iwl_fw_error_next_data(*dump_data);
-
-        IWL_DEBUG_INFO(fwrt, "WRT memory dump. Type=%u\n", dump_mem->type);
-}
-
 #define ADD_LEN(len, item_len, const_len) \
         do {size_t item = item_len; len += (!!item) * const_len + item; } \
         while (0)
@@ -815,6 +796,9 @@ static void iwl_dump_paging(struct iwl_fw_runtime *fwrt,
                                         DMA_BIDIRECTIONAL);
                 memcpy(paging->data, page_address(pages),
                        PAGING_BLOCK_SIZE);
+                dma_sync_single_for_device(fwrt->trans->dev, addr,
+                                           PAGING_BLOCK_SIZE,
+                                           DMA_BIDIRECTIONAL);
                 (*data) = iwl_fw_error_next_data(*data);
         }
 }
@@ -1059,117 +1043,645 @@ out:
         return dump_file;
 }
 
-static void iwl_dump_prph_ini(struct iwl_trans *trans,
-                              struct iwl_fw_error_dump_data **data,
-                              struct iwl_fw_ini_region_cfg *reg)
+static int iwl_dump_ini_prph_iter(struct iwl_fw_runtime *fwrt,
+                                  struct iwl_fw_ini_region_cfg *reg,
+                                  void *range_ptr, int idx)
 {
-        struct iwl_fw_error_dump_prph *prph;
+        struct iwl_fw_ini_error_dump_range *range = range_ptr;
+        __le32 *val = range->data;
+        u32 addr, prph_val, offset = le32_to_cpu(reg->offset);
+        int i;
+
+        range->start_addr = reg->start_addr[idx];
+        range->range_data_size = reg->internal.range_data_size;
+        for (i = 0; i < le32_to_cpu(reg->internal.range_data_size); i += 4) {
+                addr = le32_to_cpu(range->start_addr) + i;
+                prph_val = iwl_read_prph(fwrt->trans, addr + offset);
+                if (prph_val == 0x5a5a5a5a)
+                        return -EBUSY;
+                *val++ = cpu_to_le32(prph_val);
+        }
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+static int iwl_dump_ini_csr_iter(struct iwl_fw_runtime *fwrt,
+                                 struct iwl_fw_ini_region_cfg *reg,
+                                 void *range_ptr, int idx)
+{
+        struct iwl_fw_ini_error_dump_range *range = range_ptr;
+        __le32 *val = range->data;
+        u32 addr, offset = le32_to_cpu(reg->offset);
+        int i;
+
+        range->start_addr = reg->start_addr[idx];
+        range->range_data_size = reg->internal.range_data_size;
+        for (i = 0; i < le32_to_cpu(reg->internal.range_data_size); i += 4) {
+                addr = le32_to_cpu(range->start_addr) + i;
+                *val++ = cpu_to_le32(iwl_trans_read32(fwrt->trans,
+                                                      addr + offset));
+        }
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+static int iwl_dump_ini_dev_mem_iter(struct iwl_fw_runtime *fwrt,
+                                     struct iwl_fw_ini_region_cfg *reg,
+                                     void *range_ptr, int idx)
+{
+        struct iwl_fw_ini_error_dump_range *range = range_ptr;
+        u32 addr = le32_to_cpu(range->start_addr);
+        u32 offset = le32_to_cpu(reg->offset);
+
+        range->start_addr = reg->start_addr[idx];
+        range->range_data_size = reg->internal.range_data_size;
+        iwl_trans_read_mem_bytes(fwrt->trans, addr + offset, range->data,
+                                 le32_to_cpu(reg->internal.range_data_size));
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+static int
+iwl_dump_ini_paging_gen2_iter(struct iwl_fw_runtime *fwrt,
+                              struct iwl_fw_ini_region_cfg *reg,
+                              void *range_ptr, int idx)
+{
+        struct iwl_fw_ini_error_dump_range *range = range_ptr;
+        u32 page_size = fwrt->trans->init_dram.paging[idx].size;
+
+        range->start_addr = cpu_to_le32(idx);
+        range->range_data_size = cpu_to_le32(page_size);
+        memcpy(range->data, fwrt->trans->init_dram.paging[idx].block,
+               page_size);
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+static int iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt,
+                                    struct iwl_fw_ini_region_cfg *reg,
+                                    void *range_ptr, int idx)
+{
+        /* increase idx by 1 since the pages are from 1 to
+         * fwrt->num_of_paging_blk + 1
+         */
+        struct page *page = fwrt->fw_paging_db[++idx].fw_paging_block;
+        struct iwl_fw_ini_error_dump_range *range = range_ptr;
+        dma_addr_t addr = fwrt->fw_paging_db[idx].fw_paging_phys;
+        u32 page_size = fwrt->fw_paging_db[idx].fw_paging_size;
+
+        range->start_addr = cpu_to_le32(idx);
+        range->range_data_size = cpu_to_le32(page_size);
+        dma_sync_single_for_cpu(fwrt->trans->dev, addr, page_size,
+                                DMA_BIDIRECTIONAL);
+        memcpy(range->data, page_address(page), page_size);
+        dma_sync_single_for_device(fwrt->trans->dev, addr, page_size,
+                                   DMA_BIDIRECTIONAL);
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+static int
+iwl_dump_ini_mon_dram_iter(struct iwl_fw_runtime *fwrt,
+                           struct iwl_fw_ini_region_cfg *reg, void *range_ptr,
+                           int idx)
+{
+        struct iwl_fw_ini_error_dump_range *range = range_ptr;
+        u32 start_addr = iwl_read_umac_prph(fwrt->trans,
+                                            MON_BUFF_BASE_ADDR_VER2);
+
+        if (start_addr == 0x5a5a5a5a)
+                return -EBUSY;
+
+        range->start_addr = cpu_to_le32(start_addr);
+        range->range_data_size = cpu_to_le32(fwrt->trans->fw_mon[idx].size);
+
+        memcpy(range->data, fwrt->trans->fw_mon[idx].block,
+               fwrt->trans->fw_mon[idx].size);
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+struct iwl_ini_txf_iter_data {
+        int fifo;
+        int lmac;
+        u32 fifo_size;
+        bool internal_txf;
+        bool init;
+};
+
+static bool iwl_ini_txf_iter(struct iwl_fw_runtime *fwrt,
+                             struct iwl_fw_ini_region_cfg *reg)
+{
+        struct iwl_ini_txf_iter_data *iter = fwrt->dump.fifo_iter;
+        struct iwl_fwrt_shared_mem_cfg *cfg = &fwrt->smem_cfg;
+        int txf_num = cfg->num_txfifo_entries;
+        int int_txf_num = ARRAY_SIZE(cfg->internal_txfifo_size);
+        u32 lmac_bitmap = le32_to_cpu(reg->fifos.fid1);
+
+        if (!iter)
+                return false;
+
+        if (iter->init) {
+                if (le32_to_cpu(reg->offset) &&
+                    WARN_ONCE(cfg->num_lmacs == 1,
+                              "Invalid lmac offset: 0x%x\n",
+                              le32_to_cpu(reg->offset)))
+                        return false;
+
+                iter->init = false;
+                iter->internal_txf = false;
+                iter->fifo_size = 0;
+                iter->fifo = -1;
+                if (le32_to_cpu(reg->offset))
+                        iter->lmac = 1;
+                else
+                        iter->lmac = 0;
+        }
+
+        if (!iter->internal_txf)
+                for (iter->fifo++; iter->fifo < txf_num; iter->fifo++) {
+                        iter->fifo_size =
+                                cfg->lmac[iter->lmac].txfifo_size[iter->fifo];
+                        if (iter->fifo_size && (lmac_bitmap & BIT(iter->fifo)))
+                                return true;
+                }
+
+        iter->internal_txf = true;
+
+        if (!fw_has_capa(&fwrt->fw->ucode_capa,
+                         IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG))
+                return false;
+
+        for (iter->fifo++; iter->fifo < int_txf_num + txf_num; iter->fifo++) {
+                iter->fifo_size =
+                        cfg->internal_txfifo_size[iter->fifo - txf_num];
+                if (iter->fifo_size && (lmac_bitmap & BIT(iter->fifo)))
+                        return true;
+        }
+
+        return false;
+}
+
+static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,
+                                 struct iwl_fw_ini_region_cfg *reg,
+                                 void *range_ptr, int idx)
+{
+        struct iwl_fw_ini_fifo_error_dump_range *range = range_ptr;
+        struct iwl_ini_txf_iter_data *iter;
+        u32 offs = le32_to_cpu(reg->offset), addr;
+        u32 registers_size =
+                le32_to_cpu(reg->fifos.num_of_registers) * sizeof(__le32);
+        __le32 *val = range->data;
         unsigned long flags;
-        u32 i, size = le32_to_cpu(reg->num_regions);
+        int i;
 
-        IWL_DEBUG_INFO(trans, "WRT PRPH dump\n");
+        if (!iwl_ini_txf_iter(fwrt, reg))
+                return -EIO;
 
-        if (!iwl_trans_grab_nic_access(trans, &flags))
+        if (!iwl_trans_grab_nic_access(fwrt->trans, &flags))
+                return -EBUSY;
+
+        iter = fwrt->dump.fifo_iter;
+
+        range->fifo_num = cpu_to_le32(iter->fifo);
+        range->num_of_registers = reg->fifos.num_of_registers;
+        range->range_data_size = cpu_to_le32(iter->fifo_size + registers_size);
+
+        iwl_write_prph_no_grab(fwrt->trans, TXF_LARC_NUM + offs, iter->fifo);
+
+        /* read txf registers */
+        for (i = 0; i < le32_to_cpu(reg->fifos.num_of_registers); i++) {
+                addr = le32_to_cpu(reg->start_addr[i]) + offs;
+
+                *val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr));
+        }
+
+        if (reg->fifos.header_only) {
+                range->range_data_size = cpu_to_le32(registers_size);
+                goto out;
+        }
+
+        /* Set the TXF_READ_MODIFY_ADDR to TXF_WR_PTR */
+        iwl_write_prph_no_grab(fwrt->trans, TXF_READ_MODIFY_ADDR + offs,
+                               TXF_WR_PTR + offs);
+
+        /* Dummy-read to advance the read pointer to the head */
+        iwl_read_prph_no_grab(fwrt->trans, TXF_READ_MODIFY_DATA + offs);
+
+        /* Read FIFO */
+        addr = TXF_READ_MODIFY_DATA + offs;
+        for (i = 0; i < iter->fifo_size; i += sizeof(__le32))
+                *val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr));
+
+out:
+        iwl_trans_release_nic_access(fwrt->trans, &flags);
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+struct iwl_ini_rxf_data {
+        u32 fifo_num;
+        u32 size;
+        u32 offset;
+};
+
+static void iwl_ini_get_rxf_data(struct iwl_fw_runtime *fwrt,
+                                 struct iwl_fw_ini_region_cfg *reg,
+                                 struct iwl_ini_rxf_data *data)
+{
+        u32 fid1 = le32_to_cpu(reg->fifos.fid1);
+        u32 fid2 = le32_to_cpu(reg->fifos.fid2);
+        u32 fifo_idx;
+
+        if (!data)
                 return;
 
-        for (i = 0; i < size; i++) {
-                (*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PRPH);
-                (*data)->len = cpu_to_le32(le32_to_cpu(reg->size) +
-                                           sizeof(*prph));
-                prph = (void *)(*data)->data;
-                prph->prph_start = reg->start_addr[i];
-                prph->data[0] = cpu_to_le32(iwl_read_prph_no_grab(trans,
-                                                                  le32_to_cpu(prph->prph_start)));
-                *data = iwl_fw_error_next_data(*data);
+        memset(data, 0, sizeof(*data));
+
+        if (WARN_ON_ONCE((fid1 && fid2) || (!fid1 && !fid2)))
+                return;
+
+        fifo_idx = ffs(fid1) - 1;
+        if (fid1 && !WARN_ON_ONCE((~BIT(fifo_idx) & fid1) ||
+                                  fifo_idx >= MAX_NUM_LMAC)) {
+                data->size = fwrt->smem_cfg.lmac[fifo_idx].rxfifo1_size;
+                data->fifo_num = fifo_idx;
+                return;
+        }
+
+        fifo_idx = ffs(fid2) - 1;
+        if (fid2 && !WARN_ON_ONCE(fifo_idx != 0)) {
+                data->size = fwrt->smem_cfg.rxfifo2_size;
+                data->offset = RXF_DIFF_FROM_PREV;
+                /* use bit 31 to distinguish between umac and lmac rxf while
+                 * parsing the dump
+                 */
+                data->fifo_num = fifo_idx | IWL_RXF_UMAC_BIT;
+                return;
         }
-        iwl_trans_release_nic_access(trans, &flags);
 }
 
-static void iwl_dump_csr_ini(struct iwl_trans *trans,
-                             struct iwl_fw_error_dump_data **data,
-                             struct iwl_fw_ini_region_cfg *reg)
+static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,
+                                 struct iwl_fw_ini_region_cfg *reg,
+                                 void *range_ptr, int idx)
 {
-        int i, num = le32_to_cpu(reg->num_regions);
-        u32 size = le32_to_cpu(reg->size);
+        struct iwl_fw_ini_fifo_error_dump_range *range = range_ptr;
+        struct iwl_ini_rxf_data rxf_data;
+        u32 offs = le32_to_cpu(reg->offset), addr;
+        u32 registers_size =
+                le32_to_cpu(reg->fifos.num_of_registers) * sizeof(__le32);
+        __le32 *val = range->data;
+        unsigned long flags;
+        int i;
+
+        iwl_ini_get_rxf_data(fwrt, reg, &rxf_data);
+        if (!rxf_data.size)
+                return -EIO;
 
-        IWL_DEBUG_INFO(trans, "WRT CSR dump\n");
+        if (!iwl_trans_grab_nic_access(fwrt->trans, &flags))
+                return -EBUSY;
 
-        for (i = 0; i < num; i++) {
-                u32 add = le32_to_cpu(reg->start_addr[i]);
-                __le32 *val;
-                int j;
+        offs += rxf_data.offset;
 
-                (*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_CSR);
-                (*data)->len = cpu_to_le32(size);
-                val = (void *)(*data)->data;
+        range->fifo_num = cpu_to_le32(rxf_data.fifo_num);
+        range->num_of_registers = reg->fifos.num_of_registers;
+        range->range_data_size = cpu_to_le32(rxf_data.size + registers_size);
 
-                for (j = 0; j < size; j += 4)
-                        *val++ = cpu_to_le32(iwl_trans_read32(trans, j + add));
+        /* read rxf registers */
+        for (i = 0; i < le32_to_cpu(reg->fifos.num_of_registers); i++) {
+                addr = le32_to_cpu(reg->start_addr[i]) + offs;
 
-                *data = iwl_fw_error_next_data(*data);
+                *val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr));
+        }
+
+        if (reg->fifos.header_only) {
+                range->range_data_size = cpu_to_le32(registers_size);
+                goto out;
+        }
+
+        /* Lock fence */
+        iwl_write_prph_no_grab(fwrt->trans, RXF_SET_FENCE_MODE + offs, 0x1);
+        /* Set fence pointer to the same place like WR pointer */
+        iwl_write_prph_no_grab(fwrt->trans, RXF_LD_WR2FENCE + offs, 0x1);
+        /* Set fence offset */
+        iwl_write_prph_no_grab(fwrt->trans, RXF_LD_FENCE_OFFSET_ADDR + offs,
+                               0x0);
+
+        /* Read FIFO */
+        addr =  RXF_FIFO_RD_FENCE_INC + offs;
+        for (i = 0; i < rxf_data.size; i += sizeof(__le32))
+                *val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr));
+
+out:
+        iwl_trans_release_nic_access(fwrt->trans, &flags);
+
+        return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
+static void *iwl_dump_ini_mem_fill_header(struct iwl_fw_runtime *fwrt,
+                                          struct iwl_fw_ini_region_cfg *reg,
+                                          void *data)
+{
+        struct iwl_fw_ini_error_dump *dump = data;
+
+        return dump->ranges;
+}
+
+static void
+*iwl_dump_ini_mon_dram_fill_header(struct iwl_fw_runtime *fwrt,
+                                   struct iwl_fw_ini_region_cfg *reg,
+                                   void *data)
+{
+        struct iwl_fw_ini_monitor_dram_dump *mon_dump = (void *)data;
+        u32 write_ptr, cycle_cnt;
+        unsigned long flags;
+
+        if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) {
+                IWL_ERR(fwrt, "Failed to get DRAM monitor header\n");
+                return NULL;
         }
+        write_ptr = iwl_read_umac_prph_no_grab(fwrt->trans,
+                                               MON_BUFF_WRPTR_VER2);
+        cycle_cnt = iwl_read_umac_prph_no_grab(fwrt->trans,
+                                               MON_BUFF_CYCLE_CNT_VER2);
+        iwl_trans_release_nic_access(fwrt->trans, &flags);
+
+        mon_dump->write_ptr = cpu_to_le32(write_ptr);
+        mon_dump->cycle_cnt = cpu_to_le32(cycle_cnt);
+
+        return mon_dump->ranges;
+}
+
+static void *iwl_dump_ini_fifo_fill_header(struct iwl_fw_runtime *fwrt,
+                                           struct iwl_fw_ini_region_cfg *reg,
+                                           void *data)
+{
+        struct iwl_fw_ini_fifo_error_dump *dump = data;
+
+        return dump->ranges;
+}
+
+static u32 iwl_dump_ini_mem_ranges(struct iwl_fw_runtime *fwrt,
+                                   struct iwl_fw_ini_region_cfg *reg)
+{
+        return le32_to_cpu(reg->internal.num_of_ranges);
+}
+
+static u32 iwl_dump_ini_paging_gen2_ranges(struct iwl_fw_runtime *fwrt,
+                                           struct iwl_fw_ini_region_cfg *reg)
+{
+        return fwrt->trans->init_dram.paging_cnt;
+}
+
+static u32 iwl_dump_ini_paging_ranges(struct iwl_fw_runtime *fwrt,
+                                      struct iwl_fw_ini_region_cfg *reg)
+{
+        return fwrt->num_of_paging_blk;
+}
+
+static u32 iwl_dump_ini_mon_dram_ranges(struct iwl_fw_runtime *fwrt,
+                                        struct iwl_fw_ini_region_cfg *reg)
+{
+        return 1;
+}
+
+static u32 iwl_dump_ini_txf_ranges(struct iwl_fw_runtime *fwrt,
+                                   struct iwl_fw_ini_region_cfg *reg)
+{
+        struct iwl_ini_txf_iter_data iter = { .init = true };
+        void *fifo_iter = fwrt->dump.fifo_iter;
+        u32 num_of_fifos = 0;
+
+        fwrt->dump.fifo_iter = &iter;
+        while (iwl_ini_txf_iter(fwrt, reg))
+                num_of_fifos++;
+
+        fwrt->dump.fifo_iter = fifo_iter;
+
+        return num_of_fifos;
+}
+
+static u32 iwl_dump_ini_rxf_ranges(struct iwl_fw_runtime *fwrt,
+                                   struct iwl_fw_ini_region_cfg *reg)
+{
+        /* Each Rx fifo needs a different offset and therefore, it's
+         * region can contain only one fifo, i.e. 1 memory range.
+         */
+        return 1;
+}
+
+static u32 iwl_dump_ini_mem_get_size(struct iwl_fw_runtime *fwrt,
+                                     struct iwl_fw_ini_region_cfg *reg)
+{
+        return sizeof(struct iwl_fw_ini_error_dump) +
+                iwl_dump_ini_mem_ranges(fwrt, reg) *
+                (sizeof(struct iwl_fw_ini_error_dump_range) +
+                 le32_to_cpu(reg->internal.range_data_size));
+}
+
+static u32 iwl_dump_ini_paging_gen2_get_size(struct iwl_fw_runtime *fwrt,
+                                             struct iwl_fw_ini_region_cfg *reg)
+{
+        int i;
+        u32 range_header_len = sizeof(struct iwl_fw_ini_error_dump_range);
+        u32 size = sizeof(struct iwl_fw_ini_error_dump);
+
+        for (i = 0; i < iwl_dump_ini_paging_gen2_ranges(fwrt, reg); i++)
+                size += range_header_len +
+                        fwrt->trans->init_dram.paging[i].size;
+
+        return size;
+}
+
+static u32 iwl_dump_ini_paging_get_size(struct iwl_fw_runtime *fwrt,
+                                        struct iwl_fw_ini_region_cfg *reg)
+{
+        int i;
+        u32 range_header_len = sizeof(struct iwl_fw_ini_error_dump_range);
+        u32 size = sizeof(struct iwl_fw_ini_error_dump);
+
+        for (i = 1; i <= iwl_dump_ini_paging_ranges(fwrt, reg); i++)
+                size += range_header_len + fwrt->fw_paging_db[i].fw_paging_size;
+
+        return size;
+}
+
+static u32 iwl_dump_ini_mon_dram_get_size(struct iwl_fw_runtime *fwrt,
+                                          struct iwl_fw_ini_region_cfg *reg)
+{
+        u32 size = sizeof(struct iwl_fw_ini_monitor_dram_dump);
+
+        if (fwrt->trans->num_blocks)
+                size += fwrt->trans->fw_mon[0].size;
+
+        return size;
+}
+
+static u32 iwl_dump_ini_txf_get_size(struct iwl_fw_runtime *fwrt,
+                                     struct iwl_fw_ini_region_cfg *reg)
+{
+        struct iwl_ini_txf_iter_data iter = { .init = true };
+        void *fifo_iter = fwrt->dump.fifo_iter;
+        u32 size = 0;
+        u32 fifo_hdr = sizeof(struct iwl_fw_ini_fifo_error_dump_range) +
+                le32_to_cpu(reg->fifos.num_of_registers) * sizeof(__le32);
+
+        fwrt->dump.fifo_iter = &iter;
+        while (iwl_ini_txf_iter(fwrt, reg)) {
+                size += fifo_hdr;
+                if (!reg->fifos.header_only)
+                        size += iter.fifo_size;
+        }
+
+        if (size)
+                size += sizeof(struct iwl_fw_ini_fifo_error_dump);
+
+        fwrt->dump.fifo_iter = fifo_iter;
+
+        return size;
+}
+
+static u32 iwl_dump_ini_rxf_get_size(struct iwl_fw_runtime *fwrt,
+                                     struct iwl_fw_ini_region_cfg *reg)
+{
+        struct iwl_ini_rxf_data rx_data;
+        u32 size = sizeof(struct iwl_fw_ini_fifo_error_dump) +
+                sizeof(struct iwl_fw_ini_fifo_error_dump_range) +
+                le32_to_cpu(reg->fifos.num_of_registers) * sizeof(__le32);
+
+        if (reg->fifos.header_only)
+                return size;
+
+        iwl_ini_get_rxf_data(fwrt, reg, &rx_data);
+        size += rx_data.size;
+
+        return size;
+}
+
+/**
+ * struct iwl_dump_ini_mem_ops - ini memory dump operations
+ * @get_num_of_ranges: returns the number of memory ranges in the region.
+ * @get_size: returns the total size of the region.
+ * @fill_mem_hdr: fills region type specific headers and returns pointer to
+ *      the first range or NULL if failed to fill headers.
+ * @fill_range: copies a given memory range into the dump.
+ *      Returns the size of the range or negative error value otherwise.
+ */
+struct iwl_dump_ini_mem_ops {
+        u32 (*get_num_of_ranges)(struct iwl_fw_runtime *fwrt,
+                                 struct iwl_fw_ini_region_cfg *reg);
+        u32 (*get_size)(struct iwl_fw_runtime *fwrt,
+                        struct iwl_fw_ini_region_cfg *reg);
+        void *(*fill_mem_hdr)(struct iwl_fw_runtime *fwrt,
+                              struct iwl_fw_ini_region_cfg *reg, void *data);
+        int (*fill_range)(struct iwl_fw_runtime *fwrt,
+                          struct iwl_fw_ini_region_cfg *reg, void *range,
+                          int idx);
+};
+
+/**
+ * iwl_dump_ini_mem - copy a memory region into the dump
+ * @fwrt: fw runtime struct.
+ * @data: dump memory data.
+ * @reg: region to copy to the dump.
+ */
+static void
+iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt,
+                 enum iwl_fw_ini_region_type type,
+                 struct iwl_fw_error_dump_data **data,
+                 struct iwl_fw_ini_region_cfg *reg,
+                 struct iwl_dump_ini_mem_ops *ops)
+{
+        struct iwl_fw_ini_error_dump_header *header = (void *)(*data)->data;
+        void *range;
+        u32 num_of_ranges, i;
+
+        if (WARN_ON(!ops || !ops->get_num_of_ranges || !ops->get_size ||
+                    !ops->fill_mem_hdr || !ops->fill_range))
+                return;
+
+        num_of_ranges = ops->get_num_of_ranges(fwrt, reg);
+
+        (*data)->type = cpu_to_le32(type | INI_DUMP_BIT);
+        (*data)->len = cpu_to_le32(ops->get_size(fwrt, reg));
+
+        header->num_of_ranges = cpu_to_le32(num_of_ranges);
+        header->name_len = cpu_to_le32(min_t(int, IWL_FW_INI_MAX_NAME,
+                                             le32_to_cpu(reg->name_len)));
+        memcpy(header->name, reg->name, le32_to_cpu(header->name_len));
+
+        range = ops->fill_mem_hdr(fwrt, reg, header);
+        if (!range) {
+                IWL_ERR(fwrt, "Failed to fill region header: id=%d, type=%d\n",
+                        le32_to_cpu(reg->region_id), type);
+                return;
+        }
+
+        for (i = 0; i < num_of_ranges; i++) {
+                int range_size = ops->fill_range(fwrt, reg, range, i);
+
+                if (range_size < 0) {
+                        IWL_ERR(fwrt, "Failed to dump region: id=%d, type=%d\n",
+                                le32_to_cpu(reg->region_id), type);
+                        return;
+                }
+                range = range + range_size;
+        }
+        *data = iwl_fw_error_next_data(*data);
 }
 
 static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt,
                                       struct iwl_fw_ini_trigger *trigger)
 {
-        int i, num, size = 0, hdr_len = sizeof(struct iwl_fw_error_dump_data);
+        int i, size = 0, hdr_len = sizeof(struct iwl_fw_error_dump_data);
 
         if (!trigger || !trigger->num_regions)
                 return 0;
 
-        num = le32_to_cpu(trigger->num_regions);
-        for (i = 0; i < num; i++) {
+        for (i = 0; i < le32_to_cpu(trigger->num_regions); i++) {
                 u32 reg_id = le32_to_cpu(trigger->data[i]);
                 struct iwl_fw_ini_region_cfg *reg;
                 enum iwl_fw_ini_region_type type;
-                u32 num_entries;
 
                 if (WARN_ON(reg_id >= ARRAY_SIZE(fwrt->dump.active_regs)))
                         continue;
 
-                reg = fwrt->dump.active_regs[reg_id].reg;
+                reg = fwrt->dump.active_regs[reg_id];
                 if (WARN(!reg, "Unassigned region %d\n", reg_id))
                         continue;
 
                 type = le32_to_cpu(reg->region_type);
-                num_entries = le32_to_cpu(reg->num_regions);
-
                 switch (type) {
                 case IWL_FW_INI_REGION_DEVICE_MEMORY:
-                        size += hdr_len +
-                                sizeof(struct iwl_fw_error_dump_named_mem) +
-                                le32_to_cpu(reg->size);
-                        break;
                 case IWL_FW_INI_REGION_PERIPHERY_MAC:
                 case IWL_FW_INI_REGION_PERIPHERY_PHY:
                 case IWL_FW_INI_REGION_PERIPHERY_AUX:
-                        size += num_entries *
-                                (hdr_len +
-                                 sizeof(struct iwl_fw_error_dump_prph) +
-                                 sizeof(u32));
+                case IWL_FW_INI_REGION_INTERNAL_BUFFER:
+                case IWL_FW_INI_REGION_CSR:
+                        size += hdr_len + iwl_dump_ini_mem_get_size(fwrt, reg);
                         break;
                 case IWL_FW_INI_REGION_TXF:
-                        size += iwl_fw_txf_len(fwrt, &fwrt->smem_cfg);
+                        size += hdr_len + iwl_dump_ini_txf_get_size(fwrt, reg);
                         break;
                 case IWL_FW_INI_REGION_RXF:
-                        size += iwl_fw_rxf_len(fwrt, &fwrt->smem_cfg);
+                        size += hdr_len + iwl_dump_ini_rxf_get_size(fwrt, reg);
                         break;
-                case IWL_FW_INI_REGION_PAGING:
-                        if (!iwl_fw_dbg_is_paging_enabled(fwrt))
-                                break;
-                        size += fwrt->num_of_paging_blk *
-                                (hdr_len +
-                                 sizeof(struct iwl_fw_error_dump_paging) +
-                                 PAGING_BLOCK_SIZE);
-                        break;
-                case IWL_FW_INI_REGION_CSR:
-                        size += num_entries *
-                                (hdr_len + le32_to_cpu(reg->size));
+                case IWL_FW_INI_REGION_PAGING: {
+                        size += hdr_len;
+                        if (iwl_fw_dbg_is_paging_enabled(fwrt)) {
+                                size += iwl_dump_ini_paging_get_size(fwrt, reg);
+                        } else {
+                                size += iwl_dump_ini_paging_gen2_get_size(fwrt,
+                                                                          reg);
+                        }
                         break;
+                }
                 case IWL_FW_INI_REGION_DRAM_BUFFER:
-                        /* Transport takes care of DRAM dumping */
-                case IWL_FW_INI_REGION_INTERNAL_BUFFER:
+                        if (!fwrt->trans->num_blocks)
+                                break;
+                        size += hdr_len +
+                                iwl_dump_ini_mon_dram_get_size(fwrt, reg);
+                        break;
                 case IWL_FW_INI_REGION_DRAM_IMR:
                         /* Undefined yet */
                 default:
@@ -1181,8 +1693,7 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt,
 
 static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,
                                     struct iwl_fw_ini_trigger *trigger,
-                                    struct iwl_fw_error_dump_data **data,
-                                    u32 *dump_mask)
+                                    struct iwl_fw_error_dump_data **data)
 {
         int i, num = le32_to_cpu(trigger->num_regions);
 
@@ -1190,11 +1701,12 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,
                 u32 reg_id = le32_to_cpu(trigger->data[i]);
                 enum iwl_fw_ini_region_type type;
                 struct iwl_fw_ini_region_cfg *reg;
+                struct iwl_dump_ini_mem_ops ops;
 
                 if (reg_id >= ARRAY_SIZE(fwrt->dump.active_regs))
                         continue;
 
-                reg = fwrt->dump.active_regs[reg_id].reg;
+                reg = fwrt->dump.active_regs[reg_id];
                 /* Don't warn, get_trigger_len already warned */
                 if (!reg)
                         continue;
@@ -1202,39 +1714,75 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,
                 type = le32_to_cpu(reg->region_type);
                 switch (type) {
                 case IWL_FW_INI_REGION_DEVICE_MEMORY:
-                        if (WARN_ON(le32_to_cpu(reg->num_regions) > 1))
-                                continue;
-                        iwl_fw_dump_named_mem(fwrt, data,
-                                              le32_to_cpu(reg->size),
-                                              le32_to_cpu(reg->start_addr[0]),
-                                              reg->name,
-                                              le32_to_cpu(reg->name_len));
+                case IWL_FW_INI_REGION_INTERNAL_BUFFER:
+                        ops.get_num_of_ranges = iwl_dump_ini_mem_ranges;
+                        ops.get_size = iwl_dump_ini_mem_get_size;
+                        ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;
+                        ops.fill_range = iwl_dump_ini_dev_mem_iter;
+                        iwl_dump_ini_mem(fwrt, type, data, reg, &ops);
                         break;
                 case IWL_FW_INI_REGION_PERIPHERY_MAC:
                 case IWL_FW_INI_REGION_PERIPHERY_PHY:
                 case IWL_FW_INI_REGION_PERIPHERY_AUX:
-                        iwl_dump_prph_ini(fwrt->trans, data, reg);
+                        ops.get_num_of_ranges = iwl_dump_ini_mem_ranges;
+                        ops.get_size = iwl_dump_ini_mem_get_size;
+                        ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;
+                        ops.fill_range = iwl_dump_ini_prph_iter;
+                        iwl_dump_ini_mem(fwrt, type, data, reg, &ops);
                         break;
                 case IWL_FW_INI_REGION_DRAM_BUFFER:
-                        *dump_mask |= BIT(IWL_FW_ERROR_DUMP_FW_MONITOR);
+                        ops.get_num_of_ranges = iwl_dump_ini_mon_dram_ranges;
+                        ops.get_size = iwl_dump_ini_mon_dram_get_size;
+                        ops.fill_mem_hdr = iwl_dump_ini_mon_dram_fill_header;
+                        ops.fill_range = iwl_dump_ini_mon_dram_iter;
+                        iwl_dump_ini_mem(fwrt, type, data, reg, &ops);
                         break;
-                case IWL_FW_INI_REGION_PAGING:
-                        if (iwl_fw_dbg_is_paging_enabled(fwrt))
-                                iwl_dump_paging(fwrt, data);
-                        else
-                                *dump_mask |= BIT(IWL_FW_ERROR_DUMP_PAGING);
+                case IWL_FW_INI_REGION_PAGING: {
+                        ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;
+                        if (iwl_fw_dbg_is_paging_enabled(fwrt)) {
+                                ops.get_num_of_ranges =
+                                        iwl_dump_ini_paging_ranges;
+                                ops.get_size = iwl_dump_ini_paging_get_size;
+                                ops.fill_range = iwl_dump_ini_paging_iter;
+                        } else {
+                                ops.get_num_of_ranges =
+                                        iwl_dump_ini_paging_gen2_ranges;
+                                ops.get_size =
+                                        iwl_dump_ini_paging_gen2_get_size;
+                                ops.fill_range = iwl_dump_ini_paging_gen2_iter;
+                        }
+
+                        iwl_dump_ini_mem(fwrt, type, data, reg, &ops);
                         break;
-                case IWL_FW_INI_REGION_TXF:
-                        iwl_fw_dump_txf(fwrt, data);
+                }
+                case IWL_FW_INI_REGION_TXF: {
+                        struct iwl_ini_txf_iter_data iter = { .init = true };
+                        void *fifo_iter = fwrt->dump.fifo_iter;
+
+                        fwrt->dump.fifo_iter = &iter;
+                        ops.get_num_of_ranges = iwl_dump_ini_txf_ranges;
+                        ops.get_size = iwl_dump_ini_txf_get_size;
+                        ops.fill_mem_hdr = iwl_dump_ini_fifo_fill_header;
+                        ops.fill_range = iwl_dump_ini_txf_iter;
+                        iwl_dump_ini_mem(fwrt, type, data, reg, &ops);
+                        fwrt->dump.fifo_iter = fifo_iter;
                         break;
+                }
                 case IWL_FW_INI_REGION_RXF:
-                        iwl_fw_dump_rxf(fwrt, data);
+                        ops.get_num_of_ranges = iwl_dump_ini_rxf_ranges;
+                        ops.get_size = iwl_dump_ini_rxf_get_size;
+                        ops.fill_mem_hdr = iwl_dump_ini_fifo_fill_header;
+                        ops.fill_range = iwl_dump_ini_rxf_iter;
+                        iwl_dump_ini_mem(fwrt, type, data, reg, &ops);
                         break;
                 case IWL_FW_INI_REGION_CSR:
-                        iwl_dump_csr_ini(fwrt->trans, data, reg);
+                        ops.get_num_of_ranges = iwl_dump_ini_mem_ranges;
+                        ops.get_size = iwl_dump_ini_mem_get_size;
+                        ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;
+                        ops.fill_range = iwl_dump_ini_csr_iter;
+                        iwl_dump_ini_mem(fwrt, type, data, reg, &ops);
                         break;
                 case IWL_FW_INI_REGION_DRAM_IMR:
-                case IWL_FW_INI_REGION_INTERNAL_BUFFER:
                         /* This is undefined yet */
                 default:
                         break;
@@ -1244,26 +1792,23 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,
 
 static struct iwl_fw_error_dump_file *
 _iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,
-                       struct iwl_fw_dump_ptrs *fw_error_dump,
-                       u32 *dump_mask)
+                       struct iwl_fw_dump_ptrs *fw_error_dump)
 {
         int size, id = le32_to_cpu(fwrt->dump.desc->trig_desc.type);
         struct iwl_fw_error_dump_data *dump_data;
         struct iwl_fw_error_dump_file *dump_file;
-        struct iwl_fw_ini_trigger *trigger, *ext;
+        struct iwl_fw_ini_trigger *trigger;
 
         if (id == FW_DBG_TRIGGER_FW_ASSERT)
                 id = IWL_FW_TRIGGER_ID_FW_ASSERT;
 
-        if (WARN_ON(id >= ARRAY_SIZE(fwrt->dump.active_trigs)))
+        if (!iwl_fw_ini_trigger_on(fwrt, id))
                 return NULL;
 
-        trigger = fwrt->dump.active_trigs[id].conf;
-        ext = fwrt->dump.active_trigs[id].conf_ext;
+        trigger = fwrt->dump.active_trigs[id].trig;
 
         size = sizeof(*dump_file);
         size += iwl_fw_ini_get_trigger_len(fwrt, trigger);
-        size += iwl_fw_ini_get_trigger_len(fwrt, ext);
 
         if (!size)
                 return NULL;
@@ -1278,11 +1823,7 @@ _iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,
         dump_data = (void *)dump_file->data;
         dump_file->file_len = cpu_to_le32(size);
 
-        *dump_mask = 0;
-        if (trigger)
-                iwl_fw_ini_dump_trigger(fwrt, trigger, &dump_data, dump_mask);
-        if (ext)
-                iwl_fw_ini_dump_trigger(fwrt, ext, &dump_data, dump_mask);
+        iwl_fw_ini_dump_trigger(fwrt, trigger, &dump_data);
 
         return dump_file;
 }
@@ -1308,8 +1849,7 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
                 goto out;
 
         if (fwrt->trans->ini_valid)
-                dump_file = _iwl_fw_error_ini_dump(fwrt, fw_error_dump,
-                                                   &dump_mask);
+                dump_file = _iwl_fw_error_ini_dump(fwrt, fw_error_dump);
         else
                 dump_file = _iwl_fw_error_dump(fwrt, fw_error_dump);
 
@@ -1321,7 +1861,10 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
         if (!fwrt->trans->ini_valid && fwrt->dump.monitor_only)
                 dump_mask &= IWL_FW_ERROR_DUMP_FW_MONITOR;
 
-        fw_error_dump->trans_ptr = iwl_trans_dump_data(fwrt->trans, dump_mask);
+        if (!fwrt->trans->ini_valid)
+                fw_error_dump->trans_ptr =
+                        iwl_trans_dump_data(fwrt->trans, dump_mask);
+
         file_len = le32_to_cpu(dump_file->file_len);
         fw_error_dump->fwrt_len = file_len;
         if (fw_error_dump->trans_ptr) {
@@ -1362,61 +1905,12 @@ const struct iwl_fw_dump_desc iwl_dump_desc_assert = {
 };
 IWL_EXPORT_SYMBOL(iwl_dump_desc_assert);
 
-void iwl_fw_assert_error_dump(struct iwl_fw_runtime *fwrt)
-{
-        IWL_INFO(fwrt, "error dump due to fw assert\n");
-        fwrt->dump.desc = &iwl_dump_desc_assert;
-        iwl_fw_error_dump(fwrt);
-}
-IWL_EXPORT_SYMBOL(iwl_fw_assert_error_dump);
-
-void iwl_fw_alive_error_dump(struct iwl_fw_runtime *fwrt)
-{
-        struct iwl_fw_dump_desc *iwl_dump_desc_no_alive =
-                kmalloc(sizeof(*iwl_dump_desc_no_alive), GFP_KERNEL);
-
-        if (!iwl_dump_desc_no_alive)
-                return;
-
-        iwl_dump_desc_no_alive->trig_desc.type =
-                cpu_to_le32(FW_DBG_TRIGGER_NO_ALIVE);
-        iwl_dump_desc_no_alive->len = 0;
-
-        if (WARN_ON(fwrt->dump.desc))
-                iwl_fw_free_dump_desc(fwrt);
-
-        IWL_WARN(fwrt, "Collecting data: trigger %d fired.\n",
-                 FW_DBG_TRIGGER_NO_ALIVE);
-
-        fwrt->dump.desc = iwl_dump_desc_no_alive;
-        iwl_fw_error_dump(fwrt);
-        clear_bit(IWL_FWRT_STATUS_WAIT_ALIVE, &fwrt->status);
-}
-IWL_EXPORT_SYMBOL(iwl_fw_alive_error_dump);
-
 int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,
                             const struct iwl_fw_dump_desc *desc,
                             bool monitor_only,
                             unsigned int delay)
 {
-        /*
-         * If the loading of the FW completed successfully, the next step is to
-         * get the SMEM config data. Thus, if fwrt->smem_cfg.num_lmacs is non
-         * zero, the FW was already loaded successully. If the state is "NO_FW"
-         * in such a case - exit, since FW may be dead. Otherwise, we
-         * can try to collect the data, since FW might just not be fully
-         * loaded (no "ALIVE" yet), and the debug data is accessible.
-         *
-         * Corner case: got the FW alive but crashed before getting the SMEM
-         *      config. In such a case, due to HW access problems, we might
-         *      collect garbage.
-         */
-        if (fwrt->trans->state == IWL_TRANS_NO_FW &&
-            fwrt->smem_cfg.num_lmacs)
-                return -EIO;
-
-        if (test_and_set_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status) ||
-            test_bit(IWL_FWRT_STATUS_WAIT_ALIVE, &fwrt->status))
+        if (test_and_set_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status))
                 return -EBUSY;
 
         if (WARN_ON(fwrt->dump.desc))
@@ -1428,12 +1922,39 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,
         fwrt->dump.desc = desc;
         fwrt->dump.monitor_only = monitor_only;
 
-        schedule_delayed_work(&fwrt->dump.wk, delay);
+        schedule_delayed_work(&fwrt->dump.wk, usecs_to_jiffies(delay));
 
         return 0;
 }
 IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect_desc);
 
+int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt,
+                             enum iwl_fw_dbg_trigger trig_type)
+{
+        int ret;
+        struct iwl_fw_dump_desc *iwl_dump_error_desc =
+                kmalloc(sizeof(*iwl_dump_error_desc), GFP_KERNEL);
+
+        if (!iwl_dump_error_desc)
+                return -ENOMEM;
+
+        iwl_dump_error_desc->trig_desc.type = cpu_to_le32(trig_type);
+        iwl_dump_error_desc->len = 0;
+
+        ret = iwl_fw_dbg_collect_desc(fwrt, iwl_dump_error_desc, false, 0);
+        if (ret) {
+                kfree(iwl_dump_error_desc);
+        } else {
+                set_bit(STATUS_FW_WAIT_DUMP, &fwrt->trans->status);
+
+                /* trigger nmi to halt the fw */
+                iwl_force_nmi(fwrt->trans);
+        }
+
+        return ret;
+}
+IWL_EXPORT_SYMBOL(iwl_fw_dbg_error_collect);
+
 int _iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,
                         enum iwl_fw_dbg_trigger trig,
                         const char *str, size_t len,
@@ -1457,8 +1978,10 @@ int _iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,
                 }
 
                 trigger->occurrences = cpu_to_le16(occurrences);
-                delay = le16_to_cpu(trigger->trig_dis_ms);
                 monitor_only = trigger->mode & IWL_FW_DBG_TRIGGER_MONITOR_ONLY;
+
+                /* convert msec to usec */
+                delay = le32_to_cpu(trigger->stop_delay) * USEC_PER_MSEC;
         }
 
         desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);
@@ -1478,6 +2001,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,
                        u32 id, const char *str, size_t len)
 {
         struct iwl_fw_dump_desc *desc;
+        struct iwl_fw_ini_active_triggers *active;
         u32 occur, delay;
 
         if (!fwrt->trans->ini_valid)
@@ -1486,15 +2010,17 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,
         if (id == FW_DBG_TRIGGER_USER)
                 id = IWL_FW_TRIGGER_ID_USER_TRIGGER;
 
-        if (WARN_ON(!fwrt->dump.active_trigs[id].active))
+        active = &fwrt->dump.active_trigs[id];
+
+        if (WARN_ON(!active->active))
                 return -EINVAL;
 
-        delay = le32_to_cpu(fwrt->dump.active_trigs[id].conf->dump_delay);
-        occur = le32_to_cpu(fwrt->dump.active_trigs[id].conf->occurrences);
+        delay = le32_to_cpu(active->trig->dump_delay);
+        occur = le32_to_cpu(active->trig->occurrences);
         if (!occur)
                 return 0;
 
-        if (le32_to_cpu(fwrt->dump.active_trigs[id].conf->force_restart)) {
+        if (le32_to_cpu(active->trig->force_restart)) {
                 IWL_WARN(fwrt, "Force restart: trigger %d fired.\n", id);
                 iwl_force_nmi(fwrt->trans);
                 return 0;
@@ -1504,8 +2030,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,
         if (!desc)
                 return -ENOMEM;
 
-        occur--;
-        fwrt->dump.active_trigs[id].conf->occurrences = cpu_to_le32(occur);
+        active->trig->occurrences = cpu_to_le32(--occur);
 
         desc->len = len;
         desc->trig_desc.type = cpu_to_le32(id);
@@ -1670,27 +2195,13 @@ void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt)
 IWL_EXPORT_SYMBOL(iwl_fw_dbg_read_d3_debug_data);
 
 static void
-iwl_fw_dbg_buffer_allocation(struct iwl_fw_runtime *fwrt,
-                             struct iwl_fw_ini_allocation_tlv *alloc)
+iwl_fw_dbg_buffer_allocation(struct iwl_fw_runtime *fwrt, u32 size)
 {
         struct iwl_trans *trans = fwrt->trans;
-        struct iwl_ldbg_config_cmd ldbg_cmd = {
-                .type = cpu_to_le32(BUFFER_ALLOCATION),
-        };
-        struct iwl_buffer_allocation_cmd *cmd = &ldbg_cmd.buffer_allocation;
-        struct iwl_host_cmd hcmd = {
-                .id = LDBG_CONFIG_CMD,
-                .flags = CMD_ASYNC,
-                .data[0] = &ldbg_cmd,
-                .len[0] = sizeof(ldbg_cmd),
-        };
         void *virtual_addr = NULL;
-        u32 size = le32_to_cpu(alloc->size);
         dma_addr_t phys_addr;
 
-        if (!trans->num_blocks &&
-            le32_to_cpu(alloc->buffer_location) !=
-            IWL_FW_INI_LOCATION_DRAM_PATH)
+        if (WARN_ON_ONCE(trans->num_blocks == ARRAY_SIZE(trans->fw_mon)))
                 return;
 
         virtual_addr =
@@ -1702,25 +2213,63 @@ iwl_fw_dbg_buffer_allocation(struct iwl_fw_runtime *fwrt,
         if (!virtual_addr)
                 IWL_ERR(fwrt, "Failed to allocate debug memory\n");
 
-        if (WARN_ON_ONCE(trans->num_blocks == ARRAY_SIZE(trans->fw_mon)))
-                return;
-
         trans->fw_mon[trans->num_blocks].block = virtual_addr;
         trans->fw_mon[trans->num_blocks].physical = phys_addr;
         trans->fw_mon[trans->num_blocks].size = size;
         trans->num_blocks++;
 
         IWL_DEBUG_FW(trans, "Allocated debug block of size %d\n", size);
+}
+
+static void iwl_fw_dbg_buffer_apply(struct iwl_fw_runtime *fwrt,
+                                    struct iwl_fw_ini_allocation_data *alloc,
+                                    enum iwl_fw_ini_apply_point pnt)
+{
+        struct iwl_trans *trans = fwrt->trans;
+        struct iwl_ldbg_config_cmd ldbg_cmd = {
+                .type = cpu_to_le32(BUFFER_ALLOCATION),
+        };
+        struct iwl_buffer_allocation_cmd *cmd = &ldbg_cmd.buffer_allocation;
+        struct iwl_host_cmd hcmd = {
+                .id = LDBG_CONFIG_CMD,
+                .flags = CMD_ASYNC,
+                .data[0] = &ldbg_cmd,
+                .len[0] = sizeof(ldbg_cmd),
+        };
+        int block_idx = trans->num_blocks;
+        u32 buf_location = le32_to_cpu(alloc->tlv.buffer_location);
+
+        if (buf_location == IWL_FW_INI_LOCATION_SRAM_PATH) {
+                if (!WARN(pnt != IWL_FW_INI_APPLY_EARLY,
+                          "Invalid apply point %d for SMEM buffer allocation",
+                          pnt))
+                        /* set sram monitor by enabling bit 7 */
+                        iwl_set_bit(fwrt->trans, CSR_HW_IF_CONFIG_REG,
+                                    CSR_HW_IF_CONFIG_REG_BIT_MONITOR_SRAM);
+                return;
+        }
+
+        if (buf_location != IWL_FW_INI_LOCATION_DRAM_PATH)
+                return;
+
+        if (!alloc->is_alloc) {
+                iwl_fw_dbg_buffer_allocation(fwrt,
+                                             le32_to_cpu(alloc->tlv.size));
+                if (block_idx == trans->num_blocks)
+                        return;
+                alloc->is_alloc = 1;
+        }
 
         /* First block is assigned via registers / context info */
         if (trans->num_blocks == 1)
                 return;
 
         cmd->num_frags = cpu_to_le32(1);
-        cmd->fragments[0].address = cpu_to_le64(phys_addr);
-        cmd->fragments[0].size = alloc->size;
-        cmd->allocation_id = alloc->allocation_id;
-        cmd->buffer_location = alloc->buffer_location;
+        cmd->fragments[0].address =
+                cpu_to_le64(trans->fw_mon[block_idx].physical);
+        cmd->fragments[0].size = alloc->tlv.size;
+        cmd->allocation_id = alloc->tlv.allocation_id;
+        cmd->buffer_location = alloc->tlv.buffer_location;
 
         iwl_trans_send_cmd(trans, &hcmd);
 }
@@ -1749,9 +2298,9 @@ static void iwl_fw_dbg_update_regions(struct iwl_fw_runtime *fwrt,
         int i, size = le32_to_cpu(tlv->num_regions);
 
         for (i = 0; i < size; i++) {
-                struct iwl_fw_ini_region_cfg *reg = iter;
+                struct iwl_fw_ini_region_cfg *reg = iter, **active;
                 int id = le32_to_cpu(reg->region_id);
-                struct iwl_fw_ini_active_regs *active;
+                u32 type = le32_to_cpu(reg->region_type);
 
                 if (WARN(id >= ARRAY_SIZE(fwrt->dump.active_regs),
                          "Invalid region id %d for apply point %d\n", id, pnt))
@@ -1759,26 +2308,47 @@ static void iwl_fw_dbg_update_regions(struct iwl_fw_runtime *fwrt,
 
                 active = &fwrt->dump.active_regs[id];
 
-                if (ext && active->apply_point == pnt)
-                        IWL_WARN(fwrt->trans,
-                                 "External region TLV overrides FW default %x\n",
-                                 id);
+                if (*active)
+                        IWL_WARN(fwrt->trans, "region TLV %d override\n", id);
 
                 IWL_DEBUG_FW(fwrt,
                              "%s: apply point %d, activating region ID %d\n",
                              __func__, pnt, id);
 
-                active->reg = reg;
-                active->apply_point = pnt;
+                *active = reg;
 
-                if (le32_to_cpu(reg->region_type) !=
-                    IWL_FW_INI_REGION_DRAM_BUFFER)
-                        iter += le32_to_cpu(reg->num_regions) * sizeof(__le32);
+                if (type == IWL_FW_INI_REGION_TXF ||
+                    type == IWL_FW_INI_REGION_RXF)
+                        iter += le32_to_cpu(reg->fifos.num_of_registers) *
+                                sizeof(__le32);
+                else if (type != IWL_FW_INI_REGION_DRAM_BUFFER)
+                        iter += le32_to_cpu(reg->internal.num_of_ranges) *
+                                sizeof(__le32);
 
                 iter += sizeof(*reg);
         }
 }
 
+static int iwl_fw_dbg_trig_realloc(struct iwl_fw_runtime *fwrt,
+                                   struct iwl_fw_ini_active_triggers *active,
+                                   u32 id, int size)
+{
+        void *ptr;
+
+        if (size <= active->size)
+                return 0;
+
+        ptr = krealloc(active->trig, size, GFP_KERNEL);
+        if (!ptr) {
+                IWL_ERR(fwrt, "Failed to allocate memory for trigger %d\n", id);
+                return -ENOMEM;
+        }
+        active->trig = ptr;
+        active->size = size;
+
+        return 0;
+}
+
 static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt,
                                        struct iwl_fw_ini_trigger_tlv *tlv,
                                        bool ext,
@@ -1791,43 +2361,61 @@ static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt,
                 struct iwl_fw_ini_trigger *trig = iter;
                 struct iwl_fw_ini_active_triggers *active;
                 int id = le32_to_cpu(trig->trigger_id);
-                u32 num;
+                u32 trig_regs_size = le32_to_cpu(trig->num_regions) *
+                        sizeof(__le32);
 
                 if (WARN_ON(id >= ARRAY_SIZE(fwrt->dump.active_trigs)))
                         break;
 
                 active = &fwrt->dump.active_trigs[id];
 
-                if (active->apply_point != apply_point) {
-                        active->conf = NULL;
-                        active->conf_ext = NULL;
-                }
+                if (!active->active) {
+                        size_t trig_size = sizeof(*trig) + trig_regs_size;
 
-                num = le32_to_cpu(trig->num_regions);
+                        if (iwl_fw_dbg_trig_realloc(fwrt, active, id,
+                                                    trig_size))
+                                goto next;
 
-                if (ext && active->apply_point == apply_point) {
-                        num += le32_to_cpu(active->conf->num_regions);
-                        if (trig->ignore_default) {
-                                active->conf_ext = active->conf;
-                                active->conf = trig;
+                        memcpy(active->trig, trig, trig_size);
+
+                } else {
+                        u32 conf_override =
+                                !(le32_to_cpu(trig->override_trig) & 0xff);
+                        u32 region_override =
+                                !(le32_to_cpu(trig->override_trig) & 0xff00);
+                        u32 offset = 0;
+                        u32 active_regs =
+                                le32_to_cpu(active->trig->num_regions);
+                        u32 new_regs = le32_to_cpu(trig->num_regions);
+                        int mem_to_add = trig_regs_size;
+
+                        if (region_override) {
+                                mem_to_add -= active_regs * sizeof(__le32);
                         } else {
-                                active->conf_ext = trig;
+                                offset += active_regs;
+                                new_regs += active_regs;
                         }
-                } else {
-                        active->conf = trig;
+
+                        if (iwl_fw_dbg_trig_realloc(fwrt, active, id,
+                                                    active->size + mem_to_add))
+                                goto next;
+
+                        if (conf_override)
+                                memcpy(active->trig, trig, sizeof(*trig));
+
+                        memcpy(active->trig->data + offset, trig->data,
+                               trig_regs_size);
+                        active->trig->num_regions = cpu_to_le32(new_regs);
                 }
 
                 /* Since zero means infinity - just set to -1 */
-                if (!le32_to_cpu(trig->occurrences))
-                        trig->occurrences = cpu_to_le32(-1);
-                if (!le32_to_cpu(trig->ignore_consec))
-                        trig->ignore_consec = cpu_to_le32(-1);
+                if (!le32_to_cpu(active->trig->occurrences))
+                        active->trig->occurrences = cpu_to_le32(-1);
 
-                iter += sizeof(*trig) +
-                        le32_to_cpu(trig->num_regions) * sizeof(__le32);
+                active->active = true;
+next:
+                iter += sizeof(*trig) + trig_regs_size;
 
-                active->active = num;
-                active->apply_point = apply_point;
         }
 }
 
@@ -1844,9 +2432,13 @@ static void _iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
                 u32 type = le32_to_cpu(tlv->type);
 
                 switch (type) {
-                case IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION:
-                        iwl_fw_dbg_buffer_allocation(fwrt, ini_tlv);
+                case IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION: {
+                        struct iwl_fw_ini_allocation_data *buf_alloc = ini_tlv;
+
+                        iwl_fw_dbg_buffer_apply(fwrt, ini_tlv, pnt);
+                        iter += sizeof(buf_alloc->is_alloc);
                         break;
+                }
                 case IWL_UCODE_TLV_TYPE_HCMD:
                         if (pnt < IWL_FW_INI_APPLY_AFTER_ALIVE) {
                                 IWL_ERR(fwrt,
@@ -1877,6 +2469,16 @@ void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
                             enum iwl_fw_ini_apply_point apply_point)
 {
         void *data = &fwrt->trans->apply_points[apply_point];
+        int i;
+
+        if (apply_point == IWL_FW_INI_APPLY_EARLY) {
+                for (i = 0; i < IWL_FW_INI_MAX_REGION_ID; i++)
+                        fwrt->dump.active_regs[i] = NULL;
+
+                /* disable the triggers, used in recovery flow */
+                for (i = 0; i < IWL_FW_TRIGGER_ID_NUM; i++)
+                        fwrt->dump.active_trigs[i].active = false;
+        }
 
         _iwl_fw_dbg_apply_point(fwrt, data, apply_point, false);
 
@@ -1884,3 +2486,27 @@ void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
         _iwl_fw_dbg_apply_point(fwrt, data, apply_point, true);
 }
 IWL_EXPORT_SYMBOL(iwl_fw_dbg_apply_point);
+
+void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt)
+{
+        /* if the wait event timeout elapses instead of wake up then
+         * the driver did not receive NMI interrupt and can not assume the FW
+         * is halted
+         */
+        int ret = wait_event_timeout(fwrt->trans->fw_halt_waitq,
+                                     !test_bit(STATUS_FW_WAIT_DUMP,
+                                               &fwrt->trans->status),
+                                     msecs_to_jiffies(2000));
+        if (!ret) {
+                /* failed to receive NMI interrupt, assuming the FW is stuck */
+                set_bit(STATUS_FW_ERROR, &fwrt->trans->status);
+
+                clear_bit(STATUS_FW_WAIT_DUMP, &fwrt->trans->status);
+        }
+
+        /* Assuming the op mode mutex is held at this point */
+        iwl_fw_dbg_collect_sync(fwrt);
+
+        iwl_trans_stop_device(fwrt->trans);
+}
+IWL_EXPORT_SYMBOL(iwl_fwrt_stop_device);
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
index 330229d2a61d..a199056234d3 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -112,6 +112,8 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt);
 int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,
                             const struct iwl_fw_dump_desc *desc,
                             bool monitor_only, unsigned int delay);
+int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt,
+                             enum iwl_fw_dbg_trigger trig_type);
 int _iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,
                         enum iwl_fw_dbg_trigger trig,
                         const char *str, size_t len,
@@ -160,9 +162,9 @@ iwl_fw_dbg_trigger_stop_conf_match(struct iwl_fw_runtime *fwrt,
 }
 
 static inline bool
-iwl_fw_dbg_no_trig_window(struct iwl_fw_runtime *fwrt, u32 id, u32 dis_ms)
+iwl_fw_dbg_no_trig_window(struct iwl_fw_runtime *fwrt, u32 id, u32 dis_usec)
 {
-        unsigned long wind_jiff = msecs_to_jiffies(dis_ms);
+        unsigned long wind_jiff = usecs_to_jiffies(dis_usec);
 
         /* If this is the first event checked, jump to update start ts */
         if (fwrt->dump.non_collect_ts_start[id] &&
@@ -179,11 +181,12 @@ iwl_fw_dbg_trigger_check_stop(struct iwl_fw_runtime *fwrt,
                               struct wireless_dev *wdev,
                               struct iwl_fw_dbg_trigger_tlv *trig)
 {
+        u32 usec = le16_to_cpu(trig->trig_dis_ms) * USEC_PER_MSEC;
+
         if (wdev && !iwl_fw_dbg_trigger_vif_match(trig, wdev))
                 return false;
 
-        if (iwl_fw_dbg_no_trig_window(fwrt, le32_to_cpu(trig->id),
-                                      le16_to_cpu(trig->trig_dis_ms))) {
+        if (iwl_fw_dbg_no_trig_window(fwrt, le32_to_cpu(trig->id), usec)) {
                 IWL_WARN(fwrt, "Trigger %d occurred while no-collect window.\n",
                          trig->id);
                 return false;
@@ -220,23 +223,22 @@ _iwl_fw_dbg_trigger_on(struct iwl_fw_runtime *fwrt,
 })
 
 static inline bool
-_iwl_fw_ini_trigger_on(struct iwl_fw_runtime *fwrt,
-                       const enum iwl_fw_dbg_trigger id)
+iwl_fw_ini_trigger_on(struct iwl_fw_runtime *fwrt,
+                      enum iwl_fw_ini_trigger_id id)
 {
-        struct iwl_fw_ini_active_triggers *trig = &fwrt->dump.active_trigs[id];
-        u32 ms;
+        struct iwl_fw_ini_trigger *trig;
+        u32 usec;
+
 
-        if (!fwrt->trans->ini_valid)
-                return false;
 
-        if (!trig || !trig->active)
+        if (!fwrt->trans->ini_valid || id >= IWL_FW_TRIGGER_ID_NUM ||
+            !fwrt->dump.active_trigs[id].active)
                 return false;
 
-        ms = le32_to_cpu(trig->conf->ignore_consec);
-        if (ms)
-                ms /= USEC_PER_MSEC;
+        trig = fwrt->dump.active_trigs[id].trig;
+        usec = le32_to_cpu(trig->ignore_consec);
 
-        if (iwl_fw_dbg_no_trig_window(fwrt, id, ms)) {
+        if (iwl_fw_dbg_no_trig_window(fwrt, id, usec)) {
                 IWL_WARN(fwrt, "Trigger %d fired in no-collect window\n", id);
                 return false;
         }
@@ -244,12 +246,6 @@ _iwl_fw_ini_trigger_on(struct iwl_fw_runtime *fwrt,
         return true;
 }
 
-#define iwl_fw_ini_trigger_on(fwrt, wdev, id) ({                \
-        BUILD_BUG_ON(!__builtin_constant_p(id));                \
-        BUILD_BUG_ON((id) >= IWL_FW_TRIGGER_ID_NUM);            \
-        _iwl_fw_ini_trigger_on((fwrt), (wdev), (id));           \
-})
-
 static inline void
 _iwl_fw_dbg_trigger_simple_stop(struct iwl_fw_runtime *fwrt,
                                 struct wireless_dev *wdev,
@@ -296,13 +292,13 @@ _iwl_fw_dbg_stop_recording(struct iwl_trans *trans,
         }
 
         if (params) {
-                params->in_sample = iwl_read_prph(trans, DBGC_IN_SAMPLE);
-                params->out_ctrl = iwl_read_prph(trans, DBGC_OUT_CTRL);
+                params->in_sample = iwl_read_umac_prph(trans, DBGC_IN_SAMPLE);
+                params->out_ctrl = iwl_read_umac_prph(trans, DBGC_OUT_CTRL);
         }
 
-        iwl_write_prph(trans, DBGC_IN_SAMPLE, 0);
+        iwl_write_umac_prph(trans, DBGC_IN_SAMPLE, 0);
         udelay(100);
-        iwl_write_prph(trans, DBGC_OUT_CTRL, 0);
+        iwl_write_umac_prph(trans, DBGC_OUT_CTRL, 0);
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         trans->dbg_rec_on = false;
 #endif
@@ -330,9 +326,9 @@ _iwl_fw_dbg_restart_recording(struct iwl_trans *trans,
                 iwl_clear_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x1);
                 iwl_set_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x1);
         } else {
-                iwl_write_prph(trans, DBGC_IN_SAMPLE, params->in_sample);
+                iwl_write_umac_prph(trans, DBGC_IN_SAMPLE, params->in_sample);
                 udelay(100);
-                iwl_write_prph(trans, DBGC_OUT_CTRL, params->out_ctrl);
+                iwl_write_umac_prph(trans, DBGC_OUT_CTRL, params->out_ctrl);
         }
 }
 
@@ -373,7 +369,9 @@ static inline bool iwl_fw_dbg_is_d3_debug_enabled(struct iwl_fw_runtime *fwrt)
 {
         return fw_has_capa(&fwrt->fw->ucode_capa,
                            IWL_UCODE_TLV_CAPA_D3_DEBUG) &&
-                fwrt->trans->cfg->d3_debug_data_length &&
+                fwrt->trans->cfg->d3_debug_data_length && fwrt->ops &&
+                fwrt->ops->d3_debug_enable &&
+                fwrt->ops->d3_debug_enable(fwrt->ops_ctx) &&
                 iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_D3_DEBUG_DATA);
 }
 
@@ -434,10 +432,33 @@ static inline void iwl_fw_resume_timestamp(struct iwl_fw_runtime *fwrt) {}
 
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
-void iwl_fw_assert_error_dump(struct iwl_fw_runtime *fwrt);
-void iwl_fw_alive_error_dump(struct iwl_fw_runtime *fwrt);
 void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt);
 void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
                             enum iwl_fw_ini_apply_point apply_point);
 
+void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt);
+
+static inline void iwl_fw_lmac1_set_alive_err_table(struct iwl_trans *trans,
+                                                    u32 lmac_error_event_table)
+{
+        if (!(trans->error_event_table_tlv_status &
+              IWL_ERROR_EVENT_TABLE_LMAC1) ||
+            WARN_ON(trans->lmac_error_event_table[0] !=
+                    lmac_error_event_table))
+                trans->lmac_error_event_table[0] = lmac_error_event_table;
+}
+
+static inline void iwl_fw_umac_set_alive_err_table(struct iwl_trans *trans,
+                                                   u32 umac_error_event_table)
+{
+        if (!(trans->error_event_table_tlv_status &
+              IWL_ERROR_EVENT_TABLE_UMAC) ||
+            WARN_ON(trans->umac_error_event_table !=
+                    umac_error_event_table))
+                trans->umac_error_event_table = umac_error_event_table;
+}
+
+/* This bit is used to differentiate the legacy dump from the ini dump */
+#define INI_DUMP_BIT BIT(31)
+
 #endif  /* __iwl_fw_dbg_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
index 3e120dd47305..c1aa4360736b 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
@@ -173,9 +173,8 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {		\
         _FWRT_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct iwl_fw_runtime)
 
 #define FWRT_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode) do {     \
-        if (!debugfs_create_file(alias, mode, parent, fwrt,             \
-                                 &iwl_dbgfs_##name##_ops))              \
-                goto err;                                               \
+        debugfs_create_file(alias, mode, parent, fwrt,                  \
+                            &iwl_dbgfs_##name##_ops);                   \
         } while (0)
 #define FWRT_DEBUGFS_ADD_FILE(name, parent, mode) \
         FWRT_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)
@@ -321,14 +320,10 @@ out:
 
 FWRT_DEBUGFS_WRITE_FILE_OPS(send_hcmd, 512);
 
-int iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
+void iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
                             struct dentry *dbgfs_dir)
 {
         INIT_DELAYED_WORK(&fwrt->timestamp.wk, iwl_fw_timestamp_marker_wk);
         FWRT_DEBUGFS_ADD_FILE(timestamp_marker, dbgfs_dir, 0200);
         FWRT_DEBUGFS_ADD_FILE(send_hcmd, dbgfs_dir, 0200);
-        return 0;
-err:
-        IWL_ERR(fwrt, "Can't create the fwrt debugfs directory\n");
-        return -ENOMEM;
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.h b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.h
index 88255035e8ef..fde40ff88451 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.h
@@ -63,14 +63,11 @@
 #include "runtime.h"
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-int iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
+void iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
                             struct dentry *dbgfs_dir);
 
 #else
-static inline int iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
-                                          struct dentry *dbgfs_dir)
-{
-        return 0;
-}
+static inline void iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
+                                           struct dentry *dbgfs_dir) { }
 
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
index c02425a1e64f..9b5077bd46c3 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -275,22 +275,68 @@ struct iwl_fw_error_dump_mem {
 };
 
 /**
- * struct iwl_fw_error_dump_named_mem - chunk of memory
- * @type: &enum iwl_fw_error_dump_mem_type
- * @offset: the offset from which the memory was read
- * @name_len: name length
- * @name: file name
- * @data: the content of the memory
+ * struct iwl_fw_ini_error_dump_range - range of memory
+ * @start_addr: the start address of this range
+ * @range_data_size: the size of this range, in bytes
+ * @data: the actual memory
  */
-struct iwl_fw_error_dump_named_mem {
-        __le32 type;
-        __le32 offset;
-        u8 name_len;
-        u8 name[32];
-        u8 data[];
+struct iwl_fw_ini_error_dump_range {
+        __le32 start_addr;
+        __le32 range_data_size;
+        __le32 data[];
+} __packed;
+
+/**
+ * struct iwl_fw_ini_error_dump_header - ini region dump header
+ * @num_of_ranges: number of ranges in this region
+ * @name_len: number of bytes allocated to the name string of this region
+ * @name: name of the region
+ */
+struct iwl_fw_ini_error_dump_header {
+        __le32 num_of_ranges;
+        __le32 name_len;
+        u8 name[IWL_FW_INI_MAX_NAME];
 };
 
 /**
+ * struct iwl_fw_ini_error_dump - ini region dump
+ * @header: the header of this region
+ * @ranges: the memory ranges of this region
+ */
+struct iwl_fw_ini_error_dump {
+        struct iwl_fw_ini_error_dump_header header;
+        struct iwl_fw_ini_error_dump_range ranges[];
+} __packed;
+
+/* This bit is used to differentiate between lmac and umac rxf */
+#define IWL_RXF_UMAC_BIT BIT(31)
+
+/**
+ * struct iwl_fw_ini_fifo_error_dump_range - ini fifo range dump
+ * @fifo_num: the fifo num. In case of rxf and umac rxf, set BIT(31) to
+ *      distinguish between lmac and umac
+ * @num_of_registers: num of registers to dump, dword size each
+ * @range_data_size: the size of the registers and fifo data
+ * @data: fifo data
+ */
+struct iwl_fw_ini_fifo_error_dump_range {
+        __le32 fifo_num;
+        __le32 num_of_registers;
+        __le32 range_data_size;
+        __le32 data[];
+} __packed;
+
+/**
+ * struct iwl_fw_ini_fifo_error_dump - ini fifo region dump
+ * @header: the header of this region
+ * @ranges: the memory ranges of this region
+ */
+struct iwl_fw_ini_fifo_error_dump {
+        struct iwl_fw_ini_error_dump_header header;
+        struct iwl_fw_ini_fifo_error_dump_range ranges[];
+} __packed;
+
+/**
  * struct iwl_fw_error_dump_rb - content of an Receive Buffer
  * @index: the index of the Receive Buffer in the Rx queue
  * @rxq: the RB's Rx queue
@@ -305,6 +351,20 @@ struct iwl_fw_error_dump_rb {
 };
 
 /**
+ * struct iwl_fw_ini_monitor_dram_dump - ini dram monitor dump
+ * @header - header of the region
+ * @write_ptr - write pointer position in the dram
+ * @cycle_cnt - cycles count
+ * @ranges - the memory ranges of this this region
+ */
+struct iwl_fw_ini_monitor_dram_dump {
+        struct iwl_fw_ini_error_dump_header header;
+        __le32 write_ptr;
+        __le32 cycle_cnt;
+        struct iwl_fw_ini_error_dump_range ranges[];
+} __packed;
+
+/**
  * struct iwl_fw_error_dump_paging - content of the UMAC's image page
  *      block on DRAM
  * @index: the index of the page block
@@ -355,7 +415,9 @@ iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data)
  * @FW_DBG_TDLS: trigger log collection upon TDLS related events.
  * @FW_DBG_TRIGGER_TX_STATUS: trigger log collection upon tx status when
  *  the firmware sends a tx reply.
- * @FW_DBG_TRIGGER_NO_ALIVE: trigger log collection if alive flow fails
+ * @FW_DBG_TRIGGER_ALIVE_TIMEOUT: trigger log collection if alive flow timeouts
+ * @FW_DBG_TRIGGER_DRIVER: trigger log collection upon a flow failure
+ *      in the driver.
  */
 enum iwl_fw_dbg_trigger {
         FW_DBG_TRIGGER_INVALID = 0,
@@ -373,7 +435,8 @@ enum iwl_fw_dbg_trigger {
         FW_DBG_TRIGGER_TX_LATENCY,
         FW_DBG_TRIGGER_TDLS,
         FW_DBG_TRIGGER_TX_STATUS,
-        FW_DBG_TRIGGER_NO_ALIVE,
+        FW_DBG_TRIGGER_ALIVE_TIMEOUT,
+        FW_DBG_TRIGGER_DRIVER,
 
         /* must be last */
         FW_DBG_TRIGGER_MAX,
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
index e8b00b795cbb..641c95d03b15 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@ -9,6 +9,7 @@
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
  * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2019 Intel Corporation
  *
  * 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,6 +33,7 @@
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
  * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -143,6 +145,9 @@ enum iwl_ucode_tlv_type {
         IWL_UCODE_TLV_FW_GSCAN_CAPA     = 50,
         IWL_UCODE_TLV_FW_MEM_SEG        = 51,
         IWL_UCODE_TLV_IML               = 52,
+        IWL_UCODE_TLV_UMAC_DEBUG_ADDRS  = 54,
+        IWL_UCODE_TLV_LMAC_DEBUG_ADDRS  = 55,
+        IWL_UCODE_TLV_FW_RECOVERY_INFO  = 57,
         IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION    = IWL_UCODE_INI_TLV_GROUP | 0x1,
         IWL_UCODE_TLV_TYPE_HCMD                 = IWL_UCODE_INI_TLV_GROUP | 0x2,
         IWL_UCODE_TLV_TYPE_REGIONS              = IWL_UCODE_INI_TLV_GROUP | 0x3,
@@ -263,6 +268,12 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;
  * @IWL_UCODE_TLV_API_FRAG_EBS: This ucode supports fragmented EBS
  * @IWL_UCODE_TLV_API_REDUCE_TX_POWER: This ucode supports v5 of
  *      the REDUCE_TX_POWER_CMD.
+ * @IWL_UCODE_TLV_API_SHORT_BEACON_NOTIF: This ucode supports the short
+ *      version of the beacon notification.
+ * @IWL_UCODE_TLV_API_BEACON_FILTER_V4: This ucode supports v4 of
+ *      BEACON_FILTER_CONFIG_API_S_VER_4.
+ * @IWL_UCODE_TLV_API_FTM_NEW_RANGE_REQ: This ucode supports v7 of
+ *      LOCATION_RANGE_REQ_CMD_API_S and v6 of LOCATION_RANGE_RESP_NTFY_API_S.
  *
  * @NUM_IWL_UCODE_TLV_API: number of bits used
  */
@@ -287,6 +298,9 @@ enum iwl_ucode_tlv_api {
         IWL_UCODE_TLV_API_ADAPTIVE_DWELL_V2     = (__force iwl_ucode_tlv_api_t)42,
         IWL_UCODE_TLV_API_FRAG_EBS              = (__force iwl_ucode_tlv_api_t)44,
         IWL_UCODE_TLV_API_REDUCE_TX_POWER       = (__force iwl_ucode_tlv_api_t)45,
+        IWL_UCODE_TLV_API_SHORT_BEACON_NOTIF    = (__force iwl_ucode_tlv_api_t)46,
+        IWL_UCODE_TLV_API_BEACON_FILTER_V4      = (__force iwl_ucode_tlv_api_t)47,
+        IWL_UCODE_TLV_API_FTM_NEW_RANGE_REQ     = (__force iwl_ucode_tlv_api_t)49,
 
         NUM_IWL_UCODE_TLV_API
 #ifdef __CHECKER__
@@ -333,6 +347,7 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t;
  * @IWL_UCODE_TLV_CAPA_TLC_OFFLOAD: firmware implements rate scaling algorithm
  * @IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA: firmware implements quota related
  * @IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2: firmware implements Coex Schema 2
+ * IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD: firmware supports CSA command
  * @IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS: firmware supports ultra high band
  *      (6 GHz).
  * @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement
@@ -363,12 +378,15 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t;
  *      capability.
  * @IWL_UCODE_TLV_CAPA_CSI_REPORTING: firmware is capable of being configured
  *      to report the CSI information with (certain) RX frames
+ * @IWL_UCODE_TLV_CAPA_FTM_CALIBRATED: has FTM calibrated and thus supports both
+ *      initiator and responder
  *
  * @IWL_UCODE_TLV_CAPA_MLME_OFFLOAD: supports MLME offload
  *
  * @NUM_IWL_UCODE_TLV_CAPA: number of bits used
  */
 enum iwl_ucode_tlv_capa {
+        /* set 0 */
         IWL_UCODE_TLV_CAPA_D0I3_SUPPORT                 = (__force iwl_ucode_tlv_capa_t)0,
         IWL_UCODE_TLV_CAPA_LAR_SUPPORT                  = (__force iwl_ucode_tlv_capa_t)1,
         IWL_UCODE_TLV_CAPA_UMAC_SCAN                    = (__force iwl_ucode_tlv_capa_t)2,
@@ -390,6 +408,8 @@ enum iwl_ucode_tlv_capa {
         IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC                = (__force iwl_ucode_tlv_capa_t)29,
         IWL_UCODE_TLV_CAPA_BT_COEX_RRC                  = (__force iwl_ucode_tlv_capa_t)30,
         IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT                = (__force iwl_ucode_tlv_capa_t)31,
+
+        /* set 1 */
         IWL_UCODE_TLV_CAPA_STA_PM_NOTIF                 = (__force iwl_ucode_tlv_capa_t)38,
         IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT          = (__force iwl_ucode_tlv_capa_t)39,
         IWL_UCODE_TLV_CAPA_CDB_SUPPORT                  = (__force iwl_ucode_tlv_capa_t)40,
@@ -397,7 +417,11 @@ enum iwl_ucode_tlv_capa {
         IWL_UCODE_TLV_CAPA_TLC_OFFLOAD                  = (__force iwl_ucode_tlv_capa_t)43,
         IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA                = (__force iwl_ucode_tlv_capa_t)44,
         IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2                = (__force iwl_ucode_tlv_capa_t)45,
+        IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD           = (__force iwl_ucode_tlv_capa_t)46,
         IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS            = (__force iwl_ucode_tlv_capa_t)48,
+        IWL_UCODE_TLV_CAPA_FTM_CALIBRATED               = (__force iwl_ucode_tlv_capa_t)47,
+
+        /* set 2 */
         IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE         = (__force iwl_ucode_tlv_capa_t)64,
         IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS            = (__force iwl_ucode_tlv_capa_t)65,
         IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT             = (__force iwl_ucode_tlv_capa_t)67,
@@ -418,6 +442,7 @@ enum iwl_ucode_tlv_capa {
         IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT      = (__force iwl_ucode_tlv_capa_t)89,
         IWL_UCODE_TLV_CAPA_CSI_REPORTING                = (__force iwl_ucode_tlv_capa_t)90,
 
+        /* set 3 */
         IWL_UCODE_TLV_CAPA_MLME_OFFLOAD                 = (__force iwl_ucode_tlv_capa_t)96,
 
         NUM_IWL_UCODE_TLV_CAPA
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.h b/drivers/net/wireless/intel/iwlwifi/fw/img.h
index 12333167ea23..f4c5a4d73206 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/img.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/img.h
@@ -105,6 +105,8 @@ struct iwl_ucode_capabilities {
         u32 n_scan_channels;
         u32 standard_phy_calibration_size;
         u32 flags;
+        u32 error_log_addr;
+        u32 error_log_size;
         unsigned long _api[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_API)];
         unsigned long _capa[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_CAPA)];
 };
@@ -223,27 +225,24 @@ struct iwl_fw_dbg {
 };
 
 /**
+ * @tlv: the buffer allocation tlv
+ * @is_alloc: indicates if the buffer was already allocated
+ */
+struct iwl_fw_ini_allocation_data {
+        struct iwl_fw_ini_allocation_tlv tlv;
+        u32 is_alloc;
+} __packed;
+
+/**
  * struct iwl_fw_ini_active_triggers
  * @active: is this trigger active
- * @apply_point: last apply point that updated this trigger
- * @conf: active trigger
- * @conf_ext: second trigger, contains extra regions to dump
+ * @size: allocated memory size of the trigger
+ * @trig: trigger
  */
 struct iwl_fw_ini_active_triggers {
         bool active;
-        enum iwl_fw_ini_apply_point apply_point;
-        struct iwl_fw_ini_trigger *conf;
-        struct iwl_fw_ini_trigger *conf_ext;
-};
-
-/**
- * struct iwl_fw_ini_active_regs
- * @reg: active region from TLV
- * @apply_point: apply point where it became active
- */
-struct iwl_fw_ini_active_regs {
-        struct iwl_fw_ini_region_cfg *reg;
-        enum iwl_fw_ini_apply_point apply_point;
+        size_t size;
+        struct iwl_fw_ini_trigger *trig;
 };
 
 /**
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/init.c b/drivers/net/wireless/intel/iwlwifi/fw/init.c
index 2efac307909e..7adf4e4e841a 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/init.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/init.c
@@ -6,6 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
+ * Copyright(c) 2019 Intel Corporation
  *
  * 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
@@ -26,6 +27,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
+ * Copyright(c) 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,6 +76,7 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,
         fwrt->ops_ctx = ops_ctx;
         INIT_DELAYED_WORK(&fwrt->dump.wk, iwl_fw_error_dump_wk);
         iwl_fwrt_dbgfs_register(fwrt, dbgfs_dir);
+        init_waitqueue_head(&fwrt->trans->fw_halt_waitq);
 }
 IWL_EXPORT_SYMBOL(iwl_fw_runtime_init);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
index a0fcbb28114b..a5fe1a8ca426 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * 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
@@ -27,7 +27,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,7 @@ struct iwl_fw_runtime_ops {
         void (*dump_end)(void *ctx);
         bool (*fw_running)(void *ctx);
         int (*send_hcmd)(void *ctx, struct iwl_host_cmd *host_cmd);
+        bool (*d3_debug_enable)(void *ctx);
 };
 
 #define MAX_NUM_LMAC 2
@@ -90,7 +91,6 @@ struct iwl_fwrt_shared_mem_cfg {
 
 enum iwl_fw_runtime_status {
         IWL_FWRT_STATUS_DUMPING = 0,
-        IWL_FWRT_STATUS_WAIT_ALIVE,
 };
 
 /**
@@ -138,12 +138,13 @@ struct iwl_fw_runtime {
                 u8 conf;
 
                 /* ts of the beginning of a non-collect fw dbg data period */
-                unsigned long non_collect_ts_start[IWL_FW_TRIGGER_ID_NUM - 1];
+                unsigned long non_collect_ts_start[IWL_FW_TRIGGER_ID_NUM];
                 u32 *d3_debug_data;
-                struct iwl_fw_ini_active_regs active_regs[IWL_FW_INI_MAX_REGION_ID];
+                struct iwl_fw_ini_region_cfg *active_regs[IWL_FW_INI_MAX_REGION_ID];
                 struct iwl_fw_ini_active_triggers active_trigs[IWL_FW_TRIGGER_ID_NUM];
                 u32 lmac_err_id[MAX_NUM_LMAC];
                 u32 umac_err_id;
+                void *fifo_iter;
         } dump;
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         struct {
@@ -161,8 +162,20 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,
 
 static inline void iwl_fw_runtime_free(struct iwl_fw_runtime *fwrt)
 {
+        int i;
+
         kfree(fwrt->dump.d3_debug_data);
         fwrt->dump.d3_debug_data = NULL;
+
+        for (i = 0; i < IWL_FW_TRIGGER_ID_NUM; i++) {
+                struct iwl_fw_ini_active_triggers *active =
+                        &fwrt->dump.active_trigs[i];
+
+                active->active = false;
+                active->size = 0;
+                kfree(active->trig);
+                active->trig = NULL;
+        }
 }
 
 void iwl_fw_runtime_suspend(struct iwl_fw_runtime *fwrt);
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index ff942532fac3..f5f87773667b 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -7,7 +7,7 @@
  *
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  * Copyright (C) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -29,7 +29,7 @@
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright (C) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -89,6 +89,7 @@ enum iwl_device_family {
         IWL_DEVICE_FAMILY_9000,
         IWL_DEVICE_FAMILY_22000,
         IWL_DEVICE_FAMILY_22560,
+        IWL_DEVICE_FAMILY_AX210,
 };
 
 /*
@@ -379,6 +380,9 @@ struct iwl_csr_params {
  * @nvm_type: see &enum iwl_nvm_type
  * @d3_debug_data_base_addr: base address where D3 debug data is stored
  * @d3_debug_data_length: length of the D3 debug data
+ * @bisr_workaround: BISR hardware workaround (for 22260 series devices)
+ * @min_txq_size: minimum number of slots required in a TX queue
+ * @umac_prph_offset: offset to add to UMAC periphery address
  *
  * We enable the driver to be backward compatible wrt. hardware features.
  * API differences in uCode shouldn't be handled here but through TLVs
@@ -428,7 +432,8 @@ struct iwl_cfg {
             use_tfh:1,
             gen2:1,
             cdb:1,
-            dbgc_supported:1;
+            dbgc_supported:1,
+            bisr_workaround:1;
         u8 valid_tx_ant;
         u8 valid_rx_ant;
         u8 non_shared_ant;
@@ -443,37 +448,12 @@ struct iwl_cfg {
         u32 extra_phy_cfg_flags;
         u32 d3_debug_data_base_addr;
         u32 d3_debug_data_length;
+        u32 min_txq_size;
+        u32 umac_prph_offset;
 };
 
-static const struct iwl_csr_params iwl_csr_v1 = {
-        .flag_mac_clock_ready = 0,
-        .flag_val_mac_access_en = 0,
-        .flag_init_done = 2,
-        .flag_mac_access_req = 3,
-        .flag_sw_reset = 7,
-        .flag_master_dis = 8,
-        .flag_stop_master = 9,
-        .addr_sw_reset = (CSR_BASE + 0x020),
-        .mac_addr0_otp = 0x380,
-        .mac_addr1_otp = 0x384,
-        .mac_addr0_strap = 0x388,
-        .mac_addr1_strap = 0x38C
-};
-
-static const struct iwl_csr_params iwl_csr_v2 = {
-        .flag_init_done = 6,
-        .flag_mac_clock_ready = 20,
-        .flag_val_mac_access_en = 20,
-        .flag_mac_access_req = 21,
-        .flag_master_dis = 28,
-        .flag_stop_master = 29,
-        .flag_sw_reset = 31,
-        .addr_sw_reset = (CSR_BASE + 0x024),
-        .mac_addr0_otp = 0x30,
-        .mac_addr1_otp = 0x34,
-        .mac_addr0_strap = 0x38,
-        .mac_addr1_strap = 0x3C
-};
+extern const struct iwl_csr_params iwl_csr_v1;
+extern const struct iwl_csr_params iwl_csr_v2;
 
 /*
  * This list declares the config structures for all devices.
@@ -568,7 +548,7 @@ extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk;
 extern const struct iwl_cfg iwl22000_2ac_cfg_hr;
 extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;
 extern const struct iwl_cfg iwl22000_2ac_cfg_jf;
-extern const struct iwl_cfg iwl22560_2ax_cfg_hr;
+extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;
 extern const struct iwl_cfg iwl22000_2ax_cfg_hr;
 extern const struct iwl_cfg iwl22260_2ax_cfg;
 extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;
@@ -585,9 +565,13 @@ extern const struct iwl_cfg iwl22000_2ax_cfg_jf;
 extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0;
 extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;
 extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;
-extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_jf_b0;
+extern const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0;
 extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;
 extern const struct iwl_cfg iwl22560_2ax_cfg_su_cdb;
+extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;
+extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;
+extern const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0;
+extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;
 #endif /* CPTCFG_IWLMVM || CPTCFG_IWLFMAC */
 
 #endif /* __IWL_CONFIG_H__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index 42af421bbc3c..aea6d03e545a 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -180,6 +180,7 @@
 /* Bits for CSR_HW_IF_CONFIG_REG */
 #define CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH       (0x00000003)
 #define CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP       (0x0000000C)
+#define CSR_HW_IF_CONFIG_REG_BIT_MONITOR_SRAM   (0x00000080)
 #define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER      (0x000000C0)
 #define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI         (0x00000100)
 #define CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI       (0x00000200)
@@ -327,11 +328,14 @@ enum {
 #define CSR_HW_REV_TYPE_QNJ             (0x0000360)
 #define CSR_HW_REV_TYPE_QNJ_B0          (0x0000364)
 #define CSR_HW_REV_TYPE_HR_CDB          (0x0000340)
+#define CSR_HW_REV_TYPE_SO              (0x0000370)
+#define CSR_HW_REV_TYPE_TY              (0x0000420)
 
 /* RF_ID value */
 #define CSR_HW_RF_ID_TYPE_JF            (0x00105100)
 #define CSR_HW_RF_ID_TYPE_HR            (0x0010A000)
 #define CSR_HW_RF_ID_TYPE_HRCDB         (0x00109F00)
+#define CSR_HW_RF_ID_TYPE_GF            (0x0010D000)
 
 /* HW_RF CHIP ID  */
 #define CSR_HW_RF_ID_TYPE_CHIP_ID(_val) (((_val) >> 12) & 0xFFF)
@@ -593,6 +597,7 @@ enum msix_hw_int_causes {
         MSIX_HW_INT_CAUSES_REG_ALIVE            = BIT(0),
         MSIX_HW_INT_CAUSES_REG_WAKEUP           = BIT(1),
         MSIX_HW_INT_CAUSES_REG_IPC              = BIT(1),
+        MSIX_HW_INT_CAUSES_REG_IML              = BIT(2),
         MSIX_HW_INT_CAUSES_REG_SW_ERR_V2        = BIT(5),
         MSIX_HW_INT_CAUSES_REG_CT_KILL          = BIT(6),
         MSIX_HW_INT_CAUSES_REG_RF_KILL          = BIT(7),
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
index 43d815cb3ce9..5798f434f68f 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
@@ -71,6 +71,7 @@ void iwl_fw_dbg_copy_tlv(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,
         u32 apply_point = le32_to_cpu(header->apply_point);
 
         int copy_size = le32_to_cpu(tlv->length) + sizeof(*tlv);
+        int offset_size = copy_size;
 
         if (WARN_ONCE(apply_point >= IWL_FW_INI_APPLY_NUM,
                       "Invalid apply point id %d\n", apply_point))
@@ -81,17 +82,25 @@ void iwl_fw_dbg_copy_tlv(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,
         else
                 data = &trans->apply_points[apply_point];
 
+        /* add room for is_alloc field in &iwl_fw_ini_allocation_data struct */
+        if (le32_to_cpu(tlv->type) == IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION) {
+                struct iwl_fw_ini_allocation_data *buf_alloc =
+                        (void *)tlv->data;
+
+                offset_size += sizeof(buf_alloc->is_alloc);
+        }
+
         /*
          * Make sure we still have room to copy this TLV. Offset points to the
          * location the last copy ended.
          */
-        if (WARN_ONCE(data->offset + copy_size > data->size,
+        if (WARN_ONCE(data->offset + offset_size > data->size,
                       "Not enough memory for apply point %d\n",
                       apply_point))
                 return;
 
         memcpy(data->data + data->offset, (void *)tlv, copy_size);
-        data->offset += copy_size;
+        data->offset += offset_size;
 }
 
 void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data,
@@ -129,6 +138,16 @@ void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data,
                 if (WARN_ON(apply >= IWL_FW_INI_APPLY_NUM))
                         continue;
 
+                /* add room for is_alloc field in &iwl_fw_ini_allocation_data
+                 * struct
+                 */
+                if (tlv_type == IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION) {
+                        struct iwl_fw_ini_allocation_data *buf_alloc =
+                                (void *)tlv->data;
+
+                        size[apply] += sizeof(buf_alloc->is_alloc);
+                }
+
                 size[apply] += sizeof(*tlv) + tlv_len;
         }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
index a2af68a0d34b..655ff5694560 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
@@ -1,6 +1,7 @@
 /******************************************************************************
  *
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018 Intel Corporation
  *
  * Portions of this file are derived from the ipw3945 project.
  *
@@ -159,7 +160,7 @@ do {                                            			\
 /* 0x000F0000 - 0x00010000 */
 #define IWL_DL_FW               0x00010000
 #define IWL_DL_RF_KILL          0x00020000
-#define IWL_DL_FW_ERRORS        0x00040000
+#define IWL_DL_TPT              0x00040000
 /* 0x00F00000 - 0x00100000 */
 #define IWL_DL_RATE             0x00100000
 #define IWL_DL_CALIB            0x00200000
@@ -193,7 +194,6 @@ do {                                            			\
 #define IWL_DEBUG_CALIB(p, f, a...)     IWL_DEBUG(p, IWL_DL_CALIB, f, ## a)
 #define IWL_DEBUG_FW(p, f, a...)        IWL_DEBUG(p, IWL_DL_FW, f, ## a)
 #define IWL_DEBUG_RF_KILL(p, f, a...)   IWL_DEBUG(p, IWL_DL_RF_KILL, f, ## a)
-#define IWL_DEBUG_FW_ERRORS(p, f, a...) IWL_DEBUG(p, IWL_DL_FW_ERRORS, f, ## a)
 #define IWL_DEBUG_DROP(p, f, a...)      IWL_DEBUG(p, IWL_DL_DROP, f, ## a)
 #define IWL_DEBUG_DROP_LIMIT(p, f, a...)        \
                 IWL_DEBUG_LIMIT(p, IWL_DL_DROP, f, ## a)
@@ -215,6 +215,7 @@ do {                                            			\
 #define IWL_DEBUG_DEV_RADIO(p, f, a...) IWL_DEBUG_DEV(p, IWL_DL_RADIO, f, ## a)
 #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_TPT(p, f, a...)       IWL_DEBUG(p, IWL_DL_TPT, 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)
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 2efa1dfe9b4c..689a65b11cc3 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -8,6 +8,7 @@
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -30,6 +31,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,6 +77,7 @@
 #include "iwl-dbg-tlv.h"
 #include "iwl-config.h"
 #include "iwl-modparams.h"
+#include "fw/api/alive.h"
 
 /******************************************************************************
  *
@@ -588,6 +591,8 @@ static int iwl_parse_v1_v2_firmware(struct iwl_drv *drv,
         return 0;
 }
 
+#define FW_ADDR_CACHE_CONTROL 0xC0000000
+
 static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                                 const struct firmware *ucode_raw,
                                 struct iwl_firmware_pieces *pieces,
@@ -1085,6 +1090,52 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                                 return -ENOMEM;
                         break;
                         }
+                case IWL_UCODE_TLV_FW_RECOVERY_INFO: {
+                        struct {
+                                __le32 buf_addr;
+                                __le32 buf_size;
+                        } *recov_info = (void *)tlv_data;
+
+                        if (tlv_len != sizeof(*recov_info))
+                                goto invalid_tlv_len;
+                        capa->error_log_addr =
+                                le32_to_cpu(recov_info->buf_addr);
+                        capa->error_log_size =
+                                le32_to_cpu(recov_info->buf_size);
+                        }
+                        break;
+                case IWL_UCODE_TLV_UMAC_DEBUG_ADDRS: {
+                        struct iwl_umac_debug_addrs *dbg_ptrs =
+                                (void *)tlv_data;
+
+                        if (tlv_len != sizeof(*dbg_ptrs))
+                                goto invalid_tlv_len;
+                        if (drv->trans->cfg->device_family <
+                            IWL_DEVICE_FAMILY_22000)
+                                break;
+                        drv->trans->umac_error_event_table =
+                                le32_to_cpu(dbg_ptrs->error_info_addr) &
+                                ~FW_ADDR_CACHE_CONTROL;
+                        drv->trans->error_event_table_tlv_status |=
+                                IWL_ERROR_EVENT_TABLE_UMAC;
+                        break;
+                        }
+                case IWL_UCODE_TLV_LMAC_DEBUG_ADDRS: {
+                        struct iwl_lmac_debug_addrs *dbg_ptrs =
+                                (void *)tlv_data;
+
+                        if (tlv_len != sizeof(*dbg_ptrs))
+                                goto invalid_tlv_len;
+                        if (drv->trans->cfg->device_family <
+                            IWL_DEVICE_FAMILY_22000)
+                                break;
+                        drv->trans->lmac_error_event_table[0] =
+                                le32_to_cpu(dbg_ptrs->error_event_table_ptr) &
+                                ~FW_ADDR_CACHE_CONTROL;
+                        drv->trans->error_event_table_tlv_status |=
+                                IWL_ERROR_EVENT_TABLE_LMAC1;
+                        break;
+                        }
                 case IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION:
                 case IWL_UCODE_TLV_TYPE_HCMD:
                 case IWL_UCODE_TLV_TYPE_REGIONS:
@@ -1202,11 +1253,6 @@ _iwl_op_mode_start(struct iwl_drv *drv, struct iwlwifi_opmode_table *op)
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         drv->dbgfs_op_mode = debugfs_create_dir(op->name,
                                                 drv->dbgfs_drv);
-        if (!drv->dbgfs_op_mode) {
-                IWL_ERR(drv,
-                        "failed to create opmode debugfs directory\n");
-                return op_mode;
-        }
         dbgfs_dir = drv->dbgfs_op_mode;
 #endif
 
@@ -1262,8 +1308,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
         fw->ucode_capa.standard_phy_calibration_size =
                         IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;
         fw->ucode_capa.n_scan_channels = IWL_DEFAULT_SCAN_CHANNELS;
-        /* dump all fw memory areas by default except d3 debug data */
-        fw->dbg.dump_mask = 0xfffdffff;
+        /* dump all fw memory areas by default */
+        fw->dbg.dump_mask = 0xffffffff;
 
         pieces = kzalloc(sizeof(*pieces), GFP_KERNEL);
         if (!pieces)
@@ -1569,20 +1615,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)
         drv->dbgfs_drv = debugfs_create_dir(dev_name(trans->dev),
                                             iwl_dbgfs_root);
 
-        if (!drv->dbgfs_drv) {
-                IWL_ERR(drv, "failed to create debugfs directory\n");
-                ret = -ENOMEM;
-                goto err_free_tlv;
-        }
-
         /* Create transport layer debugfs dir */
         drv->trans->dbgfs_dir = debugfs_create_dir("trans", drv->dbgfs_drv);
-
-        if (!drv->trans->dbgfs_dir) {
-                IWL_ERR(drv, "failed to create transport debugfs directory\n");
-                ret = -ENOMEM;
-                goto err_free_dbgfs;
-        }
 #endif
 
         ret = iwl_request_firmware(drv, true);
@@ -1595,9 +1629,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)
 
 err_fw:
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-err_free_dbgfs:
         debugfs_remove_recursive(drv->dbgfs_drv);
-err_free_tlv:
         iwl_fw_dbg_free(drv->trans);
 #endif
         kfree(drv);
@@ -1708,9 +1740,6 @@ static int __init iwl_drv_init(void)
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         /* Create the root of iwlwifi debugfs subsystem. */
         iwl_dbgfs_root = debugfs_create_dir(DRV_NAME, NULL);
-
-        if (!iwl_dbgfs_root)
-                return -EFAULT;
 #endif
 
         return iwl_pci_register_driver();
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
index 75940ac406b9..04338c3a6205 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
@@ -850,8 +850,7 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
         if (WARN_ON(!cfg || !cfg->eeprom_params))
                 return NULL;
 
-        data = kzalloc(sizeof(*data) +
-                       sizeof(struct ieee80211_channel) * IWL_NUM_CHANNELS,
+        data = kzalloc(struct_size(data, channels, IWL_NUM_CHANNELS),
                        GFP_KERNEL);
         if (!data)
                 return NULL;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c
index a6db6a814257..82e87192119e 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c
@@ -193,34 +193,25 @@ static int iwl_init_otp_access(struct iwl_trans *trans)
 {
         int ret;
 
-        /* Enable 40MHz radio clock */
-        iwl_write32(trans, CSR_GP_CNTRL,
-                    iwl_read32(trans, CSR_GP_CNTRL) |
-                    BIT(trans->cfg->csr->flag_init_done));
-
-        /* wait for clock to be ready */
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           25000);
-        if (ret < 0) {
-                IWL_ERR(trans, "Time out access OTP\n");
-        } else {
-                iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,
-                                  APMG_PS_CTRL_VAL_RESET_REQ);
-                udelay(5);
-                iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,
-                                    APMG_PS_CTRL_VAL_RESET_REQ);
-
-                /*
-                 * CSR auto clock gate disable bit -
-                 * this is only applicable for HW with OTP shadow RAM
-                 */
-                if (trans->cfg->base_params->shadow_ram_support)
-                        iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
-                                    CSR_RESET_LINK_PWR_MGMT_DISABLED);
-        }
-        return ret;
+        ret = iwl_finish_nic_init(trans);
+        if (ret)
+                return ret;
+
+        iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,
+                          APMG_PS_CTRL_VAL_RESET_REQ);
+        udelay(5);
+        iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,
+                            APMG_PS_CTRL_VAL_RESET_REQ);
+
+        /*
+         * CSR auto clock gate disable bit -
+         * this is only applicable for HW with OTP shadow RAM
+         */
+        if (trans->cfg->base_params->shadow_ram_support)
+                iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
+                            CSR_RESET_LINK_PWR_MGMT_DISABLED);
+
+        return 0;
 }
 
 static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
index ffd1e649bfa0..a704e25af810 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -7,6 +7,7 @@
  *
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2015 - 2016 Intel Deutschland GmbH
+ * Copyright(C) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -28,6 +29,7 @@
  *
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2015 - 2016 Intel Deutschland GmbH
+ * Copyright (C) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,6 +70,36 @@
 #include "iwl-prph.h"
 #include "iwl-fh.h"
 
+const struct iwl_csr_params iwl_csr_v1 = {
+        .flag_mac_clock_ready = 0,
+        .flag_val_mac_access_en = 0,
+        .flag_init_done = 2,
+        .flag_mac_access_req = 3,
+        .flag_sw_reset = 7,
+        .flag_master_dis = 8,
+        .flag_stop_master = 9,
+        .addr_sw_reset = CSR_BASE + 0x020,
+        .mac_addr0_otp = 0x380,
+        .mac_addr1_otp = 0x384,
+        .mac_addr0_strap = 0x388,
+        .mac_addr1_strap = 0x38C
+};
+
+const struct iwl_csr_params iwl_csr_v2 = {
+        .flag_init_done = 6,
+        .flag_mac_clock_ready = 20,
+        .flag_val_mac_access_en = 20,
+        .flag_mac_access_req = 21,
+        .flag_master_dis = 28,
+        .flag_stop_master = 29,
+        .flag_sw_reset = 31,
+        .addr_sw_reset = CSR_BASE + 0x024,
+        .mac_addr0_otp = 0x30,
+        .mac_addr1_otp = 0x34,
+        .mac_addr0_strap = 0x38,
+        .mac_addr1_strap = 0x3C
+};
+
 void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val)
 {
         trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val);
@@ -275,9 +307,12 @@ void iwl_force_nmi(struct iwl_trans *trans)
         if (trans->cfg->device_family < IWL_DEVICE_FAMILY_9000)
                 iwl_write_prph(trans, DEVICE_SET_NMI_REG,
                                DEVICE_SET_NMI_VAL_DRV);
+        else if (trans->cfg->device_family < IWL_DEVICE_FAMILY_AX210)
+                iwl_write_umac_prph(trans, UREG_NIC_SET_NMI_DRIVER,
+                                UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER_MSK);
         else
-                iwl_write_prph(trans, UREG_NIC_SET_NMI_DRIVER,
-                               UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER_MSK);
+                iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,
+                                    UREG_DOORBELL_TO_ISR6_NMI_BIT);
 }
 IWL_EXPORT_SYMBOL(iwl_force_nmi);
 
@@ -456,3 +491,43 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf)
 
         return 0;
 }
+
+int iwl_finish_nic_init(struct iwl_trans *trans)
+{
+        int err;
+
+        if (trans->cfg->bisr_workaround) {
+                /* ensure the TOP FSM isn't still in previous reset */
+                mdelay(2);
+        }
+
+        /*
+         * Set "initialization complete" bit to move adapter from
+         * D0U* --> D0A* (powered-up active) state.
+         */
+        iwl_set_bit(trans, CSR_GP_CNTRL,
+                    BIT(trans->cfg->csr->flag_init_done));
+
+        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
+                udelay(2);
+
+        /*
+         * Wait for clock stabilization; once stabilized, access to
+         * device-internal resources is supported, e.g. iwl_write_prph()
+         * and accesses to uCode SRAM.
+         */
+        err = iwl_poll_bit(trans, CSR_GP_CNTRL,
+                           BIT(trans->cfg->csr->flag_mac_clock_ready),
+                           BIT(trans->cfg->csr->flag_mac_clock_ready),
+                           25000);
+        if (err < 0)
+                IWL_DEBUG_INFO(trans, "Failed to wake NIC\n");
+
+        if (trans->cfg->bisr_workaround) {
+                /* ensure BISR shift has finished */
+                udelay(200);
+        }
+
+        return err < 0 ? err : 0;
+}
+IWL_EXPORT_SYMBOL(iwl_finish_nic_init);
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h
index 61477e58352d..920e2146ea3f 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h
@@ -5,6 +5,8 @@
  *
  * GPL LICENSE SUMMARY
  *
+ * Copyright (C) 2018 - 2019 Intel Corporation
+ *
  * 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
  * published by the Free Software Foundation.
@@ -23,6 +25,7 @@
  *
  * BSD LICENSE
  *
+ * Copyright (C) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -96,7 +99,48 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
 void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask);
 void iwl_force_nmi(struct iwl_trans *trans);
 
+int iwl_finish_nic_init(struct iwl_trans *trans);
+
 /* Error handling */
 int iwl_dump_fh(struct iwl_trans *trans, char **buf);
 
+/*
+ * UMAC periphery address space changed from 0xA00000 to 0xD00000 starting from
+ * device family AX200. So peripheries used in families above and below AX200
+ * should go through iwl_..._umac_..._prph.
+ */
+static inline u32 iwl_umac_prph(struct iwl_trans *trans, u32 ofs)
+{
+        return ofs + trans->cfg->umac_prph_offset;
+}
+
+static inline u32 iwl_read_umac_prph_no_grab(struct iwl_trans *trans, u32 ofs)
+{
+        return iwl_read_prph_no_grab(trans, ofs + trans->cfg->umac_prph_offset);
+}
+
+static inline u32 iwl_read_umac_prph(struct iwl_trans *trans, u32 ofs)
+{
+        return iwl_read_prph(trans, ofs + trans->cfg->umac_prph_offset);
+}
+
+static inline void iwl_write_umac_prph_no_grab(struct iwl_trans *trans, u32 ofs,
+                                               u32 val)
+{
+        iwl_write_prph_no_grab(trans,  ofs + trans->cfg->umac_prph_offset, val);
+}
+
+static inline void iwl_write_umac_prph(struct iwl_trans *trans, u32 ofs,
+                                       u32 val)
+{
+        iwl_write_prph(trans,  ofs + trans->cfg->umac_prph_offset, val);
+}
+
+static inline int iwl_poll_umac_prph_bit(struct iwl_trans *trans, u32 addr,
+                                         u32 bits, u32 mask, int timeout)
+{
+        return iwl_poll_prph_bit(trans, addr + trans->cfg->umac_prph_offset,
+                                 bits, mask, timeout);
+}
+
 #endif
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 63c081e5c63a..87d6de7efdd2 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -463,6 +463,9 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg,
         }
 
         vht_cap->vht_mcs.tx_mcs_map = vht_cap->vht_mcs.rx_mcs_map;
+
+        vht_cap->vht_mcs.tx_highest |=
+                cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE);
 }
 
 static struct ieee80211_sband_iftype_data iwl_he_capa[] = {
@@ -930,15 +933,13 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         const __le16 *ch_section;
 
         if (cfg->nvm_type != IWL_NVM_EXT)
-                data = kzalloc(sizeof(*data) +
-                               sizeof(struct ieee80211_channel) *
-                               IWL_NVM_NUM_CHANNELS,
-                               GFP_KERNEL);
+                data = kzalloc(struct_size(data, channels,
+                                           IWL_NVM_NUM_CHANNELS),
+                                           GFP_KERNEL);
         else
-                data = kzalloc(sizeof(*data) +
-                               sizeof(struct ieee80211_channel) *
-                               IWL_NVM_NUM_CHANNELS_EXT,
-                               GFP_KERNEL);
+                data = kzalloc(struct_size(data, channels,
+                                           IWL_NVM_NUM_CHANNELS_EXT),
+                                           GFP_KERNEL);
         if (!data)
                 return NULL;
 
@@ -1086,12 +1087,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         int max_num_ch = cfg->nvm_type == IWL_NVM_EXT ?
                          IWL_NVM_NUM_CHANNELS_EXT : IWL_NVM_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;
 
+        if (WARN_ON_ONCE(num_of_ch > NL80211_MAX_SUPP_REG_RULES))
+                return ERR_PTR(-EINVAL);
+
         IWL_DEBUG_DEV(dev, IWL_DL_LAR, "building regdom for %d channels\n",
                       num_of_ch);
 
@@ -1425,9 +1426,7 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,
         if (empty_otp)
                 IWL_INFO(trans, "OTP is empty\n");
 
-        nvm = kzalloc(sizeof(*nvm) +
-                      sizeof(struct ieee80211_channel) * IWL_NUM_CHANNELS,
-                      GFP_KERNEL);
+        nvm = kzalloc(struct_size(nvm, channels, IWL_NUM_CHANNELS), GFP_KERNEL);
         if (!nvm) {
                 ret = -ENOMEM;
                 goto out;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
index 3aaa5f06461c..1af9f9e1ecd4 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2016        Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2016        Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -433,4 +433,7 @@ enum {
 #define HPM_DEBUG                       0xA03440
 #define PERSISTENCE_BIT                 BIT(12)
 #define PREG_WFPM_ACCESS                BIT(12)
+
+#define UREG_DOORBELL_TO_ISR6           0xA05C04
+#define UREG_DOORBELL_TO_ISR6_NMI_BIT   BIT(0)
 #endif                          /* __iwl_prph_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index a7009cd4232d..bbebbf3efd57 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -8,6 +8,7 @@
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -30,6 +31,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -230,6 +232,12 @@ enum iwl_hcmd_dataflag {
         IWL_HCMD_DFL_DUP        = BIT(1),
 };
 
+enum iwl_error_event_table_status {
+        IWL_ERROR_EVENT_TABLE_LMAC1 = BIT(0),
+        IWL_ERROR_EVENT_TABLE_LMAC2 = BIT(1),
+        IWL_ERROR_EVENT_TABLE_UMAC = BIT(2),
+};
+
 /**
  * struct iwl_host_cmd - Host command to the uCode
  *
@@ -330,6 +338,7 @@ enum iwl_d3_status {
  *      are sent
  * @STATUS_TRANS_IDLE: the trans is idle - general commands are not to be sent
  * @STATUS_TRANS_DEAD: trans is dead - avoid any read/write operation
+ * @STATUS_FW_WAIT_DUMP: if set, wait until cleared before collecting dump
  */
 enum iwl_trans_status {
         STATUS_SYNC_HCMD_ACTIVE,
@@ -342,6 +351,7 @@ enum iwl_trans_status {
         STATUS_TRANS_GOING_IDLE,
         STATUS_TRANS_IDLE,
         STATUS_TRANS_DEAD,
+        STATUS_FW_WAIT_DUMP,
 };
 
 static inline int
@@ -684,6 +694,9 @@ enum iwl_plat_pm_mode {
  */
 #define IWL_TRANS_IDLE_TIMEOUT 2000
 
+/* Max time to wait for nmi interrupt */
+#define IWL_TRANS_NMI_TIMEOUT (HZ / 4)
+
 /**
  * struct iwl_dram_data
  * @physical: page phy pointer
@@ -697,6 +710,20 @@ struct iwl_dram_data {
 };
 
 /**
+ * struct iwl_self_init_dram - dram data used by self init process
+ * @fw: lmac and umac dram data
+ * @fw_cnt: total number of items in array
+ * @paging: paging dram data
+ * @paging_cnt: total number of items in array
+ */
+struct iwl_self_init_dram {
+        struct iwl_dram_data *fw;
+        int fw_cnt;
+        struct iwl_dram_data *paging;
+        int paging_cnt;
+};
+
+/**
  * struct iwl_trans - transport common data
  *
  * @ops - pointer to iwl_trans_ops
@@ -738,6 +765,10 @@ struct iwl_dram_data {
  *      mode is set during the initialization phase and is not
  *      supposed to change during runtime.
  * @dbg_rec_on: true iff there is a fw debug recording currently active
+ * @lmac_error_event_table: addrs of lmacs error tables
+ * @umac_error_event_table: addr of umac error table
+ * @error_event_table_tlv_status: bitmap that indicates what error table
+ *      pointers was recevied via TLV. use enum &iwl_error_event_table_status
  */
 struct iwl_trans {
         const struct iwl_trans_ops *ops;
@@ -790,12 +821,18 @@ struct iwl_trans {
         u8 dbg_n_dest_reg;
         int num_blocks;
         struct iwl_dram_data fw_mon[IWL_FW_INI_APPLY_NUM];
+        struct iwl_self_init_dram init_dram;
 
         enum iwl_plat_pm_mode system_pm_mode;
         enum iwl_plat_pm_mode runtime_pm_mode;
         bool suspending;
         bool dbg_rec_on;
 
+        u32 lmac_error_event_table[2];
+        u32 umac_error_event_table;
+        unsigned int error_event_table_tlv_status;
+        wait_queue_head_t fw_halt_waitq;
+
         /* pointer to trans specific struct */
         /*Ensure that this pointer will always be aligned to sizeof pointer */
         char trans_specific[0] __aligned(sizeof(void *));
@@ -1202,6 +1239,10 @@ static inline void iwl_trans_fw_error(struct iwl_trans *trans)
         /* prevent double restarts due to the same erroneous FW */
         if (!test_and_set_bit(STATUS_FW_ERROR, &trans->status))
                 iwl_op_mode_nic_error(trans->op_mode);
+
+        if (test_and_clear_bit(STATUS_FW_WAIT_DUMP, &trans->status))
+                wake_up(&trans->fw_halt_waitq);
+
 }
 
 /*****************************************************
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
index 30cbd981efbd..dd268c4bd371 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
@@ -5,6 +5,7 @@ iwlmvm-y += utils.o rx.o rxmq.o tx.o binding.o quota.o sta.o sf.o
 iwlmvm-y += scan.o time-event.o rs.o rs-fw.o
 iwlmvm-y += power.o coex.o
 iwlmvm-y += tt.o offloading.o tdls.o
+iwlmvm-y += ftm-responder.o ftm-initiator.o
 iwlmvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o debugfs-vif.o
 iwlmvm-$(CONFIG_IWLWIFI_LEDS) += led.o
 iwlmvm-$(CONFIG_PM) += d3.o
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
index 730e37744dc0..3d2abbc5c76c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
@@ -241,7 +241,6 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
         struct iwl_bt_coex_reduced_txp_update_cmd cmd = {};
         struct iwl_mvm_sta *mvmsta;
         u32 value;
-        int ret;
 
         mvmsta = iwl_mvm_sta_from_staid_protected(mvm, sta_id);
         if (!mvmsta)
@@ -262,10 +261,8 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
         cmd.reduced_txp = cpu_to_le32(value);
         mvmsta->bt_reduced_txpower = enable;
 
-        ret = iwl_mvm_send_cmd_pdu(mvm, BT_COEX_UPDATE_REDUCED_TXP, CMD_ASYNC,
-                                   sizeof(cmd), &cmd);
-
-        return ret;
+        return iwl_mvm_send_cmd_pdu(mvm, BT_COEX_UPDATE_REDUCED_TXP,
+                                    CMD_ASYNC, sizeof(cmd), &cmd);
 }
 
 struct iwl_bt_iterator_data {
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/constants.h b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
index d96ada3c06fc..dff14f1ec55f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
@@ -8,6 +8,7 @@
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015        Intel Deutschland GmbH
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -30,6 +31,7 @@
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015        Intel Deutschland GmbH
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,6 +65,7 @@
 #define __MVM_CONSTANTS_H
 
 #include <linux/ieee80211.h>
+#include "fw-api.h"
 
 #define IWL_MVM_UAPSD_NOAGG_BSSIDS_NUM          20
 
@@ -114,6 +117,7 @@
 #define IWL_MVM_TCM_LOWLAT_ENABLE_THRESH        100 /* packets/10 seconds */
 #define IWL_MVM_UAPSD_NONAGG_PERIOD             5000 /* msecs */
 #define IWL_MVM_UAPSD_NOAGG_LIST_LEN            IWL_MVM_UAPSD_NOAGG_BSSIDS_NUM
+#define IWL_MVM_NON_TRANSMITTING_AP             0
 #define IWL_MVM_RS_NUM_TRY_BEFORE_ANT_TOGGLE    1
 #define IWL_MVM_RS_HT_VHT_RETRIES_PER_RATE      2
 #define IWL_MVM_RS_HT_VHT_RETRIES_PER_RATE_TW   1
@@ -145,5 +149,8 @@
 #define IWL_MVM_RS_TPC_SR_NO_INCREASE           85      /* percent */
 #define IWL_MVM_RS_TPC_TX_POWER_STEP            3
 #define IWL_MVM_ENABLE_EBS                      1
+#define IWL_MVM_FTM_INITIATOR_ALGO              IWL_TOF_ALGO_TYPE_MAX_LIKE
+#define IWL_MVM_FTM_INITIATOR_DYNACK            true
+#define IWL_MVM_D3_DEBUG                        false
 
 #endif /* __MVM_CONSTANTS_H */
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 36ed7d6fc971..808bc6f363d0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -1899,7 +1899,7 @@ static void iwl_mvm_d3_disconnect_iter(void *data, u8 *mac,
 static int iwl_mvm_check_rt_status(struct iwl_mvm *mvm,
                                    struct ieee80211_vif *vif)
 {
-        u32 base = mvm->error_event_table[0];
+        u32 base = mvm->trans->lmac_error_event_table[0];
         struct error_table_start {
                 /* cf. struct iwl_error_event_table */
                 u32 valid;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index e136475a34f6..776b24f54200 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1188,6 +1188,111 @@ out:
         return ret ?: count;
 }
 
+static int _iwl_dbgfs_inject_beacon_ie(struct iwl_mvm *mvm, char *bin, int len)
+{
+        struct ieee80211_vif *vif;
+        struct iwl_mvm_vif *mvmvif;
+        struct sk_buff *beacon;
+        struct ieee80211_tx_info *info;
+        struct iwl_mac_beacon_cmd beacon_cmd = {};
+        u8 rate;
+        u16 flags;
+        int i;
+
+        len /= 2;
+
+        /* Element len should be represented by u8 */
+        if (len >= U8_MAX)
+                return -EINVAL;
+
+        if (!iwl_mvm_firmware_running(mvm))
+                return -EIO;
+
+        if (!iwl_mvm_has_new_tx_api(mvm) &&
+            !fw_has_api(&mvm->fw->ucode_capa,
+                        IWL_UCODE_TLV_API_NEW_BEACON_TEMPLATE))
+                return -EINVAL;
+
+        rcu_read_lock();
+
+        for (i = 0; i < NUM_MAC_INDEX_DRIVER; i++) {
+                vif = iwl_mvm_rcu_dereference_vif_id(mvm, i, true);
+                if (!vif)
+                        continue;
+
+                if (vif->type == NL80211_IFTYPE_AP)
+                        break;
+        }
+
+        if (i == NUM_MAC_INDEX_DRIVER || !vif)
+                goto out_err;
+
+        mvm->hw->extra_beacon_tailroom = len;
+
+        beacon = ieee80211_beacon_get_template(mvm->hw, vif, NULL);
+        if (!beacon)
+                goto out_err;
+
+        if (len && hex2bin(skb_put_zero(beacon, len), bin, len)) {
+                dev_kfree_skb(beacon);
+                goto out_err;
+        }
+
+        mvm->beacon_inject_active = true;
+
+        mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        info = IEEE80211_SKB_CB(beacon);
+        rate = iwl_mvm_mac_ctxt_get_lowest_rate(info, vif);
+        flags = iwl_mvm_mac80211_idx_to_hwrate(rate);
+
+        if (rate == IWL_FIRST_CCK_RATE)
+                flags |= IWL_MAC_BEACON_CCK;
+
+        beacon_cmd.flags = cpu_to_le16(flags);
+        beacon_cmd.byte_cnt = cpu_to_le16((u16)beacon->len);
+        beacon_cmd.template_id = cpu_to_le32((u32)mvmvif->id);
+
+        iwl_mvm_mac_ctxt_set_tim(mvm, &beacon_cmd.tim_idx,
+                                 &beacon_cmd.tim_size,
+                                 beacon->data, beacon->len);
+
+        mutex_lock(&mvm->mutex);
+        iwl_mvm_mac_ctxt_send_beacon_cmd(mvm, beacon, &beacon_cmd,
+                                         sizeof(beacon_cmd));
+        mutex_unlock(&mvm->mutex);
+
+        dev_kfree_skb(beacon);
+
+        rcu_read_unlock();
+        return 0;
+
+out_err:
+        rcu_read_unlock();
+        return -EINVAL;
+}
+
+static ssize_t iwl_dbgfs_inject_beacon_ie_write(struct iwl_mvm *mvm,
+                                                char *buf, size_t count,
+                                                loff_t *ppos)
+{
+        int ret = _iwl_dbgfs_inject_beacon_ie(mvm, buf, count);
+
+        mvm->hw->extra_beacon_tailroom = 0;
+        return ret ?: count;
+}
+
+static ssize_t iwl_dbgfs_inject_beacon_ie_restore_write(struct iwl_mvm *mvm,
+                                                        char *buf,
+                                                        size_t count,
+                                                        loff_t *ppos)
+{
+        int ret = _iwl_dbgfs_inject_beacon_ie(mvm, NULL, 0);
+
+        mvm->hw->extra_beacon_tailroom = 0;
+        mvm->beacon_inject_active = false;
+        return ret ?: count;
+}
+
 static ssize_t iwl_dbgfs_fw_dbg_conf_read(struct file *file,
                                           char __user *user_buf,
                                           size_t count, loff_t *ppos)
@@ -1684,6 +1789,7 @@ iwl_dbgfs_send_echo_cmd_write(struct iwl_mvm *mvm, char *buf,
 
 struct iwl_mvm_sniffer_apply {
         struct iwl_mvm *mvm;
+        u8 *bssid;
         u16 aid;
 };
 
@@ -1693,6 +1799,8 @@ static bool iwl_mvm_sniffer_apply(struct iwl_notif_wait_data *notif_data,
         struct iwl_mvm_sniffer_apply *apply = data;
 
         apply->mvm->cur_aid = cpu_to_le16(apply->aid);
+        memcpy(apply->mvm->cur_bssid, apply->bssid,
+               sizeof(apply->mvm->cur_bssid));
 
         return true;
 }
@@ -1725,6 +1833,7 @@ iwl_dbgfs_he_sniffer_params_write(struct iwl_mvm *mvm, char *buf,
         he_mon_cmd.aid = cpu_to_le16(aid);
 
         apply.aid = aid;
+        apply.bssid = (void *)he_mon_cmd.bssid;
 
         mutex_lock(&mvm->mutex);
 
@@ -1754,6 +1863,23 @@ iwl_dbgfs_he_sniffer_params_write(struct iwl_mvm *mvm, char *buf,
 }
 
 static ssize_t
+iwl_dbgfs_he_sniffer_params_read(struct file *file, char __user *user_buf,
+                                 size_t count, loff_t *ppos)
+{
+        struct iwl_mvm *mvm = file->private_data;
+        u8 buf[32];
+        int len;
+
+        len = scnprintf(buf, sizeof(buf),
+                        "%d %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n",
+                        le16_to_cpu(mvm->cur_aid), mvm->cur_bssid[0],
+                        mvm->cur_bssid[1], mvm->cur_bssid[2], mvm->cur_bssid[3],
+                        mvm->cur_bssid[4], mvm->cur_bssid[5]);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t
 iwl_dbgfs_uapsd_noagg_bssids_read(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos)
 {
@@ -1806,6 +1932,8 @@ MVM_DEBUGFS_WRITE_FILE_OPS(max_amsdu_len, 8);
 MVM_DEBUGFS_WRITE_FILE_OPS(indirection_tbl,
                            (IWL_RSS_INDIRECTION_TABLE_SIZE * 2));
 MVM_DEBUGFS_WRITE_FILE_OPS(inject_packet, 512);
+MVM_DEBUGFS_WRITE_FILE_OPS(inject_beacon_ie, 512);
+MVM_DEBUGFS_WRITE_FILE_OPS(inject_beacon_ie_restore, 512);
 
 MVM_DEBUGFS_READ_FILE_OPS(uapsd_noagg_bssids);
 
@@ -1821,7 +1949,7 @@ MVM_DEBUGFS_READ_WRITE_FILE_OPS(d3_sram, 8);
 MVM_DEBUGFS_READ_FILE_OPS(sar_geo_profile);
 #endif
 
-MVM_DEBUGFS_WRITE_FILE_OPS(he_sniffer_params, 32);
+MVM_DEBUGFS_READ_WRITE_FILE_OPS(he_sniffer_params, 32);
 
 static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos)
@@ -2007,10 +2135,12 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
         MVM_DEBUGFS_ADD_FILE(send_echo_cmd, mvm->debugfs_dir, 0200);
         MVM_DEBUGFS_ADD_FILE(indirection_tbl, mvm->debugfs_dir, 0200);
         MVM_DEBUGFS_ADD_FILE(inject_packet, mvm->debugfs_dir, 0200);
+        MVM_DEBUGFS_ADD_FILE(inject_beacon_ie, mvm->debugfs_dir, 0200);
+        MVM_DEBUGFS_ADD_FILE(inject_beacon_ie_restore, mvm->debugfs_dir, 0200);
 #ifdef CONFIG_ACPI
         MVM_DEBUGFS_ADD_FILE(sar_geo_profile, dbgfs_dir, 0400);
 #endif
-        MVM_DEBUGFS_ADD_FILE(he_sniffer_params, mvm->debugfs_dir, 0200);
+        MVM_DEBUGFS_ADD_FILE(he_sniffer_params, mvm->debugfs_dir, 0600);
 
         if (!debugfs_create_bool("enable_scan_iteration_notif",
                                  0600,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
new file mode 100644
index 000000000000..e9822a3ec373
--- /dev/null
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
@@ -0,0 +1,654 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
+ * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ * Intel Linux Wireless <linuxwifi@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
+ * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2019 Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+#include <linux/etherdevice.h>
+#include <linux/math64.h>
+#include <net/cfg80211.h>
+#include "mvm.h"
+#include "iwl-io.h"
+#include "iwl-prph.h"
+#include "constants.h"
+
+struct iwl_mvm_loc_entry {
+        struct list_head list;
+        u8 addr[ETH_ALEN];
+        u8 lci_len, civic_len;
+        u8 buf[];
+};
+
+static void iwl_mvm_ftm_reset(struct iwl_mvm *mvm)
+{
+        struct iwl_mvm_loc_entry *e, *t;
+
+        mvm->ftm_initiator.req = NULL;
+        mvm->ftm_initiator.req_wdev = NULL;
+        memset(mvm->ftm_initiator.responses, 0,
+               sizeof(mvm->ftm_initiator.responses));
+        list_for_each_entry_safe(e, t, &mvm->ftm_initiator.loc_list, list) {
+                list_del(&e->list);
+                kfree(e);
+        }
+}
+
+void iwl_mvm_ftm_restart(struct iwl_mvm *mvm)
+{
+        struct cfg80211_pmsr_result result = {
+                .status = NL80211_PMSR_STATUS_FAILURE,
+                .final = 1,
+                .host_time = ktime_get_boot_ns(),
+                .type = NL80211_PMSR_TYPE_FTM,
+        };
+        int i;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (!mvm->ftm_initiator.req)
+                return;
+
+        for (i = 0; i < mvm->ftm_initiator.req->n_peers; i++) {
+                memcpy(result.addr, mvm->ftm_initiator.req->peers[i].addr,
+                       ETH_ALEN);
+                result.ftm.burst_index = mvm->ftm_initiator.responses[i];
+
+                cfg80211_pmsr_report(mvm->ftm_initiator.req_wdev,
+                                     mvm->ftm_initiator.req,
+                                     &result, GFP_KERNEL);
+        }
+
+        cfg80211_pmsr_complete(mvm->ftm_initiator.req_wdev,
+                               mvm->ftm_initiator.req, GFP_KERNEL);
+        iwl_mvm_ftm_reset(mvm);
+}
+
+static int
+iwl_ftm_range_request_status_to_err(enum iwl_tof_range_request_status s)
+{
+        switch (s) {
+        case IWL_TOF_RANGE_REQUEST_STATUS_SUCCESS:
+                return 0;
+        case IWL_TOF_RANGE_REQUEST_STATUS_BUSY:
+                return -EBUSY;
+        default:
+                WARN_ON_ONCE(1);
+                return -EIO;
+        }
+}
+
+static void iwl_mvm_ftm_cmd_v5(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                               struct iwl_tof_range_req_cmd_v5 *cmd,
+                               struct cfg80211_pmsr_request *req)
+{
+        int i;
+
+        cmd->request_id = req->cookie;
+        cmd->num_of_ap = req->n_peers;
+
+        /* use maximum for "no timeout" or bigger than what we can do */
+        if (!req->timeout || req->timeout > 255 * 100)
+                cmd->req_timeout = 255;
+        else
+                cmd->req_timeout = DIV_ROUND_UP(req->timeout, 100);
+
+        /*
+         * We treat it always as random, since if not we'll
+         * have filled our local address there instead.
+         */
+        cmd->macaddr_random = 1;
+        memcpy(cmd->macaddr_template, req->mac_addr, ETH_ALEN);
+        for (i = 0; i < ETH_ALEN; i++)
+                cmd->macaddr_mask[i] = ~req->mac_addr_mask[i];
+
+        if (vif->bss_conf.assoc)
+                memcpy(cmd->range_req_bssid, vif->bss_conf.bssid, ETH_ALEN);
+        else
+                eth_broadcast_addr(cmd->range_req_bssid);
+}
+
+static void iwl_mvm_ftm_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct iwl_tof_range_req_cmd *cmd,
+                            struct cfg80211_pmsr_request *req)
+{
+        int i;
+
+        cmd->initiator_flags =
+                cpu_to_le32(IWL_TOF_INITIATOR_FLAGS_MACADDR_RANDOM |
+                            IWL_TOF_INITIATOR_FLAGS_NON_ASAP_SUPPORT);
+        cmd->request_id = req->cookie;
+        cmd->num_of_ap = req->n_peers;
+
+        /*
+         * Use a large value for "no timeout". Don't use the maximum value
+         * because of fw limitations.
+         */
+        if (req->timeout)
+                cmd->req_timeout_ms = cpu_to_le32(req->timeout);
+        else
+                cmd->req_timeout_ms = cpu_to_le32(0xfffff);
+
+        memcpy(cmd->macaddr_template, req->mac_addr, ETH_ALEN);
+        for (i = 0; i < ETH_ALEN; i++)
+                cmd->macaddr_mask[i] = ~req->mac_addr_mask[i];
+
+        if (vif->bss_conf.assoc)
+                memcpy(cmd->range_req_bssid, vif->bss_conf.bssid, ETH_ALEN);
+        else
+                eth_broadcast_addr(cmd->range_req_bssid);
+
+        /* TODO: fill in tsf_mac_id if needed */
+        cmd->tsf_mac_id = cpu_to_le32(0xff);
+}
+
+static int iwl_mvm_ftm_target_chandef(struct iwl_mvm *mvm,
+                                      struct cfg80211_pmsr_request_peer *peer,
+                                      u8 *channel, u8 *bandwidth,
+                                      u8 *ctrl_ch_position)
+{
+        u32 freq = peer->chandef.chan->center_freq;
+
+        *channel = ieee80211_frequency_to_channel(freq);
+
+        switch (peer->chandef.width) {
+        case NL80211_CHAN_WIDTH_20_NOHT:
+                *bandwidth = IWL_TOF_BW_20_LEGACY;
+                break;
+        case NL80211_CHAN_WIDTH_20:
+                *bandwidth = IWL_TOF_BW_20_HT;
+                break;
+        case NL80211_CHAN_WIDTH_40:
+                *bandwidth = IWL_TOF_BW_40;
+                break;
+        case NL80211_CHAN_WIDTH_80:
+                *bandwidth = IWL_TOF_BW_80;
+                break;
+        default:
+                IWL_ERR(mvm, "Unsupported BW in FTM request (%d)\n",
+                        peer->chandef.width);
+                return -EINVAL;
+        }
+
+        *ctrl_ch_position = (peer->chandef.width > NL80211_CHAN_WIDTH_20) ?
+                iwl_mvm_get_ctrl_pos(&peer->chandef) : 0;
+
+        return 0;
+}
+
+static int
+iwl_mvm_ftm_put_target_v2(struct iwl_mvm *mvm,
+                          struct cfg80211_pmsr_request_peer *peer,
+                          struct iwl_tof_range_req_ap_entry_v2 *target)
+{
+        int ret;
+
+        ret = iwl_mvm_ftm_target_chandef(mvm, peer, &target->channel_num,
+                                         &target->bandwidth,
+                                         &target->ctrl_ch_position);
+        if (ret)
+                return ret;
+
+        memcpy(target->bssid, peer->addr, ETH_ALEN);
+        target->burst_period =
+                cpu_to_le16(peer->ftm.burst_period);
+        target->samples_per_burst = peer->ftm.ftms_per_burst;
+        target->num_of_bursts = peer->ftm.num_bursts_exp;
+        target->measure_type = 0; /* regular two-sided FTM */
+        target->retries_per_sample = peer->ftm.ftmr_retries;
+        target->asap_mode = peer->ftm.asap;
+        target->enable_dyn_ack = IWL_MVM_FTM_INITIATOR_DYNACK;
+
+        if (peer->ftm.request_lci)
+                target->location_req |= IWL_TOF_LOC_LCI;
+        if (peer->ftm.request_civicloc)
+                target->location_req |= IWL_TOF_LOC_CIVIC;
+
+        target->algo_type = IWL_MVM_FTM_INITIATOR_ALGO;
+
+        return 0;
+}
+
+#define FTM_PUT_FLAG(flag)      (target->initiator_ap_flags |= \
+                                 cpu_to_le32(IWL_INITIATOR_AP_FLAGS_##flag))
+
+static int iwl_mvm_ftm_put_target(struct iwl_mvm *mvm,
+                                  struct cfg80211_pmsr_request_peer *peer,
+                                  struct iwl_tof_range_req_ap_entry *target)
+{
+        int ret;
+
+        ret = iwl_mvm_ftm_target_chandef(mvm, peer, &target->channel_num,
+                                         &target->bandwidth,
+                                         &target->ctrl_ch_position);
+        if (ret)
+                return ret;
+
+        memcpy(target->bssid, peer->addr, ETH_ALEN);
+        target->burst_period =
+                cpu_to_le16(peer->ftm.burst_period);
+        target->samples_per_burst = peer->ftm.ftms_per_burst;
+        target->num_of_bursts = peer->ftm.num_bursts_exp;
+        target->ftmr_max_retries = peer->ftm.ftmr_retries;
+        target->initiator_ap_flags = cpu_to_le32(0);
+
+        if (peer->ftm.asap)
+                FTM_PUT_FLAG(ASAP);
+
+        if (peer->ftm.request_lci)
+                FTM_PUT_FLAG(LCI_REQUEST);
+
+        if (peer->ftm.request_civicloc)
+                FTM_PUT_FLAG(CIVIC_REQUEST);
+
+        if (IWL_MVM_FTM_INITIATOR_DYNACK)
+                FTM_PUT_FLAG(DYN_ACK);
+
+        if (IWL_MVM_FTM_INITIATOR_ALGO == IWL_TOF_ALGO_TYPE_LINEAR_REG)
+                FTM_PUT_FLAG(ALGO_LR);
+        else if (IWL_MVM_FTM_INITIATOR_ALGO == IWL_TOF_ALGO_TYPE_FFT)
+                FTM_PUT_FLAG(ALGO_FFT);
+
+        return 0;
+}
+
+int iwl_mvm_ftm_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                      struct cfg80211_pmsr_request *req)
+{
+        struct iwl_tof_range_req_cmd_v5 cmd_v5;
+        struct iwl_tof_range_req_cmd cmd;
+        bool new_api = fw_has_api(&mvm->fw->ucode_capa,
+                                  IWL_UCODE_TLV_API_FTM_NEW_RANGE_REQ);
+        u8 num_of_ap;
+        struct iwl_host_cmd hcmd = {
+                .id = iwl_cmd_id(TOF_RANGE_REQ_CMD, LOCATION_GROUP, 0),
+                .dataflags[0] = IWL_HCMD_DFL_DUP,
+        };
+        u32 status = 0;
+        int err, i;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (mvm->ftm_initiator.req)
+                return -EBUSY;
+
+        if (new_api) {
+                iwl_mvm_ftm_cmd(mvm, vif, &cmd, req);
+                hcmd.data[0] = &cmd;
+                hcmd.len[0] = sizeof(cmd);
+                num_of_ap = cmd.num_of_ap;
+        } else {
+                iwl_mvm_ftm_cmd_v5(mvm, vif, &cmd_v5, req);
+                hcmd.data[0] = &cmd_v5;
+                hcmd.len[0] = sizeof(cmd_v5);
+                num_of_ap = cmd_v5.num_of_ap;
+        }
+
+        for (i = 0; i < num_of_ap; i++) {
+                struct cfg80211_pmsr_request_peer *peer = &req->peers[i];
+
+                if (new_api)
+                        err = iwl_mvm_ftm_put_target(mvm, peer, &cmd.ap[i]);
+                else
+                        err = iwl_mvm_ftm_put_target_v2(mvm, peer,
+                                                        &cmd_v5.ap[i]);
+
+                if (err)
+                        return err;
+        }
+
+        err = iwl_mvm_send_cmd_status(mvm, &hcmd, &status);
+        if (!err && status) {
+                IWL_ERR(mvm, "FTM range request command failure, status: %u\n",
+                        status);
+                err = iwl_ftm_range_request_status_to_err(status);
+        }
+
+        if (!err) {
+                mvm->ftm_initiator.req = req;
+                mvm->ftm_initiator.req_wdev = ieee80211_vif_to_wdev(vif);
+        }
+
+        return err;
+}
+
+void iwl_mvm_ftm_abort(struct iwl_mvm *mvm, struct cfg80211_pmsr_request *req)
+{
+        struct iwl_tof_range_abort_cmd cmd = {
+                .request_id = req->cookie,
+        };
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (req != mvm->ftm_initiator.req)
+                return;
+
+        if (iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(TOF_RANGE_ABORT_CMD,
+                                                 LOCATION_GROUP, 0),
+                                 0, sizeof(cmd), &cmd))
+                IWL_ERR(mvm, "failed to abort FTM process\n");
+}
+
+static int iwl_mvm_ftm_find_peer(struct cfg80211_pmsr_request *req,
+                                 const u8 *addr)
+{
+        int i;
+
+        for (i = 0; i < req->n_peers; i++) {
+                struct cfg80211_pmsr_request_peer *peer = &req->peers[i];
+
+                if (ether_addr_equal_unaligned(peer->addr, addr))
+                        return i;
+        }
+
+        return -ENOENT;
+}
+
+static u64 iwl_mvm_ftm_get_host_time(struct iwl_mvm *mvm, __le32 fw_gp2_ts)
+{
+        u32 gp2_ts = le32_to_cpu(fw_gp2_ts);
+        u32 curr_gp2, diff;
+        u64 now_from_boot_ns;
+
+        iwl_mvm_get_sync_time(mvm, &curr_gp2, &now_from_boot_ns);
+
+        if (curr_gp2 >= gp2_ts)
+                diff = curr_gp2 - gp2_ts;
+        else
+                diff = curr_gp2 + (U32_MAX - gp2_ts + 1);
+
+        return now_from_boot_ns - (u64)diff * 1000;
+}
+
+static void iwl_mvm_ftm_get_lci_civic(struct iwl_mvm *mvm,
+                                      struct cfg80211_pmsr_result *res)
+{
+        struct iwl_mvm_loc_entry *entry;
+
+        list_for_each_entry(entry, &mvm->ftm_initiator.loc_list, list) {
+                if (!ether_addr_equal_unaligned(res->addr, entry->addr))
+                        continue;
+
+                if (entry->lci_len) {
+                        res->ftm.lci_len = entry->lci_len;
+                        res->ftm.lci = entry->buf;
+                }
+
+                if (entry->civic_len) {
+                        res->ftm.civicloc_len = entry->civic_len;
+                        res->ftm.civicloc = entry->buf + entry->lci_len;
+                }
+
+                /* we found the entry we needed */
+                break;
+        }
+}
+
+static int iwl_mvm_ftm_range_resp_valid(struct iwl_mvm *mvm, u8 request_id,
+                                        u8 num_of_aps)
+{
+        lockdep_assert_held(&mvm->mutex);
+
+        if (request_id != (u8)mvm->ftm_initiator.req->cookie) {
+                IWL_ERR(mvm, "Request ID mismatch, got %u, active %u\n",
+                        request_id, (u8)mvm->ftm_initiator.req->cookie);
+                return -EINVAL;
+        }
+
+        if (num_of_aps > mvm->ftm_initiator.req->n_peers) {
+                IWL_ERR(mvm, "FTM range response invalid\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index,
+                                     struct cfg80211_pmsr_result *res)
+{
+        s64 rtt_avg = res->ftm.rtt_avg * 100;
+
+        do_div(rtt_avg, 6666);
+
+        IWL_DEBUG_INFO(mvm, "entry %d\n", index);
+        IWL_DEBUG_INFO(mvm, "\tstatus: %d\n", res->status);
+        IWL_DEBUG_INFO(mvm, "\tBSSID: %pM\n", res->addr);
+        IWL_DEBUG_INFO(mvm, "\thost time: %llu\n", res->host_time);
+        IWL_DEBUG_INFO(mvm, "\tburst index: %hhu\n", res->ftm.burst_index);
+        IWL_DEBUG_INFO(mvm, "\tsuccess num: %u\n", res->ftm.num_ftmr_successes);
+        IWL_DEBUG_INFO(mvm, "\trssi: %d\n", res->ftm.rssi_avg);
+        IWL_DEBUG_INFO(mvm, "\trssi spread: %hhu\n", res->ftm.rssi_spread);
+        IWL_DEBUG_INFO(mvm, "\trtt: %lld\n", res->ftm.rtt_avg);
+        IWL_DEBUG_INFO(mvm, "\trtt var: %llu\n", res->ftm.rtt_variance);
+        IWL_DEBUG_INFO(mvm, "\trtt spread: %llu\n", res->ftm.rtt_spread);
+        IWL_DEBUG_INFO(mvm, "\tdistance: %lld\n", rtt_avg);
+}
+
+void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
+{
+        struct iwl_rx_packet *pkt = rxb_addr(rxb);
+        struct iwl_tof_range_rsp_ntfy_v5 *fw_resp_v5 = (void *)pkt->data;
+        struct iwl_tof_range_rsp_ntfy *fw_resp = (void *)pkt->data;
+        int i;
+        bool new_api = fw_has_api(&mvm->fw->ucode_capa,
+                                  IWL_UCODE_TLV_API_FTM_NEW_RANGE_REQ);
+        u8 num_of_aps, last_in_batch;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (!mvm->ftm_initiator.req) {
+                IWL_ERR(mvm, "Got FTM response but have no request?\n");
+                return;
+        }
+
+        if (new_api) {
+                if (iwl_mvm_ftm_range_resp_valid(mvm, fw_resp->request_id,
+                                                 fw_resp->num_of_aps))
+                        return;
+
+                num_of_aps = fw_resp->num_of_aps;
+                last_in_batch = fw_resp->last_report;
+        } else {
+                if (iwl_mvm_ftm_range_resp_valid(mvm, fw_resp_v5->request_id,
+                                                 fw_resp_v5->num_of_aps))
+                        return;
+
+                num_of_aps = fw_resp_v5->num_of_aps;
+                last_in_batch = fw_resp_v5->last_in_batch;
+        }
+
+        IWL_DEBUG_INFO(mvm, "Range response received\n");
+        IWL_DEBUG_INFO(mvm, "request id: %lld, num of entries: %hhu\n",
+                       mvm->ftm_initiator.req->cookie, num_of_aps);
+
+        for (i = 0; i < num_of_aps && i < IWL_MVM_TOF_MAX_APS; i++) {
+                struct cfg80211_pmsr_result result = {};
+                struct iwl_tof_range_rsp_ap_entry_ntfy *fw_ap;
+                int peer_idx;
+
+                if (new_api) {
+                        fw_ap = &fw_resp->ap[i];
+                        result.final = fw_resp->ap[i].last_burst;
+                } else {
+                        /* the first part is the same for old and new APIs */
+                        fw_ap = (void *)&fw_resp_v5->ap[i];
+                        /*
+                         * FIXME: the firmware needs to report this, we don't
+                         * even know the number of bursts the responder picked
+                         * (if we asked it to)
+                         */
+                        result.final = 0;
+                }
+
+                peer_idx = iwl_mvm_ftm_find_peer(mvm->ftm_initiator.req,
+                                                 fw_ap->bssid);
+                if (peer_idx < 0) {
+                        IWL_WARN(mvm,
+                                 "Unknown address (%pM, target #%d) in FTM response\n",
+                                 fw_ap->bssid, i);
+                        continue;
+                }
+
+                switch (fw_ap->measure_status) {
+                case IWL_TOF_ENTRY_SUCCESS:
+                        result.status = NL80211_PMSR_STATUS_SUCCESS;
+                        break;
+                case IWL_TOF_ENTRY_TIMING_MEASURE_TIMEOUT:
+                        result.status = NL80211_PMSR_STATUS_TIMEOUT;
+                        break;
+                case IWL_TOF_ENTRY_NO_RESPONSE:
+                        result.status = NL80211_PMSR_STATUS_FAILURE;
+                        result.ftm.failure_reason =
+                                NL80211_PMSR_FTM_FAILURE_NO_RESPONSE;
+                        break;
+                case IWL_TOF_ENTRY_REQUEST_REJECTED:
+                        result.status = NL80211_PMSR_STATUS_FAILURE;
+                        result.ftm.failure_reason =
+                                NL80211_PMSR_FTM_FAILURE_PEER_BUSY;
+                        result.ftm.busy_retry_time = fw_ap->refusal_period;
+                        break;
+                default:
+                        result.status = NL80211_PMSR_STATUS_FAILURE;
+                        result.ftm.failure_reason =
+                                NL80211_PMSR_FTM_FAILURE_UNSPECIFIED;
+                        break;
+                }
+                memcpy(result.addr, fw_ap->bssid, ETH_ALEN);
+                result.host_time = iwl_mvm_ftm_get_host_time(mvm,
+                                                             fw_ap->timestamp);
+                result.type = NL80211_PMSR_TYPE_FTM;
+                result.ftm.burst_index = mvm->ftm_initiator.responses[peer_idx];
+                mvm->ftm_initiator.responses[peer_idx]++;
+                result.ftm.rssi_avg = fw_ap->rssi;
+                result.ftm.rssi_avg_valid = 1;
+                result.ftm.rssi_spread = fw_ap->rssi_spread;
+                result.ftm.rssi_spread_valid = 1;
+                result.ftm.rtt_avg = (s32)le32_to_cpu(fw_ap->rtt);
+                result.ftm.rtt_avg_valid = 1;
+                result.ftm.rtt_variance = le32_to_cpu(fw_ap->rtt_variance);
+                result.ftm.rtt_variance_valid = 1;
+                result.ftm.rtt_spread = le32_to_cpu(fw_ap->rtt_spread);
+                result.ftm.rtt_spread_valid = 1;
+
+                iwl_mvm_ftm_get_lci_civic(mvm, &result);
+
+                cfg80211_pmsr_report(mvm->ftm_initiator.req_wdev,
+                                     mvm->ftm_initiator.req,
+                                     &result, GFP_KERNEL);
+
+                iwl_mvm_debug_range_resp(mvm, i, &result);
+        }
+
+        if (last_in_batch) {
+                cfg80211_pmsr_complete(mvm->ftm_initiator.req_wdev,
+                                       mvm->ftm_initiator.req,
+                                       GFP_KERNEL);
+                iwl_mvm_ftm_reset(mvm);
+        }
+}
+
+void iwl_mvm_ftm_lc_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
+{
+        struct iwl_rx_packet *pkt = rxb_addr(rxb);
+        const struct ieee80211_mgmt *mgmt = (void *)pkt->data;
+        size_t len = iwl_rx_packet_payload_len(pkt);
+        struct iwl_mvm_loc_entry *entry;
+        const u8 *ies, *lci, *civic, *msr_ie;
+        size_t ies_len, lci_len = 0, civic_len = 0;
+        size_t baselen = IEEE80211_MIN_ACTION_SIZE +
+                         sizeof(mgmt->u.action.u.ftm);
+        static const u8 rprt_type_lci = IEEE80211_SPCT_MSR_RPRT_TYPE_LCI;
+        static const u8 rprt_type_civic = IEEE80211_SPCT_MSR_RPRT_TYPE_CIVIC;
+
+        if (len <= baselen)
+                return;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        ies = mgmt->u.action.u.ftm.variable;
+        ies_len = len - baselen;
+
+        msr_ie = cfg80211_find_ie_match(WLAN_EID_MEASURE_REPORT, ies, ies_len,
+                                        &rprt_type_lci, 1, 4);
+        if (msr_ie) {
+                lci = msr_ie + 2;
+                lci_len = msr_ie[1];
+        }
+
+        msr_ie = cfg80211_find_ie_match(WLAN_EID_MEASURE_REPORT, ies, ies_len,
+                                        &rprt_type_civic, 1, 4);
+        if (msr_ie) {
+                civic = msr_ie + 2;
+                civic_len = msr_ie[1];
+        }
+
+        entry = kmalloc(sizeof(*entry) + lci_len + civic_len, GFP_KERNEL);
+        if (!entry)
+                return;
+
+        memcpy(entry->addr, mgmt->bssid, ETH_ALEN);
+
+        entry->lci_len = lci_len;
+        if (lci_len)
+                memcpy(entry->buf, lci, lci_len);
+
+        entry->civic_len = civic_len;
+        if (civic_len)
+                memcpy(entry->buf + lci_len, civic, civic_len);
+
+        list_add_tail(&entry->list, &mvm->ftm_initiator.loc_list);
+}
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c
new file mode 100644
index 000000000000..1513b8b4062f
--- /dev/null
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c
@@ -0,0 +1,244 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
+ * Copyright (C) 2018 Intel Corporation
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ * Intel Linux Wireless <linuxwifi@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
+ * Copyright (C) 2018 Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+#include <net/cfg80211.h>
+#include <linux/etherdevice.h>
+#include "mvm.h"
+#include "constants.h"
+
+static int
+iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
+                          struct ieee80211_vif *vif,
+                          struct cfg80211_chan_def *chandef)
+{
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_tof_responder_config_cmd cmd = {
+                .channel_num = chandef->chan->hw_value,
+                .cmd_valid_fields =
+                        cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO |
+                                    IWL_TOF_RESPONDER_CMD_VALID_BSSID |
+                                    IWL_TOF_RESPONDER_CMD_VALID_STA_ID),
+                .sta_id = mvmvif->bcast_sta.sta_id,
+        };
+
+        lockdep_assert_held(&mvm->mutex);
+
+        switch (chandef->width) {
+        case NL80211_CHAN_WIDTH_20_NOHT:
+                cmd.bandwidth = IWL_TOF_BW_20_LEGACY;
+                break;
+        case NL80211_CHAN_WIDTH_20:
+                cmd.bandwidth = IWL_TOF_BW_20_HT;
+                break;
+        case NL80211_CHAN_WIDTH_40:
+                cmd.bandwidth = IWL_TOF_BW_40;
+                cmd.ctrl_ch_position = iwl_mvm_get_ctrl_pos(chandef);
+                break;
+        case NL80211_CHAN_WIDTH_80:
+                cmd.bandwidth = IWL_TOF_BW_80;
+                cmd.ctrl_ch_position = iwl_mvm_get_ctrl_pos(chandef);
+                break;
+        default:
+                WARN_ON(1);
+                return -EINVAL;
+        }
+
+        memcpy(cmd.bssid, vif->addr, ETH_ALEN);
+
+        return iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(TOF_RESPONDER_CONFIG_CMD,
+                                                    LOCATION_GROUP, 0),
+                                    0, sizeof(cmd), &cmd);
+}
+
+static int
+iwl_mvm_ftm_responder_dyn_cfg_cmd(struct iwl_mvm *mvm,
+                                  struct ieee80211_vif *vif,
+                                  struct ieee80211_ftm_responder_params *params)
+{
+        struct iwl_tof_responder_dyn_config_cmd cmd = {
+                .lci_len = cpu_to_le32(params->lci_len + 2),
+                .civic_len = cpu_to_le32(params->civicloc_len + 2),
+        };
+        u8 data[IWL_LCI_CIVIC_IE_MAX_SIZE] = {0};
+        struct iwl_host_cmd hcmd = {
+                .id = iwl_cmd_id(TOF_RESPONDER_DYN_CONFIG_CMD,
+                                 LOCATION_GROUP, 0),
+                .data[0] = &cmd,
+                .len[0] = sizeof(cmd),
+                .data[1] = &data,
+                /* .len[1] set later */
+                /* may not be able to DMA from stack */
+                .dataflags[1] = IWL_HCMD_DFL_DUP,
+        };
+        u32 aligned_lci_len = ALIGN(params->lci_len + 2, 4);
+        u32 aligned_civicloc_len = ALIGN(params->civicloc_len + 2, 4);
+        u8 *pos = data;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (aligned_lci_len + aligned_civicloc_len > sizeof(data)) {
+                IWL_ERR(mvm, "LCI/civicloc data too big (%zd + %zd)\n",
+                        params->lci_len, params->civicloc_len);
+                return -ENOBUFS;
+        }
+
+        pos[0] = WLAN_EID_MEASURE_REPORT;
+        pos[1] = params->lci_len;
+        memcpy(pos + 2, params->lci, params->lci_len);
+
+        pos += aligned_lci_len;
+        pos[0] = WLAN_EID_MEASURE_REPORT;
+        pos[1] = params->civicloc_len;
+        memcpy(pos + 2, params->civicloc, params->civicloc_len);
+
+        hcmd.len[1] = aligned_lci_len + aligned_civicloc_len;
+
+        return iwl_mvm_send_cmd(mvm, &hcmd);
+}
+
+int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+{
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct ieee80211_ftm_responder_params *params;
+        struct ieee80211_chanctx_conf ctx, *pctx;
+        u16 *phy_ctxt_id;
+        struct iwl_mvm_phy_ctxt *phy_ctxt;
+        int ret;
+
+        params = vif->bss_conf.ftmr_params;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (WARN_ON_ONCE(!vif->bss_conf.ftm_responder))
+                return -EINVAL;
+
+        if (vif->p2p || vif->type != NL80211_IFTYPE_AP ||
+            !mvmvif->ap_ibss_active) {
+                IWL_ERR(mvm, "Cannot start responder, not in AP mode\n");
+                return -EIO;
+        }
+
+        rcu_read_lock();
+        pctx = rcu_dereference(vif->chanctx_conf);
+        /* Copy the ctx to unlock the rcu and send the phy ctxt. We don't care
+         * about changes in the ctx after releasing the lock because the driver
+         * is still protected by the mutex. */
+        ctx = *pctx;
+        phy_ctxt_id  = (u16 *)pctx->drv_priv;
+        rcu_read_unlock();
+
+        phy_ctxt = &mvm->phy_ctxts[*phy_ctxt_id];
+        ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &ctx.def,
+                                       ctx.rx_chains_static,
+                                       ctx.rx_chains_dynamic);
+        if (ret)
+                return ret;
+
+        ret = iwl_mvm_ftm_responder_cmd(mvm, vif, &ctx.def);
+        if (ret)
+                return ret;
+
+        if (params)
+                ret = iwl_mvm_ftm_responder_dyn_cfg_cmd(mvm, vif, params);
+
+        return ret;
+}
+
+void iwl_mvm_ftm_restart_responder(struct iwl_mvm *mvm,
+                                   struct ieee80211_vif *vif)
+{
+        if (!vif->bss_conf.ftm_responder)
+                return;
+
+        iwl_mvm_ftm_start_responder(mvm, vif);
+}
+
+void iwl_mvm_ftm_responder_stats(struct iwl_mvm *mvm,
+                                 struct iwl_rx_cmd_buffer *rxb)
+{
+        struct iwl_rx_packet *pkt = rxb_addr(rxb);
+        struct iwl_ftm_responder_stats *resp = (void *)pkt->data;
+        struct cfg80211_ftm_responder_stats *stats = &mvm->ftm_resp_stats;
+        u32 flags = le32_to_cpu(resp->flags);
+
+        if (resp->success_ftm == resp->ftm_per_burst)
+                stats->success_num++;
+        else if (resp->success_ftm >= 2)
+                stats->partial_num++;
+        else
+                stats->failed_num++;
+
+        if ((flags & FTM_RESP_STAT_ASAP_REQ) &&
+            (flags & FTM_RESP_STAT_ASAP_RESP))
+                stats->asap_num++;
+
+        if (flags & FTM_RESP_STAT_NON_ASAP_RESP)
+                stats->non_asap_num++;
+
+        stats->total_duration_ms += le32_to_cpu(resp->duration) / USEC_PER_MSEC;
+
+        if (flags & FTM_RESP_STAT_TRIGGER_UNKNOWN)
+                stats->unknown_triggers_num++;
+
+        if (flags & FTM_RESP_STAT_DUP)
+                stats->reschedule_requests_num++;
+
+        if (flags & FTM_RESP_STAT_NON_ASAP_OUT_WIN)
+                stats->out_of_window_triggers_num++;
+}
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index d3dc9d276e0f..00a47f6f1d81 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019        Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019       Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -105,12 +105,12 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm)
         int i;
         struct iwl_rss_config_cmd cmd = {
                 .flags = cpu_to_le32(IWL_RSS_ENABLE),
-                .hash_mask = IWL_RSS_HASH_TYPE_IPV4_TCP |
-                             IWL_RSS_HASH_TYPE_IPV4_UDP |
-                             IWL_RSS_HASH_TYPE_IPV4_PAYLOAD |
-                             IWL_RSS_HASH_TYPE_IPV6_TCP |
-                             IWL_RSS_HASH_TYPE_IPV6_UDP |
-                             IWL_RSS_HASH_TYPE_IPV6_PAYLOAD,
+                .hash_mask = BIT(IWL_RSS_HASH_TYPE_IPV4_TCP) |
+                             BIT(IWL_RSS_HASH_TYPE_IPV4_UDP) |
+                             BIT(IWL_RSS_HASH_TYPE_IPV4_PAYLOAD) |
+                             BIT(IWL_RSS_HASH_TYPE_IPV6_TCP) |
+                             BIT(IWL_RSS_HASH_TYPE_IPV6_UDP) |
+                             BIT(IWL_RSS_HASH_TYPE_IPV6_PAYLOAD),
         };
 
         if (mvm->trans->num_rx_queues == 1)
@@ -127,13 +127,17 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm)
 
 static int iwl_configure_rxq(struct iwl_mvm *mvm)
 {
-        int i, num_queues, size;
+        int i, num_queues, size, ret;
         struct iwl_rfh_queue_config *cmd;
+        struct iwl_host_cmd hcmd = {
+                .id = WIDE_ID(DATA_PATH_GROUP, RFH_QUEUE_CONFIG_CMD),
+                .dataflags[0] = IWL_HCMD_DFL_NOCOPY,
+        };
 
         /* Do not configure default queue, it is configured via context info */
         num_queues = mvm->trans->num_rx_queues - 1;
 
-        size = sizeof(*cmd) + num_queues * sizeof(struct iwl_rfh_queue_data);
+        size = struct_size(cmd, data, num_queues);
 
         cmd = kzalloc(size, GFP_KERNEL);
         if (!cmd)
@@ -154,10 +158,14 @@ static int iwl_configure_rxq(struct iwl_mvm *mvm)
                 cmd->data[i].fr_bd_wid = cpu_to_le32(data.fr_bd_wid);
         }
 
-        return iwl_mvm_send_cmd_pdu(mvm,
-                                    WIDE_ID(DATA_PATH_GROUP,
-                                            RFH_QUEUE_CONFIG_CMD),
-                                    0, size, cmd);
+        hcmd.data[0] = cmd;
+        hcmd.len[0] = size;
+
+        ret = iwl_mvm_send_cmd(mvm, &hcmd);
+
+        kfree(cmd);
+
+        return ret;
 }
 
 static int iwl_mvm_send_dqa_cmd(struct iwl_mvm *mvm)
@@ -210,7 +218,7 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
         struct iwl_lmac_alive *lmac1;
         struct iwl_lmac_alive *lmac2 = NULL;
         u16 status;
-        u32 umac_error_event_table;
+        u32 lmac_error_event_table, umac_error_event_table;
 
         if (iwl_rx_packet_payload_len(pkt) == sizeof(*palive)) {
                 palive = (void *)pkt->data;
@@ -225,30 +233,35 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
                 status = le16_to_cpu(palive3->status);
         }
 
-        mvm->error_event_table[0] = le32_to_cpu(lmac1->error_event_table_ptr);
+        lmac_error_event_table =
+                le32_to_cpu(lmac1->dbg_ptrs.error_event_table_ptr);
+        iwl_fw_lmac1_set_alive_err_table(mvm->trans, lmac_error_event_table);
+
         if (lmac2)
-                mvm->error_event_table[1] =
-                        le32_to_cpu(lmac2->error_event_table_ptr);
-        mvm->log_event_table = le32_to_cpu(lmac1->log_event_table_ptr);
+                mvm->trans->lmac_error_event_table[1] =
+                        le32_to_cpu(lmac2->dbg_ptrs.error_event_table_ptr);
 
-        umac_error_event_table = le32_to_cpu(umac->error_info_addr);
+        umac_error_event_table = le32_to_cpu(umac->dbg_ptrs.error_info_addr);
 
         if (!umac_error_event_table) {
                 mvm->support_umac_log = false;
         } else if (umac_error_event_table >=
                    mvm->trans->cfg->min_umac_error_event_table) {
                 mvm->support_umac_log = true;
-                mvm->umac_error_event_table = umac_error_event_table;
         } else {
                 IWL_ERR(mvm,
                         "Not valid error log pointer 0x%08X for %s uCode\n",
-                        mvm->umac_error_event_table,
+                        umac_error_event_table,
                         (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT) ?
                         "Init" : "RT");
                 mvm->support_umac_log = false;
         }
 
-        alive_data->scd_base_addr = le32_to_cpu(lmac1->scd_base_ptr);
+        if (mvm->support_umac_log)
+                iwl_fw_umac_set_alive_err_table(mvm->trans,
+                                                umac_error_event_table);
+
+        alive_data->scd_base_addr = le32_to_cpu(lmac1->dbg_ptrs.scd_base_ptr);
         alive_data->valid = status == IWL_ALIVE_STATUS_OK;
 
         IWL_DEBUG_FW(mvm,
@@ -299,7 +312,6 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
         enum iwl_ucode_type old_type = mvm->fwrt.cur_fw_img;
         static const u16 alive_cmd[] = { MVM_ALIVE };
 
-        set_bit(IWL_FWRT_STATUS_WAIT_ALIVE, &mvm->fwrt.status);
         if (ucode_type == IWL_UCODE_REGULAR &&
             iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_START_FROM_ALIVE) &&
             !(fw_has_capa(&mvm->fw->ucode_capa,
@@ -332,11 +344,16 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
         if (ret) {
                 struct iwl_trans *trans = mvm->trans;
 
+                if (ret == -ETIMEDOUT)
+                        iwl_fw_dbg_error_collect(&mvm->fwrt,
+                                                 FW_DBG_TRIGGER_ALIVE_TIMEOUT);
+
                 if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22000)
                         IWL_ERR(mvm,
                                 "SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",
-                                iwl_read_prph(trans, UMAG_SB_CPU_1_STATUS),
-                                iwl_read_prph(trans, UMAG_SB_CPU_2_STATUS));
+                                iwl_read_umac_prph(trans, UMAG_SB_CPU_1_STATUS),
+                                iwl_read_umac_prph(trans,
+                                                   UMAG_SB_CPU_2_STATUS));
                 else if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_8000)
                         IWL_ERR(mvm,
                                 "SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",
@@ -377,7 +394,6 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         iwl_fw_set_dbg_rec_on(&mvm->fwrt);
 #endif
-        clear_bit(IWL_FWRT_STATUS_WAIT_ALIVE, &mvm->fwrt.status);
 
         return 0;
 }
@@ -403,13 +419,15 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
                                    iwl_wait_init_complete,
                                    NULL);
 
+        iwl_fw_dbg_apply_point(&mvm->fwrt, IWL_FW_INI_APPLY_EARLY);
+
         /* Will also start the device */
         ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_REGULAR);
         if (ret) {
                 IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);
-                iwl_fw_assert_error_dump(&mvm->fwrt);
                 goto error;
         }
+        iwl_fw_dbg_apply_point(&mvm->fwrt, IWL_FW_INI_APPLY_AFTER_ALIVE);
 
         /* Send init config command to mark that we are sending NVM access
          * commands
@@ -628,10 +646,10 @@ static int iwl_mvm_config_ltr(struct iwl_mvm *mvm)
 }
 
 #ifdef CONFIG_ACPI
-static int iwl_mvm_sar_set_profile(struct iwl_mvm *mvm,
-                                   union acpi_object *table,
-                                   struct iwl_mvm_sar_profile *profile,
-                                   bool enabled)
+static inline int iwl_mvm_sar_set_profile(struct iwl_mvm *mvm,
+                                          union acpi_object *table,
+                                          struct iwl_mvm_sar_profile *profile,
+                                          bool enabled)
 {
         int i;
 
@@ -962,6 +980,57 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)
 }
 #endif /* CONFIG_ACPI */
 
+void iwl_mvm_send_recovery_cmd(struct iwl_mvm *mvm, u32 flags)
+{
+        u32 error_log_size = mvm->fw->ucode_capa.error_log_size;
+        int ret;
+        u32 resp;
+
+        struct iwl_fw_error_recovery_cmd recovery_cmd = {
+                .flags = cpu_to_le32(flags),
+                .buf_size = 0,
+        };
+        struct iwl_host_cmd host_cmd = {
+                .id = WIDE_ID(SYSTEM_GROUP, FW_ERROR_RECOVERY_CMD),
+                .flags = CMD_WANT_SKB,
+                .data = {&recovery_cmd, },
+                .len = {sizeof(recovery_cmd), },
+        };
+
+        /* no error log was defined in TLV */
+        if (!error_log_size)
+                return;
+
+        if (flags & ERROR_RECOVERY_UPDATE_DB) {
+                /* no buf was allocated while HW reset */
+                if (!mvm->error_recovery_buf)
+                        return;
+
+                host_cmd.data[1] = mvm->error_recovery_buf;
+                host_cmd.len[1] =  error_log_size;
+                host_cmd.dataflags[1] = IWL_HCMD_DFL_NOCOPY;
+                recovery_cmd.buf_size = cpu_to_le32(error_log_size);
+        }
+
+        ret = iwl_mvm_send_cmd(mvm, &host_cmd);
+        kfree(mvm->error_recovery_buf);
+        mvm->error_recovery_buf = NULL;
+
+        if (ret) {
+                IWL_ERR(mvm, "Failed to send recovery cmd %d\n", ret);
+                return;
+        }
+
+        /* skb respond is only relevant in ERROR_RECOVERY_UPDATE_DB */
+        if (flags & ERROR_RECOVERY_UPDATE_DB) {
+                resp = le32_to_cpu(*(__le32 *)host_cmd.resp_pkt->data);
+                if (resp)
+                        IWL_ERR(mvm,
+                                "Failed to send recovery cmd blob was invalid %d\n",
+                                resp);
+        }
+}
+
 static int iwl_mvm_sar_init(struct iwl_mvm *mvm)
 {
         int ret;
@@ -1052,7 +1121,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
         ret = iwl_mvm_load_rt_fw(mvm);
         if (ret) {
                 IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);
-                iwl_fw_assert_error_dump(&mvm->fwrt);
+                iwl_fw_dbg_error_collect(&mvm->fwrt, FW_DBG_TRIGGER_DRIVER);
                 goto error;
         }
 
@@ -1198,6 +1267,12 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
         if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
                 iwl_mvm_unref(mvm, IWL_MVM_REF_UCODE_DOWN);
 
+        if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
+                iwl_mvm_send_recovery_cmd(mvm, ERROR_RECOVERY_UPDATE_DB);
+
+        if (iwl_acpi_get_eckv(mvm->dev, &mvm->ext_clock_valid))
+                IWL_DEBUG_INFO(mvm, "ECKV table doesn't exist in BIOS\n");
+
         ret = iwl_mvm_sar_init(mvm);
         if (ret == 0) {
                 ret = iwl_mvm_sar_geo_init(mvm);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
index 9bb1de1cad64..4348bb00e761 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/led.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
@@ -7,6 +7,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2017        Intel Deutschland GmbH
+ * Copyright(c) 2018        Intel Corporation
  *
  * 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
@@ -28,6 +29,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2017        Intel Deutschland GmbH
+ * Copyright(c) 2018        Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -113,6 +115,7 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm)
         switch (mode) {
         case IWL_LED_BLINK:
                 IWL_ERR(mvm, "Blink led mode not supported, used default\n");
+                /* fall through */
         case IWL_LED_DEFAULT:
         case IWL_LED_RF_STATE:
                 mode = IWL_LED_RF_STATE;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 7cfdd07d8736..6a70dece447d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -706,8 +706,7 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
         if (vif->probe_req_reg && vif->bss_conf.assoc && vif->p2p)
                 cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);
 
-        if (vif->bss_conf.assoc && vif->bss_conf.he_support &&
-            !iwlwifi_mod_params.disable_11ax) {
+        if (vif->bss_conf.he_support && !iwlwifi_mod_params.disable_11ax) {
                 cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_11AX);
                 if (vif->bss_conf.twt_requester)
                         ctxt_sta->data_policy |= cpu_to_le32(TWT_SUPPORTED);
@@ -812,9 +811,9 @@ static int iwl_mvm_mac_ctxt_cmd_p2p_device(struct iwl_mvm *mvm,
         return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
 }
 
-static void iwl_mvm_mac_ctxt_set_tim(struct iwl_mvm *mvm,
-                                     __le32 *tim_index, __le32 *tim_size,
-                                     u8 *beacon, u32 frame_size)
+void iwl_mvm_mac_ctxt_set_tim(struct iwl_mvm *mvm,
+                              __le32 *tim_index, __le32 *tim_size,
+                              u8 *beacon, u32 frame_size)
 {
         u32 tim_idx;
         struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)beacon;
@@ -854,8 +853,8 @@ static u32 iwl_mvm_find_ie_offset(u8 *beacon, u8 eid, u32 frame_size)
         return ie - beacon;
 }
 
-static u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct ieee80211_tx_info *info,
-                                           struct ieee80211_vif *vif)
+u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct ieee80211_tx_info *info,
+                                    struct ieee80211_vif *vif)
 {
         u8 rate;
 
@@ -905,9 +904,9 @@ static void iwl_mvm_mac_ctxt_set_tx(struct iwl_mvm *mvm,
 
 }
 
-static int iwl_mvm_mac_ctxt_send_beacon_cmd(struct iwl_mvm *mvm,
-                                            struct sk_buff *beacon,
-                                            void *data, int len)
+int iwl_mvm_mac_ctxt_send_beacon_cmd(struct iwl_mvm *mvm,
+                                     struct sk_buff *beacon,
+                                     void *data, int len)
 {
         struct iwl_host_cmd cmd = {
                 .id = BEACON_TEMPLATE_CMD,
@@ -1010,13 +1009,16 @@ static int iwl_mvm_mac_ctxt_send_beacon_v9(struct iwl_mvm *mvm,
                                                 sizeof(beacon_cmd));
 }
 
-static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,
-                                        struct ieee80211_vif *vif,
-                                        struct sk_buff *beacon)
+int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,
+                                 struct ieee80211_vif *vif,
+                                 struct sk_buff *beacon)
 {
         if (WARN_ON(!beacon))
                 return -EINVAL;
 
+        if (IWL_MVM_NON_TRANSMITTING_AP)
+                return 0;
+
         if (!fw_has_capa(&mvm->fw->ucode_capa,
                          IWL_UCODE_TLV_CAPA_CSA_AND_TBTT_OFFLOAD))
                 return iwl_mvm_mac_ctxt_send_beacon_v6(mvm, vif, beacon);
@@ -1042,6 +1044,11 @@ int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
         if (!beacon)
                 return -ENOMEM;
 
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+        if (mvm->beacon_inject_active)
+                return -EBUSY;
+#endif
+
         ret = iwl_mvm_mac_ctxt_send_beacon(mvm, vif, beacon);
         dev_kfree_skb(beacon);
         return ret;
@@ -1330,7 +1337,7 @@ void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
 {
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_extended_beacon_notif *beacon = (void *)pkt->data;
-        struct iwl_mvm_tx_resp *beacon_notify_hdr;
+        struct iwl_extended_beacon_notif_v5 *beacon_v5 = (void *)pkt->data;
         struct ieee80211_vif *csa_vif;
         struct ieee80211_vif *tx_blocked_vif;
         struct agg_tx_status *agg_status;
@@ -1338,18 +1345,29 @@ void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
 
         lockdep_assert_held(&mvm->mutex);
 
-        beacon_notify_hdr = &beacon->beacon_notify_hdr;
         mvm->ap_last_beacon_gp2 = le32_to_cpu(beacon->gp2);
-        mvm->ibss_manager = beacon->ibss_mgr_status != 0;
 
-        agg_status = iwl_mvm_get_agg_status(mvm, beacon_notify_hdr);
-        status = le16_to_cpu(agg_status->status) & TX_STATUS_MSK;
-        IWL_DEBUG_RX(mvm,
-                     "beacon status %#x retries:%d tsf:0x%016llX gp2:0x%X rate:%d\n",
-                     status, beacon_notify_hdr->failure_frame,
-                     le64_to_cpu(beacon->tsf),
-                     mvm->ap_last_beacon_gp2,
-                     le32_to_cpu(beacon_notify_hdr->initial_rate));
+        if (!iwl_mvm_is_short_beacon_notif_supported(mvm)) {
+                struct iwl_mvm_tx_resp *beacon_notify_hdr =
+                        &beacon_v5->beacon_notify_hdr;
+
+                mvm->ibss_manager = beacon_v5->ibss_mgr_status != 0;
+                agg_status = iwl_mvm_get_agg_status(mvm, beacon_notify_hdr);
+                status = le16_to_cpu(agg_status->status) & TX_STATUS_MSK;
+                IWL_DEBUG_RX(mvm,
+                             "beacon status %#x retries:%d tsf:0x%016llX gp2:0x%X rate:%d\n",
+                             status, beacon_notify_hdr->failure_frame,
+                             le64_to_cpu(beacon->tsf),
+                             mvm->ap_last_beacon_gp2,
+                             le32_to_cpu(beacon_notify_hdr->initial_rate));
+        } else {
+                mvm->ibss_manager = beacon->ibss_mgr_status != 0;
+                status = le32_to_cpu(beacon->status) & TX_STATUS_MSK;
+                IWL_DEBUG_RX(mvm,
+                             "beacon status %#x tsf:0x%016llX gp2:0x%X\n",
+                             status, le64_to_cpu(beacon->tsf),
+                             mvm->ap_last_beacon_gp2);
+        }
 
         csa_vif = rcu_dereference_protected(mvm->csa_vif,
                                             lockdep_is_held(&mvm->mutex));
@@ -1539,42 +1557,58 @@ void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,
 {
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_channel_switch_noa_notif *notif = (void *)pkt->data;
-        struct ieee80211_vif *csa_vif;
+        struct ieee80211_vif *csa_vif, *vif;
         struct iwl_mvm_vif *mvmvif;
         int len = iwl_rx_packet_payload_len(pkt);
-        u32 id_n_color;
+        u32 id_n_color, csa_id, mac_id;
 
         if (WARN_ON_ONCE(len < sizeof(*notif)))
                 return;
 
-        rcu_read_lock();
-
-        csa_vif = rcu_dereference(mvm->csa_vif);
-        if (WARN_ON(!csa_vif || !csa_vif->csa_active))
-                goto out_unlock;
-
         id_n_color = le32_to_cpu(notif->id_and_color);
+        mac_id = id_n_color & FW_CTXT_ID_MSK;
 
-        mvmvif = iwl_mvm_vif_from_mac80211(csa_vif);
-        if (WARN(FW_CMD_ID_AND_COLOR(mvmvif->id, mvmvif->color) != id_n_color,
-                 "channel switch noa notification on unexpected vif (csa_vif=%d, notif=%d)",
-                 FW_CMD_ID_AND_COLOR(mvmvif->id, mvmvif->color), id_n_color))
-                goto out_unlock;
+        if (WARN_ON_ONCE(mac_id >= NUM_MAC_INDEX_DRIVER))
+                return;
 
-        IWL_DEBUG_INFO(mvm, "Channel Switch Started Notification\n");
+        rcu_read_lock();
+        vif = rcu_dereference(mvm->vif_id_to_mac[mac_id]);
 
-        schedule_delayed_work(&mvm->cs_tx_unblock_dwork,
-                              msecs_to_jiffies(IWL_MVM_CS_UNBLOCK_TX_TIMEOUT *
-                                               csa_vif->bss_conf.beacon_int));
+        switch (vif->type) {
+        case NL80211_IFTYPE_AP:
+                csa_vif = rcu_dereference(mvm->csa_vif);
+                if (WARN_ON(!csa_vif || !csa_vif->csa_active ||
+                            csa_vif != vif))
+                        goto out_unlock;
 
-        ieee80211_csa_finish(csa_vif);
+                mvmvif = iwl_mvm_vif_from_mac80211(csa_vif);
+                csa_id = FW_CMD_ID_AND_COLOR(mvmvif->id, mvmvif->color);
+                if (WARN(csa_id != id_n_color,
+                         "channel switch noa notification on unexpected vif (csa_vif=%d, notif=%d)",
+                         csa_id, id_n_color))
+                        goto out_unlock;
 
-        rcu_read_unlock();
+                IWL_DEBUG_INFO(mvm, "Channel Switch Started Notification\n");
 
-        RCU_INIT_POINTER(mvm->csa_vif, NULL);
+                schedule_delayed_work(&mvm->cs_tx_unblock_dwork,
+                                      msecs_to_jiffies(IWL_MVM_CS_UNBLOCK_TX_TIMEOUT *
+                                                       csa_vif->bss_conf.beacon_int));
 
-        return;
+                ieee80211_csa_finish(csa_vif);
 
+                rcu_read_unlock();
+
+                RCU_INIT_POINTER(mvm->csa_vif, NULL);
+                return;
+        case NL80211_IFTYPE_STATION:
+                iwl_mvm_csa_client_absent(mvm, vif);
+                ieee80211_chswitch_done(vif, true);
+                break;
+        default:
+                /* should never happen */
+                WARN_ON_ONCE(1);
+                break;
+        }
 out_unlock:
         rcu_read_unlock();
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index e098884dd915..3a92c09d4692 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -184,6 +184,29 @@ static const struct iwl_fw_bcast_filter iwl_mvm_default_bcast_filters[] = {
 };
 #endif
 
+static const struct cfg80211_pmsr_capabilities iwl_mvm_pmsr_capa = {
+        .max_peers = IWL_MVM_TOF_MAX_APS,
+        .report_ap_tsf = 1,
+        .randomize_mac_addr = 1,
+
+        .ftm = {
+                .supported = 1,
+                .asap = 1,
+                .non_asap = 1,
+                .request_lci = 1,
+                .request_civicloc = 1,
+                .max_bursts_exponent = -1, /* all supported */
+                .max_ftms_per_burst = 0, /* no limits */
+                .bandwidths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
+                              BIT(NL80211_CHAN_WIDTH_20) |
+                              BIT(NL80211_CHAN_WIDTH_40) |
+                              BIT(NL80211_CHAN_WIDTH_80),
+                .preambles = BIT(NL80211_PREAMBLE_LEGACY) |
+                             BIT(NL80211_PREAMBLE_HT) |
+                             BIT(NL80211_PREAMBLE_VHT),
+        },
+};
+
 void iwl_mvm_ref(struct iwl_mvm *mvm, enum iwl_mvm_ref_type ref_type)
 {
         if (!iwl_mvm_is_d0i3_supported(mvm))
@@ -420,6 +443,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                 WLAN_CIPHER_SUITE_TKIP,
                 WLAN_CIPHER_SUITE_CCMP,
         };
+#ifdef CONFIG_PM_SLEEP
+        bool unified = fw_has_capa(&mvm->fw->ucode_capa,
+                                   IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);
+#endif
 
         /* Tell mac80211 our characteristics */
         ieee80211_hw_set(hw, SIGNAL_DBM);
@@ -544,6 +571,13 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                 hw->wiphy->n_cipher_suites++;
         }
 
+        if (fw_has_capa(&mvm->fw->ucode_capa,
+                        IWL_UCODE_TLV_CAPA_FTM_CALIBRATED)) {
+                wiphy_ext_feature_set(hw->wiphy,
+                                      NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER);
+                hw->wiphy->pmsr_capa = &iwl_mvm_pmsr_capa;
+        }
+
         ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);
         hw->wiphy->features |=
                 NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
@@ -709,7 +743,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                 hw->wiphy->wowlan = &mvm->wowlan;
         }
 
-        if (mvm->fw->img[IWL_UCODE_WOWLAN].num_sec &&
+        if ((unified || mvm->fw->img[IWL_UCODE_WOWLAN].num_sec) &&
             mvm->trans->ops->d3_suspend &&
             mvm->trans->ops->d3_resume &&
             device_can_wakeup(mvm->trans->dev)) {
@@ -762,15 +796,15 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                         hw->netdev_features |= IWL_TX_CSUM_NETIF_FLAGS;
         }
 
-        ret = ieee80211_register_hw(mvm->hw);
-        if (ret)
-                iwl_mvm_leds_exit(mvm);
-        mvm->init_status |= IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE;
-
         if (mvm->cfg->vht_mu_mimo_supported)
                 wiphy_ext_feature_set(hw->wiphy,
                                       NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER);
 
+        ret = ieee80211_register_hw(mvm->hw);
+        if (ret) {
+                iwl_mvm_leds_exit(mvm);
+        }
+
         return ret;
 }
 
@@ -907,8 +941,14 @@ void iwl_mvm_mac_itxq_xmit(struct ieee80211_hw *hw, struct ieee80211_txq *txq)
                                IWL_PLAT_PM_MODE_DISABLED))) {
                         skb = ieee80211_tx_dequeue(hw, txq);
 
-                        if (!skb)
+                        if (!skb) {
+                                if (txq->sta)
+                                        IWL_DEBUG_TX(mvm,
+                                                     "TXQ of sta %pM tid %d is now empty\n",
+                                                     txq->sta->addr,
+                                                     txq->tid);
                                 break;
+                        }
 
                         if (!txq->sta)
                                 iwl_mvm_tx_skb_non_sta(mvm, skb);
@@ -1177,6 +1217,8 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)
         iwl_mvm_cleanup_roc_te(mvm);
         ieee80211_remain_on_channel_expired(mvm->hw);
 
+        iwl_mvm_ftm_restart(mvm);
+
         /*
          * cleanup all interfaces, even inactive ones, as some might have
          * gone down during the HW restart
@@ -1290,6 +1332,8 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)
         /* allow transport/FW low power modes */
         iwl_mvm_unref(mvm, IWL_MVM_REF_UCODE_DOWN);
 
+        iwl_mvm_send_recovery_cmd(mvm, ERROR_RECOVERY_END_OF_RECOVERY);
+
         /*
          * If we have TDLS peers, remove them. We don't know the last seqno/PN
          * of packets the FW sent out, so we must reconnect.
@@ -1653,6 +1697,9 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,
                                        IEEE80211_VIF_SUPPORTS_CQM_RSSI);
         }
 
+        if (vif->bss_conf.ftm_responder)
+                memset(&mvm->ftm_resp_stats, 0, sizeof(mvm->ftm_resp_stats));
+
         iwl_mvm_vif_dbgfs_clean(mvm, vif);
 
         /*
@@ -2363,7 +2410,10 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
                          * If update fails - SF might be running in associated
                          * mode while disassociated - which is forbidden.
                          */
-                        WARN_ONCE(iwl_mvm_sf_update(mvm, vif, false),
+                        ret = iwl_mvm_sf_update(mvm, vif, false);
+                        WARN_ONCE(ret &&
+                                  !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
+                                            &mvm->status),
                                   "Failed to update SF upon disassociation\n");
 
                         /*
@@ -2584,6 +2634,8 @@ 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);
 
+        iwl_mvm_ftm_restart_responder(mvm, vif);
+
         goto out_unlock;
 
 out_quota_failed:
@@ -2695,6 +2747,15 @@ iwl_mvm_bss_info_changed_ap_ibss(struct iwl_mvm *mvm,
                                 bss_conf->txpower);
                 iwl_mvm_set_tx_power(mvm, vif, bss_conf->txpower);
         }
+
+        if (changes & BSS_CHANGED_FTM_RESPONDER) {
+                int ret = iwl_mvm_ftm_start_responder(mvm, vif);
+
+                if (ret)
+                        IWL_WARN(mvm, "Failed to enable FTM responder (%d)\n",
+                                 ret);
+        }
+
 }
 
 static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
@@ -3106,11 +3167,15 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
         } else if (old_state == IEEE80211_STA_AUTH &&
                    new_state == IEEE80211_STA_ASSOC) {
                 if (vif->type == NL80211_IFTYPE_AP) {
+                        vif->bss_conf.he_support = sta->he_cap.has_he;
                         mvmvif->ap_assoc_sta_count++;
                         iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
                         if (vif->bss_conf.he_support &&
                             !iwlwifi_mod_params.disable_11ax)
                                 iwl_mvm_cfg_he_sta(mvm, vif, mvm_sta->sta_id);
+                } else if (vif->type == NL80211_IFTYPE_STATION) {
+                        vif->bss_conf.he_support = sta->he_cap.has_he;
+                        iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
                 }
 
                 iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,
@@ -3118,6 +3183,24 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
                 ret = iwl_mvm_update_sta(mvm, vif, sta);
         } else if (old_state == IEEE80211_STA_ASSOC &&
                    new_state == IEEE80211_STA_AUTHORIZED) {
+                /* if wep is used, need to set the key for the station now */
+                if (vif->type == NL80211_IFTYPE_AP && mvmvif->ap_wep_key) {
+                        mvm_sta->wep_key =
+                                kmemdup(mvmvif->ap_wep_key,
+                                        sizeof(*mvmvif->ap_wep_key) +
+                                        mvmvif->ap_wep_key->keylen,
+                                        GFP_KERNEL);
+                        if (!mvm_sta->wep_key) {
+                                ret = -ENOMEM;
+                                goto out_unlock;
+                        }
+
+                        ret = iwl_mvm_set_sta_key(mvm, vif, sta,
+                                                  mvm_sta->wep_key,
+                                                  STA_KEY_IDX_INVALID);
+                } else {
+                        ret = 0;
+                }
 
                 /* we don't support TDLS during DCM */
                 if (iwl_mvm_phy_ctx_count(mvm) > 1)
@@ -3132,18 +3215,13 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
 
                 iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,
                                      true);
-
-                /* if wep is used, need to set the key for the station now */
-                if (vif->type == NL80211_IFTYPE_AP && mvmvif->ap_wep_key)
-                        ret = iwl_mvm_set_sta_key(mvm, vif, sta,
-                                                  mvmvif->ap_wep_key,
-                                                  STA_KEY_IDX_INVALID);
-                else
-                        ret = 0;
         } else if (old_state == IEEE80211_STA_AUTHORIZED &&
                    new_state == IEEE80211_STA_ASSOC) {
                 /* disable beacon filtering */
-                WARN_ON(iwl_mvm_disable_beacon_filter(mvm, vif, 0));
+                ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);
+                WARN_ON(ret &&
+                        !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
+                                  &mvm->status));
                 ret = 0;
         } else if (old_state == IEEE80211_STA_ASSOC &&
                    new_state == IEEE80211_STA_AUTH) {
@@ -3167,12 +3245,18 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
                 /* Remove STA key if this is an AP using WEP */
                 if (vif->type == NL80211_IFTYPE_AP && mvmvif->ap_wep_key) {
                         int rm_ret = iwl_mvm_remove_sta_key(mvm, vif, sta,
-                                                            mvmvif->ap_wep_key);
+                                                            mvm_sta->wep_key);
 
                         if (!ret)
                                 ret = rm_ret;
+                        kfree(mvm_sta->wep_key);
+                        mvm_sta->wep_key = NULL;
                 }
 
+                if (unlikely(ret &&
+                             test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
+                                      &mvm->status)))
+                        ret = 0;
         } else {
                 ret = -EIO;
         }
@@ -3816,11 +3900,43 @@ static int iwl_mvm_cancel_roc(struct ieee80211_hw *hw)
         return 0;
 }
 
+struct iwl_mvm_ftm_responder_iter_data {
+        bool responder;
+        struct ieee80211_chanctx_conf *ctx;
+};
+
+static void iwl_mvm_ftm_responder_chanctx_iter(void *_data, u8 *mac,
+                                               struct ieee80211_vif *vif)
+{
+        struct iwl_mvm_ftm_responder_iter_data *data = _data;
+
+        if (rcu_access_pointer(vif->chanctx_conf) == data->ctx &&
+            vif->type == NL80211_IFTYPE_AP && vif->bss_conf.ftmr_params)
+                data->responder = true;
+}
+
+static bool iwl_mvm_is_ftm_responder_chanctx(struct iwl_mvm *mvm,
+                                             struct ieee80211_chanctx_conf *ctx)
+{
+        struct iwl_mvm_ftm_responder_iter_data data = {
+                .responder = false,
+                .ctx = ctx,
+        };
+
+        ieee80211_iterate_active_interfaces_atomic(mvm->hw,
+                                        IEEE80211_IFACE_ITER_NORMAL,
+                                        iwl_mvm_ftm_responder_chanctx_iter,
+                                        &data);
+        return data.responder;
+}
+
 static int __iwl_mvm_add_chanctx(struct iwl_mvm *mvm,
                                  struct ieee80211_chanctx_conf *ctx)
 {
         u16 *phy_ctxt_id = (u16 *)ctx->drv_priv;
         struct iwl_mvm_phy_ctxt *phy_ctxt;
+        bool responder = iwl_mvm_is_ftm_responder_chanctx(mvm, ctx);
+        struct cfg80211_chan_def *def = responder ? &ctx->def : &ctx->min_def;
         int ret;
 
         lockdep_assert_held(&mvm->mutex);
@@ -3833,7 +3949,7 @@ static int __iwl_mvm_add_chanctx(struct iwl_mvm *mvm,
                 goto out;
         }
 
-        ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &ctx->min_def,
+        ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, def,
                                        ctx->rx_chains_static,
                                        ctx->rx_chains_dynamic);
         if (ret) {
@@ -3888,6 +4004,8 @@ static void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,
         struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
         u16 *phy_ctxt_id = (u16 *)ctx->drv_priv;
         struct iwl_mvm_phy_ctxt *phy_ctxt = &mvm->phy_ctxts[*phy_ctxt_id];
+        bool responder = iwl_mvm_is_ftm_responder_chanctx(mvm, ctx);
+        struct cfg80211_chan_def *def = responder ? &ctx->def : &ctx->min_def;
 
         if (WARN_ONCE((phy_ctxt->ref > 1) &&
                       (changed & ~(IEEE80211_CHANCTX_CHANGE_WIDTH |
@@ -3902,17 +4020,17 @@ static void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,
 
         /* we are only changing the min_width, may be a noop */
         if (changed == IEEE80211_CHANCTX_CHANGE_MIN_WIDTH) {
-                if (phy_ctxt->width == ctx->min_def.width)
+                if (phy_ctxt->width == def->width)
                         goto out_unlock;
 
                 /* we are just toggling between 20_NOHT and 20 */
                 if (phy_ctxt->width <= NL80211_CHAN_WIDTH_20 &&
-                    ctx->min_def.width <= NL80211_CHAN_WIDTH_20)
+                    def->width <= NL80211_CHAN_WIDTH_20)
                         goto out_unlock;
         }
 
         iwl_mvm_bt_coex_vif_change(mvm);
-        iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &ctx->min_def,
+        iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, def,
                                  ctx->rx_chains_static,
                                  ctx->rx_chains_dynamic);
 
@@ -3941,6 +4059,7 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
                         mvmvif->ap_ibss_active = true;
                         break;
                 }
+                /* fall through */
         case NL80211_IFTYPE_ADHOC:
                 /*
                  * The AP binding flow is handled as part of the start_ap flow
@@ -3993,25 +4112,30 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
         }
 
         if (switching_chanctx && vif->type == NL80211_IFTYPE_STATION) {
-                u32 duration = 3 * vif->bss_conf.beacon_int;
+                mvmvif->csa_bcn_pending = true;
 
-                /* iwl_mvm_protect_session() reads directly from the
-                 * device (the system time), so make sure it is
-                 * available.
-                 */
-                ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PROTECT_CSA);
-                if (ret)
-                        goto out_remove_binding;
+                if (!fw_has_capa(&mvm->fw->ucode_capa,
+                                 IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD)) {
+                        u32 duration = 3 * vif->bss_conf.beacon_int;
 
-                /* Protect the session to make sure we hear the first
-                 * beacon on the new channel.
-                 */
-                mvmvif->csa_bcn_pending = true;
-                iwl_mvm_protect_session(mvm, vif, duration, duration,
-                                        vif->bss_conf.beacon_int / 2,
-                                        true);
 
-                iwl_mvm_unref(mvm, IWL_MVM_REF_PROTECT_CSA);
+                        /* iwl_mvm_protect_session() reads directly from the
+                         * device (the system time), so make sure it is
+                         * available.
+                         */
+                        ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PROTECT_CSA);
+                        if (ret)
+                                goto out_remove_binding;
+
+                        /* Protect the session to make sure we hear the first
+                         * beacon on the new channel.
+                         */
+                        iwl_mvm_protect_session(mvm, vif, duration, duration,
+                                                vif->bss_conf.beacon_int / 2,
+                                                true);
+
+                        iwl_mvm_unref(mvm, IWL_MVM_REF_PROTECT_CSA);
+                }
 
                 iwl_mvm_update_quotas(mvm, false, NULL);
         }
@@ -4081,7 +4205,9 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,
 
                 disabled_vif = vif;
 
-                iwl_mvm_mac_ctxt_changed(mvm, vif, true, NULL);
+                if (!fw_has_capa(&mvm->fw->ucode_capa,
+                                 IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD))
+                        iwl_mvm_mac_ctxt_changed(mvm, vif, true, NULL);
                 break;
         default:
                 break;
@@ -4332,6 +4458,27 @@ static void iwl_mvm_channel_switch(struct ieee80211_hw *hw,
                            "dummy channel switch op\n");
 }
 
+static int iwl_mvm_schedule_client_csa(struct iwl_mvm *mvm,
+                                       struct ieee80211_vif *vif,
+                                       struct ieee80211_channel_switch *chsw)
+{
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_chan_switch_te_cmd cmd = {
+                .mac_id = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id,
+                                                          mvmvif->color)),
+                .action = cpu_to_le32(FW_CTXT_ACTION_ADD),
+                .tsf = cpu_to_le32(chsw->timestamp),
+                .cs_count = chsw->count,
+        };
+
+        lockdep_assert_held(&mvm->mutex);
+
+        return iwl_mvm_send_cmd_pdu(mvm,
+                                    WIDE_ID(MAC_CONF_GROUP,
+                                            CHANNEL_SWITCH_TIME_EVENT_CMD),
+                                    0, sizeof(cmd), &cmd);
+}
+
 static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,
                                       struct ieee80211_vif *vif,
                                       struct ieee80211_channel_switch *chsw)
@@ -4399,14 +4546,19 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,
                 if (chsw->block_tx)
                         iwl_mvm_csa_client_absent(mvm, vif);
 
-                iwl_mvm_schedule_csa_period(mvm, vif, vif->bss_conf.beacon_int,
-                                            apply_time);
                 if (mvmvif->bf_data.bf_enabled) {
                         ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);
                         if (ret)
                                 goto out_unlock;
                 }
 
+                if (fw_has_capa(&mvm->fw->ucode_capa,
+                                IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD))
+                        iwl_mvm_schedule_client_csa(mvm, vif, chsw);
+                else
+                        iwl_mvm_schedule_csa_period(mvm, vif,
+                                                    vif->bss_conf.beacon_int,
+                                                    apply_time);
                 break;
         default:
                 break;
@@ -4799,6 +4951,60 @@ static void iwl_mvm_sync_rx_queues(struct ieee80211_hw *hw)
         mutex_unlock(&mvm->mutex);
 }
 
+static int
+iwl_mvm_mac_get_ftm_responder_stats(struct ieee80211_hw *hw,
+                                    struct ieee80211_vif *vif,
+                                    struct cfg80211_ftm_responder_stats *stats)
+{
+        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+
+        if (vif->p2p || vif->type != NL80211_IFTYPE_AP ||
+            !mvmvif->ap_ibss_active || !vif->bss_conf.ftm_responder)
+                return -EINVAL;
+
+        mutex_lock(&mvm->mutex);
+        *stats = mvm->ftm_resp_stats;
+        mutex_unlock(&mvm->mutex);
+
+        stats->filled = BIT(NL80211_FTM_STATS_SUCCESS_NUM) |
+                        BIT(NL80211_FTM_STATS_PARTIAL_NUM) |
+                        BIT(NL80211_FTM_STATS_FAILED_NUM) |
+                        BIT(NL80211_FTM_STATS_ASAP_NUM) |
+                        BIT(NL80211_FTM_STATS_NON_ASAP_NUM) |
+                        BIT(NL80211_FTM_STATS_TOTAL_DURATION_MSEC) |
+                        BIT(NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM) |
+                        BIT(NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM) |
+                        BIT(NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM);
+
+        return 0;
+}
+
+static int iwl_mvm_start_pmsr(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif,
+                              struct cfg80211_pmsr_request *request)
+{
+        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+        int ret;
+
+        mutex_lock(&mvm->mutex);
+        ret = iwl_mvm_ftm_start(mvm, vif, request);
+        mutex_unlock(&mvm->mutex);
+
+        return ret;
+}
+
+static void iwl_mvm_abort_pmsr(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct cfg80211_pmsr_request *request)
+{
+        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+
+        mutex_lock(&mvm->mutex);
+        iwl_mvm_ftm_abort(mvm, request);
+        mutex_unlock(&mvm->mutex);
+}
+
 static bool iwl_mvm_can_hw_csum(struct sk_buff *skb)
 {
         u8 protocol = ip_hdr(skb)->protocol;
@@ -4901,6 +5107,10 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {
 #endif
         .get_survey = iwl_mvm_mac_get_survey,
         .sta_statistics = iwl_mvm_mac_sta_statistics,
+        .get_ftm_responder_stats = iwl_mvm_mac_get_ftm_responder_stats,
+        .start_pmsr = iwl_mvm_start_pmsr,
+        .abort_pmsr = iwl_mvm_abort_pmsr,
+
         .can_aggregate_in_amsdu = iwl_mvm_mac_can_aggregate,
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         .sta_add_debugfs = iwl_mvm_sta_add_debugfs,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 12e9ecc3ee27..bca6f6b536d9 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -879,9 +879,6 @@ struct iwl_mvm {
 
         bool hw_registered;
         bool calibrating;
-        u32 error_event_table[2];
-        u32 log_event_table;
-        u32 umac_error_event_table;
         bool support_umac_log;
 
         u32 ampdu_ref;
@@ -981,6 +978,7 @@ struct iwl_mvm {
         u32 dbgfs_prph_reg_addr;
         bool disable_power_off;
         bool disable_power_off_d3;
+        bool beacon_inject_active;
 
         bool scan_iter_notif_enabled;
 
@@ -1017,6 +1015,7 @@ struct iwl_mvm {
 
         /* -1 for always, 0 for never, >0 for that many times */
         s8 fw_restart;
+        u8 *error_recovery_buf;
 
 #ifdef CONFIG_IWLWIFI_LEDS
         struct led_classdev led;
@@ -1106,6 +1105,8 @@ struct iwl_mvm {
 
         /* Indicate if device power save is allowed */
         u8 ps_disabled; /* u8 instead of bool to ease debugfs_create_* usage */
+        /* Indicate if 32Khz external clock is valid */
+        u32 ext_clock_valid;
         unsigned int max_amsdu_len; /* used for debugfs only */
 
         struct ieee80211_vif __rcu *csa_vif;
@@ -1150,6 +1151,14 @@ struct iwl_mvm {
         u32 ciphers[IWL_MVM_NUM_CIPHERS];
         struct ieee80211_cipher_scheme cs[IWL_UCODE_MAX_CS];
 
+        struct cfg80211_ftm_responder_stats ftm_resp_stats;
+        struct {
+                struct cfg80211_pmsr_request *req;
+                struct wireless_dev *req_wdev;
+                struct list_head loc_list;
+                int responses[IWL_MVM_TOF_MAX_APS];
+        } ftm_initiator;
+
         struct ieee80211_vif *nan_vif;
 #define IWL_MAX_BAID    32
         struct iwl_mvm_baid_data __rcu *baid_map[IWL_MAX_BAID];
@@ -1167,6 +1176,7 @@ struct iwl_mvm {
 
         /* sniffer data to include in radiotap */
         __le16 cur_aid;
+        u8 cur_bssid[ETH_ALEN];
 
 #ifdef CONFIG_ACPI
         struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];
@@ -1211,7 +1221,6 @@ enum iwl_mvm_status {
 enum iwl_mvm_init_status {
         IWL_MVM_INIT_STATUS_THERMAL_INIT_COMPLETE = BIT(0),
         IWL_MVM_INIT_STATUS_LEDS_INIT_COMPLETE = BIT(1),
-        IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE = BIT(2),
 };
 
 static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm)
@@ -1311,6 +1320,12 @@ static inline bool iwl_mvm_is_frag_ebs_supported(struct iwl_mvm *mvm)
         return fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_FRAG_EBS);
 }
 
+static inline bool iwl_mvm_is_short_beacon_notif_supported(struct iwl_mvm *mvm)
+{
+        return fw_has_api(&mvm->fw->ucode_capa,
+                          IWL_UCODE_TLV_API_SHORT_BEACON_NOTIF);
+}
+
 static inline bool iwl_mvm_enter_d0i3_on_suspend(struct iwl_mvm *mvm)
 {
         /* For now we only use this mode to differentiate between
@@ -1646,6 +1661,7 @@ void iwl_mvm_rx_queue_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
 void iwl_mvm_rx_tx_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);
 void iwl_mvm_mfu_assert_dump_notif(struct iwl_mvm *mvm,
                                    struct iwl_rx_cmd_buffer *rxb);
+void iwl_mvm_send_recovery_cmd(struct iwl_mvm *mvm, u32 flags);
 void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);
 void iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,
                                    struct iwl_rx_cmd_buffer *rxb);
@@ -1680,6 +1696,17 @@ int iwl_mvm_mac_ctxt_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
                                     struct ieee80211_vif *vif);
+int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,
+                                 struct ieee80211_vif *vif,
+                                 struct sk_buff *beacon);
+int iwl_mvm_mac_ctxt_send_beacon_cmd(struct iwl_mvm *mvm,
+                                     struct sk_buff *beacon,
+                                     void *data, int len);
+u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct ieee80211_tx_info *info,
+                                    struct ieee80211_vif *vif);
+void iwl_mvm_mac_ctxt_set_tim(struct iwl_mvm *mvm,
+                              __le32 *tim_index, __le32 *tim_size,
+                              u8 *beacon, u32 frame_size);
 void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
                              struct iwl_rx_cmd_buffer *rxb);
 void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
@@ -2007,15 +2034,12 @@ static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)
                                &mvm->status))
                 iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,
                                         false, 0);
-        /* calling this function without using dump_start/end since at this
-         * point we already hold the op mode mutex
-         */
-        iwl_fw_dbg_collect_sync(&mvm->fwrt);
+
         iwl_fw_cancel_timestamp(&mvm->fwrt);
-        iwl_free_fw_paging(&mvm->fwrt);
         clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);
+        iwl_fwrt_stop_device(&mvm->fwrt);
+        iwl_free_fw_paging(&mvm->fwrt);
         iwl_fw_dump_conf_clear(&mvm->fwrt);
-        iwl_trans_stop_device(mvm->trans);
 }
 
 /* Re-configure the SCD for a queue that has already been configured */
@@ -2057,6 +2081,23 @@ void iwl_mvm_update_changed_regdom(struct iwl_mvm *mvm);
 int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                       bool added_vif);
 
+/* FTM responder */
+int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
+void iwl_mvm_ftm_restart_responder(struct iwl_mvm *mvm,
+                                   struct ieee80211_vif *vif);
+void iwl_mvm_ftm_responder_stats(struct iwl_mvm *mvm,
+                                 struct iwl_rx_cmd_buffer *rxb);
+
+/* FTM initiator */
+void iwl_mvm_ftm_restart(struct iwl_mvm *mvm);
+void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm,
+                            struct iwl_rx_cmd_buffer *rxb);
+void iwl_mvm_ftm_lc_notif(struct iwl_mvm *mvm,
+                          struct iwl_rx_cmd_buffer *rxb);
+int iwl_mvm_ftm_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                      struct cfg80211_pmsr_request *request);
+void iwl_mvm_ftm_abort(struct iwl_mvm *mvm, struct cfg80211_pmsr_request *req);
+
 /* TDLS */
 
 /*
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 5e4f8b767d10..ba27dce4c2bb 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -82,7 +82,6 @@
 #include "fw/api/scan.h"
 #include "time-event.h"
 #include "fw-api.h"
-#include "fw/api/scan.h"
 #include "fw/acpi.h"
 
 #define DRV_DESCRIPTION "The new Intel(R) wireless AGN driver for Linux"
@@ -301,6 +300,14 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {
                    RX_HANDLER_ASYNC_LOCKED),
         RX_HANDLER(MFUART_LOAD_NOTIFICATION, iwl_mvm_rx_mfuart_notif,
                    RX_HANDLER_SYNC),
+        RX_HANDLER_GRP(LOCATION_GROUP, TOF_RESPONDER_STATS,
+                       iwl_mvm_ftm_responder_stats, RX_HANDLER_ASYNC_LOCKED),
+
+        RX_HANDLER_GRP(LOCATION_GROUP, TOF_RANGE_RESPONSE_NOTIF,
+                       iwl_mvm_ftm_range_resp, RX_HANDLER_ASYNC_LOCKED),
+        RX_HANDLER_GRP(LOCATION_GROUP, TOF_LC_NOTIF,
+                       iwl_mvm_ftm_lc_notif, RX_HANDLER_ASYNC_LOCKED),
+
         RX_HANDLER_GRP(DEBUG_GROUP, MFU_ASSERT_DUMP_NTF,
                        iwl_mvm_mfu_assert_dump_notif, RX_HANDLER_SYNC),
         RX_HANDLER_GRP(PROT_OFFLOAD_GROUP, STORED_BEACON_NTF,
@@ -415,12 +422,14 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {
 static const struct iwl_hcmd_names iwl_mvm_system_names[] = {
         HCMD_NAME(SHARED_MEM_CFG_CMD),
         HCMD_NAME(INIT_EXTENDED_CFG_CMD),
+        HCMD_NAME(FW_ERROR_RECOVERY_CMD),
 };
 
 /* Please keep this array *SORTED* by hex value.
  * Access is done through binary search
  */
 static const struct iwl_hcmd_names iwl_mvm_mac_conf_names[] = {
+        HCMD_NAME(CHANNEL_SWITCH_TIME_EVENT_CMD),
         HCMD_NAME(CHANNEL_SWITCH_NOA_NOTIF),
 };
 
@@ -445,6 +454,7 @@ static const struct iwl_hcmd_names iwl_mvm_data_path_names[] = {
         HCMD_NAME(TRIGGER_RX_QUEUES_NOTIF_CMD),
         HCMD_NAME(STA_HE_CTXT_CMD),
         HCMD_NAME(RFH_QUEUE_CONFIG_CMD),
+        HCMD_NAME(TLC_MNG_CONFIG_CMD),
         HCMD_NAME(CHEST_COLLECTOR_FILTER_CONFIG_CMD),
         HCMD_NAME(STA_PM_NOTIF),
         HCMD_NAME(MU_GROUP_MGMT_NOTIF),
@@ -591,11 +601,17 @@ static int iwl_mvm_fwrt_send_hcmd(void *ctx, struct iwl_host_cmd *host_cmd)
         return ret;
 }
 
+static bool iwl_mvm_d3_debug_enable(void *ctx)
+{
+        return IWL_MVM_D3_DEBUG;
+}
+
 static const struct iwl_fw_runtime_ops iwl_mvm_fwrt_ops = {
         .dump_start = iwl_mvm_fwrt_dump_start,
         .dump_end = iwl_mvm_fwrt_dump_end,
         .fw_running = iwl_mvm_fwrt_fw_running,
         .send_hcmd = iwl_mvm_fwrt_send_hcmd,
+        .d3_debug_enable = iwl_mvm_d3_debug_enable,
 };
 
 static struct iwl_op_mode *
@@ -690,6 +706,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         INIT_LIST_HEAD(&mvm->aux_roc_te_list);
         INIT_LIST_HEAD(&mvm->async_handlers_list);
         spin_lock_init(&mvm->time_event_lock);
+        INIT_LIST_HEAD(&mvm->ftm_initiator.loc_list);
 
         INIT_WORK(&mvm->async_handlers_wk, iwl_mvm_async_handlers_wk);
         INIT_WORK(&mvm->roc_done_wk, iwl_mvm_roc_done_wk);
@@ -817,8 +834,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         mutex_lock(&mvm->mutex);
         iwl_mvm_ref(mvm, IWL_MVM_REF_INIT_UCODE);
         err = iwl_run_init_mvm_ucode(mvm, true);
-        if (test_bit(IWL_FWRT_STATUS_WAIT_ALIVE, &mvm->fwrt.status))
-                iwl_fw_alive_error_dump(&mvm->fwrt);
+        if (err)
+                iwl_fw_dbg_error_collect(&mvm->fwrt, FW_DBG_TRIGGER_DRIVER);
         if (!iwlmvm_mod_params.init_dbg || !err)
                 iwl_mvm_stop_device(mvm);
         iwl_mvm_unref(mvm, IWL_MVM_REF_INIT_UCODE);
@@ -902,15 +919,15 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)
 
         iwl_mvm_thermal_exit(mvm);
 
-        if (mvm->init_status & IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE) {
-                ieee80211_unregister_hw(mvm->hw);
-                mvm->init_status &= ~IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE;
-        }
+        ieee80211_unregister_hw(mvm->hw);
 
         kfree(mvm->scan_cmd);
         kfree(mvm->mcast_filter_cmd);
         mvm->mcast_filter_cmd = NULL;
 
+        kfree(mvm->error_recovery_buf);
+        mvm->error_recovery_buf = NULL;
+
 #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_IWLWIFI_DEBUGFS)
         kfree(mvm->d3_resume_sram);
 #endif
@@ -1105,6 +1122,12 @@ static void iwl_mvm_async_cb(struct iwl_op_mode *op_mode,
         iwl_trans_block_txq_ptrs(mvm->trans, false);
 }
 
+static int iwl_mvm_is_static_queue(struct iwl_mvm *mvm, int queue)
+{
+        return queue == mvm->aux_queue || queue == mvm->probe_queue ||
+                queue == mvm->p2p_dev_queue || queue == mvm->snif_queue;
+}
+
 static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode,
                                        int hw_queue, bool start)
 {
@@ -1131,6 +1154,15 @@ static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode,
                 goto out;
         mvmsta = iwl_mvm_sta_from_mac80211(sta);
 
+        if (iwl_mvm_is_static_queue(mvm, hw_queue)) {
+                if (!start)
+                        ieee80211_stop_queues(mvm->hw);
+                else if (mvmsta->sta_state != IEEE80211_STA_NOTEXIST)
+                        ieee80211_wake_queues(mvm->hw);
+
+                goto out;
+        }
+
         if (iwl_mvm_has_new_tx_api(mvm)) {
                 int tid = mvm->tvqm_info[hw_queue].txq_tid;
 
@@ -1285,12 +1317,29 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
                 reprobe->dev = mvm->trans->dev;
                 INIT_WORK(&reprobe->work, iwl_mvm_reprobe_wk);
                 schedule_work(&reprobe->work);
+        } else if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
+                            &mvm->status)) {
+                IWL_ERR(mvm, "HW restart already requested, but not started\n");
         } else if (mvm->fwrt.cur_fw_img == IWL_UCODE_REGULAR &&
                    mvm->hw_registered &&
                    !test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) {
                 /* don't let the transport/FW power down */
                 iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
 
+                if (mvm->fw->ucode_capa.error_log_size) {
+                        u32 src_size = mvm->fw->ucode_capa.error_log_size;
+                        u32 src_addr = mvm->fw->ucode_capa.error_log_addr;
+                        u8 *recover_buf = kzalloc(src_size, GFP_ATOMIC);
+
+                        if (recover_buf) {
+                                mvm->error_recovery_buf = recover_buf;
+                                iwl_trans_read_mem_bytes(mvm->trans,
+                                                         src_addr,
+                                                         recover_buf,
+                                                         src_size);
+                        }
+                }
+
                 if (fw_error && mvm->fw_restart > 0)
                         mvm->fw_restart--;
                 set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
index f369173db11c..86e40bae57e3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
@@ -109,6 +109,7 @@ u8 iwl_mvm_get_ctrl_pos(struct cfg80211_chan_def *chandef)
                 return PHY_VHT_CTRL_POS_4_ABOVE;
         default:
                 WARN(1, "Invalid channel definition");
+                /* fall through */
         case 0:
                 /*
                  * The FW is expected to check the control channel position only
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/power.c b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
index 5a0a28fd762d..36f5fa1ee793 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
@@ -8,6 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
+ * Copyright (C) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -30,6 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
+ * Copyright (C) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -79,6 +81,8 @@ int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm,
                                    struct iwl_beacon_filter_cmd *cmd,
                                    u32 flags)
 {
+        u16 len;
+
         IWL_DEBUG_POWER(mvm, "ba_enable_beacon_abort is: %d\n",
                         le32_to_cpu(cmd->ba_enable_beacon_abort));
         IWL_DEBUG_POWER(mvm, "ba_escape_timer is: %d\n",
@@ -101,9 +105,23 @@ int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm,
                         le32_to_cpu(cmd->bf_temp_fast_filter));
         IWL_DEBUG_POWER(mvm, "bf_temp_slow_filter is: %d\n",
                         le32_to_cpu(cmd->bf_temp_slow_filter));
+        IWL_DEBUG_POWER(mvm, "bf_threshold_absolute_low is: %d, %d\n",
+                        le32_to_cpu(cmd->bf_threshold_absolute_low[0]),
+                        le32_to_cpu(cmd->bf_threshold_absolute_low[1]));
+
+        IWL_DEBUG_POWER(mvm, "bf_threshold_absolute_high is: %d, %d\n",
+                        le32_to_cpu(cmd->bf_threshold_absolute_high[0]),
+                        le32_to_cpu(cmd->bf_threshold_absolute_high[1]));
+
+        if (fw_has_api(&mvm->fw->ucode_capa,
+                       IWL_UCODE_TLV_API_BEACON_FILTER_V4))
+                len = sizeof(struct iwl_beacon_filter_cmd);
+        else
+                len = offsetof(struct iwl_beacon_filter_cmd,
+                               bf_threshold_absolute_low);
 
         return iwl_mvm_send_cmd_pdu(mvm, REPLY_BEACON_FILTERING_CMD, flags,
-                                    sizeof(struct iwl_beacon_filter_cmd), cmd);
+                                    len, cmd);
 }
 
 static
@@ -526,6 +544,9 @@ int iwl_mvm_power_update_device(struct iwl_mvm *mvm)
                 cmd.flags &=
                         cpu_to_le16(~DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK);
 #endif
+        if (mvm->ext_clock_valid)
+                cmd.flags |= cpu_to_le16(DEVICE_POWER_FLAGS_32K_CLK_VALID_MSK);
+
         IWL_DEBUG_POWER(mvm,
                         "Sending device power command with flags = 0x%X\n",
                         cmd.flags);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
index 09866f50857a..e231a44d2423 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
@@ -3,7 +3,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -1643,8 +1643,26 @@ static s32 rs_get_best_rate(struct iwl_mvm *mvm,
 
 static u32 rs_bw_from_sta_bw(struct ieee80211_sta *sta)
 {
+        struct ieee80211_sta_vht_cap *sta_vht_cap = &sta->vht_cap;
+        struct ieee80211_vht_cap vht_cap = {
+                .vht_cap_info = cpu_to_le32(sta_vht_cap->cap),
+                .supp_mcs = sta_vht_cap->vht_mcs,
+        };
+
         switch (sta->bandwidth) {
         case IEEE80211_STA_RX_BW_160:
+                /*
+                 * Don't use 160 MHz if VHT extended NSS support
+                 * says we cannot use 2 streams, we don't want to
+                 * deal with this.
+                 * We only check MCS 0 - they will support that if
+                 * we got here at all and we don't care which MCS,
+                 * we want to determine a more global state.
+                 */
+                if (ieee80211_get_vht_max_nss(&vht_cap,
+                                              IEEE80211_VHT_CHANWIDTH_160MHZ,
+                                              0, true) < sta->rx_nss)
+                        return RATE_MCS_CHAN_WIDTH_80;
                 return RATE_MCS_CHAN_WIDTH_160;
         case IEEE80211_STA_RX_BW_80:
                 return RATE_MCS_CHAN_WIDTH_80;
@@ -1757,7 +1775,12 @@ static void rs_set_amsdu_len(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
         else
                 mvmsta->amsdu_enabled = 0xFFFF;
 
-        mvmsta->max_amsdu_len = sta->max_amsdu_len;
+        if (mvmsta->vif->bss_conf.he_support &&
+            !iwlwifi_mod_params.disable_11ax)
+                mvmsta->max_amsdu_len = sta->max_amsdu_len;
+        else
+                mvmsta->max_amsdu_len = min_t(int, sta->max_amsdu_len, 8500);
+
         sta->max_rc_amsdu_len = mvmsta->max_amsdu_len;
 
         for (i = 0; i < IWL_MAX_TID_COUNT; i++) {
@@ -1791,7 +1814,7 @@ static bool rs_tweak_rate_tbl(struct iwl_mvm *mvm,
                               struct iwl_scale_tbl_info *tbl,
                               enum rs_action scale_action)
 {
-        if (sta->bandwidth != IEEE80211_STA_RX_BW_80)
+        if (rs_bw_from_sta_bw(sta) != RATE_MCS_CHAN_WIDTH_80)
                 return false;
 
         if (!is_vht_siso(&tbl->rate))
@@ -4122,6 +4145,7 @@ static const struct rate_control_ops rs_mvm_ops_drv = {
         .add_sta_debugfs = rs_drv_add_sta_debugfs,
         .remove_sta_debugfs = rs_remove_sta_debugfs,
 #endif
+        .capa = RATE_CTRL_CAPA_VHT_EXT_NSS_BW,
 };
 
 void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 235ab26ca429..fbd3014e8b82 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -222,7 +222,7 @@ static u32 iwl_mvm_set_mac80211_rx_flag(struct iwl_mvm *mvm,
                     !(rx_pkt_status & RX_MPDU_RES_STATUS_TTAK_OK))
                         return 0;
                 *crypt_len = IEEE80211_TKIP_IV_LEN;
-                /* fall through if TTAK OK */
+                /* fall through */
 
         case RX_MPDU_RES_STATUS_SEC_WEP_ENC:
                 if (!(rx_pkt_status & RX_MPDU_RES_STATUS_ICV_OK))
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 2c56f73d688e..1e03acf30762 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -66,11 +66,37 @@
 #include "mvm.h"
 #include "fw-api.h"
 
+static void *iwl_mvm_skb_get_hdr(struct sk_buff *skb)
+{
+        struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
+        u8 *data = skb->data;
+
+        /* Alignment concerns */
+        BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_he) % 4);
+        BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_he_mu) % 4);
+        BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_lsig) % 4);
+        BUILD_BUG_ON(sizeof(struct ieee80211_vendor_radiotap) % 4);
+
+        if (rx_status->flag & RX_FLAG_RADIOTAP_HE)
+                data += sizeof(struct ieee80211_radiotap_he);
+        if (rx_status->flag & RX_FLAG_RADIOTAP_HE_MU)
+                data += sizeof(struct ieee80211_radiotap_he_mu);
+        if (rx_status->flag & RX_FLAG_RADIOTAP_LSIG)
+                data += sizeof(struct ieee80211_radiotap_lsig);
+        if (rx_status->flag & RX_FLAG_RADIOTAP_VENDOR_DATA) {
+                struct ieee80211_vendor_radiotap *radiotap = (void *)data;
+
+                data += sizeof(*radiotap) + radiotap->len + radiotap->pad;
+        }
+
+        return data;
+}
+
 static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb,
                                    int queue, struct ieee80211_sta *sta)
 {
         struct iwl_mvm_sta *mvmsta;
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        struct ieee80211_hdr *hdr = iwl_mvm_skb_get_hdr(skb);
         struct ieee80211_rx_status *stats = IEEE80211_SKB_RXCB(skb);
         struct iwl_mvm_key_pn *ptk_pn;
         int res;
@@ -197,12 +223,15 @@ static void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm,
 {
         struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
         struct ieee80211_vendor_radiotap *radiotap;
-        int size = sizeof(*radiotap) + sizeof(__le16);
+        const int size = sizeof(*radiotap) + sizeof(__le16);
 
         if (!mvm->cur_aid)
                 return;
 
-        radiotap = skb_put(skb, size);
+        /* ensure alignment */
+        BUILD_BUG_ON((size + 2) % 4);
+
+        radiotap = skb_put(skb, size + 2);
         radiotap->align = 1;
         /* Intel OUI */
         radiotap->oui[0] = 0xf6;
@@ -212,10 +241,12 @@ static void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm,
         radiotap->subns = 1;
         radiotap->present = 0x1;
         radiotap->len = size - sizeof(*radiotap);
-        radiotap->pad = 0;
+        radiotap->pad = 2;
 
         /* fill the data now */
         memcpy(radiotap->data, &mvm->cur_aid, sizeof(mvm->cur_aid));
+        /* and clear the padding */
+        memset(radiotap->data + sizeof(__le16), 0, radiotap->pad);
 
         rx_status->flag |= RX_FLAG_RADIOTAP_VENDOR_DATA;
 }
@@ -227,10 +258,7 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,
                                             struct ieee80211_sta *sta,
                                             bool csi)
 {
-        struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
-
-        if (!(rx_status->flag & RX_FLAG_NO_PSDU) &&
-            iwl_mvm_check_pn(mvm, skb, queue, sta))
+        if (iwl_mvm_check_pn(mvm, skb, queue, sta))
                 kfree_skb(skb);
         else
                 ieee80211_rx_napi(mvm->hw, sta, skb, napi);
@@ -310,7 +338,7 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,
                         stats->flag |= RX_FLAG_MMIC_ERROR;
 
                 *crypt_len = IEEE80211_TKIP_IV_LEN;
-                /* fall through if TTAK OK */
+                /* fall through */
         case IWL_RX_MPDU_STATUS_SEC_WEP:
                 if (!(status & IWL_RX_MPDU_STATUS_ICV_OK))
                         return -1;
@@ -663,7 +691,7 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,
                             struct sk_buff *skb,
                             struct iwl_rx_mpdu_desc *desc)
 {
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        struct ieee80211_hdr *hdr = iwl_mvm_skb_get_hdr(skb);
         struct iwl_mvm_sta *mvm_sta;
         struct iwl_mvm_baid_data *baid_data;
         struct iwl_mvm_reorder_buffer *buffer;
@@ -960,6 +988,7 @@ iwl_mvm_decode_he_phy_ru_alloc(struct iwl_mvm_rx_phy_data *phy_data,
          * the TSF/timers are not be transmitted in HE-MU.
          */
         u8 ru = le32_get_bits(phy_data->d1, IWL_RX_PHY_DATA1_HE_RU_ALLOC_MASK);
+        u32 he_type = rate_n_flags & RATE_MCS_HE_TYPE_MSK;
         u8 offs = 0;
 
         rx_status->bw = RATE_INFO_BW_HE_RU;
@@ -1002,19 +1031,27 @@ iwl_mvm_decode_he_phy_ru_alloc(struct iwl_mvm_rx_phy_data *phy_data,
                 he->data2 |=
                         cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_SEC);
 
-        if (he_mu) {
 #define CHECK_BW(bw) \
         BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_ ## bw ## MHZ != \
+                     RATE_MCS_CHAN_WIDTH_##bw >> RATE_MCS_CHAN_WIDTH_POS); \
+        BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_ ## bw ## MHZ != \
                      RATE_MCS_CHAN_WIDTH_##bw >> RATE_MCS_CHAN_WIDTH_POS)
-                CHECK_BW(20);
-                CHECK_BW(40);
-                CHECK_BW(80);
-                CHECK_BW(160);
+        CHECK_BW(20);
+        CHECK_BW(40);
+        CHECK_BW(80);
+        CHECK_BW(160);
+
+        if (he_mu)
                 he_mu->flags2 |=
                         le16_encode_bits(FIELD_GET(RATE_MCS_CHAN_WIDTH_MSK,
                                                    rate_n_flags),
                                          IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW);
-        }
+        else if (he_type == RATE_MCS_HE_TYPE_TRIG)
+                he->data6 |=
+                        cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_KNOWN) |
+                        le16_encode_bits(FIELD_GET(RATE_MCS_CHAN_WIDTH_MSK,
+                                                   rate_n_flags),
+                                         IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW);
 }
 
 static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
@@ -1037,16 +1074,16 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
                                          IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE2_KNOWN |
                                          IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE3_KNOWN |
                                          IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE4_KNOWN);
-                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
+                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d2,
                                                             IWL_RX_PHY_DATA2_HE_TB_EXT_SPTL_REUSE1),
                                               IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE1);
-                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
+                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d2,
                                                             IWL_RX_PHY_DATA2_HE_TB_EXT_SPTL_REUSE2),
                                               IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE2);
-                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
+                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d2,
                                                             IWL_RX_PHY_DATA2_HE_TB_EXT_SPTL_REUSE3),
                                               IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE3);
-                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
+                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d2,
                                                             IWL_RX_PHY_DATA2_HE_TB_EXT_SPTL_REUSE4),
                                               IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE4);
                 /* fall through */
@@ -1056,7 +1093,6 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
         case IWL_RX_PHY_INFO_TYPE_HE_TB:
                 /* HE common */
                 he->data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN |
-                                         IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN |
                                          IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN |
                                          IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN);
                 he->data2 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |
@@ -1076,9 +1112,6 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
                 he->data3 |= le16_encode_bits(le32_get_bits(phy_data->d0,
                                                             IWL_RX_PHY_DATA0_HE_LDPC_EXT_SYM),
                                               IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG);
-                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
-                                                            IWL_RX_PHY_DATA0_HE_SPATIAL_REUSE_MASK),
-                                              IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE);
                 he->data5 |= le16_encode_bits(le32_get_bits(phy_data->d0,
                                                             IWL_RX_PHY_DATA0_HE_PRE_FEC_PAD_MASK),
                                               IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD);
@@ -1099,6 +1132,20 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
 
         switch (phy_data->info_type) {
         case IWL_RX_PHY_INFO_TYPE_HE_MU_EXT:
+        case IWL_RX_PHY_INFO_TYPE_HE_MU:
+        case IWL_RX_PHY_INFO_TYPE_HE_SU:
+                he->data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN);
+                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
+                                                            IWL_RX_PHY_DATA0_HE_SPATIAL_REUSE_MASK),
+                                              IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE);
+                break;
+        default:
+                /* nothing here */
+                break;
+        }
+
+        switch (phy_data->info_type) {
+        case IWL_RX_PHY_INFO_TYPE_HE_MU_EXT:
                 he_mu->flags1 |=
                         le16_encode_bits(le16_get_bits(phy_data->d4,
                                                        IWL_RX_PHY_DATA4_HE_MU_EXT_SIGB_DCM),
@@ -1165,22 +1212,16 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,
                 .flags2 = cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS2_PUNC_FROM_SIG_A_BW_KNOWN |
                                       IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN),
         };
-        unsigned int radiotap_len = 0;
 
         he = skb_put_data(skb, &known, sizeof(known));
-        radiotap_len += sizeof(known);
         rx_status->flag |= RX_FLAG_RADIOTAP_HE;
 
         if (phy_data->info_type == IWL_RX_PHY_INFO_TYPE_HE_MU ||
             phy_data->info_type == IWL_RX_PHY_INFO_TYPE_HE_MU_EXT) {
                 he_mu = skb_put_data(skb, &mu_known, sizeof(mu_known));
-                radiotap_len += sizeof(mu_known);
                 rx_status->flag |= RX_FLAG_RADIOTAP_HE_MU;
         }
 
-        /* temporarily hide the radiotap data */
-        __skb_pull(skb, radiotap_len);
-
         /* report the AMPDU-EOF bit on single frames */
         if (!queue && !(phy_info & IWL_RX_MPDU_PHY_AMPDU)) {
                 rx_status->flag |= RX_FLAG_AMPDU_DETAILS;
@@ -1766,7 +1807,7 @@ void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,
                 rx_status->rate_idx = rate;
         }
 
-        iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue, sta, false);
+        ieee80211_rx_napi(mvm->hw, sta, skb, napi);
 out:
         rcu_read_unlock();
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 86d598d5b68f..78694bc38e76 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1580,6 +1580,11 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
          * scheduled scan before starting a normal scan.
          */
 
+        /* FW supports only a single periodic scan */
+        if ((type == IWL_MVM_SCAN_SCHED || type == IWL_MVM_SCAN_NETDETECT) &&
+            mvm->scan_status & (IWL_MVM_SCAN_SCHED | IWL_MVM_SCAN_NETDETECT))
+                return -EBUSY;
+
         if (iwl_mvm_num_scans(mvm) < mvm->max_scans)
                 return 0;
 
@@ -1616,10 +1621,10 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
                 if (mvm->scan_status & IWL_MVM_SCAN_SCHED_MASK)
                         return iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED,
                                                  true);
-
-                /* fall through, something is wrong if no scan was
-                 * running but we ran out of scans.
+                /* Something is wrong if no scan was running but we
+                 * ran out of scans.
                  */
+                /* fall through */
         default:
                 WARN_ON(1);
                 break;
@@ -1976,9 +1981,8 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
                 return ret;
         }
 
-        ret = iwl_wait_notification(&mvm->notif_wait, &wait_scan_done, 1 * HZ);
-
-        return ret;
+        return iwl_wait_notification(&mvm->notif_wait, &wait_scan_done,
+                                     1 * HZ);
 }
 
 int iwl_mvm_scan_size(struct iwl_mvm *mvm)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index c5a01470a3bc..498c315291cf 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -314,7 +314,6 @@ static int iwl_mvm_invalidate_sta_queue(struct iwl_mvm *mvm, int queue,
         struct iwl_mvm_sta *mvmsta;
         u32 status;
         u8 sta_id;
-        int ret;
 
         if (WARN_ON(iwl_mvm_has_new_tx_api(mvm)))
                 return -EINVAL;
@@ -349,11 +348,9 @@ static int iwl_mvm_invalidate_sta_queue(struct iwl_mvm *mvm, int queue,
 
         /* Notify FW of queue removal from the STA queues */
         status = ADD_STA_SUCCESS;
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA,
-                                          iwl_mvm_add_sta_cmd_size(mvm),
-                                          &cmd, &status);
-
-        return ret;
+        return iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA,
+                                           iwl_mvm_add_sta_cmd_size(mvm),
+                                           &cmd, &status);
 }
 
 static int iwl_mvm_disable_txq(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
@@ -753,7 +750,8 @@ static int iwl_mvm_tvqm_enable_txq(struct iwl_mvm *mvm,
 
         if (tid == IWL_MAX_TID_COUNT) {
                 tid = IWL_MGMT_TID;
-                size = IWL_MGMT_QUEUE_SIZE;
+                size = max_t(u32, IWL_MGMT_QUEUE_SIZE,
+                             mvm->trans->cfg->min_txq_size);
         }
         queue = iwl_trans_txq_alloc(mvm->trans,
                                     cpu_to_le16(TX_QUEUE_CFG_ENABLE_QUEUE),
@@ -794,11 +792,9 @@ static int iwl_mvm_sta_alloc_queue_tvqm(struct iwl_mvm *mvm,
         if (queue < 0)
                 return queue;
 
-        if (sta) {
-                mvmtxq->txq_id = queue;
-                mvm->tvqm_info[queue].txq_tid = tid;
-                mvm->tvqm_info[queue].sta_id = mvmsta->sta_id;
-        }
+        mvmtxq->txq_id = queue;
+        mvm->tvqm_info[queue].txq_tid = tid;
+        mvm->tvqm_info[queue].sta_id = mvmsta->sta_id;
 
         IWL_DEBUG_TX_QUEUES(mvm, "Allocated queue is %d\n", queue);
 
@@ -2340,11 +2336,13 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         if (mvmvif->ap_wep_key) {
                 u8 key_offset = iwl_mvm_set_fw_key_idx(mvm);
 
+                __set_bit(key_offset, mvm->fw_key_table);
+
                 if (key_offset == STA_KEY_IDX_INVALID)
                         return -ENOSPC;
 
                 ret = iwl_mvm_send_sta_key(mvm, mvmvif->mcast_sta.sta_id,
-                                           mvmvif->ap_wep_key, 1, 0, NULL, 0,
+                                           mvmvif->ap_wep_key, true, 0, NULL, 0,
                                            key_offset, 0);
                 if (ret)
                         return ret;
@@ -2353,6 +2351,59 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         return 0;
 }
 
+static int __iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, u8 sta_id,
+                                    struct ieee80211_key_conf *keyconf,
+                                    bool mcast)
+{
+        union {
+                struct iwl_mvm_add_sta_key_cmd_v1 cmd_v1;
+                struct iwl_mvm_add_sta_key_cmd cmd;
+        } u = {};
+        bool new_api = fw_has_api(&mvm->fw->ucode_capa,
+                                  IWL_UCODE_TLV_API_TKIP_MIC_KEYS);
+        __le16 key_flags;
+        int ret, size;
+        u32 status;
+
+        /* This is a valid situation for GTK removal */
+        if (sta_id == IWL_MVM_INVALID_STA)
+                return 0;
+
+        key_flags = cpu_to_le16((keyconf->keyidx << STA_KEY_FLG_KEYID_POS) &
+                                 STA_KEY_FLG_KEYID_MSK);
+        key_flags |= cpu_to_le16(STA_KEY_FLG_NO_ENC | STA_KEY_FLG_WEP_KEY_MAP);
+        key_flags |= cpu_to_le16(STA_KEY_NOT_VALID);
+
+        if (mcast)
+                key_flags |= cpu_to_le16(STA_KEY_MULTICAST);
+
+        /*
+         * The fields assigned here are in the same location at the start
+         * of the command, so we can do this union trick.
+         */
+        u.cmd.common.key_flags = key_flags;
+        u.cmd.common.key_offset = keyconf->hw_key_idx;
+        u.cmd.common.sta_id = sta_id;
+
+        size = new_api ? sizeof(u.cmd) : sizeof(u.cmd_v1);
+
+        status = ADD_STA_SUCCESS;
+        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA_KEY, size, &u.cmd,
+                                          &status);
+
+        switch (status) {
+        case ADD_STA_SUCCESS:
+                IWL_DEBUG_WEP(mvm, "MODIFY_STA: remove sta key passed\n");
+                break;
+        default:
+                ret = -EIO;
+                IWL_ERR(mvm, "MODIFY_STA: remove sta key failed\n");
+                break;
+        }
+
+        return ret;
+}
+
 /*
  * Send the FW a request to remove the station from it's internal data
  * structures, and in addition remove it from the local data structure.
@@ -2368,6 +2419,28 @@ int iwl_mvm_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
         iwl_mvm_disable_txq(mvm, NULL, mvmvif->cab_queue, 0, 0);
 
+        if (mvmvif->ap_wep_key) {
+                int i;
+
+                if (!__test_and_clear_bit(mvmvif->ap_wep_key->hw_key_idx,
+                                          mvm->fw_key_table)) {
+                        IWL_ERR(mvm, "offset %d not used in fw key table.\n",
+                                mvmvif->ap_wep_key->hw_key_idx);
+                        return -ENOENT;
+                }
+
+                /* track which key was deleted last */
+                for (i = 0; i < STA_KEY_MAX_NUM; i++) {
+                        if (mvm->fw_key_deleted[i] < U8_MAX)
+                                mvm->fw_key_deleted[i]++;
+                }
+                mvm->fw_key_deleted[mvmvif->ap_wep_key->hw_key_idx] = 0;
+                ret = __iwl_mvm_remove_sta_key(mvm, mvmvif->mcast_sta.sta_id,
+                                               mvmvif->ap_wep_key, true);
+                if (ret)
+                        return ret;
+        }
+
         ret = iwl_mvm_rm_sta_common(mvm, mvmvif->mcast_sta.sta_id);
         if (ret)
                 IWL_WARN(mvm, "Failed sending remove station\n");
@@ -3399,59 +3472,6 @@ static int __iwl_mvm_set_sta_key(struct iwl_mvm *mvm,
         return ret;
 }
 
-static int __iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, u8 sta_id,
-                                    struct ieee80211_key_conf *keyconf,
-                                    bool mcast)
-{
-        union {
-                struct iwl_mvm_add_sta_key_cmd_v1 cmd_v1;
-                struct iwl_mvm_add_sta_key_cmd cmd;
-        } u = {};
-        bool new_api = fw_has_api(&mvm->fw->ucode_capa,
-                                  IWL_UCODE_TLV_API_TKIP_MIC_KEYS);
-        __le16 key_flags;
-        int ret, size;
-        u32 status;
-
-        /* This is a valid situation for GTK removal */
-        if (sta_id == IWL_MVM_INVALID_STA)
-                return 0;
-
-        key_flags = cpu_to_le16((keyconf->keyidx << STA_KEY_FLG_KEYID_POS) &
-                                 STA_KEY_FLG_KEYID_MSK);
-        key_flags |= cpu_to_le16(STA_KEY_FLG_NO_ENC | STA_KEY_FLG_WEP_KEY_MAP);
-        key_flags |= cpu_to_le16(STA_KEY_NOT_VALID);
-
-        if (mcast)
-                key_flags |= cpu_to_le16(STA_KEY_MULTICAST);
-
-        /*
-         * The fields assigned here are in the same location at the start
-         * of the command, so we can do this union trick.
-         */
-        u.cmd.common.key_flags = key_flags;
-        u.cmd.common.key_offset = keyconf->hw_key_idx;
-        u.cmd.common.sta_id = sta_id;
-
-        size = new_api ? sizeof(u.cmd) : sizeof(u.cmd_v1);
-
-        status = ADD_STA_SUCCESS;
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA_KEY, size, &u.cmd,
-                                          &status);
-
-        switch (status) {
-        case ADD_STA_SUCCESS:
-                IWL_DEBUG_WEP(mvm, "MODIFY_STA: remove sta key passed\n");
-                break;
-        default:
-                ret = -EIO;
-                IWL_ERR(mvm, "MODIFY_STA: remove sta key failed\n");
-                break;
-        }
-
-        return ret;
-}
-
 int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,
                         struct ieee80211_vif *vif,
                         struct ieee80211_sta *sta,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
index 0614296244b3..79700c7310a1 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
@@ -394,6 +394,7 @@ struct iwl_mvm_rxq_dup_data {
  *      the BA window. To be used for UAPSD only.
  * @ptk_pn: per-queue PTK PN data structures
  * @dup_data: per queue duplicate packet detection data
+ * @wep_key: used in AP mode. Is a duplicate of the WEP key.
  * @deferred_traffic_tid_map: indication bitmap of deferred traffic per-TID
  * @tx_ant: the index of the antenna to use for data tx to this station. Only
  *      used during connection establishment (e.g. for the 4 way handshake
@@ -425,6 +426,8 @@ struct iwl_mvm_sta {
         struct iwl_mvm_key_pn __rcu *ptk_pn[4];
         struct iwl_mvm_rxq_dup_data *dup_data;
 
+        struct ieee80211_key_conf *wep_key;
+
         u8 reserved_queue;
 
         /* Temporary, until the new TLC will control the Tx protection */
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
index 5b34100e9099..9693fa4cdc39 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
@@ -85,7 +85,7 @@ void iwl_mvm_te_clear_data(struct iwl_mvm *mvm,
 {
         lockdep_assert_held(&mvm->time_event_lock);
 
-        if (!te_data->vif)
+        if (!te_data || !te_data->vif)
                 return;
 
         list_del(&te_data->list);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index ac62eb8c4b36..0c2aabc842f9 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -209,7 +209,9 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
         u16 offload_assist = 0;
         u8 ac;
 
-        if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
+        if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) ||
+            (ieee80211_is_probe_resp(fc) &&
+             !is_multicast_ether_addr(hdr->addr1)))
                 tx_flags |= TX_CMD_FLG_ACK;
         else
                 tx_flags &= ~TX_CMD_FLG_ACK;
@@ -278,7 +280,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
         }
 
         if (ieee80211_is_data(fc) && len > mvm->rts_threshold &&
-            !is_multicast_ether_addr(ieee80211_get_DA(hdr)))
+            !is_multicast_ether_addr(hdr->addr1))
                 tx_flags |= TX_CMD_FLG_PROT_REQUIRE;
 
         if (fw_has_capa(&mvm->fw->ucode_capa,
@@ -719,6 +721,9 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
                 IEEE80211_TX_CTL_TX_OFFCHAN;
         int queue = -1;
 
+        if (IWL_MVM_NON_TRANSMITTING_AP && ieee80211_is_probe_resp(fc))
+                return -1;
+
         memcpy(&info, skb->cb, sizeof(info));
 
         if (WARN_ON_ONCE(info.flags & IEEE80211_TX_CTL_AMPDU))
@@ -1078,6 +1083,9 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
         fc = hdr->frame_control;
         hdrlen = ieee80211_hdrlen(fc);
 
+        if (IWL_MVM_NON_TRANSMITTING_AP && ieee80211_is_probe_resp(fc))
+                return -1;
+
         if (WARN_ON_ONCE(!mvmsta))
                 return -1;
 
@@ -1107,12 +1115,14 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
          */
         if (ieee80211_is_data_qos(fc) && !ieee80211_is_qos_nullfunc(fc)) {
                 tid = ieee80211_get_tid(hdr);
-                if (WARN_ON_ONCE(tid >= IWL_MAX_TID_COUNT))
+                if (WARN_ONCE(tid >= IWL_MAX_TID_COUNT, "Invalid TID %d", tid))
                         goto drop_unlock_sta;
 
                 is_ampdu = info->flags & IEEE80211_TX_CTL_AMPDU;
-                if (WARN_ON_ONCE(is_ampdu &&
-                                 mvmsta->tid_data[tid].state != IWL_AGG_ON))
+                if (WARN_ONCE(is_ampdu &&
+                              mvmsta->tid_data[tid].state != IWL_AGG_ON,
+                              "Invalid internal agg state %d for TID %d",
+                               mvmsta->tid_data[tid].state, tid))
                         goto drop_unlock_sta;
 
                 seq_number = mvmsta->tid_data[tid].seq_number;
@@ -1134,7 +1144,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
 
         WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM);
 
-        if (WARN_ON_ONCE(txq_id == IWL_MVM_INVALID_QUEUE)) {
+        if (WARN_ONCE(txq_id == IWL_MVM_INVALID_QUEUE, "Invalid TXQ id")) {
                 iwl_trans_free_tx_cmd(mvm->trans, dev_cmd);
                 spin_unlock(&mvmsta->lock);
                 return 0;
@@ -1184,6 +1194,7 @@ drop_unlock_sta:
         iwl_trans_free_tx_cmd(mvm->trans, dev_cmd);
         spin_unlock(&mvmsta->lock);
 drop:
+        IWL_DEBUG_TX(mvm, "TX to [%d|%d] dropped\n", mvmsta->sta_id, tid);
         return -1;
 }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 211c4638d690..4649327abb45 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -294,6 +294,7 @@ static const struct {
         { "SYSASSERT", 0x35 },
         { "UCODE_VERSION_MISMATCH", 0x37 },
         { "BAD_COMMAND", 0x38 },
+        { "BAD_COMMAND", 0x39 },
         { "NMI_INTERRUPT_DATA_ACTION_PT", 0x3C },
         { "FATAL_ERROR", 0x3D },
         { "NMI_TRM_HW_ERR", 0x46 },
@@ -456,12 +457,14 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
 {
         struct iwl_trans *trans = mvm->trans;
         struct iwl_umac_error_event_table table;
+        u32 base = mvm->trans->umac_error_event_table;
 
-        if (!mvm->support_umac_log)
+        if (!mvm->support_umac_log &&
+            !(mvm->trans->error_event_table_tlv_status &
+              IWL_ERROR_EVENT_TABLE_UMAC))
                 return;
 
-        iwl_trans_read_mem_bytes(trans, mvm->umac_error_event_table, &table,
-                                 sizeof(table));
+        iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));
 
         if (table.valid)
                 mvm->fwrt.dump.umac_err_id = table.error_id;
@@ -493,7 +496,7 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u8 lmac_num)
 {
         struct iwl_trans *trans = mvm->trans;
         struct iwl_error_event_table table;
-        u32 val, base = mvm->error_event_table[lmac_num];
+        u32 val, base = mvm->trans->lmac_error_event_table[lmac_num];
 
         if (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT) {
                 if (!base)
@@ -522,23 +525,9 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u8 lmac_num)
                 /* reset the device */
                 iwl_trans_sw_reset(trans);
 
-                /* set INIT_DONE flag */
-                iwl_set_bit(trans, CSR_GP_CNTRL,
-                            BIT(trans->cfg->csr->flag_init_done));
-
-                /* and wait for clock stabilization */
-                if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
-                        udelay(2);
-
-                err = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                                   BIT(trans->cfg->csr->flag_mac_clock_ready),
-                                   BIT(trans->cfg->csr->flag_mac_clock_ready),
-                                   25000);
-                if (err < 0) {
-                        IWL_DEBUG_INFO(trans,
-                                       "Failed to reset the card for the dump\n");
+                err = iwl_finish_nic_init(trans);
+                if (err)
                         return;
-                }
         }
 
         iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));
@@ -603,7 +592,7 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
 
         iwl_mvm_dump_lmac_error_log(mvm, 0);
 
-        if (mvm->error_event_table[1])
+        if (mvm->trans->lmac_error_event_table[1])
                 iwl_mvm_dump_lmac_error_log(mvm, 1);
 
         iwl_mvm_dump_umac_error_log(mvm);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c
index ceb3aa03d561..1e36459948db 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -18,7 +18,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,7 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,
         void *iml_img;
         u32 control_flags = 0;
         int ret;
+        int cmdq_size = max_t(u32, TFD_CMD_SLOTS, trans->cfg->min_txq_size);
 
         /* Allocate prph scratch */
         prph_scratch = dma_alloc_coherent(trans->dev, sizeof(*prph_scratch),
@@ -151,7 +152,7 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,
         ctxt_info_gen3->mcr_base_addr =
                 cpu_to_le64(trans_pcie->rxq->used_bd_dma);
         ctxt_info_gen3->mtr_size =
-                cpu_to_le16(TFD_QUEUE_CB_SIZE(TFD_CMD_SLOTS));
+                cpu_to_le16(TFD_QUEUE_CB_SIZE(cmdq_size));
         ctxt_info_gen3->mcr_size =
                 cpu_to_le16(RX_QUEUE_CB_SIZE(MQ_RX_TABLE_SIZE));
 
@@ -175,8 +176,13 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,
         iwl_write64(trans, CSR_IML_DATA_ADDR,
                     trans_pcie->iml_dma_addr);
         iwl_write32(trans, CSR_IML_SIZE_ADDR, trans->iml_len);
-        iwl_set_bit(trans, CSR_CTXT_INFO_BOOT_CTRL, CSR_AUTO_FUNC_BOOT_ENA);
-        iwl_set_bit(trans, CSR_GP_CNTRL, CSR_AUTO_FUNC_INIT);
+
+        iwl_set_bit(trans, CSR_CTXT_INFO_BOOT_CTRL,
+                    CSR_AUTO_FUNC_BOOT_ENA);
+        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_AX210)
+                iwl_write_umac_prph(trans, UREG_CPU_INIT_RUN, 1);
+        else
+                iwl_set_bit(trans, CSR_GP_CNTRL, CSR_AUTO_FUNC_INIT);
 
         return 0;
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
index 7f4aaa810ea1..9274e317cc77 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
@@ -59,8 +59,7 @@
 
 void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        struct iwl_self_init_dram *dram = &trans_pcie->init_dram;
+        struct iwl_self_init_dram *dram = &trans->init_dram;
         int i;
 
         if (!dram->paging) {
@@ -83,8 +82,7 @@ int iwl_pcie_init_fw_sec(struct iwl_trans *trans,
                          const struct fw_img *fw,
                          struct iwl_context_info_dram *ctxt_dram)
 {
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        struct iwl_self_init_dram *dram = &trans_pcie->init_dram;
+        struct iwl_self_init_dram *dram = &trans->init_dram;
         int i, ret, lmac_cnt, umac_cnt, paging_cnt;
 
         if (WARN(dram->paging,
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index a22e47639a4e..2b94e4cef56c 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016-2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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 @@
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -517,6 +517,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x02F0, 0x0034, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x0038, iwl9560_2ac_160_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x003C, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x02F0, 0x0040, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x02F0, 0x0044, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x02F0, 0x0060, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x0064, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -525,6 +527,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x02F0, 0x0234, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x0238, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x023C, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x02F0, 0x0244, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x02F0, 0x0260, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x0264, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x02F0, 0x02A0, iwl9462_2ac_cfg_soc)},
@@ -542,6 +545,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x06F0, 0x0034, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x0038, iwl9560_2ac_160_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x003C, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x06F0, 0x0040, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x06F0, 0x0044, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x06F0, 0x0060, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x0064, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -550,6 +555,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x06F0, 0x0234, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x0238, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x023C, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x06F0, 0x0244, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x06F0, 0x0260, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x0264, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x06F0, 0x02A0, iwl9462_2ac_cfg_soc)},
@@ -597,6 +603,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x2526, 0x2030, iwl9560_2ac_160_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x2034, iwl9560_2ac_160_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x4010, iwl9260_2ac_160_cfg)},
+        {IWL_PCI_DEVICE(0x2526, 0x4018, iwl9260_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x401C, iwl9260_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x4034, iwl9560_2ac_160_cfg_soc)},
@@ -614,6 +621,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg)},
+        {IWL_PCI_DEVICE(0x2720, 0x0044, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -622,6 +630,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x2720, 0x0234, iwl9560_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2720, 0x0238, iwl9560_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2720, 0x023C, iwl9560_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x2720, 0x0244, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x2720, 0x0260, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2720, 0x0264, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2720, 0x02A0, iwl9462_2ac_cfg_soc)},
@@ -699,6 +708,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x34F0, 0x0034, iwl9560_2ac_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x0038, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x003C, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x34F0, 0x0044, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x34F0, 0x0060, iwl9461_2ac_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x0064, iwl9461_2ac_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x00A0, iwl9462_2ac_cfg_qu_b0_jf_b0)},
@@ -707,6 +717,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x34F0, 0x0234, iwl9560_2ac_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x0238, iwl9560_2ac_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x023C, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x34F0, 0x0244, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x34F0, 0x0260, iwl9461_2ac_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x0264, iwl9461_2ac_cfg_qu_b0_jf_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x02A0, iwl9462_2ac_cfg_qu_b0_jf_b0)},
@@ -753,6 +764,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x43F0, 0x0034, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x0038, iwl9560_2ac_160_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x003C, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x43F0, 0x0044, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x43F0, 0x0060, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x0064, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -761,6 +773,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x43F0, 0x0234, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x0238, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x023C, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x43F0, 0x0244, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x43F0, 0x0260, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x0264, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x43F0, 0x02A0, iwl9462_2ac_cfg_soc)},
@@ -820,6 +833,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0xA0F0, 0x0034, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x0038, iwl9560_2ac_160_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x003C, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0044, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0xA0F0, 0x0060, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x0064, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -828,6 +842,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0xA0F0, 0x0234, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x0238, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x023C, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0244, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0xA0F0, 0x0260, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x0264, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA0F0, 0x02A0, iwl9462_2ac_cfg_soc)},
@@ -872,82 +887,92 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0xA370, 0x40A4, iwl9462_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA370, 0x4234, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0xA370, 0x42A4, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x2720, 0x0030, iwl9560_2ac_cfg_qnj_jf_b0)},
 
 /* 22000 Series */
-        {IWL_PCI_DEVICE(0x02F0, 0x0070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x02F0, 0x0074, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x02F0, 0x0078, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x02F0, 0x007C, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x02F0, 0x0310, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x02F0, 0x0070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x02F0, 0x0074, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x02F0, 0x0078, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x02F0, 0x007C, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x02F0, 0x0310, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x02F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},
         {IWL_PCI_DEVICE(0x02F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
-        {IWL_PCI_DEVICE(0x02F0, 0x4070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x06F0, 0x0070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x06F0, 0x0074, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x06F0, 0x0078, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x06F0, 0x007C, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x06F0, 0x0310, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x02F0, 0x4070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x06F0, 0x0070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x06F0, 0x0074, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x06F0, 0x0078, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x06F0, 0x007C, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x06F0, 0x0310, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x06F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},
         {IWL_PCI_DEVICE(0x06F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
-        {IWL_PCI_DEVICE(0x06F0, 0x4070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x2720, 0x0000, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x2720, 0x0030, iwl9560_2ac_160_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x0040, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x06F0, 0x4070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x2720, 0x0000, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x2720, 0x0040, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x2720, 0x0070, iwl22000_2ac_cfg_hr_cdb)},
-        {IWL_PCI_DEVICE(0x2720, 0x0074, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x2720, 0x0078, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x2720, 0x007C, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x2720, 0x0074, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x2720, 0x0078, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x2720, 0x007C, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x2720, 0x0090, iwl22000_2ac_cfg_hr_cdb)},
         {IWL_PCI_DEVICE(0x2720, 0x0310, iwl22000_2ac_cfg_hr_cdb)},
         {IWL_PCI_DEVICE(0x2720, 0x0A10, iwl22000_2ac_cfg_hr_cdb)},
-        {IWL_PCI_DEVICE(0x2720, 0x1080, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x2720, 0x1080, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x2720, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},
         {IWL_PCI_DEVICE(0x2720, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
-        {IWL_PCI_DEVICE(0x2720, 0x4070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x34F0, 0x0040, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x34F0, 0x0070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x34F0, 0x0074, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x34F0, 0x0078, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x34F0, 0x007C, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x34F0, 0x0310, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x2720, 0x4070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x34F0, 0x0040, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x34F0, 0x0070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x34F0, 0x0074, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x34F0, 0x0078, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x34F0, 0x007C, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x34F0, 0x0310, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x34F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},
         {IWL_PCI_DEVICE(0x34F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
-        {IWL_PCI_DEVICE(0x34F0, 0x4070, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x34F0, 0x4070, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x40C0, 0x0000, iwl22560_2ax_cfg_su_cdb)},
         {IWL_PCI_DEVICE(0x40C0, 0x0010, iwl22560_2ax_cfg_su_cdb)},
         {IWL_PCI_DEVICE(0x40c0, 0x0090, iwl22560_2ax_cfg_su_cdb)},
         {IWL_PCI_DEVICE(0x40C0, 0x0310, iwl22560_2ax_cfg_su_cdb)},
         {IWL_PCI_DEVICE(0x40C0, 0x0A10, iwl22560_2ax_cfg_su_cdb)},
-        {IWL_PCI_DEVICE(0x43F0, 0x0040, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x43F0, 0x0070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x43F0, 0x0074, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x43F0, 0x0078, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0x43F0, 0x007C, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x43F0, 0x0040, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x43F0, 0x0070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x43F0, 0x0074, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x43F0, 0x0078, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0x43F0, 0x007C, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0x43F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},
         {IWL_PCI_DEVICE(0x43F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
-        {IWL_PCI_DEVICE(0x43F0, 0x4070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x0000, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x0040, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x0070, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x0074, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x0078, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x007C, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x00B0, iwl22560_2ax_cfg_hr)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x0A10, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0x43F0, 0x4070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0000, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0040, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0070, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0074, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0078, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x007C, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x00B0, iwl_ax101_cfg_qu_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x0A10, iwl_ax101_cfg_qu_hr)},
         {IWL_PCI_DEVICE(0xA0F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},
         {IWL_PCI_DEVICE(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
-        {IWL_PCI_DEVICE(0xA0F0, 0x4070, iwl22560_2ax_cfg_hr)},
+        {IWL_PCI_DEVICE(0xA0F0, 0x4070, iwl_ax101_cfg_qu_hr)},
 
         {IWL_PCI_DEVICE(0x2723, 0x0080, iwl22260_2ax_cfg)},
         {IWL_PCI_DEVICE(0x2723, 0x0084, iwl22260_2ax_cfg)},
         {IWL_PCI_DEVICE(0x2723, 0x0088, iwl22260_2ax_cfg)},
         {IWL_PCI_DEVICE(0x2723, 0x008C, iwl22260_2ax_cfg)},
+        {IWL_PCI_DEVICE(0x2723, 0x1653, killer1650w_2ax_cfg)},
+        {IWL_PCI_DEVICE(0x2723, 0x1654, killer1650x_2ax_cfg)},
         {IWL_PCI_DEVICE(0x2723, 0x4080, iwl22260_2ax_cfg)},
         {IWL_PCI_DEVICE(0x2723, 0x4088, iwl22260_2ax_cfg)},
 
         {IWL_PCI_DEVICE(0x1a56, 0x1653, killer1650w_2ax_cfg)},
         {IWL_PCI_DEVICE(0x1a56, 0x1654, killer1650x_2ax_cfg)},
 
+        {IWL_PCI_DEVICE(0x2725, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
+        {IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
+        {IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax210_2ax_cfg_so_hr_a0)},
+        {IWL_PCI_DEVICE(0x2725, 0x0020, iwlax210_2ax_cfg_so_hr_a0)},
+        {IWL_PCI_DEVICE(0x2725, 0x0310, iwlax210_2ax_cfg_so_hr_a0)},
+        {IWL_PCI_DEVICE(0x2725, 0x0A10, iwlax210_2ax_cfg_so_hr_a0)},
+        {IWL_PCI_DEVICE(0x2725, 0x00B0, iwlax210_2ax_cfg_so_hr_a0)},
+
 #endif /* CONFIG_IWLMVM */
 
         {0}
@@ -999,7 +1024,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
                 if (rf_id_chp == jf_chp_id) {
                         if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ)
-                                cfg = &iwl22000_2ax_cfg_qnj_jf_b0;
+                                cfg = &iwl9560_2ac_cfg_qnj_jf_b0;
                         else
                                 cfg = &iwl22000_2ac_cfg_jf;
                 } else if (rf_id_chp == hr_chp_id) {
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index 0d16bcc3141f..bf8b61a476c5 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -400,6 +400,8 @@ struct iwl_txq {
         u32 id;
         int low_mark;
         int high_mark;
+
+        bool overflow_tx;
 };
 
 static inline dma_addr_t
@@ -454,20 +456,6 @@ enum iwl_image_response_code {
 };
 
 /**
- * struct iwl_self_init_dram - dram data used by self init process
- * @fw: lmac and umac dram data
- * @fw_cnt: total number of items in array
- * @paging: paging dram data
- * @paging_cnt: total number of items in array
- */
-struct iwl_self_init_dram {
-        struct iwl_dram_data *fw;
-        int fw_cnt;
-        struct iwl_dram_data *paging;
-        int paging_cnt;
-};
-
-/**
  * struct cont_rec: continuous recording data structure
  * @prev_wr_ptr: the last address that was read in monitor_data
  *      debugfs file
@@ -538,6 +526,8 @@ struct cont_rec {
  * @fh_mask: current unmasked fh causes
  * @hw_mask: current unmasked hw causes
  * @in_rescan: true if we have triggered a device rescan
+ * @base_rb_stts: base virtual address of receive buffer status for all queues
+ * @base_rb_stts_dma: base physical address of receive buffer status
  */
 struct iwl_trans_pcie {
         struct iwl_rxq *rxq;
@@ -554,7 +544,6 @@ struct iwl_trans_pcie {
         dma_addr_t prph_info_dma_addr;
         dma_addr_t prph_scratch_dma_addr;
         dma_addr_t iml_dma_addr;
-        struct iwl_self_init_dram init_dram;
         struct iwl_trans *trans;
 
         struct net_device napi_dev;
@@ -630,6 +619,9 @@ struct iwl_trans_pcie {
         cpumask_t affinity_mask[IWL_MAX_RX_HW_QUEUES];
         u16 tx_cmd_queue_size;
         bool in_rescan;
+
+        void *base_rb_stts;
+        dma_addr_t base_rb_stts_dma;
 };
 
 static inline struct iwl_trans_pcie *
@@ -813,8 +805,7 @@ static inline int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans,
 
 static inline void iwl_pcie_ctxt_info_free_fw_img(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        struct iwl_self_init_dram *dram = &trans_pcie->init_dram;
+        struct iwl_self_init_dram *dram = &trans->init_dram;
         int i;
 
         if (!dram->fw) {
@@ -1052,6 +1043,7 @@ static inline bool iwl_pcie_dbg_on(struct iwl_trans *trans)
 
 void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state);
 void iwl_trans_pcie_dump_regs(struct iwl_trans *trans);
+void iwl_trans_sync_nmi(struct iwl_trans *trans);
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
 int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
index c260d1251b5f..8d4f0628622b 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -202,9 +202,9 @@ int iwl_pcie_rx_stop(struct iwl_trans *trans)
 {
         if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560) {
                 /* TODO: remove this for 22560 once fw does it */
-                iwl_write_prph(trans, RFH_RXF_DMA_CFG_GEN3, 0);
-                return iwl_poll_prph_bit(trans, RFH_GEN_STATUS_GEN3,
-                                         RXF_DMA_IDLE, RXF_DMA_IDLE, 1000);
+                iwl_write_umac_prph(trans, RFH_RXF_DMA_CFG_GEN3, 0);
+                return iwl_poll_umac_prph_bit(trans, RFH_GEN_STATUS_GEN3,
+                                              RXF_DMA_IDLE, RXF_DMA_IDLE, 1000);
         } else if (trans->cfg->mq_rx_supported) {
                 iwl_write_prph(trans, RFH_RXF_DMA_CFG, 0);
                 return iwl_poll_prph_bit(trans, RFH_GEN_STATUS,
@@ -247,7 +247,7 @@ static void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans,
         }
 
         rxq->write_actual = round_down(rxq->write, 8);
-        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
+        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_22560)
                 iwl_write32(trans, HBUS_TARG_WRPTR,
                             (rxq->write_actual |
                              ((FIRST_RX_QUEUE + rxq->id) << 16)));
@@ -538,9 +538,9 @@ static void iwl_pcie_rx_allocator(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rb_allocator *rba = &trans_pcie->rba;
         struct list_head local_empty;
-        int pending = atomic_xchg(&rba->req_pending, 0);
+        int pending = atomic_read(&rba->req_pending);
 
-        IWL_DEBUG_RX(trans, "Pending allocation requests = %d\n", pending);
+        IWL_DEBUG_TPT(trans, "Pending allocation requests = %d\n", pending);
 
         /* If we were scheduled - there is at least one request */
         spin_lock(&rba->lock);
@@ -593,12 +593,15 @@ static void iwl_pcie_rx_allocator(struct iwl_trans *trans)
                         i++;
                 }
 
+                atomic_dec(&rba->req_pending);
                 pending--;
+
                 if (!pending) {
-                        pending = atomic_xchg(&rba->req_pending, 0);
-                        IWL_DEBUG_RX(trans,
-                                     "Pending allocation requests = %d\n",
-                                     pending);
+                        pending = atomic_read(&rba->req_pending);
+                        if (pending)
+                                IWL_DEBUG_TPT(trans,
+                                              "Got more pending allocation requests = %d\n",
+                                              pending);
                 }
 
                 spin_lock(&rba->lock);
@@ -609,12 +612,15 @@ static void iwl_pcie_rx_allocator(struct iwl_trans *trans)
                 spin_unlock(&rba->lock);
 
                 atomic_inc(&rba->req_ready);
+
         }
 
         spin_lock(&rba->lock);
         /* return unused rbds to the allocator empty list */
         list_splice_tail(&local_empty, &rba->rbd_empty);
         spin_unlock(&rba->lock);
+
+        IWL_DEBUG_TPT(trans, "%s, exit.\n", __func__);
 }
 
 /*
@@ -696,11 +702,6 @@ static void iwl_pcie_free_rxq_dma(struct iwl_trans *trans,
         rxq->bd_dma = 0;
         rxq->bd = NULL;
 
-        if (rxq->rb_stts)
-                dma_free_coherent(trans->dev,
-                                  use_rx_td ? sizeof(__le16) :
-                                  sizeof(struct iwl_rb_status),
-                                  rxq->rb_stts, rxq->rb_stts_dma);
         rxq->rb_stts_dma = 0;
         rxq->rb_stts = NULL;
 
@@ -737,6 +738,8 @@ static int iwl_pcie_alloc_rxq_dma(struct iwl_trans *trans,
         int free_size;
         bool use_rx_td = (trans->cfg->device_family >=
                           IWL_DEVICE_FAMILY_22560);
+        size_t rb_stts_size = use_rx_td ? sizeof(__le16) :
+                              sizeof(struct iwl_rb_status);
 
         spin_lock_init(&rxq->lock);
         if (trans->cfg->mq_rx_supported)
@@ -764,12 +767,9 @@ static int iwl_pcie_alloc_rxq_dma(struct iwl_trans *trans,
                         goto err;
         }
 
-        /* Allocate the driver's pointer to receive buffer status */
-        rxq->rb_stts = dma_alloc_coherent(dev,
-                                          use_rx_td ? sizeof(__le16) : sizeof(struct iwl_rb_status),
-                                          &rxq->rb_stts_dma, GFP_KERNEL);
-        if (!rxq->rb_stts)
-                goto err;
+        rxq->rb_stts = trans_pcie->base_rb_stts + rxq->id * rb_stts_size;
+        rxq->rb_stts_dma =
+                trans_pcie->base_rb_stts_dma + rxq->id * rb_stts_size;
 
         if (!use_rx_td)
                 return 0;
@@ -799,7 +799,6 @@ err:
 
                 iwl_pcie_free_rxq_dma(trans, rxq);
         }
-        kfree(trans_pcie->rxq);
 
         return -ENOMEM;
 }
@@ -809,6 +808,9 @@ int iwl_pcie_rx_alloc(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rb_allocator *rba = &trans_pcie->rba;
         int i, ret;
+        size_t rb_stts_size = trans->cfg->device_family >=
+                              IWL_DEVICE_FAMILY_22560 ?
+                              sizeof(__le16) : sizeof(struct iwl_rb_status);
 
         if (WARN_ON(trans_pcie->rxq))
                 return -EINVAL;
@@ -816,18 +818,46 @@ int iwl_pcie_rx_alloc(struct iwl_trans *trans)
         trans_pcie->rxq = kcalloc(trans->num_rx_queues, sizeof(struct iwl_rxq),
                                   GFP_KERNEL);
         if (!trans_pcie->rxq)
-                return -EINVAL;
+                return -ENOMEM;
 
         spin_lock_init(&rba->lock);
 
+        /*
+         * Allocate the driver's pointer to receive buffer status.
+         * Allocate for all queues continuously (HW requirement).
+         */
+        trans_pcie->base_rb_stts =
+                        dma_alloc_coherent(trans->dev,
+                                           rb_stts_size * trans->num_rx_queues,
+                                           &trans_pcie->base_rb_stts_dma,
+                                           GFP_KERNEL);
+        if (!trans_pcie->base_rb_stts) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
         for (i = 0; i < trans->num_rx_queues; i++) {
                 struct iwl_rxq *rxq = &trans_pcie->rxq[i];
 
+                rxq->id = i;
                 ret = iwl_pcie_alloc_rxq_dma(trans, rxq);
                 if (ret)
-                        return ret;
+                        goto err;
         }
         return 0;
+
+err:
+        if (trans_pcie->base_rb_stts) {
+                dma_free_coherent(trans->dev,
+                                  rb_stts_size * trans->num_rx_queues,
+                                  trans_pcie->base_rb_stts,
+                                  trans_pcie->base_rb_stts_dma);
+                trans_pcie->base_rb_stts = NULL;
+                trans_pcie->base_rb_stts_dma = 0;
+        }
+        kfree(trans_pcie->rxq);
+
+        return ret;
 }
 
 static void iwl_pcie_rx_hw_init(struct iwl_trans *trans, struct iwl_rxq *rxq)
@@ -1036,8 +1066,6 @@ int _iwl_pcie_rx_init(struct iwl_trans *trans)
         for (i = 0; i < trans->num_rx_queues; i++) {
                 struct iwl_rxq *rxq = &trans_pcie->rxq[i];
 
-                rxq->id = i;
-
                 spin_lock(&rxq->lock);
                 /*
                  * Set read write pointer to reflect that we have processed
@@ -1124,6 +1152,9 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rb_allocator *rba = &trans_pcie->rba;
         int i;
+        size_t rb_stts_size = trans->cfg->device_family >=
+                              IWL_DEVICE_FAMILY_22560 ?
+                              sizeof(__le16) : sizeof(struct iwl_rb_status);
 
         /*
          * if rxq is NULL, it means that nothing has been allocated,
@@ -1138,6 +1169,15 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)
 
         iwl_pcie_free_rbs_pool(trans);
 
+        if (trans_pcie->base_rb_stts) {
+                dma_free_coherent(trans->dev,
+                                  rb_stts_size * trans->num_rx_queues,
+                                  trans_pcie->base_rb_stts,
+                                  trans_pcie->base_rb_stts_dma);
+                trans_pcie->base_rb_stts = NULL;
+                trans_pcie->base_rb_stts_dma = 0;
+        }
+
         for (i = 0; i < trans->num_rx_queues; i++) {
                 struct iwl_rxq *rxq = &trans_pcie->rxq[i];
 
@@ -1424,6 +1464,9 @@ restart:
                              !emergency)) {
                         iwl_pcie_rx_move_to_allocator(rxq, rba);
                         emergency = true;
+                        IWL_DEBUG_TPT(trans,
+                                      "RX path is in emergency. Pending allocations %d\n",
+                                      rb_pending_alloc);
                 }
 
                 IWL_DEBUG_RX(trans, "Q %d: HW = %d, SW = %d\n", rxq->id, r, i);
@@ -1453,8 +1496,12 @@ restart:
                         count++;
                         if (count == 8) {
                                 count = 0;
-                                if (rb_pending_alloc < rxq->queue_size / 3)
+                                if (rb_pending_alloc < rxq->queue_size / 3) {
+                                        IWL_DEBUG_TPT(trans,
+                                                      "RX path exited emergency. Pending allocations %d\n",
+                                                      rb_pending_alloc);
                                         emergency = false;
+                                }
 
                                 rxq->read = i;
                                 spin_unlock(&rxq->lock);
@@ -2120,7 +2167,7 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)
                 }
         }
 
-        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560 &&
+        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_22560 &&
             inta_hw & MSIX_HW_INT_CAUSES_REG_IPC) {
                 /* Reflect IML transfer status */
                 int res = iwl_read32(trans, CSR_IML_RESP_ADDR);
@@ -2139,6 +2186,17 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)
                 isr_stats->wakeup++;
         }
 
+        if (inta_hw & MSIX_HW_INT_CAUSES_REG_IML) {
+                /* Reflect IML transfer status */
+                int res = iwl_read32(trans, CSR_IML_RESP_ADDR);
+
+                IWL_DEBUG_ISR(trans, "IML transfer status: %d\n", res);
+                if (res == IWL_IMAGE_RESP_FAIL) {
+                        isr_stats->sw++;
+                        iwl_pcie_irq_handle_error(trans);
+                }
+        }
+
         /* Chip got too hot and stopped itself */
         if (inta_hw & MSIX_HW_INT_CAUSES_REG_CT_KILL) {
                 IWL_ERR(trans, "Microcode CT kill error detected.\n");
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index 77f3610e5ca9..9c203ca75de9 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -92,26 +92,9 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)
 
         iwl_pcie_apm_config(trans);
 
-        /*
-         * Set "initialization complete" bit to move adapter from
-         * D0U* --> D0A* (powered-up active) state.
-         */
-        iwl_set_bit(trans, CSR_GP_CNTRL,
-                    BIT(trans->cfg->csr->flag_init_done));
-
-        /*
-         * Wait for clock stabilization; once stabilized, access to
-         * device-internal resources is supported, e.g. iwl_write_prph()
-         * and accesses to uCode SRAM.
-         */
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           25000);
-        if (ret < 0) {
-                IWL_DEBUG_INFO(trans, "Failed to init the card\n");
+        ret = iwl_finish_nic_init(trans);
+        if (ret)
                 return ret;
-        }
 
         set_bit(STATUS_DEVICE_ENABLED, &trans->status);
 
@@ -188,7 +171,7 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)
         }
 
         iwl_pcie_ctxt_info_free_paging(trans);
-        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_22560)
+        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
                 iwl_pcie_ctxt_info_gen3_free(trans);
         else
                 iwl_pcie_ctxt_info_free(trans);
@@ -251,6 +234,7 @@ void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)
 static int iwl_pcie_gen2_nic_init(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        int queue_size = max_t(u32, TFD_CMD_SLOTS, trans->cfg->min_txq_size);
 
         /* TODO: most of the logic can be removed in A0 - but not in Z0 */
         spin_lock(&trans_pcie->irq_lock);
@@ -264,7 +248,7 @@ static int iwl_pcie_gen2_nic_init(struct iwl_trans *trans)
                 return -ENOMEM;
 
         /* Allocate or reset and init all Tx and Command queues */
-        if (iwl_pcie_gen2_tx_init(trans, trans_pcie->cmd_queue, TFD_CMD_SLOTS))
+        if (iwl_pcie_gen2_tx_init(trans, trans_pcie->cmd_queue, queue_size))
                 return -ENOMEM;
 
         /* enable shadow regs in HW */
@@ -349,7 +333,7 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,
                 goto out;
         }
 
-        if (trans->cfg->device_family == IWL_DEVICE_FAMILY_22560)
+        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
                 ret = iwl_pcie_ctxt_info_gen3_init(trans, fw);
         else
                 ret = iwl_pcie_ctxt_info_init(trans, fw);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index f74281508197..fe8269d023de 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2007 - 2015 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2005 - 2015 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -364,26 +364,9 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans)
         if (trans->cfg->base_params->pll_cfg)
                 iwl_set_bit(trans, CSR_ANA_PLL_CFG, CSR50_ANA_PLL_CFG_VAL);
 
-        /*
-         * Set "initialization complete" bit to move adapter from
-         * D0U* --> D0A* (powered-up active) state.
-         */
-        iwl_set_bit(trans, CSR_GP_CNTRL,
-                    BIT(trans->cfg->csr->flag_init_done));
-
-        /*
-         * Wait for clock stabilization; once stabilized, access to
-         * device-internal resources is supported, e.g. iwl_write_prph()
-         * and accesses to uCode SRAM.
-         */
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           25000);
-        if (ret < 0) {
-                IWL_ERR(trans, "Failed to init the card\n");
+        ret = iwl_finish_nic_init(trans);
+        if (ret)
                 return ret;
-        }
 
         if (trans->cfg->host_interrupt_operation_mode) {
                 /*
@@ -453,23 +436,8 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans)
 
         iwl_trans_pcie_sw_reset(trans);
 
-        /*
-         * Set "initialization complete" bit to move adapter from
-         * D0U* --> D0A* (powered-up active) state.
-         */
-        iwl_set_bit(trans, CSR_GP_CNTRL,
-                    BIT(trans->cfg->csr->flag_init_done));
-
-        /*
-         * Wait for clock stabilization; once stabilized, access to
-         * device-internal resources is possible.
-         */
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           25000);
-        if (WARN_ON(ret < 0)) {
-                IWL_ERR(trans, "Access time out - failed to enable LP XTAL\n");
+        ret = iwl_finish_nic_init(trans);
+        if (WARN_ON(ret)) {
                 /* Release XTAL ON request */
                 __iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
                                            CSR_GP_CNTRL_REG_FLAG_XTAL_ON);
@@ -928,13 +896,13 @@ void iwl_pcie_apply_destination(struct iwl_trans *trans)
                 if (!trans->num_blocks)
                         return;
 
-                iwl_write_prph(trans, MON_BUFF_BASE_ADDR_VER2,
-                               trans->fw_mon[0].physical >>
-                               MON_BUFF_SHIFT_VER2);
-                iwl_write_prph(trans, MON_BUFF_END_ADDR_VER2,
-                               (trans->fw_mon[0].physical +
-                                trans->fw_mon[0].size - 256) >>
-                               MON_BUFF_SHIFT_VER2);
+                iwl_write_umac_prph(trans, MON_BUFF_BASE_ADDR_VER2,
+                                    trans->fw_mon[0].physical >>
+                                    MON_BUFF_SHIFT_VER2);
+                iwl_write_umac_prph(trans, MON_BUFF_END_ADDR_VER2,
+                                    (trans->fw_mon[0].physical +
+                                     trans->fw_mon[0].size - 256) >>
+                                    MON_BUFF_SHIFT_VER2);
                 return;
         }
 
@@ -1126,6 +1094,7 @@ static struct iwl_causes_list causes_list[] = {
         {MSIX_FH_INT_CAUSES_FH_ERR,             CSR_MSIX_FH_INT_MASK_AD, 0x5},
         {MSIX_HW_INT_CAUSES_REG_ALIVE,          CSR_MSIX_HW_INT_MASK_AD, 0x10},
         {MSIX_HW_INT_CAUSES_REG_WAKEUP,         CSR_MSIX_HW_INT_MASK_AD, 0x11},
+        {MSIX_HW_INT_CAUSES_REG_IML,            CSR_MSIX_HW_INT_MASK_AD, 0x12},
         {MSIX_HW_INT_CAUSES_REG_CT_KILL,        CSR_MSIX_HW_INT_MASK_AD, 0x16},
         {MSIX_HW_INT_CAUSES_REG_RF_KILL,        CSR_MSIX_HW_INT_MASK_AD, 0x17},
         {MSIX_HW_INT_CAUSES_REG_PERIODIC,       CSR_MSIX_HW_INT_MASK_AD, 0x18},
@@ -1158,7 +1127,7 @@ static void iwl_pcie_map_non_rx_causes(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie =  IWL_TRANS_GET_PCIE_TRANS(trans);
         int val = trans_pcie->def_irq | MSIX_NON_AUTO_CLEAR_CAUSE;
         int i, arr_size =
-                (trans->cfg->device_family < IWL_DEVICE_FAMILY_22560) ?
+                (trans->cfg->device_family != IWL_DEVICE_FAMILY_22560) ?
                 ARRAY_SIZE(causes_list) : ARRAY_SIZE(causes_list_v2);
 
         /*
@@ -1168,7 +1137,7 @@ static void iwl_pcie_map_non_rx_causes(struct iwl_trans *trans)
          */
         for (i = 0; i < arr_size; i++) {
                 struct iwl_causes_list *causes =
-                        (trans->cfg->device_family < IWL_DEVICE_FAMILY_22560) ?
+                        (trans->cfg->device_family != IWL_DEVICE_FAMILY_22560) ?
                         causes_list : causes_list_v2;
 
                 iwl_write8(trans, CSR_MSIX_IVAR(causes[i].addr), val);
@@ -1214,8 +1183,8 @@ void iwl_pcie_conf_msix_hw(struct iwl_trans_pcie *trans_pcie)
         if (!trans_pcie->msix_enabled) {
                 if (trans->cfg->mq_rx_supported &&
                     test_bit(STATUS_DEVICE_ENABLED, &trans->status))
-                        iwl_write_prph(trans, UREG_CHICK,
-                                       UREG_CHICK_MSI_ENABLE);
+                        iwl_write_umac_prph(trans, UREG_CHICK,
+                                            UREG_CHICK_MSI_ENABLE);
                 return;
         }
         /*
@@ -1224,7 +1193,7 @@ void iwl_pcie_conf_msix_hw(struct iwl_trans_pcie *trans_pcie)
          * prph.
          */
         if (test_bit(STATUS_DEVICE_ENABLED, &trans->status))
-                iwl_write_prph(trans, UREG_CHICK, UREG_CHICK_MSIX_ENABLE);
+                iwl_write_umac_prph(trans, UREG_CHICK, UREG_CHICK_MSIX_ENABLE);
 
         /*
          * Each cause from the causes list above and the RX causes is
@@ -1558,20 +1527,10 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
 
         iwl_set_bit(trans, CSR_GP_CNTRL,
                     BIT(trans->cfg->csr->flag_mac_access_req));
-        iwl_set_bit(trans, CSR_GP_CNTRL,
-                    BIT(trans->cfg->csr->flag_init_done));
-
-        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_8000)
-                udelay(2);
 
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           BIT(trans->cfg->csr->flag_mac_clock_ready),
-                           25000);
-        if (ret < 0) {
-                IWL_ERR(trans, "Failed to resume the device (mac ready)\n");
+        ret = iwl_finish_nic_init(trans);
+        if (ret)
                 return ret;
-        }
 
         /*
          * Reconfigure IVAR table in case of MSIX or reset ict table in
@@ -1602,7 +1561,7 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
         }
 
         IWL_DEBUG_POWER(trans, "WFPM value upon resume = 0x%08X\n",
-                        iwl_read_prph(trans, WFPM_GP2));
+                        iwl_read_umac_prph(trans, WFPM_GP2));
 
         val = iwl_read32(trans, CSR_RESET);
         if (val & CSR_RESET_REG_FLAG_NEVO_RESET)
@@ -1751,15 +1710,18 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans, bool low_power)
                 return err;
         }
 
-        hpm = iwl_trans_read_prph(trans, HPM_DEBUG);
+        hpm = iwl_read_umac_prph_no_grab(trans, HPM_DEBUG);
         if (hpm != 0xa5a5a5a0 && (hpm & PERSISTENCE_BIT)) {
-                if (iwl_trans_read_prph(trans, PREG_PRPH_WPROT_0) &
-                    PREG_WFPM_ACCESS) {
+                int wfpm_val = iwl_read_umac_prph_no_grab(trans,
+                                                          PREG_PRPH_WPROT_0);
+
+                if (wfpm_val & PREG_WFPM_ACCESS) {
                         IWL_ERR(trans,
                                 "Error, can not clear persistence bit\n");
                         return -EPERM;
                 }
-                iwl_trans_write_prph(trans, HPM_DEBUG, hpm & ~PERSISTENCE_BIT);
+                iwl_write_umac_prph_no_grab(trans, HPM_DEBUG,
+                                            hpm & ~PERSISTENCE_BIT);
         }
 
         iwl_trans_pcie_sw_reset(trans);
@@ -2281,6 +2243,7 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_txq *txq;
         unsigned long now = jiffies;
+        bool overflow_tx;
         u8 wr_ptr;
 
         /* Make sure the NIC is still alive in the bus */
@@ -2292,18 +2255,37 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)
 
         IWL_DEBUG_TX_QUEUES(trans, "Emptying queue %d...\n", txq_idx);
         txq = trans_pcie->txq[txq_idx];
+
+        spin_lock_bh(&txq->lock);
+        overflow_tx = txq->overflow_tx ||
+                      !skb_queue_empty(&txq->overflow_q);
+        spin_unlock_bh(&txq->lock);
+
         wr_ptr = READ_ONCE(txq->write_ptr);
 
-        while (txq->read_ptr != READ_ONCE(txq->write_ptr) &&
+        while ((txq->read_ptr != READ_ONCE(txq->write_ptr) ||
+                overflow_tx) &&
                !time_after(jiffies,
                            now + msecs_to_jiffies(IWL_FLUSH_WAIT_MS))) {
                 u8 write_ptr = READ_ONCE(txq->write_ptr);
 
-                if (WARN_ONCE(wr_ptr != write_ptr,
+                /*
+                 * If write pointer moved during the wait, warn only
+                 * if the TX came from op mode. In case TX came from
+                 * trans layer (overflow TX) don't warn.
+                 */
+                if (WARN_ONCE(wr_ptr != write_ptr && !overflow_tx,
                               "WR pointer moved while flushing %d -> %d\n",
                               wr_ptr, write_ptr))
                         return -ETIMEDOUT;
+                wr_ptr = write_ptr;
+
                 usleep_range(1000, 2000);
+
+                spin_lock_bh(&txq->lock);
+                overflow_tx = txq->overflow_tx ||
+                              !skb_queue_empty(&txq->overflow_q);
+                spin_unlock_bh(&txq->lock);
         }
 
         if (txq->read_ptr != txq->write_ptr) {
@@ -2989,7 +2971,8 @@ static u32 iwl_trans_pcie_fh_regs_dump(struct iwl_trans *trans,
                      i += sizeof(u32))
                         *val++ = cpu_to_le32(iwl_trans_pcie_read32(trans, i));
         else
-                for (i = FH_MEM_LOWER_BOUND_GEN2; i < FH_MEM_UPPER_BOUND_GEN2;
+                for (i = iwl_umac_prph(trans, FH_MEM_LOWER_BOUND_GEN2);
+                     i < iwl_umac_prph(trans, FH_MEM_UPPER_BOUND_GEN2);
                      i += sizeof(u32))
                         *val++ = cpu_to_le32(iwl_trans_pcie_read_prph(trans,
                                                                       i));
@@ -3014,11 +2997,11 @@ iwl_trans_pci_dump_marbh_monitor(struct iwl_trans *trans,
         if (!iwl_trans_grab_nic_access(trans, &flags))
                 return 0;
 
-        iwl_write_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x1);
+        iwl_write_umac_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x1);
         for (i = 0; i < buf_size_in_dwords; i++)
-                buffer[i] = iwl_read_prph_no_grab(trans,
-                                MON_DMARB_RD_DATA_ADDR);
-        iwl_write_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x0);
+                buffer[i] = iwl_read_umac_prph_no_grab(trans,
+                                                       MON_DMARB_RD_DATA_ADDR);
+        iwl_write_umac_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x0);
 
         iwl_trans_release_nic_access(trans, &flags);
 
@@ -3033,9 +3016,9 @@ iwl_trans_pcie_dump_pointers(struct iwl_trans *trans,
 
         /* If there was a dest TLV - use the values from there */
         if (trans->ini_valid) {
-                base = MON_BUFF_BASE_ADDR_VER2;
-                write_ptr = MON_BUFF_WRPTR_VER2;
-                wrap_cnt = MON_BUFF_CYCLE_CNT_VER2;
+                base = iwl_umac_prph(trans, MON_BUFF_BASE_ADDR_VER2);
+                write_ptr = iwl_umac_prph(trans, MON_BUFF_WRPTR_VER2);
+                wrap_cnt = iwl_umac_prph(trans, MON_BUFF_CYCLE_CNT_VER2);
         } else if (trans->dbg_dest_tlv) {
                 write_ptr = le32_to_cpu(trans->dbg_dest_tlv->write_ptr_reg);
                 wrap_cnt = le32_to_cpu(trans->dbg_dest_tlv->wrap_count);
@@ -3197,8 +3180,8 @@ static struct iwl_trans_dump_data
         if (dump_mask & BIT(IWL_FW_ERROR_DUMP_FH_REGS)) {
                 if (trans->cfg->gen2)
                         len += sizeof(*data) +
-                               (FH_MEM_UPPER_BOUND_GEN2 -
-                                FH_MEM_LOWER_BOUND_GEN2);
+                               (iwl_umac_prph(trans, FH_MEM_UPPER_BOUND_GEN2) -
+                                iwl_umac_prph(trans, FH_MEM_LOWER_BOUND_GEN2));
                 else
                         len += sizeof(*data) +
                                (FH_MEM_UPPER_BOUND -
@@ -3220,10 +3203,10 @@ static struct iwl_trans_dump_data
 
         /* Paged memory for gen2 HW */
         if (trans->cfg->gen2 && dump_mask & BIT(IWL_FW_ERROR_DUMP_PAGING))
-                for (i = 0; i < trans_pcie->init_dram.paging_cnt; i++)
+                for (i = 0; i < trans->init_dram.paging_cnt; i++)
                         len += sizeof(*data) +
                                sizeof(struct iwl_fw_error_dump_paging) +
-                               trans_pcie->init_dram.paging[i].size;
+                               trans->init_dram.paging[i].size;
 
         dump_data = vzalloc(len);
         if (!dump_data)
@@ -3275,20 +3258,16 @@ static struct iwl_trans_dump_data
 
         /* Paged memory for gen2 HW */
         if (trans->cfg->gen2 && dump_mask & BIT(IWL_FW_ERROR_DUMP_PAGING)) {
-                for (i = 0; i < trans_pcie->init_dram.paging_cnt; i++) {
+                for (i = 0; i < trans->init_dram.paging_cnt; i++) {
                         struct iwl_fw_error_dump_paging *paging;
-                        dma_addr_t addr =
-                                trans_pcie->init_dram.paging[i].physical;
-                        u32 page_len = trans_pcie->init_dram.paging[i].size;
+                        u32 page_len = trans->init_dram.paging[i].size;
 
                         data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PAGING);
                         data->len = cpu_to_le32(sizeof(*paging) + page_len);
                         paging = (void *)data->data;
                         paging->index = cpu_to_le32(i);
-                        dma_sync_single_for_cpu(trans->dev, addr, page_len,
-                                                DMA_BIDIRECTIONAL);
                         memcpy(paging->data,
-                               trans_pcie->init_dram.paging[i].block, page_len);
+                               trans->init_dram.paging[i].block, page_len);
                         data = iwl_fw_error_next_data(data);
 
                         len += sizeof(*data) + sizeof(*paging) + page_len;
@@ -3525,25 +3504,18 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
                  * 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,
-                            BIT(trans->cfg->csr->flag_init_done));
-                udelay(2);
-
-                ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                                   BIT(trans->cfg->csr->flag_mac_clock_ready),
-                                   BIT(trans->cfg->csr->flag_mac_clock_ready),
-                                   25000);
-                if (ret < 0) {
-                        IWL_DEBUG_INFO(trans, "Failed to wake up the nic\n");
+                ret = iwl_finish_nic_init(trans);
+                if (ret)
                         goto out_no_pci;
-                }
 
                 if (iwl_trans_grab_nic_access(trans, &flags)) {
                         u32 hw_step;
 
-                        hw_step = iwl_read_prph_no_grab(trans, WFPM_CTRL_REG);
+                        hw_step = iwl_read_umac_prph_no_grab(trans,
+                                                             WFPM_CTRL_REG);
                         hw_step |= ENABLE_WFPM;
-                        iwl_write_prph_no_grab(trans, WFPM_CTRL_REG, hw_step);
+                        iwl_write_umac_prph_no_grab(trans, WFPM_CTRL_REG,
+                                                    hw_step);
                         hw_step = iwl_read_prph_no_grab(trans, AUX_MISC_REG);
                         hw_step = (hw_step >> HW_STEP_LOCATION_BITS) & 0xF;
                         if (hw_step == 0x3)
@@ -3558,10 +3530,20 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 #if IS_ENABLED(CONFIG_IWLMVM)
         trans->hw_rf_id = iwl_read32(trans, CSR_HW_RF_ID);
 
-        if (cfg == &iwl22560_2ax_cfg_hr) {
+        if (cfg == &iwlax210_2ax_cfg_so_hr_a0) {
+                if (trans->hw_rev == CSR_HW_REV_TYPE_TY) {
+                        trans->cfg = &iwlax210_2ax_cfg_ty_gf_a0;
+                } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
+                           CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_JF)) {
+                        trans->cfg = &iwlax210_2ax_cfg_so_jf_a0;
+                } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
+                           CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF)) {
+                        trans->cfg = &iwlax210_2ax_cfg_so_gf_a0;
+                }
+        } else if (cfg == &iwl_ax101_cfg_qu_hr) {
                 if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
                     CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {
-                        trans->cfg = &iwl22560_2ax_cfg_hr;
+                        trans->cfg = &iwl_ax101_cfg_qu_hr;
                 } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
                            CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_JF)) {
                         trans->cfg = &iwl22000_2ax_cfg_jf;
@@ -3654,3 +3636,28 @@ out_no_pci:
         iwl_trans_free(trans);
         return ERR_PTR(ret);
 }
+
+void iwl_trans_sync_nmi(struct iwl_trans *trans)
+{
+        unsigned long timeout = jiffies + IWL_TRANS_NMI_TIMEOUT;
+
+        iwl_disable_interrupts(trans);
+        iwl_force_nmi(trans);
+        while (time_after(timeout, jiffies)) {
+                u32 inta_hw = iwl_read32(trans,
+                                         CSR_MSIX_HW_INT_CAUSES_AD);
+
+                /* Error detected by uCode */
+                if (inta_hw & MSIX_HW_INT_CAUSES_REG_SW_ERR) {
+                        /* Clear causes register */
+                        iwl_write32(trans, CSR_MSIX_HW_INT_CAUSES_AD,
+                                    inta_hw &
+                                    MSIX_HW_INT_CAUSES_REG_SW_ERR);
+                        break;
+                }
+
+                mdelay(1);
+        }
+        iwl_enable_interrupts(trans);
+        iwl_trans_fw_error(trans);
+}
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
index f3d2e8fe920b..88530d9f4a54 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -20,7 +20,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -965,9 +965,7 @@ static int iwl_pcie_gen2_send_hcmd_sync(struct iwl_trans *trans,
                                cmd_str);
                 ret = -ETIMEDOUT;
 
-                iwl_force_nmi(trans);
-                iwl_trans_fw_error(trans);
-
+                iwl_trans_sync_nmi(trans);
                 goto cancel;
         }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index 07395502f419..9fbd37d23e85 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -995,7 +995,11 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)
              txq_id++) {
                 bool cmd_queue = (txq_id == trans_pcie->cmd_queue);
 
-                slots_num = cmd_queue ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
+                if (cmd_queue)
+                        slots_num = max_t(u32, TFD_CMD_SLOTS,
+                                          trans->cfg->min_txq_size);
+                else
+                        slots_num = TFD_TX_CMD_SLOTS;
                 trans_pcie->txq[txq_id] = &trans_pcie->txq_memory[txq_id];
                 ret = iwl_pcie_txq_alloc(trans, trans_pcie->txq[txq_id],
                                          slots_num, cmd_queue);
@@ -1044,7 +1048,11 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)
              txq_id++) {
                 bool cmd_queue = (txq_id == trans_pcie->cmd_queue);
 
-                slots_num = cmd_queue ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
+                if (cmd_queue)
+                        slots_num = max_t(u32, TFD_CMD_SLOTS,
+                                          trans->cfg->min_txq_size);
+                else
+                        slots_num = TFD_TX_CMD_SLOTS;
                 ret = iwl_pcie_txq_init(trans, trans_pcie->txq[txq_id],
                                         slots_num, cmd_queue);
                 if (ret) {
@@ -1174,6 +1182,15 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
                 skb_queue_splice_init(&txq->overflow_q, &overflow_skbs);
 
                 /*
+                 * We are going to transmit from the overflow queue.
+                 * Remember this state so that wait_for_txq_empty will know we
+                 * are adding more packets to the TFD queue. It cannot rely on
+                 * the state of &txq->overflow_q, as we just emptied it, but
+                 * haven't TXed the content yet.
+                 */
+                txq->overflow_tx = true;
+
+                /*
                  * This is tricky: we are in reclaim path which is non
                  * re-entrant, so noone will try to take the access the
                  * txq data from that path. We stopped tx, so we can't
@@ -1201,6 +1218,7 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
                         iwl_wake_queue(trans, txq);
 
                 spin_lock_bh(&txq->lock);
+                txq->overflow_tx = false;
         }
 
         if (txq->read_ptr == txq->write_ptr) {
@@ -1942,9 +1960,7 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,
                                iwl_get_cmd_string(trans, cmd->id));
                 ret = -ETIMEDOUT;
 
-                iwl_force_nmi(trans);
-                iwl_trans_fw_error(trans);
-
+                iwl_trans_sync_nmi(trans);
                 goto cancel;
         }
 
diff --git a/drivers/net/wireless/intersil/orinoco/mic.c b/drivers/net/wireless/intersil/orinoco/mic.c
index 709d9ab3e7bc..67b0c05afbdb 100644
--- a/drivers/net/wireless/intersil/orinoco/mic.c
+++ b/drivers/net/wireless/intersil/orinoco/mic.c
@@ -18,16 +18,16 @@ int orinoco_mic_init(struct orinoco_private *priv)
 {
         priv->tx_tfm_mic = crypto_alloc_shash("michael_mic", 0, 0);
         if (IS_ERR(priv->tx_tfm_mic)) {
-                printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
-                       "crypto API michael_mic\n");
+                printk(KERN_DEBUG "%s: could not allocate "
+                       "crypto API michael_mic\n", __func__);
                 priv->tx_tfm_mic = NULL;
                 return -ENOMEM;
         }
 
         priv->rx_tfm_mic = crypto_alloc_shash("michael_mic", 0, 0);
         if (IS_ERR(priv->rx_tfm_mic)) {
-                printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
-                       "crypto API michael_mic\n");
+                printk(KERN_DEBUG "%s: could not allocate "
+                       "crypto API michael_mic\n", __func__);
                 priv->rx_tfm_mic = NULL;
                 return -ENOMEM;
         }
@@ -52,7 +52,7 @@ int orinoco_mic(struct crypto_shash *tfm_michael, u8 *key,
         int err;
 
         if (tfm_michael == NULL) {
-                printk(KERN_WARNING "orinoco_mic: tfm_michael == NULL\n");
+                printk(KERN_WARNING "%s: tfm_michael == NULL\n", __func__);
                 return -1;
         }
 
diff --git a/drivers/net/wireless/marvell/libertas_tf/cmd.c b/drivers/net/wireless/marvell/libertas_tf/cmd.c
index 909ac3685010..130f578daafd 100644
--- a/drivers/net/wireless/marvell/libertas_tf/cmd.c
+++ b/drivers/net/wireless/marvell/libertas_tf/cmd.c
@@ -256,7 +256,7 @@ static void lbtf_submit_command(struct lbtf_private *priv,
                      command, le16_to_cpu(cmd->seqnum), cmdsize);
         lbtf_deb_hex(LBTF_DEB_CMD, "DNLD_CMD", (void *) cmdnode->cmdbuf, cmdsize);
 
-        ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) cmd, cmdsize);
+        ret = priv->ops->hw_host_to_card(priv, MVMS_CMD, (u8 *)cmd, cmdsize);
         spin_unlock_irqrestore(&priv->driver_lock, flags);
 
         if (ret) {
@@ -737,10 +737,9 @@ int lbtf_process_rx_command(struct lbtf_private *priv)
         respcmd = le16_to_cpu(resp->command);
         result = le16_to_cpu(resp->result);
 
-        if (net_ratelimit())
-                pr_info("libertastf: cmd response 0x%04x, seq %d, size %d\n",
-                        respcmd, le16_to_cpu(resp->seqnum),
-                        le16_to_cpu(resp->size));
+        lbtf_deb_cmd("libertastf: cmd response 0x%04x, seq %d, size %d\n",
+                     respcmd, le16_to_cpu(resp->seqnum),
+                     le16_to_cpu(resp->size));
 
         if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
diff --git a/drivers/net/wireless/marvell/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
index 789337ea676a..a4b9ede70705 100644
--- a/drivers/net/wireless/marvell/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
@@ -42,14 +42,14 @@ MODULE_DEVICE_TABLE(usb, if_usb_table);
 
 static void if_usb_receive(struct urb *urb);
 static void if_usb_receive_fwload(struct urb *urb);
-static int if_usb_prog_firmware(struct if_usb_card *cardp);
+static int if_usb_prog_firmware(struct lbtf_private *priv);
 static int if_usb_host_to_card(struct lbtf_private *priv, uint8_t type,
                                uint8_t *payload, uint16_t nb);
 static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload,
                         uint16_t nb, u8 data);
 static void if_usb_free(struct if_usb_card *cardp);
 static int if_usb_submit_rx_urb(struct if_usb_card *cardp);
-static int if_usb_reset_device(struct if_usb_card *cardp);
+static int if_usb_reset_device(struct lbtf_private *priv);
 
 /**
  *  if_usb_wrike_bulk_callback -  call back to handle URB status
@@ -131,6 +131,12 @@ static void if_usb_fw_timeo(struct timer_list *t)
         lbtf_deb_leave(LBTF_DEB_USB);
 }
 
+static const struct lbtf_ops if_usb_ops = {
+        .hw_host_to_card = if_usb_host_to_card,
+        .hw_prog_firmware = if_usb_prog_firmware,
+        .hw_reset_device = if_usb_reset_device,
+};
+
 /**
  *  if_usb_probe - sets the configuration values
  *
@@ -216,17 +222,11 @@ static int if_usb_probe(struct usb_interface *intf,
                 goto dealloc;
         }
 
-        priv = lbtf_add_card(cardp, &udev->dev);
+        cardp->boot2_version = udev->descriptor.bcdDevice;
+        priv = lbtf_add_card(cardp, &udev->dev, &if_usb_ops);
         if (!priv)
                 goto dealloc;
 
-        cardp->priv = priv;
-
-        priv->hw_host_to_card = if_usb_host_to_card;
-        priv->hw_prog_firmware = if_usb_prog_firmware;
-        priv->hw_reset_device = if_usb_reset_device;
-        cardp->boot2_version = udev->descriptor.bcdDevice;
-
         usb_get_dev(udev);
         usb_set_intfdata(intf, cardp);
 
@@ -251,7 +251,7 @@ static void if_usb_disconnect(struct usb_interface *intf)
 
         lbtf_deb_enter(LBTF_DEB_MAIN);
 
-        if_usb_reset_device(cardp);
+        if_usb_reset_device(priv);
 
         if (priv)
                 lbtf_remove_card(priv);
@@ -334,8 +334,9 @@ static int if_usb_send_fw_pkt(struct if_usb_card *cardp)
         return 0;
 }
 
-static int if_usb_reset_device(struct if_usb_card *cardp)
+static int if_usb_reset_device(struct lbtf_private *priv)
 {
+        struct if_usb_card *cardp = priv->card;
         struct cmd_ds_802_11_reset *cmd = cardp->ep_out_buf + 4;
         int ret;
 
@@ -433,8 +434,6 @@ static int __if_usb_submit_rx_urb(struct if_usb_card *cardp,
                           skb_tail_pointer(skb),
                           MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn, cardp);
 
-        cardp->rx_urb->transfer_flags |= URB_ZERO_PACKET;
-
         lbtf_deb_usb2(&cardp->udev->dev, "Pointer for rx_urb %p\n",
                 cardp->rx_urb);
         ret = usb_submit_urb(cardp->rx_urb, GFP_ATOMIC);
@@ -808,14 +807,17 @@ static int check_fwfile_format(const u8 *data, u32 totlen)
 }
 
 
-static int if_usb_prog_firmware(struct if_usb_card *cardp)
+static int if_usb_prog_firmware(struct lbtf_private *priv)
 {
+        struct if_usb_card *cardp = priv->card;
         int i = 0;
         static int reset_count = 10;
         int ret = 0;
 
         lbtf_deb_enter(LBTF_DEB_USB);
 
+        cardp->priv = priv;
+
         kernel_param_lock(THIS_MODULE);
         ret = request_firmware(&cardp->fw, lbtf_fw_name, &cardp->udev->dev);
         if (ret < 0) {
@@ -851,7 +853,7 @@ restart:
 
         if (cardp->bootcmdresp <= 0) {
                 if (--reset_count >= 0) {
-                        if_usb_reset_device(cardp);
+                        if_usb_reset_device(priv);
                         goto restart;
                 }
                 return -1;
@@ -880,7 +882,7 @@ restart:
         if (!cardp->fwdnldover) {
                 pr_info("failed to load fw, resetting device!\n");
                 if (--reset_count >= 0) {
-                        if_usb_reset_device(cardp);
+                        if_usb_reset_device(priv);
                         goto restart;
                 }
 
@@ -889,8 +891,6 @@ restart:
                 goto release_fw;
         }
 
-        cardp->priv->fw_ready = 1;
-
  release_fw:
         release_firmware(cardp->fw);
         cardp->fw = NULL;
diff --git a/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h b/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h
index ad77b92d0b41..3ed1fbe28798 100644
--- a/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h
+++ b/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h
@@ -173,10 +173,19 @@ struct channel_range {
 
 struct if_usb_card;
 
+struct lbtf_ops {
+        /** Hardware access */
+        int (*hw_host_to_card)(struct lbtf_private *priv, u8 type,
+                               u8 *payload, u16 nb);
+        int (*hw_prog_firmware)(struct lbtf_private *priv);
+        int (*hw_reset_device)(struct lbtf_private *priv);
+};
+
 /** Private structure for the MV device */
 struct lbtf_private {
         void *card;
         struct ieee80211_hw *hw;
+        const struct lbtf_ops *ops;
 
         /* Command response buffer */
         u8 cmd_resp_buff[LBS_UPLD_SIZE];
@@ -188,11 +197,6 @@ struct lbtf_private {
 
         struct work_struct cmd_work;
         struct work_struct tx_work;
-        /** Hardware access */
-        int (*hw_host_to_card) (struct lbtf_private *priv, u8 type, u8 *payload, u16 nb);
-        int (*hw_prog_firmware) (struct if_usb_card *cardp);
-        int (*hw_reset_device) (struct if_usb_card *cardp);
-
 
         /** Wlan adapter data structure*/
         /** STATUS variables */
@@ -250,7 +254,6 @@ struct lbtf_private {
         struct ieee80211_supported_band band;
         struct lbtf_offset_value offsetvalue;
 
-        u8 fw_ready;
         u8 surpriseremoved;
         struct sk_buff_head bc_ps_buf;
 
@@ -486,7 +489,8 @@ void lbtf_cmd_response_rx(struct lbtf_private *priv);
 /* main.c */
 struct chan_freq_power *lbtf_get_region_cfp_table(u8 region,
         int *cfp_no);
-struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev);
+struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev,
+                                   const struct lbtf_ops *ops);
 int lbtf_remove_card(struct lbtf_private *priv);
 int lbtf_start_card(struct lbtf_private *priv);
 int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb);
diff --git a/drivers/net/wireless/marvell/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c
index a7cb7d06e5e6..5799e9886d83 100644
--- a/drivers/net/wireless/marvell/libertas_tf/main.c
+++ b/drivers/net/wireless/marvell/libertas_tf/main.c
@@ -118,11 +118,6 @@ static void lbtf_cmd_work(struct work_struct *work)
         priv->cmd_timed_out = 0;
         spin_unlock_irq(&priv->driver_lock);
 
-        if (!priv->fw_ready) {
-                lbtf_deb_leave_args(LBTF_DEB_CMD, "fw not ready");
-                return;
-        }
-
         /* Execute the next command */
         if (!priv->cur_cmd)
                 lbtf_execute_next_command(priv);
@@ -131,37 +126,6 @@ static void lbtf_cmd_work(struct work_struct *work)
 }
 
 /**
- *  lbtf_setup_firmware: initialize firmware.
- *
- *  @priv    A pointer to struct lbtf_private structure
- *
- *  Returns: 0 on success.
- */
-static int lbtf_setup_firmware(struct lbtf_private *priv)
-{
-        int ret = -1;
-
-        lbtf_deb_enter(LBTF_DEB_FW);
-        /*
-         * Read priv address from HW
-         */
-        eth_broadcast_addr(priv->current_addr);
-        ret = lbtf_update_hw_spec(priv);
-        if (ret) {
-                ret = -1;
-                goto done;
-        }
-
-        lbtf_set_mac_control(priv);
-        lbtf_set_radio_control(priv);
-
-        ret = 0;
-done:
-        lbtf_deb_leave_args(LBTF_DEB_FW, "ret: %d", ret);
-        return ret;
-}
-
-/**
  *  This function handles the timeout of command sending.
  *  It will re-send the same command again.
  */
@@ -281,7 +245,7 @@ static void lbtf_tx_work(struct work_struct *work)
         BUG_ON(priv->tx_skb);
         spin_lock_irq(&priv->driver_lock);
         priv->tx_skb = skb;
-        err = priv->hw_host_to_card(priv, MVMS_DAT, skb->data, skb->len);
+        err = priv->ops->hw_host_to_card(priv, MVMS_DAT, skb->data, skb->len);
         spin_unlock_irq(&priv->driver_lock);
         if (err) {
                 dev_kfree_skb_any(skb);
@@ -294,38 +258,17 @@ static void lbtf_tx_work(struct work_struct *work)
 static int lbtf_op_start(struct ieee80211_hw *hw)
 {
         struct lbtf_private *priv = hw->priv;
-        void *card = priv->card;
-        int ret = -1;
 
         lbtf_deb_enter(LBTF_DEB_MACOPS);
 
-        if (!priv->fw_ready)
-                /* Upload firmware */
-                if (priv->hw_prog_firmware(card))
-                        goto err_prog_firmware;
-
-        /* poke the firmware */
         priv->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;
         priv->radioon = RADIO_ON;
         priv->mac_control = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON;
-        ret = lbtf_setup_firmware(priv);
-        if (ret)
-                goto err_prog_firmware;
-
-        if ((priv->fwrelease < LBTF_FW_VER_MIN) ||
-            (priv->fwrelease > LBTF_FW_VER_MAX)) {
-                ret = -1;
-                goto err_prog_firmware;
-        }
+        lbtf_set_mac_control(priv);
+        lbtf_set_radio_control(priv);
 
-        printk(KERN_INFO "libertastf: Marvell WLAN 802.11 thinfirm adapter\n");
         lbtf_deb_leave(LBTF_DEB_MACOPS);
         return 0;
-
-err_prog_firmware:
-        priv->hw_reset_device(card);
-        lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programming fw; ret=%d", ret);
-        return ret;
 }
 
 static void lbtf_op_stop(struct ieee80211_hw *hw)
@@ -551,11 +494,15 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
         struct ieee80211_rx_status stats;
         struct rxpd *prxpd;
         int need_padding;
-        unsigned int flags;
         struct ieee80211_hdr *hdr;
 
         lbtf_deb_enter(LBTF_DEB_RX);
 
+        if (priv->radioon != RADIO_ON) {
+                lbtf_deb_rx("rx before we turned on the radio");
+                goto done;
+        }
+
         prxpd = (struct rxpd *) skb->data;
 
         memset(&stats, 0, sizeof(stats));
@@ -563,7 +510,7 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
                 stats.flag |= RX_FLAG_FAILED_FCS_CRC;
         stats.freq = priv->cur_freq;
         stats.band = NL80211_BAND_2GHZ;
-        stats.signal = prxpd->snr;
+        stats.signal = prxpd->snr - prxpd->nf;
         priv->noise = prxpd->nf;
         /* Marvell rate index has a hole at value 4 */
         if (prxpd->rx_rate > 4)
@@ -572,7 +519,6 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
         skb_pull(skb, sizeof(struct rxpd));
 
         hdr = (struct ieee80211_hdr *)skb->data;
-        flags = le32_to_cpu(*(__le32 *)(skb->data + 4));
 
         need_padding = ieee80211_is_data_qos(hdr->frame_control);
         need_padding ^= ieee80211_has_a4(hdr->frame_control);
@@ -594,19 +540,21 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
 
         ieee80211_rx_irqsafe(priv->hw, skb);
 
+done:
         lbtf_deb_leave(LBTF_DEB_RX);
         return 0;
 }
 EXPORT_SYMBOL_GPL(lbtf_rx);
 
 /**
- * lbtf_add_card: Add and initialize the card, no fw upload yet.
+ * lbtf_add_card: Add and initialize the card.
  *
  *  @card    A pointer to card
  *
  *  Returns: pointer to struct lbtf_priv.
  */
-struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev)
+struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev,
+                                   const struct lbtf_ops *ops)
 {
         struct ieee80211_hw *hw;
         struct lbtf_private *priv = NULL;
@@ -623,10 +571,13 @@ struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev)
 
         priv->hw = hw;
         priv->card = card;
+        priv->ops = ops;
         priv->tx_skb = NULL;
+        priv->radioon = RADIO_OFF;
 
         hw->queues = 1;
         ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);
+        ieee80211_hw_set(hw, SIGNAL_DBM);
         hw->extra_tx_headroom = sizeof(struct txpd);
         memcpy(priv->channels, lbtf_channels, sizeof(lbtf_channels));
         memcpy(priv->rates, lbtf_rates, sizeof(lbtf_rates));
@@ -646,9 +597,31 @@ struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev)
 
         INIT_WORK(&priv->cmd_work, lbtf_cmd_work);
         INIT_WORK(&priv->tx_work, lbtf_tx_work);
+
+        if (priv->ops->hw_prog_firmware(priv)) {
+                lbtf_deb_usbd(dmdev, "Error programming the firmware\n");
+                priv->ops->hw_reset_device(priv);
+                goto err_init_adapter;
+        }
+
+        eth_broadcast_addr(priv->current_addr);
+        if (lbtf_update_hw_spec(priv))
+                goto err_init_adapter;
+
+        if (priv->fwrelease < LBTF_FW_VER_MIN ||
+            priv->fwrelease > LBTF_FW_VER_MAX) {
+                goto err_init_adapter;
+        }
+
+        /* The firmware seems to start with the radio enabled. Turn it
+         * off before an actual mac80211 start callback is invoked.
+         */
+        lbtf_set_radio_control(priv);
+
         if (ieee80211_register_hw(hw))
                 goto err_init_adapter;
 
+        dev_info(dmdev, "libertastf: Marvell WLAN 802.11 thinfirm adapter\n");
         goto done;
 
 err_init_adapter:
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 1467af22e394..c46f0a54a0c7 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -376,11 +376,20 @@ mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,
         struct mwifiex_power_cfg power_cfg;
         int dbm = MBM_TO_DBM(mbm);
 
-        if (type == NL80211_TX_POWER_FIXED) {
+        switch (type) {
+        case NL80211_TX_POWER_FIXED:
                 power_cfg.is_power_auto = 0;
+                power_cfg.is_power_fixed = 1;
                 power_cfg.power_level = dbm;
-        } else {
+                break;
+        case NL80211_TX_POWER_LIMITED:
+                power_cfg.is_power_auto = 0;
+                power_cfg.is_power_fixed = 0;
+                power_cfg.power_level = dbm;
+                break;
+        case NL80211_TX_POWER_AUTOMATIC:
                 power_cfg.is_power_auto = 1;
+                break;
         }
 
         priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
@@ -4310,11 +4319,13 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wiphy->mgmt_stypes = mwifiex_mgmt_stypes;
         wiphy->max_remain_on_channel_duration = 5000;
         wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
-                                 BIT(NL80211_IFTYPE_ADHOC) |
                                  BIT(NL80211_IFTYPE_P2P_CLIENT) |
                                  BIT(NL80211_IFTYPE_P2P_GO) |
                                  BIT(NL80211_IFTYPE_AP);
 
+        if (ISSUPP_ADHOC_ENABLED(adapter->fw_cap_info))
+                wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
+
         wiphy->bands[NL80211_BAND_2GHZ] = &mwifiex_band_2ghz;
         if (adapter->config_bands & BAND_A)
                 wiphy->bands[NL80211_BAND_5GHZ] = &mwifiex_band_5ghz;
@@ -4374,11 +4385,13 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wiphy->available_antennas_tx = BIT(adapter->number_of_antenna) - 1;
         wiphy->available_antennas_rx = BIT(adapter->number_of_antenna) - 1;
 
-        wiphy->features |= NL80211_FEATURE_HT_IBSS |
-                           NL80211_FEATURE_INACTIVITY_TIMER |
+        wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER |
                            NL80211_FEATURE_LOW_PRIORITY_SCAN |
                            NL80211_FEATURE_NEED_OBSS_SCAN;
 
+        if (ISSUPP_ADHOC_ENABLED(adapter->fw_cap_info))
+                wiphy->features |= NL80211_FEATURE_HT_IBSS;
+
         if (ISSUPP_RANDOM_MAC(adapter->fw_cap_info))
                 wiphy->features |= NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR |
                                    NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
index 48e154e1865d..0dd592ea6e83 100644
--- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
+++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
@@ -267,6 +267,7 @@ struct mwifiex_ds_encrypt_key {
 
 struct mwifiex_power_cfg {
         u32 is_power_auto;
+        u32 is_power_fixed;
         u32 power_level;
 };
 
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index b454b5f85503..ebc0e41e5d3b 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -688,6 +688,9 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
         txp_cfg = (struct host_cmd_ds_txpwr_cfg *) buf;
         txp_cfg->action = cpu_to_le16(HostCmd_ACT_GEN_SET);
         if (!power_cfg->is_power_auto) {
+                u16 dbm_min = power_cfg->is_power_fixed ?
+                              dbm : priv->min_tx_power_level;
+
                 txp_cfg->mode = cpu_to_le32(1);
                 pg_tlv = (struct mwifiex_types_power_group *)
                          (buf + sizeof(struct host_cmd_ds_txpwr_cfg));
@@ -702,7 +705,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
                 pg->last_rate_code = 0x03;
                 pg->modulation_class = MOD_CLASS_HR_DSSS;
                 pg->power_step = 0;
-                pg->power_min = (s8) dbm;
+                pg->power_min = (s8) dbm_min;
                 pg->power_max = (s8) dbm;
                 pg++;
                 /* Power group for modulation class OFDM */
@@ -710,7 +713,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
                 pg->last_rate_code = 0x07;
                 pg->modulation_class = MOD_CLASS_OFDM;
                 pg->power_step = 0;
-                pg->power_min = (s8) dbm;
+                pg->power_min = (s8) dbm_min;
                 pg->power_max = (s8) dbm;
                 pg++;
                 /* Power group for modulation class HTBW20 */
@@ -718,7 +721,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
                 pg->last_rate_code = 0x20;
                 pg->modulation_class = MOD_CLASS_HT;
                 pg->power_step = 0;
-                pg->power_min = (s8) dbm;
+                pg->power_min = (s8) dbm_min;
                 pg->power_max = (s8) dbm;
                 pg->ht_bandwidth = HT_BW_20;
                 pg++;
@@ -727,7 +730,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
                 pg->last_rate_code = 0x20;
                 pg->modulation_class = MOD_CLASS_HT;
                 pg->power_step = 0;
-                pg->power_min = (s8) dbm;
+                pg->power_min = (s8) dbm_min;
                 pg->power_max = (s8) dbm;
                 pg->ht_bandwidth = HT_BW_40;
         }
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c
index e86217a6b9ca..ca759d9c0253 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_event.c
@@ -300,7 +300,7 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)
                 mwifiex_11h_handle_radar_detected(priv, adapter->event_skb);
                 break;
         case EVENT_BT_COEX_WLAN_PARA_CHANGE:
-                dev_err(adapter->dev, "EVENT: BT coex wlan param update\n");
+                mwifiex_dbg(adapter, EVENT, "event: BT coex wlan param update\n");
                 mwifiex_bt_coex_wlan_param_update_event(priv,
                                                         adapter->event_skb);
                 break;
diff --git a/drivers/net/wireless/mediatek/mt76/Makefile b/drivers/net/wireless/mediatek/mt76/Makefile
index 1a45cb30f39f..fa7a44edd02d 100644
--- a/drivers/net/wireless/mediatek/mt76/Makefile
+++ b/drivers/net/wireless/mediatek/mt76/Makefile
@@ -4,7 +4,8 @@ obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o
 obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o
 
 mt76-y := \
-        mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o tx.o agg-rx.o
+        mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \
+        tx.o agg-rx.o mcu.o
 
 mt76-usb-y := usb.o usb_trace.o usb_mcu.o
 
diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index e769c8a555dd..6eedc0ec7661 100644
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -242,6 +242,30 @@ mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q)
         iowrite32(q->head, &q->regs->cpu_idx);
 }
 
+static int
+mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,
+                          struct sk_buff *skb, u32 tx_info)
+{
+        struct mt76_queue *q = &dev->q_tx[qid];
+        struct mt76_queue_buf buf;
+        dma_addr_t addr;
+
+        addr = dma_map_single(dev->dev, skb->data, skb->len,
+                              DMA_TO_DEVICE);
+        if (dma_mapping_error(dev->dev, addr))
+                return -ENOMEM;
+
+        buf.addr = addr;
+        buf.len = skb->len;
+
+        spin_lock_bh(&q->lock);
+        mt76_dma_add_buf(dev, q, &buf, 1, tx_info, skb, NULL);
+        mt76_dma_kick_queue(dev, q);
+        spin_unlock_bh(&q->lock);
+
+        return 0;
+}
+
 int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
                           struct sk_buff *skb, struct mt76_wcid *wcid,
                           struct ieee80211_sta *sta)
@@ -522,17 +546,16 @@ mt76_dma_init(struct mt76_dev *dev)
 static const struct mt76_queue_ops mt76_dma_ops = {
         .init = mt76_dma_init,
         .alloc = mt76_dma_alloc_queue,
-        .add_buf = mt76_dma_add_buf,
+        .tx_queue_skb_raw = mt76_dma_tx_queue_skb_raw,
         .tx_queue_skb = mt76_dma_tx_queue_skb,
         .tx_cleanup = mt76_dma_tx_cleanup,
         .rx_reset = mt76_dma_rx_reset,
         .kick = mt76_dma_kick_queue,
 };
 
-int mt76_dma_attach(struct mt76_dev *dev)
+void mt76_dma_attach(struct mt76_dev *dev)
 {
         dev->queue_ops = &mt76_dma_ops;
-        return 0;
 }
 EXPORT_SYMBOL_GPL(mt76_dma_attach);
 
diff --git a/drivers/net/wireless/mediatek/mt76/dma.h b/drivers/net/wireless/mediatek/mt76/dma.h
index 357cc356342d..e3292df5e9b2 100644
--- a/drivers/net/wireless/mediatek/mt76/dma.h
+++ b/drivers/net/wireless/mediatek/mt76/dma.h
@@ -54,7 +54,7 @@ enum mt76_mcu_evt_type {
         EVT_EVENT_DFS_DETECT_RSP,
 };
 
-int mt76_dma_attach(struct mt76_dev *dev);
+void mt76_dma_attach(struct mt76_dev *dev);
 void mt76_dma_cleanup(struct mt76_dev *dev);
 
 #endif
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index ee3b65a14870..82e9f78ef328 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -124,7 +124,7 @@ static void mt76_init_stream_cap(struct mt76_dev *dev,
                                  bool vht)
 {
         struct ieee80211_sta_ht_cap *ht_cap = &sband->ht_cap;
-        int i, nstream = __sw_hweight8(dev->antenna_mask);
+        int i, nstream = hweight8(dev->antenna_mask);
         struct ieee80211_sta_vht_cap *vht_cap;
         u16 mcs_map = 0;
 
@@ -269,7 +269,9 @@ mt76_check_sband(struct mt76_dev *dev, int band)
 }
 
 struct mt76_dev *
-mt76_alloc_device(unsigned int size, const struct ieee80211_ops *ops)
+mt76_alloc_device(struct device *pdev, unsigned int size,
+                  const struct ieee80211_ops *ops,
+                  const struct mt76_driver_ops *drv_ops)
 {
         struct ieee80211_hw *hw;
         struct mt76_dev *dev;
@@ -280,6 +282,9 @@ mt76_alloc_device(unsigned int size, const struct ieee80211_ops *ops)
 
         dev = hw->priv;
         dev->hw = hw;
+        dev->dev = pdev;
+        dev->drv = drv_ops;
+
         spin_lock_init(&dev->rx_lock);
         spin_lock_init(&dev->lock);
         spin_lock_init(&dev->cc_lock);
@@ -721,7 +726,7 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                      int *dbm)
 {
         struct mt76_dev *dev = hw->priv;
-        int n_chains = __sw_hweight8(dev->antenna_mask);
+        int n_chains = hweight8(dev->antenna_mask);
 
         *dbm = dev->txpower_cur / 2;
 
diff --git a/drivers/net/wireless/mediatek/mt76/mcu.c b/drivers/net/wireless/mediatek/mt76/mcu.c
new file mode 100644
index 000000000000..dbb57b593a87
--- /dev/null
+++ b/drivers/net/wireless/mediatek/mt76/mcu.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2019 Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+ *
+ * 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 "mt76.h"
+
+struct sk_buff *
+mt76_mcu_msg_alloc(const void *data, int head_len,
+                   int data_len, int tail_len)
+{
+        struct sk_buff *skb;
+
+        skb = alloc_skb(head_len + data_len + tail_len,
+                        GFP_KERNEL);
+        if (!skb)
+                return NULL;
+
+        skb_reserve(skb, head_len);
+        if (data && data_len)
+                skb_put_data(skb, data, data_len);
+
+        return skb;
+}
+EXPORT_SYMBOL_GPL(mt76_mcu_msg_alloc);
+
+/* mmio */
+struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,
+                                      unsigned long expires)
+{
+        unsigned long timeout;
+
+        if (!time_is_after_jiffies(expires))
+                return NULL;
+
+        timeout = expires - jiffies;
+        wait_event_timeout(dev->mmio.mcu.wait,
+                           !skb_queue_empty(&dev->mmio.mcu.res_q),
+                           timeout);
+        return skb_dequeue(&dev->mmio.mcu.res_q);
+}
+EXPORT_SYMBOL_GPL(mt76_mcu_get_response);
+
+void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb)
+{
+        skb_queue_tail(&dev->mmio.mcu.res_q, skb);
+        wake_up(&dev->mmio.mcu.wait);
+}
+EXPORT_SYMBOL_GPL(mt76_mcu_rx_event);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 2bb9db4ed80a..f55dc621e060 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -87,6 +87,7 @@ struct mt76u_buf {
         struct mt76_dev *dev;
         struct urb *urb;
         size_t len;
+        void *buf;
         bool done;
 };
 
@@ -157,6 +158,9 @@ struct mt76_queue_ops {
                             struct sk_buff *skb, struct mt76_wcid *wcid,
                             struct ieee80211_sta *sta);
 
+        int (*tx_queue_skb_raw)(struct mt76_dev *dev, enum mt76_txq_id qid,
+                                struct sk_buff *skb, u32 tx_info);
+
         void *(*dequeue)(struct mt76_dev *dev, struct mt76_queue *q, bool flush,
                          int *len, u32 *info, bool *more);
 
@@ -376,6 +380,7 @@ struct mt76_usb {
         u16 out_max_packet;
         u8 in_ep[__MT_EP_IN_MAX];
         u16 in_max_packet;
+        bool sg_en;
 
         struct mt76u_mcu {
                 struct mutex mutex;
@@ -562,7 +567,7 @@ static inline u16 mt76_rev(struct mt76_dev *dev)
 
 #define mt76_init_queues(dev)           (dev)->mt76.queue_ops->init(&((dev)->mt76))
 #define mt76_queue_alloc(dev, ...)      (dev)->mt76.queue_ops->alloc(&((dev)->mt76), __VA_ARGS__)
-#define mt76_queue_add_buf(dev, ...)    (dev)->mt76.queue_ops->add_buf(&((dev)->mt76), __VA_ARGS__)
+#define mt76_tx_queue_skb_raw(dev, ...) (dev)->mt76.queue_ops->tx_queue_skb_raw(&((dev)->mt76), __VA_ARGS__)
 #define mt76_queue_rx_reset(dev, ...)   (dev)->mt76.queue_ops->rx_reset(&((dev)->mt76), __VA_ARGS__)
 #define mt76_queue_tx_cleanup(dev, ...) (dev)->mt76.queue_ops->tx_cleanup(&((dev)->mt76), __VA_ARGS__)
 #define mt76_queue_kick(dev, ...)       (dev)->mt76.queue_ops->kick(&((dev)->mt76), __VA_ARGS__)
@@ -582,8 +587,9 @@ mt76_channel_state(struct mt76_dev *dev, struct ieee80211_channel *c)
         return &msband->chan[idx];
 }
 
-struct mt76_dev *mt76_alloc_device(unsigned int size,
-                                   const struct ieee80211_ops *ops);
+struct mt76_dev *mt76_alloc_device(struct device *pdev, unsigned int size,
+                                   const struct ieee80211_ops *ops,
+                                   const struct mt76_driver_ops *drv_ops);
 int mt76_register_device(struct mt76_dev *dev, bool vht,
                          struct ieee80211_rate *rates, int n_rates);
 void mt76_unregister_device(struct mt76_dev *dev);
@@ -722,14 +728,17 @@ static inline u8 q2ep(u8 qid)
         return qid + 1;
 }
 
-static inline bool mt76u_check_sg(struct mt76_dev *dev)
+static inline int
+mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int timeout)
 {
         struct usb_interface *intf = to_usb_interface(dev->dev);
         struct usb_device *udev = interface_to_usbdev(intf);
+        struct mt76_usb *usb = &dev->usb;
+        unsigned int pipe;
+        int sent;
 
-        return (udev->bus->sg_tablesize > 0 &&
-                (udev->bus->no_sg_constraint ||
-                 udev->speed == USB_SPEED_WIRELESS));
+        pipe = usb_sndbulkpipe(udev, usb->out_ep[MT_EP_OUT_INBAND_CMD]);
+        return usb_bulk_msg(udev, pipe, data, len, &sent, timeout);
 }
 
 int mt76u_vendor_request(struct mt76_dev *dev, u8 req,
@@ -740,7 +749,7 @@ void mt76u_single_wr(struct mt76_dev *dev, const u8 req,
 int mt76u_init(struct mt76_dev *dev, struct usb_interface *intf);
 void mt76u_deinit(struct mt76_dev *dev);
 int mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf,
-                    int nsgs, int len, int sglen, gfp_t gfp);
+                    int len, int data_len, gfp_t gfp);
 void mt76u_buf_free(struct mt76u_buf *buf);
 int mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,
                      struct mt76u_buf *buf, gfp_t gfp,
@@ -751,6 +760,13 @@ void mt76u_stop_queues(struct mt76_dev *dev);
 void mt76u_stop_stat_wk(struct mt76_dev *dev);
 void mt76u_queues_deinit(struct mt76_dev *dev);
 
+struct sk_buff *
+mt76_mcu_msg_alloc(const void *data, int head_len,
+                   int data_len, int tail_len);
+void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb);
+struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,
+                                      unsigned long expires);
+
 void mt76u_mcu_complete_urb(struct urb *urb);
 int mt76u_mcu_init_rx(struct mt76_dev *dev);
 void mt76u_mcu_deinit(struct mt76_dev *dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
index b2cabce1d74d..ab6dfc026acb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
@@ -152,11 +152,11 @@ static s8 mt76x0_get_delta(struct mt76x02_dev *dev)
         return mt76x02_rate_power_val(val);
 }
 
-void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev)
+void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev,
+                                  struct ieee80211_channel *chan,
+                                  struct mt76_rate_power *t)
 {
-        struct ieee80211_channel *chan = dev->mt76.chandef.chan;
         bool is_2ghz = chan->band == NL80211_BAND_2GHZ;
-        struct mt76_rate_power *t = &dev->mt76.rate_power;
         u16 val, addr;
         s8 delta;
 
@@ -189,7 +189,7 @@ void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev)
         addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 8 : 0x126;
         val = mt76x02_eeprom_get(dev, addr);
         t->ht[4] = t->ht[5] = t->vht[4] = t->vht[5] = s6_to_s8(val);
-        t->ht[6] = t->vht[6] = s6_to_s8(val >> 8);
+        t->ht[6] = t->ht[7] = t->vht[6] = t->vht[7] = s6_to_s8(val >> 8);
 
         /* ht-vht mcs 1ss 0, 1, 2, 3 stbc */
         addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 14 : 0xec;
@@ -205,14 +205,15 @@ void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev)
 
         /* vht mcs 8, 9 5GHz */
         val = mt76x02_eeprom_get(dev, 0x132);
-        t->vht[7] = s6_to_s8(val);
-        t->vht[8] = s6_to_s8(val >> 8);
+        t->vht[8] = s6_to_s8(val);
+        t->vht[9] = s6_to_s8(val >> 8);
 
         delta = mt76x0_tssi_enabled(dev) ? 0 : mt76x0_get_delta(dev);
         mt76x02_add_rate_power_offset(t, delta);
 }
 
-void mt76x0_get_power_info(struct mt76x02_dev *dev, s8 *tp)
+void mt76x0_get_power_info(struct mt76x02_dev *dev,
+                           struct ieee80211_channel *chan, s8 *tp)
 {
         struct mt76x0_chan_map {
                 u8 chan;
@@ -226,7 +227,6 @@ void mt76x0_get_power_info(struct mt76x02_dev *dev, s8 *tp)
                 { 140, 26 }, { 151, 28 }, { 157, 30 }, { 161, 32 },
                 { 167, 34 }, { 171, 36 }, { 175, 38 },
         };
-        struct ieee80211_channel *chan = dev->mt76.chandef.chan;
         u8 offset, addr;
         int i, idx = 0;
         u16 data;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h
index 42b259f90b6d..7f73034a23b1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h
@@ -25,8 +25,11 @@ struct mt76x02_dev;
 
 int mt76x0_eeprom_init(struct mt76x02_dev *dev);
 void mt76x0_read_rx_gain(struct mt76x02_dev *dev);
-void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev);
-void mt76x0_get_power_info(struct mt76x02_dev *dev, s8 *tp);
+void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev,
+                                  struct ieee80211_channel *chan,
+                                  struct mt76_rate_power *t);
+void mt76x0_get_power_info(struct mt76x02_dev *dev,
+                           struct ieee80211_channel *chan, s8 *tp);
 
 static inline s8 s6_to_s8(u32 val)
 {
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
index 87b575fe1c74..a529ce111c20 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
@@ -18,6 +18,7 @@
 #include "eeprom.h"
 #include "mcu.h"
 #include "initvals.h"
+#include "../mt76x02_phy.h"
 
 static void mt76x0_vht_cap_mask(struct ieee80211_supported_band *sband)
 {
@@ -262,27 +263,24 @@ int mt76x0_init_hardware(struct mt76x02_dev *dev)
 }
 EXPORT_SYMBOL_GPL(mt76x0_init_hardware);
 
-struct mt76x02_dev *
-mt76x0_alloc_device(struct device *pdev,
-                    const struct mt76_driver_ops *drv_ops,
-                    const struct ieee80211_ops *ops)
+static void
+mt76x0_init_txpower(struct mt76x02_dev *dev,
+                    struct ieee80211_supported_band *sband)
 {
-        struct mt76x02_dev *dev;
-        struct mt76_dev *mdev;
-
-        mdev = mt76_alloc_device(sizeof(*dev), ops);
-        if (!mdev)
-                return NULL;
+        struct ieee80211_channel *chan;
+        struct mt76_rate_power t;
+        s8 tp;
+        int i;
 
-        mdev->dev = pdev;
-        mdev->drv = drv_ops;
+        for (i = 0; i < sband->n_channels; i++) {
+                chan = &sband->channels[i];
 
-        dev = container_of(mdev, struct mt76x02_dev, mt76);
-        mutex_init(&dev->phy_mutex);
+                mt76x0_get_tx_power_per_rate(dev, chan, &t);
+                mt76x0_get_power_info(dev, chan, &tp);
 
-        return dev;
+                chan->max_power = (mt76x02_get_max_rate_power(&t) + tp) / 2;
+        }
 }
-EXPORT_SYMBOL_GPL(mt76x0_alloc_device);
 
 int mt76x0_register_device(struct mt76x02_dev *dev)
 {
@@ -296,9 +294,14 @@ int mt76x0_register_device(struct mt76x02_dev *dev)
         if (ret)
                 return ret;
 
-        /* overwrite unsupported features */
-        if (dev->mt76.cap.has_5ghz)
+        if (dev->mt76.cap.has_5ghz) {
+                /* overwrite unsupported features */
                 mt76x0_vht_cap_mask(&dev->mt76.sband_5g.sband);
+                mt76x0_init_txpower(dev, &dev->mt76.sband_5g.sband);
+        }
+
+        if (dev->mt76.cap.has_2ghz)
+                mt76x0_init_txpower(dev, &dev->mt76.sband_2g.sband);
 
         mt76x02_init_debugfs(dev);
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
index 46629f61673b..51fbd75dff31 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
@@ -50,10 +50,6 @@ static inline bool is_mt7630(struct mt76x02_dev *dev)
 }
 
 /* Init */
-struct mt76x02_dev *
-mt76x0_alloc_device(struct device *pdev,
-                    const struct mt76_driver_ops *drv_ops,
-                    const struct ieee80211_ops *ops);
 int mt76x0_init_hardware(struct mt76x02_dev *dev);
 int mt76x0_register_device(struct mt76x02_dev *dev);
 void mt76x0_chip_onoff(struct mt76x02_dev *dev, bool enable, bool reset);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index 1472c8699b29..f302162036d0 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -30,7 +30,7 @@ static int mt76x0e_start(struct ieee80211_hw *hw)
         mt76x02_mac_start(dev);
         mt76x0_phy_calibrate(dev, true);
         ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mac_work,
-                                     MT_CALIBRATE_INTERVAL);
+                                     MT_MAC_WORK_INTERVAL);
         ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
                                      MT_CALIBRATE_INTERVAL);
         set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
@@ -174,6 +174,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 .sta_remove = mt76x02_sta_remove,
         };
         struct mt76x02_dev *dev;
+        struct mt76_dev *mdev;
         int ret;
 
         ret = pcim_enable_device(pdev);
@@ -190,16 +191,20 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (ret)
                 return ret;
 
-        dev = mt76x0_alloc_device(&pdev->dev, &drv_ops, &mt76x0e_ops);
-        if (!dev)
+        mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt76x0e_ops,
+                                 &drv_ops);
+        if (!mdev)
                 return -ENOMEM;
 
-        mt76_mmio_init(&dev->mt76, pcim_iomap_table(pdev)[0]);
+        dev = container_of(mdev, struct mt76x02_dev, mt76);
+        mutex_init(&dev->phy_mutex);
+
+        mt76_mmio_init(mdev, pcim_iomap_table(pdev)[0]);
 
-        dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);
-        dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);
+        mdev->rev = mt76_rr(dev, MT_ASIC_VERSION);
+        dev_info(mdev->dev, "ASIC revision: %08x\n", mdev->rev);
 
-        ret = devm_request_irq(dev->mt76.dev, pdev->irq, mt76x02_irq_handler,
+        ret = devm_request_irq(mdev->dev, pdev->irq, mt76x02_irq_handler,
                                IRQF_SHARED, KBUILD_MODNAME, dev);
         if (ret)
                 goto error;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index 1117cdc15b04..3467a32f5fda 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -847,14 +847,15 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)
         struct mt76_rate_power *t = &dev->mt76.rate_power;
         s8 info;
 
-        mt76x0_get_tx_power_per_rate(dev);
-        mt76x0_get_power_info(dev, &info);
+        mt76x0_get_tx_power_per_rate(dev, dev->mt76.chandef.chan, t);
+        mt76x0_get_power_info(dev, dev->mt76.chandef.chan, &info);
 
         mt76x02_add_rate_power_offset(t, info);
         mt76x02_limit_rate_power(t, dev->mt76.txpower_conf);
         dev->mt76.txpower_cur = mt76x02_get_max_rate_power(t);
         mt76x02_add_rate_power_offset(t, -info);
 
+        dev->target_power = info;
         mt76x02_phy_set_txpower(dev, info, info);
 }
 
@@ -1006,14 +1007,16 @@ int mt76x0_phy_set_channel(struct mt76x02_dev *dev,
 
         /* enable vco */
         mt76x0_rf_set(dev, MT_RF(0, 4), BIT(7));
-        if (scan)
+        if (scan) {
+                mt76x02_edcca_init(dev, false);
                 return 0;
+        }
 
         mt76x02_init_agc_gain(dev);
         mt76x0_phy_calibrate(dev, false);
         mt76x0_phy_set_txpower(dev);
 
-        mt76x02_edcca_init(dev);
+        mt76x02_edcca_init(dev, true);
 
         ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
                                      MT_CALIBRATE_INTERVAL);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 3987adaaf2bd..da9d05f6074d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -118,7 +118,7 @@ static int mt76x0u_start(struct ieee80211_hw *hw)
 
         mt76x0_phy_calibrate(dev, true);
         ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mac_work,
-                                     MT_CALIBRATE_INTERVAL);
+                                     MT_MAC_WORK_INTERVAL);
         ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
                                      MT_CALIBRATE_INTERVAL);
         set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
@@ -206,7 +206,7 @@ static int mt76x0u_register_device(struct mt76x02_dev *dev)
                 goto out_err;
 
         /* check hw sg support in order to enable AMSDU */
-        if (mt76u_check_sg(&dev->mt76))
+        if (dev->mt76.usb.sg_en)
                 hw->max_tx_fragments = MT_SG_MAX_SIZE;
         else
                 hw->max_tx_fragments = 1;
@@ -233,14 +233,18 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,
         };
         struct usb_device *usb_dev = interface_to_usbdev(usb_intf);
         struct mt76x02_dev *dev;
+        struct mt76_dev *mdev;
         u32 asic_rev, mac_rev;
         int ret;
 
-        dev = mt76x0_alloc_device(&usb_intf->dev, &drv_ops,
-                                  &mt76x0u_ops);
-        if (!dev)
+        mdev = mt76_alloc_device(&usb_intf->dev, sizeof(*dev), &mt76x0u_ops,
+                                 &drv_ops);
+        if (!mdev)
                 return -ENOMEM;
 
+        dev = container_of(mdev, struct mt76x02_dev, mt76);
+        mutex_init(&dev->phy_mutex);
+
         /* Quirk for Archer T1U */
         if (id->driver_info)
                 dev->no_2ghz = true;
@@ -250,27 +254,27 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,
 
         usb_set_intfdata(usb_intf, dev);
 
-        mt76x02u_init_mcu(&dev->mt76);
-        ret = mt76u_init(&dev->mt76, usb_intf);
+        mt76x02u_init_mcu(mdev);
+        ret = mt76u_init(mdev, usb_intf);
         if (ret)
                 goto err;
 
         /* Disable the HW, otherwise MCU fail to initalize on hot reboot */
         mt76x0_chip_onoff(dev, false, false);
 
-        if (!mt76x02_wait_for_mac(&dev->mt76)) {
+        if (!mt76x02_wait_for_mac(mdev)) {
                 ret = -ETIMEDOUT;
                 goto err;
         }
 
         asic_rev = mt76_rr(dev, MT_ASIC_VERSION);
         mac_rev = mt76_rr(dev, MT_MAC_CSR0);
-        dev_info(dev->mt76.dev, "ASIC revision: %08x MAC revision: %08x\n",
+        dev_info(mdev->dev, "ASIC revision: %08x MAC revision: %08x\n",
                  asic_rev, mac_rev);
 
         /* Note: vendor driver skips this check for MT76X0U */
         if (!(mt76_rr(dev, MT_EFUSE_CTRL) & MT_EFUSE_CTRL_SEL))
-                dev_warn(dev->mt76.dev, "Warning: eFUSE not present\n");
+                dev_warn(mdev->dev, "Warning: eFUSE not present\n");
 
         ret = mt76x0u_register_device(dev);
         if (ret < 0)
@@ -282,7 +286,7 @@ err:
         usb_set_intfdata(usb_intf, NULL);
         usb_put_dev(interface_to_usbdev(usb_intf));
 
-        ieee80211_free_hw(dev->mt76.hw);
+        ieee80211_free_hw(mdev->hw);
         return ret;
 }
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
index f391d2d21fbc..4a282761ca58 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
@@ -140,12 +140,6 @@ static int mt76x0u_load_firmware(struct mt76x02_dev *dev)
                  FIELD_PREP(MT_USB_DMA_CFG_RX_BULK_AGG_TOUT, 0x20));
         mt76x02u_mcu_fw_reset(dev);
         usleep_range(5000, 6000);
-/*
-        mt76x0_rmw(dev, MT_PBF_CFG, 0, (MT_PBF_CFG_TX0Q_EN |
-                                         MT_PBF_CFG_TX1Q_EN |
-                                         MT_PBF_CFG_TX2Q_EN |
-                                         MT_PBF_CFG_TX3Q_EN));
-*/
 
         mt76_wr(dev, MT_FCE_PSE_CTRL, 1);
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 6d96766a6ed3..3464b4ca2ea8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -27,6 +27,7 @@
 #include "mt76x02_dma.h"
 
 #define MT_CALIBRATE_INTERVAL   HZ
+#define MT_MAC_WORK_INTERVAL    (HZ / 10)
 
 #define MT_WATCHDOG_TIME        (HZ / 10)
 #define MT_TX_HANG_TH           10
@@ -73,6 +74,8 @@ struct mt76x02_dev {
 
         struct mutex phy_mutex;
 
+        u16 vif_mask;
+
         u8 txdone_seq;
         DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status);
 
@@ -114,6 +117,7 @@ struct mt76x02_dev {
         bool ed_monitor;
         u8 ed_trigger;
         u8 ed_silent;
+        ktime_t ed_time;
 };
 
 extern struct ieee80211_rate mt76x02_rates[12];
@@ -128,8 +132,7 @@ void mt76x02_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
                         struct ieee80211_sta *sta);
 
 void mt76x02_config_mac_addr_list(struct mt76x02_dev *dev);
-void mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,
-                      unsigned int idx);
+
 int mt76x02_add_interface(struct ieee80211_hw *hw,
                          struct ieee80211_vif *vif);
 void mt76x02_remove_interface(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
index 19fdcab746a0..e4649103efd4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
@@ -886,7 +886,7 @@ mt76x02_dfs_set_domain(struct mt76x02_dev *dev,
                 tasklet_disable(&dfs_pd->dfs_tasklet);
 
                 dev->ed_monitor = region == NL80211_DFS_ETSI;
-                mt76x02_edcca_init(dev);
+                mt76x02_edcca_init(dev, true);
 
                 dfs_pd->region = region;
                 mt76x02_dfs_init_params(dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 63fa27d2c404..be2979f34f31 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -291,6 +291,13 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
 
         memset(txwi, 0, sizeof(*txwi));
 
+        if (!info->control.hw_key && wcid && wcid->hw_key_idx != 0xff &&
+            ieee80211_has_protected(hdr->frame_control)) {
+                wcid = NULL;
+                ieee80211_get_tx_rates(info->control.vif, sta, skb,
+                                       info->control.rates, 1);
+        }
+
         if (wcid)
                 txwi->wcid = wcid->idx;
         else
@@ -307,7 +314,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
                 ccmp_pn[6] = pn >> 32;
                 ccmp_pn[7] = pn >> 40;
                 txwi->iv = *((__le32 *)&ccmp_pn[0]);
-                txwi->eiv = *((__le32 *)&ccmp_pn[1]);
+                txwi->eiv = *((__le32 *)&ccmp_pn[4]);
         }
 
         spin_lock_bh(&dev->mt76.lock);
@@ -548,8 +555,11 @@ mt76x02_mac_process_rate(struct mt76x02_dev *dev,
         return 0;
 }
 
-void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr)
+void mt76x02_mac_setaddr(struct mt76x02_dev *dev, const u8 *addr)
 {
+        static const u8 null_addr[ETH_ALEN] = {};
+        int i;
+
         ether_addr_copy(dev->mt76.macaddr, addr);
 
         if (!is_valid_ether_addr(dev->mt76.macaddr)) {
@@ -563,6 +573,16 @@ void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr)
         mt76_wr(dev, MT_MAC_ADDR_DW1,
                 get_unaligned_le16(dev->mt76.macaddr + 4) |
                 FIELD_PREP(MT_MAC_ADDR_DW1_U2ME_MASK, 0xff));
+
+        mt76_wr(dev, MT_MAC_BSSID_DW0,
+                get_unaligned_le32(dev->mt76.macaddr));
+        mt76_wr(dev, MT_MAC_BSSID_DW1,
+                get_unaligned_le16(dev->mt76.macaddr + 4) |
+                FIELD_PREP(MT_MAC_BSSID_DW1_MBSS_MODE, 3) | /* 8 APs + 8 STAs */
+                MT_MAC_BSSID_DW1_MBSS_LOCAL_BIT);
+
+        for (i = 0; i < 16; i++)
+                mt76x02_mac_set_bssid(dev, i, null_addr);
 }
 EXPORT_SYMBOL_GPL(mt76x02_mac_setaddr);
 
@@ -588,7 +608,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
         u16 rate = le16_to_cpu(rxwi->rate);
         u16 tid_sn = le16_to_cpu(rxwi->tid_sn);
         bool unicast = rxwi->rxinfo & cpu_to_le32(MT_RXINFO_UNICAST);
-        int i, pad_len = 0, nstreams = dev->mt76.chainmask & 0xf;
+        int pad_len = 0, nstreams = dev->mt76.chainmask & 0xf;
         s8 signal;
         u8 pn_len;
         u8 wcid;
@@ -648,12 +668,13 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
 
         status->chains = BIT(0);
         signal = mt76x02_mac_get_rssi(dev, rxwi->rssi[0], 0);
-        for (i = 0; i < nstreams; i++) {
-                status->chains |= BIT(i);
-                status->chain_signal[i] = mt76x02_mac_get_rssi(dev,
-                                                               rxwi->rssi[i],
-                                                               i);
-                signal = max_t(s8, signal, status->chain_signal[i]);
+        status->chain_signal[0] = signal;
+        if (nstreams > 1) {
+                status->chains |= BIT(1);
+                status->chain_signal[1] = mt76x02_mac_get_rssi(dev,
+                                                               rxwi->rssi[1],
+                                                               1);
+                signal = max_t(s8, signal, status->chain_signal[1]);
         }
         status->signal = signal;
         status->freq = dev->mt76.chandef.chan->center_freq;
@@ -871,12 +892,12 @@ mt76x02_edcca_tx_enable(struct mt76x02_dev *dev, bool enable)
         dev->ed_tx_blocked = !enable;
 }
 
-void mt76x02_edcca_init(struct mt76x02_dev *dev)
+void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable)
 {
         dev->ed_trigger = 0;
         dev->ed_silent = 0;
 
-        if (dev->ed_monitor) {
+        if (dev->ed_monitor && enable) {
                 struct ieee80211_channel *chan = dev->mt76.chandef.chan;
                 u8 ed_th = chan->band == NL80211_BAND_5GHZ ? 0x0e : 0x20;
 
@@ -899,17 +920,27 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev)
                 }
         }
         mt76x02_edcca_tx_enable(dev, true);
+
+        /* clear previous CCA timer value */
+        mt76_rr(dev, MT_ED_CCA_TIMER);
+        dev->ed_time = ktime_get_boottime();
 }
 EXPORT_SYMBOL_GPL(mt76x02_edcca_init);
 
-#define MT_EDCCA_TH             90
+#define MT_EDCCA_TH             92
 #define MT_EDCCA_BLOCK_TH       2
 static void mt76x02_edcca_check(struct mt76x02_dev *dev)
 {
-        u32 val, busy;
+        ktime_t cur_time;
+        u32 active, val, busy;
 
+        cur_time = ktime_get_boottime();
         val = mt76_rr(dev, MT_ED_CCA_TIMER);
-        busy = (val * 100) / jiffies_to_usecs(MT_CALIBRATE_INTERVAL);
+
+        active = ktime_to_us(ktime_sub(cur_time, dev->ed_time));
+        dev->ed_time = cur_time;
+
+        busy = (val * 100) / active;
         busy = min_t(u32, busy, 100);
 
         if (busy > MT_EDCCA_TH) {
@@ -955,7 +986,7 @@ void mt76x02_mac_work(struct work_struct *work)
         mt76_tx_status_check(&dev->mt76, NULL, false);
 
         ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
-                                     MT_CALIBRATE_INTERVAL);
+                                     MT_MAC_WORK_INTERVAL);
 }
 
 void mt76x02_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr)
@@ -1047,8 +1078,9 @@ int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,
         return 0;
 }
 
-void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
-                                   u8 vif_idx, bool val)
+static void
+__mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx,
+                                bool val, struct sk_buff *skb)
 {
         u8 old_mask = dev->beacon_mask;
         bool en;
@@ -1056,6 +1088,8 @@ void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
 
         if (val) {
                 dev->beacon_mask |= BIT(vif_idx);
+                if (skb)
+                        mt76x02_mac_set_beacon(dev, vif_idx, skb);
         } else {
                 dev->beacon_mask &= ~BIT(vif_idx);
                 mt76x02_mac_set_beacon(dev, vif_idx, NULL);
@@ -1066,14 +1100,34 @@ void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
 
         en = dev->beacon_mask;
 
-        mt76_rmw_field(dev, MT_INT_TIMER_EN, MT_INT_TIMER_EN_PRE_TBTT_EN, en);
         reg = MT_BEACON_TIME_CFG_BEACON_TX |
               MT_BEACON_TIME_CFG_TBTT_EN |
               MT_BEACON_TIME_CFG_TIMER_EN;
         mt76_rmw(dev, MT_BEACON_TIME_CFG, reg, reg * en);
 
+        if (mt76_is_usb(dev))
+                return;
+
+        mt76_rmw_field(dev, MT_INT_TIMER_EN, MT_INT_TIMER_EN_PRE_TBTT_EN, en);
         if (en)
                 mt76x02_irq_enable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);
         else
                 mt76x02_irq_disable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);
 }
+
+void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
+                                   struct ieee80211_vif *vif, bool val)
+{
+        u8 vif_idx = ((struct mt76x02_vif *)vif->drv_priv)->idx;
+        struct sk_buff *skb = NULL;
+
+        if (mt76_is_mmio(dev))
+                tasklet_disable(&dev->pre_tbtt_tasklet);
+        else if (val)
+                skb = ieee80211_beacon_get(mt76_hw(dev), vif);
+
+        __mt76x02_mac_set_beacon_enable(dev, vif_idx, val, skb);
+
+        if (mt76_is_mmio(dev))
+                tasklet_enable(&dev->pre_tbtt_tasklet);
+}
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
index 940c07f665cd..6b1f25d2f64c 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
@@ -191,7 +191,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
 void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, bool legacy_prot,
                                    int ht_mode);
 void mt76x02_mac_set_rts_thresh(struct mt76x02_dev *dev, u32 val);
-void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr);
+void mt76x02_mac_setaddr(struct mt76x02_dev *dev, const u8 *addr);
 void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
                             struct sk_buff *skb, struct mt76_wcid *wcid,
                             struct ieee80211_sta *sta, int len);
@@ -204,8 +204,8 @@ void mt76x02_mac_work(struct work_struct *work);
 void mt76x02_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr);
 int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,
                            struct sk_buff *skb);
-void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx,
-                                   bool val);
+void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
+                                   struct ieee80211_vif *vif, bool val);
 
-void mt76x02_edcca_init(struct mt76x02_dev *dev);
+void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable);
 #endif
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c
index b7f4edb729e3..4752c104abf3 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c
@@ -21,70 +21,13 @@
 
 #include "mt76x02_mcu.h"
 
-static struct sk_buff *mt76x02_mcu_msg_alloc(const void *data, int len)
-{
-        struct sk_buff *skb;
-
-        skb = alloc_skb(len, GFP_KERNEL);
-        if (!skb)
-                return NULL;
-        memcpy(skb_put(skb, len), data, len);
-
-        return skb;
-}
-
-static struct sk_buff *
-mt76x02_mcu_get_response(struct mt76x02_dev *dev, unsigned long expires)
-{
-        unsigned long timeout;
-
-        if (!time_is_after_jiffies(expires))
-                return NULL;
-
-        timeout = expires - jiffies;
-        wait_event_timeout(dev->mt76.mmio.mcu.wait,
-                           !skb_queue_empty(&dev->mt76.mmio.mcu.res_q),
-                           timeout);
-        return skb_dequeue(&dev->mt76.mmio.mcu.res_q);
-}
-
-static int
-mt76x02_tx_queue_mcu(struct mt76x02_dev *dev, enum mt76_txq_id qid,
-                     struct sk_buff *skb, int cmd, int seq)
-{
-        struct mt76_queue *q = &dev->mt76.q_tx[qid];
-        struct mt76_queue_buf buf;
-        dma_addr_t addr;
-        u32 tx_info;
-
-        tx_info = MT_MCU_MSG_TYPE_CMD |
-                  FIELD_PREP(MT_MCU_MSG_CMD_TYPE, cmd) |
-                  FIELD_PREP(MT_MCU_MSG_CMD_SEQ, seq) |
-                  FIELD_PREP(MT_MCU_MSG_PORT, CPU_TX_PORT) |
-                  FIELD_PREP(MT_MCU_MSG_LEN, skb->len);
-
-        addr = dma_map_single(dev->mt76.dev, skb->data, skb->len,
-                              DMA_TO_DEVICE);
-        if (dma_mapping_error(dev->mt76.dev, addr))
-                return -ENOMEM;
-
-        buf.addr = addr;
-        buf.len = skb->len;
-
-        spin_lock_bh(&q->lock);
-        mt76_queue_add_buf(dev, q, &buf, 1, tx_info, skb, NULL);
-        mt76_queue_kick(dev, q);
-        spin_unlock_bh(&q->lock);
-
-        return 0;
-}
-
 int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,
                          int len, bool wait_resp)
 {
         struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
         unsigned long expires = jiffies + HZ;
         struct sk_buff *skb;
+        u32 tx_info;
         int ret;
         u8 seq;
 
@@ -98,7 +41,13 @@ int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,
         if (!seq)
                 seq = ++mdev->mmio.mcu.msg_seq & 0xf;
 
-        ret = mt76x02_tx_queue_mcu(dev, MT_TXQ_MCU, skb, cmd, seq);
+        tx_info = MT_MCU_MSG_TYPE_CMD |
+                  FIELD_PREP(MT_MCU_MSG_CMD_TYPE, cmd) |
+                  FIELD_PREP(MT_MCU_MSG_CMD_SEQ, seq) |
+                  FIELD_PREP(MT_MCU_MSG_PORT, CPU_TX_PORT) |
+                  FIELD_PREP(MT_MCU_MSG_LEN, skb->len);
+
+        ret = mt76_tx_queue_skb_raw(dev, MT_TXQ_MCU, skb, tx_info);
         if (ret)
                 goto out;
 
@@ -106,7 +55,7 @@ int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,
                 u32 *rxfce;
                 bool check_seq = false;
 
-                skb = mt76x02_mcu_get_response(dev, expires);
+                skb = mt76_mcu_get_response(&dev->mt76, expires);
                 if (!skb) {
                         dev_err(mdev->dev,
                                 "MCU message %d (seq %d) timed out\n", cmd,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h
index 7e4004120102..a7b0d3e5df1d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h
@@ -96,6 +96,12 @@ struct mt76x02_patch_header {
         u8 pad[2];
 };
 
+static inline struct sk_buff *
+mt76x02_mcu_msg_alloc(const void *data, int len)
+{
+        return mt76_mcu_msg_alloc(data, 0, len, 0);
+}
+
 int mt76x02_mcu_cleanup(struct mt76x02_dev *dev);
 int mt76x02_mcu_calibrate(struct mt76x02_dev *dev, int type, u32 param);
 int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
index a5413a309a0a..94f47248c59f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
@@ -22,7 +22,6 @@
 void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
                 struct sk_buff *skb)
 {
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct mt76x02_dev *dev = hw->priv;
         struct ieee80211_vif *vif = info->control.vif;
@@ -33,13 +32,7 @@ void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
 
                 msta = (struct mt76x02_sta *)control->sta->drv_priv;
                 wcid = &msta->wcid;
-                /* sw encrypted frames */
-                if (!info->control.hw_key && wcid->hw_key_idx != 0xff &&
-                    ieee80211_has_protected(hdr->frame_control))
-                        control->sta = NULL;
-        }
-
-        if (vif && !control->sta) {
+        } else if (vif) {
                 struct mt76x02_vif *mvif;
 
                 mvif = (struct mt76x02_vif *)vif->drv_priv;
@@ -58,8 +51,7 @@ void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
 
         if (q == MT_RXQ_MCU) {
                 /* this is used just by mmio code */
-                skb_queue_tail(&mdev->mmio.mcu.res_q, skb);
-                wake_up(&mdev->mmio.mcu.wait);
+                mt76_mcu_rx_event(&dev->mt76, skb);
                 return;
         }
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
index 098d05e109e7..43f07461c8d3 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
@@ -49,7 +49,12 @@ int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)
                FIELD_PREP(MT_TXD_INFO_DPORT, port) | flags;
         put_unaligned_le32(info, skb_push(skb, sizeof(info)));
 
+        /* Add zero pad of 4 - 7 bytes */
         pad = round_up(skb->len, 4) + 4 - skb->len;
+
+        /* First packet of a A-MSDU burst keeps track of the whole burst
+         * length, need to update lenght of it and the last packet.
+         */
         skb_walk_frags(skb, iter) {
                 last = iter;
                 if (!iter->next) {
@@ -59,11 +64,10 @@ int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)
                 }
         }
 
-        if (unlikely(pad)) {
-                if (skb_pad(last, pad))
-                        return -ENOMEM;
-                __skb_put(last, pad);
-        }
+        if (skb_pad(last, pad))
+                return -ENOMEM;
+        __skb_put(last, pad);
+
         return 0;
 }
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c
index 6db789f90269..e469e383cb88 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c
@@ -28,21 +28,6 @@
 
 #define MT_TX_CPU_FROM_FCE_CPU_DESC_IDX 0x09a8
 
-static struct sk_buff *
-mt76x02u_mcu_msg_alloc(const void *data, int len)
-{
-        struct sk_buff *skb;
-
-        skb = alloc_skb(MT_CMD_HDR_LEN + len + 8, GFP_KERNEL);
-        if (!skb)
-                return NULL;
-
-        skb_reserve(skb, MT_CMD_HDR_LEN);
-        skb_put_data(skb, data, len);
-
-        return skb;
-}
-
 static void
 mt76x02u_multiple_mcu_reads(struct mt76_dev *dev, u8 *data, int len)
 {
@@ -78,9 +63,9 @@ static int mt76x02u_mcu_wait_resp(struct mt76_dev *dev, u8 seq)
         struct mt76_usb *usb = &dev->usb;
         struct mt76u_buf *buf = &usb->mcu.res;
         struct urb *urb = buf->urb;
+        u8 *data = buf->buf;
         int i, ret;
         u32 rxfce;
-        u8 *data;
 
         for (i = 0; i < 5; i++) {
                 if (!wait_for_completion_timeout(&usb->mcu.cmpl,
@@ -90,7 +75,6 @@ static int mt76x02u_mcu_wait_resp(struct mt76_dev *dev, u8 seq)
                 if (urb->status)
                         return -EIO;
 
-                data = sg_virt(&urb->sg[0]);
                 if (usb->mcu.rp)
                         mt76x02u_multiple_mcu_reads(dev, data + 4,
                                                     urb->actual_length - 8);
@@ -121,18 +105,14 @@ static int
 __mt76x02u_mcu_send_msg(struct mt76_dev *dev, struct sk_buff *skb,
                         int cmd, bool wait_resp)
 {
-        struct usb_interface *intf = to_usb_interface(dev->dev);
-        struct usb_device *udev = interface_to_usbdev(intf);
         struct mt76_usb *usb = &dev->usb;
-        unsigned int pipe;
-        int ret, sent;
+        int ret;
         u8 seq = 0;
         u32 info;
 
         if (test_bit(MT76_REMOVED, &dev->state))
                 return 0;
 
-        pipe = usb_sndbulkpipe(udev, usb->out_ep[MT_EP_OUT_INBAND_CMD]);
         if (wait_resp) {
                 seq = ++usb->mcu.msg_seq & 0xf;
                 if (!seq)
@@ -146,7 +126,7 @@ __mt76x02u_mcu_send_msg(struct mt76_dev *dev, struct sk_buff *skb,
         if (ret)
                 return ret;
 
-        ret = usb_bulk_msg(udev, pipe, skb->data, skb->len, &sent, 500);
+        ret = mt76u_bulk_msg(dev, skb->data, skb->len, 500);
         if (ret)
                 return ret;
 
@@ -166,7 +146,7 @@ mt76x02u_mcu_send_msg(struct mt76_dev *dev, int cmd, const void *data,
         struct sk_buff *skb;
         int err;
 
-        skb = mt76x02u_mcu_msg_alloc(data, len);
+        skb = mt76_mcu_msg_alloc(data, MT_CMD_HDR_LEN, len, 8);
         if (!skb)
                 return -ENOMEM;
 
@@ -268,14 +248,12 @@ void mt76x02u_mcu_fw_reset(struct mt76x02_dev *dev)
 EXPORT_SYMBOL_GPL(mt76x02u_mcu_fw_reset);
 
 static int
-__mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, struct mt76u_buf *buf,
+__mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, u8 *data,
                             const void *fw_data, int len, u32 dst_addr)
 {
-        u8 *data = sg_virt(&buf->urb->sg[0]);
-        DECLARE_COMPLETION_ONSTACK(cmpl);
         __le32 info;
         u32 val;
-        int err;
+        int err, data_len;
 
         info = cpu_to_le32(FIELD_PREP(MT_MCU_MSG_PORT, CPU_TX_PORT) |
                            FIELD_PREP(MT_MCU_MSG_LEN, len) |
@@ -291,25 +269,12 @@ __mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, struct mt76u_buf *buf,
         mt76u_single_wr(&dev->mt76, MT_VEND_WRITE_FCE,
                         MT_FCE_DMA_LEN, len << 16);
 
-        buf->len = MT_CMD_HDR_LEN + len + sizeof(info);
-        err = mt76u_submit_buf(&dev->mt76, USB_DIR_OUT,
-                               MT_EP_OUT_INBAND_CMD,
-                               buf, GFP_KERNEL,
-                               mt76u_mcu_complete_urb, &cmpl);
-        if (err < 0)
-                return err;
-
-        if (!wait_for_completion_timeout(&cmpl,
-                                         msecs_to_jiffies(1000))) {
-                dev_err(dev->mt76.dev, "firmware upload timed out\n");
-                usb_kill_urb(buf->urb);
-                return -ETIMEDOUT;
-        }
+        data_len = MT_CMD_HDR_LEN + len + sizeof(info);
 
-        if (mt76u_urb_error(buf->urb)) {
-                dev_err(dev->mt76.dev, "firmware upload failed: %d\n",
-                        buf->urb->status);
-                return buf->urb->status;
+        err = mt76u_bulk_msg(&dev->mt76, data, data_len, 1000);
+        if (err) {
+                dev_err(dev->mt76.dev, "firmware upload failed: %d\n", err);
+                return err;
         }
 
         val = mt76_rr(dev, MT_TX_CPU_FROM_FCE_CPU_DESC_IDX);
@@ -322,17 +287,16 @@ __mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, struct mt76u_buf *buf,
 int mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, const void *data,
                               int data_len, u32 max_payload, u32 offset)
 {
-        int err, len, pos = 0, max_len = max_payload - 8;
-        struct mt76u_buf buf;
+        int len, err = 0, pos = 0, max_len = max_payload - 8;
+        u8 *buf;
 
-        err = mt76u_buf_alloc(&dev->mt76, &buf, 1, max_payload, max_payload,
-                              GFP_KERNEL);
-        if (err < 0)
-                return err;
+        buf = kmalloc(max_payload, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
 
         while (data_len > 0) {
                 len = min_t(int, data_len, max_len);
-                err = __mt76x02u_mcu_fw_send_data(dev, &buf, data + pos,
+                err = __mt76x02u_mcu_fw_send_data(dev, buf, data + pos,
                                                   len, offset + pos);
                 if (err < 0)
                         break;
@@ -341,7 +305,7 @@ int mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, const void *data,
                 pos += len;
                 usleep_range(5000, 10000);
         }
-        mt76u_buf_free(&buf);
+        kfree(buf);
 
         return err;
 }
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 062614ad0d51..11b5f664f5b1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -140,10 +140,16 @@ void mt76x02_init_device(struct mt76x02_dev *dev)
         hw->max_rate_tries = 1;
         hw->extra_tx_headroom = 2;
 
+        wiphy->interface_modes =
+                BIT(NL80211_IFTYPE_STATION) |
+#ifdef CONFIG_MAC80211_MESH
+                BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
+                BIT(NL80211_IFTYPE_ADHOC);
+
         if (mt76_is_usb(dev)) {
                 hw->extra_tx_headroom += sizeof(struct mt76x02_txwi) +
                                          MT_DMA_HDR_LEN;
-                wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
         } else {
                 INIT_DELAYED_WORK(&dev->wdt_work, mt76x02_wdt_work);
 
@@ -152,18 +158,9 @@ void mt76x02_init_device(struct mt76x02_dev *dev)
                 wiphy->reg_notifier = mt76x02_regd_notifier;
                 wiphy->iface_combinations = mt76x02_if_comb;
                 wiphy->n_iface_combinations = ARRAY_SIZE(mt76x02_if_comb);
-                wiphy->interface_modes =
-                        BIT(NL80211_IFTYPE_STATION) |
-                        BIT(NL80211_IFTYPE_AP) |
-#ifdef CONFIG_MAC80211_MESH
-                        BIT(NL80211_IFTYPE_MESH_POINT) |
-#endif
-                        BIT(NL80211_IFTYPE_ADHOC);
-
+                wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP);
                 wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
 
-                wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);
-
                 /* init led callbacks */
                 if (IS_ENABLED(CONFIG_MT76_LEDS)) {
                         dev->mt76.led_cdev.brightness_set =
@@ -172,6 +169,8 @@ void mt76x02_init_device(struct mt76x02_dev *dev)
                 }
         }
 
+        wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);
+
         hw->sta_data_size = sizeof(struct mt76x02_sta);
         hw->vif_data_size = sizeof(struct mt76x02_vif);
 
@@ -268,8 +267,9 @@ void mt76x02_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
 }
 EXPORT_SYMBOL_GPL(mt76x02_sta_remove);
 
-void mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,
-                      unsigned int idx)
+static void
+mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,
+                 unsigned int idx)
 {
         struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
         struct mt76_txq *mtxq;
@@ -282,7 +282,6 @@ void mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,
 
         mt76_txq_init(&dev->mt76, vif->txq);
 }
-EXPORT_SYMBOL_GPL(mt76x02_vif_init);
 
 int
 mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
@@ -309,6 +308,15 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
         if (vif->type == NL80211_IFTYPE_STATION)
                 idx += 8;
 
+        if (dev->vif_mask & BIT(idx))
+                return -EBUSY;
+
+        /* Allow to change address in HW if we create first interface. */
+        if (!dev->vif_mask && !ether_addr_equal(dev->mt76.macaddr, vif->addr))
+                mt76x02_mac_setaddr(dev, vif->addr);
+
+        dev->vif_mask |= BIT(idx);
+
         mt76x02_vif_init(dev, vif, idx);
         return 0;
 }
@@ -318,8 +326,10 @@ void mt76x02_remove_interface(struct ieee80211_hw *hw,
                               struct ieee80211_vif *vif)
 {
         struct mt76x02_dev *dev = hw->priv;
+        struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
 
         mt76_txq_remove(&dev->mt76, vif->txq);
+        dev->vif_mask &= ~BIT(mvif->idx);
 }
 EXPORT_SYMBOL_GPL(mt76x02_remove_interface);
 
@@ -421,7 +431,7 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         } else {
                 if (idx == wcid->hw_key_idx) {
                         wcid->hw_key_idx = -1;
-                        wcid->sw_iv = true;
+                        wcid->sw_iv = false;
                 }
 
                 key = NULL;
@@ -657,29 +667,26 @@ static void mt76x02_set_beacon_offsets(struct mt76x02_dev *dev)
 
 void mt76x02_init_beacon_config(struct mt76x02_dev *dev)
 {
-        static const u8 null_addr[ETH_ALEN] = {};
         int i;
 
-        mt76_wr(dev, MT_MAC_BSSID_DW0,
-                get_unaligned_le32(dev->mt76.macaddr));
-        mt76_wr(dev, MT_MAC_BSSID_DW1,
-                get_unaligned_le16(dev->mt76.macaddr + 4) |
-                FIELD_PREP(MT_MAC_BSSID_DW1_MBSS_MODE, 3) | /* 8 beacons */
-                MT_MAC_BSSID_DW1_MBSS_LOCAL_BIT);
-
-        /* Fire a pre-TBTT interrupt 8 ms before TBTT */
-        mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_PRE_TBTT,
-                       8 << 4);
-        mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_GP_TIMER,
-                       MT_DFS_GP_INTERVAL);
-        mt76_wr(dev, MT_INT_TIMER_EN, 0);
+        if (mt76_is_mmio(dev)) {
+                /* Fire a pre-TBTT interrupt 8 ms before TBTT */
+                mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_PRE_TBTT,
+                               8 << 4);
+                mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_GP_TIMER,
+                               MT_DFS_GP_INTERVAL);
+                mt76_wr(dev, MT_INT_TIMER_EN, 0);
+        }
 
+        mt76_clear(dev, MT_BEACON_TIME_CFG, (MT_BEACON_TIME_CFG_TIMER_EN |
+                                             MT_BEACON_TIME_CFG_SYNC_MODE |
+                                             MT_BEACON_TIME_CFG_TBTT_EN |
+                                             MT_BEACON_TIME_CFG_BEACON_TX));
         mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xffff);
 
-        for (i = 0; i < 8; i++) {
-                mt76x02_mac_set_bssid(dev, i, null_addr);
+        for (i = 0; i < 8; i++)
                 mt76x02_mac_set_beacon(dev, i, NULL);
-        }
+
         mt76x02_set_beacon_offsets(dev);
 }
 EXPORT_SYMBOL_GPL(mt76x02_init_beacon_config);
@@ -697,12 +704,8 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw,
         if (changed & BSS_CHANGED_BSSID)
                 mt76x02_mac_set_bssid(dev, mvif->idx, info->bssid);
 
-        if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                tasklet_disable(&dev->pre_tbtt_tasklet);
-                mt76x02_mac_set_beacon_enable(dev, mvif->idx,
-                                              info->enable_beacon);
-                tasklet_enable(&dev->pre_tbtt_tasklet);
-        }
+        if (changed & BSS_CHANGED_BEACON_ENABLED)
+                mt76x02_mac_set_beacon_enable(dev, vif, info->enable_beacon);
 
         if (changed & BSS_CHANGED_HT || changed & BSS_CHANGED_ERP_CTS_PROT)
                 mt76x02_mac_set_tx_protection(dev, info->use_cts_prot,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
index 28ec19acf9db..6c619f1c65c9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
@@ -49,7 +49,6 @@ static inline bool mt76x2_channel_silent(struct mt76x02_dev *dev)
 
 extern const struct ieee80211_ops mt76x2_ops;
 
-struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev);
 int mt76x2_register_device(struct mt76x02_dev *dev);
 
 void mt76x2_phy_power_on(struct mt76x02_dev *dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h
index 0b0075411b34..787cdfdf5db5 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h
@@ -29,7 +29,6 @@
 
 extern const struct ieee80211_ops mt76x2u_ops;
 
-struct mt76x02_dev *mt76x2u_alloc_device(struct device *pdev);
 int mt76x2u_register_device(struct mt76x02_dev *dev);
 int mt76x2u_init_hardware(struct mt76x02_dev *dev);
 void mt76x2u_cleanup(struct mt76x02_dev *dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
index 92432fe97312..6274655e1f7e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
@@ -30,7 +30,19 @@ static const struct pci_device_id mt76pci_device_table[] = {
 static int
 mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
+        static const struct mt76_driver_ops drv_ops = {
+                .txwi_size = sizeof(struct mt76x02_txwi),
+                .update_survey = mt76x02_update_channel,
+                .tx_prepare_skb = mt76x02_tx_prepare_skb,
+                .tx_complete_skb = mt76x02_tx_complete_skb,
+                .rx_skb = mt76x02_queue_rx_skb,
+                .rx_poll_complete = mt76x02_rx_poll_complete,
+                .sta_ps = mt76x02_sta_ps,
+                .sta_add = mt76x02_sta_add,
+                .sta_remove = mt76x02_sta_remove,
+        };
         struct mt76x02_dev *dev;
+        struct mt76_dev *mdev;
         int ret;
 
         ret = pcim_enable_device(pdev);
@@ -47,17 +59,19 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (ret)
                 return ret;
 
-        dev = mt76x2_alloc_device(&pdev->dev);
-        if (!dev)
+        mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt76x2_ops,
+                                 &drv_ops);
+        if (!mdev)
                 return -ENOMEM;
 
-        mt76_mmio_init(&dev->mt76, pcim_iomap_table(pdev)[0]);
+        dev = container_of(mdev, struct mt76x02_dev, mt76);
+        mt76_mmio_init(mdev, pcim_iomap_table(pdev)[0]);
         mt76x2_reset_wlan(dev, false);
 
-        dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);
-        dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);
+        mdev->rev = mt76_rr(dev, MT_ASIC_VERSION);
+        dev_info(mdev->dev, "ASIC revision: %08x\n", mdev->rev);
 
-        ret = devm_request_irq(dev->mt76.dev, pdev->irq, mt76x02_irq_handler,
+        ret = devm_request_irq(mdev->dev, pdev->irq, mt76x02_irq_handler,
                                IRQF_SHARED, KBUILD_MODNAME, dev);
         if (ret)
                 goto error;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 4347d5e7a915..d4e3d7c11d74 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -119,9 +119,7 @@ static int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)
         mt76_wr(dev, MT_MCU_CLOCK_CTL, 0x1401);
         mt76_clear(dev, MT_FCE_L2_STUFF, MT_FCE_L2_STUFF_WR_MPDU_LEN_EN);
 
-        mt76_wr(dev, MT_MAC_ADDR_DW0, get_unaligned_le32(macaddr));
-        mt76_wr(dev, MT_MAC_ADDR_DW1, get_unaligned_le16(macaddr + 4));
-
+        mt76x02_mac_setaddr(dev, macaddr);
         mt76x02_init_beacon_config(dev);
         if (!hard)
                 return 0;
@@ -315,33 +313,6 @@ void mt76x2_cleanup(struct mt76x02_dev *dev)
         mt76x02_mcu_cleanup(dev);
 }
 
-struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev)
-{
-        static const struct mt76_driver_ops drv_ops = {
-                .txwi_size = sizeof(struct mt76x02_txwi),
-                .update_survey = mt76x02_update_channel,
-                .tx_prepare_skb = mt76x02_tx_prepare_skb,
-                .tx_complete_skb = mt76x02_tx_complete_skb,
-                .rx_skb = mt76x02_queue_rx_skb,
-                .rx_poll_complete = mt76x02_rx_poll_complete,
-                .sta_ps = mt76x02_sta_ps,
-                .sta_add = mt76x02_sta_add,
-                .sta_remove = mt76x02_sta_remove,
-        };
-        struct mt76x02_dev *dev;
-        struct mt76_dev *mdev;
-
-        mdev = mt76_alloc_device(sizeof(*dev), &mt76x2_ops);
-        if (!mdev)
-                return NULL;
-
-        dev = container_of(mdev, struct mt76x02_dev, mt76);
-        mdev->dev = pdev;
-        mdev->drv = &drv_ops;
-
-        return dev;
-}
-
 int mt76x2_register_device(struct mt76x02_dev *dev)
 {
         int ret;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
index 06a26a152ba4..878ce92405ed 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
@@ -33,7 +33,7 @@ mt76x2_start(struct ieee80211_hw *hw)
                 goto out;
 
         ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
-                                     MT_CALIBRATE_INTERVAL);
+                                     MT_MAC_WORK_INTERVAL);
         ieee80211_queue_delayed_work(mt76_hw(dev), &dev->wdt_work,
                                      MT_WATCHDOG_TIME);
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
index 65ed62229a5b..97ec575699d0 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
@@ -240,8 +240,10 @@ int mt76x2_phy_set_channel(struct mt76x02_dev *dev,
         mt76_wr(dev, MT_BBP(AGC, 2), 0x00007070);
         mt76_wr(dev, MT_TXOP_CTRL_CFG, 0x04101B3F);
 
-        if (scan)
+        if (scan) {
+                mt76x02_edcca_init(dev, false);
                 return 0;
+        }
 
         mt76x2_phy_channel_calibrate(dev, true);
         mt76x02_init_agc_gain(dev);
@@ -254,7 +256,7 @@ int mt76x2_phy_set_channel(struct mt76x02_dev *dev,
                                0x38);
         }
 
-        mt76x02_edcca_init(dev);
+        mt76x02_edcca_init(dev, true);
 
         ieee80211_queue_delayed_work(mt76_hw(dev), &dev->cal_work,
                                      MT_CALIBRATE_INTERVAL);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
index e2ee5e498da7..1848e8ab2e21 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
@@ -241,7 +241,7 @@ void mt76x2_phy_tssi_compensate(struct mt76x02_dev *dev)
                 t.offset1 = txp.chain[1].tssi_offset;
                 mt76x2_mcu_tssi_comp(dev, &t);
 
-                if (t.pa_mode || dev->cal.dpd_cal_done)
+                if (t.pa_mode || dev->cal.dpd_cal_done || dev->ed_tx_blocked)
                         return;
 
                 usleep_range(10000, 20000);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
index 4d1788eb3812..f81a85e96922 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
@@ -36,24 +36,36 @@ static const struct usb_device_id mt76x2u_device_table[] = {
 static int mt76x2u_probe(struct usb_interface *intf,
                          const struct usb_device_id *id)
 {
+        static const struct mt76_driver_ops drv_ops = {
+                .tx_prepare_skb = mt76x02u_tx_prepare_skb,
+                .tx_complete_skb = mt76x02u_tx_complete_skb,
+                .tx_status_data = mt76x02_tx_status_data,
+                .rx_skb = mt76x02_queue_rx_skb,
+                .sta_add = mt76x02_sta_add,
+                .sta_remove = mt76x02_sta_remove,
+        };
         struct usb_device *udev = interface_to_usbdev(intf);
         struct mt76x02_dev *dev;
+        struct mt76_dev *mdev;
         int err;
 
-        dev = mt76x2u_alloc_device(&intf->dev);
-        if (!dev)
+        mdev = mt76_alloc_device(&intf->dev, sizeof(*dev), &mt76x2u_ops,
+                                 &drv_ops);
+        if (!mdev)
                 return -ENOMEM;
 
+        dev = container_of(mdev, struct mt76x02_dev, mt76);
+
         udev = usb_get_dev(udev);
         usb_reset_device(udev);
 
-        mt76x02u_init_mcu(&dev->mt76);
-        err = mt76u_init(&dev->mt76, intf);
+        mt76x02u_init_mcu(mdev);
+        err = mt76u_init(mdev, intf);
         if (err < 0)
                 goto err;
 
-        dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);
-        dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);
+        mdev->rev = mt76_rr(dev, MT_ASIC_VERSION);
+        dev_info(mdev->dev, "ASIC revision: %08x\n", mdev->rev);
 
         err = mt76x2u_register_device(dev);
         if (err < 0)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
index 0be3784f44fb..090aaf71b3ef 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
@@ -134,30 +134,6 @@ static int mt76x2u_init_eeprom(struct mt76x02_dev *dev)
         return 0;
 }
 
-struct mt76x02_dev *mt76x2u_alloc_device(struct device *pdev)
-{
-        static const struct mt76_driver_ops drv_ops = {
-                .tx_prepare_skb = mt76x02u_tx_prepare_skb,
-                .tx_complete_skb = mt76x02u_tx_complete_skb,
-                .tx_status_data = mt76x02_tx_status_data,
-                .rx_skb = mt76x02_queue_rx_skb,
-                .sta_add = mt76x02_sta_add,
-                .sta_remove = mt76x02_sta_remove,
-        };
-        struct mt76x02_dev *dev;
-        struct mt76_dev *mdev;
-
-        mdev = mt76_alloc_device(sizeof(*dev), &mt76x2u_ops);
-        if (!mdev)
-                return NULL;
-
-        dev = container_of(mdev, struct mt76x02_dev, mt76);
-        mdev->dev = pdev;
-        mdev->drv = &drv_ops;
-
-        return dev;
-}
-
 int mt76x2u_init_hardware(struct mt76x02_dev *dev)
 {
         int i, k, err;
@@ -207,11 +183,7 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev)
                         mt76x02_mac_shared_key_setup(dev, i, k, NULL);
         }
 
-        mt76_clear(dev, MT_BEACON_TIME_CFG,
-                   MT_BEACON_TIME_CFG_TIMER_EN |
-                   MT_BEACON_TIME_CFG_SYNC_MODE |
-                   MT_BEACON_TIME_CFG_TBTT_EN |
-                   MT_BEACON_TIME_CFG_BEACON_TX);
+        mt76x02_init_beacon_config(dev);
 
         mt76_rmw(dev, MT_US_CYC_CFG, MT_US_CYC_CNT, 0x1e);
         mt76_wr(dev, MT_TXOP_CTRL_CFG, 0x583f);
@@ -256,7 +228,7 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)
                 goto fail;
 
         /* check hw sg support in order to enable AMSDU */
-        if (mt76u_check_sg(&dev->mt76))
+        if (dev->mt76.usb.sg_en)
                 hw->max_tx_fragments = MT_SG_MAX_SIZE;
         else
                 hw->max_tx_fragments = 1;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
index 286c7f451090..10633b8de8e8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
@@ -28,7 +28,7 @@ static int mt76x2u_start(struct ieee80211_hw *hw)
                 goto out;
 
         ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
-                                     MT_CALIBRATE_INTERVAL);
+                                     MT_MAC_WORK_INTERVAL);
         set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
 
 out:
@@ -46,19 +46,6 @@ static void mt76x2u_stop(struct ieee80211_hw *hw)
         mutex_unlock(&dev->mt76.mutex);
 }
 
-static int mt76x2u_add_interface(struct ieee80211_hw *hw,
-                                 struct ieee80211_vif *vif)
-{
-        struct mt76x02_dev *dev = hw->priv;
-        unsigned int idx = 8;
-
-        if (!ether_addr_equal(dev->mt76.macaddr, vif->addr))
-                mt76x02_mac_setaddr(dev, vif->addr);
-
-        mt76x02_vif_init(dev, vif, idx);
-        return 0;
-}
-
 static int
 mt76x2u_set_channel(struct mt76x02_dev *dev,
                     struct cfg80211_chan_def *chandef)
@@ -125,7 +112,7 @@ const struct ieee80211_ops mt76x2u_ops = {
         .tx = mt76x02_tx,
         .start = mt76x2u_start,
         .stop = mt76x2u_stop,
-        .add_interface = mt76x2u_add_interface,
+        .add_interface = mt76x02_add_interface,
         .remove_interface = mt76x02_remove_interface,
         .sta_state = mt76_sta_state,
         .set_key = mt76x02_set_key,
diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index ef38e8626da9..5a349fe3e576 100644
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -205,9 +205,6 @@ mt76_tx_status_skb_get(struct mt76_dev *dev, struct mt76_wcid *wcid, int pktid,
 {
         struct sk_buff *skb, *tmp;
 
-        if (pktid == MT_PACKET_ID_NO_ACK)
-                return NULL;
-
         skb_queue_walk_safe(&dev->status_list, skb, tmp) {
                 struct mt76_tx_cb *cb = mt76_tx_skb_cb(skb);
 
@@ -217,7 +214,7 @@ mt76_tx_status_skb_get(struct mt76_dev *dev, struct mt76_wcid *wcid, int pktid,
                 if (cb->pktid == pktid)
                         return skb;
 
-                if (!pktid &&
+                if (pktid >= 0 &&
                     !time_after(jiffies, cb->jiffies + MT_TX_STATUS_SKB_TIMEOUT))
                         continue;
 
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 6a2507524c6c..78191968b4fa 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -22,6 +22,10 @@
 #define MT_VEND_REQ_MAX_RETRY   10
 #define MT_VEND_REQ_TOUT_MS     300
 
+static bool disable_usb_sg;
+module_param_named(disable_usb_sg, disable_usb_sg, bool, 0644);
+MODULE_PARM_DESC(disable_usb_sg, "Disable usb scatter-gather support");
+
 /* should be called with usb_ctrl_mtx locked */
 static int __mt76u_vendor_request(struct mt76_dev *dev, u8 req,
                                   u8 req_type, u16 val, u16 offset,
@@ -241,6 +245,16 @@ mt76u_rd_rp(struct mt76_dev *dev, u32 base,
                 return mt76u_req_rd_rp(dev, base, data, n);
 }
 
+static bool mt76u_check_sg(struct mt76_dev *dev)
+{
+        struct usb_interface *intf = to_usb_interface(dev->dev);
+        struct usb_device *udev = interface_to_usbdev(intf);
+
+        return (!disable_usb_sg && udev->bus->sg_tablesize > 0 &&
+                (udev->bus->no_sg_constraint ||
+                 udev->speed == USB_SPEED_WIRELESS));
+}
+
 static int
 mt76u_set_endpoints(struct usb_interface *intf,
                     struct mt76_usb *usb)
@@ -309,8 +323,9 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76u_buf *buf,
         return i ? : -ENOMEM;
 }
 
-int mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf,
-                    int nsgs, int len, int sglen, gfp_t gfp)
+static int
+mt76u_buf_alloc_sg(struct mt76_dev *dev, struct mt76u_buf *buf,
+                   int nsgs, int len, int sglen, gfp_t gfp)
 {
         buf->urb = usb_alloc_urb(0, gfp);
         if (!buf->urb)
@@ -326,15 +341,42 @@ int mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf,
 
         return mt76u_fill_rx_sg(dev, buf, nsgs, len, sglen);
 }
-EXPORT_SYMBOL_GPL(mt76u_buf_alloc);
+
+int mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf,
+                    int len, int data_len, gfp_t gfp)
+{
+        struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
+
+        buf->urb = usb_alloc_urb(0, gfp);
+        if (!buf->urb)
+                return -ENOMEM;
+
+        buf->buf = page_frag_alloc(&q->rx_page, len, gfp);
+        if (!buf->buf)
+                return -ENOMEM;
+
+        buf->len = data_len;
+        buf->dev = dev;
+
+        return 0;
+}
 
 void mt76u_buf_free(struct mt76u_buf *buf)
 {
         struct urb *urb = buf->urb;
+        struct scatterlist *sg;
         int i;
 
-        for (i = 0; i < urb->num_sgs; i++)
-                skb_free_frag(sg_virt(&urb->sg[i]));
+        for (i = 0; i < urb->num_sgs; i++) {
+                sg = &urb->sg[i];
+                if (!sg)
+                        continue;
+
+                skb_free_frag(sg_virt(sg));
+        }
+        if (buf->buf)
+                skb_free_frag(buf->buf);
+
         usb_free_urb(buf->urb);
 }
 EXPORT_SYMBOL_GPL(mt76u_buf_free);
@@ -345,6 +387,7 @@ int mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,
 {
         struct usb_interface *intf = to_usb_interface(dev->dev);
         struct usb_device *udev = interface_to_usbdev(intf);
+        u8 *data = buf->urb->num_sgs ? NULL : buf->buf;
         unsigned int pipe;
 
         if (dir == USB_DIR_IN)
@@ -352,7 +395,7 @@ int mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,
         else
                 pipe = usb_sndbulkpipe(udev, dev->usb.out_ep[index]);
 
-        usb_fill_bulk_urb(buf->urb, udev, pipe, NULL, buf->len,
+        usb_fill_bulk_urb(buf->urb, udev, pipe, data, buf->len,
                           complete_fn, context);
         trace_submit_urb(dev, buf->urb);
 
@@ -393,10 +436,11 @@ static int mt76u_get_rx_entry_len(u8 *data, u32 data_len)
 }
 
 static int
-mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)
+mt76u_process_rx_entry(struct mt76_dev *dev, struct mt76u_buf *buf)
 {
         struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
-        u8 *data = sg_virt(&urb->sg[0]);
+        struct urb *urb = buf->urb;
+        u8 *data = urb->num_sgs ? sg_virt(&urb->sg[0]) : buf->buf;
         int data_len, len, nsgs = 1;
         struct sk_buff *skb;
 
@@ -407,7 +451,8 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)
         if (len < 0)
                 return 0;
 
-        data_len = min_t(int, len, urb->sg[0].length - MT_DMA_HDR_LEN);
+        data_len = urb->num_sgs ? urb->sg[0].length : buf->len;
+        data_len = min_t(int, len, data_len - MT_DMA_HDR_LEN);
         if (MT_DMA_HDR_LEN + data_len > SKB_WITH_OVERHEAD(q->buf_size))
                 return 0;
 
@@ -419,7 +464,7 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)
         __skb_put(skb, data_len);
         len -= data_len;
 
-        while (len > 0) {
+        while (len > 0 && urb->num_sgs) {
                 data_len = min_t(int, len, urb->sg[nsgs].length);
                 skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
                                 sg_page(&urb->sg[nsgs]),
@@ -447,7 +492,8 @@ static void mt76u_complete_rx(struct urb *urb)
         case -ENOENT:
                 return;
         default:
-                dev_err(dev->dev, "rx urb failed: %d\n", urb->status);
+                dev_err_ratelimited(dev->dev, "rx urb failed: %d\n",
+                                    urb->status);
                 /* fall through */
         case 0:
                 break;
@@ -464,12 +510,26 @@ out:
         spin_unlock_irqrestore(&q->lock, flags);
 }
 
+static int
+mt76u_refill_rx(struct mt76_dev *dev, struct mt76_queue *q,
+                struct mt76u_buf *buf, int nsgs)
+{
+        if (dev->usb.sg_en) {
+                return mt76u_fill_rx_sg(dev, buf, nsgs, q->buf_size,
+                                        SKB_WITH_OVERHEAD(q->buf_size));
+        } else {
+                buf->buf = page_frag_alloc(&q->rx_page, q->buf_size,
+                                           GFP_ATOMIC);
+                return buf->buf ? 0 : -ENOMEM;
+        }
+}
+
 static void mt76u_rx_tasklet(unsigned long data)
 {
         struct mt76_dev *dev = (struct mt76_dev *)data;
         struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
-        int err, nsgs, buf_len = q->buf_size;
         struct mt76u_buf *buf;
+        int err, count;
 
         rcu_read_lock();
 
@@ -478,11 +538,9 @@ static void mt76u_rx_tasklet(unsigned long data)
                 if (!buf)
                         break;
 
-                nsgs = mt76u_process_rx_entry(dev, buf->urb);
-                if (nsgs > 0) {
-                        err = mt76u_fill_rx_sg(dev, buf, nsgs,
-                                               buf_len,
-                                               SKB_WITH_OVERHEAD(buf_len));
+                count = mt76u_process_rx_entry(dev, buf);
+                if (count > 0) {
+                        err = mt76u_refill_rx(dev, q, buf, count);
                         if (err < 0)
                                 break;
                 }
@@ -520,7 +578,7 @@ EXPORT_SYMBOL_GPL(mt76u_submit_rx_buffers);
 static int mt76u_alloc_rx(struct mt76_dev *dev)
 {
         struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
-        int i, err, nsgs;
+        int i, err;
 
         spin_lock_init(&q->rx_page_lock);
         spin_lock_init(&q->lock);
@@ -530,23 +588,22 @@ static int mt76u_alloc_rx(struct mt76_dev *dev)
         if (!q->entry)
                 return -ENOMEM;
 
-        if (mt76u_check_sg(dev)) {
-                q->buf_size = MT_RX_BUF_SIZE;
-                nsgs = MT_SG_MAX_SIZE;
-        } else {
-                q->buf_size = PAGE_SIZE;
-                nsgs = 1;
-        }
-
-        for (i = 0; i < MT_NUM_RX_ENTRIES; i++) {
-                err = mt76u_buf_alloc(dev, &q->entry[i].ubuf,
-                                      nsgs, q->buf_size,
-                                      SKB_WITH_OVERHEAD(q->buf_size),
-                                      GFP_KERNEL);
+        q->buf_size = dev->usb.sg_en ? MT_RX_BUF_SIZE : PAGE_SIZE;
+        q->ndesc = MT_NUM_RX_ENTRIES;
+        for (i = 0; i < q->ndesc; i++) {
+                if (dev->usb.sg_en)
+                        err = mt76u_buf_alloc_sg(dev, &q->entry[i].ubuf,
+                                        MT_SG_MAX_SIZE, q->buf_size,
+                                        SKB_WITH_OVERHEAD(q->buf_size),
+                                        GFP_KERNEL);
+                else
+                        err = mt76u_buf_alloc(dev, &q->entry[i].ubuf,
+                                              q->buf_size,
+                                              SKB_WITH_OVERHEAD(q->buf_size),
+                                              GFP_KERNEL);
                 if (err < 0)
                         return err;
         }
-        q->ndesc = MT_NUM_RX_ENTRIES;
 
         return mt76u_submit_rx_buffers(dev);
 }
@@ -691,7 +748,7 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
 {
         struct usb_interface *intf = to_usb_interface(dev->dev);
         struct usb_device *udev = interface_to_usbdev(intf);
-        u8 ep = q2ep(q->hw_idx);
+        u8 *data = NULL, ep = q2ep(q->hw_idx);
         struct mt76u_buf *buf;
         u16 idx = q->tail;
         unsigned int pipe;
@@ -708,12 +765,16 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
         buf = &q->entry[idx].ubuf;
         buf->done = false;
 
-        err = mt76u_tx_build_sg(skb, buf->urb);
-        if (err < 0)
-                return err;
+        if (dev->usb.sg_en) {
+                err = mt76u_tx_build_sg(skb, buf->urb);
+                if (err < 0)
+                        return err;
+        } else {
+                data = skb->data;
+        }
 
         pipe = usb_sndbulkpipe(udev, dev->usb.out_ep[ep]);
-        usb_fill_bulk_urb(buf->urb, udev, pipe, NULL, skb->len,
+        usb_fill_bulk_urb(buf->urb, udev, pipe, data, skb->len,
                           mt76u_complete_tx, buf);
 
         q->tail = (q->tail + 1) % q->ndesc;
@@ -749,10 +810,8 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)
 {
         struct mt76u_buf *buf;
         struct mt76_queue *q;
-        size_t size;
         int i, j;
 
-        size = MT_SG_MAX_SIZE * sizeof(struct scatterlist);
         for (i = 0; i < IEEE80211_NUM_ACS; i++) {
                 q = &dev->q_tx[i];
                 spin_lock_init(&q->lock);
@@ -774,9 +833,15 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)
                         if (!buf->urb)
                                 return -ENOMEM;
 
-                        buf->urb->sg = devm_kzalloc(dev->dev, size, GFP_KERNEL);
-                        if (!buf->urb->sg)
-                                return -ENOMEM;
+                        if (dev->usb.sg_en) {
+                                size_t size = MT_SG_MAX_SIZE *
+                                              sizeof(struct scatterlist);
+
+                                buf->urb->sg = devm_kzalloc(dev->dev, size,
+                                                            GFP_KERNEL);
+                                if (!buf->urb->sg)
+                                        return -ENOMEM;
+                        }
                 }
         }
         return 0;
@@ -838,16 +903,9 @@ int mt76u_alloc_queues(struct mt76_dev *dev)
 
         err = mt76u_alloc_rx(dev);
         if (err < 0)
-                goto err;
-
-        err = mt76u_alloc_tx(dev);
-        if (err < 0)
-                goto err;
+                return err;
 
-        return 0;
-err:
-        mt76u_queues_deinit(dev);
-        return err;
+        return mt76u_alloc_tx(dev);
 }
 EXPORT_SYMBOL_GPL(mt76u_alloc_queues);
 
@@ -882,6 +940,8 @@ int mt76u_init(struct mt76_dev *dev,
         dev->bus = &mt76u_ops;
         dev->queue_ops = &usb_queue_ops;
 
+        usb->sg_en = mt76u_check_sg(dev);
+
         return mt76u_set_endpoints(intf, usb);
 }
 EXPORT_SYMBOL_GPL(mt76u_init);
diff --git a/drivers/net/wireless/mediatek/mt76/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/usb_mcu.c
index 036be4163e69..72c8607da4b4 100644
--- a/drivers/net/wireless/mediatek/mt76/usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/usb_mcu.c
@@ -29,9 +29,8 @@ int mt76u_mcu_init_rx(struct mt76_dev *dev)
         struct mt76_usb *usb = &dev->usb;
         int err;
 
-        err = mt76u_buf_alloc(dev, &usb->mcu.res, 1,
-                              MCU_RESP_URB_SIZE, MCU_RESP_URB_SIZE,
-                              GFP_KERNEL);
+        err = mt76u_buf_alloc(dev, &usb->mcu.res, MCU_RESP_URB_SIZE,
+                              MCU_RESP_URB_SIZE, GFP_KERNEL);
         if (err < 0)
                 return err;
 
@@ -48,9 +47,11 @@ EXPORT_SYMBOL_GPL(mt76u_mcu_init_rx);
 
 void mt76u_mcu_deinit(struct mt76_dev *dev)
 {
-        struct mt76_usb *usb = &dev->usb;
+        struct mt76u_buf *buf = &dev->usb.mcu.res;
 
-        usb_kill_urb(usb->mcu.res.urb);
-        mt76u_buf_free(&usb->mcu.res);
+        if (buf->urb) {
+                usb_kill_urb(buf->urb);
+                mt76u_buf_free(buf);
+        }
 }
 EXPORT_SYMBOL_GPL(mt76u_mcu_deinit);
diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
index 45f4cef7de9c..dcb0991432f4 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
@@ -53,9 +53,11 @@ static const u32 qtnf_cipher_suites[] = {
 static const struct ieee80211_txrx_stypes
 qtnf_mgmt_stypes[NUM_NL80211_IFTYPES] = {
         [NL80211_IFTYPE_STATION] = {
-                .tx = BIT(IEEE80211_STYPE_ACTION >> 4),
+                .tx = BIT(IEEE80211_STYPE_ACTION >> 4) |
+                      BIT(IEEE80211_STYPE_AUTH >> 4),
                 .rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
-                      BIT(IEEE80211_STYPE_PROBE_REQ >> 4),
+                      BIT(IEEE80211_STYPE_PROBE_REQ >> 4) |
+                      BIT(IEEE80211_STYPE_AUTH >> 4),
         },
         [NL80211_IFTYPE_AP] = {
                 .tx = BIT(IEEE80211_STYPE_ACTION >> 4),
@@ -636,6 +638,12 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev,
         if (vif->wdev.iftype != NL80211_IFTYPE_STATION)
                 return -EOPNOTSUPP;
 
+        if (sme->auth_type == NL80211_AUTHTYPE_SAE &&
+            !(sme->flags & CONNECT_REQ_EXTERNAL_AUTH_SUPPORT)) {
+                pr_err("can not offload authentication to userspace\n");
+                return -EOPNOTSUPP;
+        }
+
         if (sme->bssid)
                 ether_addr_copy(vif->bssid, sme->bssid);
         else
@@ -653,6 +661,30 @@ out:
 }
 
 static int
+qtnf_external_auth(struct wiphy *wiphy, struct net_device *dev,
+                   struct cfg80211_external_auth_params *auth)
+{
+        struct qtnf_vif *vif = qtnf_netdev_get_priv(dev);
+        int ret;
+
+        if (vif->wdev.iftype != NL80211_IFTYPE_STATION)
+                return -EOPNOTSUPP;
+
+        if (!ether_addr_equal(vif->bssid, auth->bssid))
+                pr_warn("unexpected bssid: %pM", auth->bssid);
+
+        ret = qtnf_cmd_send_external_auth(vif, auth);
+        if (ret) {
+                pr_err("VIF%u.%u: failed to report external auth\n",
+                       vif->mac->macid, vif->vifid);
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+static int
 qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
                 u16 reason_code)
 {
@@ -946,6 +978,7 @@ static struct cfg80211_ops qtn_cfg80211_ops = {
         .set_default_mgmt_key   = qtnf_set_default_mgmt_key,
         .scan                   = qtnf_scan,
         .connect                = qtnf_connect,
+        .external_auth          = qtnf_external_auth,
         .disconnect             = qtnf_disconnect,
         .dump_survey            = qtnf_dump_survey,
         .get_channel            = qtnf_get_channel,
@@ -1125,6 +1158,9 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac)
         if (!(hw_info->hw_capab & QLINK_HW_CAPAB_OBSS_SCAN))
                 wiphy->features |= NL80211_FEATURE_NEED_OBSS_SCAN;
 
+        if (hw_info->hw_capab & QLINK_HW_CAPAB_SAE)
+                wiphy->features |= NL80211_FEATURE_SAE;
+
 #ifdef CONFIG_PM
         if (macinfo->wowlan)
                 wiphy->wowlan = macinfo->wowlan;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c
index 0f48f541de41..85a2a58f4c16 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c
@@ -2322,6 +2322,35 @@ out:
         return ret;
 }
 
+int qtnf_cmd_send_external_auth(struct qtnf_vif *vif,
+                                struct cfg80211_external_auth_params *auth)
+{
+        struct sk_buff *cmd_skb;
+        struct qlink_cmd_external_auth *cmd;
+        int ret;
+
+        cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid,
+                                            QLINK_CMD_EXTERNAL_AUTH,
+                                            sizeof(*cmd));
+        if (!cmd_skb)
+                return -ENOMEM;
+
+        cmd = (struct qlink_cmd_external_auth *)cmd_skb->data;
+
+        ether_addr_copy(cmd->bssid, auth->bssid);
+        cmd->status = cpu_to_le16(auth->status);
+
+        qtnf_bus_lock(vif->mac->bus);
+        ret = qtnf_cmd_send(vif->mac->bus, cmd_skb);
+        if (ret)
+                goto out;
+
+out:
+        qtnf_bus_unlock(vif->mac->bus);
+
+        return ret;
+}
+
 int qtnf_cmd_send_disconnect(struct qtnf_vif *vif, u16 reason_code)
 {
         struct sk_buff *cmd_skb;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.h b/drivers/net/wireless/quantenna/qtnfmac/commands.h
index 96dff643bbc4..64f0b9dc8a14 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.h
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.h
@@ -51,6 +51,8 @@ int qtnf_cmd_send_del_sta(struct qtnf_vif *vif,
 int qtnf_cmd_send_scan(struct qtnf_wmac *mac);
 int qtnf_cmd_send_connect(struct qtnf_vif *vif,
                           struct cfg80211_connect_params *sme);
+int qtnf_cmd_send_external_auth(struct qtnf_vif *vif,
+                                struct cfg80211_external_auth_params *auth);
 int qtnf_cmd_send_disconnect(struct qtnf_vif *vif,
                              u16 reason_code);
 int qtnf_cmd_send_updown_intf(struct qtnf_vif *vif,
diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c
index 3fd1a9217737..6c1b886339ac 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/event.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/event.c
@@ -150,6 +150,13 @@ qtnf_event_handle_bss_join(struct qtnf_vif *vif,
         struct cfg80211_chan_def chandef;
         struct cfg80211_bss *bss = NULL;
         u8 *ie = NULL;
+        size_t payload_len;
+        u16 tlv_type;
+        u16 tlv_value_len;
+        size_t tlv_full_len;
+        const struct qlink_tlv_hdr *tlv;
+        const u8 *rsp_ies = NULL;
+        size_t rsp_ies_len = 0;
 
         if (unlikely(len < sizeof(*join_info))) {
                 pr_err("VIF%u.%u: payload is too short (%u < %zu)\n",
@@ -167,67 +174,118 @@ qtnf_event_handle_bss_join(struct qtnf_vif *vif,
         pr_debug("VIF%u.%u: BSSID:%pM status:%u\n",
                  vif->mac->macid, vif->vifid, join_info->bssid, status);
 
-        if (status == WLAN_STATUS_SUCCESS) {
-                qlink_chandef_q2cfg(wiphy, &join_info->chan, &chandef);
-                if (!cfg80211_chandef_valid(&chandef)) {
-                        pr_warn("MAC%u.%u: bad channel freq=%u cf1=%u cf2=%u bw=%u\n",
+        if (status != WLAN_STATUS_SUCCESS)
+                goto done;
+
+        qlink_chandef_q2cfg(wiphy, &join_info->chan, &chandef);
+        if (!cfg80211_chandef_valid(&chandef)) {
+                pr_warn("MAC%u.%u: bad channel freq=%u cf1=%u cf2=%u bw=%u\n",
+                        vif->mac->macid, vif->vifid,
+                        chandef.chan->center_freq,
+                        chandef.center_freq1,
+                        chandef.center_freq2,
+                        chandef.width);
+                status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                goto done;
+        }
+
+        bss = cfg80211_get_bss(wiphy, chandef.chan, join_info->bssid,
+                               NULL, 0, IEEE80211_BSS_TYPE_ESS,
+                               IEEE80211_PRIVACY_ANY);
+        if (!bss) {
+                pr_warn("VIF%u.%u: add missing BSS:%pM chan:%u\n",
+                        vif->mac->macid, vif->vifid,
+                        join_info->bssid, chandef.chan->hw_value);
+
+                if (!vif->wdev.ssid_len) {
+                        pr_warn("VIF%u.%u: SSID unknown for BSS:%pM\n",
                                 vif->mac->macid, vif->vifid,
-                                chandef.chan->center_freq,
-                                chandef.center_freq1,
-                                chandef.center_freq2,
-                                chandef.width);
+                                join_info->bssid);
                         status = WLAN_STATUS_UNSPECIFIED_FAILURE;
                         goto done;
                 }
 
-                bss = cfg80211_get_bss(wiphy, chandef.chan, join_info->bssid,
-                                       NULL, 0, IEEE80211_BSS_TYPE_ESS,
-                                       IEEE80211_PRIVACY_ANY);
+                ie = kzalloc(2 + vif->wdev.ssid_len, GFP_KERNEL);
+                if (!ie) {
+                        pr_warn("VIF%u.%u: IE alloc failed for BSS:%pM\n",
+                                vif->mac->macid, vif->vifid,
+                                join_info->bssid);
+                        status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                        goto done;
+                }
+
+                ie[0] = WLAN_EID_SSID;
+                ie[1] = vif->wdev.ssid_len;
+                memcpy(ie + 2, vif->wdev.ssid, vif->wdev.ssid_len);
+
+                bss = cfg80211_inform_bss(wiphy, chandef.chan,
+                                          CFG80211_BSS_FTYPE_UNKNOWN,
+                                          join_info->bssid, 0,
+                                          WLAN_CAPABILITY_ESS, 100,
+                                          ie, 2 + vif->wdev.ssid_len,
+                                          0, GFP_KERNEL);
                 if (!bss) {
-                        pr_warn("VIF%u.%u: add missing BSS:%pM chan:%u\n",
+                        pr_warn("VIF%u.%u: can't connect to unknown BSS: %pM\n",
                                 vif->mac->macid, vif->vifid,
-                                join_info->bssid, chandef.chan->hw_value);
+                                join_info->bssid);
+                        status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                        goto done;
+                }
+        }
 
-                        if (!vif->wdev.ssid_len) {
-                                pr_warn("VIF%u.%u: SSID unknown for BSS:%pM\n",
-                                        vif->mac->macid, vif->vifid,
-                                        join_info->bssid);
-                                status = WLAN_STATUS_UNSPECIFIED_FAILURE;
-                                goto done;
-                        }
+        payload_len = len - sizeof(*join_info);
+        tlv = (struct qlink_tlv_hdr *)join_info->ies;
+
+        while (payload_len >= sizeof(struct qlink_tlv_hdr)) {
+                tlv_type = le16_to_cpu(tlv->type);
+                tlv_value_len = le16_to_cpu(tlv->len);
+                tlv_full_len = tlv_value_len + sizeof(struct qlink_tlv_hdr);
 
-                        ie = kzalloc(2 + vif->wdev.ssid_len, GFP_KERNEL);
-                        if (!ie) {
-                                pr_warn("VIF%u.%u: IE alloc failed for BSS:%pM\n",
-                                        vif->mac->macid, vif->vifid,
-                                        join_info->bssid);
+                if (payload_len < tlv_full_len) {
+                        pr_warn("invalid %u TLV\n", tlv_type);
+                        status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                        goto done;
+                }
+
+                if (tlv_type == QTN_TLV_ID_IE_SET) {
+                        const struct qlink_tlv_ie_set *ie_set;
+                        unsigned int ie_len;
+
+                        if (payload_len < sizeof(*ie_set)) {
+                                pr_warn("invalid IE_SET TLV\n");
                                 status = WLAN_STATUS_UNSPECIFIED_FAILURE;
                                 goto done;
                         }
 
-                        ie[0] = WLAN_EID_SSID;
-                        ie[1] = vif->wdev.ssid_len;
-                        memcpy(ie + 2, vif->wdev.ssid, vif->wdev.ssid_len);
-
-                        bss = cfg80211_inform_bss(wiphy, chandef.chan,
-                                                  CFG80211_BSS_FTYPE_UNKNOWN,
-                                                  join_info->bssid, 0,
-                                                  WLAN_CAPABILITY_ESS, 100,
-                                                  ie, 2 + vif->wdev.ssid_len,
-                                                  0, GFP_KERNEL);
-                        if (!bss) {
-                                pr_warn("VIF%u.%u: can't connect to unknown BSS: %pM\n",
-                                        vif->mac->macid, vif->vifid,
-                                        join_info->bssid);
-                                status = WLAN_STATUS_UNSPECIFIED_FAILURE;
-                                goto done;
+                        ie_set = (const struct qlink_tlv_ie_set *)tlv;
+                        ie_len = tlv_value_len -
+                                (sizeof(*ie_set) - sizeof(ie_set->hdr));
+
+                        switch (ie_set->type) {
+                        case QLINK_IE_SET_ASSOC_RESP:
+                                if (ie_len) {
+                                        rsp_ies = ie_set->ie_data;
+                                        rsp_ies_len = ie_len;
+                                }
+                                break;
+                        default:
+                                pr_warn("unexpected IE type: %u\n",
+                                        ie_set->type);
+                                break;
                         }
                 }
+
+                payload_len -= tlv_full_len;
+                tlv = (struct qlink_tlv_hdr *)(tlv->val + tlv_value_len);
         }
 
+        if (payload_len)
+                pr_warn("VIF%u.%u: unexpected remaining payload: %zu\n",
+                        vif->mac->macid, vif->vifid, payload_len);
+
 done:
-        cfg80211_connect_result(vif->netdev, join_info->bssid, NULL, 0, NULL,
-                                0, status, GFP_KERNEL);
+        cfg80211_connect_result(vif->netdev, join_info->bssid, NULL, 0, rsp_ies,
+                                rsp_ies_len, status, GFP_KERNEL);
         if (bss) {
                 if (!ether_addr_equal(vif->bssid, join_info->bssid))
                         ether_addr_copy(vif->bssid, join_info->bssid);
@@ -516,6 +574,43 @@ static int qtnf_event_handle_radar(struct qtnf_vif *vif,
         return 0;
 }
 
+static int
+qtnf_event_handle_external_auth(struct qtnf_vif *vif,
+                                const struct qlink_event_external_auth *ev,
+                                u16 len)
+{
+        struct cfg80211_external_auth_params auth = {0};
+        struct wiphy *wiphy = priv_to_wiphy(vif->mac);
+        int ret;
+
+        if (len < sizeof(*ev)) {
+                pr_err("MAC%u: payload is too short\n", vif->mac->macid);
+                return -EINVAL;
+        }
+
+        if (!wiphy->registered || !vif->netdev)
+                return 0;
+
+        if (ev->ssid_len) {
+                memcpy(auth.ssid.ssid, ev->ssid, ev->ssid_len);
+                auth.ssid.ssid_len = ev->ssid_len;
+        }
+
+        auth.key_mgmt_suite = le32_to_cpu(ev->akm_suite);
+        ether_addr_copy(auth.bssid, ev->bssid);
+        auth.action = ev->action;
+
+        pr_info("%s: external auth bss=%pM action=%u akm=%u\n",
+                vif->netdev->name, auth.bssid, auth.action,
+                auth.key_mgmt_suite);
+
+        ret = cfg80211_external_auth_request(vif->netdev, &auth, GFP_KERNEL);
+        if (ret)
+                pr_warn("failed to offload external auth request\n");
+
+        return ret;
+}
+
 static int qtnf_event_parse(struct qtnf_wmac *mac,
                             const struct sk_buff *event_skb)
 {
@@ -574,6 +669,10 @@ static int qtnf_event_parse(struct qtnf_wmac *mac,
                 ret = qtnf_event_handle_radar(vif, (const void *)event,
                                               event_len);
                 break;
+        case QLINK_EVENT_EXTERNAL_AUTH:
+                ret = qtnf_event_handle_external_auth(vif, (const void *)event,
+                                                      event_len);
+                break;
         default:
                 pr_warn("unknown event type: %x\n", event_id);
                 break;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h
index 27fdb5b01ee3..7798edcf7980 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h
+++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h
@@ -68,6 +68,7 @@ enum qlink_hw_capab {
         QLINK_HW_CAPAB_PWR_MGMT                 = BIT(4),
         QLINK_HW_CAPAB_OBSS_SCAN                = BIT(5),
         QLINK_HW_CAPAB_SCAN_DWELL               = BIT(6),
+        QLINK_HW_CAPAB_SAE                      = BIT(8),
 };
 
 enum qlink_iface_type {
@@ -250,6 +251,7 @@ enum qlink_cmd_type {
         QLINK_CMD_DISCONNECT            = 0x0061,
         QLINK_CMD_PM_SET                = 0x0062,
         QLINK_CMD_WOWLAN_SET            = 0x0063,
+        QLINK_CMD_EXTERNAL_AUTH         = 0x0066,
 };
 
 /**
@@ -481,6 +483,20 @@ struct qlink_cmd_connect {
 } __packed;
 
 /**
+ * struct qlink_cmd_external_auth - data for QLINK_CMD_EXTERNAL_AUTH command
+ *
+ * @bssid: BSSID of the BSS to connect to
+ * @status: authentication status code
+ * @payload: variable portion of connection request.
+ */
+struct qlink_cmd_external_auth {
+        struct qlink_cmd chdr;
+        u8 bssid[ETH_ALEN];
+        __le16 status;
+        u8 payload[0];
+} __packed;
+
+/**
  * struct qlink_cmd_disconnect - data for QLINK_CMD_DISCONNECT command
  *
  * @reason: code of the reason of disconnect, see &enum ieee80211_reasoncode.
@@ -925,6 +941,7 @@ enum qlink_event_type {
         QLINK_EVENT_BSS_LEAVE           = 0x0027,
         QLINK_EVENT_FREQ_CHANGE         = 0x0028,
         QLINK_EVENT_RADAR               = 0x0029,
+        QLINK_EVENT_EXTERNAL_AUTH       = 0x0030,
 };
 
 /**
@@ -984,6 +1001,7 @@ struct qlink_event_bss_join {
         struct qlink_chandef chan;
         u8 bssid[ETH_ALEN];
         __le16 status;
+        u8 ies[0];
 } __packed;
 
 /**
@@ -1099,6 +1117,24 @@ struct qlink_event_radar {
         u8 rsvd[3];
 } __packed;
 
+/**
+ * struct qlink_event_external_auth - data for QLINK_EVENT_EXTERNAL_AUTH event
+ *
+ * @ssid: SSID announced by BSS
+ * @ssid_len: SSID length
+ * @bssid: BSSID of the BSS to connect to
+ * @akm_suite: AKM suite for external authentication
+ * @action: action type/trigger for external authentication
+ */
+struct qlink_event_external_auth {
+        struct qlink_event ehdr;
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+        u8 ssid_len;
+        u8 bssid[ETH_ALEN];
+        __le32 akm_suite;
+        u8 action;
+} __packed;
+
 /* QLINK TLVs (Type-Length Values) definitions
  */
 
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 7f813f6f8792..a03b5284a050 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -2966,6 +2966,7 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                                          struct channel_info *info)
 {
         u8 rfcsr;
+        int idx = rf->channel-1;
 
         rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
         rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
@@ -3003,60 +3004,56 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
 
         rt2800_freq_cal_mode1(rt2x00dev);
 
-        if (rf->channel <= 14) {
-                int idx = rf->channel-1;
-
-                if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
-                        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
-                                /* r55/r59 value array of channel 1~14 */
-                                static const char r55_bt_rev[] = {0x83, 0x83,
-                                        0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
-                                        0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
-                                static const char r59_bt_rev[] = {0x0e, 0x0e,
-                                        0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
-                                        0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
-
-                                rt2800_rfcsr_write(rt2x00dev, 55,
-                                                   r55_bt_rev[idx]);
-                                rt2800_rfcsr_write(rt2x00dev, 59,
-                                                   r59_bt_rev[idx]);
-                        } else {
-                                static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
-                                        0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
-                                        0x88, 0x88, 0x86, 0x85, 0x84};
-
-                                rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
-                        }
+        if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
+                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
+                        /* r55/r59 value array of channel 1~14 */
+                        static const char r55_bt_rev[] = {0x83, 0x83,
+                                0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
+                                0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
+                        static const char r59_bt_rev[] = {0x0e, 0x0e,
+                                0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
+                                0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
+
+                        rt2800_rfcsr_write(rt2x00dev, 55,
+                                           r55_bt_rev[idx]);
+                        rt2800_rfcsr_write(rt2x00dev, 59,
+                                           r59_bt_rev[idx]);
                 } else {
-                        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
-                                static const char r55_nonbt_rev[] = {0x23, 0x23,
-                                        0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
-                                        0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
-                                static const char r59_nonbt_rev[] = {0x07, 0x07,
-                                        0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-                                        0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
-
-                                rt2800_rfcsr_write(rt2x00dev, 55,
-                                                   r55_nonbt_rev[idx]);
-                                rt2800_rfcsr_write(rt2x00dev, 59,
-                                                   r59_nonbt_rev[idx]);
-                        } else if (rt2x00_rt(rt2x00dev, RT5390) ||
-                                   rt2x00_rt(rt2x00dev, RT5392) ||
-                                   rt2x00_rt(rt2x00dev, RT6352)) {
-                                static const char r59_non_bt[] = {0x8f, 0x8f,
-                                        0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
-                                        0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
-
-                                rt2800_rfcsr_write(rt2x00dev, 59,
-                                                   r59_non_bt[idx]);
-                        } else if (rt2x00_rt(rt2x00dev, RT5350)) {
-                                static const char r59_non_bt[] = {0x0b, 0x0b,
-                                        0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
-                                        0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
-
-                                rt2800_rfcsr_write(rt2x00dev, 59,
-                                                   r59_non_bt[idx]);
-                        }
+                        static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
+                                0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
+                                0x88, 0x88, 0x86, 0x85, 0x84};
+
+                        rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
+                }
+        } else {
+                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
+                        static const char r55_nonbt_rev[] = {0x23, 0x23,
+                                0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
+                                0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
+                        static const char r59_nonbt_rev[] = {0x07, 0x07,
+                                0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+                                0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
+
+                        rt2800_rfcsr_write(rt2x00dev, 55,
+                                           r55_nonbt_rev[idx]);
+                        rt2800_rfcsr_write(rt2x00dev, 59,
+                                           r59_nonbt_rev[idx]);
+                } else if (rt2x00_rt(rt2x00dev, RT5390) ||
+                           rt2x00_rt(rt2x00dev, RT5392) ||
+                           rt2x00_rt(rt2x00dev, RT6352)) {
+                        static const char r59_non_bt[] = {0x8f, 0x8f,
+                                0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
+                                0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
+
+                        rt2800_rfcsr_write(rt2x00dev, 59,
+                                           r59_non_bt[idx]);
+                } else if (rt2x00_rt(rt2x00dev, RT5350)) {
+                        static const char r59_non_bt[] = {0x0b, 0x0b,
+                                0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
+                                0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
+
+                        rt2800_rfcsr_write(rt2x00dev, 59,
+                                           r59_non_bt[idx]);
                 }
         }
 }
@@ -3861,10 +3858,12 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         if (rt2x00_rt(rt2x00dev, RT3572))
                 rt2800_rfcsr_write(rt2x00dev, 8, 0);
 
-        if (rt2x00_rt(rt2x00dev, RT6352))
+        if (rt2x00_rt(rt2x00dev, RT6352)) {
                 tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
-        else
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1);
+        } else {
                 tx_pin = 0;
+        }
 
         switch (rt2x00dev->default_ant.tx_chain_num) {
         case 3:
@@ -3896,24 +3895,29 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         switch (rt2x00dev->default_ant.rx_chain_num) {
         case 3:
                 /* Turn on tertiary LNAs */
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A2_EN, 1);
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G2_EN, 1);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A2_EN,
+                                   rf->channel > 14);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G2_EN,
+                                   rf->channel <= 14);
                 /* fall-through */
         case 2:
                 /* Turn on secondary LNAs */
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, 1);
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, 1);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN,
+                                   rf->channel > 14);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN,
+                                   rf->channel <= 14);
                 /* fall-through */
         case 1:
                 /* Turn on primary LNAs */
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1);
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, 1);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN,
+                                   rf->channel > 14);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN,
+                                   rf->channel <= 14);
                 break;
         }
 
         rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
         rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
-        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1); /* mt7620 */
 
         rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
 
@@ -3985,13 +3989,12 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
                 rt2800_bbp_write(rt2x00dev, 195, 141);
                 rt2800_bbp_write(rt2x00dev, 196, reg);
 
-                /* AGC init */
-                if (rt2x00_rt(rt2x00dev, RT6352))
-                        reg = 0x04;
-                else
-                        reg = rf->channel <= 14 ? 0x1c : 0x24;
-
-                reg += 2 * rt2x00dev->lna_gain;
+                /* AGC init.
+                 * Despite the vendor driver using different values here for
+                 * RT6352 chip, we use 0x1c for now. This may have to be changed
+                 * once TSSI got implemented.
+                 */
+                reg = (rf->channel <= 14 ? 0x1c : 0x24) + 2*rt2x00dev->lna_gain;
                 rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);
 
                 rt2800_iq_calibrate(rt2x00dev, rf->channel);
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
index e2b1bfbcfbd4..d5f65372356b 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
@@ -1723,8 +1723,8 @@ static int rtl8180_probe(struct pci_dev *pdev,
 {
         struct ieee80211_hw *dev;
         struct rtl8180_priv *priv;
-        unsigned long mem_addr, mem_len;
-        unsigned int io_addr, io_len;
+        unsigned long mem_len;
+        unsigned int io_len;
         int err;
         const char *chip_name, *rf_name = NULL;
         u32 reg;
@@ -1743,9 +1743,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
                 goto err_disable_dev;
         }
 
-        io_addr = pci_resource_start(pdev, 0);
         io_len = pci_resource_len(pdev, 0);
-        mem_addr = pci_resource_start(pdev, 1);
         mem_len = pci_resource_len(pdev, 1);
 
         if (mem_len < sizeof(struct rtl818x_csr) ||
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 7aa68fe5d791..672c0b73cb65 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "rc.h"
@@ -2311,11 +2289,10 @@ static void rtl_c2h_content_parsing(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal_ops *hal_ops = rtlpriv->cfg->ops;
         const struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
-        u8 cmd_id, cmd_seq, cmd_len;
+        u8 cmd_id, cmd_len;
         u8 *cmd_buf = NULL;
 
         cmd_id = GET_C2H_CMD_ID(skb->data);
-        cmd_seq = GET_C2H_SEQ(skb->data);
         cmd_len = skb->len - C2H_DATA_OFFSET;
         cmd_buf = GET_C2H_DATA_PTR(skb->data);
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
index a7ae40eaa3cd..99565ad09cdc 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.h
+++ b/drivers/net/wireless/realtek/rtlwifi/base.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_BASE_H__
 #define __RTL_BASE_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbt_precomp.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbt_precomp.h
index 02dff4c3f664..30a25480752d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbt_precomp.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbt_precomp.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- ******************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2007-2011  Realtek Corporation.*/
 
 #ifndef __HALBT_PRECOMP_H__
 #define __HALBT_PRECOMP_H__
@@ -49,8 +28,6 @@
 #include "halbtc8821a2ant.h"
 #include "halbtc8821a1ant.h"
 
-#define GetDefaultAdapter(padapter)     padapter
-
 #define BIT0    0x00000001
 #define BIT1    0x00000002
 #define BIT2    0x00000004
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c
index f22fec093f1d..3ebc7c93b1e9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c
@@ -1,36 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
-/**************************************************************
- * Description:
- *
- * This file is for RTL8192E Co-exist mechanism
- *
- * History
- * 2012/11/15 Cosa first check in.
- *
- **************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2012  Realtek Corporation.*/
 
 /**************************************************************
  *   include files
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.h
index b8c95c7afc06..41ac0d5dcc9c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2012  Realtek Corporation.*/
+
 /*****************************************************************
  *   The following is for 8192E 2Ant BT Co-exist definition
  *****************************************************************/
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
index 59553db020ef..5f5739904edf 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2012  Realtek Corporation.*/
 
 /***************************************************************
  * Description:
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
index 934f27893c16..9d41e11388ad 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2012  Realtek Corporation.*/
+
 /**********************************************************************
  * The following is for 8723B 1ANT BT Co-exist definition
  **********************************************************************/
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
index 6597f7cb3411..9f7b9af5bdcd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2012  Realtek Corporation.*/
+
 /***************************************************************
  * Description:
  *
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h
index aa24da402fb9..08aad6ef4046 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2012  Realtek Corporation.*/
+
 #ifndef _HAL8723B_2_ANT
 #define _HAL8723B_2_ANT
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index b5d65872db84..fa5b73f81c57 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2012  Realtek Corporation.*/
 
 /**************************************************************
  * Description:
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h
index a498ff5b1b9c..a63fb79a971a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2012  Realtek Corporation.*/
 
 /*===========================================
  * The following is for 8821A 1ANT BT Co-exist definition
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c
index 01a9d303603b..e9e211fda264 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2012  Realtek Corporation.*/
 
 /************************************************************
  * Description:
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h
index ce3e58c4e660..3df0ee8bd37b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2012  Realtek Corporation.*/
 
 /*===========================================
  * The following is for 8821A 2Ant BT Co-exist definition
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.c
index 951b8c1e0153..145d6f9c017a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.c
@@ -1,17 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2016-2017  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2016-2017  Realtek Corporation.*/
+
 #include "halbt_precomp.h"
 
 void ex_hal8822b_wifi_only_hw_config(struct wifi_only_cfg *wifionlycfg)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.h
index 6ec356542eea..5fc66cea74b2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.h
@@ -1,17 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2016-2017  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2016-2017  Realtek Corporation.*/
+
 #ifndef __INC_HAL8822BWIFIONLYHWCFG_H
 #define __INC_HAL8822BWIFIONLYHWCFG_H
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
index d748aab66aa2..2ac0481b29ef 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2013 Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- ******************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2007-2013  Realtek Corporation.*/
 
 #include "halbt_precomp.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
index 9eae87d19120..ee9aeddf1ebc 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __HALBTC_OUT_SRC_H__
 #define __HALBTC_OUT_SRC_H__
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
index cce4a37ea408..0e509c33e9e6 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
+
 #include "../wifi.h"
 #include <linux/vmalloc.h>
 #include <linux/module.h>
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
index 8c996055de71..bf2cf8505aca 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL_BTC_H__
 #define __RTL_BTC_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/cam.c b/drivers/net/wireless/realtek/rtlwifi/cam.c
index f7a7dcbf945e..bf0e0bb1f99b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/cam.c
+++ b/drivers/net/wireless/realtek/rtlwifi/cam.c
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #include "wifi.h"
 #include "cam.h"
 #include <linux/export.h>
diff --git a/drivers/net/wireless/realtek/rtlwifi/cam.h b/drivers/net/wireless/realtek/rtlwifi/cam.h
index e2e647d511c1..2461fa9afda0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/cam.h
+++ b/drivers/net/wireless/realtek/rtlwifi/cam.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_CAM_H_
 #define __RTL_CAM_H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index ce23339bf9fb..0913f02b7ff1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.h b/drivers/net/wireless/realtek/rtlwifi/core.h
index 782ac2fc4b28..7447ff456710 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.h
+++ b/drivers/net/wireless/realtek/rtlwifi/core.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_CORE_H__
 #define __RTL_CORE_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.c b/drivers/net/wireless/realtek/rtlwifi/debug.c
index 8186650efc56..a051de16284d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/debug.c
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "cam.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.h b/drivers/net/wireless/realtek/rtlwifi/debug.h
index ad6834af618b..69f169d4d4ae 100644
--- a/drivers/net/wireless/realtek/rtlwifi/debug.h
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_DEBUG_H__
 #define __RTL_DEBUG_H__
@@ -157,7 +136,7 @@ enum dbgp_flag_e {
         FEEPROM = 11,
         FPWR = 12,
         FDM = 13,
-        FDBGCtrl = 14,
+        FDBGCTRL = 14,
         FC2H = 15,
         FBT = 16,
         FINIT = 17,
diff --git a/drivers/net/wireless/realtek/rtlwifi/efuse.c b/drivers/net/wireless/realtek/rtlwifi/efuse.c
index 9729e51fce38..de0437b3cb95 100644
--- a/drivers/net/wireless/realtek/rtlwifi/efuse.c
+++ b/drivers/net/wireless/realtek/rtlwifi/efuse.c
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * Tmis 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
- * published by the Free Software Foundation.
- *
- * Tmis program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * Tme full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #include "wifi.h"
 #include "efuse.h"
 #include "pci.h"
@@ -386,20 +365,20 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-        u8 section_idx, i, Base;
+        u8 section_idx, i, base;
         u16 words_need = 0, hdr_num = 0, totalbytes, efuse_used;
         bool wordchanged, result = true;
 
         for (section_idx = 0; section_idx < 16; section_idx++) {
-                Base = section_idx * 8;
+                base = section_idx * 8;
                 wordchanged = false;
 
                 for (i = 0; i < 8; i = i + 2) {
-                        if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i] !=
-                             rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i]) ||
-                            (rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i + 1] !=
-                             rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i +
-                                                                   1])) {
+                        if (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] !=
+                            rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i] ||
+                            rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=
+                            rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i +
+                                                                   1]) {
                                 words_need++;
                                 wordchanged = true;
                         }
@@ -540,7 +519,7 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL(rtl_efuse_shadow_map_update);
 
-void efuse_force_write_vendor_Id(struct ieee80211_hw *hw)
+void efuse_force_write_vendor_id(struct ieee80211_hw *hw)
 {
         u8 tmpdata[8] = { 0xFF, 0xFF, 0xEC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF };
 
@@ -1132,7 +1111,7 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 tempval;
-        u16 tmpV16;
+        u16 tmpv16;
 
         if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) {
 
@@ -1141,31 +1120,31 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
                         rtl_write_byte(rtlpriv,
                                        rtlpriv->cfg->maps[EFUSE_ACCESS], 0x69);
                 } else {
-                        tmpV16 =
+                        tmpv16 =
                           rtl_read_word(rtlpriv,
                                         rtlpriv->cfg->maps[SYS_ISO_CTRL]);
-                        if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
-                                tmpV16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];
+                        if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
+                                tmpv16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];
                                 rtl_write_word(rtlpriv,
                                                rtlpriv->cfg->maps[SYS_ISO_CTRL],
-                                               tmpV16);
+                                               tmpv16);
                         }
                 }
-                tmpV16 = rtl_read_word(rtlpriv,
+                tmpv16 = rtl_read_word(rtlpriv,
                                        rtlpriv->cfg->maps[SYS_FUNC_EN]);
-                if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {
-                        tmpV16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];
+                if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {
+                        tmpv16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];
                         rtl_write_word(rtlpriv,
-                                       rtlpriv->cfg->maps[SYS_FUNC_EN], tmpV16);
+                                       rtlpriv->cfg->maps[SYS_FUNC_EN], tmpv16);
                 }
 
-                tmpV16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);
-                if ((!(tmpV16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||
-                    (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {
-                        tmpV16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |
+                tmpv16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);
+                if ((!(tmpv16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||
+                    (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {
+                        tmpv16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |
                                    rtlpriv->cfg->maps[EFUSE_ANA8M]);
                         rtl_write_word(rtlpriv,
-                                       rtlpriv->cfg->maps[SYS_CLK], tmpV16);
+                                       rtlpriv->cfg->maps[SYS_CLK], tmpv16);
                 }
         }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/efuse.h b/drivers/net/wireless/realtek/rtlwifi/efuse.h
index dfa31c13fc7a..1ec59f439382 100644
--- a/drivers/net/wireless/realtek/rtlwifi/efuse.h
+++ b/drivers/net/wireless/realtek/rtlwifi/efuse.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_EFUSE_H_
 #define __RTL_EFUSE_H_
@@ -107,7 +85,7 @@ void efuse_shadow_write(struct ieee80211_hw *hw, u8 type,
 bool efuse_shadow_update(struct ieee80211_hw *hw);
 bool efuse_shadow_update_chk(struct ieee80211_hw *hw);
 void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw);
-void efuse_force_write_vendor_Id(struct ieee80211_hw *hw);
+void efuse_force_write_vendor_id(struct ieee80211_hw *hw);
 void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx);
 void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate);
 int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,
diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index 5d1fda16fc8c..48ca52102cef 100644
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.h b/drivers/net/wireless/realtek/rtlwifi/pci.h
index 3fb56c845a61..866861626a0a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/pci.h
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_PCI_H__
 #define __RTL_PCI_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c
index 479a4cfc245d..dca70d239760 100644
--- a/drivers/net/wireless/realtek/rtlwifi/ps.c
+++ b/drivers/net/wireless/realtek/rtlwifi/ps.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.h b/drivers/net/wireless/realtek/rtlwifi/ps.h
index 0df2b5203030..aaa2ed2bbe16 100644
--- a/drivers/net/wireless/realtek/rtlwifi/ps.h
+++ b/drivers/net/wireless/realtek/rtlwifi/ps.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __REALTEK_RTL_PCI_PS_H__
 #define __REALTEK_RTL_PCI_PS_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/pwrseqcmd.h b/drivers/net/wireless/realtek/rtlwifi/pwrseqcmd.h
index 17ce0cb2c35c..db1765c6fef6 100644
--- a/drivers/net/wireless/realtek/rtlwifi/pwrseqcmd.h
+++ b/drivers/net/wireless/realtek/rtlwifi/pwrseqcmd.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_PWRSEQCMD_H__
 #define __RTL8723E_PWRSEQCMD_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rc.c b/drivers/net/wireless/realtek/rtlwifi/rc.c
index 6c78c6dabbdf..8fa76eab61d2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rc.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rc.h b/drivers/net/wireless/realtek/rtlwifi/rc.h
index f29643d60d6b..1c0a17370093 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rc.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_RC_H__
 #define __RTL_RC_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/regd.c b/drivers/net/wireless/realtek/rtlwifi/regd.c
index 1bf3eb25c1da..c7048830decd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/regd.c
+++ b/drivers/net/wireless/realtek/rtlwifi/regd.c
@@ -1,32 +1,10 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "regd.h"
 
-static struct country_code_to_enum_rd allCountries[] = {
+static struct country_code_to_enum_rd all_countries[] = {
         {COUNTRY_CODE_FCC, "US"},
         {COUNTRY_CODE_IC, "US"},
         {COUNTRY_CODE_ETSI, "EC"},
@@ -391,9 +369,9 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
-                if (allCountries[i].countrycode == countrycode)
-                        return &allCountries[i];
+        for (i = 0; i < ARRAY_SIZE(all_countries); i++) {
+                if (all_countries[i].countrycode == countrycode)
+                        return &all_countries[i];
         }
         return NULL;
 }
diff --git a/drivers/net/wireless/realtek/rtlwifi/regd.h b/drivers/net/wireless/realtek/rtlwifi/regd.h
index f7f15bce35dd..3ba068511e34 100644
--- a/drivers/net/wireless/realtek/rtlwifi/regd.h
+++ b/drivers/net/wireless/realtek/rtlwifi/regd.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_REGD_H__
 #define __RTL_REGD_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
index 45c866d3ca88..fa2e1b063f68 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92C_DEF_H__
 #define __RTL92C_DEF_H__
@@ -123,9 +101,6 @@
 
 #define IS_92C_SERIAL(version)                                          \
         ((IS_81XXC(version) && IS_2T2R(version)) ? true : false)
-#define IS_81xxC_VENDOR_UMC_A_CUT(version)                              \
-        (IS_81XXC(version) ? ((IS_CHIP_VENDOR_UMC(version)) ?           \
-         ((GET_CVID_CUT_VERSION(version)) ? false : true) : false) : false)
 #define IS_81XXC_VENDOR_UMC_B_CUT(version)                              \
         (IS_81XXC(version) ? (IS_CHIP_VENDOR_UMC(version) ?             \
         ((GET_CVID_CUT_VERSION(version) == B_CUT_VERSION) ? true        \
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c
index e05af7d60830..85360353f557 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h
index 50f26a9a97db..eb8090caeec2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL88E_DM_H__
 #define __RTL88E_DM_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
index 63874512598b..203e7b574e84 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h
index b884c30c7b37..39ddb7afea9d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92C__FW__H__
 #define __RTL92C__FW__H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
index cfc8762c55f4..454bab38b165 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h
index 214cd2a32018..fd09b0712d17 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92CE_HW_H__
 #define __RTL92CE_HW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c
index df3e214460db..4ef6d5907521 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h
index 4b325b75faaf..67d3dc389ba0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92CE_LED_H__
 #define __RTL92CE_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c
index 14a256062614..96d8f25b120f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h
index b29bd77210f4..8157ef419eeb 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92C_PHY_H__
 #define __RTL92C_PHY_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.c
index 02013df968a0..d69497bf5d19 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../pwrseqcmd.h"
 #include "pwrseq.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
index 8379a3e5198c..42e222c1795f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL8723E_PWRSEQ_H__
 #define __RTL8723E_PWRSEQ_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
index 0c0d64aea651..0fc8db8916fa 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92C_REG_H__
 #define __RTL92C_REG_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c
index 30798b12a363..0f401ad92c2e 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h
index 0eca030e3238..05e27b40b2a9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92C_RF_H__
 #define __RTL92C_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
index 8c15ffd3568b..eab48fed61ed 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h
index 22398c3753a6..1407151503f8 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92CE_SW_H__
 #define __RTL92CE_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.c
index 68bcb7fe6a65..a3c312c3ed9a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.c
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "table.h"
 u32 RTL8188EEPHY_REG_1TARRAY[] = {
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h
index 403c4ddd236f..df6065602401 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92CE_TABLE__H_
 #define __RTL92CE_TABLE__H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
index 14dcb0816bc0..106011a24827 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -415,7 +393,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
                                 (GET_RX_DESC_FAGGR(pdesc) == 1));
         if (status->packet_report_type == NORMAL_RX)
                 status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
-        status->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
+        status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
         status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
 
         status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate);
@@ -442,7 +420,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
         if (status->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (status->rx_is40Mhzpacket)
+        if (status->rx_is40mhzpacket)
                 rx_status->bw = RATE_INFO_BW_40;
 
         if (status->is_ht)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
index 127ba977206f..c29d9bfa5bd4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2013  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2013  Realtek Corporation.*/
 
 #ifndef __RTL92CE_TRX_H__
 #define __RTL92CE_TRX_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c
index 0b5a06ffa482..2f633118c717 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include <linux/export.h>
 #include "dm_common.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h
index 441604ff5858..c4ce9fc96163 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92COMMON_DM_H__
 #define __RTL92COMMON_DM_H__
@@ -49,7 +27,7 @@
 #define DM_DIG_FA_TH1                           0x100
 #define DM_DIG_FA_TH2                           0x200
 
-#define RXPATHSELECTION_SS_TH_lOW               30
+#define RXPATHSELECTION_SS_TH_LOW               30
 #define RXPATHSELECTION_DIFF_TH                 18
 
 #define DM_RATR_STA_INIT                        0
@@ -60,7 +38,7 @@
 #define CTS2SELF_THVAL                          30
 #define REGC38_TH                               20
 
-#define WAIOTTHVal                              25
+#define WAIOTTHVAL                              25
 
 #define TXHIGHPWRLEVEL_NORMAL                   0
 #define TXHIGHPWRLEVEL_LEVEL1                   1
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
index f3bff66e85d0..6af72799e09c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -79,27 +57,27 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
         is_version_b = IS_NORMAL_CHIP(version);
         if (is_version_b) {
-                u32 pageNums, remainsize;
+                u32 pagenums, remainsize;
                 u32 page, offset;
 
                 if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192CE)
                         rtl_fill_dummy(bufferptr, &size);
 
-                pageNums = size / FW_8192C_PAGE_SIZE;
+                pagenums = size / FW_8192C_PAGE_SIZE;
                 remainsize = size % FW_8192C_PAGE_SIZE;
 
-                if (pageNums > 4)
+                if (pagenums > 4)
                         pr_err("Page numbers should not greater then 4\n");
 
-                for (page = 0; page < pageNums; page++) {
+                for (page = 0; page < pagenums; page++) {
                         offset = page * FW_8192C_PAGE_SIZE;
                         rtl_fw_page_write(hw, page, (bufferptr + offset),
                                           FW_8192C_PAGE_SIZE);
                 }
 
                 if (remainsize) {
-                        offset = pageNums * FW_8192C_PAGE_SIZE;
-                        page = pageNums;
+                        offset = pagenums * FW_8192C_PAGE_SIZE;
+                        page = pagenums;
                         rtl_fw_page_write(hw, page, (bufferptr + offset),
                                           remainsize);
                 }
@@ -118,7 +96,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
         do {
                 value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
         } while ((counter++ < FW_8192C_POLLING_TIMEOUT_COUNT) &&
-                 (!(value32 & FWDL_ChkSum_rpt)));
+                 (!(value32 & FWDL_CHKSUM_RPT)));
 
         if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) {
                 pr_err("chksum report fail! REG_MCUFWDL:0x%08x .\n",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h
index c5fa14bda387..888d9fc94bc2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C__FW__COMMON__H__
 #define __RTL92C__FW__COMMON__H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c
index 889bd1301154..e8af1952d243 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include <linux/module.h>
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
index 7c6e5d91439d..c6a3ed441c3f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../rtl8192ce/reg.h"
@@ -239,7 +217,7 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
 
 EXPORT_SYMBOL(_rtl92c_phy_bb8192c_config_parafile);
 
-void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
+void _rtl92c_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
                                             u32 regaddr, u32 bitmask,
                                             u32 data)
 {
@@ -393,7 +371,7 @@ void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
                 rtlphy->pwrgroup_cnt++;
         }
 }
-EXPORT_SYMBOL(_rtl92c_store_pwrIndex_diffrate_offset);
+EXPORT_SYMBOL(_rtl92c_store_pwrindex_diffrate_offset);
 
 void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 {
@@ -452,10 +430,10 @@ void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
         rtlphy->phyreg_def[RF90_PATH_B].rf3wire_offset =
             RFPGA0_XB_LSSIPARAMETER;
 
-        rtlphy->phyreg_def[RF90_PATH_A].rflssi_select = rFPGA0_XAB_RFPARAMETER;
-        rtlphy->phyreg_def[RF90_PATH_B].rflssi_select = rFPGA0_XAB_RFPARAMETER;
-        rtlphy->phyreg_def[RF90_PATH_C].rflssi_select = rFPGA0_XCD_RFPARAMETER;
-        rtlphy->phyreg_def[RF90_PATH_D].rflssi_select = rFPGA0_XCD_RFPARAMETER;
+        rtlphy->phyreg_def[RF90_PATH_A].rflssi_select = RFPGA0_XAB_RFPARAMETER;
+        rtlphy->phyreg_def[RF90_PATH_B].rflssi_select = RFPGA0_XAB_RFPARAMETER;
+        rtlphy->phyreg_def[RF90_PATH_C].rflssi_select = RFPGA0_XCD_RFPARAMETER;
+        rtlphy->phyreg_def[RF90_PATH_D].rflssi_select = RFPGA0_XCD_RFPARAMETER;
 
         rtlphy->phyreg_def[RF90_PATH_A].rftxgain_stage = RFPGA0_TXGAINSTAGE;
         rtlphy->phyreg_def[RF90_PATH_B].rftxgain_stage = RFPGA0_TXGAINSTAGE;
@@ -1120,19 +1098,19 @@ static void _rtl92c_phy_reload_mac_registers(struct ieee80211_hw *hw,
 static void _rtl92c_phy_path_adda_on(struct ieee80211_hw *hw,
                                      u32 *addareg, bool is_patha_on, bool is2t)
 {
-        u32 pathOn;
+        u32 pathon;
         u32 i;
 
-        pathOn = is_patha_on ? 0x04db25a4 : 0x0b1b25a4;
+        pathon = is_patha_on ? 0x04db25a4 : 0x0b1b25a4;
         if (false == is2t) {
-                pathOn = 0x0bdb25a0;
+                pathon = 0x0bdb25a0;
                 rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0b1b25a0);
         } else {
-                rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathOn);
+                rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathon);
         }
 
         for (i = 1; i < IQK_ADDA_REG_NUM; i++)
-                rtl_set_bbreg(hw, addareg[i], MASKDWORD, pathOn);
+                rtl_set_bbreg(hw, addareg[i], MASKDWORD, pathon);
 }
 
 static void _rtl92c_phy_mac_setting_calibration(struct ieee80211_hw *hw,
@@ -1361,7 +1339,7 @@ static void _rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw,
 
         if (is_hal_stop(rtlhal)) {
                 rtl_set_bbreg(hw, REG_LEDCFG0, BIT(23), 0x01);
-                rtl_set_bbreg(hw, rFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
+                rtl_set_bbreg(hw, RFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
         }
         if (is2t) {
                 if (bmain)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h
index d11261e05a2e..75afa6253ad0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_PHY_COMMON_H__
 #define __RTL92C_PHY_COMMON_H__
@@ -44,9 +22,9 @@
 
 #define LOOP_LIMIT                      5
 #define MAX_STALL_TIME                  50
-#define AntennaDiversityValue           0x80
+#define ANTENNADIVERSITYVALUE           0x80
 #define MAX_TXPWR_IDX_NMODE_92S         63
-#define Reset_Cnt_Limit                 3
+#define RESET_CNT_LIMIT                 3
 
 #define IQK_ADDA_REG_NUM                16
 #define IQK_MAC_REG_NUM                 4
@@ -242,7 +220,7 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,
                                  enum radio_path rfpath, u32 offset,
                                  u32 data);
 bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw);
-void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
+void _rtl92c_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
                                             u32 regaddr, u32 bitmask,
                                             u32 data);
 bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h
index d2005d7e9ad2..147bf2407f8f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_DEF_H__
 #define __RTL92C_DEF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c
index 2c8205e46be4..a3e2c8a60967 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h
index 9761d0ca31b0..eab42c1bd470 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_DM_H__
 #define __RTL92C_DM_H__
@@ -44,7 +22,7 @@
 #define DM_DIG_FA_TH1                           0x100
 #define DM_DIG_FA_TH2                           0x200
 
-#define RXPATHSELECTION_SS_TH_lOW               30
+#define RXPATHSELECTION_SS_TH_LOW               30
 #define RXPATHSELECTION_DIFF_TH                 18
 
 #define DM_RATR_STA_INIT                        0
@@ -55,7 +33,7 @@
 #define CTS2SELF_THVAL                          30
 #define REGC38_TH                               20
 
-#define WAIOTTHVal                              25
+#define WAIOTTHVAL                              25
 
 #define TXHIGHPWRLEVEL_NORMAL                   0
 #define TXHIGHPWRLEVEL_LEVEL1                   1
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
index 4a81e0ef4b8e..d8f496e2d68b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
@@ -104,13 +82,13 @@ void rtl92ce_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
                 break;
         case HW_VAR_FWLPS_RF_ON:{
-                        enum rf_pwrstate rfState;
+                        enum rf_pwrstate rfstate;
                         u32 val_rcr;
 
                         rtlpriv->cfg->ops->get_hw_reg(hw,
                                                       HW_VAR_RF_STATE,
-                                                      (u8 *) (&rfState));
-                        if (rfState == ERFOFF) {
+                                                      (u8 *)(&rfstate));
+                        if (rfstate == ERFOFF) {
                                 *((bool *) (val)) = true;
                         } else {
                                 val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
@@ -336,13 +314,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         if (acm) {
                                 switch (e_aci) {
                                 case AC0_BE:
-                                        acm_ctrl |= AcmHw_BeqEn;
+                                        acm_ctrl |= ACMHW_BEQEN;
                                         break;
                                 case AC2_VI:
-                                        acm_ctrl |= AcmHw_ViqEn;
+                                        acm_ctrl |= ACMHW_VIQEN;
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl |= AcmHw_VoqEn;
+                                        acm_ctrl |= ACMHW_VOQEN;
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
@@ -353,13 +331,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         } else {
                                 switch (e_aci) {
                                 case AC0_BE:
-                                        acm_ctrl &= (~AcmHw_BeqEn);
+                                        acm_ctrl &= (~ACMHW_BEQEN);
                                         break;
                                 case AC2_VI:
-                                        acm_ctrl &= (~AcmHw_ViqEn);
+                                        acm_ctrl &= (~ACMHW_VIQEN);
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl &= (~AcmHw_VoqEn);
+                                        acm_ctrl &= (~ACMHW_VOQEN);
                                         break;
                                 default:
                                         pr_err("switch case %#x not processed\n",
@@ -584,23 +562,23 @@ static bool _rtl92ce_llt_table_init(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         unsigned short i;
         u8 txpktbuf_bndy;
-        u8 maxPage;
+        u8 maxpage;
         bool status;
 
 #if LLT_CONFIG == 1
-        maxPage = 255;
+        maxpage = 255;
         txpktbuf_bndy = 252;
 #elif LLT_CONFIG == 2
-        maxPage = 127;
+        maxpage = 127;
         txpktbuf_bndy = 124;
 #elif LLT_CONFIG == 3
-        maxPage = 255;
+        maxpage = 255;
         txpktbuf_bndy = 174;
 #elif LLT_CONFIG == 4
-        maxPage = 255;
+        maxpage = 255;
         txpktbuf_bndy = 246;
 #elif LLT_CONFIG == 5
-        maxPage = 255;
+        maxpage = 255;
         txpktbuf_bndy = 246;
 #endif
 
@@ -639,13 +617,13 @@ static bool _rtl92ce_llt_table_init(struct ieee80211_hw *hw)
         if (true != status)
                 return status;
 
-        for (i = txpktbuf_bndy; i < maxPage; i++) {
+        for (i = txpktbuf_bndy; i < maxpage; i++) {
                 status = _rtl92ce_llt_write(hw, i, (i + 1));
                 if (true != status)
                         return status;
         }
 
-        status = _rtl92ce_llt_write(hw, maxPage, txpktbuf_bndy);
+        status = _rtl92ce_llt_write(hw, maxpage, txpktbuf_bndy);
         if (true != status)
                 return status;
 
@@ -908,11 +886,11 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw)
                 return;
         }
 
-        sec_reg_value = SCR_TxEncEnable | SCR_RxDecEnable;
+        sec_reg_value = SCR_TXENCENABLE | SCR_RXDECENABLE;
 
         if (rtlpriv->sec.use_defaultkey) {
-                sec_reg_value |= SCR_TxUseDK;
-                sec_reg_value |= SCR_RxUseDK;
+                sec_reg_value |= SCR_TXUSEDK;
+                sec_reg_value |= SCR_RXUSEDK;
         }
 
         sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h
index 6711ea1a75d9..fa1049d16cb7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CE_HW_H__
 #define __RTL92CE_HW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c
index 7edf5af9046e..d6933d36ada2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h
index f6edb9cd9b67..97ab1e00af5f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CE_LED_H__
 #define __RTL92CE_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c
index 7c6d7fc1ef9a..8d18210dd5c8 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -104,7 +82,7 @@ bool rtl92c_phy_bb_config(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN,
                        FEN_PPLL | FEN_PCIEA | FEN_DIO_PCIE |
-                       FEN_BB_GLB_RSTn | FEN_BBRSTB);
+                       FEN_BB_GLB_RSTN | FEN_BBRSTB);
         rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80);
         regvaldw = rtl_read_dword(rtlpriv, REG_LEDCFG0);
         rtl_write_dword(rtlpriv, REG_LEDCFG0, regvaldw | BIT(23));
@@ -236,7 +214,7 @@ bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
                 for (i = 0; i < phy_regarray_pg_len; i = i + 3) {
                         rtl_addr_delay(phy_regarray_table_pg[i]);
 
-                        _rtl92c_store_pwrIndex_diffrate_offset(hw,
+                        _rtl92c_store_pwrindex_diffrate_offset(hw,
                                                phy_regarray_table_pg[i],
                                                phy_regarray_table_pg[i + 1],
                                                phy_regarray_table_pg[i + 2]);
@@ -464,13 +442,13 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         if ((ppsc->rfpwr_state == ERFOFF) &&
                             RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
                                 bool rtstatus;
-                                u32 InitializeCount = 0;
+                                u32 initializecount = 0;
                                 do {
-                                        InitializeCount++;
+                                        initializecount++;
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                                  "IPS Set eRf nic enable\n");
                                         rtstatus = rtl_ps_enable_nic(hw);
-                                } while (!rtstatus && (InitializeCount < 10));
+                                } while (!rtstatus && (initializecount < 10));
                                 RT_CLEAR_PS_LEVEL(ppsc,
                                                   RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h
index 93f3bc0197b4..7582a162bd11 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_PHY_H__
 #define __RTL92C_PHY_H__
@@ -44,9 +22,9 @@
 
 #define LOOP_LIMIT                      5
 #define MAX_STALL_TIME                  50
-#define AntennaDiversityValue           0x80
+#define ANTENNADIVERSITYVALUE           0x80
 #define MAX_TXPWR_IDX_NMODE_92S         63
-#define Reset_Cnt_Limit                 3
+#define RESET_CNT_LIMIT                 3
 
 #define IQK_ADDA_REG_NUM                16
 #define IQK_MAC_REG_NUM                 4
@@ -122,7 +100,7 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,
 void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
                                     enum radio_path rfpath, u32 offset,
                                     u32 data);
-void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
+void _rtl92c_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
                                             u32 regaddr, u32 bitmask, u32 data);
 bool _rtl92ce_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
 void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
index 9e3b58a5d2bb..431277ef1c98 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_REG_H__
 #define __RTL92C_REG_H__
@@ -702,7 +680,7 @@
 #define PWC_EV12V                               BIT(15)
 
 #define FEN_BBRSTB                              BIT(0)
-#define FEN_BB_GLB_RSTn                         BIT(1)
+#define FEN_BB_GLB_RSTN                         BIT(1)
 #define FEN_USBA                                BIT(2)
 #define FEN_UPLL                                BIT(3)
 #define FEN_USBD                                BIT(4)
@@ -722,7 +700,7 @@
 #define PFM_ALDN                                BIT(1)
 #define PFM_LDKP                                BIT(2)
 #define PFM_WOWL                                BIT(3)
-#define EnPDN                                   BIT(4)
+#define ENPDN                                   BIT(4)
 #define PDN_PL                                  BIT(5)
 #define APFM_ONMAC                              BIT(8)
 #define APFM_OFF                                BIT(9)
@@ -837,19 +815,19 @@
 #define LDOE25_EN                               BIT(31)
 
 #define RSM_EN                                  BIT(0)
-#define Timer_EN                                BIT(4)
+#define TIMER_EN                                BIT(4)
 
 #define TRSW0EN                                 BIT(2)
 #define TRSW1EN                                 BIT(3)
 #define EROM_EN                                 BIT(4)
-#define EnBT                                    BIT(5)
-#define EnUart                                  BIT(8)
-#define Uart_910                                BIT(9)
-#define EnPMAC                                  BIT(10)
+#define ENBT                                    BIT(5)
+#define ENUART                                  BIT(8)
+#define UART_910                                BIT(9)
+#define ENPMAC                                  BIT(10)
 #define SIC_SWRST                               BIT(11)
-#define EnSIC                                   BIT(12)
+#define ENSIC                                   BIT(12)
 #define SIC_23                                  BIT(13)
-#define EnHDP                                   BIT(14)
+#define ENHDP                                   BIT(14)
 #define SIC_LBK                                 BIT(15)
 
 #define LED0PL                                  BIT(4)
@@ -858,7 +836,7 @@
 
 #define MCUFWDL_EN                              BIT(0)
 #define MCUFWDL_RDY                             BIT(1)
-#define FWDL_ChkSum_rpt                         BIT(2)
+#define FWDL_CHKSUM_RPT                         BIT(2)
 #define MACINI_RDY                              BIT(3)
 #define BBINI_RDY                               BIT(4)
 #define RFINI_RDY                               BIT(5)
@@ -1076,13 +1054,13 @@
 #define DIS_TSF_UDT0_NORMAL_CHIP                BIT(4)
 #define DIS_TSF_UDT0_TEST_CHIP                  BIT(5)
 
-#define AcmHw_HwEn                              BIT(0)
-#define AcmHw_BeqEn                             BIT(1)
-#define AcmHw_ViqEn                             BIT(2)
-#define AcmHw_VoqEn                             BIT(3)
-#define AcmHw_BeqStatus                         BIT(4)
-#define AcmHw_ViqStatus                         BIT(5)
-#define AcmHw_VoqStatus                         BIT(6)
+#define ACMHW_HWEN                              BIT(0)
+#define ACMHW_BEQEN                             BIT(1)
+#define ACMHW_VIQEN                             BIT(2)
+#define ACMHW_VOQEN                             BIT(3)
+#define ACMHW_BEQSTATUS                         BIT(4)
+#define ACMHW_VIQSTATUS                         BIT(5)
+#define ACMHW_VOQSTATUS                         BIT(6)
 
 #define APSDOFF                                 BIT(6)
 #define APSDOFF_STATUS                          BIT(7)
@@ -1121,7 +1099,7 @@
 #define BM_DATA_EN                              BIT(17)
 #define MFBEN                                   BIT(22)
 #define LSIGEN                                  BIT(23)
-#define EnMBID                                  BIT(24)
+#define ENMBID                                  BIT(24)
 #define APP_BASSN                               BIT(27)
 #define APP_PHYSTS                              BIT(28)
 #define APP_ICV                                 BIT(29)
@@ -1150,12 +1128,12 @@
 #define RXERR_RPT_RST                           BIT(27)
 #define _RXERR_RPT_SEL(type)                    ((type) << 28)
 
-#define SCR_TxUseDK                             BIT(0)
-#define SCR_RxUseDK                             BIT(1)
-#define SCR_TxEncEnable                         BIT(2)
-#define SCR_RxDecEnable                         BIT(3)
-#define SCR_SKByA2                              BIT(4)
-#define SCR_NoSKMC                              BIT(5)
+#define SCR_TXUSEDK                             BIT(0)
+#define SCR_RXUSEDK                             BIT(1)
+#define SCR_TXENCENABLE                         BIT(2)
+#define SCR_RXDECENABLE                         BIT(3)
+#define SCR_SKBYA2                              BIT(4)
+#define SCR_NOSKMC                              BIT(5)
 #define SCR_TXBCUSEDK                           BIT(6)
 #define SCR_RXBCUSEDK                           BIT(7)
 
@@ -1208,7 +1186,7 @@
 #define RPMAC_CCKPLCPHEADER                     0x144
 #define RPMAC_CCKCRC16                          0x148
 #define RPMAC_OFDMRXCRC32OK                     0x170
-#define RPMAC_OFDMRXCRC32Er                     0x174
+#define RPMAC_OFDMRXCRC32ER                     0x174
 #define RPMAC_OFDMRXPARITYER                    0x178
 #define RPMAC_OFDMRXCRC8ER                      0x17c
 #define RPMAC_CCKCRXRC16ER                      0x180
@@ -1246,8 +1224,8 @@
 #define RFPGA0_XAB_RFINTERFACESW                0x870
 #define RFPGA0_XCD_RFINTERFACESW                0x874
 
-#define rFPGA0_XAB_RFPARAMETER                  0x878
-#define rFPGA0_XCD_RFPARAMETER                  0x87c
+#define RFPGA0_XAB_RFPARAMETER                  0x878
+#define RFPGA0_XCD_RFPARAMETER                  0x87c
 
 #define RFPGA0_ANALOGPARAMETER1                 0x880
 #define RFPGA0_ANALOGPARAMETER2                 0x884
@@ -1521,8 +1499,8 @@
 #define BCCKTXCRC16                             0xffff
 #define BCCKTXSTATUS                            0x1
 #define BOFDMTXSTATUS                           0x2
-#define IS_BB_REG_OFFSET_92S(_Offset)           \
-        ((_Offset >= 0x800) && (_Offset <= 0xfff))
+#define IS_BB_REG_OFFSET_92S(_offset)           \
+        (((_offset) >= 0x800) && ((_offset) <= 0xfff))
 
 #define BRFMOD                                  0x1
 #define BJAPANMODE                              0x2
@@ -1715,7 +1693,6 @@
 #define BCCK_RF_EXTEND                          0x20000000
 #define BCCK_RXAGC_SATLEVEL                     0x1f000000
 #define BCCK_RXAGC_SATCOUNT                     0xe0
-#define bCCKRxRFSettle                          0x1f
 #define BCCK_FIXED_RXAGC                        0x8000
 #define BCCK_ANTENNA_POLARITY                   0x2000
 #define BCCK_TXFILTER_TYPE                      0x0c00
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c
index e68ed7f37c79..713859488744 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
@@ -150,18 +128,18 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-        u32 powerBase0, powerBase1;
+        u32 powerbase0, powerbase1;
         u8 legacy_pwrdiff, ht20_pwrdiff;
         u8 i, powerlevel[2];
 
         for (i = 0; i < 2; i++) {
                 powerlevel[i] = ppowerlevel[i];
                 legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff[i][channel - 1];
-                powerBase0 = powerlevel[i] + legacy_pwrdiff;
+                powerbase0 = powerlevel[i] + legacy_pwrdiff;
 
-                powerBase0 = (powerBase0 << 24) | (powerBase0 << 16) |
-                    (powerBase0 << 8) | powerBase0;
-                *(ofdmbase + i) = powerBase0;
+                powerbase0 = (powerbase0 << 24) | (powerbase0 << 16) |
+                    (powerbase0 << 8) | powerbase0;
+                *(ofdmbase + i) = powerbase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                         " [OFDM power base index rf(%c) = 0x%x]\n",
                         i == 0 ? 'A' : 'B', *(ofdmbase + i));
@@ -172,11 +150,11 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                         ht20_pwrdiff = rtlefuse->txpwr_ht20diff[i][channel - 1];
                         powerlevel[i] += ht20_pwrdiff;
                 }
-                powerBase1 = powerlevel[i];
-                powerBase1 = (powerBase1 << 24) |
-                    (powerBase1 << 16) | (powerBase1 << 8) | powerBase1;
+                powerbase1 = powerlevel[i];
+                powerbase1 = (powerbase1 << 24) |
+                    (powerbase1 << 16) | (powerbase1 << 8) | powerbase1;
 
-                *(mcsbase + i) = powerBase1;
+                *(mcsbase + i) = powerbase1;
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                         " [MCS power base index rf(%c) = 0x%x]\n",
@@ -186,37 +164,37 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
 
 static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                        u8 channel, u8 index,
-                                                       u32 *powerBase0,
-                                                       u32 *powerBase1,
+                                                       u32 *powerbase0,
+                                                       u32 *powerbase1,
                                                        u32 *p_outwriteval)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 i, chnlgroup = 0, pwr_diff_limit[4];
-        u32 writeVal, customer_limit, rf;
+        u32 writeval, customer_limit, rf;
 
         for (rf = 0; rf < 2; rf++) {
                 switch (rtlefuse->eeprom_regulatory) {
                 case 0:
                         chnlgroup = 0;
 
-                        writeVal = rtlphy->mcs_offset[chnlgroup][index +
+                        writeval = rtlphy->mcs_offset[chnlgroup][index +
                             (rf ? 8 : 0)]
-                            + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
+                            + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "RTK better performance, writeVal(%c) = 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "RTK better performance, writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 1:
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-                                writeVal = ((index < 2) ? powerBase0[rf] :
-                                            powerBase1[rf]);
+                                writeval = ((index < 2) ? powerbase0[rf] :
+                                            powerbase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        "Realtek regulatory, 40MHz, writeVal(%c) = 0x%x\n",
-                                        rf == 0 ? 'A' : 'B', writeVal);
+                                        "Realtek regulatory, 40MHz, writeval(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeval);
                         } else {
                                 if (rtlphy->pwrgroup_cnt == 1)
                                         chnlgroup = 0;
@@ -231,23 +209,23 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                 chnlgroup++;
                                 }
 
-                                writeVal = rtlphy->mcs_offset[chnlgroup]
+                                writeval = rtlphy->mcs_offset[chnlgroup]
                                     [index + (rf ? 8 : 0)] + ((index < 2) ?
-                                                              powerBase0[rf] :
-                                                              powerBase1[rf]);
+                                                              powerbase0[rf] :
+                                                              powerbase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
-                                        rf == 0 ? 'A' : 'B', writeVal);
+                                        "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeval);
                         }
                         break;
                 case 2:
-                        writeVal =
-                            ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
+                        writeval =
+                            ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "Better regulatory, writeVal(%c) = 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "Better regulatory, writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 3:
                         chnlgroup = 0;
@@ -297,36 +275,36 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                 "Customer's limit rf(%c) = 0x%x\n",
                                 rf == 0 ? 'A' : 'B', customer_limit);
 
-                        writeVal = customer_limit +
-                            ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
+                        writeval = customer_limit +
+                            ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "Customer, writeVal rf(%c)= 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "Customer, writeval rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 default:
                         chnlgroup = 0;
-                        writeVal = rtlphy->mcs_offset[chnlgroup]
+                        writeval = rtlphy->mcs_offset[chnlgroup]
                             [index + (rf ? 8 : 0)]
-                            + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
+                            + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "RTK better performance, writeVal rf(%c) = 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "RTK better performance, writeval rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 }
 
                 if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1)
-                        writeVal = writeVal - 0x06060606;
+                        writeval = writeval - 0x06060606;
                 else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
                          TXHIGHPWRLEVEL_BT2)
-                        writeVal = writeVal - 0x0c0c0c0c;
-                *(p_outwriteval + rf) = writeVal;
+                        writeval = writeval - 0x0c0c0c0c;
+                *(p_outwriteval + rf) = writeval;
         }
 }
 
 static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
-                                         u8 index, u32 *pValue)
+                                         u8 index, u32 *value)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -342,29 +320,29 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                 RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12
         };
         u8 i, rf, pwr_val[4];
-        u32 writeVal;
+        u32 writeval;
         u16 regoffset;
 
         for (rf = 0; rf < 2; rf++) {
-                writeVal = pValue[rf];
+                writeval = value[rf];
                 for (i = 0; i < 4; i++) {
-                        pwr_val[i] = (u8) ((writeVal & (0x7f <<
+                        pwr_val[i] = (u8)((writeval & (0x7f <<
                                                         (i * 8))) >> (i * 8));
 
                         if (pwr_val[i] > RF6052_MAX_TX_PWR)
                                 pwr_val[i] = RF6052_MAX_TX_PWR;
                 }
-                writeVal = (pwr_val[3] << 24) | (pwr_val[2] << 16) |
+                writeval = (pwr_val[3] << 24) | (pwr_val[2] << 16) |
                     (pwr_val[1] << 8) | pwr_val[0];
 
                 if (rf == 0)
                         regoffset = regoffset_a[index];
                 else
                         regoffset = regoffset_b[index];
-                rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal);
+                rtl_set_bbreg(hw, regoffset, MASKDWORD, writeval);
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        "Set 0x%x = %08x\n", regoffset, writeVal);
+                        "Set 0x%x = %08x\n", regoffset, writeval);
 
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS15_MCS12 ||
@@ -373,7 +351,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                      (regoffset == RTXAGC_A_MCS07_MCS04 ||
                       regoffset == RTXAGC_B_MCS07_MCS04))) {
 
-                        writeVal = pwr_val[3];
+                        writeval = pwr_val[3];
                         if (regoffset == RTXAGC_A_MCS15_MCS12 ||
                             regoffset == RTXAGC_A_MCS07_MCS04)
                                 regoffset = 0xc90;
@@ -382,9 +360,9 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                                 regoffset = 0xc98;
 
                         for (i = 0; i < 3; i++) {
-                                writeVal = (writeVal > 6) ? (writeVal - 6) : 0;
+                                writeval = (writeval > 6) ? (writeval - 6) : 0;
                                 rtl_write_byte(rtlpriv, (u32) (regoffset + i),
-                                               (u8) writeVal);
+                                               (u8)writeval);
                         }
                 }
         }
@@ -393,20 +371,20 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
 void rtl92ce_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
                                         u8 *ppowerlevel, u8 channel)
 {
-        u32 writeVal[2], powerBase0[2], powerBase1[2];
+        u32 writeval[2], powerbase0[2], powerbase1[2];
         u8 index;
 
         rtl92c_phy_get_power_base(hw, ppowerlevel,
-                                  channel, &powerBase0[0], &powerBase1[0]);
+                                  channel, &powerbase0[0], &powerbase1[0]);
 
         for (index = 0; index < 6; index++) {
                 _rtl92c_get_txpower_writeval_by_regulatory(hw,
                                                            channel, index,
-                                                           &powerBase0[0],
-                                                           &powerBase1[0],
-                                                           &writeVal[0]);
+                                                           &powerbase0[0],
+                                                           &powerbase1[0],
+                                                           &writeval[0]);
 
-                _rtl92c_write_ofdm_power_reg(hw, index, &writeVal[0]);
+                _rtl92c_write_ofdm_power_reg(hw, index, &writeval[0]);
         }
 }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h
index 22c5e6f51331..6fa70224d2d4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_RF_H__
 #define __RTL92C_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
index 71a6761d3648..a9c0111444bc 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h
index 9a1c89cbbda1..f2d121a60159 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CE_SW_H__
 #define __RTL92CE_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c
index 98b06d48a2dd..e258b0803699 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "table.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h
index 51e4e07396a6..473af27f80d9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CE_TABLE__H_
 #define __RTL92CE_TABLE__H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
index d36e0060cc7a..b08fb1bf6709 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -354,7 +332,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
         stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
                                    && (GET_RX_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
-        stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
+        stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
         stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
 
         stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
@@ -368,7 +346,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
         if (stats->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (stats->rx_is40Mhzpacket)
+        if (stats->rx_is40mhzpacket)
                 rx_status->bw = RATE_INFO_BW_40;
 
         if (stats->is_ht)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h
index 91f0bd6b752f..fb1d4444a52f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CE_TRX_H__
 #define __RTL92CE_TRX_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h
index 316fe9990b6d..91e4427ab022 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../rtl8192ce/def.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c
index 00fc0685317a..9d1167ff3b50 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.h
index ce71433792e3..2befc2f4e3fd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../rtl8192ce/dm.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
index 1e60f70481f5..52ee713d50f5 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
@@ -53,9 +31,9 @@ static void _rtl92cu_phy_param_tab_init(struct ieee80211_hw *hw)
         rtlphy->hwparam_tables[MAC_REG].pdata = RTL8192CUMAC_2T_ARRAY;
         if (IS_HIGHT_PA(rtlefuse->board_type)) {
                 rtlphy->hwparam_tables[PHY_REG_PG].length =
-                        RTL8192CUPHY_REG_Array_PG_HPLength;
+                        RTL8192CUPHY_REG_ARRAY_PG_HPLENGTH;
                 rtlphy->hwparam_tables[PHY_REG_PG].pdata =
-                        RTL8192CUPHY_REG_Array_PG_HP;
+                        RTL8192CUPHY_REG_ARRAY_PG_HP;
         } else {
                 rtlphy->hwparam_tables[PHY_REG_PG].length =
                         RTL8192CUPHY_REG_ARRAY_PGLENGTH;
@@ -82,21 +60,21 @@ static void _rtl92cu_phy_param_tab_init(struct ieee80211_hw *hw)
         /* 1T */
         if (IS_HIGHT_PA(rtlefuse->board_type)) {
                 rtlphy->hwparam_tables[PHY_REG_1T].length =
-                        RTL8192CUPHY_REG_1T_HPArrayLength;
+                        RTL8192CUPHY_REG_1T_HPARRAYLENGTH;
                 rtlphy->hwparam_tables[PHY_REG_1T].pdata =
-                        RTL8192CUPHY_REG_1T_HPArray;
+                        RTL8192CUPHY_REG_1T_HPARRAY;
                 rtlphy->hwparam_tables[RADIOA_1T].length =
-                        RTL8192CURadioA_1T_HPArrayLength;
+                        RTL8192CURADIOA_1T_HPARRAYLENGTH;
                 rtlphy->hwparam_tables[RADIOA_1T].pdata =
-                        RTL8192CURadioA_1T_HPArray;
+                        RTL8192CURADIOA_1T_HPARRAY;
                 rtlphy->hwparam_tables[RADIOB_1T].length =
                         RTL8192CURADIOB_1TARRAYLENGTH;
                 rtlphy->hwparam_tables[RADIOB_1T].pdata =
                         RTL8192CU_RADIOB_1TARRAY;
                 rtlphy->hwparam_tables[AGCTAB_1T].length =
-                        RTL8192CUAGCTAB_1T_HPArrayLength;
+                        RTL8192CUAGCTAB_1T_HPARRAYLENGTH;
                 rtlphy->hwparam_tables[AGCTAB_1T].pdata =
-                        Rtl8192CUAGCTAB_1T_HPArray;
+                        RTL8192CUAGCTAB_1T_HPARRAY;
         } else {
                 rtlphy->hwparam_tables[PHY_REG_1T].length =
                          RTL8192CUPHY_REG_1TARRAY_LENGTH;
@@ -323,16 +301,16 @@ static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
 {
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 boardType;
+        u8 boardtype;
 
         if (IS_NORMAL_CHIP(rtlhal->version)) {
-                boardType = ((contents[EEPROM_RF_OPT1]) &
+                boardtype = ((contents[EEPROM_RF_OPT1]) &
                             BOARD_TYPE_NORMAL_MASK) >> 5; /*bit[7:5]*/
         } else {
-                boardType = contents[EEPROM_RF_OPT4];
-                boardType &= BOARD_TYPE_TEST_MASK;
+                boardtype = contents[EEPROM_RF_OPT4];
+                boardtype &= BOARD_TYPE_TEST_MASK;
         }
-        rtlefuse->board_type = boardType;
+        rtlefuse->board_type = boardtype;
         if (IS_HIGHT_PA(rtlefuse->board_type))
                 rtlefuse->external_pa = 1;
         pr_info("Board Type %x\n", rtlefuse->board_type);
@@ -442,7 +420,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
         u16             value16;
         u8              value8;
         /*  polling autoload done. */
-        u32     pollingCount = 0;
+        u32     pollingcount = 0;
 
         do {
                 if (rtl_read_byte(rtlpriv, REG_APS_FSMCO) & PFM_ALDN) {
@@ -450,7 +428,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
                                  "Autoload Done!\n");
                         break;
                 }
-                if (pollingCount++ > 100) {
+                if (pollingcount++ > 100) {
                         pr_err("Failed to polling REG_APS_FSMCO[PFM_ALDN] done!\n");
                         return -ENODEV;
                 }
@@ -474,7 +452,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_ISO_CTRL, value8);
         }
         /*  auto enable WLAN */
-        pollingCount = 0;
+        pollingcount = 0;
         value16 = rtl_read_word(rtlpriv, REG_APS_FSMCO);
         value16 |= APFM_ONMAC;
         rtl_write_word(rtlpriv, REG_APS_FSMCO, value16);
@@ -483,7 +461,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
                         pr_info("MAC auto ON okay!\n");
                         break;
                 }
-                if (pollingCount++ > 1000) {
+                if (pollingcount++ > 1000) {
                         pr_err("Failed to polling REG_APS_FSMCO[APFM_ONMAC] done!\n");
                         return -ENODEV;
                 }
@@ -495,12 +473,12 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
         value16 &= ~ISO_DIOR;
         rtl_write_word(rtlpriv, REG_SYS_ISO_CTRL, value16);
         /* Reconsider when to do this operation after asking HWSD. */
-        pollingCount = 0;
+        pollingcount = 0;
         rtl_write_byte(rtlpriv, REG_APSD_CTRL, (rtl_read_byte(rtlpriv,
                                                 REG_APSD_CTRL) & ~BIT(6)));
         do {
-                pollingCount++;
-        } while ((pollingCount < 200) &&
+                pollingcount++;
+        } while ((pollingcount < 200) &&
                  (rtl_read_byte(rtlpriv, REG_APSD_CTRL) & BIT(7)));
         /* Enable MAC DMA/WMAC/SCHEDULE/SEC block */
         value16 = rtl_read_word(rtlpriv,  REG_CR);
@@ -517,60 +495,60 @@ static void _rtl92cu_init_queue_reserved_page(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        bool isChipN = IS_NORMAL_CHIP(rtlhal->version);
-        u32 outEPNum = (u32)out_ep_num;
-        u32 numHQ = 0;
-        u32 numLQ = 0;
-        u32 numNQ = 0;
-        u32 numPubQ;
+        bool ischipn = IS_NORMAL_CHIP(rtlhal->version);
+        u32 outepnum = (u32)out_ep_num;
+        u32 numhq = 0;
+        u32 numlq = 0;
+        u32 numnq = 0;
+        u32 numpubq;
         u32 value32;
         u8 value8;
-        u32 txQPageNum, txQPageUnit, txQRemainPage;
+        u32 txqpagenum, txqpageunit, txqremaininpage;
 
         if (!wmm_enable) {
-                numPubQ = (isChipN) ? CHIP_B_PAGE_NUM_PUBQ :
+                numpubq = (ischipn) ? CHIP_B_PAGE_NUM_PUBQ :
                           CHIP_A_PAGE_NUM_PUBQ;
-                txQPageNum = TX_TOTAL_PAGE_NUMBER - numPubQ;
+                txqpagenum = TX_TOTAL_PAGE_NUMBER - numpubq;
 
-                txQPageUnit = txQPageNum/outEPNum;
-                txQRemainPage = txQPageNum % outEPNum;
+                txqpageunit = txqpagenum / outepnum;
+                txqremaininpage = txqpagenum % outepnum;
                 if (queue_sel & TX_SELE_HQ)
-                        numHQ = txQPageUnit;
+                        numhq = txqpageunit;
                 if (queue_sel & TX_SELE_LQ)
-                        numLQ = txQPageUnit;
+                        numlq = txqpageunit;
                 /* HIGH priority queue always present in the configuration of
                  * 2 out-ep. Remainder pages have assigned to High queue */
-                if ((outEPNum > 1) && (txQRemainPage))
-                        numHQ += txQRemainPage;
+                if (outepnum > 1 && txqremaininpage)
+                        numhq += txqremaininpage;
                 /* NOTE: This step done before writting REG_RQPN. */
-                if (isChipN) {
+                if (ischipn) {
                         if (queue_sel & TX_SELE_NQ)
-                                numNQ = txQPageUnit;
-                        value8 = (u8)_NPQ(numNQ);
+                                numnq = txqpageunit;
+                        value8 = (u8)_NPQ(numnq);
                         rtl_write_byte(rtlpriv,  REG_RQPN_NPQ, value8);
                 }
         } else {
                 /* for WMM ,number of out-ep must more than or equal to 2! */
-                numPubQ = isChipN ? WMM_CHIP_B_PAGE_NUM_PUBQ :
+                numpubq = ischipn ? WMM_CHIP_B_PAGE_NUM_PUBQ :
                           WMM_CHIP_A_PAGE_NUM_PUBQ;
                 if (queue_sel & TX_SELE_HQ) {
-                        numHQ = isChipN ? WMM_CHIP_B_PAGE_NUM_HPQ :
+                        numhq = ischipn ? WMM_CHIP_B_PAGE_NUM_HPQ :
                                 WMM_CHIP_A_PAGE_NUM_HPQ;
                 }
                 if (queue_sel & TX_SELE_LQ) {
-                        numLQ = isChipN ? WMM_CHIP_B_PAGE_NUM_LPQ :
+                        numlq = ischipn ? WMM_CHIP_B_PAGE_NUM_LPQ :
                                 WMM_CHIP_A_PAGE_NUM_LPQ;
                 }
                 /* NOTE: This step done before writting REG_RQPN. */
-                if (isChipN) {
+                if (ischipn) {
                         if (queue_sel & TX_SELE_NQ)
-                                numNQ = WMM_CHIP_B_PAGE_NUM_NPQ;
-                        value8 = (u8)_NPQ(numNQ);
+                                numnq = WMM_CHIP_B_PAGE_NUM_NPQ;
+                        value8 = (u8)_NPQ(numnq);
                         rtl_write_byte(rtlpriv, REG_RQPN_NPQ, value8);
                 }
         }
         /* TX DMA */
-        value32 = _HPQ(numHQ) | _LPQ(numLQ) | _PUBQ(numPubQ) | LD_RQPN;
+        value32 = _HPQ(numhq) | _LPQ(numlq) | _PUBQ(numpubq) | LD_RQPN;
         rtl_write_dword(rtlpriv, REG_RQPN, value32);
 }
 
@@ -597,20 +575,20 @@ static void _rtl92c_init_trx_buffer(struct ieee80211_hw *hw, bool wmm_enable)
         rtl_write_byte(rtlpriv, REG_PBP, value8);
 }
 
-static void _rtl92c_init_chipN_reg_priority(struct ieee80211_hw *hw, u16 beQ,
-                                            u16 bkQ, u16 viQ, u16 voQ,
-                                            u16 mgtQ, u16 hiQ)
+static void _rtl92c_init_chipn_reg_priority(struct ieee80211_hw *hw, u16 beq,
+                                            u16 bkq, u16 viq, u16 voq,
+                                            u16 mgtq, u16 hiq)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u16 value16 = (rtl_read_word(rtlpriv, REG_TRXDMA_CTRL) & 0x7);
 
-        value16 |= _TXDMA_BEQ_MAP(beQ) | _TXDMA_BKQ_MAP(bkQ) |
-                   _TXDMA_VIQ_MAP(viQ) | _TXDMA_VOQ_MAP(voQ) |
-                   _TXDMA_MGQ_MAP(mgtQ) | _TXDMA_HIQ_MAP(hiQ);
+        value16 |= _TXDMA_BEQ_MAP(beq) | _TXDMA_BKQ_MAP(bkq) |
+                   _TXDMA_VIQ_MAP(viq) | _TXDMA_VOQ_MAP(voq) |
+                   _TXDMA_MGQ_MAP(mgtq) | _TXDMA_HIQ_MAP(hiq);
         rtl_write_word(rtlpriv,  REG_TRXDMA_CTRL, value16);
 }
 
-static void _rtl92cu_init_chipN_one_out_ep_priority(struct ieee80211_hw *hw,
+static void _rtl92cu_init_chipn_one_out_ep_priority(struct ieee80211_hw *hw,
                                                     bool wmm_enable,
                                                     u8 queue_sel)
 {
@@ -630,96 +608,96 @@ static void _rtl92cu_init_chipN_one_out_ep_priority(struct ieee80211_hw *hw,
                 WARN_ON(1); /* Shall not reach here! */
                 break;
         }
-        _rtl92c_init_chipN_reg_priority(hw, value, value, value, value,
+        _rtl92c_init_chipn_reg_priority(hw, value, value, value, value,
                                         value, value);
         pr_info("Tx queue select: 0x%02x\n", queue_sel);
 }
 
-static void _rtl92cu_init_chipN_two_out_ep_priority(struct ieee80211_hw *hw,
-                                                                bool wmm_enable,
-                                                                u8 queue_sel)
+static void _rtl92cu_init_chipn_two_out_ep_priority(struct ieee80211_hw *hw,
+                                                     bool wmm_enable,
+                                                     u8 queue_sel)
 {
-        u16 beQ, bkQ, viQ, voQ, mgtQ, hiQ;
-        u16 uninitialized_var(valueHi);
-        u16 uninitialized_var(valueLow);
+        u16 beq, bkq, viq, voq, mgtq, hiq;
+        u16 uninitialized_var(valuehi);
+        u16 uninitialized_var(valuelow);
 
         switch (queue_sel) {
         case (TX_SELE_HQ | TX_SELE_LQ):
-                valueHi = QUEUE_HIGH;
-                valueLow = QUEUE_LOW;
+                valuehi = QUEUE_HIGH;
+                valuelow = QUEUE_LOW;
                 break;
         case (TX_SELE_NQ | TX_SELE_LQ):
-                valueHi = QUEUE_NORMAL;
-                valueLow = QUEUE_LOW;
+                valuehi = QUEUE_NORMAL;
+                valuelow = QUEUE_LOW;
                 break;
         case (TX_SELE_HQ | TX_SELE_NQ):
-                valueHi = QUEUE_HIGH;
-                valueLow = QUEUE_NORMAL;
+                valuehi = QUEUE_HIGH;
+                valuelow = QUEUE_NORMAL;
                 break;
         default:
                 WARN_ON(1);
                 break;
         }
         if (!wmm_enable) {
-                beQ = valueLow;
-                bkQ = valueLow;
-                viQ = valueHi;
-                voQ = valueHi;
-                mgtQ = valueHi;
-                hiQ = valueHi;
+                beq = valuelow;
+                bkq = valuelow;
+                viq = valuehi;
+                voq = valuehi;
+                mgtq = valuehi;
+                hiq = valuehi;
         } else {/* for WMM ,CONFIG_OUT_EP_WIFI_MODE */
-                beQ = valueHi;
-                bkQ = valueLow;
-                viQ = valueLow;
-                voQ = valueHi;
-                mgtQ = valueHi;
-                hiQ = valueHi;
+                beq = valuehi;
+                bkq = valuelow;
+                viq = valuelow;
+                voq = valuehi;
+                mgtq = valuehi;
+                hiq = valuehi;
         }
-        _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
+        _rtl92c_init_chipn_reg_priority(hw, beq, bkq, viq, voq, mgtq, hiq);
         pr_info("Tx queue select: 0x%02x\n", queue_sel);
 }
 
-static void _rtl92cu_init_chipN_three_out_ep_priority(struct ieee80211_hw *hw,
+static void _rtl92cu_init_chipn_three_out_ep_priority(struct ieee80211_hw *hw,
                                                       bool wmm_enable,
                                                       u8 queue_sel)
 {
-        u16 beQ, bkQ, viQ, voQ, mgtQ, hiQ;
+        u16 beq, bkq, viq, voq, mgtq, hiq;
 
         if (!wmm_enable) { /* typical setting */
-                beQ     = QUEUE_LOW;
-                bkQ     = QUEUE_LOW;
-                viQ     = QUEUE_NORMAL;
-                voQ     = QUEUE_HIGH;
-                mgtQ    = QUEUE_HIGH;
-                hiQ     = QUEUE_HIGH;
+                beq     = QUEUE_LOW;
+                bkq     = QUEUE_LOW;
+                viq     = QUEUE_NORMAL;
+                voq     = QUEUE_HIGH;
+                mgtq    = QUEUE_HIGH;
+                hiq     = QUEUE_HIGH;
         } else { /* for WMM */
-                beQ     = QUEUE_LOW;
-                bkQ     = QUEUE_NORMAL;
-                viQ     = QUEUE_NORMAL;
-                voQ     = QUEUE_HIGH;
-                mgtQ    = QUEUE_HIGH;
-                hiQ     = QUEUE_HIGH;
+                beq     = QUEUE_LOW;
+                bkq     = QUEUE_NORMAL;
+                viq     = QUEUE_NORMAL;
+                voq     = QUEUE_HIGH;
+                mgtq    = QUEUE_HIGH;
+                hiq     = QUEUE_HIGH;
         }
-        _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
+        _rtl92c_init_chipn_reg_priority(hw, beq, bkq, viq, voq, mgtq, hiq);
         pr_info("Tx queue select :0x%02x..\n", queue_sel);
 }
 
-static void _rtl92cu_init_chipN_queue_priority(struct ieee80211_hw *hw,
+static void _rtl92cu_init_chipn_queue_priority(struct ieee80211_hw *hw,
                                                bool wmm_enable,
                                                u8 out_ep_num,
                                                u8 queue_sel)
 {
         switch (out_ep_num) {
         case 1:
-                _rtl92cu_init_chipN_one_out_ep_priority(hw, wmm_enable,
+                _rtl92cu_init_chipn_one_out_ep_priority(hw, wmm_enable,
                                                         queue_sel);
                 break;
         case 2:
-                _rtl92cu_init_chipN_two_out_ep_priority(hw, wmm_enable,
+                _rtl92cu_init_chipn_two_out_ep_priority(hw, wmm_enable,
                                                         queue_sel);
                 break;
         case 3:
-                _rtl92cu_init_chipN_three_out_ep_priority(hw, wmm_enable,
+                _rtl92cu_init_chipn_three_out_ep_priority(hw, wmm_enable,
                                                           queue_sel);
                 break;
         default:
@@ -728,7 +706,7 @@ static void _rtl92cu_init_chipN_queue_priority(struct ieee80211_hw *hw,
         }
 }
 
-static void _rtl92cu_init_chipT_queue_priority(struct ieee80211_hw *hw,
+static void _rtl92cu_init_chipt_queue_priority(struct ieee80211_hw *hw,
                                                bool wmm_enable,
                                                u8 out_ep_num,
                                                u8 queue_sel)
@@ -770,10 +748,10 @@ static void _rtl92cu_init_queue_priority(struct ieee80211_hw *hw,
 {
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         if (IS_NORMAL_CHIP(rtlhal->version))
-                _rtl92cu_init_chipN_queue_priority(hw, wmm_enable, out_ep_num,
+                _rtl92cu_init_chipn_queue_priority(hw, wmm_enable, out_ep_num,
                                                    queue_sel);
         else
-                _rtl92cu_init_chipT_queue_priority(hw, wmm_enable, out_ep_num,
+                _rtl92cu_init_chipt_queue_priority(hw, wmm_enable, out_ep_num,
                                                    queue_sel);
 }
 
@@ -889,10 +867,10 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw)
                          "not open sw encryption\n");
                 return;
         }
-        sec_reg_value = SCR_TxEncEnable | SCR_RxDecEnable;
+        sec_reg_value = SCR_TXENCENABLE | SCR_RXDECENABLE;
         if (rtlpriv->sec.use_defaultkey) {
-                sec_reg_value |= SCR_TxUseDK;
-                sec_reg_value |= SCR_RxUseDK;
+                sec_reg_value |= SCR_TXUSEDK;
+                sec_reg_value |= SCR_RXUSEDK;
         }
         if (IS_NORMAL_CHIP(rtlhal->version))
                 sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
@@ -921,7 +899,7 @@ static void _rtl92cu_hw_configure(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlusb->reg_bcn_ctrl_val);
 }
 
-static void _InitPABias(struct ieee80211_hw *hw)
+static void _initpabias(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -1017,14 +995,14 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
                 rtl92c_phy_lc_calibrate(hw);
         }
         _rtl92cu_hw_configure(hw);
-        _InitPABias(hw);
+        _initpabias(hw);
         rtl92c_dm_init(hw);
 exit:
         local_irq_restore(flags);
         return err;
 }
 
-static void _DisableRFAFEAndResetBB(struct ieee80211_hw *hw)
+static void disable_rfafeandresetbb(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 /**************************************
@@ -1034,20 +1012,20 @@ c.	APSD_CTRL 0x600[7:0] = 0x40
 d.      SYS_FUNC_EN 0x02[7:0] = 0x16    reset BB state machine
 e.      SYS_FUNC_EN 0x02[7:0] = 0x14    reset BB state machine
 ***************************************/
-        u8 eRFPath = 0, value8 = 0;
+        u8 erfpath = 0, value8 = 0;
         rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
-        rtl_set_rfreg(hw, (enum radio_path)eRFPath, 0x0, MASKBYTE0, 0x0);
+        rtl_set_rfreg(hw, (enum radio_path)erfpath, 0x0, MASKBYTE0, 0x0);
 
         value8 |= APSDOFF;
         rtl_write_byte(rtlpriv, REG_APSD_CTRL, value8); /*0x40*/
         value8 = 0;
-        value8 |= (FEN_USBD | FEN_USBA | FEN_BB_GLB_RSTn);
+        value8 |= (FEN_USBD | FEN_USBA | FEN_BB_GLB_RSTN);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, value8);/*0x16*/
-        value8 &= (~FEN_BB_GLB_RSTn);
+        value8 &= (~FEN_BB_GLB_RSTN);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, value8); /*0x14*/
 }
 
-static void  _ResetDigitalProcedure1(struct ieee80211_hw *hw, bool bWithoutHWSM)
+static void  _resetdigitalprocedure1(struct ieee80211_hw *hw, bool withouthwsm)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -1098,7 +1076,7 @@ static void  _ResetDigitalProcedure1(struct ieee80211_hw *hw, bool bWithoutHWSM)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x54);
                 rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
         }
-        if (bWithoutHWSM) {
+        if (withouthwsm) {
                 /*****************************
                   Without HW auto state machine
                 g.SYS_CLKR 0x08[15:0] = 0x30A3          disable MAC clock
@@ -1113,7 +1091,7 @@ static void  _ResetDigitalProcedure1(struct ieee80211_hw *hw, bool bWithoutHWSM)
         }
 }
 
-static void _ResetDigitalProcedure2(struct ieee80211_hw *hw)
+static void _resetdigitalprocedure2(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 /*****************************
@@ -1125,7 +1103,7 @@ m. SYS_ISO_CTRL 0x01[7:0] = 0x83	isolated ELDR to PON
         rtl_write_byte(rtlpriv, REG_SYS_ISO_CTRL+1, 0x82);
 }
 
-static void _DisableGPIO(struct ieee80211_hw *hw)
+static void _disablegpio(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 /***************************************
@@ -1155,13 +1133,13 @@ n. LEDCFG 0x4C[15:0] = 0x8080
         rtl_write_word(rtlpriv, REG_LEDCFG0, 0x8080);
 }
 
-static void _DisableAnalog(struct ieee80211_hw *hw, bool bWithoutHWSM)
+static void disable_analog(struct ieee80211_hw *hw, bool withouthwsm)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u16 value16 = 0;
         u8 value8 = 0;
 
-        if (bWithoutHWSM) {
+        if (withouthwsm) {
                 /*****************************
                 n. LDOA15_CTRL 0x20[7:0] = 0x04  disable A15 power
                 o. LDOV12D_CTRL 0x21[7:0] = 0x54 disable digital core power
@@ -1184,30 +1162,30 @@ i. APS_FSMCO 0x04[15:0] = 0x4802	set USB suspend
         rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0E);
 }
 
-static void _CardDisableHWSM(struct ieee80211_hw *hw)
+static void carddisable_hwsm(struct ieee80211_hw *hw)
 {
         /* ==== RF Off Sequence ==== */
-        _DisableRFAFEAndResetBB(hw);
+        disable_rfafeandresetbb(hw);
         /* ==== Reset digital sequence   ====== */
-        _ResetDigitalProcedure1(hw, false);
+        _resetdigitalprocedure1(hw, false);
         /*  ==== Pull GPIO PIN to balance level and LED control ====== */
-        _DisableGPIO(hw);
+        _disablegpio(hw);
         /* ==== Disable analog sequence === */
-        _DisableAnalog(hw, false);
+        disable_analog(hw, false);
 }
 
-static void _CardDisableWithoutHWSM(struct ieee80211_hw *hw)
+static void carddisablewithout_hwsm(struct ieee80211_hw *hw)
 {
         /*==== RF Off Sequence ==== */
-        _DisableRFAFEAndResetBB(hw);
+        disable_rfafeandresetbb(hw);
         /*  ==== Reset digital sequence   ====== */
-        _ResetDigitalProcedure1(hw, true);
+        _resetdigitalprocedure1(hw, true);
         /*  ==== Pull GPIO PIN to balance level and LED control ====== */
-        _DisableGPIO(hw);
+        _disablegpio(hw);
         /*  ==== Reset digital sequence   ====== */
-        _ResetDigitalProcedure2(hw);
+        _resetdigitalprocedure2(hw);
         /*  ==== Disable analog sequence === */
-        _DisableAnalog(hw, true);
+        disable_analog(hw, true);
 }
 
 static void _rtl92cu_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
@@ -1353,10 +1331,10 @@ void rtl92cu_card_disable(struct ieee80211_hw *hw)
         _rtl92cu_set_media_status(hw, opmode);
         rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
         RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
-        if (rtlusb->disableHWSM)
-                _CardDisableHWSM(hw);
+        if (rtlusb->disablehwsm)
+                carddisable_hwsm(hw);
         else
-                _CardDisableWithoutHWSM(hw);
+                carddisablewithout_hwsm(hw);
 
         /* after power off we should do iqk again */
         rtlpriv->phy.iqk_initialized = false;
@@ -1498,12 +1476,12 @@ void rtl92cu_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
                 break;
         case HW_VAR_FWLPS_RF_ON:{
-                        enum rf_pwrstate rfState;
+                        enum rf_pwrstate rfstate;
                         u32 val_rcr;
 
                         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
-                                                      (u8 *)(&rfState));
-                        if (rfState == ERFOFF) {
+                                                      (u8 *)(&rfstate));
+                        if (rfstate == ERFOFF) {
                                 *((bool *) (val)) = true;
                         } else {
                                 val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
@@ -1630,7 +1608,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                                 &e_aci);
                         } else {
                                 u8 sifstime = 0;
-                                u8      u1bAIFS;
+                                u8      u1baifs;
 
                                 if (IS_WIRELESS_MODE_A(wirelessmode) ||
                                     IS_WIRELESS_MODE_N_24G(wirelessmode) ||
@@ -1638,15 +1616,15 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         sifstime = 16;
                                 else
                                         sifstime = 10;
-                                u1bAIFS = sifstime + (2 *  val[0]);
+                                u1baifs = sifstime + (2 *  val[0]);
                                 rtl_write_byte(rtlpriv, REG_EDCA_VO_PARAM,
-                                               u1bAIFS);
+                                               u1baifs);
                                 rtl_write_byte(rtlpriv, REG_EDCA_VI_PARAM,
-                                               u1bAIFS);
+                                               u1baifs);
                                 rtl_write_byte(rtlpriv, REG_EDCA_BE_PARAM,
-                                               u1bAIFS);
+                                               u1baifs);
                                 rtl_write_byte(rtlpriv, REG_EDCA_BK_PARAM,
-                                               u1bAIFS);
+                                               u1baifs);
                         }
                         break;
                 }
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.h
index ebd168400d45..0ccc47e36652 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CU_HW_H__
 #define __RTL92CU_HW_H__
@@ -71,14 +49,14 @@
 /* should be renamed and moved to another file */
 enum _BOARD_TYPE_8192CUSB {
         BOARD_USB_DONGLE                = 0,    /* USB dongle */
-        BOARD_USB_High_PA               = 1,    /* USB dongle - high power PA */
+        BOARD_USB_HIGH_PA               = 1,    /* USB dongle - high power PA */
         BOARD_MINICARD                  = 2,    /* Minicard */
         BOARD_USB_SOLO                  = 3,    /* USB solo-Slim module */
         BOARD_USB_COMBO                 = 4,    /* USB Combo-Slim module */
 };
 
 #define IS_HIGHT_PA(boardtype)          \
-        ((boardtype == BOARD_USB_High_PA) ? true : false)
+        ((boardtype == BOARD_USB_HIGH_PA) ? true : false)
 
 #define RTL92C_DRIVER_INFO_SIZE                         4
 void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c
index 66d2784de67d..cc13a4a8f856 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c
@@ -1,25 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../usb.h"
@@ -34,7 +14,7 @@ static void _rtl92cu_init_led(struct ieee80211_hw *hw,
         pled->ledon = false;
 }
 
-static void _rtl92cu_deInit_led(struct rtl_led *pled)
+static void rtl92cu_deinit_led(struct rtl_led *pled)
 {
 }
 
@@ -108,8 +88,8 @@ void rtl92cu_deinit_sw_leds(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        _rtl92cu_deInit_led(&rtlpriv->ledctl.sw_led0);
-        _rtl92cu_deInit_led(&rtlpriv->ledctl.sw_led1);
+        rtl92cu_deinit_led(&rtlpriv->ledctl.sw_led0);
+        rtl92cu_deinit_led(&rtlpriv->ledctl.sw_led1);
 }
 
 static void _rtl92cu_sw_led_control(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h
index 551deb8afb6f..3fc1e7c8f78b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h
@@ -1,25 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CU_LED_H__
 #define __RTL92CU_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
index 5657b1e34ad0..cc2ba74bff81 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
-****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.h
index 8573b7e257d9..62eb3c5adec1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_MAC_H__
 #define __RTL92C_MAC_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
index f068dd5317a7..9cd028cb2239 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -125,7 +103,7 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL + 1, 0xdb);
         rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD |
-                       FEN_BB_GLB_RSTn | FEN_BBRSTB);
+                       FEN_BB_GLB_RSTN | FEN_BBRSTB);
         regval32 = rtl_read_dword(rtlpriv, 0x87c);
         rtl_write_dword(rtlpriv, 0x87c, regval32 & (~BIT(31)));
         rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f);
@@ -143,7 +121,7 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
         u32 arraylength;
         u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_ARRAY\n");
         arraylength =  rtlphy->hwparam_tables[MAC_REG].length ;
         ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CUMAC_2T_ARRAY\n");
@@ -181,7 +159,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGARRAY[1] is %x\n",
                                  phy_regarray_table[i],
                                  phy_regarray_table[i + 1]);
                 }
@@ -191,7 +169,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       agctab_array_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 "The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 "The agctab_array_table[0] is %x Rtl819XPHY_REGARRAY[1] is %x\n",
                                  agctab_array_table[i],
                                  agctab_array_table[i + 1]);
                 }
@@ -214,7 +192,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_regarray_pg_len; i = i + 3) {
                         rtl_addr_delay(phy_regarray_table_pg[i]);
-                        _rtl92c_store_pwrIndex_diffrate_offset(hw,
+                        _rtl92c_store_pwrindex_diffrate_offset(hw,
                                                   phy_regarray_table_pg[i],
                                                   phy_regarray_table_pg[i + 1],
                                                   phy_regarray_table_pg[i + 2]);
@@ -408,14 +386,14 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 if ((ppsc->rfpwr_state == ERFOFF) &&
                     RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
                         bool rtstatus;
-                        u32 InitializeCount = 0;
+                        u32 init_count = 0;
 
                         do {
-                                InitializeCount++;
+                                init_count++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                          "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
-                        } while (!rtstatus && (InitializeCount < 10));
+                        } while (!rtstatus && (init_count < 10));
                         RT_CLEAR_PS_LEVEL(ppsc,
                                           RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.h
index a422c4db1a41..a3cc980c42fe 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../rtl8192ce/phy.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/reg.h
index 8185886daa8e..b4b6cde23341 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/reg.h
@@ -1,26 +1,4 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../rtl8192ce/reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c
index cf551785eb08..f3a336e0ea98 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
@@ -148,17 +126,17 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-        u32 powerBase0, powerBase1;
+        u32 powerbase0, powerbase1;
         u8 legacy_pwrdiff = 0, ht20_pwrdiff = 0;
         u8 i, powerlevel[2];
 
         for (i = 0; i < 2; i++) {
                 powerlevel[i] = ppowerlevel[i];
                 legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff[i][channel - 1];
-                powerBase0 = powerlevel[i] + legacy_pwrdiff;
-                powerBase0 = (powerBase0 << 24) | (powerBase0 << 16) |
-                    (powerBase0 << 8) | powerBase0;
-                *(ofdmbase + i) = powerBase0;
+                powerbase0 = powerlevel[i] + legacy_pwrdiff;
+                powerbase0 = (powerbase0 << 24) | (powerbase0 << 16) |
+                    (powerbase0 << 8) | powerbase0;
+                *(ofdmbase + i) = powerbase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                         " [OFDM power base index rf(%c) = 0x%x]\n",
                         i == 0 ? 'A' : 'B', *(ofdmbase + i));
@@ -168,10 +146,10 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                         ht20_pwrdiff = rtlefuse->txpwr_ht20diff[i][channel - 1];
                         powerlevel[i] += ht20_pwrdiff;
                 }
-                powerBase1 = powerlevel[i];
-                powerBase1 = (powerBase1 << 24) |
-                    (powerBase1 << 16) | (powerBase1 << 8) | powerBase1;
-                *(mcsbase + i) = powerBase1;
+                powerbase1 = powerlevel[i];
+                powerbase1 = (powerbase1 << 24) |
+                    (powerbase1 << 16) | (powerbase1 << 8) | powerbase1;
+                *(mcsbase + i) = powerbase1;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                         " [MCS power base index rf(%c) = 0x%x]\n",
                         i == 0 ? 'A' : 'B', *(mcsbase + i));
@@ -180,26 +158,26 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
 
 static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                        u8 channel, u8 index,
-                                                       u32 *powerBase0,
-                                                       u32 *powerBase1,
+                                                       u32 *powerbase0,
+                                                       u32 *powerbase1,
                                                        u32 *p_outwriteval)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 i, chnlgroup = 0, pwr_diff_limit[4];
-        u32 writeVal, customer_limit, rf;
+        u32 writeval, customer_limit, rf;
 
         for (rf = 0; rf < 2; rf++) {
                 switch (rtlefuse->eeprom_regulatory) {
                 case 0:
                         chnlgroup = 0;
-                        writeVal = rtlphy->mcs_offset
+                        writeval = rtlphy->mcs_offset
                             [chnlgroup][index + (rf ? 8 : 0)]
-                            + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
+                            + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "RTK better performance,writeVal(%c) = 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "RTK better performance,writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 1:
                         if (rtlphy->pwrgroup_cnt == 1)
@@ -217,20 +195,20 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                 else
                                         chnlgroup += 4;
                         }
-                        writeVal = rtlphy->mcs_offset[chnlgroup][index +
+                        writeval = rtlphy->mcs_offset[chnlgroup][index +
                                         (rf ? 8 : 0)] +
-                                        ((index < 2) ? powerBase0[rf] :
-                                        powerBase1[rf]);
+                                        ((index < 2) ? powerbase0[rf] :
+                                        powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 2:
-                        writeVal = ((index < 2) ? powerBase0[rf] :
-                                   powerBase1[rf]);
+                        writeval = ((index < 2) ? powerbase0[rf] :
+                                   powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "Better regulatory,writeVal(%c) = 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "Better regulatory,writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 3:
                         chnlgroup = 0;
@@ -275,36 +253,36 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                 "Customer's limit rf(%c) = 0x%x\n",
                                 rf == 0 ? 'A' : 'B', customer_limit);
-                        writeVal = customer_limit + ((index < 2) ?
-                                   powerBase0[rf] : powerBase1[rf]);
+                        writeval = customer_limit + ((index < 2) ?
+                                   powerbase0[rf] : powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "Customer, writeVal rf(%c)= 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "Customer, writeval rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 default:
                         chnlgroup = 0;
-                        writeVal = rtlphy->mcs_offset[chnlgroup]
+                        writeval = rtlphy->mcs_offset[chnlgroup]
                                    [index + (rf ? 8 : 0)] + ((index < 2) ?
-                                   powerBase0[rf] : powerBase1[rf]);
+                                   powerbase0[rf] : powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "RTK better performance, writeValrf(%c) = 0x%x\n",
-                                rf == 0 ? 'A' : 'B', writeVal);
+                                "RTK better performance, writevalrf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 }
                 if (rtlpriv->dm.dynamic_txhighpower_lvl ==
                     TXHIGHPWRLEVEL_LEVEL1)
-                        writeVal = 0x14141414;
+                        writeval = 0x14141414;
                 else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
                          TXHIGHPWRLEVEL_LEVEL2)
-                        writeVal = 0x00000000;
+                        writeval = 0x00000000;
                 if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1)
-                        writeVal = writeVal - 0x06060606;
-                *(p_outwriteval + rf) = writeVal;
+                        writeval = writeval - 0x06060606;
+                *(p_outwriteval + rf) = writeval;
         }
 }
 
 static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
-                                         u8 index, u32 *pValue)
+                                         u8 index, u32 *value)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -319,33 +297,33 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                 RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12
         };
         u8 i, rf, pwr_val[4];
-        u32 writeVal;
+        u32 writeval;
         u16 regoffset;
 
         for (rf = 0; rf < 2; rf++) {
-                writeVal = pValue[rf];
+                writeval = value[rf];
                 for (i = 0; i < 4; i++) {
-                        pwr_val[i] = (u8)((writeVal & (0x7f << (i * 8))) >>
+                        pwr_val[i] = (u8)((writeval & (0x7f << (i * 8))) >>
                                           (i * 8));
                         if (pwr_val[i] > RF6052_MAX_TX_PWR)
                                 pwr_val[i] = RF6052_MAX_TX_PWR;
                 }
-                writeVal = (pwr_val[3] << 24) | (pwr_val[2] << 16) |
+                writeval = (pwr_val[3] << 24) | (pwr_val[2] << 16) |
                     (pwr_val[1] << 8) | pwr_val[0];
                 if (rf == 0)
                         regoffset = regoffset_a[index];
                 else
                         regoffset = regoffset_b[index];
-                rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal);
+                rtl_set_bbreg(hw, regoffset, MASKDWORD, writeval);
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        "Set 0x%x = %08x\n", regoffset, writeVal);
+                        "Set 0x%x = %08x\n", regoffset, writeval);
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS15_MCS12 ||
                       regoffset == RTXAGC_B_MCS15_MCS12)) ||
                     ((get_rf_type(rtlphy) != RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS07_MCS04 ||
                       regoffset == RTXAGC_B_MCS07_MCS04))) {
-                        writeVal = pwr_val[3];
+                        writeval = pwr_val[3];
                         if (regoffset == RTXAGC_A_MCS15_MCS12 ||
                             regoffset == RTXAGC_A_MCS07_MCS04)
                                 regoffset = 0xc90;
@@ -354,13 +332,13 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                                 regoffset = 0xc98;
                         for (i = 0; i < 3; i++) {
                                 if (i != 2)
-                                        writeVal = (writeVal > 8) ?
-                                                   (writeVal - 8) : 0;
+                                        writeval = (writeval > 8) ?
+                                                   (writeval - 8) : 0;
                                 else
-                                        writeVal = (writeVal > 6) ?
-                                                   (writeVal - 6) : 0;
+                                        writeval = (writeval > 6) ?
+                                                   (writeval - 6) : 0;
                                 rtl_write_byte(rtlpriv, (u32)(regoffset + i),
-                                              (u8)writeVal);
+                                              (u8)writeval);
                         }
                 }
         }
@@ -369,18 +347,18 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
 void rtl92cu_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
                                          u8 *ppowerlevel, u8 channel)
 {
-        u32 writeVal[2], powerBase0[2], powerBase1[2];
+        u32 writeval[2], powerbase0[2], powerbase1[2];
         u8 index = 0;
 
         rtl92c_phy_get_power_base(hw, ppowerlevel,
-                                  channel, &powerBase0[0], &powerBase1[0]);
+                                  channel, &powerbase0[0], &powerbase1[0]);
         for (index = 0; index < 6; index++) {
                 _rtl92c_get_txpower_writeval_by_regulatory(hw,
                                                            channel, index,
-                                                           &powerBase0[0],
-                                                           &powerBase1[0],
-                                                           &writeVal[0]);
-                _rtl92c_write_ofdm_power_reg(hw, index, &writeVal[0]);
+                                                           &powerbase0[0],
+                                                           &powerbase1[0],
+                                                           &writeval[0]);
+                _rtl92c_write_ofdm_power_reg(hw, index, &writeval[0]);
         }
 }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.h
index 07aec0b20cc9..2661e5f8f6da 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CU_RF_H__
 #define __RTL92CU_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
index 43e021b49260..c1c34dca39d2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h
index 4ea2cb225580..662440c4cdc9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CU_SW_H__
 #define __RTL92CU_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.c
index b3ac981d88c6..addeac90ee0c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "table.h"
 
@@ -1269,7 +1247,7 @@ u32 RTL8192CUAGCTAB_1TARRAY[RTL8192CUAGCTAB_1TARRAYLENGTH] = {
         0xc78, 0x621f001e,
 };
 
-u32 RTL8192CUPHY_REG_1T_HPArray[RTL8192CUPHY_REG_1T_HPArrayLength] = {
+u32 RTL8192CUPHY_REG_1T_HPARRAY[RTL8192CUPHY_REG_1T_HPARRAYLENGTH] = {
         0x024, 0x0011800f,
         0x028, 0x00ffdb83,
         0x040, 0x000c0004,
@@ -1461,7 +1439,7 @@ u32 RTL8192CUPHY_REG_1T_HPArray[RTL8192CUPHY_REG_1T_HPArrayLength] = {
         0xf00, 0x00000300,
 };
 
-u32 RTL8192CUPHY_REG_Array_PG_HP[RTL8192CUPHY_REG_Array_PG_HPLength] = {
+u32 RTL8192CUPHY_REG_ARRAY_PG_HP[RTL8192CUPHY_REG_ARRAY_PG_HPLENGTH] = {
         0xe00, 0xffffffff, 0x06080808,
         0xe04, 0xffffffff, 0x00040406,
         0xe08, 0x0000ff00, 0x00000000,
@@ -1576,7 +1554,7 @@ u32 RTL8192CUPHY_REG_Array_PG_HP[RTL8192CUPHY_REG_Array_PG_HPLength] = {
         0x868, 0xffffffff, 0x00000000,
 };
 
-u32 RTL8192CURadioA_1T_HPArray[RTL8192CURadioA_1T_HPArrayLength] = {
+u32 RTL8192CURADIOA_1T_HPARRAY[RTL8192CURADIOA_1T_HPARRAYLENGTH] = {
         0x000, 0x00030159,
         0x001, 0x00031284,
         0x002, 0x00098000,
@@ -1720,7 +1698,7 @@ u32 RTL8192CURadioA_1T_HPArray[RTL8192CURadioA_1T_HPArrayLength] = {
         0x000, 0x00030159,
 };
 
-u32 Rtl8192CUAGCTAB_1T_HPArray[RTL8192CUAGCTAB_1T_HPArrayLength] = {
+u32 RTL8192CUAGCTAB_1T_HPARRAY[RTL8192CUAGCTAB_1T_HPARRAYLENGTH] = {
         0xc78, 0x7b000001,
         0xc78, 0x7b010001,
         0xc78, 0x7b020001,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.h
index 851bf53d246c..efc89f7db80f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CU_TABLE__H_
 #define __RTL92CU_TABLE__H_
@@ -53,15 +31,15 @@ extern u32 RTL8192CUAGCTAB_2TARRAY[RTL8192CUAGCTAB_2TARRAYLENGTH];
 #define RTL8192CUAGCTAB_1TARRAYLENGTH   320
 extern u32 RTL8192CUAGCTAB_1TARRAY[RTL8192CUAGCTAB_1TARRAYLENGTH];
 
-#define RTL8192CUPHY_REG_1T_HPArrayLength 378
-extern u32 RTL8192CUPHY_REG_1T_HPArray[RTL8192CUPHY_REG_1T_HPArrayLength];
+#define RTL8192CUPHY_REG_1T_HPARRAYLENGTH 378
+extern u32 RTL8192CUPHY_REG_1T_HPARRAY[RTL8192CUPHY_REG_1T_HPARRAYLENGTH];
 
-#define RTL8192CUPHY_REG_Array_PG_HPLength 336
-extern u32 RTL8192CUPHY_REG_Array_PG_HP[RTL8192CUPHY_REG_Array_PG_HPLength];
+#define RTL8192CUPHY_REG_ARRAY_PG_HPLENGTH 336
+extern u32 RTL8192CUPHY_REG_ARRAY_PG_HP[RTL8192CUPHY_REG_ARRAY_PG_HPLENGTH];
 
-#define RTL8192CURadioA_1T_HPArrayLength 282
-extern u32 RTL8192CURadioA_1T_HPArray[RTL8192CURadioA_1T_HPArrayLength];
-#define RTL8192CUAGCTAB_1T_HPArrayLength 320
-extern u32 Rtl8192CUAGCTAB_1T_HPArray[RTL8192CUAGCTAB_1T_HPArrayLength];
+#define RTL8192CURADIOA_1T_HPARRAYLENGTH 282
+extern u32 RTL8192CURADIOA_1T_HPARRAY[RTL8192CURADIOA_1T_HPARRAYLENGTH];
+#define RTL8192CUAGCTAB_1T_HPARRAYLENGTH 320
+extern u32 RTL8192CUAGCTAB_1T_HPARRAY[RTL8192CUAGCTAB_1T_HPARRAYLENGTH];
 
 #endif
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
index 9ab56827124e..4293d0640310 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../usb.h"
@@ -36,7 +14,7 @@
 #include "trx.h"
 #include "../rtl8192c/fw_common.h"
 
-static int _ConfigVerTOutEP(struct ieee80211_hw *hw)
+static int configvertoutep(struct ieee80211_hw *hw)
 {
         u8 ep_cfg, txqsele;
         u8 ep_nums = 0;
@@ -69,7 +47,7 @@ static int _ConfigVerTOutEP(struct ieee80211_hw *hw)
         return (rtlusb->out_ep_nums == ep_nums) ? 0 : -EINVAL;
 }
 
-static int _ConfigVerNOutEP(struct ieee80211_hw *hw)
+static int configvernoutep(struct ieee80211_hw *hw)
 {
         u8 ep_cfg;
         u8 ep_nums = 0;
@@ -98,7 +76,7 @@ static int _ConfigVerNOutEP(struct ieee80211_hw *hw)
         return (rtlusb->out_ep_nums == ep_nums) ? 0 : -EINVAL;
 }
 
-static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
+static void twooutepmapping(struct ieee80211_hw *hw, bool is_chip8,
                              bool  bwificfg, struct rtl_ep_map *ep_map)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -126,7 +104,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
         }
 }
 
-static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool  bwificfg,
+static void threeoutepmapping(struct ieee80211_hw *hw, bool  bwificfg,
                                struct rtl_ep_map *ep_map)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -153,7 +131,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool  bwificfg,
         }
 }
 
-static void _OneOutEpMapping(struct ieee80211_hw *hw, struct rtl_ep_map *ep_map)
+static void oneoutepmapping(struct ieee80211_hw *hw, struct rtl_ep_map *ep_map)
 {
         ep_map->ep_mapping[RTL_TXQ_BE]  = 2;
         ep_map->ep_mapping[RTL_TXQ_BK]  = 2;
@@ -166,27 +144,27 @@ static void _OneOutEpMapping(struct ieee80211_hw *hw, struct rtl_ep_map *ep_map)
 static int _out_ep_mapping(struct ieee80211_hw *hw)
 {
         int err = 0;
-        bool bIsChipN, bwificfg = false;
+        bool ischipn, bwificfg = false;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_usb_priv *usb_priv = rtl_usbpriv(hw);
         struct rtl_usb *rtlusb = rtl_usbdev(usb_priv);
         struct rtl_ep_map *ep_map = &(rtlusb->ep_map);
 
-        bIsChipN = IS_NORMAL_CHIP(rtlhal->version);
+        ischipn = IS_NORMAL_CHIP(rtlhal->version);
         switch (rtlusb->out_ep_nums) {
         case 2:
-                _TwoOutEpMapping(hw, bIsChipN, bwificfg, ep_map);
+                twooutepmapping(hw, ischipn, bwificfg, ep_map);
                 break;
         case 3:
                 /* Test chip doesn't support three out EPs. */
-                if (!bIsChipN) {
+                if (!ischipn) {
                         err  =  -EINVAL;
                         goto err_out;
                 }
-                _ThreeOutEpMapping(hw, bIsChipN, ep_map);
+                threeoutepmapping(hw, ischipn, ep_map);
                 break;
         case 1:
-                _OneOutEpMapping(hw, ep_map);
+                oneoutepmapping(hw, ep_map);
                 break;
         default:
                 err  =  -EINVAL;
@@ -202,9 +180,9 @@ int  rtl8192cu_endpoint_mapping(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         int error = 0;
         if (likely(IS_NORMAL_CHIP(rtlhal->version)))
-                error = _ConfigVerNOutEP(hw);
+                error = configvernoutep(hw);
         else
-                error = _ConfigVerTOutEP(hw);
+                error = configvertoutep(hw);
         if (error)
                 goto err_out;
         error = _out_ep_mapping(hw);
@@ -320,7 +298,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
         stats->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1)
                                    && (GET_RX_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
-        stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
+        stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
         stats->is_ht = (bool)GET_RX_DESC_RX_HT(pdesc);
         rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->band = hw->conf.chandef.chan->band;
@@ -387,7 +365,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
         stats.isampdu = (bool) ((GET_RX_DESC_PAGGR(rxdesc) == 1)
                                    && (GET_RX_DESC_FAGGR(rxdesc) == 1));
         stats.timestamp_low = GET_RX_DESC_TSFL(rxdesc);
-        stats.rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(rxdesc);
+        stats.rx_is40mhzpacket = (bool)GET_RX_DESC_BW(rxdesc);
         stats.is_ht = (bool)GET_RX_DESC_RX_HT(rxdesc);
         /* TODO: is center_freq changed when doing scan? */
         /* TODO: Shall we add protection or just skip those two step? */
@@ -610,28 +588,28 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "==>\n");
 }
 
-void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc,
-                              u32 buffer_len, bool bIsPsPoll)
+void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 *pdesc,
+                              u32 buffer_len, bool is_pspoll)
 {
         /* Clear all status */
-        memset(pDesc, 0, RTL_TX_HEADER_SIZE);
-        SET_TX_DESC_FIRST_SEG(pDesc, 1); /* bFirstSeg; */
-        SET_TX_DESC_LAST_SEG(pDesc, 1); /* bLastSeg; */
-        SET_TX_DESC_OFFSET(pDesc, RTL_TX_HEADER_SIZE); /* Offset = 32 */
-        SET_TX_DESC_PKT_SIZE(pDesc, buffer_len); /* Buffer size + command hdr */
-        SET_TX_DESC_QUEUE_SEL(pDesc, QSLT_MGNT); /* Fixed queue of Mgnt queue */
+        memset(pdesc, 0, RTL_TX_HEADER_SIZE);
+        SET_TX_DESC_FIRST_SEG(pdesc, 1); /* bFirstSeg; */
+        SET_TX_DESC_LAST_SEG(pdesc, 1); /* bLastSeg; */
+        SET_TX_DESC_OFFSET(pdesc, RTL_TX_HEADER_SIZE); /* Offset = 32 */
+        SET_TX_DESC_PKT_SIZE(pdesc, buffer_len); /* Buffer size + command hdr */
+        SET_TX_DESC_QUEUE_SEL(pdesc, QSLT_MGNT); /* Fixed queue of Mgnt queue */
         /* Set NAVUSEHDR to prevent Ps-poll AId filed to be changed to error
          * vlaue by Hw. */
-        if (bIsPsPoll) {
-                SET_TX_DESC_NAV_USE_HDR(pDesc, 1);
+        if (is_pspoll) {
+                SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
         } else {
-                SET_TX_DESC_HWSEQ_EN(pDesc, 1); /* Hw set sequence number */
-                SET_TX_DESC_PKT_ID(pDesc, 0x100); /* set bit3 to 1. */
+                SET_TX_DESC_HWSEQ_EN(pdesc, 1); /* Hw set sequence number */
+                SET_TX_DESC_PKT_ID(pdesc, 0x100); /* set bit3 to 1. */
         }
-        SET_TX_DESC_USE_RATE(pDesc, 1); /* use data rate which is set by Sw */
-        SET_TX_DESC_OWN(pDesc, 1);
-        SET_TX_DESC_TX_RATE(pDesc, DESC_RATE1M);
-        _rtl_tx_desc_checksum(pDesc);
+        SET_TX_DESC_USE_RATE(pdesc, 1); /* use data rate which is set by Sw */
+        SET_TX_DESC_OWN(pdesc, 1);
+        SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);
+        _rtl_tx_desc_checksum(pdesc);
 }
 
 void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h
index 15a66c547287..439ced0e18fa 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CU_TRX_H__
 #define __RTL92CU_TRX_H__
@@ -397,8 +375,8 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
                           struct sk_buff *skb,
                           u8 queue_index,
                           struct rtl_tcb_desc *tcb_desc);
-void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc,
-                              u32 buffer_len, bool bIsPsPoll);
+void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 *pdesc,
+                               u32 buffer_len, bool ispspoll);
 void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
                              u8 *pdesc, bool b_firstseg,
                              bool b_lastseg, struct sk_buff *skb);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h
index cb7b9b727e3a..fa33b05db052 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92D_DEF_H__
 #define __RTL92D_DEF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
index ac6d554b67c8..7cc86bb387a1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
@@ -864,7 +842,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
         else
                 rf = 1;
         if (thermalvalue) {
-                ele_d = rtl_get_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
+                ele_d = rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
                                       MASKDWORD) & MASKOFDM_D;
                 for (i = 0; i < OFDM_TABLE_SIZE_92D; i++) {
                         if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {
@@ -872,13 +850,13 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
 
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                                          "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
-                                         ROFDM0_XATxIQIMBALANCE,
+                                         ROFDM0_XATXIQIMBALANCE,
                                          ele_d, ofdm_index_old[0]);
                                 break;
                         }
                 }
                 if (is2t) {
-                        ele_d = rtl_get_bbreg(hw, ROFDM0_XBTxIQIMBALANCE,
+                        ele_d = rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
                                               MASKDWORD) & MASKOFDM_D;
                         for (i = 0; i < OFDM_TABLE_SIZE_92D; i++) {
                                 if (ele_d ==
@@ -887,7 +865,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
                                                  "Initial pathB ele_d reg 0x%x = 0x%lx, ofdm_index = 0x%x\n",
-                                                 ROFDM0_XBTxIQIMBALANCE, ele_d,
+                                                 ROFDM0_XBTXIQIMBALANCE, ele_d,
                                                  ofdm_index_old[1]);
                                         break;
                                 }
@@ -1059,11 +1037,11 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                  * regC94, element B is always 0 */
                                 value32 = (ele_d << 22) | ((ele_c & 0x3F) <<
                                           16) | ele_a;
-                                rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
+                                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
                                               MASKDWORD, value32);
 
                                 value32 = (ele_c & 0x000003C0) >> 6;
-                                rtl_set_bbreg(hw, ROFDM0_XCTxAFE, MASKH4BITS,
+                                rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS,
                                               value32);
 
                                 value32 = ((val_x * ele_d) >> 7) & 0x01;
@@ -1071,11 +1049,11 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                               value32);
 
                         } else {
-                                rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
+                                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
                                               MASKDWORD,
                                               ofdmswing_table
                                               [(u8)ofdm_index[0]]);
-                                rtl_set_bbreg(hw, ROFDM0_XCTxAFE, MASKH4BITS,
+                                rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS,
                                               0x00);
                                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
                                               BIT(24), 0x00);
@@ -1172,21 +1150,21 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                                   ((ele_c & 0x3F) << 16) |
                                                   ele_a;
                                         rtl_set_bbreg(hw,
-                                                      ROFDM0_XBTxIQIMBALANCE,
+                                                      ROFDM0_XBTXIQIMBALANCE,
                                                       MASKDWORD, value32);
                                         value32 = (ele_c & 0x000003C0) >> 6;
-                                        rtl_set_bbreg(hw, ROFDM0_XDTxAFE,
+                                        rtl_set_bbreg(hw, ROFDM0_XDTXAFE,
                                                       MASKH4BITS, value32);
                                         value32 = ((val_x * ele_d) >> 7) & 0x01;
                                         rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
                                                       BIT(28), value32);
                                 } else {
                                         rtl_set_bbreg(hw,
-                                                      ROFDM0_XBTxIQIMBALANCE,
+                                                      ROFDM0_XBTXIQIMBALANCE,
                                                       MASKDWORD,
                                                       ofdmswing_table
                                                       [(u8) ofdm_index[1]]);
-                                        rtl_set_bbreg(hw, ROFDM0_XDTxAFE,
+                                        rtl_set_bbreg(hw, ROFDM0_XDTXAFE,
                                                       MASKH4BITS, 0x00);
                                         rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
                                                       BIT(28), 0x00);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h
index 5d346ec366ce..939cc45bfebd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_DM_H__
 #define __RTL92C_DM_H__
@@ -44,7 +22,7 @@
 #define DM_DIG_FA_TH1                           0x400
 #define DM_DIG_FA_TH2                           0x600
 
-#define RXPATHSELECTION_SS_TH_lOW               30
+#define RXPATHSELECTION_SS_TH_LOW               30
 #define RXPATHSELECTION_DIFF_TH                 18
 
 #define DM_RATR_STA_INIT                        0
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c
index 75bfa9dfef4a..2064813f9381 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -97,7 +75,7 @@ static int _rtl92d_fw_free_to_go(struct ieee80211_hw *hw)
         do {
                 value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
         } while ((counter++ < FW_8192D_POLLING_TIMEOUT_COUNT) &&
-                 (!(value32 & FWDL_ChkSum_rpt)));
+                 (!(value32 & FWDL_CHKSUM_RPT)));
         if (counter >= FW_8192D_POLLING_TIMEOUT_COUNT) {
                 pr_err("chksum report fail! REG_MCUFWDL:0x%08x\n",
                        value32);
@@ -621,7 +599,7 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         struct sk_buff *skb = NULL;
         u32 totalpacketlen;
         bool rtstatus;
-        u8 u1RsvdPageLoc[3] = { 0 };
+        u8 u1rsvdpageloc[3] = { 0 };
         bool dlok = false;
         u8 *beacon;
         u8 *p_pspoll;
@@ -640,7 +618,7 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         SET_80211_PS_POLL_AID(p_pspoll, (mac->assoc_id | 0xc000));
         SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
         SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
-        SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
         /*--------------------------------------------------------
                                                 (3) null data
         ---------------------------------------------------------*/
@@ -648,7 +626,7 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         SET_80211_HDR_ADDRESS1(nullfunc, mac->bssid);
         SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
-        SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
         /*---------------------------------------------------------
                                                 (4) probe response
         ----------------------------------------------------------*/
@@ -656,14 +634,14 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         SET_80211_HDR_ADDRESS1(p_probersp, mac->bssid);
         SET_80211_HDR_ADDRESS2(p_probersp, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(p_probersp, mac->bssid);
-        SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(u1RsvdPageLoc, PROBERSP_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(u1rsvdpageloc, PROBERSP_PG);
         totalpacketlen = TOTAL_RESERVED_PKT_LEN;
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
                       "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                       "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
-                      u1RsvdPageLoc, 3);
+                      u1rsvdpageloc, 3);
         skb = dev_alloc_skb(totalpacketlen);
         if (!skb) {
                 dlok = false;
@@ -678,9 +656,9 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "Set RSVD page location to Fw\n");
                 RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                              "H2C_RSVDPAGE", u1RsvdPageLoc, 3);
+                              "H2C_RSVDPAGE", u1rsvdpageloc, 3);
                 rtl92d_fill_h2c_cmd(hw, H2C_RSVDPAGE,
-                        sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+                        sizeof(u1rsvdpageloc), u1rsvdpageloc);
         } else
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Set RSVD page location to Fw FAIL!!!!!!\n");
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h
index 6b435236a28e..bd8ea6d66dff 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92D__FW__H__
 #define __RTL92D__FW__H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
index 80123fd97221..c7f29a9be50d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
@@ -124,12 +102,12 @@ void rtl92de_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
                 break;
         case HW_VAR_FWLPS_RF_ON:{
-                enum rf_pwrstate rfState;
+                enum rf_pwrstate rfstate;
                 u32 val_rcr;
 
                 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
-                                              (u8 *) (&rfState));
-                if (rfState == ERFOFF) {
+                                              (u8 *)(&rfstate));
+                if (rfstate == ERFOFF) {
                         *((bool *) (val)) = true;
                 } else {
                         val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
@@ -280,23 +258,23 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         }
         case HW_VAR_AMPDU_FACTOR: {
                 u8 factor_toset;
-                u32 regtoSet;
+                u32 regtoset;
                 u8 *ptmp_byte = NULL;
                 u8 index;
 
                 if (rtlhal->macphymode == DUALMAC_DUALPHY)
-                        regtoSet = 0xb9726641;
+                        regtoset = 0xb9726641;
                 else if (rtlhal->macphymode == DUALMAC_SINGLEPHY)
-                        regtoSet = 0x66626641;
+                        regtoset = 0x66626641;
                 else
-                        regtoSet = 0xb972a841;
+                        regtoset = 0xb972a841;
                 factor_toset = *val;
                 if (factor_toset <= 3) {
                         factor_toset = (1 << (factor_toset + 2));
                         if (factor_toset > 0xf)
                                 factor_toset = 0xf;
                         for (index = 0; index < 4; index++) {
-                                ptmp_byte = (u8 *) (&regtoSet) + index;
+                                ptmp_byte = (u8 *)(&regtoset) + index;
                                 if ((*ptmp_byte & 0xf0) >
                                     (factor_toset << 4))
                                         *ptmp_byte = (*ptmp_byte & 0x0f)
@@ -305,7 +283,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         *ptmp_byte = (*ptmp_byte & 0xf0)
                                                      | (factor_toset);
                         }
-                        rtl_write_dword(rtlpriv, REG_AGGLEN_LMT, regtoSet);
+                        rtl_write_dword(rtlpriv, REG_AGGLEN_LMT, regtoset);
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
                                  "Set HW_VAR_AMPDU_FACTOR: %#x\n",
                                  factor_toset);
@@ -531,18 +509,18 @@ static bool _rtl92de_llt_table_init(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         unsigned short i;
         u8 txpktbuf_bndy;
-        u8 maxPage;
+        u8 maxpage;
         bool status;
         u32 value32; /* High+low page number */
         u8 value8;       /* normal page number */
 
         if (rtlpriv->rtlhal.macphymode == SINGLEMAC_SINGLEPHY) {
-                maxPage = 255;
+                maxpage = 255;
                 txpktbuf_bndy = 246;
                 value8 = 0;
                 value32 = 0x80bf0d29;
         } else {
-                maxPage = 127;
+                maxpage = 127;
                 txpktbuf_bndy = 123;
                 value8 = 0;
                 value32 = 0x80750005;
@@ -598,14 +576,14 @@ static bool _rtl92de_llt_table_init(struct ieee80211_hw *hw)
         /* This ring buffer is used as beacon buffer if we */
         /* config this MAC as two MAC transfer. */
         /* Otherwise used as local loopback buffer.  */
-        for (i = txpktbuf_bndy; i < maxPage; i++) {
+        for (i = txpktbuf_bndy; i < maxpage; i++) {
                 status = _rtl92de_llt_write(hw, i, (i + 1));
                 if (true != status)
                         return status;
         }
 
         /* Let last entry point to the start entry of ring buffer */
-        status = _rtl92de_llt_write(hw, maxPage, txpktbuf_bndy);
+        status = _rtl92de_llt_write(hw, maxpage, txpktbuf_bndy);
         if (true != status)
                 return status;
 
@@ -1415,13 +1393,13 @@ void rtl92de_update_interrupt_mask(struct ieee80211_hw *hw,
 }
 
 static void _rtl92de_readpowervalue_fromprom(struct txpower_info *pwrinfo,
-                                 u8 *rom_content, bool autoLoadfail)
+                                 u8 *rom_content, bool autoloadfail)
 {
         u32 rfpath, eeaddr, group, offset1, offset2;
         u8 i;
 
         memset(pwrinfo, 0, sizeof(struct txpower_info));
-        if (autoLoadfail) {
+        if (autoloadfail) {
                 for (group = 0; group < CHANNEL_GROUP_MAX; group++) {
                         for (rfpath = 0; rfpath < RF6052_MAX_PATH; rfpath++) {
                                 if (group < CHANNEL_GROUP_MAX_2G) {
@@ -1563,7 +1541,7 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw,
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct txpower_info pwrinfo;
         u8 tempval[2], i, pwr, diff;
-        u32 ch, rfPath, group;
+        u32 ch, rfpath, group;
 
         _rtl92de_readpowervalue_fromprom(&pwrinfo, hwinfo, autoload_fail);
         if (!autoload_fail) {
@@ -1643,25 +1621,25 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw,
                  "Delta_IQK = 0x%x Delta_LCK = 0x%x\n",
                  rtlefuse->delta_iqk, rtlefuse->delta_lck);
 
-        for (rfPath = 0; rfPath < RF6052_MAX_PATH; rfPath++) {
+        for (rfpath = 0; rfpath < RF6052_MAX_PATH; rfpath++) {
                 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
                         group = rtl92d_get_chnlgroup_fromarray((u8) ch);
                         if (ch < CHANNEL_MAX_NUMBER_2G)
-                                rtlefuse->txpwrlevel_cck[rfPath][ch] =
-                                    pwrinfo.cck_index[rfPath][group];
-                        rtlefuse->txpwrlevel_ht40_1s[rfPath][ch] =
-                                    pwrinfo.ht40_1sindex[rfPath][group];
-                        rtlefuse->txpwr_ht20diff[rfPath][ch] =
-                                    pwrinfo.ht20indexdiff[rfPath][group];
-                        rtlefuse->txpwr_legacyhtdiff[rfPath][ch] =
-                                    pwrinfo.ofdmindexdiff[rfPath][group];
-                        rtlefuse->pwrgroup_ht20[rfPath][ch] =
-                                    pwrinfo.ht20maxoffset[rfPath][group];
-                        rtlefuse->pwrgroup_ht40[rfPath][ch] =
-                                    pwrinfo.ht40maxoffset[rfPath][group];
-                        pwr = pwrinfo.ht40_1sindex[rfPath][group];
-                        diff = pwrinfo.ht40_2sindexdiff[rfPath][group];
-                        rtlefuse->txpwrlevel_ht40_2s[rfPath][ch] =
+                                rtlefuse->txpwrlevel_cck[rfpath][ch] =
+                                    pwrinfo.cck_index[rfpath][group];
+                        rtlefuse->txpwrlevel_ht40_1s[rfpath][ch] =
+                                    pwrinfo.ht40_1sindex[rfpath][group];
+                        rtlefuse->txpwr_ht20diff[rfpath][ch] =
+                                    pwrinfo.ht20indexdiff[rfpath][group];
+                        rtlefuse->txpwr_legacyhtdiff[rfpath][ch] =
+                                    pwrinfo.ofdmindexdiff[rfpath][group];
+                        rtlefuse->pwrgroup_ht20[rfpath][ch] =
+                                    pwrinfo.ht20maxoffset[rfpath][group];
+                        rtlefuse->pwrgroup_ht40[rfpath][ch] =
+                                    pwrinfo.ht40maxoffset[rfpath][group];
+                        pwr = pwrinfo.ht40_1sindex[rfpath][group];
+                        diff = pwrinfo.ht40_2sindexdiff[rfpath][group];
+                        rtlefuse->txpwrlevel_ht40_2s[rfpath][ch] =
                                     (pwr > diff) ? (pwr - diff) : 0;
                 }
         }
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h
index e6c702e69ecf..ea495216d394 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92DE_HW_H__
 #define __RTL92DE_HW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c
index 8851038c9eba..2b76a025deb8 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h
index 9874519704d3..7599c7e5ecc3 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CE_LED_H__
 #define __RTL92CE_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
index de98d88199d6..0ae6371b6318 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -506,16 +484,16 @@ static void _rtl92d_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
         rtlphy->phyreg_def[RF90_PATH_D].rfrx_afe = ROFDM0_XDRXAFE;
 
         /* Tx AFE control 1 */
-        rtlphy->phyreg_def[RF90_PATH_A].rftxiq_imbal = ROFDM0_XATxIQIMBALANCE;
-        rtlphy->phyreg_def[RF90_PATH_B].rftxiq_imbal = ROFDM0_XBTxIQIMBALANCE;
-        rtlphy->phyreg_def[RF90_PATH_C].rftxiq_imbal = ROFDM0_XCTxIQIMBALANCE;
-        rtlphy->phyreg_def[RF90_PATH_D].rftxiq_imbal = ROFDM0_XDTxIQIMBALANCE;
+        rtlphy->phyreg_def[RF90_PATH_A].rftxiq_imbal = ROFDM0_XATXIQIMBALANCE;
+        rtlphy->phyreg_def[RF90_PATH_B].rftxiq_imbal = ROFDM0_XBTXIQIMBALANCE;
+        rtlphy->phyreg_def[RF90_PATH_C].rftxiq_imbal = ROFDM0_XCTXIQIMBALANCE;
+        rtlphy->phyreg_def[RF90_PATH_D].rftxiq_imbal = ROFDM0_XDTXIQIMBALANCE;
 
         /* Tx AFE control 2 */
-        rtlphy->phyreg_def[RF90_PATH_A].rftx_afe = ROFDM0_XATxAFE;
-        rtlphy->phyreg_def[RF90_PATH_B].rftx_afe = ROFDM0_XBTxAFE;
-        rtlphy->phyreg_def[RF90_PATH_C].rftx_afe = ROFDM0_XCTxAFE;
-        rtlphy->phyreg_def[RF90_PATH_D].rftx_afe = ROFDM0_XDTxAFE;
+        rtlphy->phyreg_def[RF90_PATH_A].rftx_afe = ROFDM0_XATXAFE;
+        rtlphy->phyreg_def[RF90_PATH_B].rftx_afe = ROFDM0_XBTXAFE;
+        rtlphy->phyreg_def[RF90_PATH_C].rftx_afe = ROFDM0_XCTXAFE;
+        rtlphy->phyreg_def[RF90_PATH_D].rftx_afe = ROFDM0_XDTXAFE;
 
         /* Tranceiver LSSI Readback SI mode */
         rtlphy->phyreg_def[RF90_PATH_A].rf_rb = RFPGA0_XA_LSSIREADBACK;
@@ -764,7 +742,7 @@ bool rtl92d_phy_bb_config(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_RF_CTRL, value | RF_EN | RF_RSTB |
                 RF_SDMRSTB);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_PPLL | FEN_PCIEA |
-                FEN_DIO_PCIE | FEN_BB_GLB_RSTn | FEN_BBRSTB);
+                FEN_DIO_PCIE | FEN_BB_GLB_RSTN | FEN_BBRSTB);
         rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80);
         if (!(IS_92D_SINGLEPHY(rtlpriv->rtlhal.version))) {
                 regvaldw = rtl_read_dword(rtlpriv, REG_LEDCFG0);
@@ -1480,11 +1458,11 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
         u8 result = 0;
         u8 i;
         u8 retrycount = 2;
-        u32 TxOKBit = BIT(28), RxOKBit = BIT(27);
+        u32 TXOKBIT = BIT(28), RXOKBIT = BIT(27);
 
         if (rtlhal->interfaceindex == 1) {      /* PHY1 */
-                TxOKBit = BIT(31);
-                RxOKBit = BIT(30);
+                TXOKBIT = BIT(31);
+                RXOKBIT = BIT(30);
         }
         RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK!\n");
         /* path-A IQK setting */
@@ -1526,7 +1504,7 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe9c = 0x%x\n", rege9c);
                 regea4 = rtl_get_bbreg(hw, 0xea4, MASKDWORD);
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xea4 = 0x%x\n", regea4);
-                if (!(regeac & TxOKBit) &&
+                if (!(regeac & TXOKBIT) &&
                      (((rege94 & 0x03FF0000) >> 16) != 0x142)) {
                         result |= 0x01;
                 } else { /* if Tx not OK, ignore Rx */
@@ -1536,7 +1514,7 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                 }
 
                 /* if Tx is OK, check whether Rx is OK */
-                if (!(regeac & RxOKBit) &&
+                if (!(regeac & RXOKBIT) &&
                     (((regea4 & 0x03FF0000) >> 16) != 0x132)) {
                         result |= 0x02;
                         break;
@@ -2165,7 +2143,7 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
         if (final_candidate == 0xFF) {
                 return;
         } else if (iqk_ok) {
-                oldval_0 = (rtl_get_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
+                oldval_0 = (rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
                         MASKDWORD) >> 22) & 0x3FF;      /* OFDM0_D */
                 val_x = result[final_candidate][0];
                 if ((val_x & 0x00000200) != 0)
@@ -2174,7 +2152,7 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
                         "X = 0x%x, tx0_a = 0x%x, oldval_0 0x%x\n",
                         val_x, tx0_a, oldval_0);
-                rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, 0x3FF, tx0_a);
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, 0x3FF, tx0_a);
                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24),
                               ((val_x * oldval_0 >> 7) & 0x1));
                 val_y = result[final_candidate][1];
@@ -2188,15 +2166,15 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
                         "Y = 0x%lx, tx0_c = 0x%lx\n",
                         val_y, tx0_c);
-                rtl_set_bbreg(hw, ROFDM0_XCTxAFE, 0xF0000000,
+                rtl_set_bbreg(hw, ROFDM0_XCTXAFE, 0xF0000000,
                               ((tx0_c & 0x3C0) >> 6));
-                rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, 0x003F0000,
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, 0x003F0000,
                               (tx0_c & 0x3F));
                 if (is2t)
                         rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(26),
                                       ((val_y * oldval_0 >> 7) & 0x1));
                 RTPRINT(rtlpriv, FINIT, INIT_IQK, "0xC80 = 0x%x\n",
-                        rtl_get_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
+                        rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
                                       MASKDWORD));
                 if (txonly) {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,  "only Tx OK\n");
@@ -2224,7 +2202,7 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
         if (final_candidate == 0xFF) {
                 return;
         } else if (iqk_ok) {
-                oldval_1 = (rtl_get_bbreg(hw, ROFDM0_XBTxIQIMBALANCE,
+                oldval_1 = (rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
                                           MASKDWORD) >> 22) & 0x3FF;
                 val_x = result[final_candidate][4];
                 if ((val_x & 0x00000200) != 0)
@@ -2232,7 +2210,7 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
                 tx1_a = (val_x * oldval_1) >> 8;
                 RTPRINT(rtlpriv, FINIT, INIT_IQK, "X = 0x%x, tx1_a = 0x%x\n",
                         val_x, tx1_a);
-                rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, 0x3FF, tx1_a);
+                rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, 0x3FF, tx1_a);
                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(28),
                               ((val_x * oldval_1 >> 7) & 0x1));
                 val_y = result[final_candidate][5];
@@ -2243,9 +2221,9 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
                 tx1_c = (val_y * oldval_1) >> 8;
                 RTPRINT(rtlpriv, FINIT, INIT_IQK, "Y = 0x%lx, tx1_c = 0x%lx\n",
                         val_y, tx1_c);
-                rtl_set_bbreg(hw, ROFDM0_XDTxAFE, 0xF0000000,
+                rtl_set_bbreg(hw, ROFDM0_XDTXAFE, 0xF0000000,
                               ((tx1_c & 0x3C0) >> 6));
-                rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, 0x003F0000,
+                rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, 0x003F0000,
                               (tx1_c & 0x3F));
                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(30),
                               ((val_y * oldval_1 >> 7) & 0x1));
@@ -3086,13 +3064,13 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 if ((ppsc->rfpwr_state == ERFOFF) &&
                     RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
                         bool rtstatus;
-                        u32 InitializeCount = 0;
+                        u32 initializecount = 0;
                         do {
-                                InitializeCount++;
+                                initializecount++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                          "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
-                        } while (!rtstatus && (InitializeCount < 10));
+                        } while (!rtstatus && (initializecount < 10));
 
                         RT_CLEAR_PS_LEVEL(ppsc,
                                           RT_RF_OFF_LEVL_HALT_NIC);
@@ -3387,9 +3365,9 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
                 /* 5G LAN ON */
                 rtl_set_bbreg(hw, 0xB30, 0x00F00000, 0xa);
                 /* TX BB gain shift*1,Just for testchip,0xc80,0xc88 */
-                rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, MASKDWORD,
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD,
                               0x40000100);
-                rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, MASKDWORD,
+                rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, MASKDWORD,
                               0x40000100);
                 if (rtlhal->macphymode == DUALMAC_DUALPHY) {
                         rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW,
@@ -3443,16 +3421,16 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
                 rtl_set_bbreg(hw, 0xB30, 0x00F00000, 0x0);
                 /* TX BB gain shift,Just for testchip,0xc80,0xc88 */
                 if (rtlefuse->internal_pa_5g[0])
-                        rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, MASKDWORD,
+                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD,
                                       0x2d4000b5);
                 else
-                        rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, MASKDWORD,
+                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD,
                                       0x20000080);
                 if (rtlefuse->internal_pa_5g[1])
-                        rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, MASKDWORD,
+                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, MASKDWORD,
                                       0x2d4000b5);
                 else
-                        rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, MASKDWORD,
+                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, MASKDWORD,
                                       0x20000080);
                 if (rtlhal->macphymode == DUALMAC_DUALPHY) {
                         rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW,
@@ -3481,10 +3459,10 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
         /* update IQK related settings */
         rtl_set_bbreg(hw, ROFDM0_XARXIQIMBALANCE, MASKDWORD, 0x40000100);
         rtl_set_bbreg(hw, ROFDM0_XBRXIQIMBALANCE, MASKDWORD, 0x40000100);
-        rtl_set_bbreg(hw, ROFDM0_XCTxAFE, 0xF0000000, 0x00);
+        rtl_set_bbreg(hw, ROFDM0_XCTXAFE, 0xF0000000, 0x00);
         rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(30) | BIT(28) |
                       BIT(26) | BIT(24), 0x00);
-        rtl_set_bbreg(hw, ROFDM0_XDTxAFE, 0xF0000000, 0x00);
+        rtl_set_bbreg(hw, ROFDM0_XDTXAFE, 0xF0000000, 0x00);
         rtl_set_bbreg(hw, 0xca0, 0xF0000000, 0x00);
         rtl_set_bbreg(hw, ROFDM0_AGCRSSITABLE, 0x0000F000, 0x00);
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h
index 58b56b523dbe..8d07c783a023 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92D_PHY_H__
 #define __RTL92D_PHY_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
index d4c4e76a9244..2783d7e7b227 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92D_REG_H__
 #define __RTL92D_REG_H__
@@ -752,7 +730,7 @@
 
 /* SYS_FUNC_EN */
 #define FEN_BBRSTB                              BIT(0)
-#define FEN_BB_GLB_RSTn                         BIT(1)
+#define FEN_BB_GLB_RSTN                         BIT(1)
 #define FEN_USBA                                BIT(2)
 #define FEN_UPLL                                BIT(3)
 #define FEN_USBD                                BIT(4)
@@ -773,7 +751,7 @@
 #define PFM_ALDN                                BIT(1)
 #define PFM_LDKP                                BIT(2)
 #define PFM_WOWL                                BIT(3)
-#define EnPDN                                   BIT(4)
+#define ENPDN                                   BIT(4)
 #define PDN_PL                                  BIT(5)
 #define APFM_ONMAC                              BIT(8)
 #define APFM_OFF                                BIT(9)
@@ -910,7 +888,7 @@
 /* MCUFWDL  */
 #define MCUFWDL_EN                              BIT(0)
 #define MCUFWDL_RDY                             BIT(1)
-#define FWDL_ChkSum_rpt                         BIT(2)
+#define FWDL_CHKSUM_RPT                         BIT(2)
 #define MACINI_RDY                              BIT(3)
 #define BBINI_RDY                               BIT(4)
 #define RFINI_RDY                               BIT(5)
@@ -1033,7 +1011,7 @@
 #define RFPGA0_XA_LSSIPARAMETER                 0x840
 #define RFPGA0_XB_LSSIPARAMETER                 0x844
 
-#define RFPGA0_RFWAkEUPPARAMETER                0x850
+#define RFPGA0_RFWAKEUPPARAMETER                0x850
 #define RFPGA0_RFSLEEPUPPARAMETER               0x854
 
 #define RFPGA0_XAB_SWITCHCONTROL                0x858
@@ -1135,14 +1113,14 @@
 #define ROFDM0_AGCRSSITABLE                     0xc78
 #define ROFDM0_HTSTFAGC                         0xc7c
 
-#define ROFDM0_XATxIQIMBALANCE                  0xc80
-#define ROFDM0_XATxAFE                          0xc84
-#define ROFDM0_XBTxIQIMBALANCE                  0xc88
-#define ROFDM0_XBTxAFE                          0xc8c
-#define ROFDM0_XCTxIQIMBALANCE                  0xc90
-#define ROFDM0_XCTxAFE                          0xc94
-#define ROFDM0_XDTxIQIMBALANCE                  0xc98
-#define ROFDM0_XDTxAFE                          0xc9c
+#define ROFDM0_XATXIQIMBALANCE                  0xc80
+#define ROFDM0_XATXAFE                          0xc84
+#define ROFDM0_XBTXIQIMBALANCE                  0xc88
+#define ROFDM0_XBTXAFE                          0xc8c
+#define ROFDM0_XCTXIQIMBALANCE                  0xc90
+#define ROFDM0_XCTXAFE                          0xc94
+#define ROFDM0_XDTXIQIMBALANCE                  0xc98
+#define ROFDM0_XDTXAFE                          0xc9c
 
 #define ROFDM0_RXHPPARAMETER                    0xce0
 #define ROFDM0_TXPSEUDONOISEWGT                 0xce4
@@ -1186,7 +1164,7 @@
 #define ROFDM_AGCREPORT                         0xdd0
 #define ROFDM_RXSNR                             0xdd4
 #define ROFDM_RXEVMCSI                          0xdd8
-#define ROFDM_SIGReport                         0xddc
+#define ROFDM_SIGREPORT                         0xddc
 
 /* 8. PageE(0xE00) */
 #define RTXAGC_A_RATE18_06                      0xe00
@@ -1228,7 +1206,7 @@
 #define RF_IPA                                  0x15
 #define RF_POW_ABILITY                          0x17
 #define RF_MODE_AG                              0x18
-#define rRfChannel                              0x18
+#define rfchannel                               0x18
 #define RF_CHNLBW                               0x18
 #define RF_TOP                                  0x19
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c
index 021d3c538ac2..915a36f7af5e 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h
index c650a8dcdb26..4e646cc9ebc0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92D_RF_H__
 #define __RTL92D_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
index d5ba2bace79b..99e5cd9a5c86 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.h
index fd7d036e9abc..19db4ce30e44 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92DE_SW_H__
 #define __RTL92DE_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.c
index 4badb183cf35..9b35c65d91f2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.c
@@ -1,28 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- * Created on  2010/12/23,  6:38
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include <linux/types.h>
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.h
index 7fefc483ec28..2a45082f441f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.h
@@ -1,28 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- * Created on  2010/ 5/18,  1:41
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92DE_TABLE__H_
 #define __RTL92DE_TABLE__H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
index d7b023cf7400..d162884a9e00 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -494,7 +472,7 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw,	struct rtl_stats *stats,
         stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
                                          && (GET_RX_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
-        stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
+        stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
         stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
         rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->band = hw->conf.chandef.chan->band;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
index f7f776539438..36820070fd76 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92DE_TRX_H__
 #define __RTL92DE_TRX_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h
index 9f7e7bb8610b..fe1b7cdab1d5 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_DEF_H__
 #define __RTL92E_DEF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
index faed6e2dedf6..648f9108ed4b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.h
index 107d5a488fa8..ec48e5671b5b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_DM_H__
 #define __RTL92E_DM_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
index 84a0d0eb72e1..7c5b54b71a92 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
index 6a2fbf20d579..cbfecea232a3 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E__FW__H__
 #define __RTL92E__FW__H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
index 3f2295fdb02d..53011c2a44f5 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.h
index 3a63bec9b0cc..fc224392615f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_HW_H__
 #define __RTL92E_HW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c
index 96c64785108b..78202ad4036e 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h
index 8ef640a2ef7f..6d775e14846f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_LED_H__
 #define __RTL92E_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
index 8b072ee8e0d5..222abc41669c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h
index 49bd0e554c65..1a5dbc628379 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_PHY_H__
 #define __RTL92E_PHY_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.c
index 1a701d007f0c..515c1c3d6b43 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "pwrseq.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
index c570801508cc..2ae8347f7ebb 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_PWRSEQ_H__
 #define __RTL92E_PWRSEQ_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/reg.h
index 1eaa1fab550d..0164e006f43e 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/reg.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_REG_H__
 #define __RTL92E_REG_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c
index bc76a91da762..6b8ef680dc57 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.h
index 039c0133ad6b..d7b391599926 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_RF_H__
 #define __RTL92E_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
index 9ea62599ecbb..b6ee7dae5943 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h
index 21433d0332d0..36e29a2da0fd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_SW_H__
 #define __RTL92E_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.c
index abcdd0670fd8..fb66f610bf5d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.c
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "table.h"
 u32 RTL8192EE_PHY_REG_ARRAY[] = {
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.h
index bff9df88815d..0bc7ef58c3b9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.h
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_TABLE__H_
 #define __RTL92E_TABLE__H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
index 14d6e3fc5767..09cf8180e4ff 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -393,7 +371,7 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
         if (status->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (status->rx_is40Mhzpacket)
+        if (status->rx_is40mhzpacket)
                 rx_status->bw = RATE_INFO_BW_40;
 
         if (status->is_ht)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h
index 45df3e79f490..a9e5e620a653 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL92E_TRX_H__
 #define __RTL92E_TRX_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h
index b5ba0554a0cd..bb6b60814762 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __REALTEK_92S_DEF_H__
 #define __REALTEK_92S_DEF_H__
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c
index 44f510a94b09..a6e4384ceea1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.h
index 3af07efed73a..b9c5a92c2bd0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __RTL_92S_DM_H__
 #define __RTL_92S_DM_H__
 
@@ -79,7 +58,7 @@ enum dm_ratr_sta {
 
 #define DM_DIG_HIGH_PWR_THRESH_HIGH     75
 #define DM_DIG_HIGH_PWR_THRESH_LOW      70
-#define DM_DIG_MIN_Netcore              0x12
+#define DM_DIG_MIN_NETCORE              0x12
 
 void rtl92s_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92s_dm_init(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
index e7b1d7c0f542..faa307a0b148 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -569,14 +547,14 @@ static bool _rtl92s_firmware_set_h2c_cmd(struct ieee80211_hw *hw, u8 h2c_cmd,
         return true;
 }
 
-void rtl92s_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 Mode)
+void rtl92s_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
 {
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct h2c_set_pwrmode_parm     pwrmode;
         u16 max_wakeup_period = 0;
 
-        pwrmode.mode = Mode;
+        pwrmode.mode = mode;
         pwrmode.flag_low_traffic_en = 0;
         pwrmode.flag_lpnav_en = 0;
         pwrmode.flag_rf_low_snr_en = 0;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.h
index 5827aa32cef0..99c6f7eefd85 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __REALTEK_FIRMWARE92S_H__
 #define __REALTEK_FIRMWARE92S_H__
 
@@ -297,7 +276,7 @@ enum fw_h2c_cmd {
         H2C_JOINBSS_CMD,
         H2C_DISCONNECT_CMD,                             /*15*/
         H2C_CREATEBSS_CMD,
-        H2C_SETOPMode_CMD,
+        H2C_SETOPMODE_CMD,
         H2C_SITESURVEY_CMD,
         H2C_SETAUTH_CMD,
         H2C_SETKEY_CMD,                                 /*20*/
@@ -336,10 +315,10 @@ enum fw_h2c_cmd {
 
 /* The following macros are used for FW
  * CMD map and parameter updated. */
-#define FW_CMD_IO_CLR(rtlpriv, _Bit)                            \
+#define FW_CMD_IO_CLR(rtlpriv, _bit)                            \
         do {                                                    \
                 udelay(1000);                                   \
-                rtlpriv->rtlhal.fwcmd_iomap &= (~_Bit);         \
+                rtlpriv->rtlhal.fwcmd_iomap &= (~_bit);         \
         } while (0)
 
 #define FW_CMD_IO_UPDATE(rtlpriv, _val)                         \
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
index 30dea7b9bc17..6d6e8994460d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
@@ -258,7 +236,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         union aci_aifsn *p_aci_aifsn = (union aci_aifsn *)(&(
                                                         mac->ac[0].aifs));
                         u8 acm = p_aci_aifsn->f.acm;
-                        u8 acm_ctrl = rtl_read_byte(rtlpriv, AcmHwCtrl);
+                        u8 acm_ctrl = rtl_read_byte(rtlpriv, ACMHWCTRL);
 
                         acm_ctrl = acm_ctrl | ((rtlpci->acm_method == 2) ?
                                    0x0 : 0x1);
@@ -266,13 +244,13 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         if (acm) {
                                 switch (e_aci) {
                                 case AC0_BE:
-                                        acm_ctrl |= AcmHw_BeqEn;
+                                        acm_ctrl |= ACMHW_BEQEN;
                                         break;
                                 case AC2_VI:
-                                        acm_ctrl |= AcmHw_ViqEn;
+                                        acm_ctrl |= ACMHW_VIQEN;
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl |= AcmHw_VoqEn;
+                                        acm_ctrl |= ACMHW_VOQEN;
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
@@ -283,13 +261,13 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         } else {
                                 switch (e_aci) {
                                 case AC0_BE:
-                                        acm_ctrl &= (~AcmHw_BeqEn);
+                                        acm_ctrl &= (~ACMHW_BEQEN);
                                         break;
                                 case AC2_VI:
-                                        acm_ctrl &= (~AcmHw_ViqEn);
+                                        acm_ctrl &= (~ACMHW_VIQEN);
                                         break;
                                 case AC3_VO:
-                                        acm_ctrl &= (~AcmHw_VoqEn);
+                                        acm_ctrl &= (~ACMHW_VOQEN);
                                         break;
                                 default:
                                         pr_err("switch case %#x not processed\n",
@@ -300,7 +278,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                         RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
                                  "HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);
-                        rtl_write_byte(rtlpriv, AcmHwCtrl, acm_ctrl);
+                        rtl_write_byte(rtlpriv, ACMHWCTRL, acm_ctrl);
                         break;
                 }
         case HW_VAR_RCR:{
@@ -869,7 +847,7 @@ static void _rtl92se_macconfig_after_fwdownload(struct ieee80211_hw *hw)
         /* 10. Power Save Control Register (Offset: 0x0260 - 0x02DF) */
         /* 11. General Purpose Register (Offset: 0x02E0 - 0x02FF) */
         /* 12. Host Interrupt Status Register (Offset: 0x0300 - 0x030F) */
-        /* 13. Test Mode and Debug Control Register (Offset: 0x0310 - 0x034F) */
+        /* 13. Test mode and Debug Control Register (Offset: 0x0310 - 0x034F) */
 
         /* 14. Set driver info, we only accept PHY status now. */
         rtl_write_byte(rtlpriv, RXDRVINFO_SZ, 4);
@@ -1641,7 +1619,7 @@ void rtl92se_update_interrupt_mask(struct ieee80211_hw *hw,
         rtl92se_enable_interrupt(hw);
 }
 
-static void _rtl8192se_get_IC_Inferiority(struct ieee80211_hw *hw)
+static void _rtl8192se_get_ic_inferiority(struct ieee80211_hw *hw)
 {
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -1704,7 +1682,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         if (rtlefuse->autoload_failflag)
                 return;
 
-        _rtl8192se_get_IC_Inferiority(hw);
+        _rtl8192se_get_ic_inferiority(hw);
 
         /* Read IC Version && Channel Plan */
         /* VID, DID      SE     0xA-D */
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.h
index fa836ceefc8f..5edbc1ecd261 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __REALTEK_PCI92SE_HW_H__
 #define __REALTEK_PCI92SE_HW_H__
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c
index 33c307aca911..2d18bc1ee480 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h
index 90e265d9ffc6..c9e481a8d943 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __REALTEK_PCI92SE_LED_H__
 #define __REALTEK_PCI92SE_LED_H__
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c
index 86cb853f7169..d5c0eb462315 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -549,13 +527,13 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                             RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
 
                                 bool rtstatus;
-                                u32 InitializeCount = 0;
+                                u32 initializecount = 0;
                                 do {
-                                        InitializeCount++;
+                                        initializecount++;
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                                  "IPS Set eRf nic enable\n");
                                         rtstatus = rtl_ps_enable_nic(hw);
-                                } while (!rtstatus && (InitializeCount < 10));
+                                } while (!rtstatus && (initializecount < 10));
 
                                 RT_CLEAR_PS_LEVEL(ppsc,
                                                   RT_RF_OFF_LEVL_HALT_NIC);
@@ -935,7 +913,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
 
         if (!rtstatus) {
                 pr_err("Write BB Reg Fail!!\n");
-                goto phy_BB8190_Config_ParaFile_Fail;
+                goto phy_bb8190_config_parafile_fail;
         }
 
         /* 2. If EEPROM or EFUSE autoload OK, We must config by
@@ -948,7 +926,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
         }
         if (!rtstatus) {
                 pr_err("_rtl92s_phy_bb_config_parafile(): BB_PG Reg Fail!!\n");
-                goto phy_BB8190_Config_ParaFile_Fail;
+                goto phy_bb8190_config_parafile_fail;
         }
 
         /* 3. BB AGC table Initialization */
@@ -956,7 +934,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
 
         if (!rtstatus) {
                 pr_err("%s(): AGC Table Fail\n", __func__);
-                goto phy_BB8190_Config_ParaFile_Fail;
+                goto phy_bb8190_config_parafile_fail;
         }
 
         /* Check if the CCK HighPower is turned ON. */
@@ -964,7 +942,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
         rtlphy->cck_high_power = (bool)(rtl92s_phy_query_bb_reg(hw,
                         RFPGA0_XA_HSSIPARAMETER2, 0x200));
 
-phy_BB8190_Config_ParaFile_Fail:
+phy_bb8190_config_parafile_fail:
         return rtstatus;
 }
 
@@ -1029,13 +1007,13 @@ bool rtl92s_phy_mac_config(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
         u32 arraylength;
-        u32 *ptraArray;
+        u32 *ptrarray;
 
         arraylength = MAC_2T_ARRAYLENGTH;
-        ptraArray = rtl8192semac_2t_array;
+        ptrarray = rtl8192semac_2t_array;
 
         for (i = 0; i < arraylength; i = i + 2)
-                rtl_write_byte(rtlpriv, ptraArray[i], (u8)ptraArray[i + 1]);
+                rtl_write_byte(rtlpriv, ptrarray[i], (u8)ptrarray[i + 1]);
 
         return true;
 }
@@ -1128,7 +1106,7 @@ void rtl92s_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 }
 
 static void _rtl92s_phy_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
-                                          u8 *cckpowerlevel, u8 *ofdmpowerLevel)
+                                          u8 *cckpowerlevel, u8 *ofdmpowerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -1144,15 +1122,15 @@ static void _rtl92s_phy_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
         /* 2. OFDM for 1T or 2T */
         if (rtlphy->rf_type == RF_1T2R || rtlphy->rf_type == RF_1T1R) {
                 /* Read HT 40 OFDM TX power */
-                ofdmpowerLevel[0] = rtlefuse->txpwrlevel_ht40_1s[0][index];
-                ofdmpowerLevel[1] = rtlefuse->txpwrlevel_ht40_1s[1][index];
+                ofdmpowerlevel[0] = rtlefuse->txpwrlevel_ht40_1s[0][index];
+                ofdmpowerlevel[1] = rtlefuse->txpwrlevel_ht40_1s[1][index];
         } else if (rtlphy->rf_type == RF_2T2R) {
                 /* Read HT 40 OFDM TX power */
-                ofdmpowerLevel[0] = rtlefuse->txpwrlevel_ht40_2s[0][index];
-                ofdmpowerLevel[1] = rtlefuse->txpwrlevel_ht40_2s[1][index];
+                ofdmpowerlevel[0] = rtlefuse->txpwrlevel_ht40_2s[0][index];
+                ofdmpowerlevel[1] = rtlefuse->txpwrlevel_ht40_2s[1][index];
         } else {
-                ofdmpowerLevel[0] = 0;
-                ofdmpowerLevel[1] = 0;
+                ofdmpowerlevel[0] = 0;
+                ofdmpowerlevel[1] = 0;
         }
 }
 
@@ -1171,7 +1149,7 @@ void rtl92s_phy_set_txpower(struct ieee80211_hw *hw, u8	channel)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         /* [0]:RF-A, [1]:RF-B */
-        u8 cckpowerlevel[2], ofdmpowerLevel[2];
+        u8 cckpowerlevel[2], ofdmpowerlevel[2];
 
         if (!rtlefuse->txpwr_fromeprom)
                 return;
@@ -1183,18 +1161,18 @@ void rtl92s_phy_set_txpower(struct ieee80211_hw *hw, u8	channel)
          * 1. For CCK.
          * 2. For OFDM 1T or 2T */
         _rtl92s_phy_get_txpower_index(hw, channel, &cckpowerlevel[0],
-                        &ofdmpowerLevel[0]);
+                        &ofdmpowerlevel[0]);
 
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                  "Channel-%d, cckPowerLevel (A / B) = 0x%x / 0x%x, ofdmPowerLevel (A / B) = 0x%x / 0x%x\n",
                  channel, cckpowerlevel[0], cckpowerlevel[1],
-                 ofdmpowerLevel[0], ofdmpowerLevel[1]);
+                 ofdmpowerlevel[0], ofdmpowerlevel[1]);
 
         _rtl92s_phy_ccxpower_indexcheck(hw, channel, &cckpowerlevel[0],
-                        &ofdmpowerLevel[0]);
+                        &ofdmpowerlevel[0]);
 
         rtl92s_phy_rf6052_set_ccktxpower(hw, cckpowerlevel[0]);
-        rtl92s_phy_rf6052_set_ofdmtxpower(hw, &ofdmpowerLevel[0], channel);
+        rtl92s_phy_rf6052_set_ofdmtxpower(hw, &ofdmpowerlevel[0], channel);
 
 }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.h
index 7a3b6b623872..b8b5f097b67b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __RTL92S_PHY_H__
 #define __RTL92S_PHY_H__
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/reg.h
index 5d445c2afcf3..45f968e0e57c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/reg.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __REALTEK_92S_REG_H__
 #define __REALTEK_92S_REG_H__
 
@@ -190,7 +169,7 @@
 #define BCNTCFG                                 0x01E0
 #define CWRR                                    0x01E2
 #define ACMAVG                                  0x01E4
-#define AcmHwCtrl                               0x01E7
+#define ACMHWCTRL                               0x01E7
 #define VO_ADMTM                                0x01E8
 #define VI_ADMTM                                0x01EC
 #define BE_ADMTM                                0x01F0
@@ -256,7 +235,7 @@
 #define INTA_MASK                               0x0300
 #define ISR                                     0x0308
 
-/* 13. Test Mode and Debug Control Registers */
+/* 13. Test mode and Debug Control Registers */
 #define DBG_PORT_SWITCH                         0x003A
 #define BIST                                    0x0310
 #define DBS                                     0x0314
@@ -346,9 +325,9 @@
 #define SYS_SWHW_SEL                            BIT(14)
 #define SYS_FWHW_SEL                            BIT(15)
 
-#define CmdEEPROM_En                            BIT(5)
-#define CmdEERPOMSEL                            BIT(4)
-#define Cmd9346CR_9356SEL                       BIT(4)
+#define CMDEEPROM_EN                            BIT(5)
+#define CMDEERPOMSEL                            BIT(4)
+#define CMD9346CR_9356SEL                       BIT(4)
 
 #define AFE_MBEN                                BIT(1)
 #define AFE_BGEN                                BIT(0)
@@ -369,9 +348,9 @@
 
 #define APLL_EN                                 BIT(0)
 
-#define AFR_CardBEn                             BIT(0)
+#define AFR_CARDBEN                             BIT(0)
 #define AFR_CLKRUN_SEL                          BIT(1)
-#define AFR_FuncRegEn                           BIT(2)
+#define AFR_FUNCREGEN                           BIT(2)
 
 #define APSDOFF_STATUS                          BIT(15)
 #define APSDOFF                                 BIT(14)
@@ -387,13 +366,13 @@
 #define HCI_RXDMA_EN                            BIT(3)
 #define HCI_TXDMA_EN                            BIT(2)
 
-#define StopHCCA                                BIT(6)
-#define StopHigh                                BIT(5)
-#define StopMgt                                 BIT(4)
-#define StopVO                                  BIT(3)
-#define StopVI                                  BIT(2)
-#define StopBE                                  BIT(1)
-#define StopBK                                  BIT(0)
+#define STOPHCCA                                BIT(6)
+#define STOPHIGH                                BIT(5)
+#define STOPMGT                                 BIT(4)
+#define STOPVO                                  BIT(3)
+#define STOPVI                                  BIT(2)
+#define STOPBE                                  BIT(1)
+#define STOPBK                                  BIT(0)
 
 #define LBK_NORMAL                              0x00
 #define LBK_MAC_LB                              (BIT(0) | BIT(1) | BIT(3))
@@ -405,7 +384,7 @@
 #define TXDMAPRE2FULL                           BIT(23)
 #define DISCW                                   BIT(20)
 #define TCRICV                                  BIT(19)
-#define CfendForm                               BIT(17)
+#define cfendform                               BIT(17)
 #define TCRCRC                                  BIT(16)
 #define FAKE_IMEM_EN                            BIT(15)
 #define TSFRST                                  BIT(9)
@@ -530,7 +509,7 @@
 #define RRSR_MCS5                               BIT(17)
 #define RRSR_MCS6                               BIT(18)
 #define RRSR_MCS7                               BIT(19)
-#define BRSR_AckShortPmb                        BIT(23)
+#define BRSR_ACKSHORTPMB                        BIT(23)
 
 #define RATR_1M                                 0x00000001
 #define RATR_2M                                 0x00000002
@@ -581,13 +560,13 @@
 #define AC_PARAM_ECW_MIN_OFFSET                 8
 #define AC_PARAM_AIFS_OFFSET                    0
 
-#define AcmHw_HwEn                              BIT(0)
-#define AcmHw_BeqEn                             BIT(1)
-#define AcmHw_ViqEn                             BIT(2)
-#define AcmHw_VoqEn                             BIT(3)
-#define AcmHw_BeqStatus                         BIT(4)
-#define AcmHw_ViqStatus                         BIT(5)
-#define AcmHw_VoqStatus                         BIT(6)
+#define ACMHW_HWEN                              BIT(0)
+#define ACMHW_BEQEN                             BIT(1)
+#define ACMHW_VIQEN                             BIT(2)
+#define ACMHW_VOQEN                             BIT(3)
+#define ACMHW_BEQSTATUS                         BIT(4)
+#define ACMHW_VIQSTATUS                         BIT(5)
+#define ACMHW_VOQSTATUS                         BIT(6)
 
 #define RETRY_LIMIT_SHORT_SHIFT                 8
 #define RETRY_LIMIT_LONG_SHIFT                  0
@@ -845,7 +824,7 @@
 #define TCR_SAT                                 BIT(24)
 #define RCR_MXDMA_OFFSET                        8
 #define RCR_FIFO_OFFSET                         13
-#define RCR_OnlyErlPkt                          BIT(31)
+#define RCR_ONLYERLPKT                          BIT(31)
 #define CWR                                     0xDC
 #define RETRYCTR                                0xDE
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
index ea5b8ec45ec9..a37855f57e76 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.h
index e9ba283d05ad..a5959a228a35 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __INC_RTL92S_RF_H
 #define __INC_RTL92S_RF_H
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
index d55554b7fa9a..d1d84e7d47a4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h
index af449d6714e6..a31efba0e6b5 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h
@@ -1,25 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __REALTEK_PCI92SE_SW_H__
 #define __REALTEK_PCI92SE_SW_H__
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.c
index 162578f05c85..776e28e99d53 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.c
@@ -1,28 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- * Created on  2010/ 5/18,  1:41
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "table.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.h
index aa3c7687d226..4fd09f11f5bc 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.h
@@ -1,20 +1,6 @@
-/******************************************************************************
- * Copyright(c) 2008 - 2012 Realtek Corporation. All rights reserved.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- ******************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __INC_HAL8192SE_FW_IMG_H
 #define __INC_HAL8192SE_FW_IMG_H
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
index e1904c39f147..efb432c6d785 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -275,7 +253,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
         stats->isfirst_ampdu = (bool) ((GET_RX_STATUS_DESC_PAGGR(pdesc) == 1)
                                && (GET_RX_STATUS_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_STATUS_DESC_TSFL(pdesc);
-        stats->rx_is40Mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc);
+        stats->rx_is40mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc);
         stats->is_ht = (bool)GET_RX_STATUS_DESC_RX_HT(pdesc);
         stats->is_cck = SE_RX_HAL_IS_CCK_RATE(pdesc);
 
@@ -288,7 +266,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
         if (stats->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (stats->rx_is40Mhzpacket)
+        if (stats->rx_is40mhzpacket)
                 rx_status->bw = RATE_INFO_BW_40;
 
         if (stats->is_ht)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h
index 81a5445c04a3..90aa12fc6a7f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #ifndef __REALTEK_PCI92SE_TRX_H__
 #define __REALTEK_PCI92SE_TRX_H__
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/btc.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/btc.h
index 06c448c010fd..20a67dcc59cb 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/btc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/btc.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- **
- ** Copyright(c) 2009-2012  Realtek Corporation.
- **
- ** 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
- ** published by the Free Software Foundation.
- **
- ** This program is distributed in the hope that it will be useful, but WITHOUT
- ** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- ** FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- ** more details.
- **
- ** The full GNU General Public License is included in this distribution in the
- ** file called LICENSE.
- **
- ** Contact Information:
- ** wlanfae <wlanfae@realtek.com>
- ** Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- ** Hsinchu 300, Taiwan.
- ** Larry Finger <Larry.Finger@lwfinger.net>
- **
- ******************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_BTC_H__
 #define __RTL8723E_BTC_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
index 847544817549..42958df6b5d4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_DEF_H__
 #define __RTL8723E_DEF_H__
@@ -116,7 +94,7 @@
 #define IS_VENDOR_8723A_B_CUT(version)  ((IS_8723_SERIES(version))\
                 ? ((GET_CVID_CUT_VERSION(version) == \
                 B_CUT_VERSION) ? true : false) : false)
-#define IS_81xxC_VENDOR_UMC_B_CUT(version)      ((IS_CHIP_VENDOR_UMC(version))\
+#define IS_81XXC_VENDOR_UMC_B_CUT(version)      ((IS_CHIP_VENDOR_UMC(version))\
                 ? ((GET_CVID_CUT_VERSION(version) == \
                 B_CUT_VERSION) ? true : false) : false)
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c
index acfd54c6f8dd..514891ea2c64 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.h
index a113780af08a..bcad516f0d28 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_DM_H__
 #define __RTL8723E_DM_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c
index bf9859f74b6f..be451a6f7dbe 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h
index 2e668fcfc5c2..5c843736de8d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C__FW__H__
 #define __RTL92C__FW__H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c
index 5aac45d5a974..3ac31ec26517 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "hal_bt_coexist.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h
index 45719fdcb067..0455a3712f3e 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_HAL_BT_COEXIST_H__
 #define __RTL8723E_HAL_BT_COEXIST_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c
index 788de88ab1ee..a6b31dae5691 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #include "hal_btc.h"
 #include "../pci.h"
 #include "phy.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h
index 756868897d8b..620677128f11 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_HAL_BTC_H__
 #define __RTL8723E_HAL_BTC_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
index f783e4a8083d..6bab162e1bb8 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
@@ -698,7 +676,7 @@ static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
 
         /* HW Power on sequence */
         if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                PWR_INTF_PCI_MSK, Rtl8723_NIC_ENABLE_FLOW))
+                PWR_INTF_PCI_MSK, RTL8723_NIC_ENABLE_FLOW))
                 return false;
 
         bytetmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG+2);
@@ -988,7 +966,7 @@ int rtl8723e_hw_init(struct ieee80211_hw *hw)
         if (IS_VENDOR_UMC_A_CUT(rtlhal->version)) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD, 0x30255);
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G2, MASKDWORD, 0x50a00);
-        } else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {
+        } else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version)) {
                 rtl_set_rfreg(hw, RF90_PATH_A, 0x0C, MASKDWORD, 0x894AE);
                 rtl_set_rfreg(hw, RF90_PATH_A, 0x0A, MASKDWORD, 0x1AF31);
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_IPA, MASKDWORD, 0x8F425);
@@ -1284,7 +1262,7 @@ static void _rtl8723e_poweroff_adapter(struct ieee80211_hw *hw)
         /* Combo (PCIe + USB) Card and PCIe-MF Card */
         /* 1. Run LPS WL RFOFF flow */
         rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                                 PWR_INTF_PCI_MSK, Rtl8723_NIC_LPS_ENTER_FLOW);
+                                 PWR_INTF_PCI_MSK, RTL8723_NIC_LPS_ENTER_FLOW);
 
         /* 2. 0x1F[7:0] = 0 */
         /* turn off RF */
@@ -1304,7 +1282,7 @@ static void _rtl8723e_poweroff_adapter(struct ieee80211_hw *hw)
 
         /* HW card disable configuration. */
         rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                PWR_INTF_PCI_MSK, Rtl8723_NIC_DISABLE_FLOW);
+                PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
 
         /* Reset MCU IO Wrapper */
         u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.h
index c76e453f4f43..cf55f45d0779 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_HW_H__
 #define __RTL8723E_HW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c
index d567b0df0e9f..5e503dbc463b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h
index c22b19f542a6..9f85845d23cd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92CE_LED_H__
 #define __RTL92CE_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
index 3f3327878b51..54a3aec1dfa7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -905,7 +883,7 @@ static void _rtl8723e_phy_sw_rf_seting(struct ieee80211_hw *hw, u8 channel)
         struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-        if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {
+        if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version)) {
                 if (channel == 6 && rtlphy->current_chan_bw ==
                                 HT_CHANNEL_WIDTH_20)
                         rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h
index b85f5c7c5c01..98bfe02f66d5 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL92C_PHY_H__
 #define __RTL92C_PHY_H__
@@ -48,7 +26,7 @@
 #define MAX_STALL_TIME                          50
 #define ANTENNADIVERSITYVALUE                   0x80
 #define MAX_TXPWR_IDX_NMODE_92S                 63
-#define Reset_Cnt_Limit                         3
+#define reset_cnt_limit                         3
 
 #define IQK_ADDA_REG_NUM                        16
 #define IQK_MAC_REG_NUM                         4
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.c
index 2f7f81af8a55..041e3113a500 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../pwrseqcmd.h"
 #include "pwrseq.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
index e6c3aac3e9fd..d9247a8f3039 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_PWRSEQ_H__
 #define __RTL8723E_PWRSEQ_H__
@@ -327,14 +305,14 @@ extern struct wlan_pwr_cfg rtl8723A_leave_lps_flow
                 [RTL8723A_TRANS_LPS_TO_ACT_STEPS + RTL8723A_TRANS_END_STEPS];
 
 /* RTL8723 Power Configuration CMDs for PCIe interface */
-#define Rtl8723_NIC_PWR_ON_FLOW         rtl8723A_power_on_flow
-#define Rtl8723_NIC_RF_OFF_FLOW         rtl8723A_radio_off_flow
-#define Rtl8723_NIC_DISABLE_FLOW        rtl8723A_card_disable_flow
-#define Rtl8723_NIC_ENABLE_FLOW         rtl8723A_card_enable_flow
-#define Rtl8723_NIC_SUSPEND_FLOW        rtl8723A_suspend_flow
-#define Rtl8723_NIC_RESUME_FLOW         rtl8723A_resume_flow
-#define Rtl8723_NIC_PDN_FLOW            rtl8723A_hwpdn_flow
-#define Rtl8723_NIC_LPS_ENTER_FLOW      rtl8723A_enter_lps_flow
-#define Rtl8723_NIC_LPS_LEAVE_FLOW      rtl8723A_leave_lps_flow
+#define RTL8723_NIC_PWR_ON_FLOW         rtl8723A_power_on_flow
+#define RTL8723_NIC_RF_OFF_FLOW         rtl8723A_radio_off_flow
+#define RTL8723_NIC_DISABLE_FLOW        rtl8723A_card_disable_flow
+#define RTL8723_NIC_ENABLE_FLOW         rtl8723A_card_enable_flow
+#define RTL8723_NIC_SUSPEND_FLOW        rtl8723A_suspend_flow
+#define RTL8723_NIC_RESUME_FLOW         rtl8723A_resume_flow
+#define RTL8723_NIC_PDN_FLOW            rtl8723A_hwpdn_flow
+#define RTL8723_NIC_LPS_ENTER_FLOW      rtl8723A_enter_lps_flow
+#define RTL8723_NIC_LPS_LEAVE_FLOW      rtl8723A_leave_lps_flow
 
 #endif
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
index 30938cd9fce5..8696614c7cdd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_REG_H__
 #define __RTL8723E_REG_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c
index 89958b64b52d..9058527a7f94 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.h
index 7b44ebc0fac9..b445cfe65bf4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_RF_H__
 #define __RTL8723E_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
index 3103151dda2b..4b370410c83c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
@@ -175,7 +153,7 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
                 return 1;
         }
 
-        if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
+        if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))
                 fw_name = "rtlwifi/rtl8723fw_B.bin";
 
         rtlpriv->max_fw_size = 0x6000;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h
index 46478780d262..200ce39a0dd7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_SW_H__
 #define __RTL8723E_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.c
index 1bbee0bfac23..d895694be023 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.c
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "table.h"
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.h
index a044f3c456fa..4897dbc73b9f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.h
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_TABLE__H_
 #define __RTL8723E_TABLE__H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
index d461d0c9631f..90dc91b0d35b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -302,7 +280,7 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
         status->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1) &&
                                        (GET_RX_DESC_FAGGR(pdesc) == 1));
         status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
-        status->rx_is40Mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
+        status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
         status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
 
         status->is_cck = RX_HAL_IS_CCK_RATE(status->rate);
@@ -316,7 +294,7 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
         if (status->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (status->rx_is40Mhzpacket)
+        if (status->rx_is40mhzpacket)
                 rx_status->bw = RATE_INFO_BW_40;
 
         if (status->is_ht)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
index d592b08d4ac8..4a19ea76b290 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL8723E_TRX_H__
 #define __RTL8723E_TRX_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h
index 5e5403d69220..f4886c868df8 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_DEF_H__
 #define __RTL8723BE_DEF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
index 47e87a21ae27..ef355aa88117 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.h
index f752a2cad63d..c4f36e951747 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.h
@@ -1,24 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_DM_H__
 #define __RTL8723BE_DM_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
index f2441fbb92f1..4d7fa27f55ca 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
index 948d28646364..97ea77464139 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE__FW__H__
 #define __RTL8723BE__FW__H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
index b4f3f91b590e..979e5bfe5f45 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
@@ -319,12 +297,12 @@ void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
                 break;
         case HW_VAR_FWLPS_RF_ON:{
-                enum rf_pwrstate rfState;
+                enum rf_pwrstate rfstate;
                 u32 val_rcr;
 
                 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
-                                              (u8 *)(&rfState));
-                if (rfState == ERFOFF) {
+                                              (u8 *)(&rfstate));
+                if (rfstate == ERFOFF) {
                         *((bool *)(val)) = true;
                 } else {
                         val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
@@ -764,10 +742,10 @@ static bool _rtl8723be_llt_table_init(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         unsigned short i;
         u8 txpktbuf_bndy;
-        u8 maxPage;
+        u8 maxpage;
         bool status;
 
-        maxPage = 255;
+        maxpage = 255;
         txpktbuf_bndy = 245;
 
         rtl_write_dword(rtlpriv, REG_TRXFF_BNDY,
@@ -792,13 +770,13 @@ static bool _rtl8723be_llt_table_init(struct ieee80211_hw *hw)
         if (!status)
                 return status;
 
-        for (i = txpktbuf_bndy; i < maxPage; i++) {
+        for (i = txpktbuf_bndy; i < maxpage; i++) {
                 status = _rtl8723be_llt_write(hw, i, (i + 1));
                 if (!status)
                         return status;
         }
 
-        status = _rtl8723be_llt_write(hw, maxPage, txpktbuf_bndy);
+        status = _rtl8723be_llt_write(hw, maxpage, txpktbuf_bndy);
         if (!status)
                 return status;
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.h
index ae856a19e81a..eb797e9bb931 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_HW_H__
 #define __RTL8723BE_HW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c
index 4f7890d62c21..525f2c47da5b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h
index c57de379ee8d..8ac59374b632 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_LED_H__
 #define __RTL8723BE_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
index 11f94b1a436f..aa8a0950fcea 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.h
index 9021d4745ab7..a59813ea7c72 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_PHY_H__
 #define __RTL8723BE_PHY_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.c
index a1bb1f6116fb..95adac66676e 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../pwrseqcmd.h"
 #include "pwrseq.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
index 3367cfbc9502..57eac4864184 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_PWRSEQ_H__
 #define __RTL8723BE_PWRSEQ_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
index 95c4f8e206c7..28fd22b2a792 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_REG_H__
 #define __RTL8723BE_REG_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c
index 48491454b878..af72e489e31c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.h
index f423e157020f..81537a1a4fdf 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_RF_H__
 #define __RTL8723BE_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
index c9f7b042d9c6..00e6254bf82b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h
index a7b25e769950..6ecacf9fbfd7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_SW_H__
 #define __RTL8723BE_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.c
index 160fee8333ae..5864be89d187 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.c
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include <linux/kernel.h>
 #include "table.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.h
index 1deaffe22251..cf0c8d58cea1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.h
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_TABLE__H_
 #define __RTL8723BE_TABLE__H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
index 9f8dfb5af774..9ada9a06c6ea 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -338,7 +316,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
         status->isampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1);
         status->isfirst_ampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1);
         status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
-        status->rx_is40Mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
+        status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
         status->bandwidth = (u8)GET_RX_DESC_BW(pdesc);
         status->macid = GET_RX_DESC_MACID(pdesc);
         status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
@@ -372,7 +350,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
         if (status->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (status->rx_is40Mhzpacket)
+        if (status->rx_is40mhzpacket)
                 rx_status->bw = RATE_INFO_BW_40;
 
         if (status->is_ht)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h
index 609f7ad7f787..11e75a4e68bd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __RTL8723BE_TRX_H__
 #define __RTL8723BE_TRX_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.c
index 064340641913..46ab90332eb7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "dm_common.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.h
index 5c1b94ce2f86..6300be65aba0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __DM_COMMON_H__
 #define __DM_COMMON_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
index 521039c5d4ce..18ce2856a91b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h
index 77c25a976233..b527fcbbdf08 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __FW_COMMON_H__
 #define __FW_COMMON_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/main.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/main.c
index 9014a94fac6a..f5a9ecbf7363 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/main.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/main.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include <linux/module.h>
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
index 43d24e1ee5e6..aae14c68bf69 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "phy_common.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h
index 83b891a9adb8..edf1c52f0ee2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2014  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2014  Realtek Corporation.*/
 
 #ifndef __PHY_COMMON__
 #define __PHY_COMMON__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
index 3fe3aaa5fe3c..827bc5f35d2a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_DEF_H__
 #define __RTL8821AE_DEF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
index 3be8c88971e2..49d05b631ba1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.h
index 625a6bbb21fc..137ed735d80d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_DM_H__
 #define __RTL8821AE_DM_H__
@@ -92,11 +70,11 @@
 #define DM_REG_CCK_CCA_CNT_11N                  0xA60
 #define DM_REG_BB_PWR_SAV4_11N                  0xA74
 /*PAGE B */
-#define DM_REG_LNA_SWITCH_11N                   0xB2C
-#define DM_REG_PATH_SWITCH_11N                  0xB30
-#define DM_REG_RSSI_CTRL_11N                    0xB38
-#define DM_REG_CONFIG_ANTA_11N                  0xB68
-#define DM_REG_RSSI_BT_11N                              0xB9C
+#define DM_REG_LNA_SWITCH_11N                   0XB2C
+#define DM_REG_PATH_SWITCH_11N                  0XB30
+#define DM_REG_RSSI_CTRL_11N                    0XB38
+#define DM_REG_CONFIG_ANTA_11N                  0XB68
+#define DM_REG_RSSI_BT_11N                              0XB9C
 /*PAGE C */
 #define DM_REG_OFDM_FA_HOLDC_11N                0xC00
 #define DM_REG_RX_PATH_11N                              0xC04
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
index d868a034659f..dc0eb692088f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -844,9 +822,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 3: qos null data */
-        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
+        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -877,9 +855,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 4: BT qos null data */
-        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
+        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -911,9 +889,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
         0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 5~7 is for wowlan */
         /* page 5: ARP resp */
-        0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
+        0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
         0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,
         0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,
         0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
@@ -1015,7 +993,7 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
         /* page 0: beacon */
         0x80, 0x00, 0x00, 0x00,  0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x60, 0x00,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x60, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x64, 0x00, 0x20, 0x04,  0x00, 0x03, 0x32, 0x31,
         0x35, 0x01, 0x08, 0x82,  0x84, 0x8B, 0x96, 0x0C,
@@ -1078,8 +1056,8 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 1: ps-poll */
-        0xA4, 0x10, 0x09, 0xC0,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0xA4, 0x10, 0x09, 0xC0,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1143,9 +1121,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 2: null data */
-        0x48, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
+        0x48, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1208,9 +1186,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 3: Qos null data */
-        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
+        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1273,9 +1251,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 4: BT Qos null data */
-        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
+        0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1339,9 +1317,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
         0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
         /* page 5~7 is for wowlan */
         /* page 5: ARP resp */
-        0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
-        0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
-        0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
+        0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
+        0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
+        0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
         0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,
         0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,
         0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
@@ -1543,8 +1521,8 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         struct sk_buff *skb = NULL;
         u32 totalpacketlen;
         bool rtstatus;
-        u8 u1RsvdPageLoc[5] = { 0 };
-        u8 u1RsvdPageLoc2[7] = { 0 };
+        u8 u1rsvdpageloc[5] = { 0 };
+        u8 u1rsvdpageloc2[7] = { 0 };
         bool b_dlok = false;
         u8 *beacon;
         u8 *p_pspoll;
@@ -1574,7 +1552,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
         SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
 
-        SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
 
         /*--------------------------------------------------------
          *                      (3) null data
@@ -1585,7 +1563,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
 
-        SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
 
         /*---------------------------------------------------------
          *                      (4) Qos null data
@@ -1596,7 +1574,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
 
-        SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
 
         /*---------------------------------------------------------
          *                      (5) BT Qos null data
@@ -1607,7 +1585,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);
 
-        SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
 
         if (!dl_whole_packets) {
                 totalpacketlen = 512 * (BT_QOSNULL_PG + 1) - 40;
@@ -1622,20 +1600,20 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
 
-        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
 
         /*---------------------------------------------------------
          *                      (7) Remote Wake Ctrl
          *----------------------------------------------------------
          */
-        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
                                                                 REMOTE_PG);
 
         /*---------------------------------------------------------
          *                      (8) GTK Ext Memory
          *----------------------------------------------------------
          */
-        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
 
         totalpacketlen = TOTAL_RESERVED_PKT_LEN_8812 - 40;
 
@@ -1654,14 +1632,14 @@ out:
 
         if (!b_dl_finished && b_dlok) {
                 RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                              "H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
+                              "H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
                 rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
-                                       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+                                       sizeof(u1rsvdpageloc), u1rsvdpageloc);
                 if (dl_whole_packets) {
                         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                                      "wowlan H2C_RSVDPAGE:\n", u1RsvdPageLoc2, 7);
+                                      "wowlan H2C_RSVDPAGE:\n", u1rsvdpageloc2, 7);
                         rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
-                                               sizeof(u1RsvdPageLoc2), u1RsvdPageLoc2);
+                                               sizeof(u1rsvdpageloc2), u1rsvdpageloc2);
                 }
         }
 
@@ -1678,8 +1656,8 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         struct sk_buff *skb = NULL;
         u32 totalpacketlen;
         bool rtstatus;
-        u8 u1RsvdPageLoc[5] = { 0 };
-        u8 u1RsvdPageLoc2[7] = { 0 };
+        u8 u1rsvdpageloc[5] = { 0 };
+        u8 u1rsvdpageloc2[7] = { 0 };
         bool b_dlok = false;
         u8 *beacon;
         u8 *p_pspoll;
@@ -1709,7 +1687,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
         SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
 
-        SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
 
         /*--------------------------------------------------------
          *                      (3) null data
@@ -1720,7 +1698,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
 
-        SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
 
         /*---------------------------------------------------------
          *                      (4) Qos null data
@@ -1731,7 +1709,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
 
-        SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
 
         /*---------------------------------------------------------
          *                      (5) Qos null data
@@ -1742,7 +1720,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);
 
-        SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
+        SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
 
         if (!dl_whole_packets) {
                 totalpacketlen = 256 * (BT_QOSNULL_PG + 1) - 40;
@@ -1757,20 +1735,20 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
 
-        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
 
         /*---------------------------------------------------------
          *                      (7) Remote Wake Ctrl
          *----------------------------------------------------------
          */
-        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
                                                                         REMOTE_PG);
 
         /*---------------------------------------------------------
          *                      (8) GTK Ext Memory
          *----------------------------------------------------------
          */
-        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
 
         totalpacketlen = TOTAL_RESERVED_PKT_LEN_8821 - 40;
 
@@ -1792,16 +1770,16 @@ out:
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "Set RSVD page location to Fw.\n");
                 RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                                "H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
+                                "H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
                 rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
-                                       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+                                       sizeof(u1rsvdpageloc), u1rsvdpageloc);
                 if (dl_whole_packets) {
                         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                                       "wowlan H2C_RSVDPAGE:\n",
-                                      u1RsvdPageLoc2, 7);
+                                      u1rsvdpageloc2, 7);
                         rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
-                                               sizeof(u1RsvdPageLoc2),
-                                               u1RsvdPageLoc2);
+                                               sizeof(u1rsvdpageloc2),
+                                               u1rsvdpageloc2);
                 }
         }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
index 99c902ff0b84..e11e496b7277 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
@@ -1,26 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE__FW__H__
 #define __RTL8821AE__FW__H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
index ba258318ee9f..198d419ebb9c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../efuse.h"
@@ -2606,50 +2584,50 @@ static void _rtl8821ae_read_power_value_fromprom(struct ieee80211_hw *hw,
         u8 *hwinfo)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 rfPath, eeAddr = EEPROM_TX_PWR_INX, group, TxCount = 0;
+        u32 rfpath, eeaddr = EEPROM_TX_PWR_INX, group, txcount = 0;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "hal_ReadPowerValueFromPROM8821ae(): hwinfo[0x%x]=0x%x\n",
-                 (eeAddr+1), hwinfo[eeAddr+1]);
-        if (0xFF == hwinfo[eeAddr+1])  /*YJ,add,120316*/
+                 (eeaddr + 1), hwinfo[eeaddr + 1]);
+        if (hwinfo[eeaddr + 1] == 0xFF)  /*YJ,add,120316*/
                 autoload_fail = true;
 
         if (autoload_fail) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "auto load fail : Use Default value!\n");
-                for (rfPath = 0 ; rfPath < MAX_RF_PATH ; rfPath++) {
+                for (rfpath = 0 ; rfpath < MAX_RF_PATH ; rfpath++) {
                         /*2.4G default value*/
                         for (group = 0 ; group < MAX_CHNL_GROUP_24G; group++) {
-                                pwrinfo24g->index_cck_base[rfPath][group] =     0x2D;
-                                pwrinfo24g->index_bw40_base[rfPath][group] = 0x2D;
+                                pwrinfo24g->index_cck_base[rfpath][group] = 0x2D;
+                                pwrinfo24g->index_bw40_base[rfpath][group] = 0x2D;
                         }
-                        for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-                                if (TxCount == 0) {
-                                        pwrinfo24g->bw20_diff[rfPath][0] = 0x02;
-                                        pwrinfo24g->ofdm_diff[rfPath][0] = 0x04;
+                        for (txcount = 0; txcount < MAX_TX_COUNT; txcount++) {
+                                if (txcount == 0) {
+                                        pwrinfo24g->bw20_diff[rfpath][0] = 0x02;
+                                        pwrinfo24g->ofdm_diff[rfpath][0] = 0x04;
                                 } else {
-                                        pwrinfo24g->bw20_diff[rfPath][TxCount] = 0xFE;
-                                        pwrinfo24g->bw40_diff[rfPath][TxCount] = 0xFE;
-                                        pwrinfo24g->cck_diff[rfPath][TxCount] = 0xFE;
-                                        pwrinfo24g->ofdm_diff[rfPath][TxCount] = 0xFE;
+                                        pwrinfo24g->bw20_diff[rfpath][txcount] = 0xFE;
+                                        pwrinfo24g->bw40_diff[rfpath][txcount] = 0xFE;
+                                        pwrinfo24g->cck_diff[rfpath][txcount] = 0xFE;
+                                        pwrinfo24g->ofdm_diff[rfpath][txcount] = 0xFE;
                                 }
                         }
                         /*5G default value*/
                         for (group = 0 ; group < MAX_CHNL_GROUP_5G; group++)
-                                pwrinfo5g->index_bw40_base[rfPath][group] = 0x2A;
-
-                        for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-                                if (TxCount == 0) {
-                                        pwrinfo5g->ofdm_diff[rfPath][0] = 0x04;
-                                        pwrinfo5g->bw20_diff[rfPath][0] = 0x00;
-                                        pwrinfo5g->bw80_diff[rfPath][0] = 0xFE;
-                                        pwrinfo5g->bw160_diff[rfPath][0] = 0xFE;
+                                pwrinfo5g->index_bw40_base[rfpath][group] = 0x2A;
+
+                        for (txcount = 0; txcount < MAX_TX_COUNT; txcount++) {
+                                if (txcount == 0) {
+                                        pwrinfo5g->ofdm_diff[rfpath][0] = 0x04;
+                                        pwrinfo5g->bw20_diff[rfpath][0] = 0x00;
+                                        pwrinfo5g->bw80_diff[rfpath][0] = 0xFE;
+                                        pwrinfo5g->bw160_diff[rfpath][0] = 0xFE;
                                 } else {
-                                        pwrinfo5g->ofdm_diff[rfPath][0] = 0xFE;
-                                        pwrinfo5g->bw20_diff[rfPath][0] = 0xFE;
-                                        pwrinfo5g->bw40_diff[rfPath][0] = 0xFE;
-                                        pwrinfo5g->bw80_diff[rfPath][0] = 0xFE;
-                                        pwrinfo5g->bw160_diff[rfPath][0] = 0xFE;
+                                        pwrinfo5g->ofdm_diff[rfpath][0] = 0xFE;
+                                        pwrinfo5g->bw20_diff[rfpath][0] = 0xFE;
+                                        pwrinfo5g->bw40_diff[rfpath][0] = 0xFE;
+                                        pwrinfo5g->bw80_diff[rfpath][0] = 0xFE;
+                                        pwrinfo5g->bw160_diff[rfpath][0] = 0xFE;
                                 }
                         }
                 }
@@ -2658,112 +2636,112 @@ static void _rtl8821ae_read_power_value_fromprom(struct ieee80211_hw *hw,
 
         rtl_priv(hw)->efuse.txpwr_fromeprom = true;
 
-        for (rfPath = 0 ; rfPath < MAX_RF_PATH ; rfPath++) {
+        for (rfpath = 0 ; rfpath < MAX_RF_PATH ; rfpath++) {
                 /*2.4G default value*/
                 for (group = 0 ; group < MAX_CHNL_GROUP_24G; group++) {
-                        pwrinfo24g->index_cck_base[rfPath][group] = hwinfo[eeAddr++];
-                        if (pwrinfo24g->index_cck_base[rfPath][group] == 0xFF)
-                                pwrinfo24g->index_cck_base[rfPath][group] = 0x2D;
+                        pwrinfo24g->index_cck_base[rfpath][group] = hwinfo[eeaddr++];
+                        if (pwrinfo24g->index_cck_base[rfpath][group] == 0xFF)
+                                pwrinfo24g->index_cck_base[rfpath][group] = 0x2D;
                 }
                 for (group = 0 ; group < MAX_CHNL_GROUP_24G - 1; group++) {
-                        pwrinfo24g->index_bw40_base[rfPath][group] = hwinfo[eeAddr++];
-                        if (pwrinfo24g->index_bw40_base[rfPath][group] == 0xFF)
-                                pwrinfo24g->index_bw40_base[rfPath][group] = 0x2D;
+                        pwrinfo24g->index_bw40_base[rfpath][group] = hwinfo[eeaddr++];
+                        if (pwrinfo24g->index_bw40_base[rfpath][group] == 0xFF)
+                                pwrinfo24g->index_bw40_base[rfpath][group] = 0x2D;
                 }
-                for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-                        if (TxCount == 0) {
-                                pwrinfo24g->bw40_diff[rfPath][TxCount] = 0;
+                for (txcount = 0; txcount < MAX_TX_COUNT; txcount++) {
+                        if (txcount == 0) {
+                                pwrinfo24g->bw40_diff[rfpath][txcount] = 0;
                                 /*bit sign number to 8 bit sign number*/
-                                pwrinfo24g->bw20_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0xf0) >> 4;
-                                if (pwrinfo24g->bw20_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo24g->bw20_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo24g->bw20_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0xf0) >> 4;
+                                if (pwrinfo24g->bw20_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo24g->bw20_diff[rfpath][txcount] |= 0xF0;
                                 /*bit sign number to 8 bit sign number*/
-                                pwrinfo24g->ofdm_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
-                                if (pwrinfo24g->ofdm_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo24g->ofdm_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo24g->ofdm_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0x0f);
+                                if (pwrinfo24g->ofdm_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo24g->ofdm_diff[rfpath][txcount] |= 0xF0;
 
-                                pwrinfo24g->cck_diff[rfPath][TxCount] = 0;
-                                eeAddr++;
+                                pwrinfo24g->cck_diff[rfpath][txcount] = 0;
+                                eeaddr++;
                         } else {
-                                pwrinfo24g->bw40_diff[rfPath][TxCount] = (hwinfo[eeAddr]&0xf0) >> 4;
-                                if (pwrinfo24g->bw40_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo24g->bw40_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo24g->bw40_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0xf0) >> 4;
+                                if (pwrinfo24g->bw40_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo24g->bw40_diff[rfpath][txcount] |= 0xF0;
 
-                                pwrinfo24g->bw20_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
-                                if (pwrinfo24g->bw20_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo24g->bw20_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo24g->bw20_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0x0f);
+                                if (pwrinfo24g->bw20_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo24g->bw20_diff[rfpath][txcount] |= 0xF0;
 
-                                eeAddr++;
+                                eeaddr++;
 
-                                pwrinfo24g->ofdm_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0xf0) >> 4;
-                                if (pwrinfo24g->ofdm_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo24g->ofdm_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo24g->ofdm_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0xf0) >> 4;
+                                if (pwrinfo24g->ofdm_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo24g->ofdm_diff[rfpath][txcount] |= 0xF0;
 
-                                pwrinfo24g->cck_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
-                                if (pwrinfo24g->cck_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo24g->cck_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo24g->cck_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0x0f);
+                                if (pwrinfo24g->cck_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo24g->cck_diff[rfpath][txcount] |= 0xF0;
 
-                                eeAddr++;
+                                eeaddr++;
                         }
                 }
 
                 /*5G default value*/
                 for (group = 0 ; group < MAX_CHNL_GROUP_5G; group++) {
-                        pwrinfo5g->index_bw40_base[rfPath][group] = hwinfo[eeAddr++];
-                        if (pwrinfo5g->index_bw40_base[rfPath][group] == 0xFF)
-                                pwrinfo5g->index_bw40_base[rfPath][group] = 0xFE;
+                        pwrinfo5g->index_bw40_base[rfpath][group] = hwinfo[eeaddr++];
+                        if (pwrinfo5g->index_bw40_base[rfpath][group] == 0xFF)
+                                pwrinfo5g->index_bw40_base[rfpath][group] = 0xFE;
                 }
 
-                for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-                        if (TxCount == 0) {
-                                pwrinfo5g->bw40_diff[rfPath][TxCount] = 0;
+                for (txcount = 0; txcount < MAX_TX_COUNT; txcount++) {
+                        if (txcount == 0) {
+                                pwrinfo5g->bw40_diff[rfpath][txcount] = 0;
 
-                                pwrinfo5g->bw20_diff[rfPath][0] = (hwinfo[eeAddr] & 0xf0) >> 4;
-                                if (pwrinfo5g->bw20_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo5g->bw20_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo5g->bw20_diff[rfpath][0] = (hwinfo[eeaddr] & 0xf0) >> 4;
+                                if (pwrinfo5g->bw20_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo5g->bw20_diff[rfpath][txcount] |= 0xF0;
 
-                                pwrinfo5g->ofdm_diff[rfPath][0] = (hwinfo[eeAddr] & 0x0f);
-                                if (pwrinfo5g->ofdm_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo5g->ofdm_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo5g->ofdm_diff[rfpath][0] = (hwinfo[eeaddr] & 0x0f);
+                                if (pwrinfo5g->ofdm_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo5g->ofdm_diff[rfpath][txcount] |= 0xF0;
 
-                                eeAddr++;
+                                eeaddr++;
                         } else {
-                                pwrinfo5g->bw40_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0xf0) >> 4;
-                                if (pwrinfo5g->bw40_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo5g->bw40_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo5g->bw40_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0xf0) >> 4;
+                                if (pwrinfo5g->bw40_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo5g->bw40_diff[rfpath][txcount] |= 0xF0;
 
-                                pwrinfo5g->bw20_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
-                                if (pwrinfo5g->bw20_diff[rfPath][TxCount] & BIT(3))
-                                        pwrinfo5g->bw20_diff[rfPath][TxCount] |= 0xF0;
+                                pwrinfo5g->bw20_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0x0f);
+                                if (pwrinfo5g->bw20_diff[rfpath][txcount] & BIT(3))
+                                        pwrinfo5g->bw20_diff[rfpath][txcount] |= 0xF0;
 
-                                eeAddr++;
+                                eeaddr++;
                         }
                 }
 
-                pwrinfo5g->ofdm_diff[rfPath][1] =       (hwinfo[eeAddr] & 0xf0) >> 4;
-                pwrinfo5g->ofdm_diff[rfPath][2] =       (hwinfo[eeAddr] & 0x0f);
+                pwrinfo5g->ofdm_diff[rfpath][1] =       (hwinfo[eeaddr] & 0xf0) >> 4;
+                pwrinfo5g->ofdm_diff[rfpath][2] =       (hwinfo[eeaddr] & 0x0f);
 
-                eeAddr++;
+                eeaddr++;
 
-                pwrinfo5g->ofdm_diff[rfPath][3] = (hwinfo[eeAddr] & 0x0f);
+                pwrinfo5g->ofdm_diff[rfpath][3] = (hwinfo[eeaddr] & 0x0f);
 
-                eeAddr++;
+                eeaddr++;
 
-                for (TxCount = 1; TxCount < MAX_TX_COUNT; TxCount++) {
-                        if (pwrinfo5g->ofdm_diff[rfPath][TxCount] & BIT(3))
-                                pwrinfo5g->ofdm_diff[rfPath][TxCount] |= 0xF0;
+                for (txcount = 1; txcount < MAX_TX_COUNT; txcount++) {
+                        if (pwrinfo5g->ofdm_diff[rfpath][txcount] & BIT(3))
+                                pwrinfo5g->ofdm_diff[rfpath][txcount] |= 0xF0;
                 }
-                for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-                        pwrinfo5g->bw80_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0xf0) >> 4;
+                for (txcount = 0; txcount < MAX_TX_COUNT; txcount++) {
+                        pwrinfo5g->bw80_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0xf0) >> 4;
                         /* 4bit sign number to 8 bit sign number */
-                        if (pwrinfo5g->bw80_diff[rfPath][TxCount] & BIT(3))
-                                pwrinfo5g->bw80_diff[rfPath][TxCount] |= 0xF0;
+                        if (pwrinfo5g->bw80_diff[rfpath][txcount] & BIT(3))
+                                pwrinfo5g->bw80_diff[rfpath][txcount] |= 0xF0;
                         /* 4bit sign number to 8 bit sign number */
-                        pwrinfo5g->bw160_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
-                        if (pwrinfo5g->bw160_diff[rfPath][TxCount] & BIT(3))
-                                pwrinfo5g->bw160_diff[rfPath][TxCount] |= 0xF0;
+                        pwrinfo5g->bw160_diff[rfpath][txcount] = (hwinfo[eeaddr] & 0x0f);
+                        if (pwrinfo5g->bw160_diff[rfpath][txcount] & BIT(3))
+                                pwrinfo5g->bw160_diff[rfpath][txcount] |= 0xF0;
 
-                        eeAddr++;
+                        eeaddr++;
                 }
         }
 }
@@ -2930,8 +2908,8 @@ static void _rtl8812ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo,
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 
         if (!autoload_fail) {
-                rtlhal->pa_type_2g = hwinfo[0xBC];
-                rtlhal->lna_type_2g = hwinfo[0xBD];
+                rtlhal->pa_type_2g = hwinfo[0XBC];
+                rtlhal->lna_type_2g = hwinfo[0XBD];
                 if (rtlhal->pa_type_2g == 0xFF && rtlhal->lna_type_2g == 0xFF) {
                         rtlhal->pa_type_2g = 0;
                         rtlhal->lna_type_2g = 0;
@@ -2943,8 +2921,8 @@ static void _rtl8812ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo,
                                            (rtlhal->lna_type_2g & BIT(3))) ?
                                           1 : 0;
 
-                rtlhal->pa_type_5g = hwinfo[0xBC];
-                rtlhal->lna_type_5g = hwinfo[0xBF];
+                rtlhal->pa_type_5g = hwinfo[0XBC];
+                rtlhal->lna_type_5g = hwinfo[0XBF];
                 if (rtlhal->pa_type_5g == 0xFF && rtlhal->lna_type_5g == 0xFF) {
                         rtlhal->pa_type_5g = 0;
                         rtlhal->lna_type_5g = 0;
@@ -2969,18 +2947,18 @@ static void _rtl8812ae_read_amplifier_type(struct ieee80211_hw *hw, u8 *hwinfo,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 
-        u8 ext_type_pa_2g_a  = (hwinfo[0xBD] & BIT(2))      >> 2; /* 0xBD[2] */
-        u8 ext_type_pa_2g_b  = (hwinfo[0xBD] & BIT(6))      >> 6; /* 0xBD[6] */
-        u8 ext_type_pa_5g_a  = (hwinfo[0xBF] & BIT(2))      >> 2; /* 0xBF[2] */
-        u8 ext_type_pa_5g_b  = (hwinfo[0xBF] & BIT(6))      >> 6; /* 0xBF[6] */
-        /* 0xBD[1:0] */
-        u8 ext_type_lna_2g_a = (hwinfo[0xBD] & (BIT(1) | BIT(0))) >> 0;
-        /* 0xBD[5:4] */
-        u8 ext_type_lna_2g_b = (hwinfo[0xBD] & (BIT(5) | BIT(4))) >> 4;
-        /* 0xBF[1:0] */
-        u8 ext_type_lna_5g_a = (hwinfo[0xBF] & (BIT(1) | BIT(0))) >> 0;
-        /* 0xBF[5:4] */
-        u8 ext_type_lna_5g_b = (hwinfo[0xBF] & (BIT(5) | BIT(4))) >> 4;
+        u8 ext_type_pa_2g_a  = (hwinfo[0XBD] & BIT(2))      >> 2; /* 0XBD[2] */
+        u8 ext_type_pa_2g_b  = (hwinfo[0XBD] & BIT(6))      >> 6; /* 0XBD[6] */
+        u8 ext_type_pa_5g_a  = (hwinfo[0XBF] & BIT(2))      >> 2; /* 0XBF[2] */
+        u8 ext_type_pa_5g_b  = (hwinfo[0XBF] & BIT(6))      >> 6; /* 0XBF[6] */
+        /* 0XBD[1:0] */
+        u8 ext_type_lna_2g_a = (hwinfo[0XBD] & (BIT(1) | BIT(0))) >> 0;
+        /* 0XBD[5:4] */
+        u8 ext_type_lna_2g_b = (hwinfo[0XBD] & (BIT(5) | BIT(4))) >> 4;
+        /* 0XBF[1:0] */
+        u8 ext_type_lna_5g_a = (hwinfo[0XBF] & (BIT(1) | BIT(0))) >> 0;
+        /* 0XBF[5:4] */
+        u8 ext_type_lna_5g_b = (hwinfo[0XBF] & (BIT(5) | BIT(4))) >> 4;
 
         _rtl8812ae_read_pa_type(hw, hwinfo, autoload_fail);
 
@@ -3008,8 +2986,8 @@ static void _rtl8821ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo,
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 
         if (!autoload_fail) {
-                rtlhal->pa_type_2g = hwinfo[0xBC];
-                rtlhal->lna_type_2g = hwinfo[0xBD];
+                rtlhal->pa_type_2g = hwinfo[0XBC];
+                rtlhal->lna_type_2g = hwinfo[0XBD];
                 if (rtlhal->pa_type_2g == 0xFF && rtlhal->lna_type_2g == 0xFF) {
                         rtlhal->pa_type_2g = 0;
                         rtlhal->lna_type_2g = 0;
@@ -3017,8 +2995,8 @@ static void _rtl8821ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo,
                 rtlhal->external_pa_2g = (rtlhal->pa_type_2g & BIT(5)) ? 1 : 0;
                 rtlhal->external_lna_2g = (rtlhal->lna_type_2g & BIT(7)) ? 1 : 0;
 
-                rtlhal->pa_type_5g = hwinfo[0xBC];
-                rtlhal->lna_type_5g = hwinfo[0xBF];
+                rtlhal->pa_type_5g = hwinfo[0XBC];
+                rtlhal->lna_type_5g = hwinfo[0XBF];
                 if (rtlhal->pa_type_5g == 0xFF && rtlhal->lna_type_5g == 0xFF) {
                         rtlhal->pa_type_5g = 0;
                         rtlhal->lna_type_5g = 0;
@@ -4033,10 +4011,10 @@ void rtl8821ae_add_wowlan_pattern(struct ieee80211_hw *hw,
         rtl_write_byte(rtlpriv, REG_PKT_BUFF_ACCESS_CTRL, RXPKT_BUF_SELECT);
         for (addr = 0; addr < WKFMCAM_ADDR_NUM; addr++) {
                 /* Set Rx packet buffer offset.
-                 * RxBufer pointer increases 1,
+                 * RXBufer pointer increases 1,
                  * we can access 8 bytes in Rx packet buffer.
                  * CAM start offset (unit: 1 byte) =  index*WKFMCAM_SIZE
-                 * RxBufer addr = (CAM start offset +
+                 * RXBufer addr = (CAM start offset +
                  *                 per entry offset of a WKFM CAM)/8
                  *      * index: The index of the wake up frame mask
                  *      * WKFMCAM_SIZE: the total size of one WKFM CAM
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.h
index e2ab783a2ad9..fb0fb3a501d9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_HW_H__
 #define __RTL8821AE_HW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c
index 405c7541b386..dd7553e80ab1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h
index 038e64e18ae8..249a37a8d9db 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_LED_H__
 #define __RTL8821AE_LED_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
index a75451c246fd..408af144098e 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
@@ -475,7 +453,7 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8	band,
         const s8 auto_temp = -1;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                 "===> PHY_GetTxBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n",
+                 "===> PHY_GetTXBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n",
                  (int)swing_2g, (int)swing_5g,
                  (int)rtlefuse->autoload_failflag);
 
@@ -556,7 +534,7 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8	band,
                 swing_a = (swing & 0x3) >> 0; /* 0xC6/C7[1:0] */
                 swing_b = (swing & 0xC) >> 2; /* 0xC6/C7[3:2] */
                 RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                         "===> PHY_GetTxBBSwing_8812A, swingA: 0x%X, swingB: 0x%X\n",
+                         "===> PHY_GetTXBBSwing_8812A, swingA: 0x%X, swingB: 0x%X\n",
                          swing_a, swing_b);
 
                 /* 3 Path-A */
@@ -614,7 +592,7 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8	band,
         }
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                 "<=== PHY_GetTxBBSwing_8812A, out = 0x%X\n", out);
+                 "<=== PHY_GetTXBBSwing_8812A, out = 0x%X\n", out);
         return out;
 }
 
@@ -1078,52 +1056,52 @@ static void _rtl8821ae_phy_store_txpower_by_rate_base(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &rtlpriv->phy;
-        u16 rawValue = 0;
+        u16 rawvalue = 0;
         u8 base = 0, path = 0;
 
         for (path = RF90_PATH_A; path <= RF90_PATH_B; ++path) {
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][0] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][0] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, CCK, RF_1TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][2] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][2] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, OFDM, RF_1TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][4] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][4] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, HT_MCS0_MCS7, RF_1TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][6] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][6] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, HT_MCS8_MCS15, RF_2TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][8] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][8] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][11] >> 8) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][11] >> 8) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][2] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][2] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, OFDM, RF_1TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][4] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][4] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, HT_MCS0_MCS7, RF_1TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][6] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][6] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, HT_MCS8_MCS15, RF_2TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][8] >> 24) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][8] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
 
-                rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][11] >> 8) & 0xFF;
-                base = (rawValue >> 4) * 10 + (rawValue & 0xF);
+                rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][11] >> 8) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
                 _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
         }
 }
@@ -1380,7 +1358,7 @@ static void _rtl8812ae_phy_convert_txpower_limit_to_power_index(struct ieee80211
                                                 }
 
                                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                                        "TxPwrLimit_2_4G[regulation %d][bw %d][rateSection %d][channel %d] = %d\n(TxPwrLimit in dBm %d - BW40PwrLmt2_4G[channel %d][rfPath %d] %d)\n",
+                                                        "TxPwrLimit_2_4G[regulation %d][bw %d][rateSection %d][channel %d] = %d\n(TxPwrLimit in dBm %d - BW40PwrLmt2_4G[channel %d][rfpath %d] %d)\n",
                                                         regulation, bw, rate_section, channel,
                                                         rtlphy->txpwr_limit_2_4g[regulation][bw]
                                                         [rate_section][channel][rf_path], (temp_pwrlmt == 63)
@@ -1445,7 +1423,7 @@ static void _rtl8812ae_phy_convert_txpower_limit_to_power_index(struct ieee80211
                                                 }
 
                                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                                        "TxPwrLimit_5G[regulation %d][bw %d][rateSection %d][channel %d] =%d\n(TxPwrLimit in dBm %d - BW40PwrLmt5G[chnl group %d][rfPath %d] %d)\n",
+                                                        "TxPwrLimit_5G[regulation %d][bw %d][rateSection %d][channel %d] =%d\n(TxPwrLimit in dBm %d - BW40PwrLmt5G[chnl group %d][rfpath %d] %d)\n",
                                                         regulation, bw, rate_section,
                                                         channel, rtlphy->txpwr_limit_5g[regulation]
                                                         [bw][rate_section][channel][rf_path],
@@ -1495,106 +1473,106 @@ static void _rtl8821ae_phy_convert_txpower_dbm_to_relative_value(struct ieee8021
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &rtlpriv->phy;
-        u8 base = 0, rfPath = 0;
+        u8 base = 0, rfpath = 0;
 
-        for (rfPath = RF90_PATH_A; rfPath <= RF90_PATH_B; ++rfPath) {
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, CCK);
+        for (rfpath = RF90_PATH_A; rfpath <= RF90_PATH_B; ++rfpath) {
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, CCK);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][0],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][0],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, OFDM);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, OFDM);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][1],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][1],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][2],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][2],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, HT_MCS0_MCS7);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, HT_MCS0_MCS7);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][3],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][3],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][4],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][4],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_2TX, HT_MCS8_MCS15);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_2TX, HT_MCS8_MCS15);
 
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][5],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][5],
                         0, 3, base);
 
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][6],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][6],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][7],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][7],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][8],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][8],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][9],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][9],
                         0, 1, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][9],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][9],
                         2, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][10],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][10],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][11],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][11],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, OFDM);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, OFDM);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][1],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][1],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][2],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][2],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, HT_MCS0_MCS7);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, HT_MCS0_MCS7);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][3],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][3],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][4],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][4],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_2TX, HT_MCS8_MCS15);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_2TX, HT_MCS8_MCS15);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][5],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][5],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][6],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][6],
                         0, 3, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][7],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][7],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][8],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][8],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][9],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][9],
                         0, 1, base);
 
-                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
+                base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][9],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][9],
                         2, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][10],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][10],
                         0, 3, base);
                 _phy_convert_txpower_dbm_to_relative_value(
-                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][11],
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][11],
                         0, 3, base);
         }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h
index 1285e1adfe9d..35b7d0f70125 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_PHY_H__
 #define __RTL8821AE_PHY_H__
@@ -59,9 +37,9 @@
 
 #define LOOP_LIMIT                              5
 #define MAX_STALL_TIME                          50
-#define AntennaDiversityValue                   0x80
+#define ANTENNADIVERSITYVALUE                   0x80
 #define MAX_TXPWR_IDX_NMODE_92S                 63
-#define Reset_Cnt_Limit                         3
+#define RESET_CNT_LIMIT                         3
 
 #define IQK_ADDA_REG_NUM                        16
 #define IQK_MAC_REG_NUM                         4
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.c
index 9ddf78a187dd..1e7b3c770ac2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../pwrseqcmd.h"
 #include "pwrseq.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.h
index 6dd575435c63..d6f3cbab4abc 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_PWRSEQ_H__
 #define __RTL8821AE_PWRSEQ_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
index db8bc8a2de61..7d833b72c7ed 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_REG_H__
 #define __RTL8821AE_REG_H__
@@ -696,7 +674,7 @@
 #define EEPROM_CHANNEL_PLAN_TELEC               0x8
 #define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN       0x9
 #define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13       0xA
-#define EEPROM_CHANNEL_PLAN_NCC                 0xB
+#define EEPROM_CHANNEL_PLAN_NCC                 0XB
 #define EEPROM_CHANNEL_PLAN_BY_HW_MASK          0x80
 
 #define EEPROM_CID_DEFAULT                      0x0
@@ -718,10 +696,10 @@
 
 #define EEPROM_TX_PWR_INX                       0x10
 
-#define EEPROM_CHANNELPLAN                      0xB8
-#define EEPROM_XTAL_8821AE                      0xB9
-#define EEPROM_THERMAL_METER                    0xBA
-#define EEPROM_IQK_LCK_88E                      0xBB
+#define EEPROM_CHANNELPLAN                      0XB8
+#define EEPROM_XTAL_8821AE                      0XB9
+#define EEPROM_THERMAL_METER                    0XBA
+#define EEPROM_IQK_LCK_88E                      0XBB
 
 #define EEPROM_RF_BOARD_OPTION                  0xC1
 #define EEPROM_RF_FEATURE_OPTION_88E            0xC2
@@ -1015,7 +993,7 @@
 #define _LBMODE(x)                              (((x) & 0xF) << 24)
 #define MASK_LBMODE                             0xF000000
 #define LOOPBACK_NORMAL                         0x0
-#define LOOPBACK_IMMEDIATELY                    0xB
+#define LOOPBACK_IMMEDIATELY                    0XB
 #define LOOPBACK_MAC_DELAY                      0x3
 #define LOOPBACK_PHY                            0x1
 #define LOOPBACK_DMA                            0x7
@@ -1430,7 +1408,7 @@
 #define RCCK0_FACOUNTERUPPER            0xa58
 #define RCCK0_CCA_CNT                   0xa60
 
-/* PageB(0xB00) */
+/* PageB(0XB00) */
 #define RPDP_ANTA                       0xb00
 #define RPDP_ANTA_4                     0xb04
 #define RPDP_ANTA_8                     0xb08
@@ -1477,16 +1455,16 @@
 #define RPM_RX3_ANTB                    0xbf8
 
 /*RSSI Dump*/
-#define         RA_RSSI_DUMP            0xBF0
-#define         RB_RSSI_DUMP            0xBF1
-#define         RS1_RX_EVM_DUMP         0xBF4
-#define         RS2_RX_EVM_DUMP         0xBF5
-#define         RA_RX_SNR_DUMP          0xBF6
-#define         RB_RX_SNR_DUMP          0xBF7
-#define         RA_CFO_SHORT_DUMP       0xBF8
-#define         RB_CFO_SHORT_DUMP       0xBFA
-#define         RA_CFO_LONG_DUMP        0xBEC
-#define         RB_CFO_LONG_DUMP        0xBEE
+#define         RA_RSSI_DUMP            0XBF0
+#define         RB_RSSI_DUMP            0XBF1
+#define         RS1_RX_EVM_DUMP         0XBF4
+#define         RS2_RX_EVM_DUMP         0XBF5
+#define         RA_RX_SNR_DUMP          0XBF6
+#define         RB_RX_SNR_DUMP          0XBF7
+#define         RA_CFO_SHORT_DUMP       0XBF8
+#define         RB_CFO_SHORT_DUMP       0XBFA
+#define         RA_CFO_LONG_DUMP        0XBEC
+#define         RB_CFO_LONG_DUMP        0XBEE
 
 /*Page C*/
 #define ROFDM0_LSTF                     0xc00
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c
index 95489f41f8a0..a6e56872e063 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.h
index efd22bd0b139..6e3c8bfb2048 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_RF_H__
 #define __RTL8821AE_RF_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
index 77f6401021c9..eec7c4ecf3ad 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h
index d001e7ce3052..9d7610f84b20 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_SW_H__
 #define __RTL8821AE_SW_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
index f87f9d03b9fa..85093b3e5373 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
@@ -1,29 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
+
 #include <linux/kernel.h>
 #include "table.h"
 u32 RTL8812AE_PHY_REG_ARRAY[] = {
@@ -134,30 +111,30 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                 0xA7C, 0x225B0606,
                 0xA80, 0x218075B2,
                 0xA84, 0x001F8C80,
-                0xB00, 0x03100000,
-                0xB04, 0x0000B000,
-                0xB08, 0xAE0201EB,
-                0xB0C, 0x01003207,
-                0xB10, 0x00009807,
-                0xB14, 0x01000000,
-                0xB18, 0x00000002,
-                0xB1C, 0x00000002,
-                0xB20, 0x0000001F,
-                0xB24, 0x03020100,
-                0xB28, 0x07060504,
-                0xB2C, 0x0B0A0908,
-                0xB30, 0x0F0E0D0C,
-                0xB34, 0x13121110,
-                0xB38, 0x17161514,
-                0xB3C, 0x0000003A,
-                0xB40, 0x00000000,
-                0xB44, 0x00000000,
-                0xB48, 0x13000032,
-                0xB4C, 0x48080000,
-                0xB50, 0x00000000,
-                0xB54, 0x00000000,
-                0xB58, 0x00000000,
-                0xB5C, 0x00000000,
+                0XB00, 0x03100000,
+                0XB04, 0x0000B000,
+                0XB08, 0xAE0201EB,
+                0XB0C, 0x01003207,
+                0XB10, 0x00009807,
+                0XB14, 0x01000000,
+                0XB18, 0x00000002,
+                0XB1C, 0x00000002,
+                0XB20, 0x0000001F,
+                0XB24, 0x03020100,
+                0XB28, 0x07060504,
+                0XB2C, 0x0B0A0908,
+                0XB30, 0x0F0E0D0C,
+                0XB34, 0x13121110,
+                0XB38, 0x17161514,
+                0XB3C, 0x0000003A,
+                0XB40, 0x00000000,
+                0XB44, 0x00000000,
+                0XB48, 0x13000032,
+                0XB4C, 0x48080000,
+                0XB50, 0x00000000,
+                0XB54, 0x00000000,
+                0XB58, 0x00000000,
+                0XB5C, 0x00000000,
                 0xC00, 0x00000007,
                 0xC04, 0x00042020,
                 0xC08, 0x80410231,
@@ -197,7 +174,7 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                 0xC68, 0x59791979,
         0xA0000000, 0x00000000,
                 0xC68, 0x59799979,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0xC6C, 0x59795979,
                 0xC70, 0x19795979,
                 0xC74, 0x19795979,
@@ -367,30 +344,30 @@ u32 RTL8821AE_PHY_REG_ARRAY[] = {
         0xA7C, 0x225B0606,
         0xA80, 0x21805490,
         0xA84, 0x001F0000,
-        0xB00, 0x03100040,
-        0xB04, 0x0000B000,
-        0xB08, 0xAE0201EB,
-        0xB0C, 0x01003207,
-        0xB10, 0x00009807,
-        0xB14, 0x01000000,
-        0xB18, 0x00000002,
-        0xB1C, 0x00000002,
-        0xB20, 0x0000001F,
-        0xB24, 0x03020100,
-        0xB28, 0x07060504,
-        0xB2C, 0x0B0A0908,
-        0xB30, 0x0F0E0D0C,
-        0xB34, 0x13121110,
-        0xB38, 0x17161514,
-        0xB3C, 0x0000003A,
-        0xB40, 0x00000000,
-        0xB44, 0x00000000,
-        0xB48, 0x13000032,
-        0xB4C, 0x48080000,
-        0xB50, 0x00000000,
-        0xB54, 0x00000000,
-        0xB58, 0x00000000,
-        0xB5C, 0x00000000,
+        0XB00, 0x03100040,
+        0XB04, 0x0000B000,
+        0XB08, 0xAE0201EB,
+        0XB0C, 0x01003207,
+        0XB10, 0x00009807,
+        0XB14, 0x01000000,
+        0XB18, 0x00000002,
+        0XB1C, 0x00000002,
+        0XB20, 0x0000001F,
+        0XB24, 0x03020100,
+        0XB28, 0x07060504,
+        0XB2C, 0x0B0A0908,
+        0XB30, 0x0F0E0D0C,
+        0XB34, 0x13121110,
+        0XB38, 0x17161514,
+        0XB3C, 0x0000003A,
+        0XB40, 0x00000000,
+        0XB44, 0x00000000,
+        0XB48, 0x13000032,
+        0XB4C, 0x48080000,
+        0XB50, 0x00000000,
+        0XB54, 0x00000000,
+        0XB58, 0x00000000,
+        0XB5C, 0x00000000,
         0xC00, 0x00000007,
         0xC04, 0x00042020,
         0xC08, 0x80410231,
@@ -521,12 +498,12 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x086, 0x00014B3A,
         0xA0000000, 0x00000000,
                 0x086, 0x00014B38,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000004, 0x00000000, 0x40000000, 0x00000000,
                 0x08B, 0x00080180,
         0xA0000000, 0x00000000,
                 0x08B, 0x00087180,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0B1, 0x0001FC1A,
                 0x0B3, 0x000F0810,
                 0x0B4, 0x0001A78D,
@@ -557,7 +534,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x03B, 0x00018248,
                 0x03B, 0x00010240,
                 0x03B, 0x00008240,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000100,
         0x80000002, 0x00000000, 0x40000000, 0x00000000,
                 0x034, 0x0000A4EE,
@@ -583,7 +560,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x034, 0x000024E7,
                 0x034, 0x0000146B,
                 0x034, 0x0000006D,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
                 0x0EF, 0x000020A2,
                 0x0DF, 0x00000080,
@@ -712,7 +689,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x034, 0x000428C5,
                 0x034, 0x000418C2,
                 0x034, 0x000408C0,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x034, 0x0002A0B2,
                 0x034, 0x000290AF,
@@ -749,7 +726,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x034, 0x000228C5,
                 0x034, 0x000218C2,
                 0x034, 0x000208C0,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x034, 0x0000A0B2,
                 0x034, 0x000090AF,
@@ -786,7 +763,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x034, 0x000028C9,
                 0x034, 0x000018C6,
                 0x034, 0x000008C3,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x018, 0x0001712A,
@@ -824,7 +801,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x035, 0x000401D8,
                 0x035, 0x000481D8,
                 0x035, 0x000501D8,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x018, 0x0001712A,
@@ -871,7 +848,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x036, 0x000CCC35,
                 0x036, 0x000D4C35,
                 0x036, 0x000DCC35,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
                 0x0EF, 0x00000008,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
@@ -886,7 +863,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x03C, 0x000002A8,
                 0x03C, 0x000005A2,
                 0x03C, 0x00000880,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
                 0x018, 0x0001712A,
                 0x0EF, 0x00000002,
@@ -910,7 +887,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                 0x063, 0x000114EB,
                 0x064, 0x000196AC,
                 0x065, 0x000911D7,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x008, 0x00008400,
                 0x01C, 0x000739D2,
                 0x0B4, 0x0001E78D,
@@ -935,12 +912,12 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x086, 0x00014B3A,
         0xA0000000, 0x00000000,
                 0x086, 0x00014B38,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000004, 0x00000000, 0x40000000, 0x00000000,
                 0x08B, 0x00080180,
         0xA0000000, 0x00000000,
                 0x08B, 0x00087180,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x018, 0x00000006,
                 0x0EF, 0x00002000,
         0x80000001, 0x00000000, 0x40000000, 0x00000000,
@@ -967,7 +944,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x03B, 0x00018248,
                 0x03B, 0x00010240,
                 0x03B, 0x00008240,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000100,
         0x80000002, 0x00000000, 0x40000000, 0x00000000,
                 0x034, 0x0000A4EE,
@@ -993,7 +970,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x034, 0x000024E7,
                 0x034, 0x0000146B,
                 0x034, 0x0000006D,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
                 0x0EF, 0x000020A2,
                 0x0DF, 0x00000080,
@@ -1122,7 +1099,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x034, 0x000428C5,
                 0x034, 0x000418C2,
                 0x034, 0x000408C0,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x034, 0x0002A0B2,
                 0x034, 0x000290AF,
@@ -1159,7 +1136,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x034, 0x000228C5,
                 0x034, 0x000218C2,
                 0x034, 0x000208C0,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x034, 0x0000A0B2,
                 0x034, 0x000090AF,
@@ -1196,7 +1173,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x034, 0x000028C9,
                 0x034, 0x000018C6,
                 0x034, 0x000008C3,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x018, 0x0001712A,
@@ -1237,7 +1214,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x035, 0x000481D8,
                 0x035, 0x000501D8,
                 0x0EF, 0x00000000,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
                 0x018, 0x0001712A,
                 0x0EF, 0x00000010,
@@ -1283,7 +1260,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x036, 0x000CCC35,
                 0x036, 0x000D4C35,
                 0x036, 0x000DCC35,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
                 0x0EF, 0x00000008,
         0x80000008, 0x00000000, 0x40000000, 0x00000000,
@@ -1298,7 +1275,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x03C, 0x000002A8,
                 0x03C, 0x000005A2,
                 0x03C, 0x00000880,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x0EF, 0x00000000,
                 0x018, 0x0001712A,
                 0x0EF, 0x00000002,
@@ -1327,7 +1304,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                 0x063, 0x000114EB,
                 0x064, 0x000196AC,
                 0x065, 0x000911D7,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x008, 0x00008400,
 };
 
@@ -1933,7 +1910,7 @@ u32 RTL8812AE_MAC_REG_ARRAY[] = {
                 0x011, 0x00000066,
         0xA0000000, 0x00000000,
                 0x011, 0x0000005A,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0x025, 0x0000000F,
                 0x072, 0x00000000,
                 0x420, 0x00000080,
@@ -2337,7 +2314,7 @@ u32 RTL8812AE_AGC_TAB_ARRAY[] = {
                 0x81C, 0x417A0001,
                 0x81C, 0x417C0001,
                 0x81C, 0x417E0001,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
         0x80000004, 0x00000000, 0x40000000, 0x00000000,
                 0x81C, 0xFC800001,
                 0x81C, 0xFB820001,
@@ -2468,7 +2445,7 @@ u32 RTL8812AE_AGC_TAB_ARRAY[] = {
                 0x81C, 0x01FA0001,
                 0x81C, 0x01FC0001,
                 0x81C, 0x01FE0001,
-        0xB0000000, 0x00000000,
+        0XB0000000, 0x00000000,
                 0xC50, 0x00000022,
                 0xC50, 0x00000020,
                 0xE50, 0x00000022,
@@ -2478,24 +2455,24 @@ u32 RTL8812AE_AGC_TAB_ARRAY[] = {
 u32 RTL8812AE_AGC_TAB_1TARRAYLEN = ARRAY_SIZE(RTL8812AE_AGC_TAB_ARRAY);
 
 u32 RTL8821AE_AGC_TAB_ARRAY[] = {
-                0x81C, 0xBF000001,
-                0x81C, 0xBF020001,
-                0x81C, 0xBF040001,
-                0x81C, 0xBF060001,
-                0x81C, 0xBE080001,
-                0x81C, 0xBD0A0001,
-                0x81C, 0xBC0C0001,
-                0x81C, 0xBA0E0001,
-                0x81C, 0xB9100001,
-                0x81C, 0xB8120001,
-                0x81C, 0xB7140001,
-                0x81C, 0xB6160001,
-                0x81C, 0xB5180001,
-                0x81C, 0xB41A0001,
-                0x81C, 0xB31C0001,
-                0x81C, 0xB21E0001,
-                0x81C, 0xB1200001,
-                0x81C, 0xB0220001,
+                0x81C, 0XBF000001,
+                0x81C, 0XBF020001,
+                0x81C, 0XBF040001,
+                0x81C, 0XBF060001,
+                0x81C, 0XBE080001,
+                0x81C, 0XBD0A0001,
+                0x81C, 0XBC0C0001,
+                0x81C, 0XBA0E0001,
+                0x81C, 0XB9100001,
+                0x81C, 0XB8120001,
+                0x81C, 0XB7140001,
+                0x81C, 0XB6160001,
+                0x81C, 0XB5180001,
+                0x81C, 0XB41A0001,
+                0x81C, 0XB31C0001,
+                0x81C, 0XB21E0001,
+                0x81C, 0XB1200001,
+                0x81C, 0XB0220001,
                 0x81C, 0xAF240001,
                 0x81C, 0xAE260001,
                 0x81C, 0xAD280001,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
index 36c2388b60bc..540159c25078 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
@@ -1,29 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Created on  2010/ 5/18,  1:41
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_TABLE__H_
 #define __RTL8821AE_TABLE__H_
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
index 0f2b7c619918..db5e628b17ed 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #include "../wifi.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h
index 4ff0968dba81..a3feecad645d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2010  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
 
 #ifndef __RTL8821AE_TRX_H__
 #define __RTL8821AE_TRX_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/stats.c b/drivers/net/wireless/realtek/rtlwifi/stats.c
index 61700fa05570..504ca587a16a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/stats.c
+++ b/drivers/net/wireless/realtek/rtlwifi/stats.c
@@ -1,27 +1,6 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
+
 #include "wifi.h"
 #include "stats.h"
 #include <linux/export.h>
diff --git a/drivers/net/wireless/realtek/rtlwifi/stats.h b/drivers/net/wireless/realtek/rtlwifi/stats.h
index bd0108f93182..581590729b0f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/stats.h
+++ b/drivers/net/wireless/realtek/rtlwifi/stats.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_STATS_H__
 #define __RTL_STATS_H__
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index 2ac5004d7a40..525f72bad433 100644
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1,25 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- *****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #include "wifi.h"
 #include "core.h"
@@ -214,7 +194,7 @@ static void _usb_write32_async(struct rtl_priv *rtlpriv, u32 addr, u32 val)
         _usb_write_async(to_usb_device(dev), addr, val, 4);
 }
 
-static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
+static void _usb_writen_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
                              u16 len)
 {
         struct device *dev = rtlpriv->io.dev;
@@ -249,7 +229,7 @@ static void _rtl_usb_io_handler_init(struct device *dev,
         rtlpriv->io.read8_sync          = _usb_read8_sync;
         rtlpriv->io.read16_sync         = _usb_read16_sync;
         rtlpriv->io.read32_sync         = _usb_read32_sync;
-        rtlpriv->io.writeN_sync         = _usb_writeN_sync;
+        rtlpriv->io.writen_sync         = _usb_writen_sync;
 }
 
 static void _rtl_usb_io_handler_release(struct ieee80211_hw *hw)
@@ -413,7 +393,7 @@ static void rtl_usb_init_sw(struct ieee80211_hw *hw)
         rtlusb->irq_mask[0] = 0xFFFFFFFF;
         /* HIMR_EX - turn all on */
         rtlusb->irq_mask[1] = 0xFFFFFFFF;
-        rtlusb->disableHWSM =  true;
+        rtlusb->disablehwsm =  true;
 }
 
 static void _rtl_rx_completed(struct urb *urb);
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.h b/drivers/net/wireless/realtek/rtlwifi/usb.h
index c91cec04bfaf..09bbcdbe0dbf 100644
--- a/drivers/net/wireless/realtek/rtlwifi/usb.h
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.h
@@ -1,25 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_USB_H__
 #define __RTL_USB_H__
@@ -104,7 +84,7 @@ struct rtl_usb {
         /* Bcn control register setting */
         u32 reg_bcn_ctrl_val;
         /* for 88/92cu card disable */
-        u8      disableHWSM;
+        u8      disablehwsm;
         /*QOS & EDCA */
         enum acm_method acm_method;
         /* irq  . HIMR,HIMR_EX */
diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 87bc21bb5e8b..1ad71fb0ebf2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -1,27 +1,5 @@
-/******************************************************************************
- *
- * Copyright(c) 2009-2012  Realtek Corporation.
- *
- * 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
- * Hsinchu 300, Taiwan.
- *
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- *****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
 
 #ifndef __RTL_WIFI_H__
 #define __RTL_WIFI_H__
@@ -263,7 +241,7 @@ struct rtlwifi_firmware_header {
         u8 date;
         u8 hour;
         u8 minute;
-        __le16 ramcodeSize;
+        __le16 ramcodesize;
         __le16 rsvd2;
         __le32 svnindex;
         __le32 rsvd3;
@@ -465,11 +443,11 @@ enum hw_variables {
         HW_VAR_MCS_RATE_AVAILABLE = 0x1f,
         HW_VAR_AC_PARAM = 0x20,
         HW_VAR_ACM_CTRL = 0x21,
-        HW_VAR_DIS_Req_Qsize = 0x22,
+        HW_VAR_DIS_REQ_QSIZE = 0x22,
         HW_VAR_CCX_CHNL_LOAD = 0x23,
         HW_VAR_CCX_NOISE_HISTOGRAM = 0x24,
         HW_VAR_CCX_CLM_NHM = 0x25,
-        HW_VAR_TxOPLimit = 0x26,
+        HW_VAR_TXOPLIMIT = 0x26,
         HW_VAR_TURBO_MODE = 0x27,
         HW_VAR_RF_STATE = 0x28,
         HW_VAR_RF_OFF_BY_HW = 0x29,
@@ -522,7 +500,7 @@ enum hw_variables {
         HW_VAR_BCN_VALID = 0x55,
         HW_VAR_FWLPS_RF_ON = 0x56,
         HW_VAR_DUAL_TSF_RST = 0x57,
-        HW_VAR_SWITCH_EPHY_WoWLAN = 0x58,
+        HW_VAR_SWITCH_EPHY_WOWLAN = 0x58,
         HW_VAR_INT_MIGRATION = 0x59,
         HW_VAR_INT_AC = 0x5a,
         HW_VAR_RF_TIMING = 0x5b,
@@ -814,8 +792,8 @@ enum _fw_ps_mode {
         FW_PS_UAPSD_MODE = 6,
         FW_PS_IBSS_MODE = 7,
         FW_PS_WWLAN_MODE = 8,
-        FW_PS_PM_Radio_Off = 9,
-        FW_PS_PM_Card_Disable = 10,
+        FW_PS_PM_RADIO_OFF = 9,
+        FW_PS_PM_CARD_DISABLE = 10,
 };
 
 enum rt_psmode {
@@ -849,8 +827,8 @@ enum rtl_led_pin {
 /*QoS related.*/
 /*acm implementation method.*/
 enum acm_method {
-        eAcmWay0_SwAndHw = 0,
-        eAcmWay1_HW = 1,
+        EACMWAY0_SWANDHW = 0,
+        EACMWAY1_HW = 1,
         EACMWAY2_SW = 2,
 };
 
@@ -1481,7 +1459,7 @@ struct rtl_io {
         void (*write8_async) (struct rtl_priv *rtlpriv, u32 addr, u8 val);
         void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, u16 val);
         void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, u32 val);
-        void (*writeN_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf,
+        void (*writen_sync)(struct rtl_priv *rtlpriv, u32 addr, void *buf,
                              u16 len);
 
         u8(*read8_sync) (struct rtl_priv *rtlpriv, u32 addr);
@@ -1898,7 +1876,7 @@ struct rtl_dm {
 
 struct rtl_efuse {
         const struct rtl_efuse_ops *efuse_ops;
-        bool autoLoad_ok;
+        bool autoload_ok;
         bool bootfromefuse;
         u16 max_physical_size;
 
@@ -2125,7 +2103,7 @@ struct rtl_stats {
         u8 rx_bufshift;
         bool isampdu;
         bool isfirst_ampdu;
-        bool rx_is40Mhzpacket;
+        bool rx_is40mhzpacket;
         u8 rx_packet_bw;
         u32 rx_pwdb_all;
         u8 rx_mimo_signalstrength[4];   /*in 0~100 index */
@@ -2276,8 +2254,8 @@ struct rtl_hal_ops {
                               struct ieee80211_sta *sta,
                               struct sk_buff *skb, u8 hw_queue,
                               struct rtl_tcb_desc *ptcb_desc);
-        void (*fill_fake_txdesc) (struct ieee80211_hw *hw, u8 *pDesc,
-                                  u32 buffer_len, bool bIsPsPoll);
+        void (*fill_fake_txdesc)(struct ieee80211_hw *hw, u8 *pdesc,
+                                 u32 buffer_len, bool bsspspoll);
         void (*fill_tx_cmddesc) (struct ieee80211_hw *hw, u8 *pdesc,
                                  bool firstseg, bool lastseg,
                                  struct sk_buff *skb);
diff --git a/drivers/net/wireless/rsi/rsi_91x_debugfs.c b/drivers/net/wireless/rsi/rsi_91x_debugfs.c
index d0c35f3e2012..c71b41e45423 100644
--- a/drivers/net/wireless/rsi/rsi_91x_debugfs.c
+++ b/drivers/net/wireless/rsi/rsi_91x_debugfs.c
@@ -59,7 +59,7 @@ static int rsi_sdio_stats_read(struct seq_file *seq, void *data)
 }
 
 /**
- * rsi_sdio_stats_open() - This funtion calls single open function of seq_file
+ * rsi_sdio_stats_open() - This function calls single open function of seq_file
  *                         to open file and read contents from it.
  * @inode: Pointer to the inode structure.
  * @file: Pointer to the file structure.
@@ -93,7 +93,7 @@ static int rsi_version_read(struct seq_file *seq, void *data)
 }
 
 /**
- * rsi_version_open() - This funtion calls single open function of seq_file to
+ * rsi_version_open() - This function calls single open function of seq_file to
  *                      open file and read contents from it.
  * @inode: Pointer to the inode structure.
  * @file: Pointer to the file structure.
@@ -178,7 +178,7 @@ static int rsi_stats_read(struct seq_file *seq, void *data)
 }
 
 /**
- * rsi_stats_open() - This funtion calls single open function of seq_file to
+ * rsi_stats_open() - This function calls single open function of seq_file to
  *                    open file and read contents from it.
  * @inode: Pointer to the inode structure.
  * @file: Pointer to the file structure.
@@ -207,7 +207,7 @@ static int rsi_debug_zone_read(struct seq_file *seq, void *data)
 }
 
 /**
- * rsi_debug_read() - This funtion calls single open function of seq_file to
+ * rsi_debug_read() - This function calls single open function of seq_file to
  *                    open file and read contents from it.
  * @inode: Pointer to the inode structure.
  * @file: Pointer to the file structure.
diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
index aded1ae4fad5..831046e760f8 100644
--- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
@@ -239,6 +239,7 @@ static int rsi_mac80211_hw_scan_start(struct ieee80211_hw *hw,
         struct ieee80211_bss_conf *bss = &vif->bss_conf;
 
         rsi_dbg(INFO_ZONE, "***** Hardware scan start *****\n");
+        common->mac_ops_resumed = false;
 
         if (common->fsm_state != FSM_MAC_INIT_DONE)
                 return -ENODEV;
@@ -285,7 +286,7 @@ static void rsi_mac80211_cancel_hw_scan(struct ieee80211_hw *hw,
                         common->bgscan_en = false;
                 info.aborted = false;
                 ieee80211_scan_completed(adapter->hw, &info);
-                rsi_dbg(INFO_ZONE, "Back ground scan cancelled\b\n");
+                rsi_dbg(INFO_ZONE, "Back ground scan cancelled\n");
         }
         common->hwscan = NULL;
         mutex_unlock(&common->mutex);
@@ -370,6 +371,10 @@ static void rsi_mac80211_tx(struct ieee80211_hw *hw,
 {
         struct rsi_hw *adapter = hw->priv;
         struct rsi_common *common = adapter->priv;
+        struct ieee80211_hdr *wlh = (struct ieee80211_hdr *)skb->data;
+
+        if (ieee80211_is_auth(wlh->frame_control))
+                common->mac_ops_resumed = false;
 
         rsi_core_xmit(common, skb);
 }
@@ -677,7 +682,8 @@ static int rsi_mac80211_config(struct ieee80211_hw *hw,
         }
 
         /* Power save parameters */
-        if (changed & IEEE80211_CONF_CHANGE_PS) {
+        if ((changed & IEEE80211_CONF_CHANGE_PS) &&
+            !common->mac_ops_resumed) {
                 struct ieee80211_vif *vif, *sta_vif = NULL;
                 unsigned long flags;
                 int i, set_ps = 1;
@@ -810,15 +816,15 @@ static void rsi_mac80211_bss_info_changed(struct ieee80211_hw *hw,
                 adapter->ps_info.dtim_interval_duration = bss->dtim_period;
                 adapter->ps_info.listen_interval = conf->listen_interval;
 
-        /* If U-APSD is updated, send ps parameters to firmware */
-        if (bss->assoc) {
-                if (common->uapsd_bitmap) {
-                        rsi_dbg(INFO_ZONE, "Configuring UAPSD\n");
-                        rsi_conf_uapsd(adapter, vif);
+                /* If U-APSD is updated, send ps parameters to firmware */
+                if (bss->assoc) {
+                        if (common->uapsd_bitmap) {
+                                rsi_dbg(INFO_ZONE, "Configuring UAPSD\n");
+                                rsi_conf_uapsd(adapter, vif);
+                        }
+                } else {
+                        common->uapsd_bitmap = 0;
                 }
-        } else {
-                common->uapsd_bitmap = 0;
-        }
         }
 
         if (changed & BSS_CHANGED_CQM) {
@@ -1332,7 +1338,7 @@ static void rsi_fill_rx_status(struct ieee80211_hw *hw,
 }
 
 /**
- * rsi_indicate_pkt_to_os() - This function sends recieved packet to mac80211.
+ * rsi_indicate_pkt_to_os() - This function sends received packet to mac80211.
  * @common: Pointer to the driver private structure.
  * @skb: Pointer to the socket buffer structure.
  *
@@ -1895,6 +1901,10 @@ int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan)
                 return 0;
         }
         rsi_dbg(INFO_ZONE, "TRIGGERS %x\n", triggers);
+
+        if (common->coex_mode > 1)
+                rsi_disable_ps(adapter, adapter->vifs[0]);
+
         rsi_send_wowlan_request(common, triggers, 1);
 
         /**
@@ -1938,8 +1948,13 @@ static int rsi_mac80211_resume(struct ieee80211_hw *hw)
 
         rsi_dbg(INFO_ZONE, "%s: mac80211 resume\n", __func__);
 
-        if (common->hibernate_resume)
-                return 0;
+        if (common->hibernate_resume) {
+                common->mac_ops_resumed = true;
+                /* Device need a complete restart of all MAC operations.
+                 * returning 1 will serve this purpose.
+                 */
+                return 1;
+        }
 
         mutex_lock(&common->mutex);
         rsi_send_wowlan_request(common, 0, 0);
diff --git a/drivers/net/wireless/rsi/rsi_91x_main.c b/drivers/net/wireless/rsi/rsi_91x_main.c
index ca3a55ed72e4..29d83049c5f5 100644
--- a/drivers/net/wireless/rsi/rsi_91x_main.c
+++ b/drivers/net/wireless/rsi/rsi_91x_main.c
@@ -121,11 +121,8 @@ static struct sk_buff *rsi_prepare_skb(struct rsi_common *common,
                                        u32 pkt_len,
                                        u8 extended_desc)
 {
-        struct ieee80211_tx_info *info;
         struct sk_buff *skb = NULL;
         u8 payload_offset;
-        struct ieee80211_vif *vif;
-        struct ieee80211_hdr *wh;
 
         if (WARN(!pkt_len, "%s: Dummy pkt received", __func__))
                 return NULL;
@@ -144,10 +141,7 @@ static struct sk_buff *rsi_prepare_skb(struct rsi_common *common,
         payload_offset = (extended_desc + FRAME_DESC_SZ);
         skb_put(skb, pkt_len);
         memcpy((skb->data), (buffer + payload_offset), skb->len);
-        wh = (struct ieee80211_hdr *)skb->data;
-        vif = rsi_get_vif(common->priv, wh->addr1);
 
-        info = IEEE80211_SKB_CB(skb);
         return skb;
 }
 
diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
index 404241424a62..8c17842ac507 100644
--- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
@@ -409,8 +409,8 @@ static int rsi_load_radio_caps(struct rsi_common *common)
  * rsi_mgmt_pkt_to_core() - This function is the entry point for Mgmt module.
  * @common: Pointer to the driver private structure.
  * @msg: Pointer to received packet.
- * @msg_len: Length of the recieved packet.
- * @type: Type of recieved packet.
+ * @msg_len: Length of the received packet.
+ * @type: Type of received packet.
  *
  * Return: 0 on success, -1 on failure.
  */
@@ -1547,7 +1547,7 @@ int rsi_send_ps_request(struct rsi_hw *adapter, bool enable,
 }
 
 /**
- * rsi_set_antenna() - This fuction send antenna configuration request
+ * rsi_set_antenna() - This function send antenna configuration request
  *                     to device
  *
  * @common: Pointer to the driver private structure.
@@ -1955,7 +1955,7 @@ int rsi_handle_card_ready(struct rsi_common *common, u8 *msg)
 
 /**
  * rsi_mgmt_pkt_recv() - This function processes the management packets
- *                       recieved from the hardware.
+ *                       received from the hardware.
  * @common: Pointer to the driver private structure.
  * @msg: Pointer to the received packet.
  *
@@ -2003,6 +2003,35 @@ int rsi_mgmt_pkt_recv(struct rsi_common *common, u8 *msg)
                         return -1;
                 rsi_send_beacon(common);
                 break;
+        case WOWLAN_WAKEUP_REASON:
+                rsi_dbg(ERR_ZONE, "\n\nWakeup Type: %x\n", msg[15]);
+                switch (msg[15]) {
+                case RSI_UNICAST_MAGIC_PKT:
+                        rsi_dbg(ERR_ZONE,
+                                "*** Wakeup for Unicast magic packet ***\n");
+                        break;
+                case RSI_BROADCAST_MAGICPKT:
+                        rsi_dbg(ERR_ZONE,
+                                "*** Wakeup for Broadcast magic packet ***\n");
+                        break;
+                case RSI_EAPOL_PKT:
+                        rsi_dbg(ERR_ZONE,
+                                "*** Wakeup for GTK renewal ***\n");
+                        break;
+                case RSI_DISCONNECT_PKT:
+                        rsi_dbg(ERR_ZONE,
+                                "*** Wakeup for Disconnect ***\n");
+                        break;
+                case RSI_HW_BMISS_PKT:
+                        rsi_dbg(ERR_ZONE,
+                                "*** Wakeup for HW Beacon miss ***\n");
+                        break;
+                default:
+                        rsi_dbg(ERR_ZONE,
+                                "##### Un-intentional Wakeup #####\n");
+                        break;
+        }
+        break;
         case RX_DOT11_MGMT:
                 return rsi_mgmt_pkt_to_core(common, msg, msg_len);
         default:
diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index b412b65eb1f4..3430d7a0899e 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -138,7 +138,7 @@ static int rsi_issue_sdiocommand(struct sdio_func *func,
 }
 
 /**
- * rsi_handle_interrupt() - This function is called upon the occurence
+ * rsi_handle_interrupt() - This function is called upon the occurrence
  *                          of an interrupt.
  * @function: Pointer to the sdio_func structure.
  *
@@ -875,7 +875,7 @@ static int rsi_init_sdio_interface(struct rsi_hw *adapter,
                 goto fail;
         }
 
-        rsi_dbg(INIT_ZONE, "%s: Setup card succesfully\n", __func__);
+        rsi_dbg(INIT_ZONE, "%s: Setup card successfully\n", __func__);
 
         status = rsi_init_sdio_slave_regs(adapter);
         if (status) {
@@ -1132,6 +1132,12 @@ static void rsi_disconnect(struct sdio_func *pfunction)
         rsi_mac80211_detach(adapter);
         mdelay(10);
 
+        if (IS_ENABLED(CONFIG_RSI_COEX) && adapter->priv->coex_mode > 1 &&
+            adapter->priv->bt_adapter) {
+                rsi_bt_ops.detach(adapter->priv->bt_adapter);
+                adapter->priv->bt_adapter = NULL;
+        }
+
         /* Reset Chip */
         rsi_reset_chip(adapter);
 
@@ -1308,6 +1314,12 @@ static int rsi_freeze(struct device *dev)
                 rsi_dbg(ERR_ZONE,
                         "##### Device can not wake up through WLAN\n");
 
+        if (IS_ENABLED(CONFIG_RSI_COEX) && common->coex_mode > 1 &&
+            common->bt_adapter) {
+                rsi_bt_ops.detach(common->bt_adapter);
+                common->bt_adapter = NULL;
+        }
+
         ret = rsi_sdio_disable_interrupts(pfunction);
 
         if (sdev->write_fail)
@@ -1355,6 +1367,12 @@ static void rsi_shutdown(struct device *dev)
         if (rsi_config_wowlan(adapter, wowlan))
                 rsi_dbg(ERR_ZONE, "Failed to configure WoWLAN\n");
 
+        if (IS_ENABLED(CONFIG_RSI_COEX) && adapter->priv->coex_mode > 1 &&
+            adapter->priv->bt_adapter) {
+                rsi_bt_ops.detach(adapter->priv->bt_adapter);
+                adapter->priv->bt_adapter = NULL;
+        }
+
         rsi_sdio_disable_interrupts(sdev->pfunction);
 
         if (sdev->write_fail)
@@ -1378,7 +1396,7 @@ static int rsi_restore(struct device *dev)
         common->iface_down = true;
 
         adapter->sc_nvifs = 0;
-        ieee80211_restart_hw(adapter->hw);
+        adapter->ps_state = PS_NONE;
 
         common->wow_flags = 0;
         common->iface_down = false;
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index f360690396dd..ac0ef5ea6ffb 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -252,7 +252,7 @@ static int rsi_usb_reg_write(struct usb_device *usbdev,
 
 /**
  * rsi_rx_done_handler() - This function is called when a packet is received
- *                         from USB stack. This is callback to recieve done.
+ *                         from USB stack. This is callback to receive done.
  * @urb: Received URB.
  *
  * Return: None.
@@ -816,6 +816,13 @@ static void rsi_disconnect(struct usb_interface *pfunction)
                 return;
 
         rsi_mac80211_detach(adapter);
+
+        if (IS_ENABLED(CONFIG_RSI_COEX) && adapter->priv->coex_mode > 1 &&
+            adapter->priv->bt_adapter) {
+                rsi_bt_ops.detach(adapter->priv->bt_adapter);
+                adapter->priv->bt_adapter = NULL;
+        }
+
         rsi_reset_card(adapter);
         rsi_deinit_usb_interface(adapter);
         rsi_91x_deinit(adapter);
diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h
index 4dc0c0123469..35d13f35e9b0 100644
--- a/drivers/net/wireless/rsi/rsi_main.h
+++ b/drivers/net/wireless/rsi/rsi_main.h
@@ -311,6 +311,7 @@ struct rsi_common {
         struct cfg80211_scan_request *hwscan;
         struct rsi_bgscan_params bgscan;
         u8 bgscan_en;
+        u8 mac_ops_resumed;
 };
 
 struct eepromrw_info {
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 353fb722ab98..48703ec60d06 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2126,6 +2126,8 @@ ieee80211_he_oper_size(const u8 *he_oper_ie)
 #define IEEE80211_SPCT_MSR_RPRT_TYPE_BASIC      0
 #define IEEE80211_SPCT_MSR_RPRT_TYPE_CCA        1
 #define IEEE80211_SPCT_MSR_RPRT_TYPE_RPI        2
+#define IEEE80211_SPCT_MSR_RPRT_TYPE_LCI        8
+#define IEEE80211_SPCT_MSR_RPRT_TYPE_CIVIC      11
 
 /* 802.11g ERP information element */
 #define WLAN_ERP_NON_ERP_PRESENT (1<<0)
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 6674412f9270..459d355f6506 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -291,6 +291,12 @@ enum ieee80211_radiotap_he_bits {
 
         IEEE80211_RADIOTAP_HE_DATA6_NSTS                = 0x000f,
         IEEE80211_RADIOTAP_HE_DATA6_DOPPLER             = 0x0010,
+        IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_KNOWN    = 0x0020,
+        IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW          = 0x00c0,
+                IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_20MHZ    = 0,
+                IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_40MHZ    = 1,
+                IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_80MHZ    = 2,
+                IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_160MHZ   = 3,
         IEEE80211_RADIOTAP_HE_DATA6_TXOP                = 0x7f00,
         IEEE80211_RADIOTAP_HE_DATA6_MIDAMBLE_PDCTY      = 0x8000,
 };